Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Static emoji autosuggestion issues #15871

Merged
merged 3 commits into from
Mar 13, 2023
Merged

Conversation

fedirjh
Copy link
Contributor

@fedirjh fedirjh commented Mar 11, 2023

@stitesExpensify

Details

Fix some issue missed during #14686

Fixed Issues

  1. Fix scoping issue : Static emoji autosuggestion  #14686 (comment)
  2. Fix invalid regular expression : Static emoji autosuggestion  #14686 (comment)

Tests

Test 1 :

  1. Open any chat
  2. Write a long chat untill the scrollbar is visible
  3. Try to scroll

Test 2:

  1. Open any chat
  2. Type this message :+1:
  3. Verify that auto suggestion menu appear with thumb emoji and the app doesn’t crash
  • Verify that no errors appear in the JS console

Offline tests

Same Tests

QA Steps

Same tests

  • 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 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 correct English and 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 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
Screen.Recording.2023-03-11.at.1.21.08.AM.mov
Screen.Recording.2023-03-11.at.1.23.22.AM.mov
Mobile Web - Chrome
Screen.Recording.2023-03-11.at.1.43.33.AM.mov
Mobile Web - Safari
Simulator.Screen.Recording.-.iPhone.13.-.2023-03-11.at.01.36.51.mp4
Desktop
Screen.Recording.2023-03-11.at.1.39.19.AM.mov
iOS
Simulator.Screen.Recording.-.iPhone.13.-.2023-03-11.at.01.33.30.mp4
Android

@fedirjh fedirjh requested a review from a team as a code owner March 11, 2023 00:47
@fedirjh fedirjh mentioned this pull request Mar 11, 2023
54 tasks
@melvin-bot melvin-bot bot requested review from AndrewGable and removed request for a team March 11, 2023 00:47
@MelvinBot
Copy link

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

@fedirjh
Copy link
Contributor Author

fedirjh commented Mar 11, 2023

cc @stitesExpensify

@mananjadhav
Copy link
Collaborator

I am getting warning for one case (that we didn't catch earlier). ReportUtils.canShowReportRecipientLocalTime is returning undefined, and hence, shouldIncludeReportRecipientLocalTimeHeight prop for EmojiSuggestions is passed as undefined.

I think we should fix it in this PR @stitesExpensify @fedirjh? We can just cast the return value to Boolean, what do you think?

App/src/libs/ReportUtils.js

Lines 419 to 425 in acc4984

return !hasMultipleParticipants
&& !isChatRoom(report)
&& reportRecipient
&& reportRecipientTimezone
&& reportRecipientTimezone.selected
&& isReportParticipantValidated;
}

emoji-suggestions-warning-web

emoji-suggestions-warning.mov

@mananjadhav
Copy link
Collaborator

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 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 correct English and 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 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-emoji-suggestions.mov
Mobile Web - Chrome
mweb-chrome-emoji-suggestions.mov
Mobile Web - Safari
mweb-safari-emoji-suggestions.mov
Desktop
desktop-emoji-suggestions.mov
iOS
ios-emoji-suggestions.mov
Android
android-emoji-suggestions.mov

The current changes work well, but I raised another warning and checking if this can be a part of this PR.

mananjadhav
mananjadhav previously approved these changes Mar 12, 2023
@fedirjh
Copy link
Contributor Author

fedirjh commented Mar 12, 2023

I think we should fix it in this PR @stitesExpensify @fedirjh? We can just cast the return value to Boolean, what do you think?

@mananjadhav Good catch , I also think we should fix it here , we can just add a default prop value

const defaultProps = {
    shouldIncludeReportRecipientLocalTimeHeight: false,
    highlightedEmojiIndex: 0,
};

Also I found another warning: For newly created accounts , the preferredSkinToneIndex has value default however the prop type is number. I think this should be fixed in BE ( change the default to -1 ) or we have to apply same fix as did here

let preferredSkinTone;
Onyx.connect({
key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
callback: (val) => {
// the preferred skin tone is sometimes still "default", although it
// was changed that "default" has become -1.
if (!_.isNull(val) && Number.isInteger(Number(val))) {
preferredSkinTone = val;
} else {
preferredSkinTone = -1;
}
},
});

Screenshot 2023-03-12 at 1 31 13 PM

@mananjadhav
Copy link
Collaborator

Thanks for the comment @fedirjh.

I also think we should fix it here , we can just add a default prop value

I think instead of default prop we should retain the isRequired behaviour and pass the correct value.

For newly created accounts , the preferredSkinToneIndex has value default however the prop type is number.

I think this was fixed from the backend but @stitesExpensify can confirm.

@luacmartins luacmartins self-requested a review March 12, 2023 13:37
@stitesExpensify
Copy link
Contributor

For newly created accounts , the preferredSkinToneIndex has value default however the prop type is number.

I will fix it on the back end. Looks like we didn't update the API layer setting the default in onyx

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this! I'll create an issue to make sure you're paid out for fixing these @fedirjh

@github-actions
Copy link
Contributor

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

@luacmartins
Copy link
Contributor

LGMT and tests well. Gonna merge to fix the bugs.

@luacmartins luacmartins merged commit c5a3562 into Expensify:main Mar 13, 2023
OSBotify pushed a commit that referenced this pull request Mar 13, 2023
Fix Static emoji autosuggestion issues

(cherry picked from commit c5a3562)
OSBotify added a commit that referenced this pull request Mar 13, 2023
@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.2.83-1 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 1.2.83-3 🚀

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

@stitesExpensify
Copy link
Contributor

@fedirjh issue is here, can you comment so that I can assign you please? #15968

@fedirjh fedirjh deleted the Fix-14686 branch March 30, 2023 03:52
@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants