From e515b553b09f0cd35644120eb0068441c6e73f1e Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 30 May 2025 19:03:57 +0530
Subject: [PATCH 1/2] fix: alerts when the wizard is being shown.

---
 src/lib/layout/shell.svelte  | 4 ++--
 src/lib/layout/wizard.svelte | 9 +++++++--
 src/lib/stores/wizard.ts     | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 0b04241bde..8b9dcdf04f 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -2,7 +2,7 @@
     import { beforeNavigate } from '$app/navigation';
     import { Navbar, Sidebar } from '$lib/components';
     import type { NavbarProject } from '$lib/components/navbar.svelte';
-    import { wizard } from '$lib/stores/wizard';
+    import { isNewWizardStatusOpen, wizard } from '$lib/stores/wizard';
     import { activeHeaderAlert } from '$routes/(console)/store';
     import { setContext } from 'svelte';
     import { writable } from 'svelte/store';
@@ -131,7 +131,7 @@
 
 <svelte:window on:resize={handleResize} />
 <svelte:body use:style={$bodyStyle} />
-{#if $activeHeaderAlert?.show}
+{#if $activeHeaderAlert?.show && !$isNewWizardStatusOpen}
     <svelte:component this={$activeHeaderAlert.component} />
 {/if}
 <main
diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte
index b6c9a895c3..3cf61a924a 100644
--- a/src/lib/layout/wizard.svelte
+++ b/src/lib/layout/wizard.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
+    import { goto } from '$app/navigation';
+    import { onDestroy, onMount } from 'svelte';
     import { Layout } from '@appwrite.io/pink-svelte';
     import { trackEvent } from '$lib/actions/analytics';
     import WizardExitModal from './wizardExitModal.svelte';
-    import { goto } from '$app/navigation';
-    import { wizard } from '$lib/stores/wizard';
+    import { isNewWizardStatusOpen, wizard } from '$lib/stores/wizard';
 
     type $$Props =
         | {
@@ -56,6 +57,10 @@
             }
         }
     }
+
+    onMount(() => ($isNewWizardStatusOpen = true));
+
+    onDestroy(() => ($isNewWizardStatusOpen = false));
 </script>
 
 <svelte:window on:keydown={handleKeydown} />
diff --git a/src/lib/stores/wizard.ts b/src/lib/stores/wizard.ts
index b5581d34d1..e00bd2787a 100644
--- a/src/lib/stores/wizard.ts
+++ b/src/lib/stores/wizard.ts
@@ -101,6 +101,8 @@ function createWizardStore() {
 
 export const wizard = createWizardStore();
 
+export const isNewWizardStatusOpen = writable(false);
+
 export function updateStepStatus(map: WizardStepsType, key: number, status: boolean) {
     const updatedComponent = {
         ...map.get(key),

From ae73d1642a0272c07165f34681a27bca713b4e30 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 30 May 2025 19:08:34 +0530
Subject: [PATCH 2/2] misc: ocd driven minor cleanup.

---
 .../sites/create-site/finish/+page.svelte              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte
index a93295a9e6..871611f734 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte
@@ -20,8 +20,8 @@
 
     export let data;
 
-    let showConnectRepositry = false;
     let showOpenOnMobile = false;
+    let showConnectRepository = false;
     let showInviteCollaborator = false;
 
     const siteURL = data.proxyRuleList.rules[0].domain;
@@ -31,7 +31,7 @@
             page.url.searchParams.has('connectRepo') &&
             page.url.searchParams.get('connectRepo') === 'true'
         ) {
-            showConnectRepositry = true;
+            showConnectRepository = true;
         }
     });
 
@@ -106,7 +106,7 @@
                             <Card.Button
                                 radius="s"
                                 padding="s"
-                                on:click={() => (showConnectRepositry = true)}>
+                                on:click={() => (showConnectRepository = true)}>
                                 <Layout.Stack gap="s" style="height: 100%">
                                     <Layout.Stack
                                         direction="row"
@@ -206,11 +206,11 @@
     </svelte:fragment>
 </Wizard>
 
-{#if showConnectRepositry}
+{#if showConnectRepository}
     <ConnectRepoModal
-        bind:show={showConnectRepositry}
         {connect}
         product="sites"
+        bind:show={showConnectRepository}
         callbackState={{ connectRepo: 'true' }} />
 {/if}