From 8e4ad90490397c0b516fb63d739a8c257d6f0296 Mon Sep 17 00:00:00 2001 From: Srikar Parsi Date: Tue, 1 Oct 2024 19:52:39 -0400 Subject: [PATCH 1/3] Move Switch to Expensify Classic Button down --- src/pages/settings/InitialSettingsPage.tsx | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index 8dce84f8b470..a70fc33832e6 100755 --- 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, @@ -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, From 011c8b291fdaab201ae85f9e441aa6e7190660e9 Mon Sep 17 00:00:00 2001 From: Srikar Parsi Date: Tue, 1 Oct 2024 19:59:05 -0400 Subject: [PATCH 2/3] move setInitialURL hook --- src/pages/settings/InitialSettingsPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index a70fc33832e6..48873a342a6f 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -160,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 @@ -264,7 +264,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr }, ], }; - }, [styles.pt4, signOut]); + }, [styles.pt4, signOut, setInitialURL]); /** * Retuns JSX.Element with menu items From 87ea10031ba24d3fa3a5d3c71cc4de030085d4cf Mon Sep 17 00:00:00 2001 From: Srikar Parsi Date: Tue, 1 Oct 2024 20:07:09 -0400 Subject: [PATCH 3/3] remove unneeded text --- src/languages/en.ts | 1 - src/languages/es.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 7c510197383f..0446a3c9e86a 100755 --- 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 index 88aeffe71566..6f9a056e727a 100644 --- 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',