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

dmkt9 · 2025-10-06T05:19:58Z

Explanation of Change

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

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

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

…ription

melvin-bot · 2025-10-06T05:20:03Z

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

dmkt9 · 2025-10-06T05:27:21Z

Hi @tgolen, could you please also assign @WojtekBoman as a reviewer due to #70514 (comment)

codecov · 2025-10-06T05:31:26Z

Codecov Report

❌ Patch coverage is 80.00000% with 3 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/Navigation/helpers/linkTo/index.ts	80.00%	3 Missing ⚠️

Files with missing lines	Coverage Δ
src/libs/Navigation/helpers/linkTo/index.ts	`82.27% <80.00%> (+15.11%)`	⬆️

... and 10 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

WojtekBoman · 2025-10-06T09:14:23Z

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

+            if (
+                matchingFullScreenRoute &&
+                lastFullScreenRoute &&
+                (matchingFullScreenRoute.name !== lastFullScreenRoute.name ||
+                    (lastRouteInMatchingFullScreen?.name && lastRouteInLastFullScreenRoute?.name && lastRouteInMatchingFullScreen.name !== lastRouteInLastFullScreenRoute.name))
+            ) {


Let's create a separate function to check if full screen routes are equal, it should make this if statement more readable. Do something like !areFullScreenRoutesEqual(matchingFullScreenRoute, lastFullScreenRoute), add this helper function above the component

Thank you. I have refactored it.

WojtekBoman · 2025-10-06T09:25:02Z

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

+                const isMatchingRoutePreloaded = currentState.preloadedRoutes.some(
+                    (preloadedRoute) =>
+                        preloadedRoute.name === matchingFullScreenRoute.name &&
+                        (!lastRouteInMatchingFullScreen?.name ||
+                            (preloadedRoute.params && 'screen' in preloadedRoute.params && preloadedRoute.params.screen === lastRouteInMatchingFullScreen?.name)),


To me, this one can be simplified as well. Let's create a function isRoutePreloaded and pass currentState and matchingFullScreenRoute as params

Thank you. I have refactored it.

…ription

hoangzinh · 2025-10-10T16:30:22Z

Thanks @dmkt9. I will try review this weekend

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

hoangzinh · 2025-10-12T08:00:19Z

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

    return currentParams?.reportID === newParams?.reportID;
 }

+function areFullScreenRoutesEqual(matchingFullScreenRoute: NavigationPartialRoute, lastFullScreenRoute: NavigationPartialRoute) {


Is it possible to add unit tests for those functions?

Since the areFullScreenRoutesEqual function is just a small helper used for value comparison, and it's a private function, I don't think it's necessary to create a unit test for it. What do you think?

We have CodeCov guidelines here. Because we have "decrease coverage" in src/libs/Navigation/helpers/linkTo/index.ts, thus we need to keep or increase it @dmkt9. We either test public method linkTo or export and test areFullScreenRoutesEqual method.

Thanks. I will update the test soon.

TY @dmkt9. Leave a comment on PR whenever PR is ready for review again.

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

…ription

dmkt9 · 2025-10-15T12:49:39Z

@hoangzinh This PR is ready.

hoangzinh · 2025-10-16T10:16:40Z

I found a bug, but it exists in Prod. It shows "It's not here" page when tapping on "Add payment card" in native apps

Screen.Recording.2025-10-16.at.17.14.04.android.mov

hoangzinh · 2025-10-16T10:19:32Z

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
- MacOS: Desktop
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-10-16.at.17.14.04.android.mov

Android: mWeb Chrome

Screen.Recording.2025-10-16.at.17.11.13.android.chrome.mov

iOS: HybridApp

Screen.Recording.2025-10-16.at.20.24.31.mov

iOS: mWeb Safari

Screen.Recording.2025-10-16.at.17.17.25.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-10-16.at.17.03.53.web.mov

MacOS: Desktop

Screen.Recording.2025-10-16.at.17.06.59.desktop.mov

dmkt9 · 2025-10-16T10:33:21Z

I found a bug, but it exists in Prod. It shows "It's not here" page when tapping on "Add payment card" in native apps

@hoangzinh Yes. I don’t fully understand the reason, but it seems to be intentional.

App/src/pages/settings/Subscription/PaymentCard/index.native.tsx

Lines 5 to 15 in e4aabe2

    
           function AddPaymentCard() { 
        
               return ( 
        
                   <ScreenWrapper 
        
                       testID={AddPaymentCard.displayName} 
        
                       includeSafeAreaPaddingBottom 
        
                       shouldEnableMaxHeight 
        
                   > 
        
                       <FullPageNotFoundView shouldShow /> 
        
                   </ScreenWrapper> 
        
               ); 
        
           }

hoangzinh · 2025-10-16T13:28:04Z

We probably need to disable "Add payment card" button link on native apps. What do you think? @tgolen. We just leave it there or disable "Add payment card" on native apps? (Ref)

tgolen · 2025-10-16T19:59:07Z

@blimpich @ikevin127 Do you know why we don't allow adding a payment card for native devices? Is it because of Apple and Google payment rules?

I think at least we should disable the button, but I normally prefer to not render things rather than showing them as disabled.

ikevin127 · 2025-10-16T20:05:10Z

Found this on Slack on a quick look, seems related:

Ben Limpich

fun little edge case bug with subscription page. If user needs to re-authenticate for 3DS, but for some reason they switch to mobile during this then the will have a "authenticate payment" button that takes them to a "Page cannot be found" page. We can't support users authenticating 3DS payments for both technical and legal reasons (App store policies). So I think we just get rid of that button for native iOS and Android? Can you double check me on this?

amy

Yeah I think removing the button on native apps is fine... only alternative thought is maybe we can put a Your card still needs to be authenticated text (not button) or something?

mitch

+1 to removing the button on native apps if there is no way around the app store policy

tgolen · 2025-10-27T16:12:56Z

I'm not very familiar with this UI, can you please attach a screenshot of the areas you're asking about?

hoangzinh · 2025-10-28T08:58:21Z

Ah, you can check the recording on the Android platform here @tgolen

I'm unsure which screen @blimpich mentioned here, but I guess it's

hoangzinh

LGTM

tgolen · 2025-11-03T15:59:26Z

Thanks for the screenshot. I like this screen being there in general, but I think we should:

Not display any button
Have the text explain to the user why they cannot do that thing

cc @Expensify/design

dannymcclain · 2025-11-03T16:13:59Z

I agree @tgolen!

Have the text explain to the user why they cannot do that thing

Can we get some copy help from someone to write this?

dubielzyk-expensify · 2025-11-03T23:53:45Z

cc @jamesdeanexpensify for copy

trjExpensify · 2025-11-03T23:55:35Z

Did you see this, @tgolen? #70514 (comment)

tgolen · 2025-11-04T15:07:41Z

Oh, no. I didn't. In that case, it looks like this PR and the issue can be closed? It looks like we handle the flow better now for native.

hoangzinh · 2025-11-04T15:20:23Z

Ah, no @tgolen. The original issue of this PR is: "Add payment card" RHP opens on the Profile page

Screen.Recording.2025-11-04.at.22.16.15.mov

This PR will ensure that "Add payment card" RHP opens on the Subscription page. However, during testing, I found a bug in Native apps that also happens in Prod, and it's fixed somewhere here

=> I think this PR is ready for your review @tgolen

tgolen · 2025-11-04T15:27:45Z

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

+    return isEqualFullScreenRoute && isEqualLastRouteInFullScreenRoute;
+}
+
+/** Check whether the route has been preloaded */


You can remove this, it doesn't add value beyond what the function is already named. If you'd like to keep this, I suggest updating the comment to explain why this method exists and when or why it should be used. Also, I'm not sure what "preloaded" means, so that could also be explained in the comment.

Thanks! I've just removed that line.

jamesdeanexpensify · 2025-11-04T17:18:40Z

(Let me know if you need any input on copy, I see I was tagged earlier in this issue!)

…ription

tgolen · 2025-11-05T15:19:14Z

@jamesdeanexpensify I think we're OK here and didn't need anything in the end. Thanks!

OSBotify · 2025-11-05T15:39:02Z

✋ 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 · 2025-11-05T20:37:31Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.2.45-0 🚀

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

dangrous · 2025-11-06T15:59:46Z

Hi! This causes #74478 - specifically this commit - mind taking a look quickly, and see if we can fix without a revert? I will also look into it shortly. Thanks!

OSBotify · 2025-11-06T23:20:04Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.45-6 🚀

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

dmkt9 added 4 commits September 15, 2025 22:15

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

b1b033f

…ription

Merge branch 'main' into fix/70514

a45048e

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

09ef892

…ription

Merge branch 'main' into fix/70514

371c281

dmkt9 requested a review from a team as a code owner October 6, 2025 05:19

melvin-bot bot requested a review from hoangzinh October 6, 2025 05:20

melvin-bot bot assigned dmkt9 Oct 6, 2025

melvin-bot bot removed the request for review from a team October 6, 2025 05:20

dmkt9 mentioned this pull request Oct 6, 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

WojtekBoman reviewed Oct 6, 2025

View reviewed changes

dmkt9 added 2 commits October 7, 2025 10:33

Merge branch 'main' into fix/70514

307a57a

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

5dcebc1

…ription

hoangzinh reviewed Oct 12, 2025

View reviewed changes

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

dmkt9 added 4 commits October 13, 2025 20:09

Merge branch 'main' into fix/70514

44a417a

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

663e5a2

…ription

Merge branch 'main' into fix/70514

0f89a83

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

e7f20c2

…ription

Merge branch 'Expensify:main' into fix/70514

e6e3026

Merge branch 'main' into fix/70514

6b5da13

hoangzinh approved these changes Nov 2, 2025

View reviewed changes

melvin-bot bot requested a review from tgolen November 2, 2025 15:51

tgolen requested changes Nov 4, 2025

View reviewed changes

dmkt9 added 2 commits November 5, 2025 10:56

Merge branch 'main' into fix/70514

5ecf0c7

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

794d6ef

…ription

dmkt9 requested a review from a team as a code owner November 5, 2025 03:58

melvin-bot bot requested review from heyjennahay and removed request for a team November 5, 2025 03:58

tgolen approved these changes Nov 5, 2025

View reviewed changes

tgolen merged commit ae43561 into Expensify:main Nov 5, 2025
26 of 27 checks passed

OSBotify mentioned this pull request Nov 5, 2025

Deploy Checklist: New Expensify 2025-11-05 #74371

Closed

79 tasks

dangrous mentioned this pull request Nov 6, 2025

Report card lost - Background changes from Wallet to Profile after opening Address field #74478

Closed

8 tasks

dangrous mentioned this pull request Nov 6, 2025

[CP Staging] Revert "Fix/70514 - Add payment card RHP opens on the Profile page instead of Subscription" #74501

Merged

52 tasks

dmkt9 mentioned this pull request Nov 11, 2025

Fix/70514 - Add payment card RHP opens on the Profile page instead of Subscription #74772

Merged

54 tasks

Conversation

dmkt9 commented Oct 6, 2025 • 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!

melvin-bot bot commented Oct 6, 2025

Uh oh!

dmkt9 commented Oct 6, 2025

Uh oh!

codecov bot commented Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

WojtekBoman Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Oct 10, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dmkt9 commented Oct 15, 2025

Uh oh!

hoangzinh commented Oct 16, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dmkt9 commented Oct 16, 2025

Uh oh!

hoangzinh commented Oct 16, 2025

Uh oh!

tgolen commented Oct 16, 2025

Uh oh!

ikevin127 commented Oct 16, 2025

Uh oh!

tgolen commented Oct 27, 2025

Uh oh!

hoangzinh commented Oct 28, 2025

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

tgolen commented Nov 3, 2025

Uh oh!

dannymcclain commented Nov 3, 2025

Uh oh!

dubielzyk-expensify commented Nov 3, 2025

Uh oh!

trjExpensify commented Nov 3, 2025

Uh oh!

tgolen commented Nov 4, 2025

Uh oh!

hoangzinh commented Nov 4, 2025

dmkt9 commented Oct 6, 2025 •

edited

Loading

codecov bot commented Oct 6, 2025 •

edited

Loading

WojtekBoman Oct 6, 2025 •

edited

Loading

hoangzinh Oct 15, 2025 •

edited

Loading

hoangzinh commented Oct 16, 2025 •

edited

Loading