fix: Regression - Emoji reaction not working - Issue 22235 (Original - 21826) #22270

jeet-dhandha · 2023-07-05T14:24:10Z

Details

Fixed Issues

$ #22235
PROPOSAL: #22235 (comment)
REGRESSION-ISSUE: #21826

Tests

Open any Chat and then reply to a message in thread.
Now react using emoji to the first message of thread.
Verify that the reacted emoji is displayed.

Verify that no errors appear in the JS console

Offline tests

Open any Chat and then reply to a message in thread.
Now react using emoji to the first message of thread.
Verify that the reacted emoji is displayed.

QA Steps

Open any Chat and then reply to a message in thread.
Now react using emoji to the first message of thread.
Verify that the reacted emoji is displayed.

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Chrome-Desktop-min.mp4

Mobile Web - Chrome

mSafari-mChrome-min.mp4

Mobile Web - Safari

mSafari-mChrome-min.mp4

Desktop

Chrome-Desktop-min.mp4

iOS

iOS-Android-min.mp4

Android

iOS-Android-min.mp4

This reverts commit fd300e2.

melvin-bot · 2023-07-05T14:24:16Z

@aimane-chnaif Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

aimane-chnaif · 2023-07-05T14:26:53Z

src/libs/actions/Report.js

@@ -1635,13 +1635,14 @@ function removeEmojiReaction(reportID, originalReportAction, emoji) {
 /**
 * Calls either addEmojiReaction or removeEmojiReaction depending on if the current user has reacted to the report action.
 * @param {String} reportID
- * @param {String} reportActionID
+ * @param {Object} action


Suggested change

* @param {Object} action

* @param {Object} reportAction

Let's re-use name from original code so replace all action with reportAction

But this will give conflicts with the const created inside.

@aimane-chnaif

aimane-chnaif · 2023-07-05T14:56:57Z

src/libs/actions/Report.js

-function toggleEmojiReaction(reportID, reportActionID, emoji, paramSkinTone = preferredSkinTone) {
-    const reportAction = ReportActionsUtils.getReportAction(reportID, reportActionID);
+function toggleEmojiReaction(reportID, action, emoji, paramSkinTone = preferredSkinTone) {
+    const originalReportID = ReportUtils.getOriginalReportID(reportID, action);


As original reportID is already calculated here, let's remove redundant calculation in addEmojiReaction and removeEmojiReaction

aimane-chnaif · 2023-07-05T15:03:47Z

So this PR should

revert fix: emoji showing original message for few moments #21933
move ReportUtils.getOriginalReportID from addEmojiReaction/removeEmojiReaction to toggleEmojiReaction
refetch reportAction using originalReportID and originalReportAction

aimane-chnaif · 2023-07-05T15:05:17Z

And please complete checklist. It's failing.

jeet-dhandha · 2023-07-05T15:50:30Z

@aimane-chnaif This happened as reviewers are unaware of originalReportID else this wouldn't have gone to regression so i would suggest if we go through all the functions where originalReportID is not used and fix them all in as a different Issue. And also would love to fix that myself. As i don't want other people's PR go into regression. As this results in lower payment.

aimane-chnaif · 2023-07-05T16:00:29Z

@jeet-dhandha I am well aware of that as I reviewed PR which introduced getOriginalReportID. And sure everything is out of scope as long as it's not related to #21826, #22235.

jeet-dhandha · 2023-07-05T16:06:45Z

Then @aimane-chnaif you are right, the reviewer should have told me to keep originalReportID in check.

jeet-dhandha · 2023-07-05T16:35:17Z

@aimane-chnaif Checklist completed.

aimane-chnaif · 2023-07-05T16:43:10Z

All reactions disappear after editing message and re-appears after refresh.
I think this is known issue happening on production.
@jeet-dhandha do you know GH?

Screen.Recording.2023-07-05.at.5.40.53.PM.mov

aimane-chnaif · 2023-07-05T16:47:43Z

I confirmed it's known backend issue - #15794

jeet-dhandha · 2023-07-20T12:51:55Z

@aimane-chnaif - Please review the PR again.

aimane-chnaif · 2023-07-20T14:34:18Z

Tests well!

web.mov

aimane-chnaif

melvin-bot · 2023-07-20T14:35:38Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #22235 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

neil-marcellini · 2023-07-20T17:22:49Z

@danieldoglas I'm removing your assignment to take this off your plate, but please reassign if you like.

src/libs/actions/Report.js

jeet-dhandha · 2023-07-20T19:08:34Z

Done @aimane-chnaif

aimane-chnaif · 2023-07-20T19:09:21Z

@neil-marcellini all yours!

neil-marcellini

Code looks good but please add test and QA steps.

neil-marcellini

Good to go

melvin-bot · 2023-07-20T20:59:16Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

OSBotify · 2023-07-20T21:05:40Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-07-21T18:50:24Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.3.44-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-07-25T01:24:21Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.44-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-07-25T01:44:42Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.3.45-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-07-26T15:54:13Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.45-7 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

jeet-dhandha added 13 commits June 21, 2023 14:50

fix: Changes

fd300e2

Revert "fix: Changes"

06f9bbc

This reverts commit fd300e2.

Merge remote-tracking branch 'upstream/main'

4839b98

Merge remote-tracking branch 'upstream/main'

9aaae8a

Merge remote-tracking branch 'upstream/main'

4ba0164

Merge remote-tracking branch 'upstream/main'

86f7d3a

Merge remote-tracking branch 'upstream/main'

1a1ef11

Merge remote-tracking branch 'upstream/main'

93b92ae

Merge remote-tracking branch 'upstream/main'

9ae6e80

Merge remote-tracking branch 'upstream/main'

3cd7964

Merge remote-tracking branch 'upstream/main'

c9474fd

Merge remote-tracking branch 'upstream/main'

fd41eb4

fix-regression

d126def

jeet-dhandha requested a review from a team as a code owner July 5, 2023 14:24

melvin-bot bot requested review from aimane-chnaif and removed request for a team July 5, 2023 14:24

This was referenced Jul 5, 2023

[HOLD for payment 2023-08-01] [$1000] Dev: Web - Reaction does not work for first message of thread #22235

Closed

[HOLD for payment 2023-07-14] [$1000] Original message is displayed for few seconds after adding emoji reaction on edited message #21826

Closed

aimane-chnaif suggested changes Jul 5, 2023

View reviewed changes

aimane-chnaif reviewed Jul 5, 2023

View reviewed changes

fix: report action name changes

ae07063

jeet-dhandha added 3 commits July 14, 2023 09:48

Merge remote-tracking branch 'upstream/main'

5f7fb5c

Merge remote-tracking branch 'upstream/main'

a5cbaad

Merge remote-tracking branch 'upstream/main'

670ecfc

aimane-chnaif mentioned this pull request Jul 20, 2023

Support new emojiReaction data format #17996

Merged

57 tasks

jeet-dhandha added 3 commits July 20, 2023 17:45

Merge remote-tracking branch 'upstream/main'

30d615f

Merge branch 'main' into regression-fix-21826

653c0f7

chore: use reportId from reportAction

db668d3

aimane-chnaif approved these changes Jul 20, 2023

View reviewed changes

melvin-bot bot requested a review from danieldoglas July 20, 2023 14:35

neil-marcellini requested review from neil-marcellini and removed request for danieldoglas July 20, 2023 17:21

aimane-chnaif reviewed Jul 20, 2023

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

chore: change jsdoc type

229a5d3

neil-marcellini requested changes Jul 20, 2023

View reviewed changes

neil-marcellini approved these changes Jul 20, 2023

View reviewed changes

neil-marcellini merged commit 7fea760 into Expensify:main Jul 20, 2023

OSBotify mentioned this pull request Jul 21, 2023

Deploy Checklist: New Expensify 2023-07-21 #23362

Closed

OSBotify mentioned this pull request Jul 25, 2023

Deploy Checklist: New Expensify 2023-07-25 #23522

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Regression - Emoji reaction not working - Issue 22235 (Original - 21826) #22270

fix: Regression - Emoji reaction not working - Issue 22235 (Original - 21826) #22270

jeet-dhandha commented Jul 5, 2023 •

edited

Loading

melvin-bot bot commented Jul 5, 2023

aimane-chnaif Jul 5, 2023

aimane-chnaif Jul 5, 2023

jeet-dhandha Jul 5, 2023 •

edited

Loading

jeet-dhandha Jul 5, 2023

aimane-chnaif Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

jeet-dhandha commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

jeet-dhandha commented Jul 5, 2023

jeet-dhandha commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

jeet-dhandha commented Jul 20, 2023

aimane-chnaif commented Jul 20, 2023

aimane-chnaif left a comment

melvin-bot bot commented Jul 20, 2023

neil-marcellini commented Jul 20, 2023

jeet-dhandha commented Jul 20, 2023

aimane-chnaif commented Jul 20, 2023

neil-marcellini left a comment

neil-marcellini left a comment

melvin-bot bot commented Jul 20, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 26, 2023

fix: Regression - Emoji reaction not working - Issue 22235 (Original - 21826) #22270

fix: Regression - Emoji reaction not working - Issue 22235 (Original - 21826) #22270

Conversation

jeet-dhandha commented Jul 5, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 5, 2023

aimane-chnaif Jul 5, 2023

Choose a reason for hiding this comment

aimane-chnaif Jul 5, 2023

Choose a reason for hiding this comment

jeet-dhandha Jul 5, 2023 • edited Loading

Choose a reason for hiding this comment

jeet-dhandha Jul 5, 2023

Choose a reason for hiding this comment

aimane-chnaif Jul 5, 2023

Choose a reason for hiding this comment

aimane-chnaif commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

jeet-dhandha commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

jeet-dhandha commented Jul 5, 2023

jeet-dhandha commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

aimane-chnaif commented Jul 5, 2023

jeet-dhandha commented Jul 20, 2023

aimane-chnaif commented Jul 20, 2023

aimane-chnaif left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 20, 2023

neil-marcellini commented Jul 20, 2023

jeet-dhandha commented Jul 20, 2023

aimane-chnaif commented Jul 20, 2023

neil-marcellini left a comment

Choose a reason for hiding this comment

neil-marcellini left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 20, 2023

OSBotify commented Jul 20, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 26, 2023

jeet-dhandha commented Jul 5, 2023 •

edited

Loading

jeet-dhandha Jul 5, 2023 •

edited

Loading