Fix blank country field by koko57 · Pull Request #82950 · Expensify/App

koko57 · 2026-02-19T15:35:01Z

Explanation of Change

Fixed Issues

$ #82581
PROPOSAL:

Tests

Prerequisites: be an admin of a workspace

Go to Account >> Wallet
Click "Add bank account"
Start adding bank account on the workspace or in the wallet (Make Payments option)
Exit the flow on any of the step
If you're not on the Wallet page, go to the Wallet
Click partially added bank account (with Action required badge)
Verify that the page with Continue Setup appears
Click Continue Setup
Verify that you can continue the setup from the step you left
Tap app back button until you reach Confirm currency and country page
Verify that currency/country fields are filled in correctly
Go back & click Start Over >> Yes, start over on popup
Verify that you're redirected to the purpose page
Test both USD and non-USD flow (choosing United States vs other countries)

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-19.at.18.23.21.mp4

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-02-19.at.18.28.36.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-02-19.at.16.36.47.mp4

codecov · 2026-02-19T15:50:02Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`92.56% <ø> (+0.12%)`	⬆️
.../ReimbursementAccount/NonUSD/BankInfo/BankInfo.tsx	`0.00% <0.00%> (ø)`
...eneficialOwnerDetailsFormSubSteps/Confirmation.tsx	`0.00% <0.00%> (ø)`
...o/BeneficialOwnerDetailsFormSubSteps/Documents.tsx	`0.00% <0.00%> (ø)`
...sementAccount/NonUSD/BusinessInfo/BusinessInfo.tsx	`0.00% <0.00%> (ø)`
...USD/BusinessInfo/subSteps/AverageReimbursement.tsx	`0.00% <0.00%> (ø)`
...unt/NonUSD/BusinessInfo/subSteps/PaymentVolume.tsx	`0.00% <0.00%> (ø)`
...ntAccount/NonUSD/BusinessInfo/subSteps/Website.tsx	`0.00% <0.00%> (ø)`
...mbursementAccount/NonUSD/SignerInfo/EnterEmail.tsx	`0.00% <0.00%> (ø)`
...s/ReimbursementAccount/NonUSD/SignerInfo/index.tsx	`0.00% <0.00%> (ø)`
... and 7 more
... and 303 files with indirect coverage changes

melvin-bot · 2026-02-19T17:29:54Z

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

github-actions · 2026-02-19T17:34:00Z

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

src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx

github-actions · 2026-02-20T09:41:43Z

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

github-actions · 2026-02-20T09:46:33Z

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

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	⏩ SKIPPED ⏩
The build for Android was skipped	The build for iOS was skipped

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

👀 View the workflow run that generated this build 👀

joekaufmanexpensify · 2026-02-20T09:57:24Z

I tested both the US and non-US cases and both worked well. For the edge case where you delete the workspace (and lose admin-status), deleting the workspace actually deleted the partially setup account. I think that is expected for now and Srikar is cleaning up that behavior here.

joekaufmanexpensify

Good from my perspective!

joekaufmanexpensify · 2026-02-20T09:57:45Z

All yours @dominictb

koko57 · 2026-02-23T08:31:51Z

friendly bump @dominictb

dominictb · 2026-02-24T11:53:14Z

src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx

+    const [isCurrentUserPolicyAdmin] = useOnyx(
+        ONYXKEYS.COLLECTION.POLICY,
+        {
+            canBeMissing: true,


canBeMissing was removed

dominictb · 2026-02-24T11:57:48Z

src/pages/workspace/WorkspaceResetBankAccountModal.tsx

    /** Method to set the state of isResettingBankAccount */
    setIsResettingBankAccount?: (isResetting: boolean) => void;
+
+    /** Method to navigate back after resetting bank account from wallet */


Suggested change

/** Method to navigate back after resetting bank account from wallet */

/** Method to navigate after resetting bank account */

dominictb · 2026-02-24T11:58:56Z

src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx

    const isAccountValidated = account?.validated ?? false;

+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+    const isCurrentUserPolicyAdminSelector = useCallback((policies: OnyxCollection<OnyxTypes.Policy>) => hasActiveAdminWorkspaces(currentUserLogin, policies), [currentUserLogin]);


I don't think we need memoization here. React Compiler will handle that automatically.

dominictb · 2026-02-24T12:12:08Z

src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx

+        if (!backTo.includes(ROUTES.SETTINGS_WALLET)) {
+            return;
+        }
+        Navigation.goBack(isCurrentUserPolicyAdmin ? ROUTES.SETTINGS_BANK_ACCOUNT_PURPOSE : ROUTES.SETTINGS_WALLET);


Does this mean that if user is not an admin, resetting the flow will close RHP and open wallet page?

yes, because non-admin should not have access to the purpose page

koko57 · 2026-02-25T08:45:34Z

@dominictb all comments addressed

koko57 · 2026-02-26T09:53:39Z

@dominictb I've found one issue regarding the currency that we haven't caught during the review of the previous PR - I've added the fix to this PR, can you please test the non-USD flow as well?

koko57 · 2026-02-27T07:22:45Z

@dominictb bump

koko57 · 2026-02-27T14:29:48Z

just a heads up - I'll be ooo 4-10 March

dominictb · 2026-02-27T15:16:51Z

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 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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Untitled.mov

dominictb · 2026-02-27T16:21:38Z

BUG

When going back to country step, 1️⃣ I can change my country but 2️⃣ it's not saved. Closing and reopen that bank account flow will still show my initial country. I don't know which one but either one of them must be a bug.

Add a BBA from Wallet page
Select France
Proceed to business name step
Go back to currency & country step
Change country to Germany
Press Next till bank account info step
Account holder country field is still France ❌
Close RHP and reopen that bank account
Continue setup
Country field is France ❌

We should either not allow edit country once set, or save the updated country.

koko57 · 2026-02-27T16:56:42Z

@dominictb I will block the possiblility to change the country once we submit the step

koko57 · 2026-02-27T17:18:08Z

@dominictb fixed!

koko57 · 2026-02-28T08:35:37Z

@dominictb all checks fixed

dominictb

🎀

joekaufmanexpensify · 2026-03-02T13:23:42Z

all yours @srikarparsi

github-actions · 2026-03-02T21:25:12Z

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

github-actions · 2026-03-02T21:29:58Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-48750b6-8beecd5-657aef86e7a14e2c19a6fe4e96dbdb636987a865/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-48750b6-8beecd5-c4b8a017ffae572d07b4c2a4c2577f5d99e54a77/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-02T21:31:41Z

✋ 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-02T23:02:17Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.28-0 🚀

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

OSBotify · 2026-03-04T03:17:05Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.30-0 🚀

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

OSBotify · 2026-03-04T18:07:26Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

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

koko57 added 2 commits February 19, 2026 12:32

fix: country fallback

6e1ca40

fix: navigate back after resetting the account

8f42e5b

melvin-bot bot assigned koko57 Feb 19, 2026

fix: prettier

fa0cb2c

fix: add condition for admin, fix eslint

6422746

koko57 marked this pull request as ready for review February 19, 2026 17:29

koko57 requested review from a team as code owners February 19, 2026 17:29

melvin-bot bot requested review from dominictb and heyjennahay and removed request for a team February 19, 2026 17:29

melvin-bot bot removed the request for review from a team February 19, 2026 17:29

joekaufmanexpensify requested review from joekaufmanexpensify and removed request for heyjennahay February 19, 2026 17:33

github-actions bot reviewed Feb 19, 2026

View reviewed changes

src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

fix: apply suggested changes

0bec559

fix: prettier

01f5db6

joekaufmanexpensify previously approved these changes Feb 20, 2026

View reviewed changes

fix: resolve conflicts

3228044

koko57 dismissed joekaufmanexpensify’s stale review via 3228044 February 23, 2026 08:30

Merge branch 'main' into fix/82581-blank-country-field

f5fde92

dominictb reviewed Feb 24, 2026

View reviewed changes

koko57 added 2 commits February 24, 2026 16:03

Merge branch 'main' into fix/82581-blank-country-field

7b01f3e

fix: apply requested changes

336bf3b

fix: fix currency problem for non-USD flow

a7d20da

fix: resolve conflicts

92c8c17

koko57 requested a review from dominictb February 26, 2026 16:29

fix: do not allow user to change the country when bank account created

4177b5f

koko57 added 2 commits February 27, 2026 18:19

fix: prettier

f555d68

fix: lint

4181753

dominictb approved these changes Mar 2, 2026

View reviewed changes

joekaufmanexpensify requested a review from srikarparsi March 2, 2026 13:23

srikarparsi approved these changes Mar 2, 2026

View reviewed changes

srikarparsi merged commit 48750b6 into Expensify:main Mar 2, 2026
30 checks passed

OSBotify mentioned this pull request Mar 2, 2026

Deploy Checklist: New Expensify 2026-03-02 #83947

Closed

	/** Method to navigate back after resetting bank account from wallet */
	/** Method to navigate after resetting bank account */

Conversation

koko57 commented Feb 19, 2026 • 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 Feb 19, 2026 • 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 Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

Uh oh!

This comment has been minimized.

github-actions bot commented Feb 20, 2026

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

joekaufmanexpensify commented Feb 20, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Feb 20, 2026

Uh oh!

koko57 commented Feb 23, 2026

Uh oh!

dominictb Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

dominictb Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

dominictb Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

dominictb Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

koko57 Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

koko57 commented Feb 25, 2026

Uh oh!

koko57 commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Feb 27, 2026

Uh oh!

koko57 commented Feb 27, 2026

Uh oh!

dominictb commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Feb 27, 2026

Uh oh!

koko57 commented Feb 27, 2026

Uh oh!

koko57 commented Feb 28, 2026

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Mar 2, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 2, 2026

Uh oh!

koko57 commented Feb 19, 2026 •

edited

Loading

codecov bot commented Feb 19, 2026 •

edited by github-actions bot

Loading

koko57 commented Feb 26, 2026 •

edited

Loading

dominictb commented Feb 27, 2026 •

edited

Loading

dominictb commented Feb 27, 2026 •

edited

Loading