From 7cb88651f307bbb33e81d392e5759c54b4ae95b6 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 9 Sep 2024 17:50:58 +0200
Subject: [PATCH 1/4] fix: support modal doens't close after button click

---
 .../(console)/wizard/support/mobileSupportModal.svelte       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/routes/(console)/wizard/support/mobileSupportModal.svelte b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
index 31f2108c6..17e6c4009 100644
--- a/src/routes/(console)/wizard/support/mobileSupportModal.svelte
+++ b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
@@ -1,8 +1,13 @@
 <script lang="ts">
+    import { beforeNavigate } from '$app/navigation';
     import { Support } from '$lib/components';
     import Modal from '$lib/components/modal.svelte';
 
     export let show: boolean;
+
+    beforeNavigate(() => {
+        show = false;
+    });
 </script>
 
 <Modal title="Contact us" bind:show>

From 8749248f2c24f47c7d5f539eac5f418ce832b7d4 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 9 Sep 2024 17:54:46 +0200
Subject: [PATCH 2/4] fix: global modal close on navigate

---
 src/lib/components/modal.svelte                              | 5 +++++
 .../(console)/wizard/support/mobileSupportModal.svelte       | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index ed85e0cab..410116586 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -3,6 +3,7 @@
     import { trackEvent } from '$lib/actions/analytics';
     import { Form } from '$lib/elements/forms';
     import { disableCommands } from '$lib/commandCenter';
+    import { beforeNavigate } from '$app/navigation';
 
     export let show = false;
     export let size: 'small' | 'big' | 'huge' = null;
@@ -19,6 +20,10 @@
 
     let alert: HTMLElement;
 
+    beforeNavigate(() => {
+        show = false;
+    });
+
     $: $disableCommands(show);
 
     $: if (error) {
diff --git a/src/routes/(console)/wizard/support/mobileSupportModal.svelte b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
index 17e6c4009..31f2108c6 100644
--- a/src/routes/(console)/wizard/support/mobileSupportModal.svelte
+++ b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
@@ -1,13 +1,8 @@
 <script lang="ts">
-    import { beforeNavigate } from '$app/navigation';
     import { Support } from '$lib/components';
     import Modal from '$lib/components/modal.svelte';
 
     export let show: boolean;
-
-    beforeNavigate(() => {
-        show = false;
-    });
 </script>
 
 <Modal title="Contact us" bind:show>

From a370dff5461e43becea9967a238c7fa1dc717c5d Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 9 Sep 2024 18:04:06 +0200
Subject: [PATCH 3/4] fix: tests

---
 tests/unit/setup.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/unit/setup.ts b/tests/unit/setup.ts
index dfe5637a9..8d5662b2c 100644
--- a/tests/unit/setup.ts
+++ b/tests/unit/setup.ts
@@ -6,7 +6,8 @@ beforeAll(() => {
         browser: true
     }));
     vi.mock('$app/navigation', () => ({
-        goto: vi.fn()
+        goto: vi.fn();
+        beforeNavigate: vi.fn();
     }));
     vi.mock('$app/environment', () => ({
         dev: true,

From 46f85df62c5801963de7ebb303e5d300a01293a1 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Mon, 9 Sep 2024 18:04:17 +0200
Subject: [PATCH 4/4] fix: tests

---
 tests/unit/setup.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/setup.ts b/tests/unit/setup.ts
index 8d5662b2c..2b65f14eb 100644
--- a/tests/unit/setup.ts
+++ b/tests/unit/setup.ts
@@ -6,8 +6,8 @@ beforeAll(() => {
         browser: true
     }));
     vi.mock('$app/navigation', () => ({
-        goto: vi.fn();
-        beforeNavigate: vi.fn();
+        goto: vi.fn(),
+        beforeNavigate: vi.fn()
     }));
     vi.mock('$app/environment', () => ({
         dev: true,