diff --git a/package.json b/package.json
index 2d858eac3..6ab641f3c 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16",
         "@appwrite.io/pink-legacy": "^1.0.0",
-        "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b",
+        "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462",
         "@popperjs/core": "^2.11.8",
         "@sentry/sveltekit": "^8.38.0",
         "@stripe/stripe-js": "^3.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eee2518b9..05f1f12f6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,20 +21,20 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       '@appwrite.io/pink-svelte':
-        specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b
-        version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b(react-dom@18.3.1)(svelte@4.2.19)
+        specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462
+        version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)
       '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
       '@sentry/sveltekit':
         specifier: ^8.38.0
-        version: 8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1)(@opentelemetry/instrumentation@0.56.0)(@opentelemetry/sdk-trace-base@1.30.1)(@opentelemetry/semantic-conventions@1.28.0)(@sveltejs/kit@2.16.1)(svelte@4.2.19)(vite@5.4.14)
+        version: 8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)(@sveltejs/kit@2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       '@stripe/stripe-js':
         specifier: ^3.5.0
         version: 3.5.0
       ai:
         specifier: ^2.2.37
-        version: 2.2.37(react@18.3.1)(solid-js@1.9.4)(svelte@4.2.19)(vue@3.5.13)
+        version: 2.2.37(react@18.3.1)(solid-js@1.9.4)(svelte@4.2.19)(vue@3.5.13(typescript@5.7.3))
       analytics:
         specifier: ^0.8.14
         version: 0.8.16(@types/dlv@1.1.5)
@@ -83,7 +83,7 @@ importers:
     devDependencies:
       '@melt-ui/pp':
         specifier: ^0.3.2
-        version: 0.3.2(@melt-ui/svelte@0.83.0)(svelte@4.2.19)
+        version: 0.3.2(@melt-ui/svelte@0.83.0(svelte@4.2.19))(svelte@4.2.19)
       '@melt-ui/svelte':
         specifier: ^0.83.0
         version: 0.83.0(svelte@4.2.19)
@@ -92,13 +92,13 @@ importers:
         version: 1.50.0
       '@sveltejs/adapter-static':
         specifier: ^3.0.6
-        version: 3.0.8(@sveltejs/kit@2.16.1)
+        version: 3.0.8(@sveltejs/kit@2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))
       '@sveltejs/kit':
         specifier: ^2.8.1
-        version: 2.16.1(@sveltejs/vite-plugin-svelte@3.1.2)(svelte@4.2.19)(vite@5.4.14)
+        version: 2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       '@sveltejs/vite-plugin-svelte':
         specifier: ^3.1.2
-        version: 3.1.2(svelte@4.2.19)(vite@5.4.14)
+        version: 3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       '@testing-library/dom':
         specifier: ^10.4.0
         version: 10.4.0
@@ -107,7 +107,7 @@ importers:
         version: 6.6.3
       '@testing-library/svelte':
         specifier: ^5.2.4
-        version: 5.2.6(svelte@4.2.19)(vite@5.4.14)(vitest@1.6.0)
+        version: 5.2.6(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))(vitest@1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4))
       '@testing-library/user-event':
         specifier: ^14.5.2
         version: 14.6.1(@testing-library/dom@10.4.0)
@@ -122,7 +122,7 @@ importers:
         version: 2.0.8
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.18.0
-        version: 7.18.0(@typescript-eslint/parser@7.18.0)(eslint@8.57.1)(typescript@5.7.3)
+        version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3)
       '@typescript-eslint/parser':
         specifier: ^7.18.0
         version: 7.18.0(eslint@8.57.1)(typescript@5.7.3)
@@ -161,13 +161,13 @@ importers:
         version: 4.2.19
       svelte-check:
         specifier: ^3.8.6
-        version: 3.8.6(@babel/core@7.26.7)(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)
+        version: 3.8.6(@babel/core@7.26.7)(postcss-load-config@3.1.4(postcss@8.5.1))(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)
       svelte-jester:
         specifier: ^2.3.2
-        version: 2.3.2(jest@29.7.0)(svelte@4.2.19)
+        version: 2.3.2(jest@29.7.0(@types/node@22.12.0))(svelte@4.2.19)
       svelte-preprocess:
         specifier: ^6.0.3
