Pass cardID in Apple Wallet CreateDigitalWallet request by mountiny · Pull Request #84091 · Expensify/App

mountiny · 2026-03-03T22:38:10Z

Explanation of Change

The Apple Wallet (iOS) flow calls CreateDigitalWallet without a cardID, so when a user has multiple OPEN virtual cards the backend defaults to tokenizing an arbitrary card instead of the one the user selected. The Google Wallet (Android) flow already passes cardID correctly.

This PR fixes the iOS flow by:

Adding cardID: number to CreateDigitalAppleWalletParams
Adding cardID as a required parameter to issuerEncryptPayloadCallback and forwarding it in the API request
Wrapping the callback in index.ios.ts with a closure that captures card.cardID from the calling scope

Fixed Issues

$ #73201

Tests

Have an account with multiple OPEN virtual cards (e.g. standard + single-use + expire-by)
Open the Expensify app on iOS
Navigate to a specific virtual card and tap "Add to Apple Wallet"
Verify the correct card (the one you selected) is added to Apple Wallet
Repeat for a different virtual card and verify it also adds correctly without "already in wallet" errors

Verify that no errors appear in the JS console

Offline tests

N/A — Apple Wallet provisioning requires an active network connection.

QA Steps

Use a test account with multiple OPEN virtual cards
Add one specific card to Apple Wallet — verify it is the correct card
Add a different card to Apple Wallet — verify it succeeds without "already in wallet" errors
Remove a card from Apple Wallet and re-add it — verify it works correctly

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

The iOS flow was not passing cardID to the backend, causing the wrong card to be tokenized when a user has multiple OPEN virtual cards. This matches the existing Google Wallet behavior. Made-with: Cursor

melvin-bot · 2026-03-03T22:38:17Z

@eh2077 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 · 2026-03-03T22:40:45Z

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

codecov · 2026-03-03T23:42:50Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/Wallet/index.ios.ts	`26.08% <0.00%> (ø)`
src/libs/actions/Wallet.ts	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

mountiny · 2026-03-04T21:21:32Z

@joekaufmanexpensify tried to test on the adhoc but seems like the vitual card tokenization does not work on adhocs so we will need to merge and test in staging

francoisl · 2026-03-04T21:23: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
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 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: mWeb Safari

MacOS: Chrome / Safari

OSBotify · 2026-03-04T21:36:22Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-03-04T21:43:57Z

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

github-actions · 2026-03-04T21:48:51Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #84091.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f31a7c9-34c44ab-559517d484b71b38021b706d5f651f2491e6b44f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f31a7c9-34c44ab-03677b4667338034365195a66f5f3749c1886768/index.html

Web 🕸️
https://84091.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-06T04:16:12Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.32-0 🚀

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

joekaufmanexpensify · 2026-03-06T18:36:22Z

Not working as expected. I added the tokenize 1 card to apple pay. It worked. However, afterwards, we didn't show that it'd been added to apple pay. Meanwhile, the tokenize 2 card (not added to apple pay) says it was in Expensify and I cannot proceed with adding it. If I then try to add tokenize 1 again, I get an error saying it was already added.

mountiny · 2026-03-06T21:02:56Z

Noted in Slack, but seems like Joe tested on previous staging version before this PR so we need to retest on the correct version

OSBotify · 2026-03-06T22:45:25Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

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

joekaufmanexpensify · 2026-03-09T15:26:36Z

Retested today and the fix is working. I was able to tokenize multiple virtual cards from the same account to Apple pay 👍

Pass cardID in Apple Wallet CreateDigitalWallet request

3466e2f

The iOS flow was not passing cardID to the backend, causing the wrong card to be tokenized when a user has multiple OPEN virtual cards. This matches the existing Google Wallet behavior. Made-with: Cursor

mountiny requested review from a team as code owners March 3, 2026 22:38

melvin-bot bot assigned mountiny Mar 3, 2026

melvin-bot bot requested review from eh2077 and joekaufmanexpensify and removed request for a team March 3, 2026 22:38

melvin-bot bot removed the request for review from a team March 3, 2026 22:38

mountiny added the InternalQA This pull request required internal QA label Mar 3, 2026

This comment has been minimized.

Sign in to view

luacmartins approved these changes Mar 4, 2026

View reviewed changes

francoisl approved these changes Mar 4, 2026

View reviewed changes

mountiny merged commit f31a7c9 into main Mar 4, 2026
34 of 36 checks passed

mountiny deleted the vit-appleWallet-passCardID branch March 4, 2026 21:25

OSBotify mentioned this pull request Mar 6, 2026

Deploy Checklist: New Expensify 2026-03-06 #84352

Closed

92 tasks

melvin-bot bot mentioned this pull request Mar 6, 2026

Fix inconsistencies in the Add card to apple wallet flow #73201

Open

Conversation

mountiny commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 3, 2026

Uh oh!

github-actions bot commented Mar 3, 2026

Uh oh!

This comment has been minimized.

codecov bot commented Mar 3, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mountiny commented Mar 4, 2026

Uh oh!

francoisl commented Mar 4, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Mar 4, 2026

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

joekaufmanexpensify commented Mar 6, 2026

Uh oh!

mountiny commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

joekaufmanexpensify commented Mar 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mountiny commented Mar 3, 2026 •

edited

Loading

codecov bot commented Mar 3, 2026 •

edited by github-actions bot

Loading