Skip to content

Conversation

@jmusial
Copy link
Contributor

@jmusial jmusial commented Nov 26, 2025

Explanation of Change

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

Fixed Issues

$ #75872

PROPOSAL:

Tests

If you have access to An EU/UK bank account
Pre requisite: An EU/UK bank account on EU/UK workspace so EU/UK virtual card can be issued

Otherwise:
change src/pages/settings/Wallet/ExpensifyCardPage/index.tsx#263
to

                                        {cardsDetailsErrors[card.cardID] === 'cardPage.missingPrivateDetails'  || true ? (

to make error appear permanently

  1. As an admin, Issued virtual expensify card
  2. As a new user who does not have personal details set, tried to "Reveal card" details (only if EU/UK bank acc)
  3. Ensured an error was displayed, and user was asked to fill personal details and hence the card details were revealed.

Offline tests

n/a

QA Steps

Pre requisite: An EU/UK bank account on EU/UK workspace so EU/UK virtual card can be issued

  1. As an admin, Issued virtual expensify card
  2. As a new user who does not have personal details set, tried to "Reveal card" details
  3. Ensured an error was displayed, and user was asked to fill personal details and hence the card details were revealed.

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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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
0075.android.native.mov
Android: mWeb Chrome
0075.android.chrome.mov
iOS: Native
0075.ios.native.mov
iOS: mWeb Safari
0075.ios.safari.mov
MacOS: Chrome / Safari
0075.desktop.mov

@codecov
Copy link

codecov bot commented Nov 26, 2025

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% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 75.00% <ø> (ø)
...gPersonalDetails/MissingPersonalDetailsContent.tsx 0.00% <ø> (ø)
src/ROUTES.ts 12.51% <0.00%> (+2.00%) ⬆️
...gation/AppNavigator/ModalStackNavigators/index.tsx 8.51% <0.00%> (-0.02%) ⬇️
...ensifyCardPage/ExpensifyCardMissingDetailsPage.tsx 0.00% <0.00%> (ø)
src/pages/MissingPersonalDetails/index.tsx 0.00% <0.00%> (ø)
...dPage/ExpensifyCardMissingDetailsMagicCodePage.tsx 0.00% <0.00%> (ø)
... and 141 files with indirect coverage changes

@jmusial jmusial changed the title First draft Migrate ExpensifyCardMissingDetailsPage to Navigation-Based Validation Nov 26, 2025
@jmusial jmusial marked this pull request as ready for review November 26, 2025 16:16
@jmusial jmusial requested review from a team as code owners November 26, 2025 16:16
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and removed request for a team November 26, 2025 16:16
@melvin-bot
Copy link

melvin-bot bot commented Nov 26, 2025

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

@melvin-bot melvin-bot bot requested review from heyjennahay and removed request for a team November 26, 2025 16:16
clearPersonalDetailsErrors();
}, [validateCodeAction?.errorFields, validateLoginError]);

const values = useMemo(() => normalizeCountryCode(getSubstepValues(privatePersonalDetails, draftValues)) as PersonalDetailsForm, [privatePersonalDetails, draftValues]);
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-6 (docs)

Passing entire objects (privatePersonalDetails and draftValues) as dependencies causes this useMemo to re-execute whenever any property in these objects changes, even unrelated ones. This creates unnecessary recalculations.

Specify individual properties that getSubstepValues actually uses:

const values = useMemo(
    () => normalizeCountryCode(getSubstepValues(privatePersonalDetails, draftValues)) as PersonalDetailsForm,
    [
        privatePersonalDetails?.legalFirstName,
        privatePersonalDetails?.legalLastName,
        privatePersonalDetails?.dob,
        privatePersonalDetails?.phoneNumber,
        privatePersonalDetails?.addresses,
        draftValues?.legalFirstName,
        draftValues?.legalLastName,
        draftValues?.dob,
        draftValues?.phoneNumber,
        draftValues?.address,
    ]
);

Copy link
Contributor

Choose a reason for hiding this comment

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

Please address this feedback

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Theoretically true, but this causes lint error.
Image

setIsCardDetailsLoading((prevState: Record<number, boolean>) => ({...prevState, [cardID]: false}));
});
},
[cardID, countryCode, setCardsDetails, setCardsDetailsErrors, setIsCardDetailsLoading, values],
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-6 (docs)

Including the entire values object in the dependency array causes this useCallback to be recreated whenever any property in values changes, even if those properties aren't used by setPersonalDetailsAndRevealExpensifyCard.

Since setPersonalDetailsAndRevealExpensifyCard requires the complete PersonalDetailsForm object, and values is already memoized (line 48), consider whether this callback truly needs to be memoized at all, or specify the individual properties from values that actually matter:

const handleSubmitForm = useCallback(
    (validateCode: string) => {
        // ... implementation
    },
    [
        cardID,
        countryCode,
        setCardsDetails,
        setCardsDetailsErrors,
        setIsCardDetailsLoading,
        values.legalFirstName,
        values.legalLastName,
        values.dob,
        values.phoneNumber,
        values.address,
    ]
);

Or remove useCallback if the callback isn't passed to a memoized child component.

Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above.

Comment on lines 11 to 12
const [privatePersonalDetails, privatePersonalDetailsMetadata] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS, {canBeMissing: false});
const [draftValues, draftValuesMetadata] = useOnyx(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM_DRAFT, {canBeMissing: false});
Copy link
Contributor

Choose a reason for hiding this comment

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

any reason for setting canBeMissing to false? I see more occurrences of true than false in the app

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed

clearPersonalDetailsErrors();
}, [validateCodeAction?.errorFields, validateLoginError]);

const values = useMemo(() => normalizeCountryCode(getSubstepValues(privatePersonalDetails, draftValues)) as PersonalDetailsForm, [privatePersonalDetails, draftValues]);
Copy link
Contributor

Choose a reason for hiding this comment

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

Please address this feedback

setIsCardDetailsLoading((prevState: Record<number, boolean>) => ({...prevState, [cardID]: false}));
});
},
[cardID, countryCode, setCardsDetails, setCardsDetailsErrors, setIsCardDetailsLoading, values],
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

@heyjennahay
Copy link
Contributor

Not a product change. Removing myself and unsubscribing

@heyjennahay heyjennahay removed their request for review November 28, 2025 18:47
@jmusial jmusial requested a review from aimane-chnaif December 1, 2025 09:44
@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Dec 1, 2025

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: mWeb Chrome
iOS: HybridApp
ios.mov
iOS: mWeb Safari
msafari.mov
MacOS: Chrome / Safari
web.mov

Copy link
Contributor

@aimane-chnaif aimane-chnaif left a comment

Choose a reason for hiding this comment

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

Bug: after input incorrect magic code, modal dismisses.
Bug: browser back button goes to the same page

Screen.Recording.2025-12-01.at.4.43.13.pm.mov

Actually, this is regression from this old PR - #70736.
Let's fix this as follow-up!

@aimane-chnaif
Copy link
Contributor

Please check last part of this video. There's browser back button issue. It should go to Expensify Card page, not Reveal Details.

web.mov

@jmusial
Copy link
Contributor Author

jmusial commented Dec 2, 2025

Please check last part of this video. There's browser back button issue. It should go to Expensify Card page, not Reveal Details.

web.mov

on it

@jmusial
Copy link
Contributor Author

jmusial commented Dec 3, 2025

Bug: after input incorrect magic code, modal dismisses. Bug: browser back button goes to the same page

Screen.Recording.2025-12-01.at.4.43.13.pm.mov
Actually, this is regression from this old PR - #70736. Let's fix this as follow-up!

  1. Bug: after input incorrect magic code, modal dismisses.
  2. Bug: browser back button goes to the same page

@1 src/pages/settings/Wallet/ExpensifyCardPage/ExpensifyCardMissingDetailsMagicCodePage.tsx#71 is the line that causes the redirect back. Was working like that before (if you look @ old src/pages/settings/Wallet/ExpensifyCardPage/ExpensifyCardMissingDetailsPage.tsx), but I agree, it should stay on validate on error. will remove

@2 It's weird and I cannot repro. If you look @ your url, the card Id changes, the back button works as expected since those are 2 different urls. But I cannot get why the card ID changes ?

@jmusial
Copy link
Contributor Author

jmusial commented Dec 3, 2025

Please check last part of this video. There's browser back button issue. It should go to Expensify Card page, not Reveal Details.

web.mov

Weird, cannot repro either

Screen.Recording.2025-12-03.at.13.45.59.mov

@aimane-chnaif
Copy link
Contributor

@2 It's weird and I cannot repro. If you look @ your url, the card Id changes, the back button works as expected since those are 2 different urls. But I cannot get why the card ID changes ?

Maybe because I've hardcoded. I manually set cards like below:

            Onyx.merge(ONYXKEYS.CARD_LIST, {
                '21184323': {
                    accountID: 18394806,
                    availableSpend: 0,
                    bank: 'Expensify Card',
                    cardID: 21184323,
                    cardName: '',
                    domainName: 'cardtest.expensify.com',
                    fraud: 'none',
                    fundID: '15618847',
                    lastFourPAN: '',
                    lastScrape: '',
                    lastScrapeResult: 0,
                    nameValuePairs: {
                        feedCountry: 'US',
                        hasCustomUnapprovedExpenseLimit: true,
                        previousState: 2,
                        unapprovedExpenseLimit: 500,
                    },
                    scrapeMinDate: '',
                    state: 7,
                    token: '',
                },
                '21184324': {
                    accountID: 18394806,
                    availableSpend: 0,
                    bank: 'Expensify Card',
                    cardID: 21184324,
                    cardName: '455594XXXXXX0687',
                    domainName: 'cardtest.expensify.com',
                    fraud: 'none',
                    fundID: '15618847',
                    lastFourPAN: '0687',
                    lastScrape: '',
                    lastScrapeResult: 200,
                    nameValuePairs: {
                        expirationDate: '2028-09-30',
                        feedCountry: 'US',
                        hasCustomUnapprovedExpenseLimit: true,
                        isVirtual: true,
                        previousState: 7,
                        statusChanges: [
                            {
                                date: '2024-09-27',
                                status: 3,
                            },
                        ],
                        unapprovedExpenseLimit: 500,
                    },
                    scrapeMinDate: '',
                    state: 3,
                    token: '18394806-21184167-V',
                },
            });

@aimane-chnaif
Copy link
Contributor

Please check last part of this video. There's browser back button issue. It should go to Expensify Card page, not Reveal Details.
web.mov

Weird, cannot repro either

Screen.Recording.2025-12-03.at.13.45.59.mov

ok I can't reproduce with only one card set.

@melvin-bot melvin-bot bot requested a review from mjasikowski December 4, 2025 10:44
@mjasikowski mjasikowski merged commit 57c0cbc into Expensify:main Dec 5, 2025
31 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Dec 5, 2025

✋ 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
Copy link
Contributor

OSBotify commented Dec 5, 2025

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

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

@izarutskaya
Copy link

Hi @jmusial When adding a bank account the system forces to update USD currency. So we can't test it. Let me know if we missed anything. Thank you in advance

explorer_8R7IHM8Hqj.mp4

@jmusial
Copy link
Contributor Author

jmusial commented Dec 8, 2025

Hi @jmusial When adding a bank account the system forces to update USD currency. So we can't test it. Let me know if we missed anything. Thank you in advance

explorer_8R7IHM8Hqj.mp4

@mountiny can we tag it as [Internal QA] then ?

@OSBotify
Copy link
Contributor

OSBotify commented Dec 9, 2025

🚀 Deployed to production by https://github.com/thienlnam in version: 9.2.73-5 🚀

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

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.

6 participants