Only add the new emojis to the frequent emojis list by doing a difference between former and new emojis #27687

ShogunFire · 2023-09-18T15:14:57Z

Details

We save the emojis present before to find out what emojis were actually added then we send that to the api

Fixed Issues

$ #27464
PROPOSAL: #27464 (comment)

Tests

Open any report
Open the emoji picker
Choose an emoji that is not in the frequently used emoji list
Open the emoji picker again and see at what position this emoji is in the frequently used emoji list
Close the emoji picker
Type a lot of characters
Open the emoji picker and verify the position hasn't changed
Write the same emoji multiple times with different methods (picker/suggestion list/copy paste/native emojis) and verify that the position change in the emoji picker

Verify that no errors appear in the JS console

Offline tests

Same tests

QA Steps

Same tests

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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
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

2023-09-21.08-05-35.mp4

Mobile Web - Chrome

2023-09-21.08-22-27.mp4

Mobile Web - Safari

2023-09-24.18-47-50.mp4

Desktop

2023-09-24.18-51-28.mp4

iOS

2023-09-24.18-41-41.mp4

Android

2023-09-21.09-29-09.mp4

…ence between former and new emojis Signed-off-by: Pierre Michel <pmiche04@gmail.com>

melvin-bot · 2023-09-18T15:15:02Z

@mananjadhav 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]

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

ShogunFire · 2023-09-18T15:29:06Z

@mananjadhav onInsertedEmoji is currently required so not passing it creates an error in the console, what should I do ?

Remove the props completly since it is not used anywhere else
Create a default value
pass an empty method

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

mananjadhav · 2023-09-20T07:12:33Z

@ShogunFire Best to remove the prop if not used anywhere else.

Also we still have lint issues here.

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

ShogunFire · 2023-09-20T19:29:26Z

Ok I removed it, I saw there was this issue #27579 about sending multiple calls to the API, right now my solution is sending the right numbers but multiple times, I will fix that

…iSentMultipleTimes Signed-off-by: Pierre Michel <pmiche04@gmail.com> # Conflicts: # src/pages/home/report/ReportActionCompose/SuggestionEmoji.js # src/pages/home/report/ReportActionCompose/Suggestions.js

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

mananjadhav · 2023-09-21T04:03:54Z

src/libs/EmojiUtils.js

            emojis.push(emoji);
        }
    }

    return emojis;
 }

