From 88d833eb7522be04ad2b4aa3ad1f14a30e55e82a Mon Sep 17 00:00:00 2001 From: Abdelrahman Khattab Date: Thu, 14 Mar 2024 15:35:05 +0200 Subject: [PATCH] Fix contact method back navigation --- src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx index 80b76b9a6acb2..cbb1f5991ad3e 100644 --- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx +++ b/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]);