Fix add business bank account opens personal bank account flow in invoice room #75530

bernhardoj · 2025-11-19T11:31:12Z

Explanation of Change

In invoice room, when we choose Pay as business > Add bank account, it'll open the add personal bank account page. This PR navigates the user to the correct add business bank account page.

Fixed Issues

$ #73763
PROPOSAL: #73763 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Main test:
Prerequisite: Account B has a default workspace (as admin) and the WS currency is USD

Submit an invoice from account A to account B
Log in to account B
Go to the invoice
Tap Pay > pay as business
Tap Add bank account
Verify the add business bank account page is open

Another case:

Case 1, Account B has no default workspace (as admin), user currency not USD
Case 2, Account B has a default workspace (as admin), both workspace and user currency are not USD

Submit an invoice (from global create) from account A to account B
Log in to account B
Go to the invoice
Tap Pay > pay as business
Verify Add bank account option is not available

Case 3, Account B has no default workspace (as admin), user currency is USD
Case 4, Account B has a default workspace (as admin), WS currency is not USD, but user currency is USD.

Submit an invoice (from global create) from account A to account B
Log in to account B
Go to the invoice
Tap Pay > pay as business
Verify Add bank account option is shown
Press Add bank account
Verify the add business bank account page is open
Verify a new workspace is created

Case 5, invoice room with business type, Account B has a default workspace (as admin) and the WS currency is USD

Submit an invoice (from global create) from account A to account B
Log in to account B
Go to the invoice
Tap Pay > pay as business
Choose mark as paid
As account A, open the invoice room and send another invoice from the composer + button
As account B, change the WS currency to other than USD
Open the newly sent invoice report
Tap Pay > pay as business
Verify Add bank account option isn't available

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2025-11-19T11:31:19Z

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

src/components/SettlementButton/index.tsx

github-actions · 2025-11-19T11:34:49Z

src/components/SettlementButton/index.tsx

+            const isInvoiceReceiverPolicyCurrencySupported = isCurrencySupportedForDirectReimbursement(invoiceReceiverPolicy?.outputCurrency ?? '');
+
+            const canUseActivePolicy = hasActivePolicyAsAdmin && isActivePolicyCurrencySupported;
+            const isPolicyCurrencySupported = invoiceReceiverPolicy ? isInvoiceReceiverPolicyCurrencySupported : canUseActivePolicy || isUserCurrencySupported;


❌ Missing Error Handling

The createWorkspace() function is called within a click handler without any error handling or loading state management.

Why this matters:

Workspace creation is an async operation that can fail (network issues, server errors, etc.)

Users get no feedback while the workspace is being created

If creation fails, navigation to navigateToBankAccountRoute(policyID) may use an invalid policyID

Suggested fix: Add proper async handling:

onSelected: async () => { if (payAsBusiness) { if (chatReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS) { navigateToBankAccountRoute(chatReport?.invoiceReceiver?.policyID); } else { if (!canUseActivePolicy) { try { const {policyID} = await createWorkspace(); navigateToBankAccountRoute(policyID); } catch (error) { // Handle error appropriately console.error('Failed to create workspace:', error); } } else { navigateToBankAccountRoute(activePolicy.id); } } } else { Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route); } },

Check if createWorkspace() returns a promise and handle it appropriately.

@bernhardoj Can you check this comment?

I left this unresolved since I'm not sure how to handle this. We create the workspace optimistically and navigate to the bank account page. Should we show not found page if the workspace is failed to be created?

App/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

Lines 426 to 435 in cb4506d

if ((!isLoading && (isEmptyObject(policy) || !isPolicyAdmin(policy))) || isPendingDeletePolicy(policy)) {

return (

<ScreenWrapper testID={ReimbursementAccountPage.displayName}>

<FullPageNotFoundView

shouldShow

onBackButtonPress={goBackFromInvalidPolicy}

onLinkPress={goBackFromInvalidPolicy}

subtitleKey={isEmptyObject(policy) || isPendingDeletePolicy(policy) ? undefined : 'workspace.common.notAuthorized'}

/>

</ScreenWrapper>

codecov · 2025-11-19T11:42:09Z

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/components/SettlementButton/index.tsx	`0.36% <0.00%> (-0.03%)`	⬇️
... and 180 files with indirect coverage changes

bernhardoj · 2025-11-19T11:42:19Z

Recording of the other cases:

Case 1:

1.mp4

Case 2:

2.mp4

Case 3:

4.mp4

Case 4:

3.mp4

Case 5:

5.mp4

…rsonal-bank-account-flow

heyjennahay

No concern with product change

mananjadhav · 2025-11-23T19:46:31Z

Reviewed the code, but requires more testing. @bernhardoj Can you please resolve conflicts?

…rsonal-bank-account-flow

bernhardoj · 2025-11-24T01:48:42Z

Fixed the conflict

mananjadhav · 2025-11-30T23:22:34Z

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

android-business-account-flow.mov

Android: mWeb Chrome

mweb-chrome-business-account-flow.mov

iOS: HybridApp

ios-business-account-flow.mov

iOS: mWeb Safari

mweb-safari-business-account-flow.mov

MacOS: Chrome / Safari

web-business-account-flow.mov

mananjadhav · 2025-11-30T23:23:34Z

@bernhardoj Can you please resolve the conflicts?

…rsonal-bank-account-flow

bernhardoj · 2025-12-01T03:22:50Z

@mananjadhav fixed

bernhardoj added 2 commits November 19, 2025 18:40

fix add (business) bank account opens personal bank account flow

dfd5cc9

hide Add bank account if the currency is not supported

a329868

bernhardoj requested review from a team as code owners November 19, 2025 11:31

melvin-bot bot assigned bernhardoj Nov 19, 2025

melvin-bot bot requested review from mananjadhav and removed request for a team November 19, 2025 11:31

melvin-bot bot requested review from heyjennahay and removed request for a team November 19, 2025 11:31