[Internal QA] Migrate ReportLostCardPage to Navigation-Based Validation by jmusial · Pull Request #76280 · Expensify/App

jmusial · 2025-11-28T14:40:12Z

Explanation of Change

Refactor ReportLostCardPage to use navigation based confirm modal page instead of modal based.

Fixed Issues

$ #75869
PROPOSAL:

Tests

Pre requisite:
Have an account with physical card issued.

Due to dev acc limitations w/ physical cards, the flow tested in 2 parts.

Reporting card lost or damaged
Success -> new card page.

Dev pre requisites:

For showing the button regardless of card send status src/pages/settings/Wallet/ExpensifyCardPage/index.tsx#147

    const shouldShowReportLostCardButton = currentPhysicalCard?.state === CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED || currentPhysicalCard?.state === CONST.EXPENSIFY_CARD.STATE.OPEN || true;

For showing the success regardless w/o entering the code: src/pages/settings/Wallet/ReportCardLostConfirmMagicCodePage.tsx#34

    const [newCardID, setNewCardID] = useState<string>('23548922'); // your physical card id

Steps:

Open app
Go to "Account" -> "Wallet"
In "Assigned cards" click on you physical card
Click "Report card lost or damaged"
Select your reason, click "next"
Confirm you address and press "Deactivate" or "Ship new card" (depending on previous choice)
Enter magic code
Recieve an error (bc test accounts limitations)
Do dev prerequisite 2, refresh the page and repeat 3 -> 6
"Got it" Shuold redirect you to card details

Offline tests

QA Steps

IMPORTANT: Must have an actual issue physical card.

Open app
Go to "Account" -> "Wallet"
In "Assigned cards" click on you physical card
Click "Report card lost or damaged"
Select your reason, click "next"
Confirm you address and press "Deactivate" or "Ship new card" (depending on previous choice)
Enter magic code
"Got it" button shuold redirect you to card details

PR Author Checklist

Screenshots/Videos

Android: Native

0077.android.native.mov

Android: mWeb Chrome

0077.android.chrome.mov

iOS: Native

0077.ios.native.mov

iOS: mWeb Safari

0077.ios.safari.mov

MacOS: Chrome / Safari

0077.desktop.chrome.mov

codecov · 2025-11-28T14:49:19Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/SCREENS.ts	`100.00% <ø> (ø)`
...igation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`75.00% <ø> (ø)`
.../pages/settings/Wallet/ExpensifyCardPage/index.tsx	`66.29% <ø> (-0.38%)`	⬇️
...rc/pages/settings/Wallet/SuccessReportCardLost.tsx	`0.00% <ø> (ø)`
src/ROUTES.ts	`12.50% <0.00%> (+0.09%)`	⬆️
...gation/AppNavigator/ModalStackNavigators/index.tsx	`8.50% <0.00%> (-0.02%)`	⬇️
src/pages/settings/Wallet/ReportCardLostPage.tsx	`0.00% <0.00%> (ø)`
...ings/Wallet/ReportCardLostConfirmMagicCodePage.tsx	`0.00% <0.00%> (ø)`
... and 7 files with indirect coverage changes

…s-navigation

melvin-bot · 2025-12-01T12:12:48Z

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

github-actions · 2025-12-01T12:15:10Z

Code Review Summary

I've completed a comprehensive review of this PR. The refactoring from a modal-based validation flow to a navigation-based approach is well-implemented. The code follows React best practices and TypeScript patterns correctly.

Key Observations:

Clean separation of concerns - validation logic properly extracted into its own page
Proper navigation patterns using React Navigation
Type safety maintained throughout with TypeScript
Hooks used correctly with proper dependencies
Error handling patterns consistent with existing codebase
State management properly implemented with Onyx

Architecture Notes:

The migration improves the user experience by using native navigation transitions instead of modals, which is more consistent with modern mobile app patterns. The forceReplace: true parameter added to the success navigation prevents users from navigating back to intermediate validation steps.

No critical issues found. The implementation follows Expensify's established patterns and coding standards.

…s-navigation

joekaufmanexpensify · 2025-12-01T19:12:17Z

No product considerations

…s-navigation

aimane-chnaif · 2025-12-02T10:14:32Z

src/pages/settings/Wallet/ReportCardLostConfirmMagicCodePage.tsx

