Clear stale reimbursement account data on Wallet bank account setup by MelvinBot · Pull Request #84773 · Expensify/App

MelvinBot · 2026-03-10T17:08:11Z

Explanation of Change

When a user who already has a bank account on a workspace navigates through Wallet → Add bank account → Make payments → selects a non-USD country → clicks Next, they see the "Business bank account added" confirmation screen instead of the expected bank connection options.

The root cause is that stale achData from a previously viewed workspace bank account persists in the REIMBURSEMENT_ACCOUNT Onyx key. The Wallet's CountrySelection page only called clearReimbursementAccountDraft() but did not call clearReimbursementAccount(), so stale data (with state: 'OPEN') was used by ReimbursementAccountPage to incorrectly show the "bank account added" screen.

This PR adds a clearReimbursementAccount() call in CountrySelection.onConfirm() before navigation, which resets achData to DEFAULT_DATA (with state: 'SETUP') so that the fresh setup flow renders correctly.

Fixed Issues

$ #82763
PROPOSAL: #82763 (comment)

Tests

Sign in to New Dot
Create a workspace
Open Workflows → Payments → Add bank account
Add a Regions 1111 bank account (complete the setup)
Navigate to the Wallet (Settings → Wallet)
Click "Add bank account", then "Make payments" and select a non-USD country
Click Next
Verify that the bank connection options are displayed (Plaid/manual entry) instead of the "Business bank account added" screen

Verify that no errors appear in the JS console

Offline tests

N/A — This flow requires network connectivity to reach the bank account setup pages.

QA Steps

Same as Tests above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…unt setup When entering the Wallet's bank account flow, stale achData from a previously viewed workspace bank account persists in REIMBURSEMENT_ACCOUNT. The Wallet CountrySelection page only cleared the draft but not the main account data, causing the "Business bank account added" screen to appear instead of the bank connection options. Call clearReimbursementAccount() before navigation to reset achData to DEFAULT_DATA. Co-authored-by: Shridhar Goel <ShridharGoel@users.noreply.github.com>

ShridharGoel · 2026-03-13T21:37:06Z

@MelvinBot Mark this as ready for review.

melvin-bot · 2026-03-13T21:39:26Z

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

MelvinBot · 2026-03-13T21:39:28Z

Done! This PR has been marked as ready for review. 🚀

ShridharGoel · 2026-03-15T13:08:26Z

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.2026-03-15.at.6.42.23.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-03-15.at.6.41.41.PM.mov

iOS: HybridApp

Screen.Recording.2026-03-15.at.6.44.23.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-03-15.at.6.43.46.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-15.at.6.37.19.PM.mov

melvin-bot · 2026-03-15T13:14:53Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #82763 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

github-actions · 2026-03-16T11:34:06Z

🚧 @MarioExpensify has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-16T11:38:07Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #84773.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-235f6f4-a6a9d5f-67aff241e9e59e4d00ddfc2b8c090bc34471907d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-235f6f4-a6a9d5f-ae8cd9cb4d9c28b1b0240dd3d59fc01738f396e8/index.html

Web 🕸️
https://84773.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-16T11:41:22Z

✋ 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 · 2026-03-17T11:55:41Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.3.39-0 🚀

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

OSBotify · 2026-03-18T13:02:47Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.39-3 🚀

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

MelvinBot assigned ShridharGoel Mar 10, 2026

MelvinBot requested a review from a team March 10, 2026 17:08

MelvinBot mentioned this pull request Mar 10, 2026

[Due for payment 2026-03-25] [$250] Add bank account- Successful page is shown after clicking Next on BA location page in Wallet #82763

Open

7 tasks

MelvinBot marked this pull request as ready for review March 13, 2026 21:39

MelvinBot requested a review from a team as a code owner March 13, 2026 21:39

melvin-bot bot requested review from ShridharGoel and heyjennahay and removed request for a team March 13, 2026 21:39

melvin-bot bot removed the request for review from a team March 13, 2026 21:39

ShridharGoel approved these changes Mar 15, 2026

View reviewed changes

melvin-bot bot requested a review from MarioExpensify March 15, 2026 13:14

MarioExpensify approved these changes Mar 16, 2026

View reviewed changes

MarioExpensify merged commit 235f6f4 into main Mar 16, 2026
39 checks passed

MarioExpensify deleted the claude-clearStaleReimbursementAccountOnWalletSetup branch March 16, 2026 11:33

OSBotify mentioned this pull request Mar 17, 2026

Deploy Checklist: New Expensify 2026-03-17 #85529

Closed

75 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clear stale reimbursement account data on Wallet bank account setup#84773

Clear stale reimbursement account data on Wallet bank account setup#84773
MarioExpensify merged 1 commit intomainfrom
claude-clearStaleReimbursementAccountOnWalletSetup

MelvinBot commented Mar 10, 2026

Uh oh!

ShridharGoel commented Mar 13, 2026

Uh oh!

melvin-bot bot commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

ShridharGoel commented Mar 15, 2026 •

edited

Loading

Uh oh!

melvin-bot bot commented Mar 15, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

MelvinBot commented Mar 10, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

ShridharGoel commented Mar 13, 2026

Uh oh!

melvin-bot bot commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

ShridharGoel commented Mar 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 15, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 16, 2026

Uh oh!

OSBotify commented Mar 17, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ShridharGoel commented Mar 15, 2026 •

edited

Loading