Merge pull request Expensify#82695 from Expensify/claude-fixUSPhoneValidationForTerritories

Accept US territory phone numbers in wallet phone validation

Author: AndrewGable

src/CONST/index.ts

@@ -802,6 +802,8 @@ const CONST = {
         PR: 'PR',
         GU: 'GU',
         VI: 'VI',
+        AS: 'AS',
+        MP: 'MP',
     },
     SWIPE_DIRECTION: {
         DOWN: 'down',

src/libs/ValidationUtils.ts

@@ -321,7 +321,11 @@ function isValidUSPhone(phoneNumber = '', isCountryCodeOptional?: boolean): bool
     }
 
     const parsedPhoneNumber = parsePhoneNumber(phone, {regionCode});
-    return parsedPhoneNumber.possible && parsedPhoneNumber.regionCode === CONST.COUNTRY.US;
+
+    // US territories share the +1 country calling code but have their own ISO region codes.
+    // We accept these as valid US phone numbers for wallet/bank account verification.
+    const validUSRegionCodes: string[] = [CONST.COUNTRY.US, CONST.COUNTRY.PR, CONST.COUNTRY.GU, CONST.COUNTRY.VI, CONST.COUNTRY.AS, CONST.COUNTRY.MP];
+    return parsedPhoneNumber.possible && validUSRegionCodes.includes(parsedPhoneNumber.regionCode ?? '');
 }
 
 function isValidPhoneNumber(phoneNumber: string): boolean {

tests/unit/ValidationUtilsTest.ts

@@ -17,6 +17,7 @@ import {
     isValidRegistrationNumber,
     isValidRoomName,
     isValidTwoFactorCode,
+    isValidUSPhone,
     isValidWebsite,
     meetsMaximumAgeRequirement,
     meetsMinimumAgeRequirement,
@@ -552,6 +553,40 @@ describe('ValidationUtils', () => {
         });
     });
 
+    describe('isValidUSPhone', () => {
+        test('Should return true for a standard US phone number', () => {
+            expect(isValidUSPhone('+12018675309')).toBe(true);
+        });
+
+        test('Should return true for a Puerto Rico phone number', () => {
+            expect(isValidUSPhone('+17873464732')).toBe(true);
+        });
+
+        test('Should return true for a US Virgin Islands phone number', () => {
+            expect(isValidUSPhone('+13405551234')).toBe(true);
+        });
+
+        test('Should return true for a Guam phone number', () => {
+            expect(isValidUSPhone('+16715551234')).toBe(true);
+        });
+
+        test('Should return true for a Northern Mariana Islands phone number', () => {
+            expect(isValidUSPhone('+16705551234')).toBe(true);
+        });
+
+        test('Should return false for a Canadian phone number', () => {
+            expect(isValidUSPhone('+14165551234')).toBe(false);
+        });
+
+        test('Should return false for a UK phone number', () => {
+            expect(isValidUSPhone('+442071234567')).toBe(false);
+        });
+
+        test('Should return false for an empty string', () => {
+            expect(isValidUSPhone('')).toBe(false);
+        });
+    });
+
     describe('isInvalidMerchantValue', () => {
         test('Valid merchnt name', () => {
             expect(isInvalidMerchantValue('test name')).toBe(false);