Merge pull request #38308 from abzokhattab/fix-contact-method-back-na…

…vigation

[CP Staging] Fix contact method back navigation

(cherry picked from commit ac2d14d)

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

@@ -38,7 +38,7 @@ function ContactMethodsPage({loginList, session, route}: ContactMethodsPageProps
     const styles = useThemeStyles();
     const {formatPhoneNumber, translate} = useLocalize();
     const loginNames = Object.keys(loginList ?? {});
-    const navigateBackTo = route?.params?.backTo || ROUTES.SETTINGS_PROFILE;
+    const navigateBackTo = route?.params?.backTo;
 
     // Sort the login names by placing the one corresponding to the default contact method as the first item before displaying the contact methods.
     // The default contact method is determined by checking against the session email (the current login).
@@ -91,10 +91,6 @@ function ContactMethodsPage({loginList, session, route}: ContactMethodsPageProps
     });
 
     const onNewContactMethodButtonPress = useCallback(() => {
-        if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {
-            Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.route);
-            return;
-        }
         Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.getRoute(navigateBackTo));
     }, [navigateBackTo]);