[Due for payment 2026-04-14] [$250] Bank account- Unable to update currency in overview when WS has partially added non-US bank account

[jponikarchuk]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: v9.3.33-1
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from BrowserStack: https://test-management.browserstack.com/projects/2219752/test-runs/TR-7802/folder/13176691/41236748/1233304337
Email or phone of affected tester (no customers): applausetester+ck3726@applause.expensifail.com
Issue reported by: Applause Internal Team
Bug source: Regression TC Execution
Device used: Windows 11/Chrome, iPhone 16/iOS 18.7.1
App Component: Workspace Settings

Action Performed:

1. Navigate to staging.new.expensify.com
2. Log in with new expensifail account (that does not have any bank account already added)
3. Create a new workspace
4. Set its primary currency to "AUD"
5. Navigate to Workspace settings > Workflows > Add bank account > Connect manually
6. Proceed through the bank account connection flow until you reach Step 3: Business Information (Enter random details for all the fields for step 1 and 2 which does not trigger error)
7. Enter random business name and website
8. Enter 24 302 976 253 as business registration number >> Click Next
9. Enter 24 302 976 253 as "ABN" >> Click Next
10. Click outside the RHP to close or exit the "Connect Bank Account" flow
11. Navigate to "Workspace Overview"
12. Update the currency either to "CAD", "EUR" or "GBP"

Expected Result:

User able to update currency in overview when WS has partially added non-US bank account

Actual Result:

Unable to update currency in overview when WS has partially added non-US bank account

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari

Screenshots/Videos

1.mp4

View all open jobs on GitHub

Issue Owner

Current Issue Owner: @mallenexpensify

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022030910418863443411
• Upwork Job ID: 2030910418863443411
• Last Price Increase: 2026-03-16

[melvin-bot]

