Refactor switching workspace

software-mansion-labs · Jan 19, 2024 · f6bfbf0 · f6bfbf0
1 parent 3354570
commit f6bfbf0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
@@ -311,7 +311,10 @@ function waitForProtectedRoutes() {
 }
 
 function navigateWithSwitchPolicyID(policyID: string) {
-    goBack();
+    if (!canNavigate('navigateWithSwitchPolicyID')) {
+        return;
+    }
+
     return switchPolicyID(navigationRef.current, policyID);
 }
 

diff --git a/src/pages/WorkspaceSwitcherPage.js b/src/pages/WorkspaceSwitcherPage.js
@@ -111,10 +111,8 @@ function WorkspaceSwitcherPage({policies}) {
             setSelectedOption(undefined);
         }
         setActiveWorkspaceID(policyID);
-
-        if (policyID === activeWorkspaceID) {
-            Navigation.goBack();
-        } else {
+        Navigation.goBack();
+        if (policyID !== activeWorkspaceID) {
             Navigation.navigateWithSwitchPolicyID(policyID);
         }
     }, []);