fix: blank screen when navigating back from WS Switcher

Expensify · Dec 12, 2024 · a64553e · a64553e
1 parent 6b4078c
commit a64553e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/components/WorkspaceSwitcherButton.tsx b/src/components/WorkspaceSwitcherButton.tsx
@@ -18,14 +18,9 @@ type WorkspaceSwitcherButtonOnyxProps = {
     policy: OnyxEntry<Policy>;
 };
 
-type WorkspaceSwitcherButtonProps = WorkspaceSwitcherButtonOnyxProps & {
-    /**
-     * Callback used to keep track of the workspace switching process in the BaseSidebarScreen.
-     */
-    onSwitchWorkspace?: () => void;
-};
+type WorkspaceSwitcherButtonProps = WorkspaceSwitcherButtonOnyxProps;
 
-function WorkspaceSwitcherButton({policy, onSwitchWorkspace}: WorkspaceSwitcherButtonProps) {
+function WorkspaceSwitcherButton({policy}: WorkspaceSwitcherButtonProps) {
     const {translate} = useLocalize();
     const theme = useTheme();
 
@@ -54,7 +49,6 @@ function WorkspaceSwitcherButton({policy, onSwitchWorkspace}: WorkspaceSwitcherB
                 accessible
                 testID="WorkspaceSwitcherButton"
                 onPress={() => {
-                    onSwitchWorkspace?.();
                     pressableRef?.current?.blur();
                     interceptAnonymousUser(() => {
                         Navigation.navigate(ROUTES.WORKSPACE_SWITCHER);

diff --git a/src/pages/WorkspaceSwitcherPage/index.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx
@@ -87,11 +87,10 @@ function WorkspaceSwitcherPage() {
 
             setActiveWorkspaceID(newPolicyID);
             if (newPolicyID !== activeWorkspaceID) {
-                Navigation.navigateWithSwitchPolicyID({policyID: newPolicyID});
+                InteractionManager.runAfterInteractions(() => {
+                    Navigation.navigateWithSwitchPolicyID({policyID: newPolicyID});
+                });
             }
-            InteractionManager.runAfterInteractions(() => {
-                Navigation.goBack();
-            });
         },
         [activeWorkspaceID, setActiveWorkspaceID, isFocused],
     );