remove unnecessary changes

Author: kubabutkiewicz

src/pages/TeachersUnite/KnowATeacherPage.tsx

@@ -26,13 +26,12 @@ function KnowATeacherPage() {
     const {translate} = useLocalize();
     const {isProduction} = useEnvironment();
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
-    const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: true});
 
     /**
      * Submit form to pass firstName, partnerUserID and lastName
      */
     const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.I_KNOW_A_TEACHER_FORM>) => {
-        const phoneLogin = getPhoneLogin(values.partnerUserID, countryCode);
+        const phoneLogin = getPhoneLogin(values.partnerUserID);
         const validateIfNumber = validateNumber(phoneLogin);
         const contactMethod = (validateIfNumber || values.partnerUserID).trim().toLowerCase();
         const firstName = values.firstName.trim();
@@ -49,7 +48,7 @@ function KnowATeacherPage() {
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.I_KNOW_A_TEACHER_FORM>) => {
             const errors = getFieldRequiredErrors(values, [INPUT_IDS.FIRST_NAME, INPUT_IDS.LAST_NAME]);
-            const phoneLogin = getPhoneLogin(values.partnerUserID, countryCode);
+            const phoneLogin = getPhoneLogin(values.partnerUserID);
             const validateIfNumber = validateNumber(phoneLogin);
 
             if (!isValidDisplayName(values.firstName)) {
@@ -88,7 +87,7 @@ function KnowATeacherPage() {
 
             return errors;
         },
-        [loginList, translate, countryCode],
+        [loginList, translate],
     );
 
     return (

src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx

@@ -33,25 +33,24 @@ function NewContactMethodPage({route}: NewContactMethodPageProps) {
     const {translate} = useLocalize();
     const loginInputRef = useRef<AnimatedTextInputRef>(null);
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
-    const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: true});
 
     const navigateBackTo = route?.params?.backTo;
 
     const handleValidateMagicCode = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM>) => {
-            const phoneLogin = getPhoneLogin(values.phoneOrEmail, countryCode);
+            const phoneLogin = getPhoneLogin(values.phoneOrEmail);
             const validateIfNumber = validateNumber(phoneLogin);
             const submitDetail = (validateIfNumber || values.phoneOrEmail).trim().toLowerCase();
             resetValidateActionCodeSent();
             addPendingContactMethod(submitDetail);
             Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD_CONFIRM_MAGIC_CODE.getRoute(submitDetail, navigateBackTo));
         },
-        [countryCode, navigateBackTo],
+        [navigateBackTo],
     );
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM>): Errors => {
-            const phoneLogin = getPhoneLogin(values.phoneOrEmail, countryCode);
+            const phoneLogin = getPhoneLogin(values.phoneOrEmail);
             const validateIfNumber = validateNumber(phoneLogin);
 
             const errors = {};
@@ -83,7 +82,7 @@ function NewContactMethodPage({route}: NewContactMethodPageProps) {
         // the loginList gets updated, causing this function to run again.
         // https://github.com/Expensify/App/issues/20610
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-        [translate, countryCode],
+        [translate],
     );
 
     const onBackButtonPress = useCallback(() => {

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

@@ -72,7 +72,6 @@ function AccountDetailsPage() {
     const {params} = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.MERGE_ACCOUNTS.ACCOUNT_DETAILS>>();
     const [email, setEmail] = useState(params?.email ?? '');
     const {inputCallbackRef} = useAutoFocusInput();
-    const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: true});
     const validateCodeSent = getValidateCodeForAccountMerge?.validateCodeSent;
     const latestError = getLatestErrorMessage(getValidateCodeForAccountMerge);
     const errorKey = getValidateCodeErrorKey(latestError);
@@ -145,7 +144,7 @@ function AccountDetailsPage() {
         } else if (login.trim() === userEmailOrPhone) {
             addErrorMessage(errors, INPUT_IDS.PHONE_OR_EMAIL, translate('common.error.email'));
         } else {
-            const phoneLogin = getPhoneLogin(login, countryCode);
+            const phoneLogin = getPhoneLogin(login);
             const validateIfNumber = validateNumber(phoneLogin);
 
             if (!Str.isValidEmail(login) && !validateIfNumber) {

tests/unit/LoginUtilsTest.ts

@@ -79,17 +79,17 @@ describe('LoginUtils', () => {
     describe('getPhoneLogin', () => {
         it('Should return valid phone number with country code if provided phone number is valid and with country code', () => {
             const givenPhone = '+12345678901';
-            const parsedPhone = LoginUtils.getPhoneLogin(givenPhone, 1);
+            const parsedPhone = LoginUtils.getPhoneLogin(givenPhone);
             expect(parsedPhone).toBe('+12345678901');
         });
         it('Should return valid phone number with country code if provided phone number is valid and without country code', () => {
             const givenPhone = '2345678901';
-            const parsedPhone = LoginUtils.getPhoneLogin(givenPhone, 1);
+            const parsedPhone = LoginUtils.getPhoneLogin(givenPhone);
             expect(parsedPhone).toBe('+12345678901');
         });
         it('Should return empty string if provided phone number is empty', () => {
             const givenPhone = '';
-            const parsedPhone = LoginUtils.getPhoneLogin(givenPhone, 1);
+            const parsedPhone = LoginUtils.getPhoneLogin(givenPhone);
             expect(parsedPhone).toBe('');
         });
     });