fix: 65912 NIT fixes by MrMuzyk · Pull Request #79343 · Expensify/App

MrMuzyk · 2026-01-12T12:22:49Z

Explanation of Change

Fixes for multiple issues found during testing

Fixed Issues

$ #79317
$ #79318
$ #79323
$ #79252

PROPOSAL:

Tests

Same as QA steps

Verify that no errors appear in the JS console

Offline tests

QA Steps

Scenario A:

Preconditions:
Create two USD workspaces - A and B.
Workspace A is set up with business bank account.

Go to workspace chat B.
Create an expense.
Click Submit and Approve,
Go to workspace B settings > Overview.
Click Default currency and change it to MYR.
Go back to workspace chat B.
Click Pay > Pay with business account.
Page to prompt user to change default workspace currency will open.
Linked account page will not open because the workspace currency is not USD.

Scenario B:

Preconditions:
Create a USD workspace.
Create a non-USD workspace.
USD workspace is set up with business bank account.

Go to non-USD workspace chat.
Create an expense.
Click Submit and Approve,
Go to non-USD workspace settings > Overview.
Click Default currency and change it to USD.
Go back to non-USD workspace chat.
Click Pay > Pay with business account.
Linked account page will open.

Scenario C:

Precondition:
Create two USD workspaces - A and B.
Add a pending bank account to Workspace A.

Go to workspace chat B.
Create an expense.
Click Submit and Approve,
Click Pay > Pay with business account.
Click on the pending bank account.
Click RHP back button. → Linked bank account page opens.
Click Add bank account. → App opens the same Validate your bank account page.
Close the RHP.
Click Pay > Pay with business account.
After selecting pending bank account and clicking RHP back button, RHP will not return to linked bank account page because the pending bank account has become "default business bank account" (according to system message in #admins).

Scenario D:

Precondition:
User has created a USD workspace and add business bank account.

Create another USD workspace.
Go to workspace chat.
Create an expense.
Click Submit and Approve on the expense preview.
Go to Reports > Reports.
Click Pay button > Pay with business account.
→ Existing linked account is shown.
Close the RHP.
Select the report via checkbox.
Click dropdown button > Pay > Pay with business account.
Existing linked account will be shown.

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

Screen.Recording.2026-01-13.at.13.07.58.mov

nonusd65912.mp4

rhp.mp4

bulkpay.mp4

codecov · 2026-01-12T12:32:05Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/SettlementButton/index.tsx	`0.00% <ø> (ø)`
...rkspace/ConnectExistingBusinessBankAccountPage.tsx	`0.00% <ø> (ø)`
src/components/KYCWall/BaseKYCWall.tsx	`0.66% <0.00%> (ø)`
src/libs/actions/Search.ts	`20.28% <0.00%> (ø)`
.../ReimbursementAccount/ReimbursementAccountPage.tsx	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

melvin-bot · 2026-01-12T13:03:28Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7c03ea2a4d

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/libs/actions/Policy/Policy.ts

MrMuzyk · 2026-01-13T08:46:52Z

@alitoshmatov Hey, it's not yet ready for review - I will add some more fixes and tests.

We had a bunch of issues yesterday that we thought were blockers but ultimately got demoted. I thought we will want to merge it ASAP but since we have some time now I will add all the fixes here.

…2-fixes

joekaufmanexpensify · 2026-01-14T20:28:47Z

@dominictb will be reviewer here because he is the dedicated C+ reviewer for this project

github-actions · 2026-01-14T20:29:53Z

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

github-actions · 2026-01-14T20:35:26Z

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

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

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

👀 View the workflow run that generated this build 👀

…2-fixes

MrMuzyk · 2026-01-15T08:59:30Z

@dominictb Ready for your review :)

joekaufmanexpensify

Tested and all four cases work for me 👍

joekaufmanexpensify · 2026-01-26T21:58:36Z

@dominictb could you please proceed with the review here?

dominictb · 2026-01-28T07:41:24Z

BUG: reimbursementAccount data is not updated when paying

Have a workspace with partially setup BBA; and another with no BBA
Approve an expense report in the partial-BBA workspace chat

Open the non-BBA workspace > Workflows > Add bank account
Close RHP
Open the partial-BBA workspace chat > Pay > Pay with BBA
Link existing BBA page shows ❌

Open the partial-BBA workspace > Workflows > Tap the partial BBA
Close RHP
Open the partial-BBA workspace chat > Pay > Pay with BBA
Continue setting up partial BBA page shows ✅

