From e9b915c01184a8b63479144f68aba39def3208d1 Mon Sep 17 00:00:00 2001 From: dragnoir Date: Sat, 6 Apr 2024 13:36:54 +0200 Subject: [PATCH] Fix: Breadcrumbs shows correct workspace when selected via keyboard --- src/pages/WorkspaceSwitcherPage.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage.tsx index 6f077f7644745..9b7b176a3a5bb 100644 --- a/src/pages/WorkspaceSwitcherPage.tsx +++ b/src/pages/WorkspaceSwitcherPage.tsx @@ -111,9 +111,11 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) { setSelectedOption(undefined); } setActiveWorkspaceID(policyID); - Navigation.goBack(); + if (policyID !== activeWorkspaceID) { Navigation.navigateWithSwitchPolicyID({policyID}); + } else { + Navigation.goBack(); } }, [activeWorkspaceID, setActiveWorkspaceID],