-        version: 6.0.3(@babel/core@7.26.7)(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3)
+        version: 6.0.3(@babel/core@7.26.7)(postcss-load-config@3.1.4(postcss@8.5.1))(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3)
       svelte-sequential-preprocessor:
         specifier: ^2.0.2
         version: 2.0.2
@@ -179,10 +179,10 @@ importers:
         version: 5.7.3
       vite:
         specifier: ^5.4.11
-        version: 5.4.14(sass@1.83.4)
+        version: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
       vitest:
         specifier: ^1.6.0
-        version: 1.6.0(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)
+        version: 1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)
 
 packages:
 
@@ -216,19 +216,16 @@ packages:
 
   '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c':
     resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c}
-    name: '@appwrite.io/console'
     version: 1.2.1
 
   '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16':
     resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16}
-    name: '@appwrite.io/pink-icons-svelte'
     version: 1.0.0-next.7
     peerDependencies:
       svelte: ^4.0.0
 
-  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@78e2c3be870ec08a85f0f02104173fb781276b9e':
-    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@78e2c3be870ec08a85f0f02104173fb781276b9e}
-    name: '@appwrite.io/pink-icons-svelte'
+  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7':
+    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7}
     version: 1.0.0-next.7
     peerDependencies:
       svelte: ^4.0.0
@@ -242,9 +239,8 @@ packages:
   '@appwrite.io/pink-legacy@1.0.0':
     resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==}
 
-  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b':
-    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b}
-    name: '@appwrite.io/pink-svelte'
+  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462':
+    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462}
     version: 1.0.0-next.85
     peerDependencies:
       react-dom: ^18.0.0
@@ -4095,12 +4091,10 @@ snapshots:
   '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c': {}
 
   '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16(svelte@4.2.19)':
-    id: '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16'
     dependencies:
       svelte: 4.2.19
 
-  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@78e2c3be870ec08a85f0f02104173fb781276b9e(svelte@4.2.19)':
-    id: '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@78e2c3be870ec08a85f0f02104173fb781276b9e'
+  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7(svelte@4.2.19)':
     dependencies:
       svelte: 4.2.19
 
@@ -4113,12 +4107,11 @@ snapshots:
       '@appwrite.io/pink-icons': 1.0.0
       the-new-css-reset: 1.11.3
 
-  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b(react-dom@18.3.1)(svelte@4.2.19)':
-    id: '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@78e2c3b'
+  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)':
     dependencies:
-      '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@78e2c3be870ec08a85f0f02104173fb781276b9e(svelte@4.2.19)
+      '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7(svelte@4.2.19)
       '@floating-ui/dom': 1.6.13
-      '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2)(svelte@4.2.19)
+      '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19)
       '@melt-ui/svelte': 0.86.2(svelte@4.2.19)
       pretty-bytes: 6.1.1
       react-dom: 18.3.1(react@18.3.1)
@@ -4626,14 +4619,14 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  '@melt-ui/pp@0.3.2(@melt-ui/svelte@0.83.0)(svelte@4.2.19)':
+  '@melt-ui/pp@0.3.2(@melt-ui/svelte@0.83.0(svelte@4.2.19))(svelte@4.2.19)':
     dependencies:
       '@melt-ui/svelte': 0.83.0(svelte@4.2.19)
       estree-walker: 3.0.3
       magic-string: 0.30.17
       svelte: 4.2.19
 
-  '@melt-ui/pp@0.3.2(@melt-ui/svelte@0.86.2)(svelte@4.2.19)':
+  '@melt-ui/pp@0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19)':
     dependencies:
       '@melt-ui/svelte': 0.86.2(svelte@4.2.19)
       estree-walker: 3.0.3
@@ -5205,12 +5198,12 @@ snapshots:
       '@opentelemetry/semantic-conventions': 1.28.0
       '@prisma/instrumentation': 5.22.0
       '@sentry/core': 8.52.0
