Send E.164 phone number from the personal bank account update flow

The update flow stripped the calling code with parsePhoneNumber().number.significant,
so a UK number was sent as 10 bare digits and the BE read it as NANP. Reuse
formatE164PhoneNumber() so this flow matches the add flow.

Author: mountiny

src/pages/settings/Wallet/UpdatePersonalBankAccountPage.tsx

@@ -12,8 +12,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getCompletedStepsForBankAccount} from '@libs/BankAccountUtils';
 import Log from '@libs/Log';
+import {formatE164PhoneNumber} from '@libs/LoginUtils';
 import {getCurrentAddress, getStreetLines} from '@libs/PersonalDetailsUtils';
-import {parsePhoneNumber} from '@libs/PhoneNumber';
 
 import Navigation from '@navigation/Navigation';
 
@@ -111,6 +111,7 @@ function UpdatePersonalBankAccountPage() {
     const [homeAddressDraft] = useOnyx(ONYXKEYS.FORMS.HOME_ADDRESS_FORM_DRAFT);
     const [personalBankAccount, personalBankAccountResult] = useOnyx(ONYXKEYS.PERSONAL_BANK_ACCOUNT);
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
 
     const shouldShowSuccess = personalBankAccount?.shouldShowSuccess ?? false;
     const bankAccountID = personalBankAccount?.bankAccountID;
@@ -196,9 +197,10 @@ function UpdatePersonalBankAccountPage() {
             addressZipCode = '';
         }
 
+        // The BE reads companyPhone as the Plaid phone_number and assumes +1 for a bare 10 digit value, so send E.164.
+        // The form draft holds whatever the user typed, which can lack a calling code, so apply the country code here.
         const rawPhone = personalBankAccountDraft?.phoneNumber ?? privatePersonalDetails?.phoneNumber ?? existingData?.companyPhone ?? '';
-        const parsed = parsePhoneNumber(rawPhone, {regionCode: CONST.COUNTRY.US});
-        const phoneNumber = parsed.number?.significant ?? '';
+        const phoneNumber = formatE164PhoneNumber(rawPhone, countryCode) ?? '';
 
         updatePersonalBankAccountInfo(personalBankAccount.bankAccountID, {
             legalFirstName,

tests/unit/LoginUtilsTest.ts

@@ -1,5 +1,6 @@
 import {
     appendCountryCode,
+    formatE164PhoneNumber,
     getEmailDomain,
     getPhoneLogin,
     getPhoneNumberWithoutSpecialChars,
@@ -57,6 +58,23 @@ describe('LoginUtils', () => {
             expect(parsedPhone).toBe('+12345678901');
         });
     });
+    describe('formatE164PhoneNumber', () => {
+        it('Should keep the calling code of a number that already has one', () => {
+            expect(formatE164PhoneNumber('+442071234567', CONST.DEFAULT_COUNTRY_CODE)).toBe('+442071234567');
+        });
+        it('Should prepend the country code to a bare US number', () => {
+            expect(formatE164PhoneNumber('201 867 5309', CONST.DEFAULT_COUNTRY_CODE)).toBe('+12018675309');
+        });
+        it('Should prepend the country code to a bare UK number', () => {
+            expect(formatE164PhoneNumber('20 7123 4567', 44)).toBe('+442071234567');
+        });
+        it('Should keep the calling code when it differs from the country code', () => {
+            expect(formatE164PhoneNumber('+61255501234', CONST.DEFAULT_COUNTRY_CODE)).toBe('+61255501234');
+        });
+        it('Should return undefined for an unparseable number', () => {
+            expect(formatE164PhoneNumber('abcdefg', CONST.DEFAULT_COUNTRY_CODE)).toBeUndefined();
+        });
+    });
     describe('isEmailPublicDomain', () => {
         it('Should return true if email is from public domain', () => {
             const givenEmail = 'test@gmail.com';

tests/unit/ValidationUtilsTest.ts

@@ -17,6 +17,7 @@ import {
     isValidPastDate,
     isValidPaymentZipCode,
     isValidPersonName,
+    isValidPhoneNumber,
     isValidPIN,
     isValidRegistrationNumber,
     isValidRoomName,
@@ -595,6 +596,36 @@ describe('ValidationUtils', () => {
         });
     });
 
+    describe('isValidPhoneNumber', () => {
+        test('Should return true for a US phone number', () => {
+            expect(isValidPhoneNumber('+12018675309')).toBe(true);
+        });
+
+        test('Should return true for a Canadian phone number', () => {
+            expect(isValidPhoneNumber('+14165551234')).toBe(true);
+        });
+
+        test('Should return true for a UK phone number', () => {
+            expect(isValidPhoneNumber('+442071234567')).toBe(true);
+        });
+
+        test('Should return true for an Australian phone number', () => {
+            expect(isValidPhoneNumber('+61255501234')).toBe(true);
+        });
+
+        test('Should return false for a number that is too short to be possible', () => {
+            expect(isValidPhoneNumber('123')).toBe(false);
+        });
+
+        test('Should return false for letters', () => {
+            expect(isValidPhoneNumber('abcdefg')).toBe(false);
+        });
+
+        test('Should return false for an empty string', () => {
+            expect(isValidPhoneNumber('')).toBe(false);
+        });
+    });
+
     describe('isInvalidMerchantValue', () => {
         test('Valid merchnt name', () => {
             expect(isInvalidMerchantValue('test name')).toBe(false);