Refreshing default currency page directs to confirm workspace page by thelullabyy · Pull Request #63371 · Expensify/App

thelullabyy · 2025-06-03T15:58:27Z

Explanation of Change

Fixed Issues

$#62357
PROPOSAL:#62357 (comment)

Tests

Open app
Tap workspace - workspaces - new workspace
Tap default currency
Refresh the page
Verify app remain in same currency page

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open app
Tap workspace - workspaces - new workspace
Tap default currency
Refresh the page
Verify app remain in same currency page

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 verified there are no new alerts related to the canBeMissing param for useOnyx
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 used JaimeGPT to get English > Spanish translation. I then posted it 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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.ts 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 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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.

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android_Web.mov

iOS: Native

Screen.Recording.2025-06-03.at.22.57.34.mov

iOS: mWeb Safari

ios_web.mov

MacOS: Chrome / Safari

chorme.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2025-06-03T16:09:09Z

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

eh2077 · 2025-06-04T04:22:19Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb 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 there are no new alerts related to the canBeMissing param for useOnyx
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 grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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.ts 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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

Android: HybridApp

Screen.Recording.2025-06-04.at.11.38.08.AM.mov

Android: mWeb Chrome

Screen.Recording.2025-06-04.at.11.36.57.AM.mov

iOS: HybridApp

Screen.Recording.2025-06-04.at.11.39.31.AM.mov

iOS: mWeb Safari

Screen.Recording.2025-06-04.at.11.38.35.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-04.at.11.35.37.AM.mov

MacOS: Desktop

Screen.Recording.2025-06-04.at.11.39.58.AM.mov

eh2077

LGTM!

inimaga

Looks good overall. But it doesn't handle preserving the selected non-default currency after a page reload.

thelullabyy · 2025-06-05T07:34:20Z

@inimaga I mentioned this issue here. I think it out of scope

inimaga · 2025-06-05T08:12:30Z

@thelullabyy I'm aware that you mentioned it but don't agree that it is out of scope. As even though its not explicitly mentioned, it is still related to the UX of preserving the state of the page after refresh. And shouldn't be treated separately, when we can handle it here with minimal changes.

eh2077 · 2025-06-05T09:04:26Z

@thelullabyy Let's try what @inimaga suggested. Yeah, I also agree we can do the polish together in this PR.

I think we can use the parameter to save the current code and pass it to initiallySelectedCurrencyCode. Wdyt?

thelullabyy · 2025-06-09T03:13:00Z

@eh2077 Okay it will be done today

thelullabyy · 2025-06-09T07:21:28Z

@eh2077 I updated PR. Please help to check. This is the result:

Screen.Recording.2025-06-09.at.14.13.47.mov

eh2077 · 2025-06-10T06:32:07Z

src/components/CurrencyPicker.tsx


    const hidePickerModal = () => {
        setIsPickerVisible(false);
+        Navigation.setParams({currency: value});


Is it necessary to add a flag to enable this feature?

@eh2077 flag is added

eh2077 · 2025-06-10T06:38:18Z

src/components/WorkspaceConfirmationForm.tsx

+    const currencyParam = route.params && 'currency' in route.params && !!route.params.currency ? (route.params.currency as string) : userCurrency;
+    const [currency] = useState(currencyParam);


If the currency value is from route param, I think we need to add extra check to ensure it's valid current code. The currency list is available like

App/src/components/CurrencySelectionList/index.tsx

Line 23 in 74fc9b9

const [currencyList] = useOnyx(ONYXKEYS.CURRENCY_LIST);

Screen.Recording.2025-06-10.at.2.28.17.PM.mov

@eh2077 Updated

eh2077 · 2025-06-11T08:20:22Z

Screen.Recording.2025-06-11.at.4.12.44.PM.mov

Screen.Recording.2025-06-11.at.4.16.25.PM.mov

Screen.Recording.2025-06-11.at.4.19.05.PM.mov

eh2077

Code looks good and tested well.
@thelullabyy Thanks for your patience!

@inimaga All yours

inimaga

Looks good to me too. Thanks both!

OSBotify · 2025-06-11T10:35:36Z

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

github-actions · 2025-06-11T22:34:34Z

🚀 Deployed to staging by https://github.com/inimaga in version: 9.1.65-0 🚀

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

github-actions · 2025-06-12T22:10:51Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.65-1 🚀

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

fix: Refreshing default currency page directs to confirm workspace page

a3b75ae

thelullabyy marked this pull request as ready for review June 3, 2025 16:09

thelullabyy requested a review from a team as a code owner June 3, 2025 16:09

melvin-bot bot requested review from eh2077 and removed request for a team June 3, 2025 16:09

eh2077 approved these changes Jun 4, 2025

View reviewed changes

melvin-bot bot requested a review from inimaga June 4, 2025 04:24

inimaga requested changes Jun 4, 2025

View reviewed changes

fix: retain currency state when refreshing page

bf131af

Merge branch 'main' into fix/62357-refreshing-default-currency

5aee8a3

eh2077 reviewed Jun 10, 2025

View reviewed changes

fix: add check currency available in currencyList

b1958d5

eh2077 approved these changes Jun 11, 2025

View reviewed changes

melvin-bot bot requested a review from inimaga June 11, 2025 08:21

inimaga approved these changes Jun 11, 2025

View reviewed changes

inimaga merged commit 7adf5b5 into Expensify:main Jun 11, 2025
20 checks passed

github-actions bot mentioned this pull request Jun 11, 2025

Deploy Checklist: New Expensify 2025-06-11 #64018

Closed

25 tasks

melvin-bot bot mentioned this pull request Jun 12, 2025

[Due for payment 2025-06-19] [$250] Workspace - Refreshing default currency page directs to confirm workspace page. #62357

Closed

8 tasks

layacat mentioned this pull request Jul 25, 2025

[BACK BUTTON] [$250] mWeb - Workspace - After creating WS, device´s back button leads to "Currency" page again. #65717

Closed

8 tasks

		const currencyParam = route.params && 'currency' in route.params && !!route.params.currency ? (route.params.currency as string) : userCurrency;
		const [currency] = useState(currencyParam);

Conversation

thelullabyy commented Jun 3, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 3, 2025

Uh oh!

eh2077 commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

inimaga left a comment

Choose a reason for hiding this comment

Uh oh!

thelullabyy commented Jun 5, 2025

Uh oh!

inimaga commented Jun 5, 2025

Uh oh!

eh2077 commented Jun 5, 2025

Uh oh!

thelullabyy commented Jun 9, 2025

Uh oh!

thelullabyy commented Jun 9, 2025

Uh oh!

eh2077 Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

thelullabyy Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

eh2077 Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

thelullabyy Jun 10, 2025

Choose a reason for hiding this comment

Uh oh!

eh2077 commented Jun 11, 2025

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

inimaga left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jun 11, 2025

Uh oh!

github-actions bot commented Jun 11, 2025

Uh oh!

github-actions bot commented Jun 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

eh2077 commented Jun 4, 2025 •

edited

Loading