-      '@sentry/opentelemetry': 8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1)(@opentelemetry/instrumentation@0.56.0)(@opentelemetry/sdk-trace-base@1.30.1)(@opentelemetry/semantic-conventions@1.28.0)
+      '@sentry/opentelemetry': 8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)
       import-in-the-middle: 1.12.0
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/opentelemetry@8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1)(@opentelemetry/instrumentation@0.56.0)(@opentelemetry/sdk-trace-base@1.30.1)(@opentelemetry/semantic-conventions@1.28.0)':
+  '@sentry/opentelemetry@8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
@@ -5226,18 +5219,19 @@ snapshots:
       magic-string: 0.30.7
       svelte: 4.2.19
 
-  '@sentry/sveltekit@8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1)(@opentelemetry/instrumentation@0.56.0)(@opentelemetry/sdk-trace-base@1.30.1)(@opentelemetry/semantic-conventions@1.28.0)(@sveltejs/kit@2.16.1)(svelte@4.2.19)(vite@5.4.14)':
+  '@sentry/sveltekit@8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)(@sveltejs/kit@2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))':
     dependencies:
       '@sentry/core': 8.52.0
       '@sentry/node': 8.52.0
-      '@sentry/opentelemetry': 8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1)(@opentelemetry/instrumentation@0.56.0)(@opentelemetry/sdk-trace-base@1.30.1)(@opentelemetry/semantic-conventions@1.28.0)
+      '@sentry/opentelemetry': 8.52.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)
       '@sentry/svelte': 8.52.0(svelte@4.2.19)
       '@sentry/vite-plugin': 2.22.6
-      '@sveltejs/kit': 2.16.1(@sveltejs/vite-plugin-svelte@3.1.2)(svelte@4.2.19)(vite@5.4.14)
+      '@sveltejs/kit': 2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       magic-string: 0.30.7
       magicast: 0.2.8
       sorcery: 1.0.0
-      vite: 5.4.14(sass@1.83.4)
+    optionalDependencies:
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
     transitivePeerDependencies:
       - '@opentelemetry/api'
       - '@opentelemetry/core'
@@ -5303,13 +5297,13 @@ snapshots:
 
   '@stripe/stripe-js@3.5.0': {}
 
-  '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.16.1)':
+  '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))':
     dependencies:
-      '@sveltejs/kit': 2.16.1(@sveltejs/vite-plugin-svelte@3.1.2)(svelte@4.2.19)(vite@5.4.14)
+      '@sveltejs/kit': 2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
 
-  '@sveltejs/kit@2.16.1(@sveltejs/vite-plugin-svelte@3.1.2)(svelte@4.2.19)(vite@5.4.14)':
+  '@sveltejs/kit@2.16.1(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 3.1.2(svelte@4.2.19)(vite@5.4.14)
+      '@sveltejs/vite-plugin-svelte': 3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       '@types/cookie': 0.6.0
       cookie: 0.6.0
       devalue: 5.1.1
@@ -5322,28 +5316,28 @@ snapshots:
       set-cookie-parser: 2.7.1
       sirv: 3.0.0
       svelte: 4.2.19
-      vite: 5.4.14(sass@1.83.4)
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
 
-  '@sveltejs/vite-plugin-svelte-inspector@2.1.0(@sveltejs/vite-plugin-svelte@3.1.2)(svelte@4.2.19)(vite@5.4.14)':
+  '@sveltejs/vite-plugin-svelte-inspector@2.1.0(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 3.1.2(svelte@4.2.19)(vite@5.4.14)
+      '@sveltejs/vite-plugin-svelte': 3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       debug: 4.4.0
       svelte: 4.2.19
-      vite: 5.4.14(sass@1.83.4)
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14)':
+  '@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 2.1.0(@sveltejs/vite-plugin-svelte@3.1.2)(svelte@4.2.19)(vite@5.4.14)
+      '@sveltejs/vite-plugin-svelte-inspector': 2.1.0(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)))(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
       debug: 4.4.0
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.17
       svelte: 4.2.19
       svelte-hmr: 0.16.0(svelte@4.2.19)
-      vite: 5.4.14(sass@1.83.4)
-      vitefu: 0.2.5(vite@5.4.14)
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
+      vitefu: 0.2.5(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))
     transitivePeerDependencies:
       - supports-color
 
@@ -5372,12 +5366,13 @@ snapshots:
       lodash: 4.17.21
       redent: 3.0.0
 
