Block currency changes when workspace has partially setup bank account by MelvinBot · Pull Request #86075 · Expensify/App

MelvinBot · 2026-03-23T05:41:59Z

Explanation of Change

When a workspace has a non-US bank account that is only partially set up (via the Corpay flow), the backend correctly rejects currency changes with error "You cannot change the currency because this policy is linked to a business bank account." However, the frontend was not blocking the currency field, allowing users to attempt a change that would silently revert.

This PR uses the existing doesPolicyHavePartiallySetupBankAccount utility to also disable the currency field and block the currency selection page when the workspace has a partially-setup bank account (state is SETUP, VERIFYING, or PENDING).

Changes:

WorkspaceOverviewCurrencyPage.tsx: Block the page via AccessOrNotFoundWrapper when a partially-setup bank account exists for the policy
WorkspaceOverviewPage.tsx: Disable the currency menu item (hide right icon, disable interaction, show disabled hint text) when a partially-setup bank account exists

Fixed Issues

$ #84535
PROPOSAL: #84535 (comment)

Tests

Log in with a new account
Create a new workspace and set its primary currency to "AUD"
Navigate to Workspace settings > Workflows > Add bank account > Connect manually
Proceed through the bank account connection flow until Step 3: Business Information
Enter random business name, website, and registration number
Click outside the RHP to close or exit the "Connect Bank Account" flow
Navigate to "Workspace Overview"
Verify the currency field is disabled (no right arrow icon, not interactive, shows hint text "Your workspace currency is AUD")
Try navigating directly to the currency page via deep link
Verify the currency page is blocked (shows not found view)

Verify that no errors appear in the JS console

Offline tests

Follow steps 1-7 above to create a workspace with a partially-setup bank account
Go offline
Navigate to Workspace Overview
Verify the currency field remains disabled while offline

QA Steps

Log in with a new account that does not have any bank account already added
Create a new workspace and set its primary currency to "AUD"
Navigate to Workspace settings > Workflows > Add bank account > Connect manually
Proceed through the bank account connection flow until Step 3: Business Information
Enter random details for all fields
Click outside the RHP to close or exit the "Connect Bank Account" flow
Navigate to "Workspace Overview"
Verify the currency field is disabled and shows "Your workspace currency is AUD"
Verify you cannot navigate to the currency selection page

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

…ccount When a non-US bank account is partially set up via the Corpay flow, the backend correctly rejects currency changes. The frontend now also blocks currency changes in the UI by checking for partially setup bank accounts using the existing doesPolicyHavePartiallySetupBankAccount utility. Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-23T05:44:53Z

Fixed the failing ESLint check: replaced policy?.id ?? '' and policyID ?? '' with guarded calls (\!\!policy?.id && ... / \!\!policyID && ...) to avoid defaulting string IDs to empty strings, which violates the no-default-id-values lint rule.

MelvinBot · 2026-03-23T05:54:00Z

The failing check (test job 8) is unrelated to this PR's changes.

Analysis: The job failed during the "Set up job" phase while downloading GitHub Actions dependencies (SimenB/github-actions-cpu-cores and 1Password/load-secrets-action). The errors are network-level: "Error while copying content to a stream" and "An error occurred while sending the request." No test code was ever executed.

Evidence: This is a transient GitHub Actions infrastructure/network issue. Re-running the failed job should resolve it.

MelvinBot · 2026-03-23T06:14:21Z

The failing checks are unrelated to this PR's code changes.

build (New Expensify Dev, DebugDevelopment, false): Failed in the "Rock Remote Build - iOS" step. The remote cache was missing (NoSuchKey), and the fallback from-scratch compilation appears to have timed out after 25+ minutes during iOS Pod compilation (Airship, RCT-Folly). This PR only modifies two TypeScript files (WorkspaceOverviewCurrencyPage.tsx and WorkspaceOverviewPage.tsx) — no native/iOS code was changed.

test (job 8): Failed during "Set up job" while downloading GitHub Actions dependencies (1Password/load-secrets-action) with network errors (Error while copying content to a stream). This is a GitHub Actions infrastructure flake — no test code was executed.

Re-running these checks should resolve both failures.

bernhardoj · 2026-03-23T07:11:37Z

@MelvinBot since the logic is duplicated, let's refactor the logic into a hook for the shouldBlockCurrencyChange

Extract the duplicated shouldBlockCurrencyChange logic from WorkspaceOverviewCurrencyPage and WorkspaceOverviewPage into a new useShouldBlockCurrencyChange hook. Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-23T07:21:17Z