Same issue when paying in Search page

Seems like OpenReimbursementAccountPage call is not re-fetched when ReimbursementAccountPage opens so reimbursementAccount data is stale.

Screen.Recording.2026-01-28.at.14.36.13-compressed.mov

dominictb · 2026-01-28T08:00:08Z

For #79323, I think neither the expected behavior nor the fix is complete. Other steps also have the same issue, not just ValidationStep.

I think the real issue is not about after selecting pending bank account => going back returns to linked bank account page, user can always change their mind to link to another BBA. IMO, the real issue is:

When tapping Add bank account, the progress is not reset

Once decided to add a completely new BBA, we should reset the progress; not to continue what's left with the partial BBA that was initially selected.

Screen.Recording.2026-01-28.at.14.53.33.mov

@joekaufmanexpensify might confirm here.

dominictb · 2026-01-28T07:11:42Z

src/components/KYCWall/BaseKYCWall.tsx

-
    const selectPaymentMethod = useCallback(
        (paymentMethod?: PaymentMethod, policy?: Policy) => {
+            const canLinkExistingBusinessBankAccount = getEligibleExistingBusinessBankAccounts(bankAccountList, policy?.outputCurrency, true).length > 0;


Do we need to move this into the memoized function? Can we move it outside like before?

We need the policy that comes as argument provided to selectPaymentMethod

dominictb · 2026-01-28T08:01:56Z

src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx

        if (policyID === undefined) {
            return;
        }
+


Redundant change

joekaufmanexpensify · 2026-01-28T17:44:52Z

I think the real issue is not about after selecting pending bank account => going back returns to linked bank account page, user can always change their mind to link to another BBA.

Hm, I think this is the real issue. Once you select a PENDING bank account, we shouldn't show the select acount page if you go back from the test transactions step. We should link the PENDING bank account to the workspace. You can't then add a different bank account unless you delete the pending bank account. This had been working before when I tested it on adhoc, but maybe something has changed, cc @MrMuzyk

dominictb · 2026-01-28T19:24:51Z

Thanks. @MrMuzyk If so we need to fix for other steps too (we currently only fix for VALIDATION step). Basically once linked, we can never go back to existing BBA page.

MrMuzyk · 2026-01-29T11:07:25Z

I'll look into the comments. If something changed it must've changed on BE side as PR wasn't update at all over last 2 weeks.

…2-fixes

MrMuzyk · 2026-01-29T11:56:11Z

This bug you've described has the very same cause as this one .

We've had a long chat about it and in result there will be a new field added to bankAccountList that will allow us to change how we check for connected accounts.
I believe it did arrive on staging just today so I'll revisit these issues.
Originally I was suppose do that later but this PR was waiting for review for a while now 😅

MrMuzyk · 2026-01-29T12:13:08Z

Thanks. @MrMuzyk If so we need to fix for other steps too (we currently only fix for VALIDATION step). Basically once linked, we can never go back to existing BBA page.

If account is PENDING then it should always end up on VALIDATION step afaik -> https://github.com/Expensify/App/blob/main/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx#L226

So I don't think we need a safeguard for other steps. Unless Im missing something...? 🤔

dominictb · 2026-02-01T11:22:18Z

Ah okay 👍 Got it now.

dominictb · 2026-02-01T11:23:01Z

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: mWeb Chrome

iOS: HybridApp

Screen.Recording.2026-02-01.at.18.40.38.mov

Screen.Recording.2026-02-01.at.18.41.37-compressed.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-02-01.at.18.30.12.mov

Screen.Recording.2026-02-01.at.18.33.41.mov

dominictb · 2026-02-01T11:48:50Z

Tested well.

We've had a long chat about it and in result there will be a new field added to bankAccountList that will allow us to change how we check for connected accounts.
I believe it did arrive on staging just today so I'll revisit these issues.
Originally I was suppose do that later but this PR was waiting for review for a while now 😅

@MrMuzyk Do you think we should block this PR for that backend change or would you handle that in a separate PR later? As I tested today, that bug is not fixed yet.

MrMuzyk · 2026-02-02T07:59:27Z

@MrMuzyk Do you think we should block this PR for that backend change or would you handle that in a separate PR later? As I tested today, that bug is not fixed yet.

Actually if this is already tested, approved and can get merged lets do that 🙏 I'll open a separate PR with the fix for that one last issue

MrMuzyk · 2026-02-02T12:24:53Z

@dominictb Small correction. Ive linked the wrong issue in this comment. Correct issue I wanted to link is - #79312.

Im working on separate PR which will also address this issue you've mentioned

dominictb

🎀

OSBotify · 2026-02-03T00:04:32Z

✋ 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-02-03T02:14:08Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.11-19 🚀

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

OSBotify · 2026-02-05T20:17:35Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀

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

fix: New flow briefly shown

f45b616

melvin-bot bot assigned MrMuzyk Jan 12, 2026

MrMuzyk added 2 commits January 12, 2026 13:33

fix: only connect if different

ba8a28e

fix: lint

7c03ea2

MrMuzyk marked this pull request as ready for review January 12, 2026 13:03

MrMuzyk requested review from a team as code owners January 12, 2026 13:03

melvin-bot bot requested review from alitoshmatov and joekaufmanexpensify and removed request for a team and joekaufmanexpensify January 12, 2026 13:03

melvin-bot bot removed the request for review from a team January 12, 2026 13:03

chatgpt-codex-connector bot reviewed Jan 12, 2026

View reviewed changes

src/libs/actions/Policy/Policy.ts Outdated Show resolved Hide resolved

MrMuzyk changed the title ~~fix: 65912 deploy blockers~~ fix: 65912 NIT fixes Jan 12, 2026

MrMuzyk added 7 commits January 13, 2026 09:56

Merge branch 'main' of https://github.com/Expensify/App into fix/6591…

f51fb5e

…2-fixes

fix: pass workspace currency to connect exisiting bank account screen

73da2a2

fix: rhp back button for pending acc

4f18a7f

fix: remove fix for one of the bugs and add tests

9681583

fix: bulk pay

9139240

fix: revert unstable flickering solution

a767599

fix: ts

2d89645

joekaufmanexpensify requested review from dominictb and removed request for alitoshmatov January 14, 2026 20:28

Merge branch 'main' of https://github.com/Expensify/App into fix/6591…

1772f58

…2-fixes

joekaufmanexpensify self-requested a review January 15, 2026 16:15

joekaufmanexpensify previously approved these changes Jan 15, 2026

View reviewed changes

dominictb reviewed Jan 28, 2026

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into fix/6591…

3a867ac

…2-fixes

MrMuzyk dismissed joekaufmanexpensify’s stale review via 3a867ac January 29, 2026 12:19

dominictb approved these changes Feb 2, 2026

View reviewed changes

melvin-bot bot requested a review from srikarparsi February 2, 2026 14:45

srikarparsi approved these changes Feb 2, 2026

View reviewed changes

srikarparsi merged commit bd52ab7 into Expensify:main Feb 2, 2026
30 of 34 checks passed

OSBotify mentioned this pull request Feb 3, 2026

Deploy Checklist: New Expensify 2026-01-28 #80808

Closed

OSBotify mentioned this pull request Feb 3, 2026

Reports - Magic code page opens after selecting option from dropdown button #81235

Closed

7 tasks

mohammadjafarinejad mentioned this pull request Feb 4, 2026

[$500] "Back button" on Validate your bank account page does nothing #78356

Open

7 tasks

etCoderDysto mentioned this pull request Feb 7, 2026

[$125] Add bank account - Existing bank account not displayed after workspace currency matches account currency #77626

Closed

7 tasks

Conversation

MrMuzyk commented Jan 12, 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 Jan 12, 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 Jan 12, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

MrMuzyk commented Jan 13, 2026

Uh oh!

joekaufmanexpensify commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

MrMuzyk commented Jan 15, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Jan 26, 2026

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

dominictb Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

MrMuzyk Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

dominictb Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Jan 28, 2026

Uh oh!

dominictb commented Jan 28, 2026

Uh oh!

MrMuzyk commented Jan 29, 2026

Uh oh!

MrMuzyk commented Jan 29, 2026

Uh oh!

MrMuzyk commented Jan 29, 2026

Uh oh!

dominictb commented Feb 1, 2026

Uh oh!

dominictb commented Feb 1, 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 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MrMuzyk commented Feb 2, 2026

Uh oh!

MrMuzyk commented Feb 2, 2026

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MrMuzyk commented Jan 12, 2026 •

edited

Loading

codecov bot commented Jan 12, 2026 •

edited by github-actions bot

Loading

dominictb commented Jan 28, 2026 •

edited

Loading

dominictb commented Jan 28, 2026 •

edited

Loading

dominictb commented Feb 1, 2026 •

edited

Loading

dominictb commented Feb 1, 2026 •

edited

Loading