From bc6931998bf20071b6d2af0f470846bf9dd25a9c Mon Sep 17 00:00:00 2001 From: kubabutkiewicz Date: Mon, 25 Aug 2025 17:37:52 +0200 Subject: [PATCH 1/2] migrate updatePersonalDetailsAndShipExpensifyCards to use temporary appendCountryCodeWithCountryCode --- src/libs/LoginUtils.ts | 2 +- src/libs/actions/PersonalDetails.ts | 4 ++-- .../MissingPersonalDetailsContent.tsx | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libs/LoginUtils.ts b/src/libs/LoginUtils.ts index 919d1f1c7c97..c53e05b93d44 100644 --- a/src/libs/LoginUtils.ts +++ b/src/libs/LoginUtils.ts @@ -55,7 +55,7 @@ function appendCountryCode(phone: string): string { * * TODO: Remove this function after completing Onyx.connect deprecation (issue #66329) */ -function appendCountryCodeWithCountryCode(phone: string, countryCode: string): string { +function appendCountryCodeWithCountryCode(phone: string, countryCode: number): string { if (phone.startsWith('+')) { return phone; } diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts index db0f8b0b7f56..7fdcbde50d23 100644 --- a/src/libs/actions/PersonalDetails.ts +++ b/src/libs/actions/PersonalDetails.ts @@ -503,11 +503,11 @@ function clearPersonalDetailsErrors() { }); } -function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues, validateCode: string) { +function updatePersonalDetailsAndShipExpensifyCards(values: FormOnyxValues, validateCode: string, countryCode: number) { const parameters: SetPersonalDetailsAndShipExpensifyCardsParams = { legalFirstName: values.legalFirstName?.trim() ?? '', legalLastName: values.legalLastName?.trim() ?? '', - phoneNumber: LoginUtils.appendCountryCode(values.phoneNumber?.trim() ?? ''), + phoneNumber: LoginUtils.appendCountryCodeWithCountryCode(values.phoneNumber?.trim() ?? '', countryCode), addressCity: values.city.trim(), addressStreet: values.addressLine1?.trim() ?? '', addressStreet2: values.addressLine2?.trim() ?? '', diff --git a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx index 4795320510f8..41dbbebbcde4 100644 --- a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx +++ b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx @@ -7,6 +7,7 @@ import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader'; import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader'; import ScreenWrapper from '@components/ScreenWrapper'; import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; import useSubStep from '@hooks/useSubStep'; import useThemeStyles from '@hooks/useThemeStyles'; import {clearDraftValues} from '@libs/actions/FormActions'; @@ -36,6 +37,7 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi const styles = useThemeStyles(); const {translate} = useLocalize(); const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false); + const [countryCode] = useOnyx(ONYXKEYS.COUNTRY_CODE); const ref: ForwardedRef = useRef(null); @@ -81,9 +83,9 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi const handleSubmitForm = useCallback( (validateCode: string) => { - updatePersonalDetailsAndShipExpensifyCards(values, validateCode); + updatePersonalDetailsAndShipExpensifyCards(values, validateCode, countryCode ?? 1); }, - [values], + [countryCode, values], ); const handleNextScreen = useCallback(() => { From f53c3d989d6d595d021b1680eaaeecbc5adc95d2 Mon Sep 17 00:00:00 2001 From: kubabutkiewicz Date: Wed, 10 Sep 2025 17:14:39 +0300 Subject: [PATCH 2/2] fix lint --- .../MissingPersonalDetails/MissingPersonalDetailsContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx index 41dbbebbcde4..ec640c296d0a 100644 --- a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx +++ b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx @@ -37,7 +37,7 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi const styles = useThemeStyles(); const {translate} = useLocalize(); const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(false); - const [countryCode] = useOnyx(ONYXKEYS.COUNTRY_CODE); + const [countryCode] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: false}); const ref: ForwardedRef = useRef(null);