Skip to content

Migrate ExpensifyCard/ConfirmationPage to Navigation-Based Validation#76241

Merged
mjasikowski merged 8 commits intoExpensify:mainfrom
software-mansion-labs:feat/migrate-issue-new-card-confirm-page-to-use-navigation
Dec 10, 2025
Merged

Migrate ExpensifyCard/ConfirmationPage to Navigation-Based Validation#76241
mjasikowski merged 8 commits intoExpensify:mainfrom
software-mansion-labs:feat/migrate-issue-new-card-confirm-page-to-use-navigation

Conversation

@jmusial
Copy link
Contributor

@jmusial jmusial commented Nov 27, 2025

Explanation of Change

Refactor ExpensifyCard/ConfirmationPage to use navigation based confirm modal page instead of modal based.

Fixed Issues

$ #75871

PROPOSAL:

Tests

  1. Open the app
  2. Create a workspace, enable Expensify card on it and add bank account
  3. Try to issue a card
  4. After the last step Confirm Magic code RHP should appear
  5. After typing in the code the card should be added

Offline tests

QA Steps

Same as tests

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
0076.android.native.mov
Android: mWeb Chrome
0076.android.chrome.mov
iOS: Native
0076.ios.native.mov
iOS: mWeb Safari
0076.ios.safari.mov
MacOS: Chrome / Safari
0076.desktop.chrome.mov

@codecov
Copy link

codecov bot commented Nov 27, 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% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 75.00% <ø> (ø)
...kspace/expensifyCard/issueNew/IssueNewCardPage.tsx 0.00% <ø> (ø)
src/ROUTES.ts 12.52% <0.00%> (-0.03%) ⬇️
...gation/AppNavigator/ModalStackNavigators/index.tsx 8.51% <0.00%> (-0.03%) ⬇️
...kspace/expensifyCard/issueNew/ConfirmationStep.tsx 0.00% <0.00%> (ø)
...Card/issueNew/IssueNewCardConfirmMagicCodePage.tsx 0.00% <0.00%> (ø)
... and 16 files with indirect coverage changes

@jmusial jmusial marked this pull request as ready for review November 28, 2025 09:45
@jmusial jmusial requested review from a team as code owners November 28, 2025 09:45
@melvin-bot melvin-bot bot requested review from JmillsExpensify and aimane-chnaif and removed request for a team November 28, 2025 09:46
@melvin-bot
Copy link

melvin-bot bot commented Nov 28, 2025

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

@melvin-bot melvin-bot bot requested review from a team and mjasikowski and removed request for a team November 28, 2025 09:46
@melvin-bot
Copy link

melvin-bot bot commented Nov 28, 2025

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

sendValidateCode={() => requestValidateCodeAction()}
validateCodeActionErrorField={data?.cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL ? 'createExpensifyCard' : 'createAdminIssuedVirtualCard'}
handleSubmitForm={handleSubmit}
validateError={validateError}
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-4 (docs)

The inline function () => setValidateError({}) creates a new function instance on every render, which causes child components to recreate their memoized callbacks that depend on clearError. This can trigger unnecessary re-renders.

Wrap this function with useCallback:

const clearError = useCallback(() => setValidateError({}), []);

Then pass it directly:

clearError={clearError}

@jmusial
Copy link
Contributor Author

jmusial commented Dec 1, 2025

I feel like PERF-4 sugesstions on this PR are an overkill, what do you think @aimane-chnaif ?

@aimane-chnaif
Copy link
Contributor

I feel like PERF-4 sugesstions on this PR are an overkill, what do you think @aimane-chnaif ?

first one seems overkill but others seem fine to me

Copy link
Contributor

@JmillsExpensify JmillsExpensify left a comment

Choose a reason for hiding this comment

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

