Fix/70514 - Add payment card RHP opens on the Profile page instead of Subscription by dmkt9 · Pull Request #74772 · Expensify/App

dmkt9 · 2025-11-11T04:29:02Z

Explanation of Change

Follow-up #71878
When a user's trial has ended, the workspace restricted action page will be shown during the expense submission flow within a workspace. This PR ensures that clicking "Add payment card" on the workspace restricted action page will navigate the user to the Subscription tab in Settings

Fixed Issues

$ #70514
PROPOSAL: #70514 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Test 1

Login as the account that has a free trial
Open console and run the following snippets:
Onyx.merge('nvp_private_lastDayFreeTrial', '2025-09-12 01:01:00');
(change the date to your current date for the above snippet)
Onyx.merge('nvp_private_amountOwed', 1000);
Onyx.merge('nvp_private_billingGracePeriodEnd', 1719792000);
They will end the free trial and leave the user in a "expired" state.
Navigate to the workspace chat, start an expense creation flow
On a “Restricted” screen click the "Add payment card”
Verify you are brought to the Subscription tab and "Add payment card" RHP opens on the Subscription page

Test 2
Precondition: User has assigned a physical card that is ready to be activated (or log in as applausetester+061102kh@applause.expensifail.com)

Go to staging.new.expensify.com
Go to Account > Wallet.
Click on the physical card named "Expensify Card".
Click "Report card lost or damaged".
Select any reason > Next.
Click Address.
Note that Central pane in the background will not change (remain as Wallet) after opening Address field.

Test 3
Precondition: User has assigned themselves a Well Fargos card (0000).

Go to staging.new.expensify.com
Go to workspace settings > Members.
Click on your profile.
Click on the assigned card.
Click Card name.
Note that members will remain in the background when opening Card name field on Members.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Test 1:

Android: Native

android.native.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.native.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

mac.safari.mp4

MacOS: Desktop

mac.desktop.mp4

Test 2:

test2.mp4

Test 3:

test3.mp4

…ription

melvin-bot · 2025-11-11T04:29:09Z

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

codecov · 2025-11-11T04:39:39Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/Navigation/helpers/linkTo/index.ts	`80.00% <68.75%> (+12.83%)`	⬆️
... and 31 files with indirect coverage changes

dmkt9 · 2025-11-11T04:46:31Z

Hi @hoangzinh, PR #71878 has been reverted, so I've submitted this follow-up PR to address the original issue. When you have a moment, please take a look!

src/libs/Navigation/helpers/linkTo/index.ts

trjExpensify

Makes sense to navigate the owner to subscription page and open the Add Payment Card modal if on web/desktop. 👍

…ription

hoangzinh · 2025-11-24T21:07:59Z

Hi @trjExpensify Can you take a look at this comment when you have a moment? TY

hoangzinh · 2025-12-03T22:03:41Z

@trjExpensify, when you have a moment, can you give a thought on this again so we can move forward with this PR? TY

hoangzinh · 2025-12-17T16:18:44Z

@trjExpensify another comment that needs your attention here #74772 (comment)

hoangzinh

All good. Just a small suggestion.

hoangzinh · 2025-12-18T16:32:13Z

src/libs/Navigation/helpers/linkTo/index.ts

+                matchingFullScreenRoute &&
+                lastFullScreenRoute &&
+                (matchingFullScreenRoute.name !== lastFullScreenRoute.name ||
+                    (newFocusedRoute.name === SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD && lastRouteInLastFullScreenRoute?.name !== SCREENS.SETTINGS.SUBSCRIPTION.ROOT))


Should we move this into a function and add comments explaining why the SUBSCRIPTION screen needs to be treated as an exception here?

Yes. I have just refactored that a bit. If you find any comments unclear, feel free to request changes from me.

I mean just "newFocusedRoute?.name === SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD && lastRouteInLastFullScreenRoute?.name !== SCREENS.SETTINGS.SUBSCRIPTION.ROOT" only. But let me review your current approach

hoangzinh · 2025-12-18T16:32:57Z

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

Screen.Recording.2025-12-20.at.14.21.21.android.mov

Android: mWeb Chrome

Screen.Recording.2025-12-20.at.14.18.41.android.chrome.mov

