Format phone numbers in account switcher menu items by MelvinBot · Pull Request #86741 · Expensify/App

MelvinBot · 2026-03-31T14:52:57Z

Explanation of Change

When a Copilot account is registered with a phone number and has no custom display name set, the backend sets displayName equal to the full login (e.g., +15857527441@expensify.sms). The account switcher popover's createBaseMenuItem function used this raw value directly, causing the @expensify.sms suffix to appear in the menu.

This PR wraps both the text and description fields in createBaseMenuItem with formatPhoneNumber(), which strips the @expensify.sms suffix and formats the number for the user's locale. It safely passes through non-phone strings unchanged, so email-based accounts are unaffected.

Fixed Issues

$ #86308
PROPOSAL: #86308 (comment)

Tests

Sign in with a phone number that has no custom display name set
Set up a Copilot delegator that is a phone number account with no display name
Open the account switcher (click avatar area > Switch accounts)
Verify the copilot phone number account shows a formatted phone number (e.g., +1 585-752-7441) instead of +15857527441@expensify.sms
Verify email-based accounts still display correctly

Verify that no errors appear in the JS console

Offline tests

N/A - This is a display-only change that uses data already available locally. No network requests involved.

QA Steps

Sign in with a phone number Copilot account that has no custom display name
Open the account switcher
Verify the phone number is displayed without @expensify.sms and is formatted properly
Verify email-based accounts still display correctly in the switcher

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

Wrap the text and description fields in createBaseMenuItem with formatPhoneNumber so that copilot accounts registered with phone numbers show a formatted number instead of the raw login with @expensify.sms. Co-authored-by: Eric Han <eh2077@users.noreply.github.com>

codecov · 2026-03-31T15:02:46Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/AccountSwitcher.tsx	`0.00% <0.00%> (ø)`
... and 566 files with indirect coverage changes

eh2077 · 2026-04-02T14:20:23Z

@MelvinBot Please mark it ready for review

MelvinBot · 2026-04-02T14:22:04Z

PR has been marked as ready for review! 🚀

melvin-bot · 2026-04-02T14:22:06Z

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

eh2077 · 2026-04-02T14:52:31Z

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

Screen.Recording.2026-04-07.at.9.20.47.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-04-07.at.9.13.39.PM.mov

iOS: HybridApp

Screen.Recording.2026-04-07.at.9.18.09.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-04-07.at.9.12.53.PM.mov

MacOS: Chrome / Safari

eh2077 · 2026-04-02T14:52:53Z

@MelvinBot Can you add unit test to cover the change?

Adds two test cases to LocalePhoneNumberTest covering the @expensify.sms domain scenario used by the AccountSwitcher: a US number formatted locally and a foreign number formatted internationally. Co-authored-by: Eric Han <eh2077@users.noreply.github.com>

melvin-bot · 2026-04-02T14:59:47Z

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

MelvinBot · 2026-04-02T14:59:48Z

Added unit tests for the formatPhoneNumber SMS domain behavior in tests/unit/LocalePhoneNumberTest.ts:

US number with @expensify.sms: verifies +15857527441@expensify.sms → (585) 752-7441
Foreign number with @expensify.sms: verifies +34702474537@expensify.sms → +34 702 47 45 37

These test the exact formatting behavior that createBaseMenuItem now relies on — stripping the SMS domain and formatting phone numbers for display in the account switcher.

Valforte · 2026-04-07T13:00:23Z

@eh2077 is this ready to review? I'm waiting on the checklist

eh2077 · 2026-04-07T13:04:13Z

src/components/AccountSwitcher.tsx

-            text: personalDetails?.displayName ?? personalDetails?.login ?? '',
-            description: Str.removeSMSDomain(personalDetails?.login ?? ''),
+            text: formatPhoneNumber(personalDetails?.displayName ?? personalDetails?.login ?? ''),
+            description: formatPhoneNumber(personalDetails?.login ?? ''),


@MelvinBot don't change this line

Reverted — the text line now uses the original expression without formatPhoneNumber.

@MelvinBot No, only format the text prop with method formatPhoneNumber. Don't change formatting for the description prop.

Done — text now uses formatPhoneNumber, and description is back to Str.removeSMSDomain.

