fix: Merge - Inconsistent merge flow for same phone number

src/libs/actions/MergeAccounts.ts

@@ -1,11 +1,19 @@
+import {Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
 import * as API from '@libs/API';
 import type {GetValidateCodeForAccountMergeParams, MergeWithValidateCodeParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
+import {appendCountryCode} from '@libs/LoginUtils';
+import {parsePhoneNumber} from '@libs/PhoneNumber';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-function requestValidationCodeForAccountMerge(email: string, validateCodeResent = false) {
+function requestValidationCodeForAccountMerge(email: string, validateCodeResent = false, countryCode: number = CONST.DEFAULT_COUNTRY_CODE) {
+    // Normalize the email/phone input
+    const parsedPhoneNumber = parsePhoneNumber(appendCountryCode(Str.removeSMSDomain(email), countryCode));
+    const normalizedEmail = parsedPhoneNumber.possible && parsedPhoneNumber.number?.e164 ? parsedPhoneNumber.number.e164 : email.toLowerCase();
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -51,7 +59,7 @@ function requestValidationCodeForAccountMerge(email: string, validateCodeResent
     ];
 
     const parameters: GetValidateCodeForAccountMergeParams = {
-        email,
+        email: normalizedEmail,
     };
 
     API.write(WRITE_COMMANDS.GET_VALIDATE_CODE_FOR_ACCOUNT_MERGE, parameters, {optimisticData, successData, failureData});

src/pages/settings/Security/MergeAccounts/AccountDetailsPage.tsx

@@ -179,7 +179,7 @@ function AccountDetailsPage() {
                 <FormProvider
                     formID={ONYXKEYS.FORMS.MERGE_ACCOUNT_DETAILS_FORM}
                     onSubmit={(values) => {
-                        requestValidationCodeForAccountMerge(values[INPUT_IDS.PHONE_OR_EMAIL]);
+                        requestValidationCodeForAccountMerge(values[INPUT_IDS.PHONE_OR_EMAIL], false, countryCode);
                     }}
                     style={[styles.flexGrow1, styles.mh5]}
                     shouldTrimValues

src/pages/settings/Security/MergeAccounts/AccountValidatePage.tsx

@@ -89,6 +89,8 @@ function AccountValidatePage() {
         canBeMissing: true,
     });
 
+    const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: false});
+
     const privateSubscription = usePrivateSubscription();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
 
@@ -190,7 +192,7 @@ function AccountValidatePage() {
                         mergeWithValidateCodeAction(email, code);
                     }}
                     sendValidateCode={() => {
-                        requestValidationCodeForAccountMerge(email, true);
+                        requestValidationCodeForAccountMerge(email, true, countryCode);
                     }}
                     shouldSkipInitialValidation
                     clearError={() => clearMergeWithValidateCode()}