-  '@testing-library/svelte@5.2.6(svelte@4.2.19)(vite@5.4.14)(vitest@1.6.0)':
+  '@testing-library/svelte@5.2.6(svelte@4.2.19)(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4))(vitest@1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4))':
     dependencies:
       '@testing-library/dom': 10.4.0
       svelte: 4.2.19
-      vite: 5.4.14(sass@1.83.4)
-      vitest: 1.6.0(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)
+    optionalDependencies:
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
+      vitest: 1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)
 
   '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.0)':
     dependencies:
@@ -5489,7 +5484,7 @@ snapshots:
     dependencies:
       '@types/yargs-parser': 21.0.3
 
-  '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0)(eslint@8.57.1)(typescript@5.7.3)':
+  '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
       '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.7.3)
@@ -5502,6 +5497,7 @@ snapshots:
       ignore: 5.3.2
       natural-compare: 1.4.0
       ts-api-utils: 1.4.3(typescript@5.7.3)
+    optionalDependencies:
       typescript: 5.7.3
     transitivePeerDependencies:
       - supports-color
@@ -5514,6 +5510,7 @@ snapshots:
       '@typescript-eslint/visitor-keys': 7.18.0
       debug: 4.4.0
       eslint: 8.57.1
+    optionalDependencies:
       typescript: 5.7.3
     transitivePeerDependencies:
       - supports-color
@@ -5530,6 +5527,7 @@ snapshots:
       debug: 4.4.0
       eslint: 8.57.1
       ts-api-utils: 1.4.3(typescript@5.7.3)
+    optionalDependencies:
       typescript: 5.7.3
     transitivePeerDependencies:
       - supports-color
@@ -5546,6 +5544,7 @@ snapshots:
       minimatch: 9.0.5
       semver: 7.6.3
       ts-api-utils: 1.4.3(typescript@5.7.3)
+    optionalDependencies:
       typescript: 5.7.3
     transitivePeerDependencies:
       - supports-color
@@ -5599,7 +5598,7 @@ snapshots:
       pathe: 1.1.2
       picocolors: 1.1.1
       sirv: 2.0.4
-      vitest: 1.6.0(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)
+      vitest: 1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4)
 
   '@vitest/utils@1.6.0':
     dependencies:
@@ -5654,7 +5653,7 @@ snapshots:
       '@vue/shared': 3.5.13
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.13(vue@3.5.13)':
+  '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.7.3))':
     dependencies:
       '@vue/compiler-ssr': 3.5.13
       '@vue/shared': 3.5.13
@@ -5684,18 +5683,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ai@2.2.37(react@18.3.1)(solid-js@1.9.4)(svelte@4.2.19)(vue@3.5.13):
+  ai@2.2.37(react@18.3.1)(solid-js@1.9.4)(svelte@4.2.19)(vue@3.5.13(typescript@5.7.3)):
     dependencies:
       eventsource-parser: 1.0.0
       nanoid: 3.3.6
-      react: 18.3.1
-      solid-js: 1.9.4
       solid-swr-store: 0.10.7(solid-js@1.9.4)(swr-store@0.10.6)
       sswr: 2.0.0(svelte@4.2.19)
-      svelte: 4.2.19
       swr: 2.2.0(react@18.3.1)
       swr-store: 0.10.6
-      swrv: 1.0.4(vue@3.5.13)
+      swrv: 1.0.4(vue@3.5.13(typescript@5.7.3))
+    optionalDependencies:
+      react: 18.3.1
+      solid-js: 1.9.4
+      svelte: 4.2.19
       vue: 3.5.13(typescript@5.7.3)
 
   ajv@6.12.6:
@@ -5978,7 +5978,7 @@ snapshots:
 
   cookie@0.6.0: {}
 
-  create-jest@29.7.0:
+  create-jest@29.7.0(@types/node@22.12.0):
     dependencies:
       '@jest/types': 29.6.3
       chalk: 4.1.2
@@ -6217,8 +6217,9 @@ snapshots:
       postcss-safe-parser: 6.0.0(postcss@8.5.1)
       postcss-selector-parser: 6.1.2
       semver: 7.6.3
