fix(tab nav): fix navigating back from language selection (#5146)

### Description issue found in bugapalooza when changing language. Fixed so now you don't see back arrow + hamburger when in new tab experience. ### Test plan Manual test changing language: https://github.com/valora-inc/wallet/assets/140328381/96c727ce-1b4a-44ff-ab89-68510fc097ad Testing other paths: https://github.com/valora-inc/wallet/assets/140328381/8f951b09-f204-4f8c-8f3a-977aa30ccf16 ### Related issues - N/A ### Backwards compatibility Yes ### Network scalability If a new NetworkId and/or Network are added in the future, the changes in this PR will: - N/A
valora-inc · Mar 23, 2024 · 98637c3 · 98637c3
1 parent 73f10d5
commit 98637c3
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 40 deletions.
diff --git a/src/account/Settings.test.tsx b/src/account/Settings.test.tsx
@@ -436,7 +436,7 @@ describe('Account', () => {
     expect(mockFetch).toHaveBeenCalledTimes(1)
   })
 
-  it('deletes the account and unlinks the phone number successfully', async () => {
+  it('deletes the account and unlinks the phone number successfully (using SettingsDrawer screen)', async () => {
     mockedEnsurePincode.mockImplementation(() => Promise.resolve(true))
     mockFetch.mockResponseOnce(JSON.stringify({ message: 'OK' }), {
       status: 200,
@@ -450,7 +450,7 @@ describe('Account', () => {
 
     const tree = render(
       <Provider store={store}>
-        <Settings {...getMockStackScreenProps(Screens.Settings)} />
+        <Settings {...getMockStackScreenProps(Screens.SettingsDrawer)} />
       </Provider>
     )
 
@@ -482,7 +482,7 @@ describe('Account', () => {
 
     const tree = render(
       <Provider store={store}>
-        <Settings {...getMockStackScreenProps(Screens.Settings, { isTabNav: true })} />
+        <Settings {...getMockStackScreenProps(Screens.Settings)} />
       </Provider>
     )
 

diff --git a/src/account/Settings.tsx b/src/account/Settings.tsx
@@ -92,7 +92,7 @@ export const Account = ({ navigation, route }: Props) => {
   const dispatch = useDispatch()
   const { t } = useTranslation()
   const promptConfirmRemovalModal = route.params?.promptConfirmRemovalModal
-  const isTabNav = route.params?.isTabNav
+  const isTabNav = route.name === Screens.Settings
 
   const revokeBottomSheetRef = useRef<BottomSheetRefType>(null)
   const deleteAccountBottomSheetRef = useRef<BottomSheetRefType>(null)

diff --git a/src/account/Support.test.tsx b/src/account/Support.test.tsx
@@ -12,7 +12,7 @@ import { createMockStore, getMockStackScreenProps } from 'test/utils'
 const renderSupport = () =>
   render(
     <Provider store={createMockStore()}>
-      <Support {...getMockStackScreenProps(Screens.Support)} />
+      <Support {...getMockStackScreenProps(Screens.SupportDrawer)} />
     </Provider>
   )
 

diff --git a/src/account/Support.tsx b/src/account/Support.tsx
@@ -20,9 +20,9 @@ const onPressContact = () => {
   navigate(Screens.SupportContact)
 }
 
-const Support = ({ navigation, route }: Props) => {
+const Support = ({ route }: Props) => {
   const { t } = useTranslation()
-  const isTabNav = route.params?.isTabNav
+  const isTabNav = route.name === Screens.Support
 
   return (
     <SafeAreaView

diff --git a/src/backup/BackupComplete.tsx b/src/backup/BackupComplete.tsx
@@ -30,9 +30,8 @@ function BackupComplete({ route }: Props) {
     const timer = setTimeout(() => {
       if (settingsScreen) {
         // TODO(ACT-1133): change settingsScreen props to isAccountRemoval boolean to know if we need to go back to settings to show promptConfirmRemovalModal
-        navigate(settingsScreen === Screens.Settings ? Screens.Settings : Screens.SettingsDrawer, {
+        navigate(settingsScreen, {
           promptConfirmRemovalModal: true,
-          isTabNav: settingsScreen === Screens.Settings,
         })
       } else if (backupCompleted) {
         ValoraAnalytics.track(OnboardingEvents.backup_complete)

diff --git a/src/backup/BackupQuiz.test.tsx b/src/backup/BackupQuiz.test.tsx
@@ -59,9 +59,7 @@ describe('BackupQuiz', () => {
       )
 
       fireEvent.press(getByTestId('CancelButton'))
-      expect(navigate).toBeCalledWith(routeParams.settingsScreen, {
-        isTabNav: routeParams.settingsScreen === Screens.Settings,
-      })
+      expect(navigate).toBeCalledWith(routeParams.settingsScreen)
     }
   )
 

diff --git a/src/backup/BackupQuiz.tsx b/src/backup/BackupQuiz.tsx
@@ -78,17 +78,7 @@ export const navOptionsForQuiz = ({ route }: OwnProps) => {
     ...emptyHeader,
     headerLeft: () => {
       return settingsScreen ? (
-        <CancelButton
-          onCancel={() =>
-            navigate(
-              settingsScreen === Screens.Settings ? Screens.Settings : Screens.SettingsDrawer,
-              {
-                isTabNav: settingsScreen === Screens.Settings,
-              }
-            )
-          }
-          style={styles.cancelButton}
-        />
+        <CancelButton onCancel={() => navigate(settingsScreen)} style={styles.cancelButton} />
       ) : (
         <CancelConfirm screen={TAG} />
       )

diff --git a/src/navigator/ProfileMenu.test.tsx b/src/navigator/ProfileMenu.test.tsx
@@ -136,7 +136,7 @@ describe('ProfileMenu', () => {
     fireEvent.press(getByTestId('ProfileMenu/Help'))
     expect(navigate).toHaveBeenCalledTimes(3)
     expect(navigate).toHaveBeenNthCalledWith(1, Screens.Invite)
-    expect(navigate).toHaveBeenNthCalledWith(2, Screens.Settings, { isTabNav: true })
-    expect(navigate).toHaveBeenNthCalledWith(3, Screens.Support, { isTabNav: true })
+    expect(navigate).toHaveBeenNthCalledWith(2, Screens.Settings)
+    expect(navigate).toHaveBeenNthCalledWith(3, Screens.Support)
   })
 })
diff --git a/src/navigator/ProfileMenu.tsx b/src/navigator/ProfileMenu.tsx
@@ -65,19 +65,13 @@ export default function ProfileMenu({ route }: Props) {
             <Text style={styles.actionLabel}>{t('invite')}</Text>
           </View>
         </Touchable>
-        <Touchable
-          testID="ProfileMenu/Settings"
-          onPress={() => navigate(Screens.Settings, { isTabNav: true })}
-        >
+        <Touchable testID="ProfileMenu/Settings" onPress={() => navigate(Screens.Settings)}>
           <View style={styles.container}>
             <Settings color={Colors.gray3} />
             <Text style={styles.actionLabel}>{t('settings')}</Text>
           </View>
         </Touchable>
-        <Touchable
-          testID="ProfileMenu/Help"
-          onPress={() => navigate(Screens.Support, { isTabNav: true })}
-        >
+        <Touchable testID="ProfileMenu/Help" onPress={() => navigate(Screens.Support)}>
           <View style={styles.container}>
             <Help color={Colors.gray3} />
             <Text style={styles.actionLabel}>{t('help')}</Text>

diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
@@ -54,7 +54,7 @@ export type StackParamList = {
   [Screens.BackupComplete]:
     | undefined
     | {
-        settingsScreen: Screens | undefined
+        settingsScreen: Screens.Settings | Screens.SettingsDrawer | undefined
       }
   [Screens.BackupIntroduction]:
     | {
@@ -70,12 +70,12 @@ export type StackParamList = {
   [Screens.BackupPhrase]:
     | undefined
     | {
-        settingsScreen: Screens | undefined
+        settingsScreen: Screens.Settings | Screens.SettingsDrawer | undefined
       }
   [Screens.BackupQuiz]:
     | undefined
     | {
-        settingsScreen: Screens | undefined
+        settingsScreen: Screens.Settings | Screens.SettingsDrawer | undefined
       }
   [Screens.FiatDetailsScreen]: {
     quote: FiatConnectQuote
@@ -265,15 +265,15 @@ export type StackParamList = {
     sendAmount: string
     tokenId: string
   }
-  [Screens.Settings]: { promptConfirmRemovalModal?: boolean; isTabNav?: boolean } | undefined
-  [Screens.SettingsDrawer]: { promptConfirmRemovalModal?: boolean; isTabNav?: boolean } | undefined
+  [Screens.Settings]: { promptConfirmRemovalModal?: boolean } | undefined
+  [Screens.SettingsDrawer]: { promptConfirmRemovalModal?: boolean } | undefined
   [Screens.SignInWithEmail]: {
     keylessBackupFlow: KeylessBackupFlow
   }
   [Screens.Spend]: undefined
   [Screens.StoreWipeRecoveryScreen]: undefined
-  [Screens.Support]: { isTabNav?: boolean } | undefined
-  [Screens.SupportDrawer]: { isTabNav?: boolean } | undefined
+  [Screens.Support]: undefined
+  [Screens.SupportDrawer]: {} | undefined
   [Screens.SupportContact]:
     | {
         prefilledText: string