From 5af347f684bf80571d8161cd6b5ba998200bca03 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Wed, 19 Mar 2025 15:30:22 +0530
Subject: [PATCH] more cleanup.

---
 src/lib/components/customId.svelte                |  1 -
 src/lib/components/modal.svelte                   |  3 +--
 src/lib/elements/table/cellHeadCheck.svelte       |  2 +-
 src/lib/helpers/types.ts                          |  1 +
 src/lib/sdk/domains.ts                            |  2 +-
 .../domains/+page.svelte                          | 15 +++++++++++----
 .../domains/domain-[domain]/domainMetrics.svelte  |  2 +-
 .../settings/deleteOrganizationModal.svelte       |  7 +------
 .../database-[database]/backups/table.svelte      |  3 +++
 .../attributes/datetime.svelte                    |  1 -
 .../document-[document]/attributes/email.svelte   |  1 -
 .../document-[document]/attributes/integer.svelte |  1 -
 .../document-[document]/attributes/string.svelte  |  1 -
 .../document-[document]/attributes/url.svelte     |  1 -
 .../collection-[collection]/indexes/+page.svelte  |  2 +-
 .../databases/database-[database]/table.svelte    |  2 +-
 .../domains/recordsCard.svelte                    |  3 ++-
 .../domains/retryDomainModal.svelte               |  3 ++-
 .../functions/function-[function]/table.svelte    |  2 +-
 .../usage/[[period]]/+page.svelte                 |  1 -
 .../project-[project]/messaging/+page.svelte      |  1 -
 .../message-[message]/pushMessage.svelte          |  1 -
 .../messaging/providers/+page.svelte              |  4 +---
 .../messaging/providers/table.svelte              |  2 +-
 .../messaging/topics/table.svelte                 |  2 +-
 .../messaging/topics/topic-[topic]/table.svelte   |  2 +-
 .../settings/migrations/+page.svelte              |  2 +-
 .../sites/site-[site]/domains/+page.svelte        |  3 ++-
 .../site-[site]/domains/add-domain/+page.svelte   |  2 --
 .../sites/site-[site]/domains/recordsCard.svelte  |  3 ++-
 .../site-[site]/domains/retryDomainModal.svelte   |  4 ++--
 31 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/lib/components/customId.svelte b/src/lib/components/customId.svelte
index 0db5336dc..77c32899f 100644
--- a/src/lib/components/customId.svelte
+++ b/src/lib/components/customId.svelte
@@ -9,7 +9,6 @@
     export let name: string;
     export let id: string;
     export let autofocus = true;