-      svelte: 4.2.19
       svelte-eslint-parser: 0.43.0(svelte@4.2.19)
+    optionalDependencies:
+      svelte: 4.2.19
     transitivePeerDependencies:
       - ts-node
 
@@ -6784,13 +6785,13 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@29.7.0:
+  jest-cli@29.7.0(@types/node@22.12.0):
     dependencies:
       '@jest/core': 29.7.0
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0
+      create-jest: 29.7.0(@types/node@22.12.0)
       exit: 0.1.2
       import-local: 3.2.0
       jest-config: 29.7.0(@types/node@22.12.0)
@@ -6808,7 +6809,6 @@ snapshots:
       '@babel/core': 7.26.7
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 22.12.0
       babel-jest: 29.7.0(@babel/core@7.26.7)
       chalk: 4.1.2
       ci-info: 3.9.0
@@ -6828,6 +6828,8 @@ snapshots:
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 22.12.0
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -6909,7 +6911,7 @@ snapshots:
       jest-util: 29.7.0
 
   jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
-    dependencies:
+    optionalDependencies:
       jest-resolve: 29.7.0
 
   jest-regex-util@29.6.3: {}
@@ -7047,12 +7049,12 @@ snapshots:
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@29.7.0:
+  jest@29.7.0(@types/node@22.12.0):
     dependencies:
       '@jest/core': 29.7.0
       '@jest/types': 29.6.3
       import-local: 3.2.0
-      jest-cli: 29.7.0
+      jest-cli: 29.7.0(@types/node@22.12.0)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -7483,8 +7485,9 @@ snapshots:
   postcss-load-config@3.1.4(postcss@8.5.1):
     dependencies:
       lilconfig: 2.1.0
-      postcss: 8.5.1
       yaml: 1.10.2
+    optionalDependencies:
+      postcss: 8.5.1
 
   postcss-safe-parser@6.0.0(postcss@8.5.1):
     dependencies:
@@ -7930,14 +7933,14 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte-check@3.8.6(@babel/core@7.26.7)(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19):
+  svelte-check@3.8.6(@babel/core@7.26.7)(postcss-load-config@3.1.4(postcss@8.5.1))(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       chokidar: 3.6.0
       picocolors: 1.1.1
       sade: 1.8.1
       svelte: 4.2.19
-      svelte-preprocess: 5.1.4(@babel/core@7.26.7)(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3)
+      svelte-preprocess: 5.1.4(@babel/core@7.26.7)(postcss-load-config@3.1.4(postcss@8.5.1))(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3)
       typescript: 5.7.3
     transitivePeerDependencies:
       - '@babel/core'
@@ -7961,15 +7964,16 @@ snapshots:
       espree: 9.6.1
       postcss: 8.5.1
       postcss-scss: 4.0.9(postcss@8.5.1)
+    optionalDependencies:
       svelte: 4.2.19
 
   svelte-hmr@0.16.0(svelte@4.2.19):
     dependencies:
       svelte: 4.2.19
 
-  svelte-jester@2.3.2(jest@29.7.0)(svelte@4.2.19):
+  svelte-jester@2.3.2(jest@29.7.0(@types/node@22.12.0))(svelte@4.2.19):
     dependencies:
-      jest: 29.7.0
+      jest: 29.7.0(@types/node@22.12.0)
       svelte: 4.2.19
 
   svelte-motion@0.12.2(svelte@4.2.19):
@@ -7981,25 +7985,29 @@ snapshots:
       svelte: 4.2.19
       tslib: 2.8.1
 
-  svelte-preprocess@5.1.4(@babel/core@7.26.7)(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3):
+  svelte-preprocess@5.1.4(@babel/core@7.26.7)(postcss-load-config@3.1.4(postcss@8.5.1))(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3):
     dependencies:
-      '@babel/core': 7.26.7
       '@types/pug': 2.0.10
       detect-indent: 6.1.0
       magic-string: 0.30.17
-      postcss: 8.5.1
-      sass: 1.83.4
       sorcery: 0.11.1
       strip-indent: 3.0.0
       svelte: 4.2.19
-      typescript: 5.7.3
-
-  svelte-preprocess@6.0.3(@babel/core@7.26.7)(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3):
-    dependencies:
+    optionalDependencies:
       '@babel/core': 7.26.7
       postcss: 8.5.1
+      postcss-load-config: 3.1.4(postcss@8.5.1)
       sass: 1.83.4
+      typescript: 5.7.3
+
+  svelte-preprocess@6.0.3(@babel/core@7.26.7)(postcss-load-config@3.1.4(postcss@8.5.1))(postcss@8.5.1)(sass@1.83.4)(svelte@4.2.19)(typescript@5.7.3):
+    dependencies:
       svelte: 4.2.19
+    optionalDependencies:
+      '@babel/core': 7.26.7
+      postcss: 8.5.1
+      postcss-load-config: 3.1.4(postcss@8.5.1)
+      sass: 1.83.4
       typescript: 5.7.3
 
   svelte-sequential-preprocessor@2.0.2:
@@ -8039,7 +8047,7 @@ snapshots:
 
   swrev@4.0.0: {}
 
-  swrv@1.0.4(vue@3.5.13):
+  swrv@1.0.4(vue@3.5.13(typescript@5.7.3)):
     dependencies:
       vue: 3.5.13(typescript@5.7.3)
 
@@ -8196,13 +8204,13 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-node@1.6.0(sass@1.83.4):
+  vite-node@1.6.0(@types/node@22.12.0)(sass@1.83.4):
     dependencies:
       cac: 6.7.14
       debug: 4.4.0
       pathe: 1.1.2
       picocolors: 1.1.1
-      vite: 5.4.14(sass@1.83.4)
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -8214,32 +8222,31 @@ snapshots:
       - supports-color
       - terser
 
-  vite@5.4.14(sass@1.83.4):
+  vite@5.4.14(@types/node@22.12.0)(sass@1.83.4):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.1
       rollup: 4.32.1
-      sass: 1.83.4
     optionalDependencies:
+      '@types/node': 22.12.0
       fsevents: 2.3.3
+      sass: 1.83.4
 
-  vitefu@0.2.5(vite@5.4.14):
-    dependencies:
-      vite: 5.4.14(sass@1.83.4)
+  vitefu@0.2.5(vite@5.4.14(@types/node@22.12.0)(sass@1.83.4)):
+    optionalDependencies:
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
 
-  vitest@1.6.0(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4):
+  vitest@1.6.0(@types/node@22.12.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.83.4):
     dependencies:
       '@vitest/expect': 1.6.0
       '@vitest/runner': 1.6.0
       '@vitest/snapshot': 1.6.0
       '@vitest/spy': 1.6.0
-      '@vitest/ui': 1.6.0(vitest@1.6.0)
       '@vitest/utils': 1.6.0
       acorn-walk: 8.3.4
       chai: 4.5.0
       debug: 4.4.0
       execa: 8.0.1
-      jsdom: 22.1.0
       local-pkg: 0.5.1
       magic-string: 0.30.17
       pathe: 1.1.2
@@ -8248,9 +8255,13 @@ snapshots:
       strip-literal: 2.1.1
       tinybench: 2.9.0
       tinypool: 0.8.4
-      vite: 5.4.14(sass@1.83.4)
-      vite-node: 1.6.0(sass@1.83.4)
+      vite: 5.4.14(@types/node@22.12.0)(sass@1.83.4)
+      vite-node: 1.6.0(@types/node@22.12.0)(sass@1.83.4)
       why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 22.12.0
+      '@vitest/ui': 1.6.0(vitest@1.6.0)
+      jsdom: 22.1.0
     transitivePeerDependencies:
       - less
       - lightningcss
@@ -8266,8 +8277,9 @@ snapshots:
       '@vue/compiler-dom': 3.5.13
       '@vue/compiler-sfc': 3.5.13
       '@vue/runtime-dom': 3.5.13
-      '@vue/server-renderer': 3.5.13(vue@3.5.13)
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.7.3))
       '@vue/shared': 3.5.13
+    optionalDependencies:
       typescript: 5.7.3
 
   w3c-xmlserializer@4.0.0:
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 5b0abf2c9..9a59cbbc5 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
@@ -37,6 +37,12 @@
     let selectedDomain: Models.ProxyRule = null;
 
     $: console.log(data.domains);
