Skip to content

Accept US territory phone numbers in wallet phone validation#82695

Merged
AndrewGable merged 5 commits intomainfrom
claude-fixUSPhoneValidationForTerritories
Feb 19, 2026
Merged

Accept US territory phone numbers in wallet phone validation#82695
AndrewGable merged 5 commits intomainfrom
claude-fixUSPhoneValidationForTerritories

Conversation

@MelvinBot
Copy link
Contributor

@MelvinBot MelvinBot commented Feb 17, 2026 •
edited by cead22
Loading

Explanation of Change

This change updates isValidUSPhone to accept region codes for US territories (PR, GU, VI, AS, MP) in addition to US.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/599685
PROPOSAL: https://github.com/Expensify/Expensify/issues/599685#issuecomment-3900380030

Tests

Unit tests are added to verify the fix works for all US territory area codes and that non-US countries (e.g., Canada, UK) are still correctly rejected.

Manual:

  1. Open the app and navigate to the Enable Payments / Wallet setup flow
  2. On the phone number step, enter a Puerto Rico phone number in E.164 format (e.g., +17873464732)
  3. Verify the phone number is accepted without error
  4. Enter a standard US phone number (e.g., +12018675309)
  5. Verify the phone number is accepted without error
  6. Enter a Canadian phone number (e.g., +14165551234)
  7. Verify the phone number is rejected with a validation error
  • Verify that no errors appear in the JS console

Offline tests

N/A — phone number validation is a client-side synchronous check that does not depend on network state.

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

N/A — no UI changes, validation logic only

Android: mWeb Chrome

N/A — no UI changes, validation logic only

iOS: Native

N/A — no UI changes, validation logic only

iOS: mWeb Safari

N/A — no UI changes, validation logic only

MacOS: Chrome / Safari

N/A — no UI changes, validation logic only

@MelvinBot @lydiabarclay
Accept US territory phone numbers in isValidUSPhone validation
35415b1 
The isValidUSPhone function previously required region code to be
exactly 'US', which rejected valid phone numbers from US territories
that share the +1 country code but have their own ISO region codes
(e.g., PR for Puerto Rico, GU for Guam). This caused users in
Puerto Rico to see "Please enter a complete phone number" errors
when trying to add their phone for bank account verification.

Co-authored-by: Lydia Barclay <lydiabarclay@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team February 17, 2026 17:39
MelvinBot and others added 2 commits February 17, 2026 17:59
@MelvinBot @lydiabarclay
Merge branch 'main' into claude-fixUSPhoneValidationForTerritories
ab2ca38 
Co-authored-by: Lydia Barclay <lydiabarclay@users.noreply.github.com>
@MelvinBot @lydiabarclay
Fix: Use onyxData prefix for optimisticData/successData/failureData i…
fc1dc82 
…n Split.ts

The isLastTransactionInReport block referenced bare optimisticData,
successData, and failureData variables which don't exist in the
updateSplitTransactions scope. Changed to onyxData.optimisticData?,
onyxData.successData?, and onyxData.failureData? to match the
existing pattern in this function.

Co-authored-by: Lydia Barclay <lydiabarclay@users.noreply.github.com>
@MelvinBot

This comment was marked as resolved.

Sign in to view
@MelvinBot

This comment was marked as resolved.

Sign in to view
@codecov
Copy link

codecov bot commented Feb 17, 2026 •
edited by github-actions bot
Loading

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/CONST/index.ts 87.39% <ø> (ø)
src/libs/ValidationUtils.ts 50.00% <100.00%> (+2.20%) ⬆️
src/libs/actions/IOU/Split.ts 68.54% <0.00%> (-0.05%) ⬇️
... and 86 files with indirect coverage changes

@cead22
Copy link
Contributor

cead22 commented Feb 17, 2026

@MelvinBot upate const validUSRegionCodes = [CONST.COUNTRY.US, CONST.COUNTRY.PR, CONST.COUNTRY.GU, CONST.COUNTRY.VI, 'AS', 'MP']; to use consts for 'AS' and 'MP', and update src/CONST/index.ts accordingly

Also update tests to remove the bits in parenthesis in the test description, eg, 'Should return true for a Puerto Rico phone number (+1-787)' => 'Should return true for a Puerto Rico phone number', Should return true for a Guam phone number (+1-671) => Should return true for a Guam phone number

@MelvinBot @cead22
Use CONST.COUNTRY for AS and MP, clean up test descriptions
67a3152 
- Add AS (American Samoa) and MP (Northern Mariana Islands) to
  CONST.COUNTRY in src/CONST/index.ts