-    export let fullWidth = false;
     export let isProject = false;
     $: if (!show) {
         id = null;
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index 926b7e7d0..01d8d0d63 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -15,7 +15,6 @@
     export let hideFooter = false;
 
     let alert: HTMLElement;
-    let formComponent: Form;
 
     beforeNavigate(() => {
         show = false;
@@ -28,7 +27,7 @@
     }
 </script>
 
-<Form isModal {onSubmit} bind:this={formComponent}>
+<Form isModal {onSubmit}>
     <Modal {size} {title} bind:open={show} {hideFooter} {dismissible}>
         <slot slot="description" name="description" />
         {#if error}
diff --git a/src/lib/elements/table/cellHeadCheck.svelte b/src/lib/elements/table/cellHeadCheck.svelte
index abff61e0f..b45ebe121 100644
--- a/src/lib/elements/table/cellHeadCheck.svelte
+++ b/src/lib/elements/table/cellHeadCheck.svelte
@@ -6,7 +6,7 @@
     export let selected: string[] = [];
     export let pageItemsIds: string[] = [];
 
-    function handleClick(e: CustomEvent) {
+    function handleClick(e: MouseEvent) {
         if (!isHTMLInputElement(e.target)) return;
         if (e.target.checked) {
             const set = new Set(selected);
diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts
index e0ec1c4a9..664871d71 100644
--- a/src/lib/helpers/types.ts
+++ b/src/lib/helpers/types.ts
@@ -30,6 +30,7 @@ export type Column = PinkColumn & {
     filter?: boolean;
     array?: boolean;
     format?: string;
+    show?: boolean;
     elements?: string[] | { value: string | number; label: string }[];
 };
 
diff --git a/src/lib/sdk/domains.ts b/src/lib/sdk/domains.ts
index 8908592a7..889093438 100644
--- a/src/lib/sdk/domains.ts
+++ b/src/lib/sdk/domains.ts
@@ -27,7 +27,7 @@ export type Domain = {
     /**
      * Nameservers setting. &quot;Appwrite&quot; or empty string.
      */
-    nameservers: string[];
+    nameservers: string;
     /**
      * Domain expiry date in ISO 8601 format.
      */
diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte
index e26c1d72a..db39f59fd 100644
--- a/src/routes/(console)/organization-[organization]/domains/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte
@@ -7,7 +7,12 @@
     import { toLocaleDateTime } from '$lib/helpers/date';
     import Container from '$lib/layout/container.svelte';
     import { protocol } from '$routes/(console)/store.js';
-    import { IconDotsHorizontal, IconPlus, IconTrash } from '@appwrite.io/pink-icons-svelte';
+    import {
+        IconDotsHorizontal,
+        IconPlus,
+        IconRefresh,
+        IconTrash
+    } from '@appwrite.io/pink-icons-svelte';
     import {
         ActionMenu,
         Card,
@@ -18,6 +23,7 @@
         Table
     } from '@appwrite.io/pink-svelte';
     import DeleteDomainModal from './deleteDomainModal.svelte';
+    import RetryDomainModal from './retryDomainModal.svelte';
     import { queries } from '$lib/components/filters';
     import SearchQuery from '$lib/components/searchQuery.svelte';
     import { app } from '$lib/stores/app';
@@ -27,6 +33,7 @@
     export let data;
 
     let showDelete = false;
+    let showRetry = false;
     let selectedDomain: Domain = null;
 </script>
 
@@ -77,7 +84,7 @@
                     </Table.Cell>
                     <Table.Cell column="registrar" {root}>{domain?.registrar || '-'}</Table.Cell>
                     <Table.Cell column="nameservers" {root}
-                        >{domain?.nameservers || '-'}</Table.Cell>
+                    >{domain?.nameservers || '-'}</Table.Cell>
                     <Table.Cell column="expiry_date" {root}>
                         {domain?.expiry ? toLocaleDateTime(domain.expiry) : '-'}
                     </Table.Cell>
@@ -85,7 +92,7 @@
                         {domain.renewal ? toLocaleDateTime(domain.renewal) : '-'}
                     </Table.Cell>
                     <Table.Cell column="auto_renewal" {root}
-                        >{domain.autoRenewal ? 'On' : 'Off'}</Table.Cell>
+                    >{domain.autoRenewal ? 'On' : 'Off'}</Table.Cell>
                     <Table.Cell column="actions" {root}>
                         <Layout.Stack direction="row" justifyContent="flex-end">
                             <Popover let:toggle placement="bottom-end" padding="none">
@@ -198,4 +205,4 @@
 
 {#if showRetry}
     <RetryDomainModal show={showRetry} {selectedDomain} />
-{/if}
+{/if}
\ No newline at end of file
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte
index 4683b04ad..c3029bf68 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte
@@ -17,7 +17,7 @@
             description: 'Registrar'
         },
         {
-            value: domain?.nameservers ? domain?.nameservers.join(', ') : '-',
+            value: domain?.nameservers ? domain?.nameservers : '-',
             description: 'Nameservers'
         },
         {
diff --git a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
index f86917b45..80a67052a 100644
--- a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Modal, SecondaryTabs, SecondaryTabsItem } from '$lib/components';
+    import { Modal } from '$lib/components';
     import { Button, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
@@ -156,11 +156,6 @@
 </Modal>
 
 <style>
-    .box {
-        padding: unset;
-        border-radius: var(--border-radius-medium, 8px);
-    }
-
     :global(.max-height-dialog dialog) {
         max-height: 650px;
     }
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
index 9acd8324f..6882615cc 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
@@ -402,6 +402,9 @@
         margin: auto;
     }
 
+    /**
+        TODO: @itznotabug - see in backups pink2.
+     */
     .actions {
         .indicator {
             border-radius: 0.25rem;
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
index a18bf7f8a..d1b3e24b5 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
@@ -6,7 +6,6 @@
     export let label: string;
     export let value: string;
     export let attribute: Models.AttributeDatetime;
-    export let optionalText: string | undefined = undefined;
 </script>
 
 <InputDateTime
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
index d6cc6b4dc..540cc370d 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
@@ -5,7 +5,6 @@
     export let id: string;
     export let label: string;
     export let value: string | null;
-    export let optionalText: string | undefined = undefined;
     export let attribute: Models.AttributeUrl;
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
index 734398d56..2647c00e9 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
@@ -6,7 +6,6 @@
     export let label: string;
     export let value: number;
     export let attribute: Models.AttributeInteger;
-    export let optionalText: string | undefined = undefined;
 </script>
 
 <InputNumber
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
index e04cd59cb..e2ecbba05 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
@@ -6,7 +6,6 @@
     export let label: string;
     export let value: string;
     export let attribute: Models.AttributeString;
-    export let optionalText: string | undefined = undefined;
 </script>
 
 {#if attribute.size >= 50}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
index 308c1332b..426ef2751 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
@@ -5,7 +5,6 @@
     export let id: string;
     export let label: string;
     export let value: string | null;
-    export let optionalText: string | undefined = undefined;
     export let attribute: Models.AttributeUrl;
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
index 7926ee9ff..0436f12b9 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Empty } from '$lib/components';
     import { Container } from '$lib/layout';
-    import { collection, indexes } from '../store';
+    import { collection } from '../store';
     import Delete from './deleteIndex.svelte';
     import Create from './createIndex.svelte';
     import Overview from './overviewIndex.svelte';
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
index 4a56affa2..19c65b32e 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
@@ -3,7 +3,7 @@
     import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { Id, Modal } from '$lib/components';
+    import { Id } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte
index a44760013..87d83f145 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte
@@ -4,8 +4,9 @@
     import type { Domain } from '$lib/sdk/domains';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import { Badge, Layout, Typography, Table, Fieldset, Icon } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
-    export let domain: Domain;
+    export let domain: Domain | Models.ProxyRule;
 </script>
 
 <Fieldset legend="Verification">
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte
index 3355d93bb..9e0d3eb62 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte
@@ -8,9 +8,10 @@
     import { Dependencies } from '$lib/constants';
     import RecordsCard from './recordsCard.svelte';
     import type { Domain } from '$lib/sdk/domains';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let selectedDomain: Domain;
+    export let selectedDomain: Domain | Models.ProxyRule;
 
     let error = null;
     async function retryDomain() {
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
index dc9332c95..80b249423 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
@@ -14,7 +14,7 @@
     import { Dependencies } from '$lib/constants';
     import Cancel from './(modals)/cancel.svelte';
     import { base } from '$app/paths';
-    import { ActionMenu, Icon, Layout, Status, Table } from '@appwrite.io/pink-svelte';
+    import { ActionMenu, Icon, Status, Table } from '@appwrite.io/pink-svelte';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import {
         IconDotsHorizontal,
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
index b72616615..3a869808b 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
@@ -28,7 +28,6 @@
         {#if mbSecondsCount}
             <Usage
                 hidePeriodSelect
-                title="GB hours"
                 path={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/usage`}
                 countMetadata={{
                     legend: 'GB hours',
diff --git a/src/routes/(console)/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[project]/messaging/+page.svelte
index f678cd4be..7ffd02d04 100644
--- a/src/routes/(console)/project-[project]/messaging/+page.svelte
+++ b/src/routes/(console)/project-[project]/messaging/+page.svelte
@@ -6,7 +6,6 @@
         EmptyFilter,
         EmptySearch,
         Id,
-        Modal,
         PaginationWithLimit,
         SearchQuery,
         ViewSelector
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
index 73e625ee5..df25735bc 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
+++ b/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
@@ -9,7 +9,6 @@
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { validateData } from '../wizard/pushFormList.svelte';
     import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
 
diff --git a/src/routes/(console)/project-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[project]/messaging/providers/+page.svelte
index 1741853f8..668449ef9 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/+page.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/+page.svelte
@@ -16,13 +16,11 @@
     import Table from './table.svelte';
     import { base } from '$app/paths';
     import { canWriteProviders } from '$lib/stores/roles';
-    import { Card, Layout, Typography, Empty, Icon } from '@appwrite.io/pink-svelte';
+    import { Card, Layout, Empty, Icon } from '@appwrite.io/pink-svelte';
     import { View } from '$lib/helpers/load';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
 
     export let data: PageData;
-
-    let showCreateDropdownEmpty = false;
 </script>
 
 <Container>
diff --git a/src/routes/(console)/project-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[project]/messaging/providers/table.svelte
index 55f5c216e..22ebe1288 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/table.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/table.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { Id, Modal } from '$lib/components';
+    import { Id } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import type { PageData } from './$types';
diff --git a/src/routes/(console)/project-[project]/messaging/topics/table.svelte b/src/routes/(console)/project-[project]/messaging/topics/table.svelte
index ae9cbdd39..27db523ca 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/table.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/table.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { Id, Modal } from '$lib/components';
+    import { Id } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import type { PageData } from './$types';
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
index 90509b795..931a04ab7 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
@@ -2,7 +2,7 @@
     import { invalidate } from '$app/navigation';
     import { base } from '$app/paths';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { Id, Modal } from '$lib/components';
+    import { Id } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
diff --git a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[project]/settings/migrations/+page.svelte
index 7f8d383a2..f73714455 100644
--- a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/migrations/+page.svelte
@@ -40,7 +40,7 @@
         if (status === 'failed') {
             return 'failed';
         } else if (status === 'completed') {
-            return 'completed';
+            return 'complete';
         } else if (status === 'processing') {
             return 'processing';
         }
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte
index 28b425ca9..7b278b2bb 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte
@@ -29,13 +29,14 @@
     import { app } from '$lib/stores/app';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import CreatePreviewDomainModal from './createPreviewDomainModal.svelte';
+    import type { Domain } from '$lib/sdk/domains.js';
 
     export let data;
 
     let showDelete = false;
     let showRetry = false;
-    let selectedDomain: Models.ProxyRule = null;
     let showPreviewDomainModal = false;
+    let selectedDomain: Domain | Models.ProxyRule = null;
 
     $: console.log(data.domains);
 </script>
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index bdc498a7a..d391f5b26 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -10,11 +10,9 @@
         Layout,
         Tooltip,
         Icon,
-        Alert,
         Input,
         Divider,
         Typography,
-        Badge,
         Card
     } from '@appwrite.io/pink-svelte';
     import { goto, invalidate } from '$app/navigation';
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/recordsCard.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/recordsCard.svelte
index a44760013..87d83f145 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/recordsCard.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/recordsCard.svelte
@@ -4,8 +4,9 @@
     import type { Domain } from '$lib/sdk/domains';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import { Badge, Layout, Typography, Table, Fieldset, Icon } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
-    export let domain: Domain;
+    export let domain: Domain | Models.ProxyRule;
 </script>
 
 <Fieldset legend="Verification">
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index 74dcc41be..9e0d3eb62 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -4,14 +4,14 @@
     import { sdk } from '$lib/stores/sdk';
     import { addNotification } from '$lib/stores/notifications';
     import { invalidate } from '$app/navigation';
-    import type { Models } from '@appwrite.io/console';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import RecordsCard from './recordsCard.svelte';
     import type { Domain } from '$lib/sdk/domains';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let selectedDomain: Domain;
+    export let selectedDomain: Domain | Models.ProxyRule;
 
     let error = null;
     async function retryDomain() {