Refactored the duplicated shouldBlockCurrencyChange logic into a new useShouldBlockCurrencyChange hook (src/hooks/useShouldBlockCurrencyChange.ts).

The hook encapsulates:

Fetching hasVBA from ONYXKEYS.REIMBURSEMENT_ACCOUNT
Fetching bankAccountList from ONYXKEYS.BANK_ACCOUNT_LIST
Computing hasPartiallySetupBankAccount via doesPolicyHavePartiallySetupBankAccount
Returning the combined hasVBA || hasPartiallySetupBankAccount boolean

Both WorkspaceOverviewCurrencyPage and WorkspaceOverviewPage now use useShouldBlockCurrencyChange(policyID) instead of duplicating the logic.

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-23T07:23:16Z

Fixed the failing Prettier check: sorted the useShouldBlockCurrencyChange import alphabetically in WorkspaceOverviewPage.tsx.

codecov · 2026-03-23T07:30:47Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/pages/workspace/WorkspacePageWithSections.tsx	`72.85% <100.00%> (-0.76%)`	⬇️
...pages/workspace/invoices/WorkspaceInvoicesPage.tsx	`0.00% <0.00%> (ø)`
.../pages/workspace/WorkspaceOverviewCurrencyPage.tsx	`0.00% <0.00%> (ø)`
src/hooks/useShouldBlockCurrencyChange.ts	`0.00% <0.00%> (ø)`
src/pages/workspace/WorkspaceOverviewPage.tsx	`0.00% <0.00%> (ø)`
... and 28 files with indirect coverage changes

bernhardoj · 2026-03-23T07:31:07Z

@MelvinBot since hasVBA from WorkspacePageWithSections is not being used anywhere, let's remove it.

The hasVBA parameter is no longer consumed by any child component after the shouldBlockCurrencyChange hook refactor. Remove it from the children type signature, computation, and the one remaining consumer (WorkspaceInvoicesPage). Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-23T07:35:36Z

Removed the unused hasVBA render prop from WorkspacePageWithSections:

Removed hasVBA and achState computation from WorkspacePageWithSections.tsx
Updated the children type signature from (hasVBA, policyID, isUsingECard) to (policyID, isUsingECard)
Updated WorkspaceInvoicesPage.tsx which was the only consumer still accepting (but not using) the _hasVBA parameter

bernhardoj · 2026-03-23T07:37:01Z

src/pages/workspace/WorkspaceOverviewPage.tsx

            modals={modals}
        >
-            {(hasVBA?: boolean) => (
+            {() => (


@MelvinBot I think we can remove the function style here (line 559). We can just render the component directly

Now that hasVBA is no longer consumed from the render prop, render the children directly instead of using function style. Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-23T07:39:23Z

Removed the function-style render prop wrapper. Since hasVBA is no longer consumed from WorkspacePageWithSections, the children are now rendered directly as JSX instead of through a function callback.

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-23T07:42:01Z

Fixed the failing Prettier check: the children inside the <View> component in WorkspaceOverviewPage.tsx had incorrect indentation (4 extra spaces). Ran Prettier to fix the formatting.

MelvinBot · 2026-03-23T08:08:41Z

The failing check (build (New Expensify Dev, DebugDevelopment, false)) is unrelated to this PR.

Analysis: This is a Remote Build iOS (xcodebuild) failure, but this PR only modifies TypeScript files:

src/hooks/useShouldBlockCurrencyChange.ts
src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx
src/pages/workspace/WorkspaceOverviewPage.tsx
src/pages/workspace/WorkspacePageWithSections.tsx
src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx

TypeScript files are bundled by Metro, not compiled by xcodebuild. The native iOS build failure cannot be caused by these changes.

Evidence: The same Remote Build iOS workflow is also failing on other unrelated branches (claude-fixCreateReportWorkspaceDisplay, claude-autoCreateWorkspaceForTrackSignups), and even on a currently-running main branch build. This appears to be an intermittent infrastructure/build environment issue.

bernhardoj · 2026-03-23T08:09:29Z

@MelvinBot Mark this PR as ready

melvin-bot · 2026-03-23T08:12:00Z

@bernhardoj 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-23T15:13:22Z

The failing check (build (New Expensify Dev, DebugDevelopment, false)) is unrelated to this PR's changes.

Analysis: The iOS build fails with Swift compilation errors in ios/AppDelegate.swift:

error: ambiguous implicit access level for import of 'ExpoModulesCore'; it is imported as 'internal' elsewhere
error: ambiguous implicit access level for import of 'Expo'; it is imported as 'internal' elsewhere

Evidence: This PR only modifies TypeScript files (WorkspaceOverviewCurrencyPage.tsx, WorkspaceOverviewPage.tsx, WorkspacePageWithSections.tsx, WorkspaceInvoicesPage.tsx, and useShouldBlockCurrencyChange.ts). The error is in native iOS Swift code that this PR does not touch. All other recent Remote Build iOS runs (including on main) are passing, indicating this is a transient/flaky build failure.

Recommendation: Re-run the failing check.

joekaufmanexpensify

@bernhardoj there are no screenshots/videos in the PR, is Melvin supposed to add them?

MelvinBot · 2026-03-23T18:08:14Z

The failing check (build (New Expensify Dev, DebugDevelopment, false)) is unrelated to this PR's changes.

Analysis: The failure is in the Rock Remote Build - iOS step, which is a native iOS build infrastructure issue. This PR only modifies TypeScript files (useShouldBlockCurrencyChange.ts, WorkspaceOverviewCurrencyPage.tsx, WorkspaceOverviewPage.tsx, WorkspacePageWithSections.tsx, WorkspaceInvoicesPage.tsx), none of which affect the native iOS build.

Evidence: The same Build and deploy apps for testing workflow is consistently failing on main as well, with iOS build failures. All other checks on this PR (ESLint, TypeScript, tests, other builds) pass.

bernhardoj · 2026-03-24T02:55:10Z

@joekaufmanexpensify I don't think Melvin can add them

nkuoch · 2026-03-25T16:33:52Z

@MelvinBot can you merge main into this branch?

MelvinBot · 2026-03-25T16:36:21Z

I can only make code changes when directed by the PR author, an assignee, or an existing co-author. To have me merge main into this branch, the PR assignee (bernhardoj) should reply with a request tagging me.

MelvinBot · 2026-03-25T16:37:07Z

The failing check is unrelated to this PR.

Failing check: build (New Expensify Dev, DebugDevelopment, false) — the Rock Remote Build - iOS step failed after ~25 minutes.

Analysis: This PR only modifies TypeScript files (useShouldBlockCurrencyChange.ts, WorkspaceOverviewCurrencyPage.tsx, WorkspaceOverviewPage.tsx, WorkspacePageWithSections.tsx, WorkspaceInvoicesPage.tsx) — no iOS native code, Podfile changes, or anything that could affect the iOS build.

Evidence: The same Build and deploy apps for testing workflow has recent failures on main as well (e.g. runs from 2026-03-25 03:00 UTC, 03:12 UTC, 2026-03-24 21:17 UTC), confirming this is a flaky infrastructure issue with the remote iOS build service, not caused by this PR's changes.

Re-running the failed check should resolve this.

joekaufmanexpensify · 2026-03-25T21:16:28Z

@bernhardoj Could you add them then? I am interested to understand more about what this change will look like.

bernhardoj · 2026-03-26T03:32:39Z

@joekaufmanexpensify I put the rec on my checklist. Here is the rec:

web.16.10.53.mp4

joekaufmanexpensify

Looks good to me 👍

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-03-31T16:17:16Z

Fixed the failing perf-tests check. The issue was a duplicate reportActions variable declaration in src/components/LHNOptionsList/OptionRowLHNData.tsx — a pre-existing problem on main introduced by the merge of PR #86644. The duplicate caused Babel to fail parsing the file, which broke the ReportActionsList and SidebarLinks perf tests. Removed the redundant second declaration.

nkuoch · 2026-04-01T08:14:43Z

@bernhardoj can you merge main to handle the conflict?

bernhardoj · 2026-04-01T10:30:58Z

@MelvinBot please merge with main branch and resolve the conflict

…olve conflict Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot · 2026-04-01T10:38:01Z

Merged main into this branch and resolved the conflict in src/components/LHNOptionsList/OptionRowLHNData.tsx.

Conflict details: main added a new fullReportActions hook (useOnyx keyed by fullReport?.reportID) which is used by getOptionData. The PR branch didn't have this line. Resolved by accepting the addition from main.

bernhardoj · 2026-04-01T10:45:00Z

@nkuoch done

github-actions · 2026-04-01T11:00:29Z

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

github-actions · 2026-04-01T11:05:12Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ae84527-38ead1b-920a3eb4506bafbac5fe356bcaffdced6176e7fb/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ae84527-38ead1b-8867e13a518ff43d1003ec29f7219e5b4f31798a/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-01T11:08:42Z

✋ 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-04-02T20:19:44Z

🚀 Deployed to staging by https://github.com/nkuoch in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-02T20:22:23Z

No help site changes are required for this PR.

Why:

This PR extends an existing currency-lock behavior (previously triggered only by a fully verified bank account) to also cover partially-setup bank accounts. The UI hint text is unchanged — "The default currency can't be changed because this workspace is linked to a [currency] bank account." — and already describes the restriction accurately for both cases.

The relevant help site articles are unaffected:

Create a company workspace — mentions setting currency during initial workspace creation, which still works fine (currency is only locked after a bank account setup begins).
Connect a Business Bank Account — doesn't mention currency, and adding a note about this restriction would be out of scope for a bank-account-setup guide.
Set Currency (Classic) — Expensify Classic only, not affected.

There is no standalone New Expensify article for changing workspace currency. The in-app hint text adequately explains the restriction to users who encounter it.

OSBotify · 2026-04-07T01:10:40Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀

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

MelvinBot assigned bernhardoj Mar 23, 2026

MelvinBot requested a review from a team March 23, 2026 05:42

MelvinBot mentioned this pull request Mar 23, 2026

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

Open

7 tasks

Fix: guard policyID instead of defaulting to empty string

735650e

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

Fix: sort imports to satisfy Prettier check

c53ae0a

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

bernhardoj reviewed Mar 23, 2026

View reviewed changes

Remove render prop wrapper from WorkspacePageWithSections children

f4dc06c

Now that hasVBA is no longer consumed from the render prop, render the children directly instead of using function style. Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

Fix: run Prettier on WorkspaceOverviewPage.tsx

77bb690

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot marked this pull request as ready for review March 23, 2026 08:11

MelvinBot requested a review from a team as a code owner March 23, 2026 08:11

melvin-bot bot requested review from bernhardoj and joekaufmanexpensify and removed request for a team March 23, 2026 08:11

joekaufmanexpensify requested changes Mar 23, 2026

View reviewed changes

joekaufmanexpensify previously approved these changes Mar 26, 2026

View reviewed changes

nkuoch and others added 2 commits March 31, 2026 17:57

Merge branch 'main' into claude-fixCurrencyBlockWithPartialBankAccount

44db208

Fix: Remove duplicate reportActions declaration after merge with main

9e635c5

Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

MelvinBot dismissed joekaufmanexpensify’s stale review via 9e635c5 March 31, 2026 16:17

Merge main into claude-fixCurrencyBlockWithPartialBankAccount and res…

a1d0232

…olve conflict Co-authored-by: Bernhard Owen Josephus <bernhardoj@users.noreply.github.com>

nkuoch approved these changes Apr 1, 2026

View reviewed changes

nkuoch merged commit ae84527 into main Apr 1, 2026
35 checks passed

nkuoch deleted the claude-fixCurrencyBlockWithPartialBankAccount branch April 1, 2026 10:59

OSBotify mentioned this pull request Apr 2, 2026

Deploy Checklist: New Expensify 2026-04-02 #86989

Closed

mitarachim mentioned this pull request Apr 3, 2026

BA-Red dot appears near Overview when changing currency offline with partially added non-US BA #87067

Open

7 tasks

Conversation

MelvinBot commented Mar 23, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

bernhardoj commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

codecov bot commented Mar 23, 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!

bernhardoj commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

bernhardoj Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

bernhardoj commented Mar 23, 2026

Uh oh!

melvin-bot bot commented Mar 23, 2026

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 23, 2026

Uh oh!

bernhardoj commented Mar 24, 2026

Uh oh!

nkuoch commented Mar 25, 2026

Uh oh!

MelvinBot commented Mar 25, 2026

Uh oh!

MelvinBot commented Mar 25, 2026

Uh oh!

joekaufmanexpensify commented Mar 25, 2026

Uh oh!

bernhardoj commented Mar 26, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 31, 2026

Uh oh!

nkuoch commented Apr 1, 2026

Uh oh!

bernhardoj commented Apr 1, 2026

Uh oh!

MelvinBot commented Apr 1, 2026

Uh oh!

bernhardoj commented Apr 1, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

codecov bot commented Mar 23, 2026 •

edited by github-actions bot

Loading