Merge pull request Expensify#50029 from Expensify/srikar-moveClassicDown

bernhardoj · Oct 2, 2024 · 7dde09e · 7dde09e
2 parents 23f12a2 + 87ea100
commit 7dde09e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -1216,7 +1216,6 @@ const translations = {
             phrase3: 'and',
             phrase4: 'Privacy',
         },
-        returnToClassic: 'Switch to Expensify Classic',
         help: 'Help',
         accountSettings: 'Account settings',
         account: 'Account',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -1211,7 +1211,6 @@ const translations = {
             phrase3: 'y',
             phrase4: 'Privacidad',
         },
-        returnToClassic: 'Volver a Expensify Clásico',
         help: 'Ayuda',
         accountSettings: 'Configuración de la cuenta',
         account: 'Cuenta',

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
@@ -131,20 +131,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             sectionStyle: styles.accountSettingsSectionContainer,
             sectionTranslationKey: 'initialSettingsPage.account',
             items: [
-                {
-                    translationKey: 'exitSurvey.goToExpensifyClassic',
-                    icon: Expensicons.ExpensifyLogoNew,
-                    ...(NativeModules.HybridAppModule
-                        ? {
-                              action: () => {
-                                  NativeModules.HybridAppModule.closeReactNativeApp(false, true);
-                                  setInitialURL(undefined);
-                              },
-                          }
-                        : {
-                              routeName: ROUTES.SETTINGS_EXIT_SURVEY_REASON,
-                          }),
-                },
                 {
                     translationKey: 'common.profile',
                     icon: Expensicons.Profile,
@@ -174,7 +160,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
         };
 
         return defaultMenu;
-    }, [loginList, fundList, styles.accountSettingsSectionContainer, bankAccountList, userWallet?.errors, walletTerms?.errors, setInitialURL]);
+    }, [loginList, fundList, styles.accountSettingsSectionContainer, bankAccountList, userWallet?.errors, walletTerms?.errors]);
 
     /**
      * Retuns a list of menu items data for workspace section
@@ -240,6 +226,20 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                     shouldShowRightIcon: true,
                     link: CONST.NEWHELP_URL,
                 },
+                {
+                    translationKey: 'exitSurvey.goToExpensifyClassic',
+                    icon: Expensicons.ExpensifyLogoNew,
+                    ...(NativeModules.HybridAppModule
+                        ? {
+                              action: () => {
+                                  NativeModules.HybridAppModule.closeReactNativeApp(false, true);
+                                  setInitialURL(undefined);
+                              },
+                          }
+                        : {
+                              routeName: ROUTES.SETTINGS_EXIT_SURVEY_REASON,
+                          }),
+                },
                 {
                     translationKey: 'initialSettingsPage.about',
                     icon: Expensicons.Info,
@@ -264,7 +264,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 },
             ],
         };
-    }, [styles.pt4, signOut]);
+    }, [styles.pt4, signOut, setInitialURL]);
 
     /**
      * Retuns JSX.Element with menu items