fix wrong navigation after adding personal bank account successfully in wallet page

[apeyada]

Explanation of Change

• fix wrong detection of active tab
• remove all manual memoization in favor of React Compiler memoization

Fixed Issues

$ #89017
PROPOSAL: #89017 (comment)

Tests

1. Open wallet - add bank account - get reimbursed
2. Select hongkong and try to complete the flow
3. Tap continue on personal bank account page added
4. Verify that bank account flow ends and redirects to wallet page

• Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

• Verify that no errors appear in the JS console

PR Author Checklist

• I linked the correct issue in the ### Fixed Issues section above
• I wrote clear testing steps that cover the changes made in this PR
  • I added steps for local testing in the Tests section
  • I added steps for the expected offline behavior in the Offline steps section
  • I added steps for Staging and/or Production testing in the QA steps section
  • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• I included screenshots or videos for tests on all platforms
• I ran the tests on all platforms & verified they passed on:
  • Android: Native
  • Android: mWeb Chrome
  • iOS: Native
  • iOS: mWeb Safari
  • MacOS: Chrome / Safari
  • MacOS: Desktop
• I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• I verified there are no new alerts related to the canBeMissing param for useOnyx
• I followed proper code patterns (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
    • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • 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 followed the guidelines as stated in the Review Guidelines
• I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• 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
• I verified that if a function's arguments changed that all usages have also been updated correctly
• 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 new assets were added or existing ones were modified, I verified that:
  • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
  • The assets load correctly across all supported platforms.
• 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.
• I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

[melvin-bot]

@mkhutornyi 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: 09bcf79de4

ℹ️ 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".

[chatgpt-codex-connector]

Restore navigator-aware fallback when backTo is missing

When this flow is opened without a backTo param (e.g. Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT.route) in src/components/SettlementButton/index.tsx:444, and the non-admin verify flow in src/pages/settings/Wallet/DynamicAddBankAccountVerifyAccountPage.tsx:15), this branch now calls Navigation.goBack(backTo) with undefined. That drops to generic goBack() behavior instead of the previous navigator-specific fallback (SETTINGS_SPLIT => wallet, REPORTS_SPLIT => closeRHPFlow), so finishing/canceling can pop to an intermediate substep or no-op if there is no back history, rather than reliably exiting the bank-account flow.

Useful? React with 👍 / 👎.

[mkhutornyi]

@MelvinBot what do you think #89649 (comment)? Is this page reachable on other tabs like Inbox, Spend (not only Account->Wallet)?

[MelvinBot]

The review comment raises a valid point. Yes, this page is reachable from tabs other than Account > Wallet, and several of those entry points don't pass a backTo param:

• SettlementButton (personal payments, line 444) navigates with the plain .route string — no backTo.
• DynamicAddBankAccountVerifyAccountPage (line 15) — also uses plain .route.
• ReportUtils.getBankAccountRoute() (line 1813) — returns plain .route for non-policy-expense-chat cases (e.g. personal payment from Inbox).

The route's entryScreens in ROUTES.ts explicitly include SCREENS.REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.SEARCH.ROOT, and SCREENS.RIGHT_MODAL.SEARCH_REPORT, confirming reachability from Inbox and Search/Spend tabs.

So when backTo is undefined, the new code calls Navigation.goBack(undefined) → generic goBack(), which may not reliably exit the flow. The previous navigator-aware switch (SETTINGS_SPLIT → wallet, REPORTS_SPLIT → closeRHPFlow) handled these cases correctly. Additionally, hardcoding ROUTES.SETTINGS_WALLET in the shouldIgnoreBackToParam=true branch would be wrong if the user entered from a non-wallet context.

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
...ositAccount/InternationalDepositAccountContent.tsx	0.00% <0.00%> (ø)
... and 39 files with indirect coverage changes

[MelvinBot]

The existing helper getActiveTabName already solves this — it looks inside TAB_NAVIGATOR to return the active split navigator name:

if (route.name === NAVIGATORS.TAB_NAVIGATOR && route.state) {
    const index = route.state.index ?? 0;
    return route.state.routes?.at(index)?.name;
}

There's even a ready-made helper isReportTopmostSplitNavigator() that combines topmostFullScreenRoute + getActiveTabName:

const topmostFullScreenRoute = rootState.routes.findLast((route) => isFullScreenName(route.name));
return getActiveTabName(topmostFullScreenRoute) === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR;

Proposed fix for goBack in InternationalDepositAccountContent: Instead of hardcoding ROUTES.SETTINGS_WALLET, use getActiveTabName(topmostFullScreenRoute) to restore the original navigator-aware behavior:

const goBack = (shouldIgnoreBackToParam = false) => {
    if (backTo && !shouldIgnoreBackToParam) {
        Navigation.goBack(backTo);
        return;
    }
    const rootState = navigationRef.getRootState() as State<RootNavigatorParamList>;
    const topmostFullScreenRoute = rootState?.routes.findLast((r) => isFullScreenName(r.name));
    const activeTab = getActiveTabName(topmostFullScreenRoute);

    switch (activeTab) {
        case NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR:
            Navigation.goBack(ROUTES.SETTINGS_WALLET);
            break;
        case NAVIGATORS.REPORTS_SPLIT_NAVIGATOR:
            Navigation.closeRHPFlow();
            break;
        default:
            Navigation.goBack();
            break;
    }
};

This preserves the original behavior for all entry points (Inbox, Spend, Wallet) while still simplifying the memoization as the PR intends.

[apeyada]

@codex review

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. Keep it up!

ℹ️ 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".

[MelvinBot]

Code Review

The updated diff (using getActiveTabName) addresses the concern from the earlier review thread. The navigator-aware switch is preserved, and getActiveTabName is actually more correct than the old topmostFullScreenRoute?.name — when TAB_NAVIGATOR is the topmost full-screen route, the old code would fall through to the default goBack() since TAB_NAVIGATOR doesn't match either case, whereas getActiveTabName properly resolves to the active tab inside it (e.g., SETTINGS_SPLIT_NAVIGATOR).

Two items worth noting:

1. handleBackButtonPress is passed to useAndroidBackButtonHandler on every render — since useCallback was removed, this creates a new function reference each render. If useAndroidBackButtonHandler uses the handler as a dependency in an effect (e.g., useEffect with the handler in its deps array), it could cause excessive re-subscriptions. This is fine if React Compiler handles it, but worth confirming the component compiles cleanly with npm run react-compiler-compliance-check check-changed.

2. handleFinishStep is passed to useSubPage as onFinished — same concern. If useSubPage has effects depending on onFinished, a new reference each render could cause issues. Again, React Compiler should handle this, but it's the key assumption underpinning the removal of all manual memoization in this file.

The navigation logic itself looks correct.