Use usePrimaryContactMethod fallback on magic code pages after copilot switch by MelvinBot · Pull Request #87711 · Expensify/App

MelvinBot · 2026-04-11T17:41:02Z

Explanation of Change

After switching back from a copilot account, Delegate.disconnect() calls Onyx.clear() which wipes ONYXKEYS.ACCOUNT (including primaryLogin) before the async openApp() response repopulates it. This left the email field blank on magic code pages that read account.primaryLogin without a fallback.

This PR replaces direct account.primaryLogin reads with the existing usePrimaryContactMethod hook in two affected pages. The hook falls back to session.email, which is preserved through delegate switching via KEYS_TO_PRESERVE_DELEGATE_ACCESS.

Files changed:

MissingPersonalDetailsMagicCodePage.tsx — replaced useOnyx(ONYXKEYS.ACCOUNT, {selector: primaryLoginSelector}) with usePrimaryContactMethod()
MultifactorAuthentication/ValidateCodePage.tsx — replaced account?.primaryLogin ?? '' with usePrimaryContactMethod()

Fixed Issues

$ #87408
PROPOSAL: #87408 (comment)

Tests

As an admin, issue a physical card to a member
As admin, add that member as a copilot
Log in as the member
Open account switcher, select the admin account
Open account switcher, select the member account to switch back
Go to the workspace chat and click "Add shipping details"
Complete the flow until the magic code page
Verify the email address is displayed on the magic code page (not blank)

Verify that no errors appear in the JS console

Offline tests

N/A - The issue is caused by async Onyx state after copilot switching, not network state.

QA Steps

Same as tests above.

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

…ic code pages After switching back from a copilot account, account.primaryLogin is temporarily wiped by Onyx.clear in Delegate.disconnect(). This left the magic code email field blank on MissingPersonalDetailsMagicCodePage and MultifactorAuthentication ValidateCodePage. Replace direct account.primaryLogin reads with the existing usePrimaryContactMethod hook, which falls back to session.email (preserved through delegate switching). Co-authored-by: Shridhar Goel <ShridharGoel@users.noreply.github.com>

ShridharGoel · 2026-04-12T17:54:09Z

@MelvinBot Mark this as ready for review

MelvinBot · 2026-04-12T17:55:22Z

🤖 I attempted to mark this PR as ready for review, but I don't have the required permissions to do so in this environment. Please mark it as ready for review manually using the GitHub UI or by running gh pr ready 87711 locally.

ShridharGoel · 2026-04-12T18:37:50Z

@MelvinBot Try again

MelvinBot · 2026-04-12T18:39:04Z

🤖 Done! This PR has been marked as ready for review.

melvin-bot · 2026-04-12T18:39:06Z

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

ShridharGoel · 2026-04-12T18:49:43Z

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

Screen.Recording.2026-04-13.at.12.19.05.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-04-13.at.12.15.12.AM.mov

iOS: HybridApp

iOS: mWeb Safari

Screen.Recording.2026-04-13.at.12.11.53.AM.mov

MacOS: Chrome / Safari

ShridharGoel · 2026-04-12T18:52:32Z

@MelvinBot Is this change needed in other places also like ReportCardLostConfirmMagicCodePage.tsx, ReportVirtualCardFraudVerifyAccountPage.tsx, and TravelCVVVerifyAccountPage.tsx ?

MelvinBot · 2026-04-12T18:54:02Z

Yes, all three files have the same vulnerable pattern (account?.primaryLogin ?? '' with no fallback to session.email) and should be updated to use usePrimaryContactMethod():

ReportCardLostConfirmMagicCodePage.tsx:32 — const primaryLogin = account?.primaryLogin ?? '';
ReportVirtualCardFraudVerifyAccountPage.tsx:34 — const primaryLogin = account?.primaryLogin ?? '';
TravelCVVVerifyAccountPage.tsx:27 — const primaryLogin = account?.primaryLogin ?? '';

ShridharGoel · 2026-04-12T19:37:57Z

@MelvinBot Ok then update them as well

Replace account?.primaryLogin with usePrimaryContactMethod() in ReportCardLostConfirmMagicCodePage, ReportVirtualCardFraudVerifyAccountPage, and TravelCVVVerifyAccountPage to fix the same copilot-switch blank email issue. Co-authored-by: Shridhar Goel <ShridharGoel@users.noreply.github.com>

MelvinBot · 2026-04-12T19:41:22Z

Updated the three additional files to use usePrimaryContactMethod() instead of account?.primaryLogin ?? '':

ReportCardLostConfirmMagicCodePage.tsx
ReportVirtualCardFraudVerifyAccountPage.tsx
TravelCVVVerifyAccountPage.tsx

melvin-bot · 2026-04-12T19:41:52Z

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

codecov · 2026-04-12T19:49:37Z

Codecov Report

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

