From a124e4fbbd7a678d3ebae253f3d8fff940c0e528 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:34:07 +0200
Subject: [PATCH] Merge pull request #48466 from
 getusha/validate-contact-method-action-followups

[CP Staging] Fix: navigate after clearing contact method

(cherry picked from commit 7cb6bd3b2fa07bba7f702b018b1df67d3012f242)

(CP triggered by mountiny)
---
 src/libs/actions/User.ts                                     | 1 -
 .../settings/Profile/Contacts/ContactMethodDetailsPage.tsx   | 5 ++++-
 .../settings/Profile/Contacts/ValidateContactActionPage.tsx  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 1ac44512b8c5..04d57e52be47 100644
--- 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
index 2dc60867b87c..3c00662682c8 100644
--- 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
index 469fb0908fcd..157588a67397 100644
--- 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 ?? ''}