+/**
+ * Take the current emojis and the former emojis and return the emojis that were added, if we add an already existing emoji, we also return it


if we add an already existing emoji, we also return it

I didn't quite understand this part of the comment. Can you elaborate what do you mean here?

I mean that if we had 😏 before and now we have 😏😏😏 we need to return two 😏 even if 😏 was present in the former list

mananjadhav · 2023-09-21T17:01:12Z

@ShogunFire Can you complete the author checklist with the screencasts from all the platforms?

ShogunFire · 2023-09-21T17:08:04Z

Yes, I have a problem with executing ios but I will try to make it today

mananjadhav · 2023-09-24T15:16:32Z

@ShogunFire What's the latest update on this?

ShogunFire · 2023-09-25T00:54:25Z

@mananjadhav Sorry for the delay, I completed the checklist

mananjadhav · 2023-09-26T02:22:45Z

src/pages/home/report/ReportActionItemMessageEdit.js

@@ -203,9 +209,13 @@ function ReportActionItemMessageEdit(props) {
            const {text: newDraft, emojis} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, props.preferredSkinTone, props.preferredLocale);

            if (!_.isEmpty(emojis)) {
-                insertedEmojis.current = [...insertedEmojis.current, ...emojis];
-                debouncedUpdateFrequentlyUsedEmojis();
+                const newEmojis = EmojiUtils.getAddedEmojis(emojis, emojisPresentBefore.current);


Can we move this block to a util or an action? I can see the exact same thing repeated for ComposeWithSuggestions

I am not sure how to do this cleanly with the debounce, also it was repeating before and a lot of code is repeating in those two files, can we keep it like this for now ?

joelbettner · 2023-10-03T23:46:06Z

@mananjadhav will you please take care of the checklist? @ShogunFire it looks like some conflicts popped up.

Signed-off-by: Pierre Michel <pmiche04@gmail.com> # Conflicts: # src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

mananjadhav · 2023-10-04T22:05:40Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (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
- 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 verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
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
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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web-frequently-used-emojis.mp4

Mobile Web - Chrome

mweb-chrome-frequently-used-emojis.mov

Mobile Web - Safari

mweb-safari-frequently-used-emojis.mov

Desktop

desktop-frequently-used-emojis.mov

iOS

ios-frequently-used-emojis.mov

Android

android-frequently-used-emojis.mov

Thanks for the PR and the patience here @ShogunFire. Tests well. @joelbettner All yours.

🎀 👀 🎀 C+ reviewed.

melvin-bot · 2023-10-10T14:33:29Z

@joelbettner looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2023-10-10T14:39:12Z

✋ 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-10-11T05:08:53Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.81-0 🚀

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

OSBotify · 2023-10-12T04:50:21Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.83-0 🚀

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

Only add the new emojis to the frequent emojis list by doing a differ…

45f2936

…ence between former and new emojis Signed-off-by: Pierre Michel <pmiche04@gmail.com>

ShogunFire requested a review from a team as a code owner September 18, 2023 15:14

melvin-bot bot requested review from mananjadhav and removed request for a team September 18, 2023 15:15

Same thing in ReportActionItemMessageEdit

b5e44b8

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

ShogunFire added 5 commits September 18, 2023 09:39

Fix lint errors

597f67b

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

After npm run prettier

093300e

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

We must pass the array not the ref

fa0a82b

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

Add JSdoc for the new method

c2b8837

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

Adding param names for JS docs

0bc8fa6

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

Removing onInsertedEmoji because it's not used anymore

77a4d48

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

ShogunFire added 2 commits September 20, 2023 13:39

Merge remote-tracking branch 'origin/main' into fixFrequentlyUsedEmoj…

218905a

…iSentMultipleTimes Signed-off-by: Pierre Michel <pmiche04@gmail.com> # Conflicts: # src/pages/home/report/ReportActionCompose/SuggestionEmoji.js # src/pages/home/report/ReportActionCompose/Suggestions.js

Only call updateFrequentlyUsedEmojis when we add emojis

90e5225

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

mananjadhav reviewed Sep 21, 2023

View reviewed changes

mananjadhav reviewed Sep 26, 2023

View reviewed changes

aimane-chnaif mentioned this pull request Sep 28, 2023

[HOLD for payment 2023-10-25] [$1000] Chat - Emoji suggestion list does not disappear when typing 👍 in the composer #20998

Closed

6 tasks

mananjadhav approved these changes Oct 2, 2023

View reviewed changes

melvin-bot bot requested a review from joelbettner October 2, 2023 20:50

ShogunFire added 2 commits October 4, 2023 12:45

Merge branch 'main' into fixFrequentlyUsedEmojiSentMultipleTimes

932029f

Signed-off-by: Pierre Michel <pmiche04@gmail.com> # Conflicts: # src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js

After npm run prettier

f9c43fc

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

mananjadhav mentioned this pull request Oct 6, 2023

[HOLD for payment 2023-10-23] [HOLD for payment 2023-10-23] [HOLD for payment 2023-10-20] [HOLD for payment 2023-10-20] [$500] Web - Frequently used emojis is listed wrong #27464

Closed

6 tasks

joelbettner approved these changes Oct 10, 2023

View reviewed changes

joelbettner merged commit f878fbd into Expensify:main Oct 10, 2023
13 checks passed

melvin-bot bot added the Emergency label Oct 10, 2023

OSBotify mentioned this pull request Oct 11, 2023

Deploy Checklist: New Expensify 2023-10-11 #29252

Closed

OSBotify mentioned this pull request Oct 12, 2023

Deploy Checklist: New Expensify 2023-10-12 #29417

Closed

97 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only add the new emojis to the frequent emojis list by doing a difference between former and new emojis #27687

Only add the new emojis to the frequent emojis list by doing a difference between former and new emojis #27687

ShogunFire commented Sep 18, 2023 •

edited

Loading

melvin-bot bot commented Sep 18, 2023

ShogunFire commented Sep 18, 2023

mananjadhav commented Sep 20, 2023

ShogunFire commented Sep 20, 2023 •

edited

Loading

mananjadhav Sep 21, 2023

ShogunFire Sep 21, 2023

mananjadhav commented Sep 21, 2023

ShogunFire commented Sep 21, 2023

mananjadhav commented Sep 24, 2023

ShogunFire commented Sep 25, 2023

mananjadhav Sep 26, 2023

ShogunFire Sep 26, 2023

joelbettner commented Oct 3, 2023

mananjadhav commented Oct 4, 2023

melvin-bot bot commented Oct 10, 2023

OSBotify commented Oct 10, 2023

OSBotify commented Oct 11, 2023

OSBotify commented Oct 12, 2023

Only add the new emojis to the frequent emojis list by doing a difference between former and new emojis #27687

Only add the new emojis to the frequent emojis list by doing a difference between former and new emojis #27687

Conversation

ShogunFire commented Sep 18, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

Screenshots/Videos

melvin-bot bot commented Sep 18, 2023

ShogunFire commented Sep 18, 2023

mananjadhav commented Sep 20, 2023

ShogunFire commented Sep 20, 2023 • edited Loading

mananjadhav Sep 21, 2023

Choose a reason for hiding this comment

ShogunFire Sep 21, 2023

Choose a reason for hiding this comment

mananjadhav commented Sep 21, 2023

ShogunFire commented Sep 21, 2023

mananjadhav commented Sep 24, 2023

ShogunFire commented Sep 25, 2023

mananjadhav Sep 26, 2023

Choose a reason for hiding this comment

ShogunFire Sep 26, 2023

Choose a reason for hiding this comment

joelbettner commented Oct 3, 2023

mananjadhav commented Oct 4, 2023

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Oct 10, 2023

OSBotify commented Oct 10, 2023

OSBotify commented Oct 11, 2023

OSBotify commented Oct 12, 2023

ShogunFire commented Sep 18, 2023 •

edited

Loading

ShogunFire commented Sep 20, 2023 •

edited

Loading