fix: open country selector RHP when adding a personal card after upgrade

[dilshodmackbook-sketch]

Explanation of Change

After creating a workspace from the "Add personal card" upgrade flow, tapping Add personal card on the confirmation screen only closed the RHP (the real navigation was left as a TODO). Because the upgrade page was the only route in the RHP stack, closeRHPFlow() popped the whole RHP and dropped the user back on the Wallet page instead of opening the country selector.

This navigates directly to the add-card route from within the already-open RHP using forceReplace, so the country selector (AddNewCardPage, which defaults to the country-selector step) opens smoothly in the same RHP with no close/re-open flicker. Both screens are siblings in the Settings RHP stack, so there is no need to tear down the RHP. forceReplace swaps out the completed upgrade confirmation rather than pushing on top of it, so pressing back from the country selector returns to the Wallet page as expected.

Fixed Issues

$ #94429
PROPOSAL: #94429 (comment)

Tests

1. Sign into an account that is NOT a member of any paid workspace
2. Go to Account > Wallet > Add personal card > United States > Other > Regions Bank
3. Connect a test card via Plaid, then add a second personal card
4. Click Add personal card again to attempt a third card
5. On the upgrade page, click Create workspace
6. Click Add personal card
7. Verify the country selector RHP opens (instead of being redirected to the Wallet page)
8. Press back and verify you return to the Wallet page

• Verify that no errors appear in the JS console

Offline tests

Same as the Tests above — the navigation change is purely client-side, so the country selector RHP opens the same way while offline.

QA Steps

Same as the Tests above.

• 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
• 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 followed proper code patterns (see Reviewing the code)
  • 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 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)
• 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)
• 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.
• 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

Screen.Recording.2026-07-23.at.00.27.52.mov

Android: mWeb Chrome

Screen.Recording.2026-07-23.at.00.01.48.mov

iOS: Native

Screen.Recording.2026-07-23.at.00.38.32.mov

iOS: mWeb Safari

Screen.Recording.2026-07-23.at.00.02.55.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-22.at.23.58.32.mov

Screen.Recording.2026-07-23.at.00.00.26.mov

[melvin-bot]

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

[dilshodmackbook-sketch]

@codex review

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: 0940ccebaa

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

[joekaufmanexpensify]

Good for product 👍