Merge pull request #53742 from mkzie2/mkzie2-issue/53481

Fix new contact method isn't displayed
Expensify · Dec 9, 2024 · 59193c6 · 59193c6
2 parents 9d418f5 + 8bc8c53
commit 59193c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
@@ -443,6 +443,7 @@ function addNewContactMethod(contactMethod: string, validateCode = '') {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PENDING_CONTACT_ACTION,
             value: {
+                contactMethod: null,
                 validateCodeSent: null,
                 actionVerified: true,
                 errorFields: {

diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
@@ -30,6 +30,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/NewContactMethodForm';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type NewContactMethodPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD>;
 
@@ -162,7 +163,7 @@ function NewContactMethodPage({route}: NewContactMethodPageProps) {
                         User.clearContactMethodErrors(addSMSDomainIfPhoneNumber(pendingContactAction?.contactMethod ?? contactMethod), 'addedLogin');
                     }}
                     onClose={() => {
-                        if (loginData?.errorFields && pendingContactAction?.contactMethod) {
+                        if (!isEmptyObject(loginData?.errorFields) && pendingContactAction?.contactMethod) {
                             User.clearContactMethod(pendingContactAction?.contactMethod);
                             User.clearUnvalidatedNewContactMethodAction();
                         }