+
+    // TODO: replace status once backend is fixed
+    // created - Verification Failed
+    // verified - Verification OK , Certificate OK
+    // verifying - Verifiacitok OK
+    // unverified - Verificaiton OK , Certificate Failed
 </script>
 
 <Container>
@@ -69,7 +75,12 @@
                                 {domain.domain}
                                 <Icon icon={IconExternalLink} size="s" />
                             </Link>
-                            {#if domain.status !== 'verified'}
+                            {#if domain.status === 'created'}
+                                <Badge
+                                    variant="secondary"
+                                    content="Verification failed"
+                                    type="error" />
+                            {:else if domain.status === 'veryfing'}
                                 <Badge
                                     variant="secondary"
                                     content="Pending verification"
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 ae48a99dd..1f22d5e88 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
@@ -16,7 +16,8 @@
         Divider,
         Fieldset,
         Layout,
-        Typography
+        Typography,
+        Spinner
     } from '@appwrite.io/pink-svelte';
     import RecordsCard from '../recordsCard.svelte';
     import { invalidate } from '$app/navigation';
@@ -97,11 +98,24 @@
                     <Button secondary on:click={verifyStatus}>Verify</Button>
                 </Layout.Stack>
             </RecordsCard>
+        {:else if domainData.status === 'verifying'}
+            <Card radius="s">
+                <Layout.Stack gap="s" direction="row" alignItems="center">
+                    <Typography.Text variant="l-500">{domainData.domain}</Typography.Text>
+                    <Badge variant="secondary" type="success" content="Verified" />
+                    <Badge variant="secondary" content="Generating certificate...">
+                        <svelte:fragment slot="start">
+                            <Spinner size="s" />
+                        </svelte:fragment>
+                    </Badge>
+                </Layout.Stack>
+            </Card>
         {:else if domainData.status === 'verified'}
             <Card radius="s">
                 <Layout.Stack gap="s" direction="row" alignItems="center">
                     <Typography.Text variant="l-500">{domainData.domain}</Typography.Text>
                     <Badge variant="secondary" type="success" content="Verified" />
+                    <Badge variant="secondary" type="success" content="Generated certificate" />
                 </Layout.Stack>
             </Card>
         {/if}
@@ -121,9 +135,8 @@
                     </Layout.Stack>
                 </Form>
                 <Alert.Inline title="Domain providers and DNS settings" hideActions>
-                    A list of all domain providers and their DNS setting is available <Link
-                        size="s"
-                        href="#">here</Link
+                    A list of all domain providers and their DNS setting is available <Link href="#"
+                        >here</Link
                     >.
                 </Alert.Inline>
             </Layout.Stack>
@@ -133,9 +146,8 @@
     <svelte:fragment slot="aside">
         <Card>
             <Layout.Stack direction="column">
-                <!-- TODO: Update the Accordion component to conditionally render a divider, as it currently includes one by default for every instance -->
-                {#each siteDomainTips as tips}
-                    <Accordion title={tips.title}>
+                {#each siteDomainTips as tips, i}
+                    <Accordion title={tips.title} hideDivider={i === siteDomainTips.length - 1}>
                         {tips.message}
                     </Accordion>
                 {/each}
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 c03adf3ee..0afc74175 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
@@ -12,6 +12,7 @@
     export let show = false;
     export let selectedDomain: Models.ProxyRule;
 
+    let error = null;
     async function retryDomain() {
         try {
             await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id);
@@ -22,17 +23,18 @@
                 message: `${selectedDomain.domain} has been deleted`
             });
             trackEvent(Submit.DomainDelete);
-        } catch (error) {
-            addNotification({
-                type: 'error',
-                message: error.message
-            });
-            trackError(error, Submit.DomainDelete);
+        } catch (e) {
+            error = e;
+            trackError(e, Submit.DomainDelete);
         }
     }
+
+    $: if (!show) {
+        error = null;
+    }
 </script>
 
-<Modal title="Retry verification" bind:show onSubmit={retryDomain}>
+<Modal title="Retry verification" bind:show onSubmit={retryDomain} bind:error>
     {#if selectedDomain}
         <RecordsCard domain={selectedDomain} />
     {/if}