get stored phonenumber from privatePersonalDetails

Author: dukenv0307

src/pages/EnablePayments/Pay/AdditionalDetails/AdditionalDetailsStep.tsx

@@ -135,7 +135,7 @@ function AdditionalDetailsStep({currentUserPersonalDetails}: AdditionalDetailsSt
             dob: values.dob ?? '',
             ssn: values.ssn ?? '',
         };
-        submitPersonalDetails(personalDetails, currentUserPersonalDetails.phoneNumber);
+        submitPersonalDetails(personalDetails);
     };
 
     if (isMagicCodeRequired) {

src/pages/EnablePayments/Wallet/PersonalInfo/PersonalInfo.tsx

@@ -55,6 +55,7 @@ function PersonalInfoPage() {
     const {isMagicCodeRequired, submitPersonalDetails, confirmPersonalDetailsWithMagicCode, closeMagicCodePrompt} = useWalletPhoneMagicCode();
 
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
+
     const submit = () => {
         const personalDetails: UpdatePersonalDetailsForWalletParams = {
             phoneNumber: (values.phoneNumber && parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '',
@@ -67,7 +68,7 @@ function PersonalInfoPage() {
             dob: values?.[PERSONAL_INFO_STEP_KEYS.DOB] ?? '',
             ssn: values?.[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4] ?? '',
         };
-        submitPersonalDetails(personalDetails, walletAdditionalDetails?.phoneNumber);
+        submitPersonalDetails(personalDetails);
     };
 
     const startFrom = useMemo(() => getInitialSubstepForPersonalInfo(values), [values]);

src/pages/EnablePayments/shared/useWalletPhoneMagicCode.ts

@@ -18,6 +18,7 @@ import {useEffect, useRef, useState} from 'react';
 function useWalletPhoneMagicCode() {
     const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
     const [formData] = useOnyx(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS);
+    const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
 
     // The details the user submitted, held while we prompt for a magic code to confirm a phone number change
     const submittedPersonalDetailsRef = useRef<UpdatePersonalDetailsForWalletParams | null>(null);
@@ -43,11 +44,12 @@ function useWalletPhoneMagicCode() {
     }, [formData?.isLoading, walletAdditionalDetails?.errorCode]);
 
     // Submits the personal details, first prompting for a magic code when an existing phone number is being changed.
-    const submitPersonalDetails = (personalDetails: UpdatePersonalDetailsForWalletParams, storedPhoneNumber: string | undefined) => {
+    const submitPersonalDetails = (personalDetails: UpdatePersonalDetailsForWalletParams) => {
         submittedPersonalDetailsRef.current = personalDetails;
 
         // The stored phone number keeps its country code, so normalize it the same way as the submitted one before
         // comparing, otherwise an unchanged phone would look like a change and wrongly prompt for a magic code.
+        const storedPhoneNumber = privatePersonalDetails?.phoneNumber;
         const normalizedStoredPhoneNumber = (storedPhoneNumber && parsePhoneNumber(storedPhoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '';
         const hasPhoneNumberChanged = !!normalizedStoredPhoneNumber && personalDetails.phoneNumber !== normalizedStoredPhoneNumber;
         if (hasPhoneNumberChanged) {