Merge pull request #48466 from getusha/validate-contact-method-action…

…-followups [CP Staging] Fix: navigate after clearing contact method (cherry picked from commit 7cb6bd3) (CP triggered by mountiny)
Expensify · Sep 3, 2024 · a124e4f · a124e4f
1 parent 7715e2b
commit a124e4f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
@@ -263,7 +263,6 @@ function deleteContactMethod(contactMethod: string, loginList: Record<string, Lo
 /**
  * Clears a contact method optimistically. this is used when the contact method fails to be added to the backend
  */
-
 function clearContactMethod(contactMethod: string) {
     Onyx.merge(ONYXKEYS.LOGIN_LIST, {
         [contactMethod]: null,

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
@@ -206,7 +206,10 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                     <ErrorMessageRow
                         errors={ErrorUtils.getLatestErrorField(loginData, 'addedLogin')}
                         errorRowStyles={[themeStyles.mh5, themeStyles.mv3]}
-                        onClose={() => User.clearContactMethod(contactMethod)}
+                        onClose={() => {
+                            User.clearContactMethod(contactMethod);
+                            Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
+                        }}
                         canDismissError
                     />
                 )}

diff --git a/src/pages/settings/Profile/Contacts/ValidateContactActionPage.tsx b/src/pages/settings/Profile/Contacts/ValidateContactActionPage.tsx
@@ -42,6 +42,7 @@ function ValidateContactActionPage() {
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             testID={ValidateContactActionPage.displayName}
+            offlineIndicatorStyle={themeStyles.mtAuto}
         >
             <HeaderWithBackButton
                 title={account?.primaryLogin ?? ''}