Display names should not be formatted as phone numbers. Co-authored-by: Eric Han <eh2077@users.noreply.github.com>

MelvinBot · 2026-04-07T13:07:37Z

The only failing check is PR Reviewer Checklist — the reviewer (Valforte) hasn't completed their checklist yet (0/57 items checked). This is not a code issue and doesn't require a fix.

All code checks (tests, ESLint, typecheck, prettier, etc.) are passing.

…or description Co-authored-by: Eric Han <eh2077@users.noreply.github.com>

eh2077

works well.

@Valforte sorry for the delay, checklist is here #86741 (comment), thanks!

github-actions · 2026-04-08T19:40:37Z

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

github-actions · 2026-04-08T19:46:07Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d441395-77157b8-a18fb4530859148d3f4a352c390730bfdb066fc8/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d441395-77157b8-a1df5cc394215b2829f94b1402aaea1ef2f2c1dc/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-08T19:48:59Z

✋ 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-09T00:57:18Z

🚀 Deployed to staging by https://github.com/Valforte in version: 9.3.55-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-09T01:02:16Z

No help site changes required.

This PR fixes a display formatting bug — it wraps phone-number display names with formatPhoneNumber() in AccountSwitcher.tsx to strip the @expensify.sms suffix. No new features, settings, labels, or user flows were added or changed.

I reviewed the relevant help article (docs/articles/new-expensify/settings/Copilot-Access.md) and confirmed it describes the Copilot account-switching workflow at a high level without referencing specific phone number formatting. The fix is purely cosmetic and doesn't affect any content documented on the help site.

MelvinBot assigned eh2077 Mar 31, 2026

MelvinBot requested a review from a team March 31, 2026 14:53

MelvinBot mentioned this pull request Mar 31, 2026

[$250] Copilot - Account switcher shows @expensify.sms when account is phone number #86308

Open

7 tasks

MelvinBot marked this pull request as ready for review April 2, 2026 14:21

MelvinBot requested a review from a team as a code owner April 2, 2026 14:22

melvin-bot bot requested review from eh2077 and trjExpensify and removed request for a team April 2, 2026 14:22

MelvinBot requested a review from a team as a code owner April 2, 2026 14:59

melvin-bot bot requested review from Valforte and removed request for a team April 2, 2026 14:59

eh2077 reviewed Apr 7, 2026

View reviewed changes

Revert text line to not use formatPhoneNumber

f5b806e

Display names should not be formatted as phone numbers. Co-authored-by: Eric Han <eh2077@users.noreply.github.com>

Apply formatPhoneNumber to text prop only, keep Str.removeSMSDomain f…

36db0c4

…or description Co-authored-by: Eric Han <eh2077@users.noreply.github.com>

eh2077 approved these changes Apr 7, 2026

View reviewed changes

Valforte approved these changes Apr 8, 2026

View reviewed changes

Valforte merged commit d441395 into main Apr 8, 2026
35 of 36 checks passed

Valforte deleted the claude-fixAccountSwitcherSmsDisplay branch April 8, 2026 19:39

OSBotify mentioned this pull request Apr 9, 2026

Deploy Checklist: New Expensify 2026-04-09 #87435

Open

62 tasks

Conversation

MelvinBot commented Mar 31, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Mar 31, 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!

eh2077 commented Apr 2, 2026

Uh oh!

MelvinBot commented Apr 2, 2026

Uh oh!

melvin-bot bot commented Apr 2, 2026

Uh oh!

eh2077 commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 commented Apr 2, 2026

Uh oh!

melvin-bot bot commented Apr 2, 2026

Uh oh!

MelvinBot commented Apr 2, 2026

Uh oh!

Valforte commented Apr 7, 2026

Uh oh!

eh2077 Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

eh2077 Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 7, 2026

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 8, 2026

Uh oh!

github-actions bot commented Apr 8, 2026

Uh oh!

OSBotify commented Apr 8, 2026

Uh oh!

OSBotify commented Apr 9, 2026

Uh oh!

MelvinBot commented Apr 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Mar 31, 2026 •

edited by github-actions bot

Loading

eh2077 commented Apr 2, 2026 •

edited

Loading