From 93df983692ab9f1e0cdcce9a87396745aa992dda Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Thu, 16 Mar 2023 11:41:59 -0500 Subject: [PATCH] Disable the drawer and reset the nav when the user logs out or switches accounts --- src/view/screens/Settings.tsx | 2 ++ src/view/shell/index.tsx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx index a79a357b75..dc18add506 100644 --- a/src/view/screens/Settings.tsx +++ b/src/view/screens/Settings.tsx @@ -68,6 +68,8 @@ export const SettingsScreen = withAuthRequired( } const onPressAddAccount = () => { track('Settings:AddAccountButtonClicked') + navigation.navigate('HomeTab') + navigation.dispatch(StackActions.popToTop()) store.session.clear() } const onPressChangeHandle = () => { diff --git a/src/view/shell/index.tsx b/src/view/shell/index.tsx index 15f9ef58c6..d7877804b9 100644 --- a/src/view/shell/index.tsx +++ b/src/view/shell/index.tsx @@ -46,7 +46,7 @@ const ShellInner = observer(() => { onOpen={onOpenDrawer} onClose={onCloseDrawer} swipeEdgeWidth={winDim.width} - swipeEnabled={!canGoBack}> + swipeEnabled={!canGoBack && store.session.hasSession}>