Files with missing lines	Coverage Δ
...nalDetails/MissingPersonalDetailsMagicCodePage.tsx	`0.00% <ø> (ø)`
...ges/MultifactorAuthentication/ValidateCodePage.tsx	`0.00% <ø> (ø)`
...pensifyCardPage/ExpensifyCardVerifyAccountPage.tsx	`0.00% <ø> (ø)`
...ings/Wallet/ReportCardLostConfirmMagicCodePage.tsx	`0.00% <0.00%> (ø)`
...Wallet/ReportVirtualCardFraudVerifyAccountPage.tsx	`0.00% <0.00%> (ø)`
...allet/TravelCVVPage/TravelCVVVerifyAccountPage.tsx	`0.00% <0.00%> (ø)`
... and 20 files with indirect coverage changes

ShridharGoel · 2026-04-12T20:14:47Z

@MelvinBot Fix it in ExpensifyCardVerifyAccountPage.tsx as well

Co-authored-by: Shridhar Goel <ShridharGoel@users.noreply.github.com>

MelvinBot · 2026-04-12T20:17:20Z

Applied the same usePrimaryContactMethod() fix to ExpensifyCardVerifyAccountPage.tsx — replaced useOnyx(ONYXKEYS.ACCOUNT) + account?.primaryLogin ?? '' with the hook.

trjExpensify

Makes sense, weird one. 👍

github-actions · 2026-04-13T12:32:25Z

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

github-actions · 2026-04-13T12:37:01Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f896ffc-08ff3fc-04451a178139ff3470d2e24b3c6115cdb2a6aebe/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f896ffc-08ff3fc-7d1a95eb7751d7cae4988e2d4baeac7a1bbd45f3/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-13T12:40:25Z

✋ 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 · 2026-04-13T20:35:54Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.59-0 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot · 2026-04-13T20:37:19Z

No help site changes are required for this PR.

The changes are purely internal — they replace how the primary email is sourced on magic code pages (switching from account.primaryLogin to the usePrimaryContactMethod() hook for resilience after copilot switching). This doesn't alter any user-facing behavior, UI labels, feature names, or documented workflows. The fix ensures the email field displays correctly in an edge case; the user experience remains the same.

OSBotify · 2026-04-16T03:32:35Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.59-4 🚀

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

MelvinBot assigned ShridharGoel Apr 11, 2026

MelvinBot requested a review from a team April 11, 2026 17:41

MelvinBot mentioned this pull request Apr 11, 2026

[Due for payment 2026-04-23] [$250] Expensify Card - Email is not shown on magic code page after switching to copilot account #87408

Closed

7 tasks

MelvinBot marked this pull request as ready for review April 12, 2026 18:39

MelvinBot requested a review from a team as a code owner April 12, 2026 18:39

melvin-bot Bot requested review from ShridharGoel and trjExpensify and removed request for a team April 12, 2026 18:39

melvin-bot Bot removed the request for review from a team April 12, 2026 18:39

MelvinBot requested a review from a team as a code owner April 12, 2026 19:41

melvin-bot Bot requested review from JS00001 and removed request for a team April 12, 2026 19:41

Use usePrimaryContactMethod in ExpensifyCardVerifyAccountPage

bbdeb8d

Co-authored-by: Shridhar Goel <ShridharGoel@users.noreply.github.com>

ShridharGoel approved these changes Apr 12, 2026

View reviewed changes

trjExpensify approved these changes Apr 13, 2026

View reviewed changes

JS00001 approved these changes Apr 13, 2026

View reviewed changes

JS00001 merged commit f896ffc into main Apr 13, 2026
37 checks passed

JS00001 deleted the claude-fixMagicCodeEmailAfterCopilotSwitch branch April 13, 2026 12:31

OSBotify mentioned this pull request Apr 13, 2026

Deploy Checklist: New Expensify 2026-04-13 #87792

Closed

89 tasks

Uh oh!

Conversation

MelvinBot commented Apr 11, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

ShridharGoel commented Apr 12, 2026

Uh oh!

MelvinBot commented Apr 12, 2026

Uh oh!

ShridharGoel commented Apr 12, 2026

Uh oh!

MelvinBot commented Apr 12, 2026

Uh oh!

melvin-bot Bot commented Apr 12, 2026

Uh oh!

ShridharGoel commented Apr 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

ShridharGoel commented Apr 12, 2026

Uh oh!

MelvinBot commented Apr 12, 2026

Uh oh!

ShridharGoel commented Apr 12, 2026

Uh oh!

MelvinBot commented Apr 12, 2026

Uh oh!

melvin-bot Bot commented Apr 12, 2026

Uh oh!

codecov Bot commented Apr 12, 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!

ShridharGoel commented Apr 12, 2026

Uh oh!

MelvinBot commented Apr 12, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

MelvinBot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Apr 12, 2026 •

edited by github-actions Bot

Loading