+
+function ReportCardLostConfirmMagicCodePage({
+    route: {
+        params: {cardID = '', reason = 'damaged'},


Where do these default params come from?

cardID = '' is widely used in all other pages, reason = 'damaged' there are 2 of them, just picked one

aimane-chnaif · 2025-12-02T10:16:01Z

src/pages/settings/Wallet/SuccessReportCardLost.tsx

            shouldShowButton
            onButtonPress={() => {
-                Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAIN_CARD.getRoute(cardID));
+                Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAIN_CARD.getRoute(cardID), {forceReplace: true});


Won't this cause navigation animation direction issue on mobile?

You can see the animation for example in IOS: Native clip. IMO looks ok

aimane-chnaif · 2025-12-04T10:46: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

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

aimane-chnaif · 2025-12-04T11:41:37Z

2 bugs in this video:

Screen.Recording.2025-12-04.at.12.35.37.pm.mov

magic code is reset (around 00:07)
Browser back button goes to "Report card lot or damaged" page instead of dismissing modal (around 00:18 to the end)

…s-navigation

jmusial · 2025-12-05T12:03:58Z

2 bugs in this video:

Screen.Recording.2025-12-04.at.12.35.37.pm.mov

magic code is reset (around 00:07)

Browser back button goes to "Report card lot or damaged" page instead of dismissing modal (around 00:18 to the end)

@1 - fixed
@2 - I think this is the way it works now (video from main - code modified to go through Success)

repro.mov

aimane-chnaif · 2025-12-05T12:34:46Z

magic code is reset

This is still reproducible

Screen.Recording.2025-12-05.at.1.33.07.pm.mov

…s-navigation

jmusial · 2025-12-09T11:29:14Z

Ok, the reload should be fixed now. Found another issue, but it's on main as well.

Not sure it's a real life scenario since I'm forcing the button for the card that has not been send.

After reporting card stolen and entering magic code BE responds with

{
    "code": 666,
    "jsonCode": 666,
    "type": "Expensify\\Libs\\Error\\ExpError",
    "UUID": "3c8914ef-b48d-4394-9d64-ed520a8b4198",
    "message": "Looks like your card is suspended. A Domain Admin needs to set a Smart Limit of more than $0, then try again.",
    "title": "Card Suspended",
    "data": [],
    "htmlMessage": "Looks like your card is suspended. A Domain Admin needs to set a <a href=\"https:\/\/community.expensify.com\/discussion\/4854\/how-to-set-or-edit-the-default-unapproved-expense-limit-for-an-individual-cardholder\">Smart Limit<\/a> of more than $0, then try again",
    "onyxData": [],
    "requestID": "9ab407876bf5d2c5-LAX"
}

but "onyxData": [], so there is no error shown to user :(

…s-navigation

aimane-chnaif · 2025-12-09T15:17:48Z

src/pages/settings/Wallet/ReportCardLostConfirmMagicCodePage.tsx

+
+        const newErrors = physicalCard?.errors ?? {};
+        // Only update if errors have actually changed to prevent additional rerender
+        if (deepEqual(newErrors, formData?.errors ?? {})) {


The reload didn't happen before without using deepEqual.
Why do you think this happened after migration and are forced to use deep compare?

As far as I could reproduce it updating errors was causing the reload, so was hoping checking weather they actually changed will solve it. And I couldn't reproduce reload on my side after.

But looking @ your comment below it may be that I just get API response that code has beed issued fast enough that I cannot get into the state before.

aimane-chnaif · 2025-12-09T15:27:28Z

There's still case where magic code input is reset but I think it's fine as it doesn't make sense to input before getting magic code
(input quickly before magic code sent message shows)

web-refresh.mov

OSBotify · 2025-12-09T20:21:21Z

✋ 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-12-10T22:05:47Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.2.75-0 🚀

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

OSBotify · 2025-12-10T23:59:01Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.2.75-0 🚀

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

OSBotify · 2025-12-12T19:00:54Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.2.77-0 🚀

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

OSBotify · 2025-12-12T22:06:08Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.77-1 🚀

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

truph01 · 2025-12-18T08:35:14Z

@jmusial After your PR #76280, the Success page no longer shows the header back button.

Is this the expected behavior, or is it a regression/bug?

I asked because I am working on the related issue #75178.

jmusial · 2025-12-18T11:13:36Z

@truph01 Definitely wasn't planned so it's a regression. Do you want to fix it as a part of yours ? Otherwise I can take a look but realistically next week.

truph01 · 2025-12-22T02:20:44Z

@jmusial Thanks for the information. Since this is part of the issue I’m currently working on, @daledah and I will address it in #75178.

Remove modal & add new page

91b5b21

melvin-bot bot assigned jmusial Nov 28, 2025

navigation for success

4d87d29

jmusial changed the title ~~Remove modal & add new page~~ Migrate ReportLostCardPage to Navigation-Based Validation Dec 1, 2025

jmusial changed the title ~~Migrate ReportLostCardPage to Navigation-Based Validation~~ [Internal QA] Migrate ReportLostCardPage to Navigation-Based Validation Dec 1, 2025

jmusial added 3 commits December 1, 2025 11:02

fix lint & prettier

6f151a7

goBack on back button

cbe9fff

Merge branch 'main' into feat/report-card-lost-confirm-magic-code-use…

747f3fa

…s-navigation

jmusial marked this pull request as ready for review December 1, 2025 12:12

jmusial requested review from a team as code owners December 1, 2025 12:12

melvin-bot bot requested a review from aimane-chnaif December 1, 2025 12:12

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team December 1, 2025 12:12

jmusial mentioned this pull request Dec 1, 2025

[Due for payment now] [Tracking] [$1000] Update the ValidateCodeActionModal to be its own screen in the stack #69171

Closed

jmusial added 2 commits December 1, 2025 14:50

fix lint

0d6980b

Merge branch 'main' into feat/report-card-lost-confirm-magic-code-use…

cbc3175

…s-navigation

joekaufmanexpensify removed their request for review December 1, 2025 19:12

Merge branch 'main' into feat/report-card-lost-confirm-magic-code-use…

75842d4

…s-navigation

aimane-chnaif reviewed Dec 2, 2025

View reviewed changes

jmusial added 3 commits December 5, 2025 11:06

Merge branch 'main' into feat/report-card-lost-confirm-magic-code-use…

28ad240

…s-navigation

fix redundant magic code reset

675b97f

remove test code

e912507

jmusial added 2 commits December 8, 2025 16:50

Merge branch 'main' into feat/report-card-lost-confirm-magic-code-use…

65f641a

…s-navigation

fix for reload

75a19d7

jmusial requested a review from aimane-chnaif December 9, 2025 11:29

Merge branch 'main' into feat/report-card-lost-confirm-magic-code-use…

8d22f89

…s-navigation

aimane-chnaif reviewed Dec 9, 2025

View reviewed changes

aimane-chnaif approved these changes Dec 9, 2025

View reviewed changes

melvin-bot bot requested a review from mjasikowski December 9, 2025 15:37

mjasikowski approved these changes Dec 9, 2025

View reviewed changes

mjasikowski merged commit 9733c70 into Expensify:main Dec 9, 2025
31 of 32 checks passed

OSBotify mentioned this pull request Dec 10, 2025

Deploy Checklist: New Expensify 2025-12-10 #77285

Closed

94 tasks

melvin-bot bot mentioned this pull request Dec 12, 2025

[Due for payment 2025-12-19] Migrate ReportLostCardPage to Navigation-Based Validation #75869

Closed

truph01 mentioned this pull request Dec 18, 2025

[Due for payment 2026-01-16] [$250] Expensify card - RHP back button on Success page after deactivating card opens not here page #75178

Closed

8 tasks

daledah mentioned this pull request Dec 22, 2025

fix: RHP back button on Success page after deactivating card opens not here page #75847

Closed

54 tasks

Conversation

jmusial commented Nov 28, 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!

codecov bot commented Nov 28, 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!

melvin-bot bot commented Dec 1, 2025

Uh oh!

github-actions bot commented Dec 1, 2025

Code Review Summary

Key Observations:

Architecture Notes:

Uh oh!

joekaufmanexpensify commented Dec 1, 2025

Uh oh!

aimane-chnaif Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

jmusial Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

jmusial Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Dec 4, 2025

Uh oh!

jmusial commented Dec 5, 2025

Uh oh!

aimane-chnaif commented Dec 5, 2025

Uh oh!

jmusial commented Dec 9, 2025

Uh oh!

aimane-chnaif Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

jmusial Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

OSBotify commented Dec 9, 2025

Uh oh!

OSBotify commented Dec 10, 2025

Uh oh!

OSBotify commented Dec 10, 2025

Uh oh!

OSBotify commented Dec 12, 2025

Uh oh!

OSBotify commented Dec 12, 2025

Uh oh!

truph01 commented Dec 18, 2025

Uh oh!

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

Uh oh!

Uh oh!

truph01 commented Dec 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

jmusial commented Nov 28, 2025 •

edited

Loading

codecov bot commented Nov 28, 2025 •

edited by github-actions bot

Loading

aimane-chnaif commented Dec 4, 2025 •

edited

Loading

aimane-chnaif commented Dec 9, 2025 •

edited

Loading

jmusial commented Dec 18, 2025 •

edited

Loading