Add types in frequently used emojis #22662

stitesExpensify · 2023-07-11T18:09:15Z

Details

This was a regression caused by this pr which I reviewed, and missed this

Fixed Issues

$ #22654
PROPOSAL: N/A

Tests

Open NewDot
Open any chat
Open emoji picker
Select Non-default skintone
Select any emojis supporting skintone
Open emoji picker again
Make sure that your frequently used emojis are the skin tone that you selected

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open NewDot
Open any chat
Open emoji picker
Select Non-default skintone
Select any emojis supporting skintone
Open emoji picker again
Make sure that your frequently used emojis are the skin tone that you selected

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
- 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 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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-07-11T18:09:23Z

@Santhosh-Sellavel 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]

Santhosh-Sellavel · 2023-07-11T18:10:23Z

Does this require a C+ Review?

0xmiros · 2023-07-11T18:10:35Z

Let me review this as this was caused by PR I reviewed.

stitesExpensify · 2023-07-11T18:13:03Z

Adding screenshots now.

Santhosh-Sellavel · 2023-07-11T18:13:28Z

@0xmiroslav From which PR?

francoisl

Tested only on web but works well

francoisl · 2023-07-11T18:15:14Z

@0xmiroslav From which PR?

@Santhosh-Sellavel apparently #20828

Santhosh-Sellavel · 2023-07-11T18:16:29Z

Seems like the regression, @0xmiroslav it is then!

0xmiros · 2023-07-11T18:21:56Z

@stitesExpensify one more place to add types:

App/src/libs/EmojiUtils.js

Lines 231 to 232 in 702d8e2

    
           const {name, code} = Emojis.emojiCodeTable[emoji.code]; 
        
           const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp};

stitesExpensify · 2023-07-11T18:27:39Z

@0xmiroslav updated!

ios/Podfile.lock

0xmiros · 2023-07-11T18:41:38Z

Job 3 failing

stitesExpensify · 2023-07-11T18:52:55Z

Running to lunch to meet with Bondy, I'll fix the test as soon as i'm back

0xmiros · 2023-07-11T18:58:03Z

src/libs/EmojiUtils.js

@@ -14,7 +14,7 @@ Onyx.connect({
        frequentlyUsedEmojis = _.map(val, (item) => {
            const emoji = Emojis.emojiCodeTable[item.code];
            if (emoji) {
-                return {name: emoji.name, code: emoji.code, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
+                return {name: emoji.name, code: emoji.code, count: item.count, lastUpdatedAt: item.lastUpdatedAt, types: emoji.types};


To avoid types: undefined:

Suggested change

return {name: emoji.name, code: emoji.code, count: item.count, lastUpdatedAt: item.lastUpdatedAt, types: emoji.types};

return {...emoji, count: item.count, lastUpdatedAt: item.lastUpdatedAt};

0xmiros · 2023-07-11T18:58:37Z

src/libs/EmojiUtils.js

+        const {name, code, types} = Emojis.emojiCodeTable[emoji.code];
+        const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp, types};


Same here:

Suggested change

const {name, code, types} = Emojis.emojiCodeTable[emoji.code];

const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp, types};

const updatedEmoji = {...Emojis.emojiCodeTable[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};

0xmiros

Oh I meant to request changes

melvin-bot · 2023-07-11T18:59:14Z

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

0xmiros · 2023-07-11T18:59:42Z

Above suggestion will fix job3 tests failing

stitesExpensify · 2023-07-11T20:21:21Z

@0xmiroslav I don't think we actually want types in the getFrequentlyUsedEmojis list. We didn't update that test, and it doesn't have types even before the spanish addition

stitesExpensify · 2023-07-11T20:37:07Z

Hm no that was actually from the other portion... So were we not passing types before?

0xmiros · 2023-07-11T20:49:22Z

@0xmiroslav I don't think we actually want types in the getFrequentlyUsedEmojis list. We didn't update that test, and it doesn't have types even before the spanish addition

I confirmed they exist in production, but yes not necessary.

0xmiros · 2023-07-11T20:50:24Z

Lint failing

stitesExpensify · 2023-07-11T20:53:26Z

Updated to fix tests/skintones. I think it makes sense to pass the types.

0xmiros · 2023-07-11T21:08:11Z

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 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.mov

Mobile Web - Chrome

Mobile Web - Safari

msafari.mov

Desktop

iOS

ios.mov

Android

0xmiros

LGTM!

melvin-bot · 2023-07-11T21:09:48Z

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

OSBotify · 2023-07-11T21:48:00Z

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

(cherry picked from commit 1a4190b)

OSBotify · 2023-07-12T17:20:10Z

🚀 Deployed to staging by https://github.com/francoisl in version: 1.3.39-10 🚀

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

OSBotify · 2023-07-13T01:42:36Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.39-11 🚀

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

Add types in frequently used emojis

47a5894

stitesExpensify requested a review from a team as a code owner July 11, 2023 18:09

stitesExpensify self-assigned this Jul 11, 2023

melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team July 11, 2023 18:09

thienlnam previously approved these changes Jul 11, 2023

View reviewed changes

francoisl previously approved these changes Jul 11, 2023

View reviewed changes

add types to getFrequentlyUsedEmojis

81acb45

stitesExpensify dismissed stale reviews from francoisl and thienlnam via 81acb45 July 11, 2023 18:27

0xmiros reviewed Jul 11, 2023

View reviewed changes

ios/Podfile.lock Outdated Show resolved Hide resolved

Revert lock change

e9ae888

0xmiros approved these changes Jul 11, 2023

View reviewed changes

0xmiros suggested changes Jul 11, 2023

View reviewed changes

melvin-bot bot requested a review from Julesssss July 11, 2023 18:59

Use spread to clean up code

cc75420

thienlnam removed the request for review from Santhosh-Sellavel July 11, 2023 20:17

thienlnam requested a review from 0xmiros July 11, 2023 20:17

remove types from getFrequentlyUsedEmojis

f1a6612

stitesExpensify added 2 commits July 11, 2023 14:44

Spread emoji so that we return types

2f2080e

Fix tests

605b5a9

Prettier

4e6d744

0xmiros approved these changes Jul 11, 2023

View reviewed changes

melvin-bot bot requested a review from cristipaval July 11, 2023 21:09

francoisl approved these changes Jul 11, 2023

View reviewed changes

francoisl merged commit 1a4190b into main Jul 11, 2023

francoisl deleted the stites-fixFrequentlyUsedEmojis branch July 11, 2023 21:44

francoisl mentioned this pull request Jul 11, 2023

Fix date format to find recent commits in CP workflow #22720

Merged

57 tasks

OSBotify pushed a commit that referenced this pull request Jul 11, 2023

Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis

5065971

(cherry picked from commit 1a4190b)

OSBotify mentioned this pull request Jul 11, 2023

🍒 Cherry pick PR #22662 to staging 🍒 #22722

Closed

OSBotify pushed a commit that referenced this pull request Jul 12, 2023

Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis

f654f6b

(cherry picked from commit 1a4190b)

OSBotify mentioned this pull request Jul 13, 2023

Deploy Checklist: New Expensify 2023-07-13 #22783

Closed

53 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add types in frequently used emojis #22662

Add types in frequently used emojis #22662

stitesExpensify commented Jul 11, 2023 •

edited

Loading

melvin-bot bot commented Jul 11, 2023

Santhosh-Sellavel commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

Santhosh-Sellavel commented Jul 11, 2023

francoisl left a comment

francoisl commented Jul 11, 2023

Santhosh-Sellavel commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

0xmiros Jul 11, 2023

0xmiros Jul 11, 2023

0xmiros left a comment

melvin-bot bot commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

0xmiros commented Jul 11, 2023 •

edited

Loading

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023 •

edited

Loading

0xmiros commented Jul 11, 2023

0xmiros left a comment

melvin-bot bot commented Jul 11, 2023

OSBotify commented Jul 11, 2023

OSBotify commented Jul 12, 2023

OSBotify commented Jul 13, 2023

	return {name: emoji.name, code: emoji.code, count: item.count, lastUpdatedAt: item.lastUpdatedAt, types: emoji.types};
	return {...emoji, count: item.count, lastUpdatedAt: item.lastUpdatedAt};

		const {name, code, types} = Emojis.emojiCodeTable[emoji.code];
		const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp, types};

	const {name, code, types} = Emojis.emojiCodeTable[emoji.code];
	const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp, types};
	const updatedEmoji = {...Emojis.emojiCodeTable[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};

Add types in frequently used emojis #22662

Add types in frequently used emojis #22662

Conversation

stitesExpensify commented Jul 11, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 11, 2023

Santhosh-Sellavel commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

Santhosh-Sellavel commented Jul 11, 2023

francoisl left a comment

Choose a reason for hiding this comment

francoisl commented Jul 11, 2023

Santhosh-Sellavel commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

0xmiros Jul 11, 2023

Choose a reason for hiding this comment

0xmiros Jul 11, 2023

Choose a reason for hiding this comment

0xmiros left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 11, 2023

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023

0xmiros commented Jul 11, 2023 • edited Loading

0xmiros commented Jul 11, 2023

stitesExpensify commented Jul 11, 2023 • edited Loading

0xmiros commented Jul 11, 2023

Reviewer Checklist

Screenshots/Videos

0xmiros left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 11, 2023

OSBotify commented Jul 11, 2023

OSBotify commented Jul 12, 2023

OSBotify commented Jul 13, 2023

stitesExpensify commented Jul 11, 2023 •

edited

Loading

0xmiros commented Jul 11, 2023 •

edited

Loading

stitesExpensify commented Jul 11, 2023 •

edited

Loading