Skip to content

[Payment due @huult] Implement AddToDigitalWallet MFA scenario - #104179

Open
chuckdries wants to merge 5 commits into
mainfrom
chuckdries/mfa-tokenization
Open

chuckdries wants to merge 5 commits into
mainfrom
chuckdries/mfa-tokenization

Conversation

@chuckdries

@chuckdries chuckdries commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Require UK/EU Expensify cardholders to authenticate through the existing native MFA flow before adding their card to Apple Pay or Google Wallet. Failed or canceled platform authentication stops the flow before native wallet provisioning starts. Other cardholders retain the existing flow.

UK/EU requests to CreateDigitalWallet include a signed challenge and authentication method so the backend can route them internally.

  • Add AddToDigitalWallet scenario
  • Refresh payment methods only after successful native tokenization, retaining the existing iOS confirmation page
  • Keep a small cancellation signal between the MFA provider and wallet action. On Android, canceling while CreateDigitalWallet is pending prevents its eventual response from opening Google Wallet. This also covers offline cancellation.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/692372
PROPOSAL:

Tests

Add to wallet happy path Android

  1. Start with a user who has been issued a virtual Expensify Card on a UK or EU feed
  2. Go to Account > Wallet and press on the card
  3. Press "Add to Google Wallet" and complete the steps
  4. Verify that the card is added to Google Wallet
  5. When you go back to the app, verify that the "Let's authenticate you" screen disappears and leaves you on the card details page

Add to wallet happy path iOS

  1. Start with a user who has been issued a virtual Expensify Card on a UK or EU feed
  2. Go to Account > Wallet and press on the card
  3. Press "Add to Apple Pay" and complete the steps
  4. Verify that the card is added to Apple Pay
  5. When you go back to the app, verify that the "Let's authenticate you" screen disappears and you are taken to a screen that says "Your card has been added to Apple Wallet"
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

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 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 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)
  • 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)
  • 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.
  • 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
screen-20261020-084822-1792500452549.mp4
iOS: Native

@chuckdries chuckdries self-assigned this Oct 16, 2026
@codecov

codecov Bot commented Oct 16, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/components/AddToWalletButton/index.native.tsx 100.00% <100.00%> (+52.94%) ⬆️
...n/Context/MultifactorAuthenticationMainContext.tsx 88.14% <100.00%> (+61.16%) ⬆️
...hentication/config/scenarios/AddToDigitalWallet.ts 100.00% <100.00%> (ø)
...ultifactorAuthentication/config/scenarios/index.ts 100.00% <ø> (ø)
...ultifactorAuthentication/config/scenarios/names.ts 100.00% <ø> (ø)
...rc/libs/MultifactorAuthentication/shared/VALUES.ts 100.00% <ø> (ø)
src/libs/Wallet/WalletProvisioningError.ts 100.00% <100.00%> (ø)
src/libs/Wallet/index.ts 33.33% <100.00%> (+33.33%) ⬆️
...bs/actions/MultifactorAuthentication/processing.ts 100.00% <100.00%> (ø)
src/libs/actions/Wallet.ts 46.59% <100.00%> (+46.59%) ⬆️
... and 3 more
... and 408 files with indirect coverage changes

@chuckdries
chuckdries marked this pull request as ready for review October 16, 2026 04:00
@chuckdries
chuckdries requested review from a team as code owners October 16, 2026 04:00
@melvin-bot
melvin-bot Bot requested review from huult and removed request for a team October 16, 2026 04:00
@melvin-bot

melvin-bot Bot commented Oct 16, 2026

Copy link
Copy Markdown

@huult 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 joekaufmanexpensify and removed request for a team October 16, 2026 04:00
@huult

huult commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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: mWeb Safari
MacOS: Chrome / Safari

@chuckdries chuckdries changed the title Implement AddToDigitalWallet MFA scenario [HOLD Auth 25571] Implement AddToDigitalWallet MFA scenario Oct 16, 2026
Comment thread src/components/MultifactorAuthentication/config/scenarios/AddToDigitalWallet.ts Outdated
Comment thread src/libs/Wallet/index.ios.ts Outdated
@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-16T04:05:33.682308Z f2aef00 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@huult

huult commented Oct 16, 2026

Copy link
Copy Markdown
Contributor

Please tag me when it's ready for review. Thank you!

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@chuckdries chuckdries changed the title [HOLD Auth 25571] Implement AddToDigitalWallet MFA scenario Implement AddToDigitalWallet MFA scenario Oct 19, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🚧 chuckdries has triggered a test Expensify/App build. You can view the workflow run here.

@rafecolton rafecolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should fix the bug that causes the MFA error screen to show before the native digital wallet prompt appears. I tested it with this ad-hoc build

From my agent:

Cause: Hermes V1 has a compiler bug. An async arrow function with destructured params doesn’t pause at await. The await resumes at once with undefined. Your scenario action is written that way, so await handleAddCardToWallet(...) returned undefined immediately. MFA then reported failure while the wallet flow kept running in the background.

Why it shows on ad hoc builds: ad hoc builds rebuild the JS with Re.Pack, which keeps async functions as native async. Metro bundles convert async into generators, so they don’t hit the bug.

Verified:

  • I reproduced it locally with the same hermesc that ad hoc builds use, 250829098.0.14.
  • An ad hoc build with this fix behaved correctly on device. The action waited for the wallet flow, and the failure screen showed only after Apple’s error.

Fix: destructure in the body instead of in the params.

diff --git a/src/components/MultifactorAuthentication/config/scenarios/AddToDigitalWallet.ts b/src/components/MultifactorAuthentication/config/scenarios/AddToDigitalWallet.ts
index e3ed008bbb0..103b1bcda73 100644
--- a/src/components/MultifactorAuthentication/config/scenarios/AddToDigitalWallet.ts
+++ b/src/components/MultifactorAuthentication/config/scenarios/AddToDigitalWallet.ts
@@ -19,7 +19,9 @@ type Payload = {
 
 export default {
     allowedAuthenticationMethods: [CONST.MULTIFACTOR_AUTHENTICATION.TYPE.BIOMETRICS_HSM],
-    action: async ({card, cardHolderName, cardDescription, signedChallenge, authenticationMethod}, context) => {
+    // Hermes V1 does not suspend at await inside async arrows with destructured parameters, so destructure in the body.
+    action: async (params, context) => {
+        const {card, cardHolderName, cardDescription, signedChallenge, authenticationMethod} = params;
         try {
             const status = await handleAddCardToWallet(card, cardHolderName, cardDescription, {
                 authentication: {signedChallenge, authenticationMethod},

It also noted:

Separate issue: Apple still rejects the card after our backend returns Marqeta’s payload, with PKPassKitErrorDomain error 2. So the card add itself still fails.

@chuckdries chuckdries added the InternalQA This pull request required internal QA label Oct 20, 2026
@chuckdries

Copy link
Copy Markdown
Contributor Author

@huult this is ready for review! I know you don't have a UK Expensify Card, so just focus on the code

@huult

huult commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

Thanks! I’ll start reviewing now.

@huult huult left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM.

@melvin-bot
melvin-bot Bot requested a review from puneetlath October 20, 2026 14:57
@melvin-bot

melvin-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

@puneetlath 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 changed the title Implement AddToDigitalWallet MFA scenario [Payment due @huult] Implement AddToDigitalWallet MFA scenario Oct 20, 2026
@melvin-bot

melvin-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

🎯 @huult, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/692372.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

InternalQA This pull request required internal QA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants