From 10a06486f9bed48a1eb2b2d5d9ad5bbef43a6309 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 9 Dec 2025 18:43:25 +0530
Subject: [PATCH 1/3] fix: broken domains flow.

---
 src/lib/studio/domains/manage/table.svelte | 18 ++++--------------
 src/lib/studio/domains/manage/view.svelte  |  6 ++++--
 src/lib/studio/domains/verify/view.svelte  |  2 +-
 src/lib/studio/studio.svelte               |  6 +++++-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/lib/studio/domains/manage/table.svelte b/src/lib/studio/domains/manage/table.svelte
index 9f44181ef2..a1c0cc97bb 100644
--- a/src/lib/studio/domains/manage/table.svelte
+++ b/src/lib/studio/domains/manage/table.svelte
@@ -32,11 +32,13 @@
     let {
         siteId,
         region,
-        projectId
+        projectId,
+        onAddNewDomain = null
     }: {
         siteId: string;
         region: string;
         projectId: string;
+        onAddNewDomain?: () => void;
     } = $props();
 
     let loading = $state(true);
@@ -82,18 +84,6 @@
         previousDeleteState = showDelete;
         previousRetryState = showRetry;
     });
-
-    const addDomainUrl = $derived.by(() => {
-        const baseUrl = resolve(
-            '/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain',
-            {
-                region,
-                project: projectId,
-                site: siteId
-            }
-        );
-        return `${baseUrl}?types=false`;
-    });
 </script>
 
 <Table.Root columns={[{ id: 'domain' }, { id: 'actions', width: 40 }]} let:root>
@@ -164,7 +154,7 @@
 </Table.Root>
 
 <Layout.Stack style="width: min-content;">
-    <Button compact on:onclick={async () => await goto(addDomainUrl)}>
+    <Button compact on:click={() => onAddNewDomain?.()}>
         <Icon icon={IconPlus} size="s" />
         Add domain
     </Button>
diff --git a/src/lib/studio/domains/manage/view.svelte b/src/lib/studio/domains/manage/view.svelte
index 63220024ab..6212318fc1 100644
--- a/src/lib/studio/domains/manage/view.svelte
+++ b/src/lib/studio/domains/manage/view.svelte
@@ -10,13 +10,15 @@
         domain,
         siteId,
         region,
-        projectId
+        projectId,
+        onAddNewDomain = null
     }: {
         show: boolean;
         domain: string;
         siteId: string;
         region: string;
         projectId: string;
+        onAddNewDomain?: () => void;
     } = $props();
 </script>
 
@@ -40,6 +42,6 @@
             </Typography.Text>
         </Layout.Stack>
 
-        <DomainsTable {siteId} {region} {projectId} />
+        <DomainsTable {siteId} {region} {projectId} {onAddNewDomain} />
     </Layout.Stack>
 </SideSheet>
diff --git a/src/lib/studio/domains/verify/view.svelte b/src/lib/studio/domains/verify/view.svelte
index 045c26b21d..34a4600a29 100644
--- a/src/lib/studio/domains/verify/view.svelte
+++ b/src/lib/studio/domains/verify/view.svelte
@@ -107,7 +107,7 @@
 </script>
 
 {#if show}
-    <Wizard column columnSize="s" title="Add domain" showExitModal onExit={() => (show = false)}>
+    <Wizard column columnSize="s" title="Add domain" onExit={() => (show = false)}>
         <Form onSubmit={verify} bind:isSubmitting>
             <Layout.Stack gap="xxl">
                 <Card.Base radius="s" padding="s">
diff --git a/src/lib/studio/studio.svelte b/src/lib/studio/studio.svelte
index 66ad208fde..283ca5f6e5 100644
--- a/src/lib/studio/studio.svelte
+++ b/src/lib/studio/studio.svelte
@@ -106,4 +106,8 @@
     {region}
     {projectId}
     domain={primaryDomainForSite}
-    bind:show={showManageDomainsSheet} />
+    bind:show={showManageDomainsSheet}
+    onAddNewDomain={() => {
+        showAddDomainsWizard = true;
+        showManageDomainsSheet = false;
+    }} />

From 3c7f6365c12cf5ecf19eaf8e23c0d27e2a32b258 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 9 Dec 2025 18:52:57 +0530
Subject: [PATCH 2/3] add: exit confirm.

---
 src/lib/studio/domains/verify/view.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/studio/domains/verify/view.svelte b/src/lib/studio/domains/verify/view.svelte
index 34a4600a29..9c1982d30f 100644
--- a/src/lib/studio/domains/verify/view.svelte
+++ b/src/lib/studio/domains/verify/view.svelte
@@ -107,7 +107,7 @@
 </script>
 
 {#if show}
-    <Wizard column columnSize="s" title="Add domain" onExit={() => (show = false)}>
+    <Wizard column columnSize="s" title="Add domain" confirmExit onExit={() => (show = false)}>
         <Form onSubmit={verify} bind:isSubmitting>
             <Layout.Stack gap="xxl">
                 <Card.Base radius="s" padding="s">

From 7e8c60c498da16e3813a1e630f27c9a64e27c28c Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 9 Dec 2025 19:02:59 +0530
Subject: [PATCH 3/3] lint.

---
 src/lib/studio/domains/manage/table.svelte | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/studio/domains/manage/table.svelte b/src/lib/studio/domains/manage/table.svelte
index a1c0cc97bb..bf03bb8a00 100644
--- a/src/lib/studio/domains/manage/table.svelte
+++ b/src/lib/studio/domains/manage/table.svelte
@@ -22,8 +22,6 @@
         Skeleton,
         Divider
     } from '@appwrite.io/pink-svelte';
-    import { resolve } from '$app/paths';
-    import { goto } from '$app/navigation';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
     import DeleteDomainModal from '$routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte';