Fix: 'Start over' button do not return to the 'Confirm currency and country' by nyomanjyotisa · Pull Request #76072 · Expensify/App

nyomanjyotisa · 2025-11-26T01:25:29Z

Explanation of Change

Update setNonUSDBankAccountStep to use CONST.NON_USD_BANK_ACCOUNT.STEP.COUNTRY instead of null in order to navigate to the 'Confirm currency and country' step when starting over

Fixed Issues

$ #74809
PROPOSAL: #74809 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Prerequisites: Use Expensifail account

Go to a workspace with non-USD currency (e.g., EUR).
Navigate to Workflows → Add Bank Account → Connect Manually.
Select Country = Czech Republic and enter IBAN = CZ5508000000001234567899.
Continue to the next step, enter address, and proceed to the next step.
Close the RHP (Right-Hand Panel).
Open the Add Bank Account flow again.
On the RHP, click Start Over.
Confirm the warning modal.
Verify that the flow returns to the 'Confirm currency and country' page and that the 'Country' field is empty.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.Chrome.mp4

iOS: Native

iOS-Native.mp4

iOS: mWeb Safari

iOS-mWeb.Safari.mp4

MacOS: Chrome / Safari

MacOS-Chrome.mp4

…ountry'

codecov · 2025-11-26T01:34:18Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...ementAccount/VerifiedBankAccountFlowEntryPoint.tsx	`0.00% <ø> (ø)`
...pages/workspace/WorkspaceResetBankAccountModal.tsx	`0.00% <0.00%> (ø)`
.../ReimbursementAccount/ReimbursementAccountPage.tsx	`0.00% <0.00%> (ø)`
... and 13 files with indirect coverage changes

melvin-bot · 2025-11-26T02:55:38Z

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

trjExpensify

Makes sense to start here when wiped. 👍

abdulrahuman5196 · 2025-11-27T09:21:12Z

@nyomanjyotisa I am seeing a flash of old data while starting over @nyomanjyotisa could you check on this?

Screen.Recording.2025-11-27.at.2.50.02.PM.mov

nyomanjyotisa · 2025-11-27T16:44:48Z

I am seeing a flash of old data while starting over

Seems like this issue only happens on Android native. I've updated the PR to use a local react state isResettingBankAccount to prevent the flash. Could you please review it again?

abdulrahuman5196 · 2025-11-28T08:46:15Z

@nyomanjyotisa I am not sure if this is the right approach of passing around a prop to solve this issue and using a requestAnimationFrame.

Actually what is the stale data? Why is it not cleared? When does it get clear?
Could you kindly add information on RCA and how the fix will help this?

nyomanjyotisa · 2025-11-28T15:03:16Z

RCA

The stale data is the country value stored in reimbursementAccountDraft?.[COUNTRY] (the form draft)

App/src/components/SubStepForms/CountryFullStep/subSteps/Confirmation.tsx

Line 50 in 4ae8e1d

    
           const countryDefaultValue = reimbursementAccountDraft?.[COUNTRY] ?? reimbursementAccount?.achData?.[COUNTRY] ?? '';

This draft is cleared in resetNonUSDBankAccount via Onyx update here

App/src/libs/actions/ReimbursementAccount/resetNonUSDBankAccount.ts

Lines 17 to 19 in 4ae8e1d

    
           onyxMethod: Onyx.METHOD.SET, 
        
           key: ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM_DRAFT, 
        
           value: null,

However, Onyx updates are asynchronous, while react state updates are synchronous

When "Start Over" is clicked:

resetNonUSDBankAccount is called -> queues Onyx update to clear the draft (async)
setNonUSDBankAccountStep(CONST.NON_USD_BANK_ACCOUNT.STEP.COUNTRY) is called immediately -> React state update (synchronous)
React re-renders -> Country component reads reimbursementAccountDraft?.[COUNTRY] which still has the old value because Onyx hasn't propagated the update yet, which causes the flash of old country data

This is the log when we click on "Start Over"

countryDefaultValue return the stale data here

Then later, after Onyx updates propagate

countryDefaultValue return the cleared draft

This race condition exists on all platforms, but I think Android native rendering cycle makes it more visible. React state updates and re-renders might happen faster, so the component renders before Onyx updates have fully propagated

Solution

Use a local react state isResettingBankAccount that we control synchronously

Set isResettingBankAccount = true before calling resetNonUSDBankAccount -> blocks the NonUSD flow from rendering immediately
Call resetNonUSDBankAccount -> Onyx update to clear draft is queued
Call setNonUSDBankAccountStep(CONST.NON_USD_BANK_ACCOUNT.STEP.COUNTRY) -> step is set, but flow won't render because isResettingBankAccount === true
After requestAnimationFrame, set isResettingBankAccount = false -> allows rendering once Onyx updates have propagated

With this change, the Country component only renders after the draft has been cleared from Onyx. The requestAnimationFrame gives Onyx updates time to propagate before allowing the component to render again

abdulrahuman5196 · 2025-12-08T14:18:34Z

checking now

abdulrahuman5196 · 2025-12-08T15:06:40Z

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
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-12-08.at.8.16.01.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-12-08.at.8.21.39.PM.mov

iOS: HybridApp

Screen.Recording.2025-12-08.at.8.28.13.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-12-08.at.8.30.42.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-08.at.8.33.12.PM.mov

abdulrahuman5196

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @mjasikowski

🎀 👀 🎀
C+ Reviewed

OSBotify · 2025-12-09T09:11:27Z

✋ 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 · 2025-12-09T15:29:18Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.2.74-0 🚀

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

OSBotify · 2025-12-10T21:38:27Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

OSBotify · 2025-12-10T21:54:41Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

OSBotify · 2025-12-10T22:59:06Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

Fix: 'Start over' button do not return to the 'Confirm currency and c…

5215eb2

…ountry'

melvin-bot Bot assigned nyomanjyotisa Nov 26, 2025

nyomanjyotisa marked this pull request as ready for review November 26, 2025 02:55

nyomanjyotisa requested review from a team as code owners November 26, 2025 02:55

melvin-bot Bot requested a review from abdulrahuman5196 November 26, 2025 02:55

melvin-bot Bot requested review from trjExpensify and removed request for a team November 26, 2025 02:55

trjExpensify previously approved these changes Nov 26, 2025

View reviewed changes

fix: add isResettingBankAccount state to prevent flash on Android native

6588d2d

nyomanjyotisa dismissed trjExpensify’s stale review via 6588d2d November 27, 2025 16:19

nyomanjyotisa added 2 commits November 28, 2025 00:23

Merge branch 'main' into issue-74809

8a20d69

ESLint fix

4ae8e1d

abdulrahuman5196 approved these changes Dec 8, 2025

View reviewed changes

melvin-bot Bot requested a review from mjasikowski December 8, 2025 15:07

mjasikowski approved these changes Dec 9, 2025

View reviewed changes

mjasikowski merged commit c21a1f5 into Expensify:main Dec 9, 2025
31 checks passed

OSBotify mentioned this pull request Dec 9, 2025

Deploy Checklist: New Expensify 2025-12-09 #77123

Closed

Conversation

nyomanjyotisa commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Nov 26, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Nov 26, 2025

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

abdulrahuman5196 commented Nov 27, 2025

Uh oh!

nyomanjyotisa commented Nov 27, 2025

Uh oh!

abdulrahuman5196 commented Nov 28, 2025

Uh oh!

nyomanjyotisa commented Nov 28, 2025

RCA

Solution

Uh oh!

abdulrahuman5196 commented Dec 8, 2025

Uh oh!

abdulrahuman5196 commented Dec 8, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

abdulrahuman5196 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Dec 9, 2025

Uh oh!

OSBotify commented Dec 9, 2025

Uh oh!

OSBotify commented Dec 10, 2025

Uh oh!

OSBotify commented Dec 10, 2025

Uh oh!

OSBotify commented Dec 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nyomanjyotisa commented Nov 26, 2025 •

edited

Loading

codecov Bot commented Nov 26, 2025 •

edited by github-actions Bot

Loading