iOS: HybridApp

Screen.Recording.2025-12-20.at.14.37.57.mov

iOS: mWeb Safari

Screen.Recording.2025-12-20.at.14.27.53.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-20.at.14.11.58.web.mov

…ription

hoangzinh

LGTM

melvin-bot · 2025-12-20T07:40:01Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #70514 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

src/libs/Navigation/helpers/linkTo/index.ts

…ription

hoangzinh · 2026-01-13T09:55:34Z

@Julesssss, it appears that we're waiting for your next review here.

Julesssss · 2026-01-13T18:00:53Z

Changes look good.

OSBotify · 2026-01-13T18:11:49Z

✋ 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-01-14T03:23:17Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.1-0 🚀

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

OSBotify · 2026-01-14T21:31:25Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.3.1-1 🚀

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

Fix - Add payment card RHP opens on the Profile page instead of Subsc…

fe29806

…ription

dmkt9 requested review from a team as code owners November 11, 2025 04:29

melvin-bot bot assigned dmkt9 Nov 11, 2025

melvin-bot bot requested review from hoangzinh and trjExpensify and removed request for a team November 11, 2025 04:29

melvin-bot bot removed the request for review from a team November 11, 2025 04:29

hoangzinh reviewed Nov 11, 2025

View reviewed changes

src/libs/Navigation/helpers/linkTo/index.ts Outdated Show resolved Hide resolved

trjExpensify previously approved these changes Nov 11, 2025

View reviewed changes

dmkt9 mentioned this pull request Nov 12, 2025

[Due for payment 2026-01-21] [$250] Free trial ended-"Add payment card" RHP opens on the Profile page instead of Subscription #70514

Closed

8 tasks

dmkt9 added 2 commits November 17, 2025 18:45

Merge branch 'main' into fix/70514b

18c1175

Fix - Add payment card RHP opens on the Profile page instead of Subsc…

1cd19e5

…ription

dmkt9 dismissed trjExpensify’s stale review via 1cd19e5 November 17, 2025 12:05

Merge branch 'main' into fix/70514b

e69e421

hoangzinh reviewed Dec 18, 2025

View reviewed changes

dmkt9 added 2 commits December 19, 2025 20:49

Merge branch 'main' into fix/70514b

ba7d3fb

Fix - Add payment card RHP opens on the Profile page instead of Subsc…

90ba433

…ription

hoangzinh approved these changes Dec 20, 2025

View reviewed changes

melvin-bot bot requested a review from Julesssss December 20, 2025 07:40

Julesssss reviewed Dec 22, 2025

View reviewed changes

src/libs/Navigation/helpers/linkTo/index.ts Outdated Show resolved Hide resolved

Julesssss reviewed Dec 22, 2025

View reviewed changes

src/libs/Navigation/helpers/linkTo/index.ts Outdated Show resolved Hide resolved

dmkt9 added 2 commits December 23, 2025 09:58

Merge branch 'main' into fix/70514b

35c33b5

Fix - Add payment card RHP opens on the Profile page instead of Subsc…

0814b81

…ription

Julesssss approved these changes Jan 13, 2026

View reviewed changes

Julesssss merged commit f6c2a49 into Expensify:main Jan 13, 2026
32 checks passed

OSBotify mentioned this pull request Jan 14, 2026

Deploy Checklist: New Expensify 2026-01-14 #79522

Closed

39 tasks

Conversation

dmkt9 commented Nov 11, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Nov 11, 2025

Uh oh!

codecov bot commented Nov 11, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dmkt9 commented Nov 11, 2025

Uh oh!

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Nov 24, 2025

Uh oh!

hoangzinh commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hoangzinh commented Dec 17, 2025

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

dmkt9 Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Dec 19, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Dec 20, 2025

Uh oh!

Uh oh!

Uh oh!

hoangzinh commented Jan 13, 2026

Uh oh!

Julesssss commented Jan 13, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 13, 2026

Uh oh!

OSBotify commented Jan 14, 2026

Uh oh!

OSBotify commented Jan 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Nov 11, 2025 •

edited by github-actions bot

Loading

hoangzinh commented Dec 3, 2025 •

edited

Loading

hoangzinh commented Dec 18, 2025 •

edited

Loading