Changes approved by product (though a product review isn't strictly required here).

@aimane-chnaif
Copy link
Contributor

@jmusial is there any way to skip onfido step?

Screenshot 2025-12-02 at 8 08 38 am

@aimane-chnaif
Copy link
Contributor

After adding bank account, it doesn't go to Issue card step.

Screen.Recording.2025-12-02.at.8.34.13.am.mov

Any way to test manually?

@jmusial
Copy link
Contributor Author

jmusial commented Dec 2, 2025

@jmusial is there any way to skip onfido step?

Screenshot 2025-12-02 at 8 08 38 am

You need to be on staging server & use those creds.

Sometimes it does not work, then create a new account and add the bank there

@jmusial
Copy link
Contributor Author

jmusial commented Dec 2, 2025

After adding bank account, it doesn't go to Issue card step.

Screen.Recording.2025-12-02.at.8.34.13.am.mov
Any way to test manually?

Maybe it's connected with onfido ?

@jmusial
Copy link
Contributor Author

jmusial commented Dec 2, 2025

I feel like PERF-4 sugesstions on this PR are an overkill, what do you think @aimane-chnaif ?

first one seems overkill but others seem fine to me

Ok will add them for the latter 2

@aimane-chnaif
Copy link
Contributor

After adding bank account, it doesn't go to Issue card step.
Screen.Recording.2025-12-02.at.8.34.13.am.mov
Any way to test manually?

Maybe it's connected with onfido ?

Onfido step was skipped using these credentials, and bank account was created successfully.

@jmusial
Copy link
Contributor Author

jmusial commented Dec 2, 2025

@jmusial
Copy link
Contributor Author

jmusial commented Dec 2, 2025

After adding bank account, it doesn't go to Issue card step.
Screen.Recording.2025-12-02.at.8.34.13.am.mov
Any way to test manually?

Maybe it's connected with onfido ?

Onfido step was skipped using these credentials, and bank account was created successfully.

Then dunno :( I had no issue with that

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Dec 3, 2025

I added bank account and it's verified. Now stuck on this page:

Screenshot 2025-12-03 at 7 06 33 pm

Is there any way to test manually? (even hardcoding condition)


I managed to test by hardcoding this change:

case CONST.EXPENSIFY_CARD.VERIFICATION_STATE.ON_WAITLIST:

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Dec 3, 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.mov
Android: mWeb Chrome
mchrome.mov
iOS: HybridApp
ios.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mov

@aimane-chnaif
Copy link
Contributor

The domain is not configured for Expensify Cards

@jmusial how can I bypass this?

Btw, there's regression from this PR.

The error message with RBR doesn't show after input correct magic code.

Screen.Recording.2025-12-04.at.9.59.00.am.mov

Works fine on main:

Screenshot 2025-12-04 at 10 04 58 am

@jmusial
Copy link
Contributor Author

jmusial commented Dec 4, 2025

The domain is not configured for Expensify Cards

@jmusial how can I bypass this?

Btw, there's regression from this PR.

The error message with RBR doesn't show after input correct magic code.

Screen.Recording.2025-12-04.at.9.59.00.am.mov
Works fine on main:

Screenshot 2025-12-04 at 10 04 58 am

Dunno about the domain :(
Will check on my non-company email. I assume swmansion domain has some extra config.

@jmusial
Copy link
Contributor Author

jmusial commented Dec 5, 2025

@aimane-chnaif did you have the issue when here on account verification you get response like:

{
    "jsonCode": 500,
    "message": "500 Failed to parse Marqeta response (httpResponseCode: 403, Response: HTTP\/1.1 403 Forbidden",
    "source": "auth-via-api",
    "onyxData": [],
    "requestID": "9a92ea3e2ec8bf8d-SJC"
}

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Dec 5, 2025

@aimane-chnaif did you have the issue when here on account verification you get response like:

{
    "jsonCode": 500,
    "message": "500 Failed to parse Marqeta response (httpResponseCode: 403, Response: HTTP\/1.1 403 Forbidden",
    "source": "auth-via-api",
    "onyxData": [],
    "requestID": "9a92ea3e2ec8bf8d-SJC"
}

No

yes, I just reproduced.

@jmusial
Copy link
Contributor Author

jmusial commented Dec 5, 2025

The domain is not configured for Expensify Cards

@jmusial how can I bypass this?

Btw, there's regression from this PR.

The error message with RBR doesn't show after input correct magic code.

Screen.Recording.2025-12-04.at.9.59.00.am.mov
Works fine on main:

Screenshot 2025-12-04 at 10 04 58 am

Ok, I think I fixed that one, can you check plz?

@aimane-chnaif
Copy link
Contributor

500 Failed to parse Marqeta response (httpResponseCode: 403, Response: HTTP/1.1 403 Forbidden

I got this now

@jmusial how did you bypass?

@jmusial
Copy link
Contributor Author

jmusial commented Dec 5, 2025

500 Failed to parse Marqeta response (httpResponseCode: 403, Response: HTTP/1.1 403 Forbidden

I got this now

@jmusial how did you bypass?

Didn't but found another error that weren't showing on this branch but visible on main and figured out what was the difference from there.

For one of my accounts, I'm getting this when issuing
image

@mjasikowski
Copy link
Contributor

@aimane-chnaif is there anything you need to finish reviewing here?

@aimane-chnaif
Copy link
Contributor

Currently blocked testing by this backend bug - #76324 (comment)

@aimane-chnaif
Copy link
Contributor

Cannot access offset of type string on string

@jmusial your bug was reported here.
Internal issue: https://github.com/Expensify/Expensify/issues/555406#issuecomment-3625323372

@aimane-chnaif
Copy link
Contributor

I managed to test by bypassing blocked issues.

Here's hardcoding steps:

  1. return CONST.EXPENSIFY_CARD.VERIFICATION_STATE.VERIFIED; early here: (to unblock marqeta 500 issue)

    const getVerificationState = () => {
    if (cardOnWaitlist) {
    return CONST.EXPENSIFY_CARD.VERIFICATION_STATE.ON_WAITLIST;
    }
    if (cardBankAccountMetadata?.isSuccess) {
    return CONST.EXPENSIFY_CARD.VERIFICATION_STATE.VERIFIED;
    }
    if (cardBankAccountMetadata?.isLoading) {
    return CONST.EXPENSIFY_CARD.VERIFICATION_STATE.LOADING;
    }
    return '';
    };

  2. remove Navigation.dismissModal(); to unblock "Issue new card" step not opening bug after click "Got it" in "Bank account verified" page

    onPress={() => {
    setIssueNewCardStepAndData({policyID, isChangeAssigneeDisabled: false});
    Navigation.dismissModal();
    Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID));
    }}

  3. add isSuccessful: true, here to unblock "Cannot access offset of type string on string" issue after input correct magic code. (leave as is to test the case of incorrect magic code)

    const failureData: OnyxUpdate[] = [
    {
    onyxMethod: Onyx.METHOD.MERGE,
    key: `${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`,
    value: {
    isLoading: false,
    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
    },
    },
    ];

@mjasikowski mjasikowski merged commit 819aede into Expensify:main Dec 10, 2025
31 checks passed
@OSBotify
Copy link
Contributor

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

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

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

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

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

}
if (backTo && shouldUseBackToParam) {
Navigation.goBack(backTo);
} else {
Copy link
Contributor

Choose a reason for hiding this comment

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

Came from this issue
We have a bit specific case when app reopens Expensify Card page after issuing card and swiping right on ios
More context here

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