Triggered auto assignment to @dylanexpensify (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[MelvinBot]

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a user creates a workspace with a non-USD currency (e.g., AUD), starts connecting a bank account manually via the Corpay (non-USD) flow, partially completes the setup (through Business Info steps), then exits the flow — they are unable to update the workspace currency afterward.

What is the root cause of that problem?

There are two layers of currency-change protection in the frontend, and the blocking depends on what the backend returns after a Corpay bank account is created:

Frontend blocking mechanism: The currency field on WorkspaceOverviewPage is made non-interactive when hasVBA is true (WorkspaceOverviewPage.tsx:682-683). The WorkspaceOverviewCurrencyPage is also fully blocked via AccessOrNotFoundWrapper when hasVBA is true (WorkspaceOverviewCurrencyPage.tsx:68). hasVBA is computed as achState === CONST.BANK_ACCOUNT.STATE.OPEN at WorkspacePageWithSections.tsx:148-150, where achState = policy?.achAccount?.state ?? reimbursementAccount?.achData?.state.

What happens during partial Corpay setup: At the BankInfo step (step 2 of the non-USD flow), createCorpayBankAccount() (BankAccounts.ts:658-703) creates a bank account record on the server via BankAccount_CreateCorpay. When the user exits, clearReimbursementAccount() resets local state, but the server-side record persists. When the user returns to the workspace overview, openWorkspaceView() (BankAccounts.ts:1191-1227) re-fetches the data including policy.achAccount and reimbursementAccount.achData from the server.

The root cause is that the backend likely sets policy.achAccount.state or reimbursementAccount.achData.state to 'OPEN' after BankAccount_CreateCorpay succeeds — even though the onboarding/KYC steps are incomplete. Since the frontend checks achState === 'OPEN' to determine hasVBA, the currency field becomes non-interactive and the currency page is blocked entirely.

Additionally, there is a confirmed error display bug: if the user somehow bypasses the UI blocking (e.g., deep link) and the backend rejects the currency change, the error is set on errorFields.outputCurrency (Policy.ts:1907-1908) but the OfflineWithFeedback wrapper reads errorFields.generalSettings (WorkspaceOverviewPage.tsx:668), so the error is never displayed to the user.

What changes do you think we should make in order to solve the problem?

1. Fix the hasVBA check to account for partially-setup bank accounts: In WorkspacePageWithSections.tsx:150 and WorkspaceOverviewCurrencyPage.tsx:33, modify the hasVBA logic to also check that the bank account onboarding is complete — not just that state === 'OPEN'. This could use a condition similar to how isBankAccountPartiallySetup() in BankAccountUtils.ts:14-16 distinguishes partial states. Specifically, for non-USD (Corpay) bank accounts, the currency should remain editable while the bank account onboarding steps (Business Info, Beneficial Owner, Signer Info, Agreements) are not yet completed. The exact condition depends on what field the backend uses to indicate onboarding completion (likely checking if the Corpay onboarding steps are finished, e.g., achData.isCorpayOnboardingComplete or similar).

2. Fix the error field mismatch: In Policy.ts, the failureData for updateGeneralSettings should set errorFields.generalSettings (matching CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS) instead of errorFields.outputCurrency, so that the OfflineWithFeedback wrapper on WorkspaceOverviewPage.tsx:668 can actually display the error to the user.

What alternative solutions did you explore? (Optional)

• Backend-only fix: Change the backend so BankAccount_CreateCorpay does not set policy.achAccount.state to 'OPEN' until all onboarding steps are finished. This would fix the issue without frontend changes, but the frontend error field mismatch should still be fixed regardless.
• Allow currency changes with a confirmation dialog: Instead of blocking currency changes when a bank account exists, show a confirmation warning that changing currency may require re-connecting the bank account. This gives users more control but adds complexity.

---

Next Steps for Contributor+ team: Reply with @MelvinBot implement this to create a draft PR, @MelvinBot <your feedback> to refine this analysis, or explain why you are rejecting Melvin's proposal.

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @bernhardoj (External)

[melvin-bot]

Job added to Upwork: https://www.upwork.com/jobs/~022030910418863443411

[mukhrr]

🚨 Edited by proposal-police: This proposal was edited at 2026-03-09 08:22:52 UTC.

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a user creates a workspace with a non-US currency (e.g., AUD), partially completes the non-US bank account connection flow (Corpay), and then exits the flow, they are unable to change the workspace currency from the Workspace Overview page. Selecting a new currency (e.g., CAD, EUR, GBP) triggers an optimistic update that immediately reverts because the server rejects the change.

What is the root cause of that problem?

When the user selects a new currency in the Workspace Overview, onSelectCurrency calls updateGeneralSettings which sends the UpdateWorkspaceGeneralSettings command to the server. The server validates the request and rejects it with error code 666: "You cannot change the currency because this policy is linked to a business bank account."

App/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx

Lines 42 to 48 in 43a57cf

	const onSelectCurrency = (item: CurrencyListItem) => {
	if (!policy) {
	return;
	}
	clearDraftValues(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM);
	updateGeneralSettings(policy, policy?.name ?? '', item.currencyCode);
	clearCorpayBankAccountFields();

The partially set up non-US bank account (created through the Corpay flow) is linked to the policy on the server side. Even though the bank account onboarding is incomplete, the server treats it as a linked bank account and blocks the currency change. The client-side code does not account for this — it calls updateGeneralSettings without first removing the partially set up bank account.

What changes do you think we should make in order to solve the problem?

1. In WorkspaceOverviewCurrencyPage.tsx, before calling updateGeneralSettings, check if the policy has a partially set up bank account using the existing doesPolicyHavePartiallySetupBankAccount utility. If it does, call resetNonUSDBankAccount first to unlink and reset it. Since both are WRITE commands, they are queued sequentially — the bank account reset is processed by the server before the currency update, allowing the currency change to succeed.
   

   App/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx

   Lines 42 to 48 in 43a57cf

   	const onSelectCurrency = (item: CurrencyListItem) => {
   	if (!policy) {
   	return;
   	}
   	clearDraftValues(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM);
   	updateGeneralSettings(policy, policy?.name ?? '', item.currencyCode);
   	clearCorpayBankAccountFields();

--- a/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx
+++ b/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx
@@ -8,6 +8,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {doesPolicyHavePartiallySetupBankAccount} from '@libs/BankAccountUtils';
 import Navigation from '@libs/Navigation/Navigation';
 ...
 import {clearCorpayBankAccountFields} from '@userActions/BankAccounts';
 import {clearDraftValues} from '@userActions/FormActions';
 import {isCurrencySupportedForGlobalReimbursement, updateGeneralSettings} from '@userActions/Policy/Policy';
-import {navigateToBankAccountRoute} from '@userActions/ReimbursementAccount';
+import {navigateToBankAccountRoute, resetNonUSDBankAccount} from '@userActions/ReimbursementAccount';
 ...

     const [hasVBA = false] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {selector: hasVBASelector});
+    const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const hasPartiallySetupBankAccount = doesPolicyHavePartiallySetupBankAccount(bankAccountList, policy?.id ?? '');

     const onSelectCurrency = (item: CurrencyListItem) => {
         if (!policy) {
             return;
         }
+
+        // If the policy has a partially set up bank account, reset it first
+        // so the server won't reject the currency change
+        if (hasPartiallySetupBankAccount) {
+            resetNonUSDBankAccount(policy.id, policy.achAccount, reimbursementAccount?.achData?.bankAccountID);
+        }
+
         clearDraftValues(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM);
         updateGeneralSettings(policy, policy?.name ?? '', item.currencyCode);

This leverages the existing resetNonUSDBankAccount action (which sends RESTART_BANK_ACCOUNT_SETUP to the server) and the existing doesPolicyHavePartiallySetupBankAccount utility that checks the bankAccountList for accounts linked to the policy with SETUP, VERIFYING, or PENDING states. No new utilities or server-side changes are needed.

[thelullabyy]

Proposal

Please re-state the problem that we are trying to solve in this issue.

Unable to update currency in overview when WS has partially added non-US bank account

What is the root cause of that problem?

The backend returns this error when changing the currency while the bank account setup is in progress

You cannot change the currency because this policy is linked to a business bank account.

If the backend is expected, this bug is a front-end bug since we're only disable the currency if the bank account setup is complete based on this condition

App/src/pages/workspace/WorkspacePageWithSections.tsx

Line 150 in 8d27026

const hasVBA = achState === CONST.BANK_ACCOUNT.STATE.OPEN;

What changes do you think we should make in order to solve the problem?

We should update hasVBA to also return true if the bank account is in progess. To check the bank account setup is in progress, we can use hasInProgressVBBA function

const hasInProgressVBBA = hasInProgressVBBAUtils(reimbursementAccount?.achData, policy?.outputCurrency !== CONST.CURRENCY.USD, policyID);
    const hasVBA = hasInProgressVBBA || achState === CONST.BANK_ACCOUNT.STATE.OPEN;

App/src/pages/workspace/WorkspacePageWithSections.tsx

Line 150 in 8d27026

const hasVBA = achState === CONST.BANK_ACCOUNT.STATE.OPEN;

We also need to update the same with the condition on WorkspaceOverviewCurrencyPage

App/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx

Line 33 in 8d27026

const hasVBASelector = (reimbursementAccount: OnyxEntry<ReimbursementAccount>) => reimbursementAccount?.achData?.state === CONST.BANK_ACCOUNT.STATE.OPEN;

What alternative solutions did you explore? (Optional)

We can return a separate variable hasInProgressVBBA in WorkspacePageWithSections and in the children component, get this variable and also block currency section when hasInProgressVBBA is true

App/src/pages/workspace/WorkspaceOverviewPage.tsx

Line 682 in 8d27026

shouldShowRightIcon={hasVBA ? false : !currencyReadOnly}

Reminder: Please use plain English, be brief and avoid jargon. Feel free to use images, charts or pseudo-code if necessary. Do not post large multi-line diffs or write walls of text. Do not create PRs unless you have been hired for this job.

[genesis-ai-labs-star]

I can take this. I reproduced locally and will work on a fix + PR today. (Tracking: repro log /Users/genesis/.openclaw/workspace/ops/repros/expensify-jest-duplicate-manual-mock-20260309-0412.txt)