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

Display displayName instead of primaryLogin on the ReportPreview message #20446

Merged
merged 34 commits into from
Jun 28, 2023

Conversation

hoangzinh
Copy link
Contributor

@hoangzinh hoangzinh commented Jun 8, 2023

Details

Fixed Issues

$ #19301
PROPOSAL: #19301 (comment)

Tests

Prerequisite: AccountB must have a displayName set in Avatar > Profile > Display Name

  1. Sign in to accountA, ensure the current language is English
  2. Request money from accountA to accountB
  3. Verify that, In the DM between A:B and LHN, the latest message displays as: "[account B's firstName] owes [amount]"
  4. Go to Preferences -> Language, change to Spanish
  5. Verify that, In the DM between A:B and LHN, the latest message displays as: "[account B's firstName] debe [amount]"
  6. In accountB, click "Pay elsewhere" button
  7. Back to account A
  8. Verify that, In the DM between A:B and LHN, the latest message displays as: "pagó [amount] de otra forma"
  9. Go to Preferences -> Language, change to English
  10. Verify that, In the DM between A:B and LHN, the latest message displays as: "paid [amount] elsewhere"
  11. Sign out and sign in again to account A
  12. Verify that in DM and LHN, it shows as "paid [amount] elsewhere"
  • Verify that no errors appear in the JS console

Offline tests

The change is not related to network

QA Steps

  • 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
Screen.Recording.2023-06-26.at.06.57.28.-.web.mp4
Mobile Web - Chrome
Screen.Recording.2023-06-26.at.21.01.54.-.android.chrome.mp4
Mobile Web - Safari
Screen.Recording.2023-06-26.at.20.47.57.-.ios.safari.mp4
Desktop
Screen.Recording.2023-06-26.at.17.03.02.-.desktop.mp4
iOS
Screen.Recording.2023-06-26.at.20.51.32.-.ios.mp4
Android
Screen.Recording.2023-06-26.at.21.04.43.-.android.mp4

@hoangzinh
Copy link
Contributor Author

@venture1981 Not really, I found a bug during recording video so I need to discuss again with team again #19301 (comment)

@hoangzinh
Copy link
Contributor Author

@venture1981 actually there is a bug that BE returns incorrect amount in report.lastMessageText

@hoangzinh hoangzinh marked this pull request as ready for review June 14, 2023 15:14
@hoangzinh hoangzinh requested a review from a team as a code owner June 14, 2023 15:14
@melvin-bot melvin-bot bot requested review from Julesssss and thesahindia and removed request for a team June 14, 2023 15:14
@melvin-bot
Copy link

melvin-bot bot commented Jun 14, 2023

@Julesssss @thesahindia One of you needs to 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]

src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportActionsUtils.js Outdated Show resolved Hide resolved
src/libs/SidebarUtils.js Outdated Show resolved Hide resolved
src/libs/SidebarUtils.js Outdated Show resolved Hide resolved
src/libs/SidebarUtils.js Outdated Show resolved Hide resolved
src/libs/SidebarUtils.js Outdated Show resolved Hide resolved
src/pages/home/report/ReportActionItem.js Outdated Show resolved Hide resolved
@mountiny mountiny requested a review from luacmartins June 14, 2023 16:43
@mountiny
Copy link
Contributor

Also tagging Carlos for a review here

@hoangzinh
Copy link
Contributor Author

Also tagging Carlos for a review here

I think you haven't tagged him yet @mountiny 🤣

@mountiny
Copy link
Contributor

@hoangzinh thanks there are some conflicts

@luacmartins has been requested for a review.

@hoangzinh
Copy link
Contributor Author

@thesahindia I resolved the conflict. Please help me review this PR again. Thanks

Julesssss
Julesssss previously approved these changes Jun 27, 2023
@Julesssss
Copy link
Contributor

Okay, nearly there. @luacmartins and @thesahindia could you please take another look? I believe your concerns/points have all been resolved. Thanks!

@Julesssss
Copy link
Contributor

@hoangzinh translation is good 👍

@hoangzinh
Copy link
Contributor Author

Thanks @Julesssss for helping verify translation

@thesahindia
Copy link
Member

It's really hard to test right now. I requested money from user B but when I switch to user B I can't find the contact. It was working fine a couple mins ago(server related stuff I guess) I will try to test it again after a few hours.

luacmartins
luacmartins previously approved these changes Jun 27, 2023
@thesahindia
Copy link
Member

thesahindia commented Jun 28, 2023

@hoangzinh, when I log out and log in again I only see paid [amount] instead of paid [amount] elsewhere

Screen.Recording.2023-06-28.at.5.25.29.AM.mov

@hoangzinh
Copy link
Contributor Author

@thesahindia Yeah, I reported above and @Julesssss said that we can fix separately in BE here #20446 (comment)

@thesahindia
Copy link
Member

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 Screenshot 2023-06-28 at 5 18 14 AM
Mobile Web - Chrome Screenshot 2023-06-28 at 3 47 41 AM
Mobile Web - Safari Screenshot 2023-06-28 at 4 15 09 AM
Desktop
Screen.Recording.2023-06-27.at.5.41.49.PM.mov
iOS Screenshot 2023-06-28 at 4 09 46 AM
Android Screenshot 2023-06-28 at 3 42 48 AM

@thesahindia
Copy link
Member

Sorry for the delay here I was having a hard time testing things. The chats weren't loading/updating. It tested well for me!
@hoangzinh, can you please resolve the conflicts for one last time?

@hoangzinh hoangzinh dismissed stale reviews from luacmartins and Julesssss via 0f106df June 28, 2023 15:11
@hoangzinh
Copy link
Contributor Author

@thesahindia Sure. I just resolved the conflicts

Copy link
Member

@thesahindia thesahindia left a comment

Choose a reason for hiding this comment

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

Works well!

@melvin-bot melvin-bot bot requested a review from Julesssss June 28, 2023 19:19
@luacmartins
Copy link
Contributor

Vit is ooo and Jules had already approved these changes, so I'm gonna merge this.

@luacmartins luacmartins merged commit 3dc50e0 into Expensify:main Jun 28, 2023
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.35-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jul 3, 2023

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

OSBotify commented Jul 3, 2023

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.35-5 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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