- Update validUSRegionCodes to use CONST.COUNTRY.AS and CONST.COUNTRY.MP
  instead of string literals
- Remove parenthesized area codes from test descriptions

Co-authored-by: Carlos Alvarez <cead22@users.noreply.github.com>
@MelvinBot

This comment was marked as resolved.

Sign in to view
@MelvinBot @lydiabarclay
Fix: Add explicit string[] type to validUSRegionCodes array
4625fa4 
The array's element type was inferred as a narrow union of string
literals from CONST.COUNTRY, causing Array.includes() to reject
the generic string from parsedPhoneNumber.regionCode.

Co-authored-by: Lydia Barclay <lydiabarclay@users.noreply.github.com>
@MelvinBot

This comment was marked as resolved.

Sign in to view
@cead22 cead22 assigned cead22 and unassigned lydiabarclay Feb 19, 2026
@cead22 cead22 requested a review from eh2077 February 19, 2026 04:37
@eh2077
Copy link
Contributor

eh2077 commented Feb 19, 2026

@MelvinBot please mark this PR ready for review

@MelvinBot MelvinBot marked this pull request as ready for review February 19, 2026 13:57
@MelvinBot MelvinBot requested a review from a team as a code owner February 19, 2026 13:57
@melvin-bot melvin-bot bot requested review from Krishna2323 and heyjennahay and removed request for a team February 19, 2026 13:57
@melvin-bot
Copy link

melvin-bot bot commented Feb 19, 2026

@Krishna2323 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 removed the request for review from a team February 19, 2026 13:57
@MelvinBot
Copy link
Contributor Author

MelvinBot commented Feb 19, 2026

Done — PR has been marked as ready for review.

@eh2077
Copy link
Contributor

eh2077 commented Feb 19, 2026 •
edited
Loading

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-02-20.at.12.15.42.AM.mov
Android: mWeb Chrome
Screen.Recording.2026-02-20.at.12.16.54.AM.mov
iOS: HybridApp
Screen.Recording.2026-02-20.at.12.18.59.AM.mov
iOS: mWeb Safari
Screen.Recording.2026-02-20.at.12.20.09.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-02-20.at.12.09.46.AM.mov

@eh2077
Copy link
Contributor

eh2077 commented Feb 19, 2026

@Krishna2323 sorry for the ping, I'll take care of the C+ review for it.

eh2077
eh2077 approved these changes Feb 19, 2026
View reviewed changes
Copy link
Contributor

@eh2077 eh2077 left a comment

Choose a reason for hiding this comment

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

Looks good and works well!

@melvin-bot
Copy link

melvin-bot bot commented Feb 19, 2026

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

An E/App issue has been created to issue payment here: #82959.

@melvin-bot melvin-bot bot mentioned this pull request Feb 19, 2026
Closed
@AndrewGable AndrewGable merged commit e48c614 into main Feb 19, 2026
36 checks passed
@AndrewGable AndrewGable deleted the claude-fixUSPhoneValidationForTerritories branch February 19, 2026 21:54
@github-actions
Copy link
Contributor

github-actions bot commented Feb 19, 2026

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

@github-actions
Copy link
Contributor

github-actions bot commented Feb 19, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e48c614-1fe8027-9f4bae31f0820d093e22a2b27ecdb8bdf6cea757/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e48c614-1fe8027-8970d98e20f59e4f456faea2d2ac963d5f0195ce/index.html
Android iOS
Web 🕸️
https://82695.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify
Copy link
Contributor

OSBotify commented Feb 19, 2026

✋ 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 OSBotify mentioned this pull request Feb 20, 2026
Closed
67 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Feb 20, 2026

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.3.24-1 🚀

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

@nlemma nlemma mentioned this pull request Feb 20, 2026
Closed
7 tasks
@nlemma
Copy link

nlemma commented Feb 20, 2026

@cead22 @AndrewGable @Krishna2323 @heyjennahay this PR is failing with #83090

@nlemma
Copy link

nlemma commented Feb 20, 2026

Please disregard the previous comment. The testers got a bit mixed up with the steps. I've already sorted this out and closed the issue.

@OSBotify
Copy link
Contributor

OSBotify commented Feb 23, 2026

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.24-3 🚀

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

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

Reviewers

@cead22 cead22 cead22 approved these changes

@AndrewGable AndrewGable AndrewGable approved these changes

@Krishna2323 Krishna2323 Awaiting requested review from Krishna2323

@heyjennahay heyjennahay Awaiting requested review from heyjennahay

+1 more reviewer

@eh2077 eh2077 eh2077 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cead22 cead22

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@MelvinBot @cead22 @eh2077 @OSBotify @nlemma @AndrewGable @lydiabarclay