cleanup: rename settings screen name

Author: kosmydel

patches/@react-navigation+stack+6.3.16+002+dontDetachScreen.patch

@@ -43,7 +43,7 @@ index 7558eb3..b7bb75e 100644
          }) : STATE_TRANSITIONING_OR_BELOW_TOP;
        }
 +      
-+      const isHomeScreenAndNotOnTop = (route.name === 'BottomTabNavigator' || route.name === 'SettingsHome')  && isScreenActive !== STATE_ON_TOP;
++      const isHomeScreenAndNotOnTop = (route.name === 'BottomTabNavigator' || route.name === 'Settings_Root')  && isScreenActive !== STATE_ON_TOP;
 +
        const {
          headerShown = true,

src/ROUTES.ts

@@ -59,8 +59,6 @@ const ROUTES = {
     },
 
     SETTINGS: 'settings',
-    SETTINGS_HOME: 'settings_new',
-    SETTINGS_NEW_PROFILE: 'settings_new/profile',
     SETTINGS_PROFILE: 'settings/profile',
     SETTINGS_SHARE_CODE: 'settings/shareCode',
     SETTINGS_DISPLAY_NAME: 'settings/profile/display-name',

src/SCREENS.ts

@@ -18,7 +18,6 @@ const SCREENS = {
     TRANSITION_BETWEEN_APPS: 'TransitionBetweenApps',
     VALIDATE_LOGIN: 'ValidateLogin',
     UNLINK_LOGIN: 'UnlinkLogin',
-    SETTINGS_HOME: 'SettingsHome',
     SETTINGS_CENTRAL_PANE: 'SettingsCentralPane',
     SETTINGS: {
         ROOT: 'Settings_Root',

src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx

@@ -178,9 +178,9 @@ const NewTeachersUniteNavigator = createModalStackNavigator<TeachersUniteNavigat
     [SCREENS.I_AM_A_TEACHER]: () => require('../../../pages/TeachersUnite/ImTeacherPage').default as React.ComponentType,
 });
 
-// should it be merged with SettingsModalStackNavigator?
 const AccountSettingsModalStackNavigator = createModalStackNavigator(
     {
+        [SCREENS.SETTINGS.ROOT]: () => require('../../../pages/settings/InitialSettingsPage').default as React.ComponentType,
         [SCREENS.SETTINGS.WORKSPACES]: () => require('../../../pages/workspace/WorkspacesListPage').default as React.ComponentType,
         [SCREENS.SETTINGS.PREFERENCES.ROOT]: () => require('../../../pages/settings/Preferences/PreferencesPage').default as React.ComponentType,
         [SCREENS.SETTINGS.SECURITY]: () => require('../../../pages/settings/Security/SecuritySettingsPage').default as React.ComponentType,
@@ -193,7 +193,6 @@ const AccountSettingsModalStackNavigator = createModalStackNavigator(
 );
 
 const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorParamList>({
-    [SCREENS.SETTINGS.ROOT]: () => require('../../../pages/settings/InitialSettingsPage').default as React.ComponentType,
     [SCREENS.SETTINGS.SHARE_CODE]: () => require('../../../pages/ShareCodePage').default as React.ComponentType,
     [SCREENS.SETTINGS.PROFILE.ROOT]: () => require('../../../pages/settings/Profile/ProfilePage').default as React.ComponentType,
     [SCREENS.SETTINGS.PROFILE.PRONOUNS]: () => require('../../../pages/settings/Profile/PronounsPage').default as React.ComponentType,

src/libs/Navigation/AppNavigator/Navigators/FullScreenNavigator.tsx

@@ -20,7 +20,7 @@ function FullScreenNavigator() {
         <View style={styles.rootNavigatorContainerStyles(isSmallScreenWidth)}>
             <RootStack.Navigator isSmallScreenWidth={isSmallScreenWidth}>
                 <RootStack.Screen
-                    name={SCREENS.SETTINGS_HOME}
+                    name={SCREENS.SETTINGS.ROOT}
                     options={screenOptions.homeScreen}
                     getComponent={loadPage}
                 />

src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts

@@ -76,7 +76,7 @@ const handleSettingsOpened = (state: State) => {
         state: {
             routes: [
                 {
-                    name: SCREENS.SETTINGS_HOME,
+                    name: SCREENS.SETTINGS.ROOT,
                 },
                 {
                     name: SCREENS.SETTINGS_CENTRAL_PANE,

src/libs/Navigation/linkingConfig.ts

@@ -499,10 +499,10 @@ const linkingConfig: LinkingOptions<RootStackParamList> = {
             },
 
             [NAVIGATORS.FULL_SCREEN_NAVIGATOR]: {
-                initialRouteName: SCREENS.SETTINGS_HOME,
+                initialRouteName: SCREENS.SETTINGS.ROOT,
                 screens: {
-                    [SCREENS.SETTINGS_HOME]: {
-                        path: ROUTES.SETTINGS_HOME,
+                    [SCREENS.SETTINGS.ROOT]: {
+                        path: ROUTES.SETTINGS,
                     },
                     [SCREENS.SETTINGS_CENTRAL_PANE]: {
                         screens: {

src/libs/Navigation/types.ts

@@ -384,7 +384,7 @@ type SettingsCentralPaneNavigatorParamList = {
 };
 
 type FullScreenNavigatorParamList = {
-    [SCREENS.SETTINGS_HOME]: undefined;
+    [SCREENS.SETTINGS.ROOT]: undefined;
     [SCREENS.SETTINGS_CENTRAL_PANE]: NavigatorScreenParams<SettingsCentralPaneNavigatorParamList>;
 };
 

src/pages/ShareCodePage.js

@@ -81,7 +81,7 @@ class ShareCodePage extends React.Component {
             <ScreenWrapper testID={ShareCodePage.displayName}>
                 <HeaderWithBackButton
                     title={this.props.translate('common.shareCode')}
-                    onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(this.props.report.reportID) : ROUTES.SETTINGS_HOME)}
+                    onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(this.props.report.reportID) : ROUTES.SETTINGS.ROOT)}
                     shouldUseCentralPaneView
                     shouldShowBorderBottom
                 />

src/pages/home/sidebar/PressableAvatarWithIndicator.js

@@ -46,7 +46,7 @@ function PressableAvatarWithIndicator({isCreateMenuOpen, currentUserPersonalDeta
             return;
         }
 
-        Navigation.navigate(ROUTES.SETTINGS_HOME);
+        Navigation.navigate(ROUTES.SETTINGS);
     }, [isCreateMenuOpen]);
 
     return (

src/pages/settings/AboutPage/AboutPage.js

@@ -103,7 +103,7 @@ function AboutPage(props) {
                 <>
                     <HeaderWithBackButton
                         title={props.translate('initialSettingsPage.about')}
-                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_HOME)}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
                         shouldUseCentralPaneView
                         shouldShowBorderBottom
                     />

src/pages/settings/Profile/ProfilePage.js

@@ -108,7 +108,7 @@ function ProfilePage(props) {
         >
             <HeaderWithBackButton
                 title={props.translate('common.profile')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_HOME)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
                 shouldUseCentralPaneView
                 shouldShowBorderBottom
             />

src/pages/settings/Security/SecuritySettingsPage.js

@@ -66,7 +66,7 @@ function SecuritySettingsPage(props) {
     return (
         <IllustratedHeaderPageLayout
             title={translate('initialSettingsPage.security')}
-            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_HOME)}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
             shouldShowBackButton
             illustration={LottieAnimations.Safe}
             backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.SECURITY].backgroundColor}

src/pages/settings/Wallet/WalletEmptyState.js

@@ -38,7 +38,7 @@ function WalletEmptyState({onAddPaymentMethod}) {
         <IllustratedHeaderPageLayout
             backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.WALLET.ROOT].backgroundColor}
             illustration={LottieAnimations.FastMoney}
-            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_HOME)}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
             title={translate('common.wallet')}
             footer={
                 <Button

src/pages/settings/Wallet/WalletPage/WalletPage.js

@@ -324,7 +324,7 @@ function WalletPage({bankAccountList, cardList, fundList, isLoadingPaymentMethod
                 <ScreenWrapper testID={WalletPage.displayName}>
                     <HeaderWithBackButton
                         title={translate('common.wallet')}
-                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_HOME)}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
                         shouldUseCentralPaneView
                     />
                     <View style={[styles.flex1, styles.mb4]}>

src/pages/workspace/WorkspacesListPage.js

@@ -185,7 +185,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, u
         <IllustratedHeaderPageLayout
             backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.WORKSPACES].backgroundColor}
             illustration={LottieAnimations.WorkspacePlanet}
-            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_HOME)}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
             title={translate('common.workspaces')}
             shouldUseCentralPaneView
             footer={