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: Wrong currency in request money page after login #25786

Merged
merged 12 commits into from
Sep 25, 2023

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Aug 23, 2023

Details

USD currency is displayed when navigating to request money page by deep-link though it's supposed to be user preference's currency. This PR fixes that.

Fixed Issues

$ #24393
PROPOSAL: #24393 (comment)

Tests

  1. Log out of the app
  2. Verify that your default currency is different from USD
  3. Go to URL /request/new/manual
  4. Login
  5. Verify that a loader shows
  6. Verify that then your default currency shows instead of USD
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

  1. Log out of the app
  2. Verify that your default currency is different from USD
  3. Go to URL /request/new/manual
  4. Login
  5. Verify that a loader shows
  6. Verify that then your default currency shows instead of USD
  • 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
deeplink-compressed.mov
Mobile Web - Chrome
video_2023-08-23_22-36-44.mp4
Mobile Web - Safari
Screen.Recording.2023-08-23.at.23.36.53.mov
Desktop
currency-desktop-compressed.mov
iOS
Screen.Recording.2023-08-23.at.22.36.01.mov
Android
Screen.Recording.2023-08-23.at.23.38.35.mov

@tienifr tienifr marked this pull request as ready for review August 23, 2023 16:47
@tienifr tienifr requested a review from a team as a code owner August 23, 2023 16:47
@melvin-bot melvin-bot bot removed the request for review from a team August 23, 2023 16:47
@melvin-bot
Copy link

melvin-bot bot commented Aug 23, 2023

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

@allroundexperts
Copy link
Contributor

@tienifr The request money screen keeps on loading if you're already logged in and reload the page. Can you please check?

Screen.Recording.2023-08-24.at.10.36.08.PM.mov

let currentUserPersonalDetails = {};
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (val) => {
currentUserPersonalDetails = lodashGet(val, userAccountID, {});
if (val && SessionUtils.didUserLogInDuringSession() && shouldResetIOUAfterLogin) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we might want to remove the didInitCurrency outside this condition for this to work as intended.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried removing it but seemed like the merge for didInitCurrency happened too quick (even before resetRequestMoney and thus there would be no loader shown.

Copy link
Contributor

Choose a reason for hiding this comment

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

So what's the fix for this? With the current implementation, I see an infinitely loading screen.
#25786 (comment)

@allroundexperts
Copy link
Contributor

Bump on this @tienifr!

@tienifr
Copy link
Contributor Author

tienifr commented Aug 28, 2023

@allroundexperts Sorry for the delay. I think we should check based on didInitCurrency (i.e., whether it has been set or not), not merely on user log in state. Please take a look at the latest change!

@allroundexperts
Copy link
Contributor

Reviewing this again today!

@tienifr
Copy link
Contributor Author

tienifr commented Aug 31, 2023

Bump @allroundexperts

@allroundexperts
Copy link
Contributor

@tienifr Deep linking is not working now 😞

Screen.Recording.2023-08-31.at.2.13.28.PM.mov

@tienifr
Copy link
Contributor Author

tienifr commented Sep 5, 2023

I also faced this problem. I have reported the bug on Slack here. I think we should hold this PR until the bug is fixed @allroundexperts.

@tienifr
Copy link
Contributor Author

tienifr commented Sep 8, 2023

The issue about deeplinks is up here #26852 and PR has been raised.

@tienifr tienifr changed the title Fix: Wrong currency in request money page after login [HOLD #26852] Fix: Wrong currency in request money page after login Sep 8, 2023
@tienifr tienifr changed the title [HOLD #26852] Fix: Wrong currency in request money page after login Fix: Wrong currency in request money page after login Sep 8, 2023
@tienifr
Copy link
Contributor Author

tienifr commented Sep 8, 2023

@allroundexperts The PR to fix deeplink issue was merged. I think we're good to go.

@tienifr
Copy link
Contributor Author

tienifr commented Sep 11, 2023

Bump @allroundexperts

@allroundexperts
Copy link
Contributor

@tienifr I'm still unable to see the deep links fixed. Did you verify?

Screen.Recording.2023-09-12.at.3.47.39.AM.mov

@tienifr
Copy link
Contributor Author

tienifr commented Sep 12, 2023

@allroundexperts Worked fine on my side:

deeplink-compressed.mov

Due to new features in request money flow, we should modify the test's deeplink as request/new/manual.

@allroundexperts
Copy link
Contributor

This is super weird. But its not working for me.

Screen.Recording.2023-09-13.at.4.30.42.AM.mov

@tienifr
Copy link
Contributor Author

tienifr commented Sep 13, 2023

Hmm but did you type in the deeplink before loging in?

@tienifr
Copy link
Contributor Author

tienifr commented Sep 18, 2023

@allroundexperts Was the deeplink issue on your device fixed?

Due to new features in request money flow, we should modify the test's deeplink as request/new/manual.

I mentioned this above, it might help.

@allroundexperts
Copy link
Contributor

@tienifr I'm encountering a new failure.

screen-recording-2023-09-20-at-125755-am_cNF81U7r.mp4

@tienifr
Copy link
Contributor Author

tienifr commented Sep 20, 2023

App crashes on main as well, let me check if there's any existing issue.

@tienifr
Copy link
Contributor Author

tienifr commented Sep 21, 2023

@allroundexperts No more crashes after pulling main. I tried with a new account as well.

currency-compressed.mov

@allroundexperts
Copy link
Contributor

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
screen-recording-2023-09-26-at-34208-am_2ixmxpji.mp4
Mobile Web - Chrome
Screen.Recording.2023-09-26.at.3.53.58.AM.mov
Mobile Web - Safari
Screen.Recording.2023-09-26.at.3.47.55.AM.mov
Desktop
Screen.Recording.2023-09-26.at.4.07.28.AM.mov
iOS
Screen.Recording.2023-09-26.at.3.50.23.AM.mov
Android
Screen.Recording.2023-09-26.at.3.57.14.AM.mov

Copy link
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

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

Looks good.

@melvin-bot melvin-bot bot requested a review from cristipaval September 25, 2023 23:11
@allroundexperts
Copy link
Contributor

FYI, there is console error when opening a deep link. It's not related and I have recorded it here

Screenshot 2023-09-26 at 3 51 47 AM

Copy link
Contributor

@cristipaval cristipaval left a comment

Choose a reason for hiding this comment

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

Thank you all for the work!

@cristipaval cristipaval merged commit df6e2b6 into Expensify:main Sep 25, 2023
12 checks passed
@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.

}
// eslint-disable-next-line no-use-before-define
resetMoneyRequestInfo();
shouldResetIOUAfterLogin = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

I am concerned that this is a hack that does not address the root cause of the problem. I think it is a mistake that the IOU in Onyx is the thing in charge of initializing currency.

I suggest reverting this PR since it has already been linked to a regression: #28280 and go back to the drawing board for a better solution.

Alternatively, you can wait for me to make progress and resolve #26538 which is an attempt to clean up a lot of the messing routing logic that is probably closer to the root of the problems.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! I'm working on it.

@narefyev91
Copy link
Contributor

@tienifr can you please take a look at this issue #28280 - which cause regression from this merged pr

@tienifr
Copy link
Contributor Author

tienifr commented Sep 28, 2023

I'm working on it.

@tienifr
Copy link
Contributor Author

tienifr commented Sep 28, 2023

Regression PR is up #28410.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.75-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Oct 2, 2023

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.75-12 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Oct 2, 2023

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.76-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Oct 3, 2023

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.76-6 🚀

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