Skip to content

Fix paywall Add payment card CTA navigation race in restricted action#91509

Open
neerajbachani wants to merge 3 commits into
Expensify:mainfrom
neerajbachani:fix/89718-paywall-add-card-redirect
Open

Fix paywall Add payment card CTA navigation race in restricted action#91509
neerajbachani wants to merge 3 commits into
Expensify:mainfrom
neerajbachani:fix/89718-paywall-add-card-redirect

Conversation

@neerajbachani
Copy link
Copy Markdown
Contributor

Use dismissModal with afterTransition for web/native owner CTA to avoid modal-stack race, and add regression tests for web and native routes.

Explanation of Change

The workspace owner paywall CTA was calling Navigation.closeRHPFlow() and immediately calling Navigation.navigate(...). That dispatches two navigation actions in the same tick while the RHP/modal stack is still transitioning, which can drop the follow-up navigation and make the button appear to do nothing.

This PR keeps the existing UX unchanged (web still shows Add payment card and routes to the add-card screen; native still shows Go to Subscription and routes to subscription settings). It only fixes navigation sequencing by using Navigation.dismissModal({ afterTransition: () => Navigation.navigate(...) }) in both platform handlers, and adds unit tests to lock in web/native behavior.

Fixed Issues

$ #89718
PROPOSAL: #89718 (comment)

Tests

  1. Sign up / use a workspace owner account with billing restriction (amount owed + grace period ended).
  2. Open FAB → Create expense → Manual expense → enter amount → Next.
  3. On Choose recipient, select the restricted workspace chat and open the paywall modal.
  4. Click Add payment card (web).
  5. Confirm navigation to subscription with add-card flow occurs reliably (no “stuck” modal with no navigation).
  • Verify that no errors appear in the JS console

Offline tests

  1. Reproduce the paywall state (billing NVPs as in issue repro).
  2. Disable network.
  3. FAB → Create expense → choose restricted workspace → open paywall.
  4. Tap Add payment card (web) / Go to Subscription (native).
  5. Confirm navigation still occurs to the expected billing screen (client-side navigation).

QA Steps

  1. Go to https://staging.new.expensify.com/
  2. Use a workspace owner in billing-restricted state (or set NVPs per issue repro).
  3. Go offline (disable network)
  4. FAB → Create Expense → Manual expense → amount → Next.
  5. Select workspace chat to open restricted paywall.
  6. Click Add payment card (web).
  7. Verify user is redirected into billing flow subscription with add-card paywall on top.
  • 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 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 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: mWeb Safari
MacOS: Chrome / Safari

Use dismissModal with afterTransition for web/native owner CTA to avoid modal-stack race, and add regression tests for web and native routes.
@neerajbachani neerajbachani requested review from a team as code owners May 23, 2026 13:42
@melvin-bot melvin-bot Bot requested review from heyjennahay and thelullabyy and removed request for a team May 23, 2026 13:42
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 23, 2026

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

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e9aa78e5b2

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

Comment on lines +24 to +25
Navigation.dismissModal({
afterTransition: () => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD),
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve underlying RHP flow before navigating to billing

Switching from Navigation.closeRHPFlow() to Navigation.dismissModal() changes behavior from “pop only the top RHP flow” to “pop the entire RIGHT_MODAL navigator,” so users who open this paywall from a multi-step modal flow (e.g., expense creation) lose their in-progress stack when they tap the CTA. closeRHPFlow was designed to keep prior RHP routes when more than one exists, but dismissModal always dismisses the modal route itself, so back navigation can no longer return to the interrupted flow.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed, this is better, Preserves underlying multi-step RHP flow semantics ( closeRHPFlow ) , Still avoids the navigation race ( waitForTransition ), code updated.

Use closeRHPFlow with waitForTransition navigation for web/native owner CTAs to avoid modal-stack race without dismissing the full modal stack, and add regression tests.
@neerajbachani
Copy link
Copy Markdown
Contributor Author

okay @codex review again, make no mistakes

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant