From eea9ce93b918115e9ed6b951d000049ca66bd5fd Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Thu, 17 Aug 2023 23:26:06 +0200
Subject: [PATCH] feat(frontend): Fix workspace switch + always displays
 confirmation modal on top of splitpanel separator (#2115)

---
 .../common/confirmationModal/ConfirmationModal.svelte         | 2 +-
 frontend/src/lib/components/sidebar/WorkspaceMenu.svelte      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
index 16ada89cf5..7909f908cf 100644
--- a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
@@ -38,7 +38,7 @@
 {#if open}
 	<div
 		transition:fadeFast|local
-		class={'absolute top-0 bottom-0 left-0 right-0 z-50'}
+		class={'absolute top-0 bottom-0 left-0 right-0 z-[5000]'}
 		role="dialog"
 	>
 		<div
diff --git a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
index 0383881eb8..0c1efc3a27 100644
--- a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
+++ b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
@@ -42,9 +42,9 @@
 		} else {
 			await goto('/')
 
-			const shouldSwitch = await waitForNextUpdate(dirtyStore)
+			const isStillDirty = await waitForNextUpdate(dirtyStore)
 
-			if (shouldSwitch) {
+			if (!isStillDirty) {
 				switchWorkspace(id)
 			}
 		}