Merge pull request #38190 from GandalfGwaihir/issue37359

Incorrect animation direction on Wallet, Save The World, Exit Survey, Profile Contact and Troubleshooting page
Expensify · Mar 18, 2024 · 5770e23 · 5770e23
2 parents 66eda14 + f81f9b4
commit 5770e23
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx b/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx
@@ -20,7 +20,7 @@ function ImTeacherUpdateEmailPage() {
         <ScreenWrapper testID={ImTeacherUpdateEmailPage.displayName}>
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.iAmATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <BlockingView
                 shouldShowLink

diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
@@ -20,7 +20,6 @@ import * as ValidationUtils from '@libs/ValidationUtils';
 import TeachersUnite from '@userActions/TeachersUnite';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/IntroSchoolPrincipalForm';
 import type {LoginList} from '@src/types/onyx';
 
@@ -81,7 +80,7 @@ function IntroSchoolPrincipalPage(props: IntroSchoolPrincipalPageProps) {
         >
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.introSchoolPrincipal')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <FormProvider
                 enabledWhenOffline

diff --git a/src/pages/TeachersUnite/KnowATeacherPage.tsx b/src/pages/TeachersUnite/KnowATeacherPage.tsx
@@ -20,7 +20,6 @@ import * as ValidationUtils from '@libs/ValidationUtils';
 import TeachersUnite from '@userActions/TeachersUnite';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/IKnowTeacherForm';
 import type {LoginList} from '@src/types/onyx';
 
@@ -87,7 +86,7 @@ function KnowATeacherPage(props: KnowATeacherPageProps) {
         >
             <HeaderWithBackButton
                 title={translate('teachersUnitePage.iKnowATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <FormProvider
                 enabledWhenOffline

diff --git a/src/pages/settings/AboutPage/TroubleshootPage.tsx b/src/pages/settings/AboutPage/TroubleshootPage.tsx
@@ -95,7 +95,7 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
     return (
         <IllustratedHeaderPageLayout
             title={translate('initialSettingsPage.aboutPage.troubleshoot')}
-            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_ABOUT)}
+            onBackButtonPress={() => Navigation.goBack()}
             backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.TROUBLESHOOT].backgroundColor}
             illustration={LottieAnimations.Desk}
             testID={TroubleshootPage.displayName}

diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
@@ -62,7 +62,7 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS
         <ScreenWrapper testID={ExitSurveyConfirmPage.displayName}>
             <HeaderWithBackButton
                 title={translate('exitSurvey.header')}
-                onBackButtonPress={() => Navigation.goBack(backTo)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.mh5]}>
                 {isOffline && <ExitSurveyOffline />}

diff --git a/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
@@ -98,7 +98,7 @@ function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyRe
         <ScreenWrapper testID={ExitSurveyResponsePage.displayName}>
             <HeaderWithBackButton
                 title={translate('exitSurvey.header')}
-                onBackButtonPress={() => Navigation.goBack(backTo)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM}

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
@@ -101,7 +101,7 @@ function ContactMethodsPage({loginList, session, route}: ContactMethodsPageProps
         >
             <HeaderWithBackButton
                 title={translate('contacts.contactMethods')}
-                onBackButtonPress={() => Navigation.goBack(navigateBackTo)}
+                onBackButtonPress={() => Navigation.goBack()}
             />
             <ScrollView contentContainerStyle={styles.flexGrow1}>
                 <View style={[styles.ph5, styles.mv3, styles.flexRow, styles.flexWrap]}>

diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.tsx b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
@@ -125,7 +125,7 @@ function ExpensifyCardPage({
                 <>
                     <HeaderWithBackButton
                         title={translate('cardPage.expensifyCard')}
-                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
+                        onBackButtonPress={() => Navigation.goBack()}
                     />
                     <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
                         <View style={[styles.flex1, styles.mb9, styles.mt9]}>