From d3c96369d15417b17b9c47281038e15e7e6a8dfe Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 14:48:34 +0530
Subject: [PATCH 001/177] fix: consistent divider colors.

---
 src/lib/wizards/functions/cover.svelte | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 08a18f1195..4a1245d4ac 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -287,4 +287,20 @@
             hsl(var(--p-card-bg-color) / 0.5) 95.8%
         );
     }
+
+    .u-sep-block-start {
+        border-block-start: solid .0625rem hsl(var(--color-neutral)) !important;
+    }
+
+    .clickable-list-item:not(:last-child) {
+        border-block-end: solid .0625rem hsl(var(--color-neutral)) !important;
+    }
+
+    :global(.theme-light) {
+        --color-neutral: var(--color-neutral-10);
+    }
+
+    :global(.theme-dark) {
+        --color-neutral: var(--color-neutral-85);
+    }
 </style>

From 06a02c7939437ebcab08388eaf108f3f737bc128 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 14:55:07 +0530
Subject: [PATCH 002/177] fix: add 16px padding around link items.

---
 src/lib/wizards/functions/cover.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 4a1245d4ac..10e28b72bd 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -219,7 +219,7 @@
 
                         <ul class="clickable-list u-margin-block-start-16">
                             {#each templates as template}
-                                <li class="clickable-list-item">
+                                <li class="clickable-list-item u-padding-block-16">
                                     <button
                                         type="button"
                                         on:click={() => {

From 302e58b4abfac645513c00c10f00624aeaab8267 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 15:05:48 +0530
Subject: [PATCH 003/177] update: correct closed lock icon color.

---
 src/lib/wizards/functions/components/repositories.svelte | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index dc8c73bd41..30297eb319 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -225,3 +225,9 @@
         </Button>
     </div>
 {/if}
+
+<style>
+    .icon-lock-closed {
+        color: hsl(var(--color-neutral-50));
+    }
+</style>
\ No newline at end of file

From b59dd1d5dcd0ef3def02b8a9c6e4d7ac299c0da9 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 15:35:29 +0530
Subject: [PATCH 004/177] update: center progress bar.

---
 src/lib/wizards/functions/components/repositories.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index 30297eb319..9b1bd657cb 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -125,7 +125,7 @@
     </p>
     {#if selectedInstallation}
         {#await loadRepositories(selectedInstallation, search)}
-            <div class="u-flex u-gap-8 u-cross-center u-main-center">
+            <div class="u-flex u-gap-8 u-cross-center u-main-center" style="height: 50vh; ">
                 <div class="loader u-margin-32" />
             </div>
         {:then response}

From 3bd01431eb0fcda2219ec19c47a4a2cf8024f847 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 15:44:28 +0530
Subject: [PATCH 005/177] fix: branch message to use plural.

---
 src/lib/wizards/functions/steps/gitConfiguration.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/steps/gitConfiguration.svelte b/src/lib/wizards/functions/steps/gitConfiguration.svelte
index 9980e765d9..1aaaf93baf 100644
--- a/src/lib/wizards/functions/steps/gitConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/gitConfiguration.svelte
@@ -67,7 +67,7 @@
                             $choices.branch = event.detail.value;
                         }}
                         interactiveOutput
-                        name="branch"
+                        name="branches"
                         {options} />
                     <InputText
                         id="root"

From eda0016d4d611c5f4a0bf484fe506b065addfe1b Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 18:16:34 +0530
Subject: [PATCH 006/177] fix: icon sizes as per designs.

---
 src/lib/components/dropListLink.svelte                      | 4 +++-
 .../functions/function-[function]/deploymentSource.svelte   | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/dropListLink.svelte b/src/lib/components/dropListLink.svelte
index 0267a21d05..5f60543ec8 100644
--- a/src/lib/components/dropListLink.svelte
+++ b/src/lib/components/dropListLink.svelte
@@ -6,6 +6,7 @@
     export let disabled = false;
     export let external = false;
     export let event: string = null;
+    export let iconStyle: string = '';
 
     function track() {
         if (!event) {
@@ -29,7 +30,8 @@
         rel={external ? 'noopener noreferrer' : ''}>
         <span class="text"><slot /></span>
         {#if icon}
-            <span class={`icon-${icon}`} aria-hidden="true" />
+            <span class={`icon-${icon}`} style={iconStyle} aria-hidden="true" />
         {/if}
     </a>
 </li>
+
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
index 0c5b765de1..83e4f4e7ec 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
@@ -15,14 +15,14 @@
             <span class="icon-github" aria-hidden="true" /> <span class="link">GitHub</span>
         </button>
         <svelte:fragment slot="list">
-            <DropListLink href={deployment.providerRepositoryUrl} external icon="github">
+            <DropListLink href={deployment.providerRepositoryUrl} external icon="github" iconStyle="font-size:20px">
                 {deployment.providerRepositoryOwner}/{deployment.providerRepositoryName}
             </DropListLink>
-            <DropListLink href={deployment.providerBranchUrl} external icon="git-branch">
+            <DropListLink href={deployment.providerBranchUrl} external icon="git-branch" iconStyle="font-size:20px">
                 {deployment.providerBranch}
             </DropListLink>
             {#if deployment?.providerCommitMessage && deployment?.providerCommitHash && deployment?.providerCommitUrl}
-                <DropListLink href={deployment.providerCommitUrl} external icon="git-commit">
+                <DropListLink href={deployment.providerCommitUrl} external icon="git-commit" iconStyle="font-size:20px">
                     <Trim alternativeTrim>
                         {deployment?.providerCommitHash?.substring(0, 7)}
                         {deployment.providerCommitMessage}

From f4a7e9901b2eddd62ee9032046f2e62f56213792 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 18:28:41 +0530
Subject: [PATCH 007/177] fix: truncate labels in git deployment info tooltip.

---
 .../function-[function]/deploymentSource.svelte      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
index 83e4f4e7ec..2d64f7a031 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
@@ -16,7 +16,11 @@
         </button>
         <svelte:fragment slot="list">
             <DropListLink href={deployment.providerRepositoryUrl} external icon="github" iconStyle="font-size:20px">
-                {deployment.providerRepositoryOwner}/{deployment.providerRepositoryName}
+                <Trim alternativeTrim>
+                    <span style="white-space: pre-wrap">
+                        {deployment.providerRepositoryOwner}/{deployment.providerRepositoryName}
+                    </span>
+                </Trim>
             </DropListLink>
             <DropListLink href={deployment.providerBranchUrl} external icon="git-branch" iconStyle="font-size:20px">
                 {deployment.providerBranch}
@@ -24,8 +28,10 @@
             {#if deployment?.providerCommitMessage && deployment?.providerCommitHash && deployment?.providerCommitUrl}
                 <DropListLink href={deployment.providerCommitUrl} external icon="git-commit" iconStyle="font-size:20px">
                     <Trim alternativeTrim>
-                        {deployment?.providerCommitHash?.substring(0, 7)}
-                        {deployment.providerCommitMessage}
+                        <span style="white-space: pre-wrap">
+                            {deployment?.providerCommitHash?.substring(0, 7)}
+                            {deployment.providerCommitMessage}
+                        </span>
                     </Trim>
                 </DropListLink>
             {/if}

From 40120c79881dc1ad1a8aca604a6174afac820aa2 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 18:35:50 +0530
Subject: [PATCH 008/177] fix: use `Build Size` for consistency.

---
 .../functions/function-[function]/+page.svelte                  | 2 +-
 .../function-[function]/deployment-[deployment]/+page.svelte    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
index aa0c3c17b2..e370f26793 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
@@ -105,7 +105,7 @@
                                 <b>Updated:</b>
                                 <DeploymentCreatedBy deployment={activeDeployment} />
                             </p>
-                            <p><b>Size:</b> {fileSize.value + fileSize.unit}</p>
+                            <p><b>Build Size:</b> {fileSize.value + fileSize.unit}</p>
                             <p class="u-flex u-gap-4 u-cross-center">
                                 <b>Source:</b>
                                 <DeploymentSource deployment={activeDeployment} />
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index ccaacbe06f..8d33c939e3 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -76,7 +76,7 @@
                     </p>
                     <p><b>Updated:</b> <DeploymentCreatedBy deployment={$deployment} /></p>
                     <p>
-                        <b>Size:</b>
+                        <b>Build Size:</b>
                         {fileSize.value + fileSize.unit}
                         <span
                             class="icon-info"

From ef7dc5b60223bbc122dc33e7368fb2e3d3721dc9 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 30 Jul 2024 18:42:37 +0530
Subject: [PATCH 009/177] fix: remove extra space.

---
 .../functions/function-[function]/execute.svelte             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
index aea981107d..aaa56773af 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
@@ -92,9 +92,8 @@
             class="link"
             href="https://appwrite.io/docs/products/functions/execution"
             target="_blank"
-            rel="noopener noreferrer">
-            Learn more
-        </a>.
+            rel="noopener noreferrer">Learn more</a
+        >.
     </p>
 
     <FormList>

From 9ce2d7b703135c4cc9abc5d0722145adfafede17 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Wed, 31 Jul 2024 16:52:35 +0530
Subject: [PATCH 010/177] fix: show only element if single in required vars.

---
 .../functions/steps/templateVariables.svelte  | 60 ++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/lib/wizards/functions/steps/templateVariables.svelte b/src/lib/wizards/functions/steps/templateVariables.svelte
index d8e6773440..e832a73cd5 100644
--- a/src/lib/wizards/functions/steps/templateVariables.svelte
+++ b/src/lib/wizards/functions/steps/templateVariables.svelte
@@ -63,12 +63,51 @@
     </svelte:fragment>
     {#if $template?.variables?.length}
         {#if requiredVariables?.length}
-            <Collapsible>
-                <CollapsibleItem open={true}>
-                    <svelte:fragment slot="title">Required variables</svelte:fragment>
-                    <svelte:fragment slot="subtitle">
-                        <span class="inline-tag">{requiredVariables.length}</span>
-                    </svelte:fragment>
+            {#if requiredVariables?.length === 1}
+                <div class="collapsible-item">
+                    <div class="collapsible-wrapper">
+                        <div class="collapsible-button">
+                            <div>
+                                <span class="text">Required variables</span>
+                                <span class="collapsible-button-optional">
+                                    <span class="inline-tag">{requiredVariables.length}</span>
+                                </span>
+                            </div>
+                        </div>
+                        <div class="collapsible-content">
+                            <FormList>
+                            {#each requiredVariables as variable}
+                                {#if variable.name === 'APPWRITE_API_KEY'}
+                                    <AppwriteVariable appwriteVariable={variable} />
+                                {:else}
+                                    <div>
+                                        <svelte:component
+                                            this={selectComponent(variable.type)}
+                                            id={variable.name}
+                                            label={variable.name}
+                                            placeholder={variable.placeholder ?? 'Enter value'}
+                                            required={variable.required}
+                                            autocomplete={false}
+                                            minlength={variable.type === 'password' ? 0 : null}
+                                            showPasswordButton={variable.type === 'password'}
+                                            bind:value={$templateConfig.variables[variable.name]} />
+                                        <Helper type="neutral">
+                                            {@html variable.description}
+                                        </Helper>
+                                    </div>
+                                {/if}
+                            {/each}
+                        </FormList>
+                        </div>
+                    </div>
+                </div>
+            {:else if requiredVariables?.length > 1}
+                <Collapsible>
+                    <CollapsibleItem open={true}>
+                        <svelte:fragment slot="title">Required variables</svelte:fragment>
+                        <svelte:fragment slot="subtitle">
+                            <span class="inline-tag">{requiredVariables.length}</span>
+                        </svelte:fragment>
 
                     <FormList>
                         {#each requiredVariables as variable}
@@ -94,7 +133,8 @@
                         {/each}
                     </FormList>
                 </CollapsibleItem>
-            </Collapsible>
+                </Collapsible>
+            {/if}
         {/if}
 
         {#if optionalVariables?.length}
@@ -137,3 +177,9 @@
         </Card>
     {/if}
 </WizardStep>
+
+<style>
+    .collapsible-button div {
+        padding: 3px 0;
+    }
+</style>
\ No newline at end of file

From bc56e7d4e1ea82d39b3b97314b706196d413f0ae Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Thu, 1 Aug 2024 14:15:30 +0530
Subject: [PATCH 011/177] update: stack content vertically on mobile.

---
 .../deployment-[deployment]/+page.svelte        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 8d33c939e3..334283d775 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -64,7 +64,7 @@
         <svelte:fragment slot="aside">
             {@const status = $deployment.status}
             {@const fileSize = humanFileSize($deployment.size)}
-            <div class="u-flex u-main-space-between">
+            <div class="u-flex u-main-space-between deployment-info">
                 <div class="u-grid-equal-row-size u-gap-4 u-line-height-1">
                     <p>
                         <b>Build time:</b>
@@ -98,7 +98,7 @@
                         </p>
                     {/if}
                 </div>
-                <div class="u-flex u-flex-vertical u-cross-end">
+                <div class="u-flex u-flex-vertical u-cross-end deployment-status">
                     <Pill
                         danger={status === 'failed'}
                         warning={status === 'building'}
@@ -141,3 +141,16 @@
         </div>
     </Card>
 </Container>
+
+<style>
+    @media (max-width: 768px) {
+        .deployment-info, .code-panel-header {
+            flex-direction: column;
+        }
+
+        .deployment-status {
+            padding-block-start: 1.5rem;
+            align-items: start !important;
+        }
+    }
+</style>
\ No newline at end of file

From f53897f7791201b271d4f5b3afe04cde7de08b6a Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Thu, 1 Aug 2024 14:55:22 +0530
Subject: [PATCH 012/177] fix: component borders for CLI modal.

---
 src/lib/components/code.svelte                  |  5 ++++-
 .../function-[function]/createCli.svelte        | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte
index 5a358d548d..47c134f20e 100644
--- a/src/lib/components/code.svelte
+++ b/src/lib/components/code.svelte
@@ -32,6 +32,9 @@
     export let noBoxPadding = false;
     export let allowScroll = false;
 
+    let classes = '';
+    export { classes as class };
+
     Prism.plugins.customClass.prefix('prism-');
 
     afterUpdate(async () => {
@@ -39,7 +42,7 @@
     });
 </script>
 
-<section class="box u-overflow-hidden" class:common-section={!noMargin} class:noBoxPadding>
+<section class="box u-overflow-hidden {classes}" class:common-section={!noMargin} class:noBoxPadding>
     <div
         class="controls u-position-absolute u-inset-inline-end-8 u-inset-block-start-8 u-flex u-gap-8">
         {#if label}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
index efc7a48c7c..b43c2d9bd3 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
@@ -98,7 +98,7 @@
         >.
     </Alert>
 
-    <div class="editor-border">
+    <div class="editor-border box">
         <SecondaryTabs large class="u-sep-block-end u-padding-8">
             {#each ['Unix', 'CMD', 'PowerShell'] as cat}
                 <SecondaryTabsItem
@@ -118,6 +118,7 @@
                     withLineNumbers
                     withCopy
                     language="sh"
+                    class="cli-commands-code-box-no-outline"
                     label={codeSnippets[cat].language}
                     code={codeSnippets[cat].code} />
             {/if}
@@ -127,3 +128,17 @@
         <Button secondary on:click={() => (show = false)}>Close</Button>
     </svelte:fragment>
 </Modal>
+
+<style>
+    .box {
+        padding: unset !important;
+    }
+
+    /* should we use global here? */
+    .editor-border :global(.cli-commands-code-box-no-outline) {
+        margin: 1rem 0;
+        border: unset !important;
+        border-radius: unset!important;
+        padding: 0 var(--box-padding, 1.5rem ) 0 var(--box-padding, 1.5rem );
+    }
+</style>
\ No newline at end of file

From 1242c454e78f2deac739638e294ee85f965d7e75 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 14:18:01 +0530
Subject: [PATCH 013/177] fix: cli commands bg.

---
 .../functions/function-[function]/createCli.svelte          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
index b43c2d9bd3..d8e3e3b2be 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
@@ -132,6 +132,7 @@
 <style>
     .box {
         padding: unset !important;
+        background-color: unset !important;
     }
 
     /* should we use global here? */
@@ -139,6 +140,11 @@
         margin: 1rem 0;
         border: unset !important;
         border-radius: unset!important;
+        background-color: unset !important;
         padding: 0 var(--box-padding, 1.5rem ) 0 var(--box-padding, 1.5rem );
     }
+
+    :global(.editor-border .cli-commands-code-box-no-outline pre) {
+        background-color: unset !important;
+    }
 </style>
\ No newline at end of file

From 14e83740d7cf04994f21ef60945d30c36d603ea4 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 15:01:33 +0530
Subject: [PATCH 014/177] fix: item gap.

---
 src/lib/wizards/functions/cover.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 10e28b72bd..a5afc9cf8c 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -219,7 +219,7 @@
 
                         <ul class="clickable-list u-margin-block-start-16">
                             {#each templates as template}
-                                <li class="clickable-list-item u-padding-block-16">
+                                <li class="clickable-list-item u-padding-block-8">
                                     <button
                                         type="button"
                                         on:click={() => {

From c2b3a12e6d6ddc62afd475b7423b596eb091e8d3 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 15:02:38 +0530
Subject: [PATCH 015/177] fix: hide accordion if all are required variables.

---
 src/lib/wizards/functions/steps/templateVariables.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/steps/templateVariables.svelte b/src/lib/wizards/functions/steps/templateVariables.svelte
index e832a73cd5..d7a44179e1 100644
--- a/src/lib/wizards/functions/steps/templateVariables.svelte
+++ b/src/lib/wizards/functions/steps/templateVariables.svelte
@@ -63,7 +63,7 @@
     </svelte:fragment>
     {#if $template?.variables?.length}
         {#if requiredVariables?.length}
-            {#if requiredVariables?.length === 1}
+            {#if requiredVariables?.length === 1 || requiredVariables.every((variable) => variable.required)}
                 <div class="collapsible-item">
                     <div class="collapsible-wrapper">
                         <div class="collapsible-button">

From 3d316616f6b1e2c179be35b9cccb62781d06ec9e Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 15:09:19 +0530
Subject: [PATCH 016/177] fix: status alignment.

---
 .../function-[function]/deployment-[deployment]/+page.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 334283d775..3f929eef69 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -98,7 +98,7 @@
                         </p>
                     {/if}
                 </div>
-                <div class="u-flex u-flex-vertical u-cross-end deployment-status">
+                <div class="u-flex u-flex-vertical deployment-status">
                     <Pill
                         danger={status === 'failed'}
                         warning={status === 'building'}

From 226227f880d087c19f4b86495243f5562f2689a5 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 15:26:45 +0530
Subject: [PATCH 017/177] fix: execution modal theme.

---
 src/lib/layout/logs.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 55deb73326..0d920cc2da 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -162,10 +162,10 @@
                             </div>
                         </div>
                     </header>
-                    <div class="code-panel-content grid-1-2" style="u-grid">
+                    <div class="code-panel-content grid-1-2">
                         <div
                             class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16"
-                            class:theme-dark={$app.themeInUse === 'light'}>
+                            class:theme-dark={$app.themeInUse === 'dark'}>
                             <Heading tag="h3" size="6">Request</Heading>
                             <div class="u-sep-block-end">
                                 <Tabs>
@@ -278,7 +278,7 @@
                         </div>
                         <div
                             class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0"
-                            class:theme-dark={$app.themeInUse === 'light'}>
+                            class:theme-dark={$app.themeInUse === 'dark'}>
                             <Heading tag="h3" size="6">Response</Heading>
                             <div class="u-sep-block-end">
                                 <Tabs>

From a55ec9c1147826d81e90fb654c1cf8464a96477c Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 17:03:19 +0530
Subject: [PATCH 018/177] fix: make only logs scrollable.

---
 src/lib/layout/logs.svelte | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 0d920cc2da..0ede7d5983 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -316,7 +316,13 @@
                                             {/if}
                                         </Alert>
                                     {/if}
-                                    <Code withCopy noMargin code={execution.logs} language="sh" />
+                                    <Code
+                                        allowScroll
+                                        withCopy
+                                        noMargin
+                                        code={execution.logs}
+                                        language="sh"
+                                        class="limited-code-height" />
                                 {:else}
                                     <Card isDashed isTile>
                                         <p class="text u-text-center">No response was recorded.</p>
@@ -324,7 +330,13 @@
                                 {/if}
                             {:else if selectedResponse === 'errors'}
                                 {#if execution?.errors}
-                                    <Code withCopy noMargin code={execution.errors} language="sh" />
+                                    <Code
+                                        allowScroll
+                                        withCopy
+                                        noMargin
+                                        code={execution.errors}
+                                        language="sh"
+                                        class="limited-code-height" />
                                 {:else}
                                     <Card isDashed isTile>
                                         <p class="text u-text-center">No response was recorded.</p>
@@ -384,3 +396,10 @@
         </div>
     </section>
 {/if}
+
+<style>
+    :global(.limited-code-height) {
+        max-height: 50vh;
+        overflow: auto !important;
+    }
+</style>

From c554aab4b9dae846d8d29af12b86e26388c08a56 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 17:05:02 +0530
Subject: [PATCH 019/177] ran: `npm run format`.

---
 src/lib/components/code.svelte                |  5 +-
 src/lib/components/dropListLink.svelte        |  1 -
 src/lib/helpers/load.ts                       |  2 +-
 src/lib/layout/unauthenticated.svelte         |  2 +-
 src/lib/stores/feedback.ts                    |  4 +-
 .../functions/components/repositories.svelte  |  2 +-
 src/lib/wizards/functions/cover.svelte        |  4 +-
 .../functions/steps/templateVariables.svelte  | 74 ++++++++++---------
 .../function-[function]/createCli.svelte      |  6 +-
 .../deployment-[deployment]/+page.svelte      |  5 +-
 .../deploymentSource.svelte                   | 18 ++++-
 11 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte
index 47c134f20e..5b818a7b8a 100644
--- a/src/lib/components/code.svelte
+++ b/src/lib/components/code.svelte
@@ -42,7 +42,10 @@
     });
 </script>
 
-<section class="box u-overflow-hidden {classes}" class:common-section={!noMargin} class:noBoxPadding>
+<section
+    class="box u-overflow-hidden {classes}"
+    class:common-section={!noMargin}
+    class:noBoxPadding>
     <div
         class="controls u-position-absolute u-inset-inline-end-8 u-inset-block-start-8 u-flex u-gap-8">
         {#if label}
diff --git a/src/lib/components/dropListLink.svelte b/src/lib/components/dropListLink.svelte
index 5f60543ec8..a2ef47b999 100644
--- a/src/lib/components/dropListLink.svelte
+++ b/src/lib/components/dropListLink.svelte
@@ -34,4 +34,3 @@
         {/if}
     </a>
 </li>
-
diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts
index 05e043ddc9..21e2f1ee6e 100644
--- a/src/lib/helpers/load.ts
+++ b/src/lib/helpers/load.ts
@@ -21,7 +21,7 @@ export enum View {
 export function getView(url: URL, route: Page['route'], fallback: View): View {
     return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
         ? View.Grid
-        : View.Table ?? fallback;
+        : (View.Table ?? fallback);
 }
 
 export function getColumns(route: Page['route'], fallback: string[]): string[] {
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index b7e250b540..4d859d492e 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -16,7 +16,7 @@
     export let coupon: Coupon = null;
 
     $: selectedCampaign = campaigns.get(coupon?.campaign ?? campaign);
-    $: variation = (coupon?.campaign ?? campaign ? selectedCampaign?.template : 'default') as
+    $: variation = ((coupon?.campaign ?? campaign) ? selectedCampaign?.template : 'default') as
         | 'default'
         | CampaignData['template'];
 
diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
index 7f9b6b2004..7eaefca2d5 100644
--- a/src/lib/stores/feedback.ts
+++ b/src/lib/stores/feedback.ts
@@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore();
 
 function createFeedbackStore() {
     const { subscribe, update } = writable<Feedback>({
-        elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0,
-        visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0,
+        elapsed: browser ? (parseInt(localStorage.getItem('feedbackElapsed')) ?? 0) : 0,
+        visualized: browser ? (parseInt(localStorage.getItem('feedbackVisualized')) ?? 0) : 0,
         notification: false,
         type: 'general',
         show: false
diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index 9b1bd657cb..2c6bcc90de 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -230,4 +230,4 @@
     .icon-lock-closed {
         color: hsl(var(--color-neutral-50));
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index a5afc9cf8c..e539f6f052 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -289,11 +289,11 @@
     }
 
     .u-sep-block-start {
-        border-block-start: solid .0625rem hsl(var(--color-neutral)) !important;
+        border-block-start: solid 0.0625rem hsl(var(--color-neutral)) !important;
     }
 
     .clickable-list-item:not(:last-child) {
-        border-block-end: solid .0625rem hsl(var(--color-neutral)) !important;
+        border-block-end: solid 0.0625rem hsl(var(--color-neutral)) !important;
     }
 
     :global(.theme-light) {
diff --git a/src/lib/wizards/functions/steps/templateVariables.svelte b/src/lib/wizards/functions/steps/templateVariables.svelte
index d7a44179e1..4d4f49dad4 100644
--- a/src/lib/wizards/functions/steps/templateVariables.svelte
+++ b/src/lib/wizards/functions/steps/templateVariables.svelte
@@ -76,6 +76,42 @@
                         </div>
                         <div class="collapsible-content">
                             <FormList>
+                                {#each requiredVariables as variable}
+                                    {#if variable.name === 'APPWRITE_API_KEY'}
+                                        <AppwriteVariable appwriteVariable={variable} />
+                                    {:else}
+                                        <div>
+                                            <svelte:component
+                                                this={selectComponent(variable.type)}
+                                                id={variable.name}
+                                                label={variable.name}
+                                                placeholder={variable.placeholder ?? 'Enter value'}
+                                                required={variable.required}
+                                                autocomplete={false}
+                                                minlength={variable.type === 'password' ? 0 : null}
+                                                showPasswordButton={variable.type === 'password'}
+                                                bind:value={$templateConfig.variables[
+                                                    variable.name
+                                                ]} />
+                                            <Helper type="neutral">
+                                                {@html variable.description}
+                                            </Helper>
+                                        </div>
+                                    {/if}
+                                {/each}
+                            </FormList>
+                        </div>
+                    </div>
+                </div>
+            {:else if requiredVariables?.length > 1}
+                <Collapsible>
+                    <CollapsibleItem open={true}>
+                        <svelte:fragment slot="title">Required variables</svelte:fragment>
+                        <svelte:fragment slot="subtitle">
+                            <span class="inline-tag">{requiredVariables.length}</span>
+                        </svelte:fragment>
+
+                        <FormList>
                             {#each requiredVariables as variable}
                                 {#if variable.name === 'APPWRITE_API_KEY'}
                                     <AppwriteVariable appwriteVariable={variable} />
@@ -98,41 +134,7 @@
                                 {/if}
                             {/each}
                         </FormList>
-                        </div>
-                    </div>
-                </div>
-            {:else if requiredVariables?.length > 1}
-                <Collapsible>
-                    <CollapsibleItem open={true}>
-                        <svelte:fragment slot="title">Required variables</svelte:fragment>
-                        <svelte:fragment slot="subtitle">
-                            <span class="inline-tag">{requiredVariables.length}</span>
-                        </svelte:fragment>
-
-                    <FormList>
-                        {#each requiredVariables as variable}
-                            {#if variable.name === 'APPWRITE_API_KEY'}
-                                <AppwriteVariable appwriteVariable={variable} />
-                            {:else}
-                                <div>
-                                    <svelte:component
-                                        this={selectComponent(variable.type)}
-                                        id={variable.name}
-                                        label={variable.name}
-                                        placeholder={variable.placeholder ?? 'Enter value'}
-                                        required={variable.required}
-                                        autocomplete={false}
-                                        minlength={variable.type === 'password' ? 0 : null}
-                                        showPasswordButton={variable.type === 'password'}
-                                        bind:value={$templateConfig.variables[variable.name]} />
-                                    <Helper type="neutral">
-                                        {@html variable.description}
-                                    </Helper>
-                                </div>
-                            {/if}
-                        {/each}
-                    </FormList>
-                </CollapsibleItem>
+                    </CollapsibleItem>
                 </Collapsible>
             {/if}
         {/if}
@@ -182,4 +184,4 @@
     .collapsible-button div {
         padding: 3px 0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
index d8e3e3b2be..22bf832f9e 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
@@ -139,12 +139,12 @@
     .editor-border :global(.cli-commands-code-box-no-outline) {
         margin: 1rem 0;
         border: unset !important;
-        border-radius: unset!important;
+        border-radius: unset !important;
         background-color: unset !important;
-        padding: 0 var(--box-padding, 1.5rem ) 0 var(--box-padding, 1.5rem );
+        padding: 0 var(--box-padding, 1.5rem) 0 var(--box-padding, 1.5rem);
     }
 
     :global(.editor-border .cli-commands-code-box-no-outline pre) {
         background-color: unset !important;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 3f929eef69..e09f79cd49 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -144,7 +144,8 @@
 
 <style>
     @media (max-width: 768px) {
-        .deployment-info, .code-panel-header {
+        .deployment-info,
+        .code-panel-header {
             flex-direction: column;
         }
 
@@ -153,4 +154,4 @@
             align-items: start !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
index 2d64f7a031..b07d96d974 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
@@ -15,18 +15,30 @@
             <span class="icon-github" aria-hidden="true" /> <span class="link">GitHub</span>
         </button>
         <svelte:fragment slot="list">
-            <DropListLink href={deployment.providerRepositoryUrl} external icon="github" iconStyle="font-size:20px">
+            <DropListLink
+                href={deployment.providerRepositoryUrl}
+                external
+                icon="github"
+                iconStyle="font-size:20px">
                 <Trim alternativeTrim>
                     <span style="white-space: pre-wrap">
                         {deployment.providerRepositoryOwner}/{deployment.providerRepositoryName}
                     </span>
                 </Trim>
             </DropListLink>
-            <DropListLink href={deployment.providerBranchUrl} external icon="git-branch" iconStyle="font-size:20px">
+            <DropListLink
+                href={deployment.providerBranchUrl}
+                external
+                icon="git-branch"
+                iconStyle="font-size:20px">
                 {deployment.providerBranch}
             </DropListLink>
             {#if deployment?.providerCommitMessage && deployment?.providerCommitHash && deployment?.providerCommitUrl}
-                <DropListLink href={deployment.providerCommitUrl} external icon="git-commit" iconStyle="font-size:20px">
+                <DropListLink
+                    href={deployment.providerCommitUrl}
+                    external
+                    icon="git-commit"
+                    iconStyle="font-size:20px">
                     <Trim alternativeTrim>
                         <span style="white-space: pre-wrap">
                             {deployment?.providerCommitHash?.substring(0, 7)}

From e437a45061934e550348a1e2df66c443359aaf95 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 18:02:58 +0530
Subject: [PATCH 020/177] improve: handle scroll to top button.

---
 .../deployment-[deployment]/+page.svelte      | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index e09f79cd49..b0e5977763 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -22,24 +22,45 @@
     import { tooltip } from '$lib/actions/tooltip';
 
     let logs = '';
+    let showScrollButton = false;
+    let codePanelContent: HTMLElement; /* global var to avoid frequent querySelector calls */
+
+    function handleScroll() {
+        const threshold = codePanelContent.clientHeight * 0.25;
+        showScrollButton = codePanelContent.scrollTop > threshold;
+    }
 
     onMount(() => {
         logs = $deployment.buildLogs;
+
+        codePanelContent = document.querySelector('.code-panel-content');
+        codePanelContent.addEventListener('scroll', handleScroll);
+
         if ($deployment.status === 'ready') {
             return;
         }
-        return sdk.forConsole.client.subscribe<Models.Deployment>('console', (message) => {
-            if (
-                message.events.includes(
-                    `functions.${$page.params.function}.deployments.${$page.params.deployment}.update`
-                )
-            ) {
-                logs = message.payload['logs'];
-                if (message.payload.status === 'ready') {
-                    invalidate(Dependencies.DEPLOYMENT);
+
+        const unsubscribe = sdk.forConsole.client.subscribe<Models.Deployment>(
+            'console',
+            (message) => {
+                if (
+                    message.events.includes(
+                        `functions.${$page.params.function}.deployments.${$page.params.deployment}.update`
+                    )
+                ) {
+                    logs = message.payload['logs'];
+
+                    if (message.payload.status === 'ready') {
+                        invalidate(Dependencies.DEPLOYMENT);
+                    }
                 }
             }
-        });
+        );
+
+        return () => {
+            unsubscribe();
+            codePanelContent.removeEventListener('scroll', handleScroll);
+        };
     });
 </script>
 
@@ -130,7 +151,8 @@
                             <span class="icon-external-link" aria-hidden="true" /> Raw data</Button> -->
                         <Button
                             secondary
-                            on:click={() => window.scrollTo({ top: 0, behavior: 'smooth' })}>
+                            disabled={!showScrollButton}
+                            on:click={() => codePanelContent?.scrollTo({ top: 0, behavior: 'smooth' })}>
                             <span class="icon-arrow-sm-up" aria-hidden="true" /> Scroll to top</Button>
                     </div>
                 </header>
@@ -154,4 +176,8 @@
             align-items: start !important;
         }
     }
+
+    .code-panel-content {
+        max-height: 50vh;
+    }
 </style>

From 18508992c558aec5b87fb98b7121d5e3cd9e199f Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Fri, 2 Aug 2024 18:04:07 +0530
Subject: [PATCH 021/177] fix: comment message.

---
 .../function-[function]/deployment-[deployment]/+page.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index b0e5977763..36fed5591c 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -23,7 +23,7 @@
 
     let logs = '';
     let showScrollButton = false;
-    let codePanelContent: HTMLElement; /* global var to avoid frequent querySelector calls */
+    let codePanelContent: HTMLElement; /* var to avoid frequent querySelector calls */
 
     function handleScroll() {
         const threshold = codePanelContent.clientHeight * 0.25;

From 1818a762c00f8b2e633497448539def57461bba5 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sat, 3 Aug 2024 14:22:42 +0530
Subject: [PATCH 022/177] fix: borders cut off.

---
 src/lib/pages/domains/wizard/retry.svelte | 6 +++++-
 src/lib/pages/domains/wizard/step2.svelte | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lib/pages/domains/wizard/retry.svelte b/src/lib/pages/domains/wizard/retry.svelte
index 66ebfb30ca..40223cd110 100644
--- a/src/lib/pages/domains/wizard/retry.svelte
+++ b/src/lib/pages/domains/wizard/retry.svelte
@@ -11,6 +11,7 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     let retrying = false;
+    export let showTitle = true;
 
     const dispatch = createEventDispatcher();
 
@@ -36,7 +37,10 @@
     }
 </script>
 
-<Trim alternativeTrim><b>{$domain.domain}</b></Trim>
+{#if showTitle}
+    <Trim alternativeTrim><b>{$domain.domain}</b></Trim>
+{/if}
+
 {#if $domain.status === 'created'}
     <Box radius="small">
         <div class="u-flex u-gap-8 u-cross-center">
diff --git a/src/lib/pages/domains/wizard/step2.svelte b/src/lib/pages/domains/wizard/step2.svelte
index c2806750ea..b6b66d208a 100644
--- a/src/lib/pages/domains/wizard/step2.svelte
+++ b/src/lib/pages/domains/wizard/step2.svelte
@@ -18,7 +18,7 @@
 
     <div class="boxes-wrapper u-margin-block-start-24">
         {#if $domain.status === 'created'}
-            <Retry on:error={onRetryError} />
+            <Retry on:error={onRetryError} showTitle={false} />
         {:else}
             <div class="u-flex u-gap-8 u-cross-center">
                 <span class="icon-check u-color-text-success" aria-hidden="true" />

From 16ee13934d1ae175a8eecadb6c890aaf00dd79bd Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sat, 3 Aug 2024 14:26:05 +0530
Subject: [PATCH 023/177] fix: lowercase tag.

---
 src/lib/pages/domains/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte
index 518bc62604..8b06ffdf51 100644
--- a/src/lib/pages/domains/index.svelte
+++ b/src/lib/pages/domains/index.svelte
@@ -130,7 +130,7 @@
                         {:else}
                             <Pill warning>
                                 <span class="icon-clock u-text-color-gray" aria-hidden="true" />
-                                <p class="text">Blocked by verification</p>
+                                <p class="text">blocked by verification</p>
                             </Pill>
                         {/if}
                     </TableCell>

From fe74251cfa20c526955720a9e7c6c10ad2671aaa Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sat, 3 Aug 2024 16:45:30 +0530
Subject: [PATCH 024/177] fix: avatars background colors.

---
 .../functions/templates/+page.svelte               | 14 +++++++++++---
 .../templates/template-[template]/+page.svelte     |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/templates/+page.svelte b/src/routes/console/project-[project]/functions/templates/+page.svelte
index c1a0ba1f6c..5296605386 100644
--- a/src/routes/console/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/+page.svelte
@@ -142,7 +142,7 @@
                                                 .getAll('runtime')
                                                 .includes(runtime)}
                                             on:change={(e) => applyFilter('runtime', runtime, e)} />
-                                        <div class="u-flex u-cross-center u-gap-8">
+                                        <div class="u-flex u-cross-center u-gap-8 functions-avatar-holder">
                                             <div class="avatar is-size-x-small">
                                                 <SvgIcon name={icon} iconSize="small" />
                                             </div>
@@ -188,7 +188,7 @@
                                         {#each displayed as runtime}
                                             {@const icon = getIconFromRuntime(runtime.name)}
                                             {#if icon}
-                                                <li class="avatars-group-item">
+                                                <li class="avatars-group-item functions-avatar-holder">
                                                     <div class="avatar is-size-small">
                                                         <img
                                                             style:--p-text-size="20px"
@@ -201,7 +201,7 @@
                                             {/if}
                                         {/each}
                                         {#if hidden.length}
-                                            <li class="avatars-group-item">
+                                            <li class="avatars-group-item functions-avatar-holder">
                                                 <div
                                                     class="avatar is-size-small"
                                                     use:tooltip={{
@@ -261,3 +261,11 @@
         </section>
     </div>
 </Container>
+
+
+<style>
+    :global(.theme-light .functions-avatar-holder .avatar)  {
+        background-color: var(--p-avatar-bg-color-default);
+        --p-avatar-bg-color-default: hsl(var(--color-neutral-0));
+    }
+</style>
\ No newline at end of file
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
index fc6e5ec74a..4fc65831fd 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -52,7 +52,7 @@
                         <h4 class="body-text-1 u-bold">Published by</h4>
                         <img
                             class="u-margin-block-start-8"
-                            src={$app.themeInUse == 'dark' ? AppwriteLogoDark : AppwriteLogoLight}
+                            src={$app.themeInUse === 'dark' ? AppwriteLogoDark : AppwriteLogoLight}
                             width="120"
                             height="22"
                             alt="Appwrite" />
@@ -63,7 +63,7 @@
         <section>
             <Card>
                 <Heading size="7" tag="h3">
-                    <span class="u-flex u-cross-center u-gap-8">
+                    <span class="u-flex u-cross-center u-gap-8 functions-avatar-holder">
                         <div class="avatar is-size-small">
                             <span
                                 style:--p-text-size="20px"

From e82f98204f3c557fc4dac32638ab7bb7dc980c5a Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sat, 3 Aug 2024 16:55:12 +0530
Subject: [PATCH 025/177] fix: template title colors.

---
 .../project-[project]/functions/templates/+page.svelte | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/functions/templates/+page.svelte b/src/routes/console/project-[project]/functions/templates/+page.svelte
index 5296605386..729c8e6d36 100644
--- a/src/routes/console/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/+page.svelte
@@ -181,7 +181,7 @@
                         <li>
                             <article class="card u-min-height-100-percent">
                                 <div class="u-flex u-gap-16 u-cross-center u-main-space-between">
-                                    <h2 class="body-text-1 u-bold u-trim-1">
+                                    <h2 class="body-text-1 u-bold u-trim-1 functions-template-title">
                                         {template.name}
                                     </h2>
                                     <ul class="avatars-group is-with-border">
@@ -268,4 +268,12 @@
         background-color: var(--p-avatar-bg-color-default);
         --p-avatar-bg-color-default: hsl(var(--color-neutral-0));
     }
+
+    :global(.theme-light .functions-template-title) {
+        color: hsl(var(--color-neutral-120));
+    }
+
+    :global(.theme-dark .functions-template-title) {
+        color: hsl(var(--color-neutral-15));
+    }
 </style>
\ No newline at end of file

From 8f90b1fd2742f0233406e3451878c3b30c2f991d Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 12:01:30 +0530
Subject: [PATCH 026/177] fix: spacing.

---
 .../templates/template-[template]/+page.svelte       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
index 4fc65831fd..eecb0917e3 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -28,8 +28,9 @@
         <section>
             <Collapsible>
                 <li class="collapsible-item">
-                    <h3 class="body-text-2 u-bold u-padding-block-12">
-                        Use cases <span class="inline-tag">{$template.usecases.length}</span>
+                    <h3 class="u-flex u-gap-16 body-text-2 u-bold u-padding-block-12">
+                        Use cases
+                        <span class="inline-tag">{$template.usecases.length}</span>
                     </h3>
                     <div class="collapsible-content u-flex u-flex-wrap u-gap-8">
                         {#each $template.usecases as useCase}
@@ -38,8 +39,9 @@
                     </div>
                 </li>
                 <li class="collapsible-item">
-                    <h3 class="body-text-2 u-bold u-padding-block-12">
-                        Runtimes <span class="inline-tag">{$template.runtimes.length}</span>
+                    <h3 class="u-flex u-gap-16 body-text-2 u-bold u-padding-block-12">
+                        Runtimes
+                        <span class="inline-tag">{$template.runtimes.length}</span>
                     </h3>
                     <div class="collapsible-content u-flex u-flex-wrap u-gap-8">
                         {#each $template.runtimes as runtime}
@@ -63,7 +65,7 @@
         <section>
             <Card>
                 <Heading size="7" tag="h3">
-                    <span class="u-flex u-cross-center u-gap-8 functions-avatar-holder">
+                    <span class="u-flex u-cross-center u-gap-16 functions-avatar-holder">
                         <div class="avatar is-size-small">
                             <span
                                 style:--p-text-size="20px"

From 31e35cd1a1b2eeafa998e4fc5940be0a3e1a739f Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 12:18:41 +0530
Subject: [PATCH 027/177] fix: divider colors.

---
 .../templates/template-[template]/+page.svelte  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
index eecb0917e3..5c64826f1e 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -27,7 +27,7 @@
     <div class="grid-300px-1fr">
         <section>
             <Collapsible>
-                <li class="collapsible-item">
+                <li class="collapsible-item-divider collapsible-item">
                     <h3 class="u-flex u-gap-16 body-text-2 u-bold u-padding-block-12">
                         Use cases
                         <span class="inline-tag">{$template.usecases.length}</span>
@@ -38,7 +38,7 @@
                         {/each}
                     </div>
                 </li>
-                <li class="collapsible-item">
+                <li class="collapsible-item-divider collapsible-item">
                     <h3 class="u-flex u-gap-16 body-text-2 u-bold u-padding-block-12">
                         Runtimes
                         <span class="inline-tag">{$template.runtimes.length}</span>
@@ -49,7 +49,7 @@
                         {/each}
                     </div>
                 </li>
-                <li class="collapsible-item">
+                <li class="collapsible-item-divider collapsible-item">
                     <section class="card u-margin-block-start-24">
                         <h4 class="body-text-1 u-bold">Published by</h4>
                         <img
@@ -113,3 +113,14 @@
         </section>
     </div>
 </Container>
+
+<style>
+    :global(.theme-dark .collapsible-item-divider:where(:not(:last-child))) {
+        border-block-end: solid .0625rem hsl(var(--color-neutral-150));
+    }
+
+    :global(.theme-light .collapsible-item-divider:where(:not(:last-child))) {
+        border-block-end: solid .0625rem hsl(var(--color-neutral-10));
+    }
+
+</style>
\ No newline at end of file

From 294b0590dd34ff786c18daf9564b9fdbf55900a5 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 12:35:31 +0530
Subject: [PATCH 028/177] fix: colors for unsupported git services.

---
 src/lib/components/avatarGroup.svelte                     | 5 ++++-
 .../project-[project]/settings/updateInstallations.svelte | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/avatarGroup.svelte b/src/lib/components/avatarGroup.svelte
index c9091ffcf5..c874eb46c8 100644
--- a/src/lib/components/avatarGroup.svelte
+++ b/src/lib/components/avatarGroup.svelte
@@ -9,6 +9,9 @@
     export let bordered = false;
     export let color = '';
 
+    let classes = '';
+    export { classes as class };
+
     enum Sizes {
         xsmall = 'is-size-x-small',
         small = 'is-size-small',
@@ -18,7 +21,7 @@
     }
 </script>
 
-<ul class="avatars-group" class:is-with-border={bordered}>
+<ul class="avatars-group {classes}" class:is-with-border={bordered}>
     {#each avatars as name, index}
         {#if index < 2}
             <li class="avatars-group-item">
diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index 749260fd3d..9971e84925 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -201,7 +201,7 @@
             <article class="card-git card is-border-dashed is-no-shadow">
                 <div class="u-flex u-cross-center u-flex-vertical u-gap-32">
                     <div class="u-flex u-cross-center u-flex-vertical u-gap-8">
-                        <AvatarGroup bordered icons={['github', 'gitlab', 'bitBucket', 'azure']} />
+                        <AvatarGroup class="git-installation-avatar-group" bordered icons={['github', 'gitlab', 'bitBucket', 'azure']} />
                         <span class="icon-arrow-narrow-down" />
 
                         <div class="avatar"><SvgIcon name="appwrite" type="color" size={80} /></div>
@@ -225,3 +225,9 @@
 {#if showGitDisconnect}
     <GitDisconnectModal bind:showGitDisconnect {selectedInstallation} />
 {/if}
+
+<style>
+    :global(.git-installation-avatar-group .icon-gitlab, .icon-bitBucket, .icon-azure) {
+        color: hsl(var(--color-neutral-50));
+    }
+</style>
\ No newline at end of file

From 173018274aeb085b25520c84bf53c7ff129a393c Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 12:36:23 +0530
Subject: [PATCH 029/177] fix: duplicate, inconsistent message.

---
 .../project-[project]/settings/GitDisconnectModal.svelte  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte b/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
index b414f37bda..c305278573 100644
--- a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
+++ b/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
@@ -51,10 +51,6 @@
     bind:show={showGitDisconnect}
     onSubmit={handleSubmit}
     size="big">
-    <p>
-        Are you sure you want to disconnect this git installation? This will affect future
-        deployments to the following functions:
-    </p>
 
     {#await loadFunctions()}
         <div class="u-flex u-main-center">
@@ -64,6 +60,10 @@
         </div>
     {:then functions}
         {#if functions.total}
+            <p>
+                Are you sure you want to disconnect this git installation? This will affect future
+                deployments to the following functions:
+            </p>
             <div class="u-flex u-flex-vertical u-gap-12">
                 {#each functions.functions as func}
                     <div class="u-flex u-main-start u-gap-8">

From 08dc387848813267caeeaa25b201afd727c5ccb3 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 12:40:25 +0530
Subject: [PATCH 030/177] fix: use correct icon component.

---
 .../project-[project]/settings/updateInstallations.svelte     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index 9971e84925..cb10db5a4d 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -3,6 +3,7 @@
     import { page } from '$app/stores';
     import {
         Alert,
+        Arrow,
         AvatarGroup,
         CardGrid,
         DropList,
@@ -202,7 +203,8 @@
                 <div class="u-flex u-cross-center u-flex-vertical u-gap-32">
                     <div class="u-flex u-cross-center u-flex-vertical u-gap-8">
                         <AvatarGroup class="git-installation-avatar-group" bordered icons={['github', 'gitlab', 'bitBucket', 'azure']} />
-                        <span class="icon-arrow-narrow-down" />
+
+                        <Arrow direction="down" />
 
                         <div class="avatar"><SvgIcon name="appwrite" type="color" size={80} /></div>
                     </div>

From 888d7afb1a9cece6080b860e67eb9a30cad84a14 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 12:41:23 +0530
Subject: [PATCH 031/177] fix: content text.

---
 .../project-[project]/settings/GitInstallationModal.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte b/src/routes/console/project-[project]/settings/GitInstallationModal.svelte
index 8fc2e5c3e8..17c2d376c8 100644
--- a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte
+++ b/src/routes/console/project-[project]/settings/GitInstallationModal.svelte
@@ -20,7 +20,7 @@
 </script>
 
 <Modal title="Install" headerDivider={false} bind:show={showGitInstall} size="big">
-    <p>Select a provider to import an existing git repositories.</p>
+    <p>Select a provider to import an existing git repository.</p>
 
     <div class="u-flex u-cross-center u-flex-vertical u-gap-16">
         <Button on:click={connectGitHub} fullWidth secondary>

From 8f7db8cb9d5e48f10f7dd09a789d5942abda81a4 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 13:00:02 +0530
Subject: [PATCH 032/177] fix: add spacing.

---
 .../project-[project]/settings/updateInstallations.svelte       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index cb10db5a4d..e50b791a29 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -90,7 +90,7 @@
     <svelte:fragment slot="aside">
         {#if total > 0}
             <div>
-                <div class="u-flex u-flex-vertical-mobile u-main-end">
+                <div class="u-flex u-flex-vertical-mobile u-main-end u-padding-block-end-16">
                     <ul class="buttons-list">
                         <li class="buttons-list-item">
                             <Button secondary on:click={() => (showGitIstall = true)}>

From 4e393352904c01494eb7785958ef5889ca1b0dfe Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 13:28:14 +0530
Subject: [PATCH 033/177] fix: make table scrollable.

---
 .../project-[project]/settings/updateInstallations.svelte     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index e50b791a29..149b4d23c2 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -101,7 +101,8 @@
                     </ul>
                 </div>
 
-                <Table noMargin noStyles>
+                <div style="overflow: auto">
+                    <Table noMargin noStyles isAutoLayout>
                     <TableHeader>
                         <TableCellHead width={150}>Installation ID</TableCellHead>
                         <TableCellHead>Repository</TableCellHead>
@@ -172,6 +173,7 @@
                         {/each}
                     </TableBody>
                 </Table>
+                </div>
             </div>
             <div class="u-flex u-main-space-between">
                 <p class="text">Total installations: {total}</p>

From d3926ee7d7db7ab6e9416e033b74475662ef9256 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 13:54:15 +0530
Subject: [PATCH 034/177] fix: content alignment.

---
 .../project-[project]/settings/GitDisconnectModal.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte b/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
index c305278573..d59aa24602 100644
--- a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
+++ b/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
@@ -73,7 +73,7 @@
                         <div
                             class="u-cross-child-center u-flex u-main-space-between u-flex-wrap u-gap-8 u-width-full-line">
                             <h6>{func.name}</h6>
-                            <p class="u-x-small" style="color: hsl(var(--color-neutral-70));">
+                            <p class="u-x-small u-cross-child-center" style="color: hsl(var(--color-neutral-70));">
                                 Last deployed: {toLocaleDateTime(func.$updatedAt)}
                             </p>
                         </div>

From 73bf41251b702e5340bf855337bc7410a43d126e Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Sun, 4 Aug 2024 13:54:56 +0530
Subject: [PATCH 035/177] ran: `npm run format`

---
 src/lib/helpers/load.ts                       |   2 +-
 src/lib/layout/unauthenticated.svelte         |   2 +-
 src/lib/stores/feedback.ts                    |   4 +-
 .../settings/GitDisconnectModal.svelte        |   5 +-
 .../settings/updateInstallations.svelte       | 145 +++++++++---------
 5 files changed, 82 insertions(+), 76 deletions(-)

diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts
index 05e043ddc9..21e2f1ee6e 100644
--- a/src/lib/helpers/load.ts
+++ b/src/lib/helpers/load.ts
@@ -21,7 +21,7 @@ export enum View {
 export function getView(url: URL, route: Page['route'], fallback: View): View {
     return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
         ? View.Grid
-        : View.Table ?? fallback;
+        : (View.Table ?? fallback);
 }
 
 export function getColumns(route: Page['route'], fallback: string[]): string[] {
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index b7e250b540..4d859d492e 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -16,7 +16,7 @@
     export let coupon: Coupon = null;
 
     $: selectedCampaign = campaigns.get(coupon?.campaign ?? campaign);
-    $: variation = (coupon?.campaign ?? campaign ? selectedCampaign?.template : 'default') as
+    $: variation = ((coupon?.campaign ?? campaign) ? selectedCampaign?.template : 'default') as
         | 'default'
         | CampaignData['template'];
 
diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
index 7f9b6b2004..7eaefca2d5 100644
--- a/src/lib/stores/feedback.ts
+++ b/src/lib/stores/feedback.ts
@@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore();
 
 function createFeedbackStore() {
     const { subscribe, update } = writable<Feedback>({
-        elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0,
-        visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0,
+        elapsed: browser ? (parseInt(localStorage.getItem('feedbackElapsed')) ?? 0) : 0,
+        visualized: browser ? (parseInt(localStorage.getItem('feedbackVisualized')) ?? 0) : 0,
         notification: false,
         type: 'general',
         show: false
diff --git a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte b/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
index d59aa24602..fa12b9e3ba 100644
--- a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
+++ b/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
@@ -51,7 +51,6 @@
     bind:show={showGitDisconnect}
     onSubmit={handleSubmit}
     size="big">
-
     {#await loadFunctions()}
         <div class="u-flex u-main-center">
             <div class="avatar is-size-x-small">
@@ -73,7 +72,9 @@
                         <div
                             class="u-cross-child-center u-flex u-main-space-between u-flex-wrap u-gap-8 u-width-full-line">
                             <h6>{func.name}</h6>
-                            <p class="u-x-small u-cross-child-center" style="color: hsl(var(--color-neutral-70));">
+                            <p
+                                class="u-x-small u-cross-child-center"
+                                style="color: hsl(var(--color-neutral-70));">
                                 Last deployed: {toLocaleDateTime(func.$updatedAt)}
                             </p>
                         </div>
diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index 149b4d23c2..d8d27dfcf7 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -103,76 +103,78 @@
 
                 <div style="overflow: auto">
                     <Table noMargin noStyles isAutoLayout>
-                    <TableHeader>
-                        <TableCellHead width={150}>Installation ID</TableCellHead>
-                        <TableCellHead>Repository</TableCellHead>
-                        <TableCellHead>Updated</TableCellHead>
-                        <TableCellHead width={40} />
-                    </TableHeader>
-                    <TableBody>
-                        {#each installations as installation, i}
-                            <TableRow>
-                                <TableCell title="installations">
-                                    <Id value={installation.$id}>{installation.$id}</Id>
-                                </TableCell>
-                                <TableCell title="repository">
-                                    <div class="u-flex u-gap-8 u-cross-center">
-                                        <div class="avatar is-size-small">
-                                            <span
-                                                class={getProviderIcon(installation.provider)}
-                                                style="font-size: var(--icon-size-medium)!important" />
+                        <TableHeader>
+                            <TableCellHead width={150}>Installation ID</TableCellHead>
+                            <TableCellHead>Repository</TableCellHead>
+                            <TableCellHead>Updated</TableCellHead>
+                            <TableCellHead width={40} />
+                        </TableHeader>
+                        <TableBody>
+                            {#each installations as installation, i}
+                                <TableRow>
+                                    <TableCell title="installations">
+                                        <Id value={installation.$id}>{installation.$id}</Id>
+                                    </TableCell>
+                                    <TableCell title="repository">
+                                        <div class="u-flex u-gap-8 u-cross-center">
+                                            <div class="avatar is-size-small">
+                                                <span
+                                                    class={getProviderIcon(installation.provider)}
+                                                    style="font-size: var(--icon-size-medium)!important" />
+                                            </div>
+                                            <a
+                                                href={getInstallationLink(installation)}
+                                                target="_blank"
+                                                class="u-flex u-gap-4 u-cross-center">
+                                                <span>{installation.organization}</span><span
+                                                    style="font-size: 1rem; color: hsl(var(--color-neutral-70));"
+                                                    class="icon-external-link" /></a>
                                         </div>
-                                        <a
-                                            href={getInstallationLink(installation)}
-                                            target="_blank"
-                                            class="u-flex u-gap-4 u-cross-center">
-                                            <span>{installation.organization}</span><span
-                                                style="font-size: 1rem; color: hsl(var(--color-neutral-70));"
-                                                class="icon-external-link" /></a>
-                                    </div>
-                                </TableCell>
-                                <TableCellText title="updated">
-                                    {dayjs().to(installation.$updatedAt)}
-                                </TableCellText>
+                                    </TableCell>
+                                    <TableCellText title="updated">
+                                        {dayjs().to(installation.$updatedAt)}
+                                    </TableCellText>
 
-                                <TableCell>
-                                    <DropList
-                                        bind:show={showInstallationDropdown[i]}
-                                        placement="bottom-start"
-                                        noArrow>
-                                        <button
-                                            class="button is-text is-only-icon"
-                                            aria-label="more options"
-                                            on:click|preventDefault={() =>
-                                                (showInstallationDropdown[i] =
-                                                    !showInstallationDropdown[i])}>
-                                            <span class="icon-dots-horizontal" aria-hidden="true" />
-                                        </button>
-                                        <svelte:fragment slot="list">
-                                            <DropListLink
-                                                href={configureGitHub()}
-                                                icon="external-link"
-                                                on:click={() => {
-                                                    showInstallationDropdown[i] = false;
-                                                }}>
-                                                Configure
-                                            </DropListLink>
-                                            <DropListItem
-                                                icon="x-circle"
-                                                on:click={async () => {
-                                                    showInstallationDropdown[i] = false;
-                                                    showGitDisconnect = true;
-                                                    selectedInstallation = installation;
-                                                }}>
-                                                Disconnect
-                                            </DropListItem>
-                                        </svelte:fragment>
-                                    </DropList>
-                                </TableCell>
-                            </TableRow>
-                        {/each}
-                    </TableBody>
-                </Table>
+                                    <TableCell>
+                                        <DropList
+                                            bind:show={showInstallationDropdown[i]}
+                                            placement="bottom-start"
+                                            noArrow>
+                                            <button
+                                                class="button is-text is-only-icon"
+                                                aria-label="more options"
+                                                on:click|preventDefault={() =>
+                                                    (showInstallationDropdown[i] =
+                                                        !showInstallationDropdown[i])}>
+                                                <span
+                                                    class="icon-dots-horizontal"
+                                                    aria-hidden="true" />
+                                            </button>
+                                            <svelte:fragment slot="list">
+                                                <DropListLink
+                                                    href={configureGitHub()}
+                                                    icon="external-link"
+                                                    on:click={() => {
+                                                        showInstallationDropdown[i] = false;
+                                                    }}>
+                                                    Configure
+                                                </DropListLink>
+                                                <DropListItem
+                                                    icon="x-circle"
+                                                    on:click={async () => {
+                                                        showInstallationDropdown[i] = false;
+                                                        showGitDisconnect = true;
+                                                        selectedInstallation = installation;
+                                                    }}>
+                                                    Disconnect
+                                                </DropListItem>
+                                            </svelte:fragment>
+                                        </DropList>
+                                    </TableCell>
+                                </TableRow>
+                            {/each}
+                        </TableBody>
+                    </Table>
                 </div>
             </div>
             <div class="u-flex u-main-space-between">
@@ -204,7 +206,10 @@
             <article class="card-git card is-border-dashed is-no-shadow">
                 <div class="u-flex u-cross-center u-flex-vertical u-gap-32">
                     <div class="u-flex u-cross-center u-flex-vertical u-gap-8">
-                        <AvatarGroup class="git-installation-avatar-group" bordered icons={['github', 'gitlab', 'bitBucket', 'azure']} />
+                        <AvatarGroup
+                            class="git-installation-avatar-group"
+                            bordered
+                            icons={['github', 'gitlab', 'bitBucket', 'azure']} />
 
                         <Arrow direction="down" />
 
@@ -234,4 +239,4 @@
     :global(.git-installation-avatar-group .icon-gitlab, .icon-bitBucket, .icon-azure) {
         color: hsl(var(--color-neutral-50));
     }
-</style>
\ No newline at end of file
+</style>

From e372d5c955f749a3c7982cc1c6e0f2f421d3902f Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 6 Aug 2024 14:58:19 +0530
Subject: [PATCH 036/177] rebuild previews


From ba8bd113a5e41b6cbe6101185f99196d8e6bcd52 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 6 Aug 2024 15:34:34 +0530
Subject: [PATCH 037/177] improve: mobile version of cards.

---
 src/lib/layout/logs.svelte | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 0ede7d5983..419c67569f 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -138,8 +138,8 @@
 
             <div class="u-stretch u-margin-block-start-32 u-overflow-hidden">
                 <section class="code-panel">
-                    <header class="code-panel-header u-flex u-main-space-between u-width-full-line">
-                        <div class="u-flex u-gap-24">
+                    <header class="code-panel-header code-panel-compact-header u-main-space-between u-width-full-line">
+                        <div class="u-flex">
                             <div class="u-flex u-gap-16">
                                 <h4 class="text u-bold">Method:</h4>
                                 <span class="u-text-color-gray">{execution.requestMethod}</span>
@@ -164,7 +164,7 @@
                     </header>
                     <div class="code-panel-content grid-1-2">
                         <div
-                            class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16"
+                            class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16 mobile-only-inline-16-padding"
                             class:theme-dark={$app.themeInUse === 'dark'}>
                             <Heading tag="h3" size="6">Request</Heading>
                             <div class="u-sep-block-end">
@@ -276,8 +276,9 @@
                                 </p>
                             {/if}
                         </div>
+                        <div class="u-sep-block-end is-only-mobile" />
                         <div
-                            class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0"
+                            class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0 mobile-only-inline-16-padding"
                             class:theme-dark={$app.themeInUse === 'dark'}>
                             <Heading tag="h3" size="6">Response</Heading>
                             <div class="u-sep-block-end">
@@ -402,4 +403,28 @@
         max-height: 50vh;
         overflow: auto !important;
     }
+
+    .code-panel-compact-header .u-flex {
+        gap: 1.5rem !important;
+    }
+
+    @media (max-width: 768px) {
+        .code-panel-compact-header {
+            row-gap: 1rem;
+            flex-direction: column !important;
+        }
+
+        .code-panel-content {
+            padding: unset !important;
+            padding-block: 1.5rem !important;
+        }
+
+        .mobile-only-inline-16-padding {
+            padding-inline: 1.5rem !important;
+        }
+
+        .grid-1-2 {
+            row-gap: 1.5rem;
+        }
+    }
 </style>

From be3e9a1a884d3c080ef8c33aed10f567ce1cc549 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 6 Aug 2024 15:36:14 +0530
Subject: [PATCH 038/177] another empty commit to rebuild previews


From 6f91e3eec1f49627a177dc9866a398ed94808537 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 6 Aug 2024 16:19:41 +0530
Subject: [PATCH 039/177] fix: layout consistency issues.

---
 src/lib/layout/logs.svelte | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 419c67569f..fae3a2428f 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -164,7 +164,7 @@
                     </header>
                     <div class="code-panel-content grid-1-2">
                         <div
-                            class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16 mobile-only-inline-16-padding"
+                            class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16 mobile-only-inline-20-padding"
                             class:theme-dark={$app.themeInUse === 'dark'}>
                             <Heading tag="h3" size="6">Request</Heading>
                             <div class="u-sep-block-end">
@@ -248,7 +248,7 @@
                                     </div>
                                 {/if}
 
-                                <p class="text u-text-center u-padding-24">
+                                <p class="text u-text-center u-padding-16">
                                     {execution.requestHeaders?.length
                                         ? 'Not all header data is'
                                         : 'Header data is not'}
@@ -263,7 +263,7 @@
                                     >.
                                 </p>
                             {:else if selectedRequest === 'body'}
-                                <p class="text u-text-center u-padding-24">
+                                <p class="text u-text-center u-padding-16">
                                     Body data is not captured by Appwrite for your user's security
                                     and privacy. To display body data in the Logs tab, use
                                     <b>context.log()</b>.
@@ -276,9 +276,9 @@
                                 </p>
                             {/if}
                         </div>
-                        <div class="u-sep-block-end is-only-mobile" />
+                        <div class="u-sep-block-end is-only-mobile u-padding-block-start-16" />
                         <div
-                            class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0 mobile-only-inline-16-padding"
+                            class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0 mobile-only-inline-20-padding mobile-only-block-start-20-padding"
                             class:theme-dark={$app.themeInUse === 'dark'}>
                             <Heading tag="h3" size="6">Response</Heading>
                             <div class="u-sep-block-end">
@@ -363,7 +363,7 @@
                                         </TableBody>
                                     </TableScroll>
                                 {/if}
-                                <p class="text u-text-center u-padding-24">
+                                <p class="text u-text-center u-padding-16">
                                     {execution.responseHeaders?.length
                                         ? 'Not all header data is'
                                         : 'Header data is not'}
@@ -378,7 +378,7 @@
                                     >.
                                 </p>
                             {:else if selectedResponse === 'body'}
-                                <p class="text u-text-center u-padding-24">
+                                <p class="text u-text-center u-padding-16">
                                     Body data is not captured by Appwrite for your user's security
                                     and privacy. To display body data in the Logs tab, use
                                     <b>context.log()</b>.
@@ -419,12 +419,17 @@
             padding-block: 1.5rem !important;
         }
 
-        .mobile-only-inline-16-padding {
+        .mobile-only-inline-20-padding {
             padding-inline: 1.5rem !important;
         }
 
-        .grid-1-2 {
-            row-gap: 1.5rem;
+        .mobile-only-block-start-20-padding {
+            padding-block-start: 1.5rem !important;
+        }
+
+        .code-panel-content.grid-1-2 {
+            display: unset !important;
+            row-gap: unset !important;
         }
     }
 </style>

From f1d51a9dd074e7961aabec64d4c1d476f1e87093 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 6 Aug 2024 17:56:06 +0530
Subject: [PATCH 040/177] address comments: fix colors.

---
 .../console/project-[project]/functions/templates/+page.svelte  | 2 +-
 .../functions/templates/template-[template]/+page.svelte        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/console/project-[project]/functions/templates/+page.svelte b/src/routes/console/project-[project]/functions/templates/+page.svelte
index 729c8e6d36..947e947f37 100644
--- a/src/routes/console/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/+page.svelte
@@ -270,7 +270,7 @@
     }
 
     :global(.theme-light .functions-template-title) {
-        color: hsl(var(--color-neutral-120));
+        color: hsl(var(--color-neutral-70));
     }
 
     :global(.theme-dark .functions-template-title) {
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
index 5c64826f1e..08906b5d8a 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -116,7 +116,7 @@
 
 <style>
     :global(.theme-dark .collapsible-item-divider:where(:not(:last-child))) {
-        border-block-end: solid .0625rem hsl(var(--color-neutral-150));
+        border-block-end: solid .0625rem hsl(var(--color-neutral-85));
     }
 
     :global(.theme-light .collapsible-item-divider:where(:not(:last-child))) {

From 95c6dee772c24c295ec77e5ec407f5d4d9ba8bee Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 12 Aug 2024 13:50:07 +0530
Subject: [PATCH 041/177] improve: use `https`

---
 src/lib/pages/domains/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte
index 8b06ffdf51..98d9c27ee5 100644
--- a/src/lib/pages/domains/index.svelte
+++ b/src/lib/pages/domains/index.svelte
@@ -70,7 +70,7 @@
         <TableBody>
             {#each rules.rules as domain, i}
                 <TableRow>
-                    <TableCellLink title="Domain" href={`http://${domain.domain}`} external noStyle>
+                    <TableCellLink title="Domain" href={`https://${domain.domain}`} external noStyle>
                         <span class="u-flex u-gap-4 u-cross-center">
                             <Trim>
                                 <span class="link">{domain.domain}</span>

From 8a78c414c331cc6fc4284f8dd53cb4bf355bbccd Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Fri, 16 Aug 2024 19:18:29 +0900
Subject: [PATCH 042/177] Cherrypick Runtime Controls

Feat implement runtime controls
---
 package-lock.json                             |  9 +++---
 package.json                                  |  2 +-
 src/lib/elements/forms/inputSelect.svelte     |  6 +++-
 .../project-[project]/functions/+layout.ts    |  8 +++--
 .../settings/updateRuntime.svelte             | 31 ++++++++++++++++---
 .../usage/[[period]]/+page.svelte             | 22 +++++++++++++
 .../project-[project]/functions/store.ts      |  5 +++
 7 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 650428e1e5..f8b5876317 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
         "": {
             "name": "@appwrite/console",
             "dependencies": {
-                "@appwrite.io/console": "^0.6.2",
+                "@appwrite.io/console": "^0.6.4",
                 "@appwrite.io/pink": "0.25.0",
                 "@appwrite.io/pink-icons": "0.25.0",
                 "@popperjs/core": "^2.11.8",
@@ -149,9 +149,10 @@
             "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg=="
         },
         "node_modules/@appwrite.io/console": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.2.tgz",
-            "integrity": "sha512-3qYknuFwhvTN2GnPB8G1w5DgxfVorGtfj4uuEaXbTmMUmjA8fHaW5VkJriuUxCi6/TpxDxqV/hhEkdoXL+5H4w=="
+            "version": "0.6.4",
+            "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.4.tgz",
+            "integrity": "sha512-0LPeeHR3fLQpTiX/AjguXqHYRgjMLf2lxie5TevBPxMssi1tcipctTGmj0YMyjWxQKD05NBmgvkJwAXEsm9rRA==",
+            "license": "BSD-3-Clause"
         },
         "node_modules/@appwrite.io/pink": {
             "version": "0.25.0",
diff --git a/package.json b/package.json
index e566dcf141..6be5e30134 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "^0.6.2",
+        "@appwrite.io/console": "^0.6.4",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte
index 9de5dd726f..b6901ee31f 100644
--- a/src/lib/elements/forms/inputSelect.svelte
+++ b/src/lib/elements/forms/inputSelect.svelte
@@ -15,6 +15,7 @@
     export let options: {
         value: string | boolean | number | null;
         label: string;
+        disabled?: boolean;
     }[];
     export let isMultiple = false;
     export let fullWidth = false;
@@ -70,7 +71,10 @@
                 <option value={null} disabled selected hidden>{placeholder}</option>
             {/if}
             {#each options as option}
-                <option value={option.value} selected={option.value === value}>
+                <option
+                    value={option.value}
+                    selected={option.value === value}
+                    disabled={option.disabled}>
                     {option.label}
                 </option>
             {/each}
diff --git a/src/routes/console/project-[project]/functions/+layout.ts b/src/routes/console/project-[project]/functions/+layout.ts
index 68ecb719d9..f309452054 100644
--- a/src/routes/console/project-[project]/functions/+layout.ts
+++ b/src/routes/console/project-[project]/functions/+layout.ts
@@ -8,15 +8,17 @@ import type { LayoutLoad } from './$types';
 export const load: LayoutLoad = async ({ depends }) => {
     depends(Dependencies.FUNCTION_INSTALLATIONS);
 
-    const [runtimesList, installations] = await Promise.all([
+    const [runtimesList, installations, specifications] = await Promise.all([
         sdk.forProject.functions.listRuntimes(),
-        sdk.forProject.vcs.listInstallations([Query.limit(100)])
+        sdk.forProject.vcs.listInstallations([Query.limit(100)]),
+        sdk.forProject.functions.getSpecifications()
     ]);
 
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
         runtimesList,
-        installations
+        installations,
+        specifications
     };
 };
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
index a4a2f806c6..21b6ded4fe 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -10,23 +10,35 @@
     import { onMount } from 'svelte';
     import { func } from '../store';
     import InputSelect from '$lib/elements/forms/inputSelect.svelte';
-    import { runtimesList } from '../../store';
+    import { runtimesList, specifications } from '../../store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { Runtime } from '@appwrite.io/console';
 
     const functionId = $page.params.function;
     let runtime: string = null;
+    let specification: string = null;
 
     let options = [];
+    let specificationOptions = [];
 
     onMount(async () => {
         runtime ??= $func.runtime;
+        specification ??= $func.specification;
 
         let runtimes = await $runtimesList;
+        let allowedSpecifications = await $specifications;
         options = runtimes.runtimes.map((runtime) => ({
             label: `${runtime.name} - ${runtime.version}`,
             value: runtime.$id
         }));
+
+        specificationOptions = allowedSpecifications.map((size) => ({
+            label:
+                `${size.cpus} CPU, ${size.memory} MB RAM` +
+                (!size.enabled ? ` (Upgrade to use this)` : ''),
+            value: size.slug,
+            disabled: !size.enabled
+        }));
     });
 
     async function updateRuntime() {
@@ -50,11 +62,12 @@
                 $func.providerRepositoryId || undefined,
                 $func.providerBranch || undefined,
                 $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
+                $func.providerRootDirectory || undefined,
+                specification
             );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
-                message: 'Runtime has been updated',
+                message: 'Runtime settings have been updated',
                 type: 'success'
             });
             trackEvent(Submit.FunctionUpdateName);
@@ -66,6 +79,8 @@
             trackError(error, Submit.FunctionUpdateName);
         }
     }
+
+    $: isUpdateButtonEnabled = runtime !== $func?.runtime || specification !== $func?.specification;
 </script>
 
 <Form onSubmit={updateRuntime}>
@@ -82,11 +97,19 @@
                     {options}
                     required
                     hideRequired />
+                <InputSelect
+                    label="Specification"
+                    id="size"
+                    placeholder="Select runtime specification"
+                    bind:value={specification}
+                    options={specificationOptions}
+                    required
+                    hideRequired />
             </FormList>
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            <Button disabled={runtime === $func.runtime} submit>Update</Button>
+            <Button disabled={!isUpdateButtonEnabled} submit>Update</Button>
         </svelte:fragment>
     </CardGrid>
 </Form>
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 c486d2ba5d..3513b90a3e 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
@@ -9,6 +9,8 @@
     export let data: PageData;
     $: total = data.executionsTotal;
     $: count = data.executions;
+    $: gbHoursTotal = data.executionsMbSecondsTotal / 1000 / 3600;
+    $: mbSecondsCount = data.executionsMbSeconds;
 </script>
 
 <Container>
@@ -46,4 +48,24 @@
                 ]} />
         </Card>
     {/if}
+
+    {#if mbSecondsCount}
+        <Card>
+            <Heading tag="h6" size="6">{formatNumberWithCommas(gbHoursTotal)}</Heading>
+            <p>GB Hours</p>
+            <div class="u-margin-block-start-16" />
+            <BarChart
+                series={[
+                    {
+                        name: 'Count of gbHours over time',
+                        data: [
+                            ...mbSecondsCount.map((e) => [
+                                e.date,
+                                Math.ceil((e.value / 1000 / 3600) * 1000) / 1000
+                            ])
+                        ]
+                    }
+                ]} />
+        </Card>
+    {/if}
 </Container>
diff --git a/src/routes/console/project-[project]/functions/store.ts b/src/routes/console/project-[project]/functions/store.ts
index 3acf62136f..e56f264ea1 100644
--- a/src/routes/console/project-[project]/functions/store.ts
+++ b/src/routes/console/project-[project]/functions/store.ts
@@ -7,6 +7,11 @@ export const runtimesList = derived(
     async ($page) => (await $page.data.runtimesList) as Models.RuntimeList
 );
 
+export const specifications = derived(
+    page,
+    async ($page) => (await $page.data.specifications.specifications) as Models.Specification[]
+);
+
 export const baseRuntimesList = derived(runtimesList, async ($runtimesList) => {
     const baseRuntimes = new Map<string, Models.Runtime>();
     for (const runtime of (await $runtimesList).runtimes) {

From 10b48f97a2f0a9d8f0470fdae87b6be599e76618 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Mon, 19 Aug 2024 13:23:14 +0900
Subject: [PATCH 043/177] Update pnpm lockfile

---
 pnpm-lock.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d89979a2d3..6541888cfc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: npm:matej-appwrite-console@0.6.13
-        version: matej-appwrite-console@0.6.13
+        specifier: npm:bradley-console@0.6.5
+        version: bradley-console@0.6.5
       '@appwrite.io/pink':
         specifier: 0.25.0
         version: 0.25.0
@@ -1147,6 +1147,9 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
+  bradley-console@0.6.5:
+    resolution: {integrity: sha512-IzXpW9MW3Ofx8+cKsEdQQU1TztA/LyzOEF4A6EgvdM2z3dx5S7FV99jWk9U1G9ugV2BGv49Pwp+yjqe8vRnzVA==}
+
   browserslist@4.23.3:
     resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -2164,9 +2167,6 @@ packages:
   makeerror@1.0.12:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
 
-  matej-appwrite-console@0.6.13:
-    resolution: {integrity: sha512-F15YP98n9Um809SN3wbyZun8ZFY/m5MEU2uWUUU+4ej+PI0af3YGhwnkYC1nmciKpDbILf8O4hQ1+ORXKho8hg==}
-
   mdn-data@2.0.30:
     resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
 
@@ -4346,6 +4346,8 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
+  bradley-console@0.6.5: {}
+
   browserslist@4.23.3:
     dependencies:
       caniuse-lite: 1.0.30001651
@@ -5602,8 +5604,6 @@ snapshots:
     dependencies:
       tmpl: 1.0.5
 
-  matej-appwrite-console@0.6.13: {}
-
   mdn-data@2.0.30: {}
 
   merge-stream@2.0.0: {}

From 84bb17b72c4c01f75ee3bf2c55c4e5237ef803a3 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Mon, 19 Aug 2024 18:40:08 +0900
Subject: [PATCH 044/177] Run Linter

---
 src/lib/stores/specifications.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/stores/specifications.ts b/src/lib/stores/specifications.ts
index ad7f14589f..30bc5eabb2 100644
--- a/src/lib/stores/specifications.ts
+++ b/src/lib/stores/specifications.ts
@@ -5,4 +5,4 @@ import { derived } from 'svelte/store';
 export const specificationsList = derived(
     page,
     async ($page) => (await $page.data.specificationsList) as Models.SpecificationList
-);
\ No newline at end of file
+);

From a892c0822f3b64527d1f4905c234a34e4ff1bab3 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Wed, 21 Aug 2024 16:19:40 +0530
Subject: [PATCH 045/177] ran: `npm run format`.

---
 src/lib/pages/domains/index.svelte | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte
index 98d9c27ee5..ce04b5daeb 100644
--- a/src/lib/pages/domains/index.svelte
+++ b/src/lib/pages/domains/index.svelte
@@ -70,7 +70,11 @@
         <TableBody>
             {#each rules.rules as domain, i}
                 <TableRow>
-                    <TableCellLink title="Domain" href={`https://${domain.domain}`} external noStyle>
+                    <TableCellLink
+                        title="Domain"
+                        href={`https://${domain.domain}`}
+                        external
+                        noStyle>
                         <span class="u-flex u-gap-4 u-cross-center">
                             <Trim>
                                 <span class="link">{domain.domain}</span>

From 7984f3894af399cc9e9270647b103de4707cad02 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Fri, 23 Aug 2024 12:37:39 +0900
Subject: [PATCH 046/177] Remove console and change getSpec... to listSpec...

---
 package.json                                       |  2 +-
 pnpm-lock.yaml                                     | 14 +++++++-------
 .../project-[project]/functions/+layout.ts         |  2 +-
 .../settings/updateRuntime.svelte                  |  2 --
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 46a01ef3e4..07b50665aa 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "npm:bradley-console@0.6.5",
+        "@appwrite.io/console": "npm:matej-appwrite-console@0.6.18",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6541888cfc..51026dac09 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: npm:bradley-console@0.6.5
-        version: bradley-console@0.6.5
+        specifier: npm:matej-appwrite-console@0.6.18
+        version: matej-appwrite-console@0.6.18
       '@appwrite.io/pink':
         specifier: 0.25.0
         version: 0.25.0
@@ -1147,9 +1147,6 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  bradley-console@0.6.5:
-    resolution: {integrity: sha512-IzXpW9MW3Ofx8+cKsEdQQU1TztA/LyzOEF4A6EgvdM2z3dx5S7FV99jWk9U1G9ugV2BGv49Pwp+yjqe8vRnzVA==}
-
   browserslist@4.23.3:
     resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -2167,6 +2164,9 @@ packages:
   makeerror@1.0.12:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
 
+  matej-appwrite-console@0.6.18:
+    resolution: {integrity: sha512-n1WmZBKjmJEJ3Fc3w/qAKwfLJSPoDQDR+B4loWpa2NLkKRICxZScIvUsegxaBx9uGPOE8Q+A8sw3iCQBVihLuQ==}
+
   mdn-data@2.0.30:
     resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
 
@@ -4346,8 +4346,6 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  bradley-console@0.6.5: {}
-
   browserslist@4.23.3:
     dependencies:
       caniuse-lite: 1.0.30001651
@@ -5604,6 +5602,8 @@ snapshots:
     dependencies:
       tmpl: 1.0.5
 
+  matej-appwrite-console@0.6.18: {}
+
   mdn-data@2.0.30: {}
 
   merge-stream@2.0.0: {}
diff --git a/src/routes/(console)/project-[project]/functions/+layout.ts b/src/routes/(console)/project-[project]/functions/+layout.ts
index 0f9f725355..8d7b68a162 100644
--- a/src/routes/(console)/project-[project]/functions/+layout.ts
+++ b/src/routes/(console)/project-[project]/functions/+layout.ts
@@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ depends }) => {
         sdk.forProject.functions.listRuntimes(),
         sdk.forProject.vcs.listInstallations([Query.limit(100)]),
         sdk.forProject.functions.listTemplates(undefined, undefined, 100),
-        sdk.forProject.functions.getSpecifications()
+        sdk.forProject.functions.listSpecifications()
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
index ac1254d137..c447e6e361 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -33,8 +33,6 @@
             value: runtime.$id
         }));
 
-        console.log(allowedSpecifications);
-
         specificationOptions = allowedSpecifications.map((size) => ({
             label:
                 `${size.cpus} CPU, ${size.memory} MB RAM` +

From e93a328888c157e84529e2b7276a5de6a5481f52 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 27 Aug 2024 13:17:00 +0530
Subject: [PATCH 047/177] fix: formatting.

---
 src/lib/layout/logs.svelte                               | 9 ++++-----
 .../deployment-[deployment]/+page.svelte                 | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 5e2b9ce96b..bc755d47e2 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -152,7 +152,8 @@
 
             <div class="u-stretch u-margin-block-start-32 u-overflow-hidden">
                 <section class="code-panel">
-                    <header class="code-panel-header code-panel-compact-header u-main-space-between u-width-full-line">
+                    <header
+                        class="code-panel-header code-panel-compact-header u-main-space-between u-width-full-line">
                         <div class="u-flex">
                             <div class="u-flex u-gap-16">
                                 <h4 class="text u-bold">Method:</h4>
@@ -195,8 +196,7 @@
                     </header>
                     <div class="code-panel-content grid-1-2">
                         <div
-                            class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16 mobile-only-inline-20-padding"
-                        >
+                            class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16 mobile-only-inline-20-padding">
                             <Heading tag="h3" size="6">Request</Heading>
                             <div class="u-sep-block-end">
                                 <Tabs>
@@ -309,8 +309,7 @@
                         </div>
                         <div class="u-sep-block-end is-only-mobile u-padding-block-start-16" />
                         <div
-                            class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0 mobile-only-inline-20-padding mobile-only-block-start-20-padding"
-                        >
+                            class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0 mobile-only-inline-20-padding mobile-only-block-start-20-padding">
                             <Heading tag="h3" size="6">Response</Heading>
                             <div class="u-sep-block-end">
                                 <Tabs>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 8868b08c9f..457369eec7 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -67,7 +67,8 @@
                         invalidate(Dependencies.DEPLOYMENT);
                     }
                 }
-        });
+            }
+        );
 
         return () => {
             unsubscribe();
@@ -167,4 +168,4 @@
     .code-panel-content {
         max-height: 50vh;
     }
-</style>
\ No newline at end of file
+</style>

From 7529748975b052845b21a2e81a59f3073354a221 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 27 Aug 2024 13:39:14 +0530
Subject: [PATCH 048/177] ran: `pnpm format`.

---
 .../functions/templates/+page.svelte               | 14 ++++++++------
 .../templates/template-[template]/+page.svelte     |  7 +++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/routes/(console)/project-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[project]/functions/templates/+page.svelte
index 53950368e8..fc1aee8549 100644
--- a/src/routes/(console)/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/templates/+page.svelte
@@ -142,7 +142,8 @@
                                                 .getAll('runtime')
                                                 .includes(runtime)}
                                             on:change={(e) => applyFilter('runtime', runtime, e)} />
-                                        <div class="u-flex u-cross-center u-gap-8 functions-avatar-holder">
+                                        <div
+                                            class="u-flex u-cross-center u-gap-8 functions-avatar-holder">
                                             <div class="avatar is-size-x-small">
                                                 <SvgIcon name={icon} iconSize="small" />
                                             </div>
@@ -181,14 +182,16 @@
                         <li>
                             <article class="card u-min-height-100-percent">
                                 <div class="u-flex u-gap-16 u-cross-center u-main-space-between">
-                                    <h2 class="body-text-1 u-bold u-trim-1 functions-template-title">
+                                    <h2
+                                        class="body-text-1 u-bold u-trim-1 functions-template-title">
                                         {template.name}
                                     </h2>
                                     <ul class="avatars-group is-with-border">
                                         {#each displayed as runtime}
                                             {@const icon = getIconFromRuntime(runtime.name)}
                                             {#if icon}
-                                                <li class="avatars-group-item functions-avatar-holder">
+                                                <li
+                                                    class="avatars-group-item functions-avatar-holder">
                                                     <div class="avatar is-size-small">
                                                         <img
                                                             style:--p-text-size="20px"
@@ -262,9 +265,8 @@
     </div>
 </Container>
 
-
 <style>
-    :global(.theme-light .functions-avatar-holder .avatar)  {
+    :global(.theme-light .functions-avatar-holder .avatar) {
         background-color: var(--p-avatar-bg-color-default);
         --p-avatar-bg-color-default: hsl(var(--color-neutral-0));
     }
@@ -276,4 +278,4 @@
     :global(.theme-dark .functions-template-title) {
         color: hsl(var(--color-neutral-15));
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
index 15e5899c1e..15ae8d5105 100644
--- a/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -94,11 +94,10 @@
 
 <style>
     :global(.theme-dark .collapsible-item-divider:where(:not(:last-child))) {
-        border-block-end: solid .0625rem hsl(var(--color-neutral-85));
+        border-block-end: solid 0.0625rem hsl(var(--color-neutral-85));
     }
 
     :global(.theme-light .collapsible-item-divider:where(:not(:last-child))) {
-        border-block-end: solid .0625rem hsl(var(--color-neutral-10));
+        border-block-end: solid 0.0625rem hsl(var(--color-neutral-10));
     }
-
-</style>
\ No newline at end of file
+</style>

From ec213d39de6da21b934a303bff32f461d26761e6 Mon Sep 17 00:00:00 2001
From: ItzNotABug <itznotabug@gmail.com>
Date: Tue, 27 Aug 2024 13:39:57 +0530
Subject: [PATCH 049/177] ran: `pnpm format`.

---
 src/lib/helpers/load.ts               | 2 +-
 src/lib/layout/unauthenticated.svelte | 2 +-
 src/lib/stores/feedback.ts            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts
index 05e043ddc9..21e2f1ee6e 100644
--- a/src/lib/helpers/load.ts
+++ b/src/lib/helpers/load.ts
@@ -21,7 +21,7 @@ export enum View {
 export function getView(url: URL, route: Page['route'], fallback: View): View {
     return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
         ? View.Grid
-        : View.Table ?? fallback;
+        : (View.Table ?? fallback);
 }
 
 export function getColumns(route: Page['route'], fallback: string[]): string[] {
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index b7e250b540..4d859d492e 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -16,7 +16,7 @@
     export let coupon: Coupon = null;
 
     $: selectedCampaign = campaigns.get(coupon?.campaign ?? campaign);
-    $: variation = (coupon?.campaign ?? campaign ? selectedCampaign?.template : 'default') as
+    $: variation = ((coupon?.campaign ?? campaign) ? selectedCampaign?.template : 'default') as
         | 'default'
         | CampaignData['template'];
 
diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
index 7f9b6b2004..7eaefca2d5 100644
--- a/src/lib/stores/feedback.ts
+++ b/src/lib/stores/feedback.ts
@@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore();
 
 function createFeedbackStore() {
     const { subscribe, update } = writable<Feedback>({
-        elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0,
-        visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0,
+        elapsed: browser ? (parseInt(localStorage.getItem('feedbackElapsed')) ?? 0) : 0,
+        visualized: browser ? (parseInt(localStorage.getItem('feedbackVisualized')) ?? 0) : 0,
         notification: false,
         type: 'general',
         show: false

From 992fbb564a63fc4037d5b069aafab43a6a9eefe7 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 26 Nov 2024 16:20:06 +0530
Subject: [PATCH 050/177] update: checkout from `main`.

---
 .../functions/steps/templateVariables.svelte  | 136 ++++++------------
 1 file changed, 40 insertions(+), 96 deletions(-)

diff --git a/src/lib/wizards/functions/steps/templateVariables.svelte b/src/lib/wizards/functions/steps/templateVariables.svelte
index b51a4996d8..c7db15bd43 100644
--- a/src/lib/wizards/functions/steps/templateVariables.svelte
+++ b/src/lib/wizards/functions/steps/templateVariables.svelte
@@ -56,80 +56,34 @@
     </svelte:fragment>
     {#if $template?.variables?.length}
         {#if requiredVariables?.length}
-            {#if requiredVariables?.length === 1 || requiredVariables.every((variable) => variable.required)}
-                <div class="collapsible-item">
-                    <div class="collapsible-wrapper">
-                        <div class="collapsible-button">
+            <Collapsible>
+                <CollapsibleItem open={true}>
+                    <svelte:fragment slot="title">Required variables</svelte:fragment>
+                    <svelte:fragment slot="subtitle">
+                        <span class="inline-tag">{requiredVariables.length}</span>
+                    </svelte:fragment>
+
+                    <FormList>
+                        {#each requiredVariables as variable}
                             <div>
-                                <span class="text">Required variables</span>
-                                <span class="collapsible-button-optional">
-                                    <span class="inline-tag">{requiredVariables.length}</span>
-                                </span>
+                                <svelte:component
+                                    this={selectComponent(variable.type)}
+                                    id={variable.name}
+                                    label={variable.name}
+                                    placeholder={variable.placeholder ?? 'Enter value'}
+                                    required={variable.required}
+                                    autocomplete={false}
+                                    minlength={variable.type === 'password' ? 0 : null}
+                                    showPasswordButton={variable.type === 'password'}
+                                    bind:value={$templateConfig.variables[variable.name]} />
+                                <Helper type="neutral">
+                                    {@html variable.description}
+                                </Helper>
                             </div>
-                        </div>
-                        <div class="collapsible-content">
-                            <FormList>
-                                {#each requiredVariables as variable}
-                                    {#if variable.name === 'APPWRITE_API_KEY'}
-                                        <AppwriteVariable appwriteVariable={variable} />
-                                    {:else}
-                                        <div>
-                                            <svelte:component
-                                                this={selectComponent(variable.type)}
-                                                id={variable.name}
-                                                label={variable.name}
-                                                placeholder={variable.placeholder ?? 'Enter value'}
-                                                required={variable.required}
-                                                autocomplete={false}
-                                                minlength={variable.type === 'password' ? 0 : null}
-                                                showPasswordButton={variable.type === 'password'}
-                                                bind:value={$templateConfig.variables[
-                                                    variable.name
-                                                ]} />
-                                            <Helper type="neutral">
-                                                {@html variable.description}
-                                            </Helper>
-                                        </div>
-                                    {/if}
-                                {/each}
-                            </FormList>
-                        </div>
-                    </div>
-                </div>
-            {:else if requiredVariables?.length > 1}
-                <Collapsible>
-                    <CollapsibleItem open={true}>
-                        <svelte:fragment slot="title">Required variables</svelte:fragment>
-                        <svelte:fragment slot="subtitle">
-                            <span class="inline-tag">{requiredVariables.length}</span>
-                        </svelte:fragment>
-
-                        <FormList>
-                            {#each requiredVariables as variable}
-                                {#if variable.name === 'APPWRITE_API_KEY'}
-                                    <AppwriteVariable appwriteVariable={variable} />
-                                {:else}
-                                    <div>
-                                        <svelte:component
-                                            this={selectComponent(variable.type)}
-                                            id={variable.name}
-                                            label={variable.name}
-                                            placeholder={variable.placeholder ?? 'Enter value'}
-                                            required={variable.required}
-                                            autocomplete={false}
-                                            minlength={variable.type === 'password' ? 0 : null}
-                                            showPasswordButton={variable.type === 'password'}
-                                            bind:value={$templateConfig.variables[variable.name]} />
-                                        <Helper type="neutral">
-                                            {@html variable.description}
-                                        </Helper>
-                                    </div>
-                                {/if}
-                            {/each}
-                        </FormList>
-                    </CollapsibleItem>
-                </Collapsible>
-            {/if}
+                        {/each}
+                    </FormList>
+                </CollapsibleItem>
+            </Collapsible>
         {/if}
 
         {#if optionalVariables?.length}
@@ -142,25 +96,21 @@
 
                     <FormList>
                         {#each optionalVariables as variable}
-                            {#if variable.name === 'APPWRITE_API_KEY'}
-                                <AppwriteVariable appwriteVariable={variable} />
-                            {:else}
-                                <div>
-                                    <svelte:component
-                                        this={selectComponent(variable.type)}
-                                        id={variable.name}
-                                        label={variable.name}
-                                        placeholder={variable.placeholder ?? 'Enter value'}
-                                        required={variable.required}
-                                        autocomplete={false}
-                                        showPasswordButton={variable.type === 'password'}
-                                        bind:value={$templateConfig.variables[variable.name]} />
+                            <div>
+                                <svelte:component
+                                    this={selectComponent(variable.type)}
+                                    id={variable.name}
+                                    label={variable.name}
+                                    placeholder={variable.placeholder ?? 'Enter value'}
+                                    required={variable.required}
+                                    autocomplete={false}
+                                    showPasswordButton={variable.type === 'password'}
+                                    bind:value={$templateConfig.variables[variable.name]} />
 
-                                    <Helper type="neutral">
-                                        {@html variable.description}
-                                    </Helper>
-                                </div>
-                            {/if}
+                                <Helper type="neutral">
+                                    {@html variable.description}
+                                </Helper>
+                            </div>
                         {/each}
                     </FormList>
                 </CollapsibleItem>
@@ -172,9 +122,3 @@
         </Card>
     {/if}
 </WizardStep>
-
-<style>
-    .collapsible-button div {
-        padding: 3px 0;
-    }
-</style>

From 8396e5d0043ec7c13b9345352aeee4f0ee2b46b3 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 28 Nov 2024 13:46:14 +0530
Subject: [PATCH 051/177] update: address comments.

---
 .../functions/components/repositories.svelte        |  2 +-
 .../functions/function-[function]/createCli.svelte  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index cdbdf3016b..da3524ee22 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -125,7 +125,7 @@
     </p>
     {#if selectedInstallation}
         {#await loadRepositories(selectedInstallation, search)}
-            <div class="u-flex u-gap-8 u-cross-center u-main-center" style="height: 50vh; ">
+            <div class="u-flex u-gap-8 u-cross-center u-main-center" style:height="50vh">
                 <div class="loader u-margin-32" />
             </div>
         {:then response}
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte
index 22bf832f9e..4ab648d8e0 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte
@@ -131,20 +131,19 @@
 
 <style>
     .box {
-        padding: unset !important;
-        background-color: unset !important;
+        padding: unset;
+        background-color: unset;
     }
 
-    /* should we use global here? */
     .editor-border :global(.cli-commands-code-box-no-outline) {
         margin: 1rem 0;
-        border: unset !important;
-        border-radius: unset !important;
-        background-color: unset !important;
+        border: unset;
+        border-radius: unset;
+        background-color: unset;
         padding: 0 var(--box-padding, 1.5rem) 0 var(--box-padding, 1.5rem);
     }
 
     :global(.editor-border .cli-commands-code-box-no-outline pre) {
-        background-color: unset !important;
+        background-color: unset;
     }
 </style>

From 5c999e77445eb9e86a1ec6d7aab1ce1dbcdf6323 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 28 Nov 2024 14:21:07 +0530
Subject: [PATCH 052/177] update: address comments.

---
 src/lib/layout/logs.svelte | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 9d04824f0c..074e8260a3 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -434,36 +434,36 @@
 
 <style>
     :global(.limited-code-height) {
+        overflow: auto;
         max-height: 50vh;
-        overflow: auto !important;
     }
 
     .code-panel-compact-header .u-flex {
-        gap: 1.5rem !important;
+        gap: 1.5rem;
     }
 
     @media (max-width: 768px) {
         .code-panel-compact-header {
             row-gap: 1rem;
-            flex-direction: column !important;
+            flex-direction: column;
         }
 
         .code-panel-content {
-            padding: unset !important;
-            padding-block: 1.5rem !important;
+            padding: unset;
+            padding-block: 1.5rem;
         }
 
         .mobile-only-inline-20-padding {
-            padding-inline: 1.5rem !important;
+            padding-inline: 1.5rem;
         }
 
         .mobile-only-block-start-20-padding {
-            padding-block-start: 1.5rem !important;
+            padding-block-start: 1.5rem;
         }
 
         .code-panel-content.grid-1-2 {
-            display: unset !important;
-            row-gap: unset !important;
+            display: unset;
+            row-gap: unset;
         }
     }
 </style>

From 8cc55773f716abcdf8006a36d2946ada36ff4ca5 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <lohanidamodar@users.noreply.github.com>
Date: Mon, 2 Dec 2024 08:32:59 +0545
Subject: [PATCH 053/177] Feat: use premium support from plan attribute

---
 src/lib/components/support.svelte | 8 +++-----
 src/lib/sdk/billing.ts            | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 66d922d410..95a008011c 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -13,9 +13,7 @@
 
     export let show = false;
 
-    $: isPaid =
-        $organization?.billingPlan === BillingPlan.PRO ||
-        $organization?.billingPlan === BillingPlan.SCALE;
+    $: hasPremiumSupport = $organization?.billingPlan.premiumSupport ?? false;
 
     $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeTimezoneName()}`;
 </script>
@@ -24,13 +22,13 @@
     <section class="drop-section u-grid u-gap-24 u-padding-24">
         <div>
             <h4 class="eyebrow-heading-3">Premium support</h4>
-            {#if isPaid}
+            {#if hasPremiumSupport}
                 <p class="u-line-height-1-5 u-margin-block-start-8">
                     Get personalized support from the Appwrite team from <b>{supportTimings}</b>
                 </p>
             {/if}
         </div>
-        {#if $organization?.billingPlan === BillingPlan.FREE}
+        {#if !hasPremiumSupport}
             <Button
                 fullWidth
                 href={$upgradeURL}
diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index d93535f023..c2127ac7f7 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -281,6 +281,7 @@ export type Plan = {
     trialDays: number;
     isAvailable: boolean;
     selfService: boolean;
+    premiumSupport: boolean;
 };
 
 export type PlansInfo = {

From cd270453767b7d89bc07ad9b3f845fc9cf7e97d7 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 2 Dec 2024 09:10:50 +0545
Subject: [PATCH 054/177] improve currentPlan store

---
 src/lib/stores/organization.ts                |  2 ++
 .../organization-[organization]/+layout.ts    |  4 +++
 .../billing/+page.svelte                      |  4 +--
 .../billing/+page.ts                          | 33 +++++++------------
 .../change-plan/+page.svelte                  | 10 ++++--
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index d400742e34..128962b731 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -2,6 +2,7 @@ import { page } from '$app/stores';
 import { derived, writable } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 import type { Tier } from './billing';
+import type { Plan } from '$lib/sdk/billing';
 
 export type Organization = Models.Team<Record<string, unknown>> & {
     billingBudget: number;
@@ -43,4 +44,5 @@ export const organizationList = derived(
 );
 
 export const organization = derived(page, ($page) => $page.data?.organization as Organization);
+export const currentPlan = derived(page, ($page) => $page.data?.currentPlan as Plan);
 export const members = derived(page, ($page) => $page.data.members as Models.MembershipList);
diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts
index ccc1c0a939..650990e866 100644
--- a/src/routes/(console)/organization-[organization]/+layout.ts
+++ b/src/routes/(console)/organization-[organization]/+layout.ts
@@ -12,6 +12,7 @@ import { get } from 'svelte/store';
 import { preferences } from '$lib/stores/preferences';
 import type { Organization } from '$lib/stores/organization';
 import { defaultRoles, defaultScopes } from '$lib/constants';
+import type { Plan } from '$lib/sdk/billing';
 
 export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.ORGANIZATION);
@@ -19,12 +20,14 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.PAYMENT_METHODS);
     let roles = isCloud ? [] : defaultRoles;
     let scopes = isCloud ? [] : defaultScopes;
+    let currentPlan: Plan = null;
 
     try {
         if (isCloud) {
             const res = await sdk.forConsole.billing.getRoles(params.organization);
             roles = res.roles;
             scopes = res.scopes;
+            currentPlan = await sdk.forConsole.billing.getPlan(params.organization);
             if (scopes.includes('billing.read')) {
                 await failedInvoice.load(params.organization);
                 if (get(failedInvoice)) {
@@ -53,6 +56,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
             header: Header,
             breadcrumbs: Breadcrumbs,
             organization,
+            currentPlan,
             members,
             roles,
             scopes
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
index d3d6b7fd1a..c31d1e8d06 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Container } from '$lib/layout';
-    import { organization } from '$lib/stores/organization';
+    import { currentPlan, organization } from '$lib/stores/organization';
     import BudgetAlert from './budgetAlert.svelte';
     import BudgetCap from './budgetCap.svelte';
     import PlanSummary from './planSummary.svelte';
@@ -123,7 +123,7 @@
     <PlanSummary
         creditList={data?.creditList}
         members={data?.members}
-        currentPlan={data?.currentPlan}
+        currentPlan={$currentPlan}
         invoices={data?.invoices.invoices} />
     <PaymentHistory />
     <PaymentMethods />
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts
index 0e945f906a..36247292e3 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.ts
+++ b/src/routes/(console)/organization-[organization]/billing/+page.ts
@@ -25,33 +25,24 @@ export const load: PageLoad = async ({ parent, depends }) => {
               .catch(() => null)
         : null;
 
-    const [
-        paymentMethods,
-        addressList,
-        aggregationList,
-        billingAddress,
-        currentPlan,
-        creditList,
-        invoices
-    ] = await Promise.all([
-        sdk.forConsole.billing.listPaymentMethods(),
-        sdk.forConsole.billing.listAddresses(),
-        sdk.forConsole.billing.listAggregation(organization.$id),
-        billingAddressPromise,
-        sdk.forConsole.billing.getPlan(organization.$id),
-        sdk.forConsole.billing.listCredits(organization.$id),
-        sdk.forConsole.billing.listInvoices(organization.$id, [
-            Query.limit(1),
-            Query.equal('from', organization.billingCurrentInvoiceDate)
-        ])
-    ]);
+    const [paymentMethods, addressList, aggregationList, billingAddress, creditList, invoices] =
+        await Promise.all([
+            sdk.forConsole.billing.listPaymentMethods(),
+            sdk.forConsole.billing.listAddresses(),
+            sdk.forConsole.billing.listAggregation(organization.$id),
+            billingAddressPromise,
+            sdk.forConsole.billing.listCredits(organization.$id),
+            sdk.forConsole.billing.listInvoices(organization.$id, [
+                Query.limit(1),
+                Query.equal('from', organization.billingCurrentInvoiceDate)
+            ])
+        ]);
 
     return {
         paymentMethods,
         addressList,
         aggregationList,
         billingAddress,
-        currentPlan,
         creditList,
         invoices
     };
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index 11afa878a0..7f4dadac2b 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -32,7 +32,12 @@
     import { type Coupon, type PaymentList } from '$lib/sdk/billing';
     import { plansInfo, tierToPlan, type Tier } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import { organization, organizationList, type Organization } from '$lib/stores/organization';
+    import {
+        currentPlan,
+        organization,
+        organizationList,
+        type Organization
+    } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
     import { VARS } from '$lib/system';
@@ -101,8 +106,7 @@
             billingPlan = BillingPlan.PRO;
         }
 
-        const currentPlan = await sdk.forConsole.billing.getPlan($organization?.$id);
-        selfService = currentPlan.selfService;
+        selfService = $currentPlan?.selfService ?? true;
     });
 
     async function loadPaymentMethods() {

From c5519c9837aad4f24082e686f5c350e2c10ac23c Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 2 Dec 2024 09:11:01 +0545
Subject: [PATCH 055/177] show support based on current plan config

---
 src/lib/components/support.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 95a008011c..a584e2fe5b 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -5,15 +5,14 @@
     import SupportWizard from '$routes/(console)/supportWizard.svelte';
     import { showSupportModal } from '$routes/(console)/wizard/support/store';
     import { isCloud } from '$lib/system';
-    import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
     import { trackEvent } from '$lib/actions/analytics';
     import { localeTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
     import { upgradeURL } from '$lib/stores/billing';
+    import { currentPlan } from '$lib/stores/organization';
 
     export let show = false;
 
-    $: hasPremiumSupport = $organization?.billingPlan.premiumSupport ?? false;
+    $: hasPremiumSupport = $currentPlan?.premiumSupport ?? false;
 
     $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeTimezoneName()}`;
 </script>

From de30de7b2f205eb78f336671b1dda6ffd2f226a3 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 2 Dec 2024 12:31:15 +0530
Subject: [PATCH 056/177] fix: autofocus on conditional inputs.

---
 .../components/billing/selectPaymentMethod.svelte    |  1 +
 src/lib/elements/forms/inputNumber.svelte            | 10 ++++++++--
 .../billing/addCreditModal.svelte                    |  7 ++++++-
 .../billing/budgetCap.svelte                         |  1 +
 .../auth/security/updatePasswordHistory.svelte       | 10 ++++++++++
 .../auth/security/updateUsersLimit.svelte            | 12 +++++++++++-
 6 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte
index 937d6bc67c..8e82a806e9 100644
--- a/src/lib/components/billing/selectPaymentMethod.svelte
+++ b/src/lib/components/billing/selectPaymentMethod.svelte
@@ -140,6 +140,7 @@
                         <InputText
                             id="taxId"
                             label="Tax ID"
+                            autofocus
                             placeholder="Tax ID"
                             bind:value={taxId} />
                     </div>
diff --git a/src/lib/elements/forms/inputNumber.svelte b/src/lib/elements/forms/inputNumber.svelte
index 97835384e1..dc3613644f 100644
--- a/src/lib/elements/forms/inputNumber.svelte
+++ b/src/lib/elements/forms/inputNumber.svelte
@@ -24,11 +24,17 @@
     let error: string;
 
     onMount(() => {
-        if (element && autofocus) {
-            element.focus();
+        if (autofocus) {
+            addInputFocus();
         }
     });
 
+    export function addInputFocus() {
+        if (element) {
+            element.focus();
+        }
+    }
+
     const handleInvalid = (event: Event) => {
         event.preventDefault();
 
diff --git a/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
index f0bb10ba9b..4a66d67972 100644
--- a/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
@@ -40,7 +40,12 @@
     Apply Appwrite credits to your organization.
 
     <FormList>
-        <InputText placeholder="Promo code" id="code" label="Add promo code" bind:value={coupon} />
+        <InputText
+            placeholder="Promo code"
+            id="code"
+            autofocus
+            label="Add promo code"
+            bind:value={coupon} />
     </FormList>
 
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index e76bcd2ed4..c6b0d00fe5 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -84,6 +84,7 @@
                         <InputNumber
                             placeholder="Add budget cap"
                             id="cap"
+                            autofocus
                             label="Budget cap (USD)"
                             bind:value={budget} />
                     {/if}
diff --git a/src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte
index a308e99624..82209e2bb0 100644
--- a/src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte
+++ b/src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte
@@ -8,6 +8,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
+    import { tick } from 'svelte';
 
     let passwordHistory = $project?.authPasswordHistory < 1 ? 5 : $project?.authPasswordHistory;
     let passwordHistoryEnabled = ($project?.authPasswordHistory ?? 0) !== 0;
@@ -34,6 +35,14 @@
             trackError(error, Submit.AuthPasswordHistoryUpdate);
         }
     }
+
+    let maxSessionInputField: InputNumber | null = null;
+
+    $: if (passwordHistoryEnabled && maxSessionInputField) {
+        tick().then(() => {
+            maxSessionInputField.addInputFocus();
+        });
+    }
 </script>
 
 <Form onSubmit={updatePasswordHistoryLimit}>
@@ -59,6 +68,7 @@
                     min={1}
                     id="max-session"
                     label="Limit"
+                    bind:this={maxSessionInputField}
                     disabled={!passwordHistoryEnabled}
                     bind:value={passwordHistory} />
             </FormList>
diff --git a/src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte
index 6f67ceae0d..3672167834 100644
--- a/src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte
+++ b/src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte
@@ -9,6 +9,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
+    import { tick } from 'svelte';
 
     let isLimited = $project?.authLimit !== 0;
     let newLimit = isLimited ? $project?.authLimit : 100;
@@ -41,6 +42,14 @@
             trackError(error, Submit.AuthLimitUpdate);
         }
     }
+
+    let maxUsersInputField: HTMLInputElement | null = null;
+
+    $: if (isLimited && maxUsersInputField) {
+        tick().then(() => {
+            maxUsersInputField.focus();
+        });
+    }
 </script>
 
 <CardGrid>
@@ -96,7 +105,8 @@
                         class="input-text"
                         max="10000"
                         disabled={!isLimited}
-                        bind:value={newLimit} />
+                        bind:value={newLimit}
+                        bind:this={maxUsersInputField} />
                 </div>
             </li>
         </ul>

From b5f737646fd11b88b845ff25b51a02a95aac0cf3 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 2 Dec 2024 12:31:32 +0530
Subject: [PATCH 057/177] fix: equality checks.

---
 .../messaging/message-[message]/emailMessage.svelte         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
index 6fcaad6d47..fc897c3984 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
+++ b/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
@@ -63,7 +63,7 @@
 </script>
 
 <Form onSubmit={update}>
-    <CardGrid hideFooter={message.status != 'draft'}>
+    <CardGrid hideFooter={message.status !== 'draft'}>
         <div class="grid-1-2-col-1 u-flex u-cross-center u-gap-16">
             <Heading tag="h6" size="7">Message</Heading>
         </div>
@@ -72,12 +72,12 @@
                 <InputText
                     id="subject"
                     label="Subject"
-                    disabled={message.status != 'draft'}
+                    disabled={message.status !== 'draft'}
                     bind:value={subject}></InputText>
                 <InputTextarea
                     id="message"
                     label="Message"
-                    disabled={message.status != 'draft'}
+                    disabled={message.status !== 'draft'}
                     bind:value={content}></InputTextarea>
                 <InputSwitch label="HTML mode" id="html" bind:value={html}>
                     <svelte:fragment slot="description">

From c7d7f08a8515198b64d014bc21a3f6d91ba6db54 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 2 Dec 2024 12:31:54 +0530
Subject: [PATCH 058/177] fix: missing custom id.

---
 .../messaging/wizard/emailFormList.svelte                 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
index 693d209fb7..fd6bd9a027 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
@@ -10,7 +10,7 @@
         InputTextarea
     } from '$lib/elements/forms';
     import { Pill } from '$lib/elements';
-    import { Modal } from '$lib/components';
+    import { CustomId, Modal } from '$lib/components';
     import { user } from '$lib/stores/user';
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
@@ -113,5 +113,11 @@
                     Message ID
                 </span></Pill>
         </div>
+    {:else}
+        <CustomId
+            bind:show={showCustomId}
+            name="Message"
+            bind:id={$messageParams[$providerType].messageId}
+            fullWidth />
     {/if}
 </FormList>

From f368acc1c0add64e218fd2414c5b528776220d4c Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 2 Dec 2024 12:50:38 +0530
Subject: [PATCH 059/177] remove: `icon-x` button in a read-only view.

---
 .../collection-[collection]/indexes/overviewIndex.svelte   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
index 54d16cab6f..de7c68e6a0 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Modal } from '$lib/components';
-    import { Button, InputText, FormList } from '$lib/elements/forms';
+    import { InputText, FormList } from '$lib/elements/forms';
     import type { Models } from '@appwrite.io/console';
 
     export let showOverview = false;
@@ -50,11 +50,6 @@
                                 readonly />
                         </div>
                     </div>
-                    <div class="form-item-part u-cross-child-end">
-                        <Button text disabled>
-                            <span class="icon-x" aria-hidden="true" />
-                        </Button>
-                    </div>
                 </li>
             {/each}
         {/if}

From 869813ed3ebd256b2ecfeb6e27fd935246f70905 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 2 Dec 2024 14:56:43 +0530
Subject: [PATCH 060/177] remove: `icon-x` button in a read-only view.

---
 src/lib/components/collapsibleItem.svelte     |   7 +-
 .../billing/+page.svelte                      |   4 +-
 .../billing/availableCredit.svelte            |   4 +-
 .../billing/budgetAlert.svelte                | 126 +++++---
 .../billing/budgetCap.svelte                  |  12 +-
 .../billing/paymentHistory.svelte             | 244 +++++++-------
 .../billing/paymentMethods.svelte             | 198 ++++++------
 .../billing/planSummary.svelte                | 302 ++++++++++--------
 8 files changed, 489 insertions(+), 408 deletions(-)

diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte
index a16b634608..f98c8845eb 100644
--- a/src/lib/components/collapsibleItem.svelte
+++ b/src/lib/components/collapsibleItem.svelte
@@ -7,12 +7,15 @@
     export let noContent = false;
     export let isInfo = false;
     export let gap = 16;
+
+    export let style = null;
+    export let wrapperStyle = null;
 </script>
 
 <li class="collapsible-item" class:is-info={isInfo}>
     {#if noContent}
-        <div class="collapsible-wrapper">
-            <div class={`collapsible-button u-gap-${gap}`}>
+        <div class="collapsible-wrapper" style={wrapperStyle}>
+            <div class={`collapsible-button u-gap-${gap}`} {style}>
                 <slot />
             </div>
         </div>
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
index d3d6b7fd1a..23802e0815 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte
@@ -130,9 +130,7 @@
     <BillingAddress billingAddress={data?.billingAddress} />
     <TaxId />
     <BudgetCap />
-    {#if $organization?.billingPlan !== BillingPlan.FREE && !!$organization?.billingBudget}
-        <BudgetAlert />
-    {/if}
+    <BudgetAlert />
     <AvailableCredit />
 </Container>
 
diff --git a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
index b0a1efd7fa..6efbb54340 100644
--- a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
@@ -90,7 +90,9 @@
 </script>
 
 <CardGrid hideFooter={$organization?.billingPlan !== BillingPlan.FREE}>
-    <Heading tag="h2" size="6">Available credit</Heading>
+    <Heading tag="h2" size="6">
+        {$organization?.billingPlan === BillingPlan.FREE ? 'Credit' : 'Available credit'}
+    </Heading>
 
     <p class="text">Appwrite credit will automatically be applied to your next invoice.</p>
     <svelte:fragment slot="aside">
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index a75439aac4..9c391398bd 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { CardGrid, Heading } from '$lib/components';
-    import { Dependencies } from '$lib/constants';
+    import { Alert, CardGrid, Heading } from '$lib/components';
+    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { upgradeURL } from '$lib/stores/billing';
     import { Button, Form, FormList, InputSelectSearch } from '$lib/elements/forms';
     import {
         Table,
@@ -85,58 +86,87 @@
             specified budget cap. You can set a maximum of 3 alerts.
         </p>
         <svelte:fragment slot="aside">
-            <FormList>
-                <div class="u-flex u-gap-16">
-                    <InputSelectSearch
-                        label="Percentage (%) of budget cap"
-                        placeholder="Select a percentage"
-                        id="alerts"
-                        {options}
-                        bind:search
-                        bind:value={selectedAlert}
-                        on:select={() => (search = selectedAlert.toString())} />
-                    <div style="align-self: flex-end">
-                        <Button
-                            secondary
-                            disabled={alerts.length > 2 || (!search && !selectedAlert)}
-                            on:click={addAlert}>
-                            Add alert
-                        </Button>
+            {#if $organization?.billingPlan === BillingPlan.FREE}
+                <Alert type="info">
+                    <svelte:fragment slot="title"
+                        >Budget alerts are a Pro plan feature
+                    </svelte:fragment>
+                    Upgrade to a Pro plan to set a budget alerts for your organization. For more information
+                    on what you can do with a Pro plan,
+                    <a
+                        class="link"
+                        href="https://appwrite.io/pricing"
+                        target="_blank"
+                        rel="noopener noreferrer">view our pricing guide.</a>
+                </Alert>
+            {:else}
+                <FormList>
+                    <div class="u-flex u-gap-16">
+                        <InputSelectSearch
+                            label="Percentage (%) of budget cap"
+                            placeholder="Select a percentage"
+                            id="alerts"
+                            {options}
+                            bind:search
+                            bind:value={selectedAlert}
+                            on:select={() => (search = selectedAlert.toString())} />
+                        <div style="align-self: flex-end">
+                            <Button
+                                secondary
+                                disabled={alerts.length > 2 || (!search && !selectedAlert)}
+                                on:click={addAlert}>
+                                Add alert
+                            </Button>
+                        </div>
                     </div>
-                </div>
-            </FormList>
+                </FormList>
 
-            {#if alerts.length}
-                <Table noMargin noStyles transparent>
-                    <TableHeader>
-                        <TableCellHead>Alert at budget cap %</TableCellHead>
-                        <TableCellHead width={30} />
-                    </TableHeader>
-                    <TableBody>
-                        {#each alerts.sort() as alert}
-                            <TableRow>
-                                <TableCellText title="Percentage">
-                                    {alert}%
-                                </TableCellText>
-                                <TableCell>
-                                    <Button
-                                        text
-                                        round
-                                        ariaLabel="remove alert"
-                                        on:click={() =>
-                                            (alerts = alerts.filter((a) => a !== alert))}>
-                                        <span class="icon-x" aria-hidden="true" />
-                                    </Button>
-                                </TableCell>
-                            </TableRow>
-                        {/each}
-                    </TableBody>
-                </Table>
+                {#if alerts.length}
+                    <Table noMargin noStyles transparent>
+                        <TableHeader>
+                            <TableCellHead>Alert at budget cap %</TableCellHead>
+                            <TableCellHead width={30} />
+                        </TableHeader>
+                        <TableBody>
+                            {#each alerts.sort() as alert}
+                                <TableRow>
+                                    <TableCellText title="Percentage">
+                                        {alert}%
+                                    </TableCellText>
+                                    <TableCell>
+                                        <Button
+                                            text
+                                            round
+                                            ariaLabel="remove alert"
+                                            on:click={() =>
+                                                (alerts = alerts.filter((a) => a !== alert))}>
+                                            <span class="icon-x" aria-hidden="true" />
+                                        </Button>
+                                    </TableCell>
+                                </TableRow>
+                            {/each}
+                        </TableBody>
+                    </Table>
+                {/if}
             {/if}
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            <Button disabled={isButtonDisabled} submit>Update</Button>
+            {#if $organization?.billingPlan === BillingPlan.FREE}
+                <Button
+                    secondary
+                    href={$upgradeURL}
+                    on:click={() => {
+                        trackEvent('click_organization_upgrade', {
+                            from: 'button',
+                            source: 'billing_alerts_card'
+                        });
+                    }}
+                    >Upgrade to Pro
+                </Button>
+            {:else}
+                <Button disabled={isButtonDisabled} submit>Update</Button>
+            {/if}
         </svelte:fragment>
     </CardGrid>
 </Form>
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index e76bcd2ed4..0d3503c0aa 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -53,10 +53,10 @@
         <Heading tag="h2" size="6">Budget cap</Heading>
 
         <p class="text">
-            Restrict your resource usage by setting a budget cap. <button
-                on:click={() => ($showUsageRatesModal = true)}
-                type="button"
-                class="link">Learn more about usage rates.</button>
+            Restrict your resource usage by setting a budget cap. Cap usage is reset at the
+            beginning of each billing cycle.
+            <button class="link" type="button" on:click={() => ($showUsageRatesModal = true)}
+                >Learn more about usage rates.</button>
         </p>
         <svelte:fragment slot="aside">
             {#if $organization?.billingPlan === BillingPlan.FREE}
@@ -101,7 +101,9 @@
                             from: 'button',
                             source: 'billing_budget_cap'
                         });
-                    }}>Upgrade to Pro</Button>
+                    }}
+                    >Upgrade to Pro
+                </Button>
             {:else}
                 <Button disabled={$organization?.billingBudget === budget} submit>Update</Button>
             {/if}
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
index 211f5f4ebc..ea6265f7c1 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
@@ -29,6 +29,7 @@
     import { trackEvent } from '$lib/actions/analytics';
     import { selectedInvoice, showRetryModal } from './store';
     import { organization } from '$lib/stores/organization';
+    import { BillingPlan } from '$lib/constants';
 
     let showDropdown = [];
     let showFailedError = false;
@@ -64,135 +65,144 @@
     }
 </script>
 
-<CardGrid>
-    <Heading tag="h2" size="6">Payment history</Heading>
+{#if $organization?.billingPlan === BillingPlan.FREE && invoiceList.total > 0}
+    <CardGrid>
+        <Heading tag="h2" size="6">Payment history</Heading>
 
-    <p class="text">
-        Transaction history for this organization. Download invoices for more details about your
-        payments.
-    </p>
-    <svelte:fragment slot="aside">
-        {#if invoiceList.total > 0}
-            <TableScroll noMargin transparent noStyles>
-                <TableHeader>
-                    <TableCellHead width={100}>Due Date</TableCellHead>
-                    <TableCellHead width={80}>Status</TableCellHead>
-                    <TableCellHead width={100}>Amount Due</TableCellHead>
-                    <TableCellHead width={40} />
-                </TableHeader>
-                <TableBody>
-                    {#each invoiceList?.invoices as invoice, i}
-                        {@const status = invoice.status}
-                        <TableRow>
-                            <TableCellText title="date">
-                                {toLocaleDate(invoice.dueAt)}
-                            </TableCellText>
-                            <TableCell title="status">
-                                {#if invoice?.lastError}
-                                    <DropList bind:show={showFailedError}>
+        <p class="text">
+            Transaction history for this organization. Download invoices for more details about your
+            payments.
+        </p>
+        <svelte:fragment slot="aside">
+            {#if invoiceList.total > 0}
+                <TableScroll noMargin transparent noStyles>
+                    <TableHeader>
+                        <TableCellHead width={100}>Due Date</TableCellHead>
+                        <TableCellHead width={80}>Status</TableCellHead>
+                        <TableCellHead width={100}>Amount Due</TableCellHead>
+                        <TableCellHead width={40} />
+                    </TableHeader>
+                    <TableBody>
+                        {#each invoiceList?.invoices as invoice, i}
+                            {@const status = invoice.status}
+                            <TableRow>
+                                <TableCellText title="date">
+                                    {toLocaleDate(invoice.dueAt)}
+                                </TableCellText>
+                                <TableCell title="status">
+                                    {#if invoice?.lastError}
+                                        <DropList bind:show={showFailedError}>
+                                            <Pill
+                                                danger={status === 'overdue' ||
+                                                    status === 'failed' ||
+                                                    status === 'requires_authentication'}
+                                                success={status === 'paid' ||
+                                                    status === 'succeeded'}
+                                                warning={status === 'pending'}
+                                                on:click={() => (showFailedError = true)}
+                                                button>
+                                                {status === 'requires_authentication'
+                                                    ? 'failed'
+                                                    : status}
+                                            </Pill>
+                                            <svelte:fragment slot="list">
+                                                <li>
+                                                    The scheduled payment has failed.
+                                                    <Button
+                                                        link
+                                                        on:click={() => {
+                                                            retryPayment(invoice);
+                                                            showFailedError = false;
+                                                        }}
+                                                        >Try again
+                                                    </Button>
+                                                    .
+                                                </li>
+                                            </svelte:fragment>
+                                        </DropList>
+                                    {:else}
                                         <Pill
                                             danger={status === 'overdue' ||
                                                 status === 'failed' ||
                                                 status === 'requires_authentication'}
                                             success={status === 'paid' || status === 'succeeded'}
-                                            warning={status === 'pending'}
-                                            on:click={() => (showFailedError = true)}
-                                            button>
+                                            warning={status === 'pending'}>
                                             {status === 'requires_authentication'
                                                 ? 'failed'
                                                 : status}
                                         </Pill>
+                                    {/if}
+                                </TableCell>
+                                <TableCellText title="due">
+                                    {formatCurrency(invoice.grossAmount)}
+                                </TableCellText>
+                                <TableCell showOverflow right>
+                                    <DropList
+                                        bind:show={showDropdown[i]}
+                                        placement="bottom-start"
+                                        noArrow>
+                                        <Button
+                                            round
+                                            text
+                                            noMargin
+                                            ariaLabel="More options"
+                                            on:click={() => {
+                                                showDropdown[i] = !showDropdown[i];
+                                            }}>
+                                            <span class="icon-dots-horizontal" aria-hidden="true" />
+                                        </Button>
                                         <svelte:fragment slot="list">
-                                            <li>
-                                                The scheduled payment has failed. <Button
-                                                    link
+                                            <DropListLink
+                                                icon="external-link"
+                                                external
+                                                href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/view`}
+                                                on:click={() =>
+                                                    (showDropdown[i] = !showDropdown[i])}
+                                                event="view_invoice">
+                                                View invoice
+                                            </DropListLink>
+                                            <DropListLink
+                                                icon="download"
+                                                href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/download`}
+                                                on:click={() => {
+                                                    showDropdown[i] = !showDropdown[i];
+                                                }}
+                                                event="download_invoice">
+                                                Download PDF
+                                            </DropListLink>
+                                            {#if status === 'overdue' || status === 'failed'}
+                                                <DropListItem
+                                                    icon="refresh"
                                                     on:click={() => {
                                                         retryPayment(invoice);
-                                                        showFailedError = false;
-                                                    }}>Try again</Button
-                                                >.
-                                            </li>
+                                                        showDropdown[i] = !showDropdown[i];
+                                                        trackEvent(`click_retry_payment`, {
+                                                            from: 'button',
+                                                            source: 'billing_invoice_menu'
+                                                        });
+                                                    }}>
+                                                    Retry payment
+                                                </DropListItem>
+                                            {/if}
                                         </svelte:fragment>
                                     </DropList>
-                                {:else}
-                                    <Pill
-                                        danger={status === 'overdue' ||
-                                            status === 'failed' ||
-                                            status === 'requires_authentication'}
-                                        success={status === 'paid' || status === 'succeeded'}
-                                        warning={status === 'pending'}>
-                                        {status === 'requires_authentication' ? 'failed' : status}
-                                    </Pill>
-                                {/if}
-                            </TableCell>
-                            <TableCellText title="due">
-                                {formatCurrency(invoice.grossAmount)}
-                            </TableCellText>
-                            <TableCell showOverflow right>
-                                <DropList
-                                    bind:show={showDropdown[i]}
-                                    placement="bottom-start"
-                                    noArrow>
-                                    <Button
-                                        round
-                                        text
-                                        noMargin
-                                        ariaLabel="More options"
-                                        on:click={() => {
-                                            showDropdown[i] = !showDropdown[i];
-                                        }}>
-                                        <span class="icon-dots-horizontal" aria-hidden="true" />
-                                    </Button>
-                                    <svelte:fragment slot="list">
-                                        <DropListLink
-                                            icon="external-link"
-                                            external
-                                            href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/view`}
-                                            on:click={() => (showDropdown[i] = !showDropdown[i])}
-                                            event="view_invoice">
-                                            View invoice
-                                        </DropListLink>
-                                        <DropListLink
-                                            icon="download"
-                                            href={`${endpoint}/organizations/${$page.params.organization}/invoices/${invoice.$id}/download`}
-                                            on:click={() => {
-                                                showDropdown[i] = !showDropdown[i];
-                                            }}
-                                            event="download_invoice">
-                                            Download PDF
-                                        </DropListLink>
-                                        {#if status === 'overdue' || status === 'failed'}
-                                            <DropListItem
-                                                icon="refresh"
-                                                on:click={() => {
-                                                    retryPayment(invoice);
-                                                    showDropdown[i] = !showDropdown[i];
-                                                    trackEvent(`click_retry_payment`, {
-                                                        from: 'button',
-                                                        source: 'billing_invoice_menu'
-                                                    });
-                                                }}>
-                                                Retry payment
-                                            </DropListItem>
-                                        {/if}
-                                    </svelte:fragment>
-                                </DropList>
-                            </TableCell>
-                        </TableRow>
-                    {/each}
-                </TableBody>
-            </TableScroll>
-            <div class="u-flex u-main-space-between">
-                <p class="text">Total results: {invoiceList?.total ?? 0}</p>
-                <PaginationInline {limit} bind:offset sum={invoiceList?.total ?? 0} hidePages />
-            </div>
-        {:else}
-            <EmptySearch hidePagination>
-                <p class="text u-text-center">
-                    You have no payment history. After you receive your first invoice, you'll see it
-                    here.
-                </p>
-            </EmptySearch>
-        {/if}
-    </svelte:fragment>
-</CardGrid>
+                                </TableCell>
+                            </TableRow>
+                        {/each}
+                    </TableBody>
+                </TableScroll>
+                <div class="u-flex u-main-space-between">
+                    <p class="text">Total results: {invoiceList?.total ?? 0}</p>
+                    <PaginationInline {limit} bind:offset sum={invoiceList?.total ?? 0} hidePages />
+                </div>
+            {:else}
+                <EmptySearch hidePagination>
+                    <p class="text u-text-center">
+                        You have no payment history. After you receive your first invoice, you'll
+                        see it here.
+                    </p>
+                </EmptySearch>
+            {/if}
+        </svelte:fragment>
+    </CardGrid>
+{/if}
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 4e7bdbcdc8..1a7938d240 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -99,7 +99,6 @@
     <p class="text">View or update your organization payment methods here.</p>
     <svelte:fragment slot="aside">
         <div class="u-flex u-flex-vertical u-gap-8">
-            <h4 class="u-bold body-text-2">Default</h4>
             {#if $organization?.paymentMethodId}
                 <CreditCardInfo isBox paymentMethod={defaultPaymentMethod}>
                     <DropList bind:show={showDropdown} placement="bottom-start" noArrow>
@@ -196,112 +195,115 @@
                 </article>
             {/if}
         </div>
-        <div class="u-flex u-flex-vertical u-gap-8">
-            <h4 class="u-bold body-text-2">Backup</h4>
-            {#if $organization?.backupPaymentMethodId}
-                <CreditCardInfo isBox paymentMethod={backupPaymentMethod}>
-                    <DropList bind:show={showDropdownBackup} placement="bottom-start" noArrow>
-                        <Button
-                            round
-                            text
-                            ariaLabel="More options"
-                            on:click={() => {
-                                showDropdownBackup = !showDropdownBackup;
-                            }}>
-                            <span class="icon-dots-horizontal" aria-hidden="true" />
-                        </Button>
-                        <svelte:fragment slot="list">
-                            {#if backupPaymentMethod.userId === $user.$id}
+        {#if $organization?.billingPlan !== BillingPlan.FREE}
+            <!-- TODO: Add a simple button if a backup payment doesn't exist. -->
+            <div class="u-flex u-flex-vertical u-gap-8">
+                <h4 class="u-bold body-text-2">Backup</h4>
+                {#if $organization?.backupPaymentMethodId}
+                    <CreditCardInfo isBox paymentMethod={backupPaymentMethod}>
+                        <DropList bind:show={showDropdownBackup} placement="bottom-start" noArrow>
+                            <Button
+                                round
+                                text
+                                ariaLabel="More options"
+                                on:click={() => {
+                                    showDropdownBackup = !showDropdownBackup;
+                                }}>
+                                <span class="icon-dots-horizontal" aria-hidden="true" />
+                            </Button>
+                            <svelte:fragment slot="list">
+                                {#if backupPaymentMethod.userId === $user.$id}
+                                    <DropListItem
+                                        icon="pencil"
+                                        on:click={() => {
+                                            showEdit = true;
+                                            isSelectedBackup = true;
+                                            showDropdownBackup = false;
+                                        }}>
+                                        Edit
+                                    </DropListItem>
+                                {/if}
                                 <DropListItem
-                                    icon="pencil"
+                                    icon="switch-horizontal"
                                     on:click={() => {
-                                        showEdit = true;
+                                        showReplace = true;
                                         isSelectedBackup = true;
                                         showDropdownBackup = false;
                                     }}>
-                                    Edit
+                                    Replace
                                 </DropListItem>
-                            {/if}
-                            <DropListItem
-                                icon="switch-horizontal"
-                                on:click={() => {
-                                    showReplace = true;
-                                    isSelectedBackup = true;
-                                    showDropdownBackup = false;
-                                }}>
-                                Replace
-                            </DropListItem>
-                            <DropListItem
-                                icon="trash"
-                                on:click={() => {
-                                    showDelete = true;
-                                    isSelectedBackup = true;
-                                    showDropdownBackup = false;
-                                }}>
-                                Delete
-                            </DropListItem>
-                        </svelte:fragment>
-                    </DropList>
-                </CreditCardInfo>
-            {:else}
-                {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
-                    (o) => !!o.last4 && o.$id !== $organization?.paymentMethodId
-                )}
-                <article class="card u-grid u-cross-center u-width-full-line dashed">
-                    <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
-                        <div class="common-section">
-                            <DropList bind:show={showDropdownBackup} placement="bottom-start">
-                                <Button
-                                    secondary
-                                    round
+                                <DropListItem
+                                    icon="trash"
                                     on:click={() => {
-                                        if (filteredPaymentMethods.length) {
-                                            showDropdownBackup = !showDropdownBackup;
-                                        } else {
-                                            isSelectedBackup = true;
-                                            showPayment = true;
-                                        }
+                                        showDelete = true;
+                                        isSelectedBackup = true;
+                                        showDropdownBackup = false;
                                     }}>
-                                    <i class="icon-plus" />
-                                </Button>
-                                <svelte:fragment slot="list">
-                                    {#if $paymentMethods.total}
-                                        {#each filteredPaymentMethods as paymentMethod}
-                                            <DropListItem
-                                                on:click={() => {
-                                                    showDropdownBackup = true;
-                                                    addBackupPaymentMethod(paymentMethod?.$id);
-                                                }}>
-                                                <span class="u-flex u-cross-center u-gap-8">
-                                                    <p class="text">
-                                                        Card ending in {paymentMethod.last4}
-                                                    </p>
-                                                    <CreditCardBrandImage
-                                                        brand={paymentMethod?.brand} />
-                                                </span>
-                                            </DropListItem>
-                                        {/each}
-                                    {/if}
-                                    <DropListItem on:click={() => (showPayment = true)}>
-                                        Add new payment method
-                                    </DropListItem>
-                                </svelte:fragment>
-                            </DropList>
-                        </div>
-                        <div class="common-section u-flex u-cross-center u-gap-4">
-                            <span class="text"> Add a backup payment method </span>
-                            <span
-                                class="icon-info"
-                                style="font-size: var(--icon-size-small)"
-                                use:tooltip={{
-                                    content:
-                                        'When your default payment method fails, a backup method will be used to pay your invoice automatically'
-                                }} />
+                                    Delete
+                                </DropListItem>
+                            </svelte:fragment>
+                        </DropList>
+                    </CreditCardInfo>
+                {:else}
+                    {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
+                        (o) => !!o.last4 && o.$id !== $organization?.paymentMethodId
+                    )}
+                    <article class="card u-grid u-cross-center u-width-full-line dashed">
+                        <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
+                            <div class="common-section">
+                                <DropList bind:show={showDropdownBackup} placement="bottom-start">
+                                    <Button
+                                        secondary
+                                        round
+                                        on:click={() => {
+                                            if (filteredPaymentMethods.length) {
+                                                showDropdownBackup = !showDropdownBackup;
+                                            } else {
+                                                isSelectedBackup = true;
+                                                showPayment = true;
+                                            }
+                                        }}>
+                                        <i class="icon-plus" />
+                                    </Button>
+                                    <svelte:fragment slot="list">
+                                        {#if $paymentMethods.total}
+                                            {#each filteredPaymentMethods as paymentMethod}
+                                                <DropListItem
+                                                    on:click={() => {
+                                                        showDropdownBackup = true;
+                                                        addBackupPaymentMethod(paymentMethod?.$id);
+                                                    }}>
+                                                    <span class="u-flex u-cross-center u-gap-8">
+                                                        <p class="text">
+                                                            Card ending in {paymentMethod.last4}
+                                                        </p>
+                                                        <CreditCardBrandImage
+                                                            brand={paymentMethod?.brand} />
+                                                    </span>
+                                                </DropListItem>
+                                            {/each}
+                                        {/if}
+                                        <DropListItem on:click={() => (showPayment = true)}>
+                                            Add new payment method
+                                        </DropListItem>
+                                    </svelte:fragment>
+                                </DropList>
+                            </div>
+                            <div class="common-section u-flex u-cross-center u-gap-4">
+                                <span class="text"> Add a backup payment method </span>
+                                <span
+                                    class="icon-info"
+                                    style="font-size: var(--icon-size-small)"
+                                    use:tooltip={{
+                                        content:
+                                            'When your default payment method fails, a backup method will be used to pay your invoice automatically'
+                                    }} />
+                            </div>
                         </div>
-                    </div>
-                </article>
-            {/if}
-        </div>
+                    </article>
+                {/if}
+            </div>
+        {/if}
     </svelte:fragment>
 </CardGrid>
 
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index c84356b753..f356741add 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
-    import { CardGrid, Collapsible, CollapsibleItem, Heading } from '$lib/components';
+    import { Card, CardGrid, Collapsible, CollapsibleItem, Heading } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
     import { plansInfo, tierToPlan, upgradeURL } from '$lib/stores/billing';
@@ -42,148 +42,157 @@
                     $organization?.billingNextInvoiceDate
                 )}
             </p>
-            <Collapsible>
-                <CollapsibleItem noContent>
-                    <span class="body-text-2">
-                        {tierToPlan($organization?.billingPlan)?.name} plan</span>
-                    <div class="body-text-2 u-margin-inline-start-auto">
-                        {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
-                            ? formatCurrency(0)
-                            : currentPlan
-                              ? formatCurrency(currentPlan?.price)
-                              : ''}
+            <Card isTile style="--p-card-padding: 1.5rem;" class="card-only-on-desktop">
+                <Collapsible>
+                    <div class="u-flex">
+                        <span class="body-text-2">
+                            {tierToPlan($organization?.billingPlan)?.name} plan</span>
+                        <div class="body-text-2 u-margin-inline-start-auto">
+                            {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
+                                ? formatCurrency(0)
+                                : currentPlan
+                                  ? formatCurrency(currentPlan?.price)
+                                  : ''}
+                        </div>
                     </div>
-                </CollapsibleItem>
-                {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0}
-                    <CollapsibleItem isInfo gap={8}>
-                        <svelte:fragment slot="beforetitle">
-                            <span class="body-text-2"><b>Add-ons</b></span><span class="inline-tag"
-                                >{extraMembers ? extraAddons + 1 : extraAddons}</span>
-                            <div class="icon">
-                                <span class="icon-cheveron-down" aria-hidden="true"></span>
-                            </div>
-                        </svelte:fragment>
-                        <svelte:fragment slot="end">
-                            <div class="body-text-2 u-margin-inline-start-auto">
-                                <b>
-                                    {formatCurrency(extraUsage >= 0 ? extraUsage : 0)}
-                                </b>
-                            </div>
-                        </svelte:fragment>
+                    {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0}
+                        <CollapsibleItem gap={8}>
+                            <svelte:fragment slot="beforetitle">
+                                <span class="body-text-2"><b>Add-ons</b></span><span
+                                    class="inline-tag"
+                                    >{extraMembers ? extraAddons + 1 : extraAddons}</span>
+                                <div class="icon">
+                                    <span class="icon-cheveron-down" aria-hidden="true"></span>
+                                </div>
+                            </svelte:fragment>
+                            <svelte:fragment slot="end">
+                                <div class="body-text-2 u-margin-inline-start-auto">
+                                    <b>
+                                        {formatCurrency(extraUsage >= 0 ? extraUsage : 0)}
+                                    </b>
+                                </div>
+                            </svelte:fragment>
 
-                        <ul>
-                            {#if extraMembers}
-                                <li class="u-flex-vertical u-gap-4 u-padding-block-8">
-                                    <div class="u-flex u-gap-4">
-                                        <h5 class="body-text-2 u-stretch">Additional members</h5>
-                                        <div>
-                                            {formatCurrency(
-                                                extraMembers *
-                                                    (currentPlan?.addons?.member?.price ?? 0)
-                                            )}
-                                        </div>
-                                    </div>
-                                    <div class="u-flex u-gap-4">
-                                        <h5 class="body-text-2 u-stretch u-color-text-offline">
-                                            {extraMembers}
-                                        </h5>
-                                    </div>
-                                </li>
-                            {/if}
-                            {#if currentInvoice?.usage}
-                                {#each currentInvoice.usage as excess, i}
-                                    <li
-                                        class="u-flex-vertical u-gap-4 {extraMembers
-                                            ? 'u-padding-block-8'
-                                            : 'u-padding-block-start-8'}"
-                                        class:u-sep-block-start={i > 0 || extraMembers}>
-                                        {#if ['storage', 'bandwidth'].includes(excess.name)}
-                                            {@const excessValue = humanFileSize(excess.value)}
-                                            <div class="u-flex u-main-space-between">
-                                                <h5 class="body-text-2 u-stretch u-capitalize">
-                                                    {excess.name}
-                                                </h5>
-                                                {formatCurrency(excess.amount)}
-                                            </div>
-                                            <h5
-                                                class="body-text-2 u-stretch u-color-text-offline"
-                                                title={formatNumberWithCommas(excess.value ?? 0) +
-                                                    'bytes'}>
-                                                {excessValue.value ?? 0}{excessValue.unit}
+                            <ul>
+                                {#if extraMembers}
+                                    <li class="u-flex-vertical u-gap-4 u-padding-block-8">
+                                        <div class="u-flex u-gap-4">
+                                            <h5 class="body-text-2 u-stretch">
+                                                Additional members
                                             </h5>
-                                        {/if}
-                                        {#if ['users', 'executions'].includes(excess.name)}
-                                            <div class="u-flex u-main-space-between">
-                                                <h5 class="body-text-2 u-stretch u-capitalize">
-                                                    {excess.name}
-                                                </h5>
-                                                {formatCurrency(excess.amount)}
+                                            <div>
+                                                {formatCurrency(
+                                                    extraMembers *
+                                                        (currentPlan?.addons?.member?.price ?? 0)
+                                                )}
                                             </div>
-                                            <h5
-                                                class="body-text-2 u-stretch u-color-text-offline"
-                                                title={formatNumberWithCommas(excess.value)}>
-                                                {abbreviateNumber(excess.value)}
+                                        </div>
+                                        <div class="u-flex u-gap-4">
+                                            <h5 class="body-text-2 u-stretch u-color-text-offline">
+                                                {extraMembers}
                                             </h5>
-                                        {/if}
+                                        </div>
                                     </li>
-                                {/each}
-                            {/if}
-                        </ul>
-                    </CollapsibleItem>
-                {/if}
+                                {/if}
+                                {#if currentInvoice?.usage}
+                                    {#each currentInvoice.usage as excess, i}
+                                        <li
+                                            class="u-flex-vertical u-gap-4 {extraMembers
+                                                ? 'u-padding-block-8'
+                                                : 'u-padding-block-start-8'}"
+                                            class:u-sep-block-start={i > 0 || extraMembers}>
+                                            {#if ['storage', 'bandwidth'].includes(excess.name)}
+                                                {@const excessValue = humanFileSize(excess.value)}
+                                                <div class="u-flex u-main-space-between">
+                                                    <h5 class="body-text-2 u-stretch u-capitalize">
+                                                        {excess.name}
+                                                    </h5>
+                                                    {formatCurrency(excess.amount)}
+                                                </div>
+                                                <h5
+                                                    class="body-text-2 u-stretch u-color-text-offline"
+                                                    title={formatNumberWithCommas(
+                                                        excess.value ?? 0
+                                                    ) + 'bytes'}>
+                                                    {excessValue.value ?? 0}{excessValue.unit}
+                                                </h5>
+                                            {/if}
+                                            {#if ['users', 'executions'].includes(excess.name)}
+                                                <div class="u-flex u-main-space-between">
+                                                    <h5 class="body-text-2 u-stretch u-capitalize">
+                                                        {excess.name}
+                                                    </h5>
+                                                    {formatCurrency(excess.amount)}
+                                                </div>
+                                                <h5
+                                                    class="body-text-2 u-stretch u-color-text-offline"
+                                                    title={formatNumberWithCommas(excess.value)}>
+                                                    {abbreviateNumber(excess.value)}
+                                                </h5>
+                                            {/if}
+                                        </li>
+                                    {/each}
+                                {/if}
+                            </ul>
+                        </CollapsibleItem>
+                    {/if}
 
-                {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
-                    <CollapsibleItem noContent gap={4}>
-                        <span class="body-text-2 u-flex u-cross-center u-gap-2"
-                            ><svg
-                                width="16"
-                                height="17"
-                                viewBox="0 0 16 17"
-                                fill="none"
-                                xmlns="http://www.w3.org/2000/svg">
-                                <path
-                                    fill-rule="evenodd"
-                                    clip-rule="evenodd"
-                                    d="M14.166 7.93434C14.4784 8.24676 14.4784 8.75329 14.166 9.06571L8.56603 14.6657C8.25361 14.9781 7.74708 14.9781 7.43466 14.6657L1.83466 9.06571C1.67842 8.90947 1.60032 8.70469 1.60034 8.49992V4.50002C1.60034 3.17454 2.67486 2.10002 4.00034 2.10002H8.00056C8.20523 2.10008 8.40987 2.17818 8.56603 2.33434L14.166 7.93434ZM4.00034 5.30002C4.44217 5.30002 4.80034 4.94185 4.80034 4.50002C4.80034 4.05819 4.44217 3.70002 4.00034 3.70002C3.55851 3.70002 3.20034 4.05819 3.20034 4.50002C3.20034 4.94185 3.55851 5.30002 4.00034 5.30002Z"
-                                    fill="#00BC5D" />
-                            </svg>
-                            Credits to be applied</span>
+                    {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
+                        <CollapsibleItem noContent gap={4}>
+                            <span class="body-text-2 u-flex u-cross-center u-gap-2"
+                                ><svg
+                                    width="16"
+                                    height="17"
+                                    viewBox="0 0 16 17"
+                                    fill="none"
+                                    xmlns="http://www.w3.org/2000/svg">
+                                    <path
+                                        fill-rule="evenodd"
+                                        clip-rule="evenodd"
+                                        d="M14.166 7.93434C14.4784 8.24676 14.4784 8.75329 14.166 9.06571L8.56603 14.6657C8.25361 14.9781 7.74708 14.9781 7.43466 14.6657L1.83466 9.06571C1.67842 8.90947 1.60032 8.70469 1.60034 8.49992V4.50002C1.60034 3.17454 2.67486 2.10002 4.00034 2.10002H8.00056C8.20523 2.10008 8.40987 2.17818 8.56603 2.33434L14.166 7.93434ZM4.00034 5.30002C4.44217 5.30002 4.80034 4.94185 4.80034 4.50002C4.80034 4.05819 4.44217 3.70002 4.00034 3.70002C3.55851 3.70002 3.20034 4.05819 3.20034 4.50002C3.20034 4.94185 3.55851 5.30002 4.00034 5.30002Z"
+                                        fill="#00BC5D" />
+                                </svg>
+                                Credits to be applied</span>
 
-                        <div
-                            class="body-text-2 u-margin-inline-start-auto"
-                            style="color: var(--web-green-500, #10B981)">
-                            -{formatCurrency(
-                                Math.min(availableCredit, currentInvoice?.amount ?? 0)
-                            )}
-                        </div>
-                    </CollapsibleItem>
-                {/if}
+                            <div
+                                class="body-text-2 u-margin-inline-start-auto"
+                                style="color: var(--web-green-500, #10B981)">
+                                -{formatCurrency(
+                                    Math.min(availableCredit, currentInvoice?.amount ?? 0)
+                                )}
+                            </div>
+                        </CollapsibleItem>
+                    {/if}
 
-                <CollapsibleItem noContent gap={4}>
-                    <span class="body-text-2">Current total (USD)</span>
-                    <span class="tooltip u-cross-center" aria-label="total info">
-                        <span
-                            class="icon-info"
-                            aria-hidden="true"
-                            use:tooltip={{
-                                content:
-                                    'Totals displayed are estimates updated every 24 hours and may not accurately reflect your invoice.'
-                            }}></span>
-                    </span>
-                    <div class="body-text-2 u-margin-inline-start-auto">
-                        {$organization?.billingPlan === BillingPlan.FREE ||
-                        $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
-                            ? formatCurrency(0)
-                            : formatCurrency(
-                                  Math.max(
-                                      (currentInvoice?.amount ?? 0) -
-                                          Math.min(availableCredit, currentInvoice?.amount ?? 0),
-                                      0
-                                  )
-                              )}
-                    </div>
-                </CollapsibleItem>
-            </Collapsible>
+                    {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
+                        <CollapsibleItem
+                            noContent
+                            gap={4}
+                            style="padding-block-end: unset;"
+                            wrapperStyle="padding-block-end: unset;">
+                            <span class="body-text-2">Current total (USD)</span>
+                            <span class="tooltip u-cross-center" aria-label="total info">
+                                <span
+                                    class="icon-info"
+                                    aria-hidden="true"
+                                    use:tooltip={{
+                                        content:
+                                            'Totals displayed are estimates updated every 24 hours and may not accurately reflect your invoice.'
+                                    }}></span>
+                            </span>
+                            <div class="body-text-2 u-margin-inline-start-auto">
+                                {formatCurrency(
+                                    Math.max(
+                                        (currentInvoice?.amount ?? 0) -
+                                            Math.min(availableCredit, currentInvoice?.amount ?? 0),
+                                        0
+                                    )
+                                )}
+                            </div>
+                        </CollapsibleItem>
+                    {/if}
+                </Collapsible>
+            </Card>
         </svelte:fragment>
         <svelte:fragment slot="actions">
             {#if $organization?.billingPlan === BillingPlan.FREE}
@@ -223,3 +232,28 @@
         </svelte:fragment>
     </CardGrid>
 {/if}
+
+<style>
+    :global(.card-only-on-desktop) {
+        background: hsl(var(--color-neutral-5));
+        border: 1px solid hsl(var(--color-neutral-10));
+        border-radius: var(--corner-radius-medium, 8px);
+    }
+
+    :global(.theme-dark .card-only-on-desktop) {
+        background: #2c2c2f;
+        border: 1px solid #424248;
+    }
+
+    @media (max-width: 768px) {
+        :global(.card-only-on-desktop) {
+            padding: unset;
+            box-shadow: unset;
+            border-radius: unset;
+
+            /* yes, these `!important`s are needed*/
+            border: unset !important;
+            background: unset !important;
+        }
+    }
+</style>

From 6a2c7184090658baed509bcf020b7961e7733c8a Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 2 Dec 2024 17:46:58 +0530
Subject: [PATCH 061/177] updates: copy, misc.

---
 src/lib/components/billing/usageRates.svelte       |  2 +-
 .../billing/availableCredit.svelte                 |  2 +-
 .../billing/budgetAlert.svelte                     | 14 ++++++++++++--
 .../billing/planSummary.svelte                     | 10 +++++++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte
index c2d5c73ae0..d8f57849dd 100644
--- a/src/lib/components/billing/usageRates.svelte
+++ b/src/lib/components/billing/usageRates.svelte
@@ -67,7 +67,7 @@
             following rates. Next billing period: {toLocaleDate(nextDate)}.
         </p>
     {/if}
-    <Table noStyles>
+    <Table noStyles noMargin>
         <TableHeader>
             <TableCellHead>Resource</TableCellHead>
             <TableCellHead>Limit</TableCellHead>
diff --git a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
index 6efbb54340..23275fe0f5 100644
--- a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
@@ -91,7 +91,7 @@
 
 <CardGrid hideFooter={$organization?.billingPlan !== BillingPlan.FREE}>
     <Heading tag="h2" size="6">
-        {$organization?.billingPlan === BillingPlan.FREE ? 'Credit' : 'Available credit'}
+        {$organization?.billingPlan === BillingPlan.FREE ? 'Credits' : 'Available credit'}
     </Heading>
 
     <p class="text">Appwrite credit will automatically be applied to your next invoice.</p>
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index 9c391398bd..116c72e47a 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -82,8 +82,13 @@
         <Heading tag="h2" size="6">Budget alerts</Heading>
 
         <p class="text">
-            Get notified by email when your organization reaches or exceeds a percent of your
-            specified budget cap. You can set a maximum of 3 alerts.
+            {#if $organization?.billingPlan === BillingPlan.FREE}
+                Get notified by email when your organization meets a percentage of your budget cap. <b
+                    >Free organizations will receive one notification at 75% resource usage.</b>
+            {:else}
+                Get notified by email when your organization meets or exceeds a percentage of your
+                specified billing alert(s).
+            {/if}
         </p>
         <svelte:fragment slot="aside">
             {#if $organization?.billingPlan === BillingPlan.FREE}
@@ -101,6 +106,11 @@
                 </Alert>
             {:else}
                 <FormList>
+                    <!-- TODO: confirm copy, design mentions only Pro plan -->
+                    <Alert type="info">
+                        You can set a maximum of 4 billing alerts per organization.
+                    </Alert>
+
                     <div class="u-flex u-gap-16">
                         <InputSelectSearch
                             label="Percentage (%) of budget cap"
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index f356741add..331e11addd 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -34,7 +34,8 @@
         <Heading tag="h2" size="6">Payment estimates</Heading>
 
         <p class="text">
-            A breakdown of your estimated upcoming payment for the current billing period.
+            A breakdown of your estimated upcoming payment for the current billing period. Totals
+            displayed exclude accumulated credits and applicable taxes.
         </p>
         <svelte:fragment slot="aside">
             <p class="text u-bold">
@@ -196,11 +197,14 @@
         </svelte:fragment>
         <svelte:fragment slot="actions">
             {#if $organization?.billingPlan === BillingPlan.FREE}
-                <div class="u-flex u-gap-16 u-flex-wrap">
-                    <Button text href={`${base}/organization-${$organization?.$id}/usage`}>
+                <!-- TODO: make center on mobile and have different styles. -->
+                <div
+                    class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line">
+                    <Button secondary href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
                     </Button>
                     <Button
+                        text
                         disabled={$organization?.markedForDeletion}
                         href={$upgradeURL}
                         on:click={() =>

From 37124f7ea7396a9f63d575ce7c111820cfe54c03 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 10 Dec 2024 01:58:16 +0100
Subject: [PATCH 062/177] fix: sdk context

---
 .../panels/createAttribute.svelte             |   4 +-
 .../commandCenter/panels/createMessage.svelte |   8 +-
 src/lib/commandCenter/panels/platforms.svelte |   2 +-
 src/lib/commandCenter/searchers/buckets.ts    |  20 +-
 .../commandCenter/searchers/collections.ts    |  10 +-
 src/lib/commandCenter/searchers/databases.ts  |   8 +-
 src/lib/commandCenter/searchers/files.ts      |  18 +-
 src/lib/commandCenter/searchers/functions.ts  |  10 +-
 src/lib/commandCenter/searchers/messages.ts   |   9 +-
 src/lib/commandCenter/searchers/projects.ts   |   2 +-
 src/lib/commandCenter/searchers/providers.ts  |  11 +-
 src/lib/commandCenter/searchers/teams.ts      |   8 +-
 src/lib/commandCenter/searchers/topics.ts     |   9 +-
 src/lib/commandCenter/searchers/users.ts      |  10 +-
 src/lib/components/backupRestoreBox.svelte    |   5 +-
 src/lib/components/bottomModalAlert.svelte    |   2 +-
 src/lib/components/filePicker.svelte          |  28 +-
 src/lib/components/permissions/row.svelte     |   9 +-
 src/lib/components/permissions/team.svelte    |   8 +-
 src/lib/components/permissions/user.svelte    |   8 +-
 src/lib/components/uploadBox.svelte           |  12 +-
 src/lib/elements/flag.svelte                  |   7 +-
 src/lib/layout/navigation.svelte              |   5 +-
 src/lib/pages/domains/delete.svelte           |   5 +-
 src/lib/pages/domains/wizard/retry.svelte     |   5 +-
 src/lib/pages/domains/wizard/step1.svelte     |  19 +-
 src/lib/stores/database.ts                    |  13 +-
 src/lib/stores/oauth-providers.ts             |  18 +-
 src/lib/stores/preferences.ts                 |  36 ++-
 src/lib/stores/sdk.ts                         |  30 +-
 .../functions/components/repositories.svelte  |  17 +-
 .../wizards/functions/connectExisting.svelte  |  43 +--
 src/lib/wizards/functions/cover.svelte        |   4 +-
 src/lib/wizards/functions/createGit.svelte    |  42 +--
 src/lib/wizards/functions/createManual.svelte |  38 +--
 .../wizards/functions/createTemplate.svelte   |  66 +++--
 .../functions/steps/createRepository.svelte   |  20 +-
 .../steps/functionConfiguration.svelte        |   9 +-
 .../functions/steps/gitConfiguration.svelte   |  10 +-
 .../(console)/(migration-wizard)/index.ts     |   3 +-
 .../(migration-wizard)/resource-form.svelte   |   8 +-
 .../(console)/(migration-wizard)/step2.svelte |   5 +-
 .../(migration-wizard)/wizard.svelte          |  16 +-
 src/routes/(console)/+layout.svelte           |  16 +-
 .../account/payments/addressModal.svelte      |   7 +-
 .../account/payments/billingAddress.svelte    |   5 +-
 .../account/payments/editAddressModal.svelte  |   7 +-
 .../(console)/account/sessions/+page.svelte   |   4 +-
 src/routes/(console)/bottomAlerts.ts          |   2 +-
 .../organization-[organization]/+page.svelte  |   6 +-
 .../billing/replaceAddress.svelte             |   7 +-
 .../createProject.svelte                      |   2 +-
 .../createProjectCloud.svelte                 |   2 +-
 .../settings/BAAModal.svelte                  |   7 +-
 .../settings/Soc2Modal.svelte                 |   7 +-
 .../usage/[[invoice]]/ProjectBreakdown.svelte |   7 +-
 .../project-[project]/auth/templates/+page.ts |   8 -
 .../messaging/providers/create.svelte         | 168 -----------
 .../provider-[provider]/updateSettings.svelte | 248 ----------------
 .../+error.svelte                             |   0
 .../+layout.svelte                            |  14 +-
 .../+layout.ts                                |   5 +-
 .../+page.ts                                  |   2 +-
 .../auth/(providers)/appleOAuth.svelte        |   0
 .../auth/(providers)/auth0OAuth.svelte        |   0
 .../auth/(providers)/authentikOAuth.svelte    |   0
 .../auth/(providers)/gitlabOAuth.svelte       |   0
 .../auth/(providers)/googleOAuth.svelte       |   0
 .../auth/(providers)/mainOAuth.svelte         |   0
 .../auth/(providers)/microsoftOAuth.svelte    |   0
 .../auth/(providers)/oidcOAuth.svelte         |   0
 .../auth/(providers)/oktaOAuth.svelte         |   0
 .../auth/+layout.svelte                       |  12 +-
 .../auth/+layout.ts                           |   0
 .../auth/+page.svelte                         |  11 +-
 .../auth/+page.ts                             |   9 +-
 .../auth/breadcrumbs.svelte                   |   0
 .../auth/createTeam.svelte                    |   5 +-
 .../auth/createUser.svelte                    |  17 +-
 .../auth/header.svelte                        |   3 +-
 .../auth/security/+page.svelte                |   0
 .../auth/security/mock-numbers-dark.png       | Bin
 .../auth/security/mock-numbers-light.png      | Bin
 .../security/updateMembershipPrivacy.svelte   |   0
 .../auth/security/updateMockNumbers.svelte    |   0
 .../security/updatePasswordDictionary.svelte  |   0
 .../security/updatePasswordHistory.svelte     |   0
 .../security/updatePersonalDataCheck.svelte   |   0
 .../auth/security/updateSessionAlerts.svelte  |   0
 .../auth/security/updateSessionLength.svelte  |   0
 .../auth/security/updateSessionsLimit.svelte  |   0
 .../auth/security/updateUsersLimit.svelte     |   0
 .../auth/settings/+page.svelte                |   0
 .../auth/store.ts                             |   0
 .../auth/teams/+page.svelte                   |  10 +-
 .../auth/teams/+page.ts                       |   9 +-
 .../auth/teams/team-[team]/+layout.svelte     |   0
 .../auth/teams/team-[team]/+layout.ts         |   2 +-
 .../auth/teams/team-[team]/+page.svelte       |   0
 .../teams/team-[team]/activity/+page.svelte   |   0
 .../auth/teams/team-[team]}/activity/+page.ts |   7 +-
 .../auth/teams/team-[team]/breadcrumbs.svelte |   2 +-
 .../teams/team-[team]/createMembership.svelte |  20 +-
 .../auth/teams/team-[team]/dangerZone.svelte  |   0
 .../teams/team-[team]/deleteMembership.svelte |   9 +-
 .../auth/teams/team-[team]/deleteTeam.svelte  |   4 +-
 .../auth/teams/team-[team]/header.svelte      |   7 +-
 .../teams/team-[team]/members/+page.svelte    |   2 +-
 .../auth/teams/team-[team]/members/+page.ts   |  12 +-
 .../auth/teams/team-[team]/store.ts           |   0
 .../auth/teams/team-[team]/updateName.svelte  |   4 +-
 .../auth/teams/team-[team]/updatePrefs.svelte |   5 +-
 .../auth/templates/+page.svelte               |   0
 .../auth/templates}/+page.ts                  |   3 +-
 .../auth/templates/email-footer-dark.png      | Bin
 .../auth/templates/email-footer-light.png     | Bin
 .../templates/email-footer-mobile-dark.png    | Bin
 .../templates/email-footer-mobile-light.png   | Bin
 .../auth/templates/email2FATemplate.svelte    |   0
 .../auth/templates/emailInviteTemplate.svelte |   0
 .../templates/emailMagicUrlTemplate.svelte    |   0
 .../templates/emailRecoveryTemplate.svelte    |   0
 .../emailSessionAlertTemplate.svelte          |   0
 .../auth/templates/emailSignature.svelte      |   0
 .../auth/templates/emailTemplate.svelte       |   0
 .../emailVerificationTemplate.svelte          |   0
 .../auth/templates/localeOptions.svelte       |   0
 .../auth/templates/resetEmail.svelte          |   0
 .../auth/templates/resetSms.svelte            |   0
 .../templates/smsInvitationTemplate.svelte    |   0
 .../auth/templates/smsLoginTemplate.svelte    |   0
 .../auth/templates/smsTemplate.svelte         |   0
 .../templates/smsVerificationTemplate.svelte  |   0
 .../auth/templates/store.ts                   |   0
 .../auth/updateOAuth.ts                       |   0
 .../auth/usage/[[period]]/+page.svelte        |   2 +-
 .../auth/usage/[[period]]/+page.ts            |   2 +-
 .../auth/user-[user]/+layout.svelte           |   0
 .../auth/user-[user]/+layout.ts               |   4 +-
 .../auth/user-[user]/+page.svelte             |   0
 .../auth/user-[user]/activity/+page.svelte    |   0
 .../auth/user-[user]}/activity/+page.ts       |   8 +-
 .../auth/user-[user]/breadcrumbs.svelte       |   0
 .../auth/user-[user]/dangerZone.svelte        |   0
 .../auth/user-[user]/deleteAllSessions.svelte |   4 +-
 .../auth/user-[user]/deleteMembership.svelte  |   9 +-
 .../auth/user-[user]/deleteMfa.svelte         |   5 +-
 .../auth/user-[user]/deleteSession.svelte     |   4 +-
 .../auth/user-[user]/deleteUser.svelte        |   4 +-
 .../auth/user-[user]/header.svelte            |   6 +-
 .../auth/user-[user]/identities/+page.svelte  |   0
 .../auth/user-[user]/identities}/+page.ts     |  34 ++-
 .../auth/user-[user]/identities/table.svelte  |   5 +-
 .../auth/user-[user]/memberships/+page.svelte |   2 +-
 .../auth/user-[user]/memberships/+page.ts     |  10 +
 .../auth/user-[user]/sessions/+page.svelte    |   5 +-
 .../auth/user-[user]/sessions/+page.ts        |   4 +-
 .../auth/user-[user]/store.ts                 |   0
 .../auth/user-[user]/targets/+page.svelte     |   0
 .../auth/user-[user]/targets/+page.ts         |  20 +-
 .../auth/user-[user]/targets/create.svelte    |  18 +-
 .../auth/user-[user]/targets/store.ts         |   0
 .../auth/user-[user]/targets/table.svelte     |   8 +-
 .../auth/user-[user]/updateEmail.svelte       |   6 +-
 .../auth/user-[user]/updateLabels.svelte      |   5 +-
 .../auth/user-[user]/updateMfa.svelte         |   5 +-
 .../auth/user-[user]/updateName.svelte        |   5 +-
 .../auth/user-[user]/updatePassword.svelte    |   5 +-
 .../auth/user-[user]/updatePhone.svelte       |   5 +-
 .../auth/user-[user]/updatePrefs.svelte       |   5 +-
 .../auth/user-[user]/updateStatus.svelte      |  13 +-
 .../createVariable.svelte                     |   2 +-
 .../databases/+layout.svelte                  |   2 +-
 .../databases/+layout.ts                      |   0
 .../databases/+page.svelte                    |   4 +-
 .../databases/+page.ts                        |  36 +--
 .../databases/breadcrumbs.svelte              |   0
 .../databases/create.svelte                   |  23 +-
 .../database-[database]/+layout.svelte        |  30 +-
 .../databases/database-[database]/+layout.ts  |   4 +-
 .../database-[database]/+page.svelte          |   0
 .../databases/database-[database]/+page.ts    |  12 +-
 .../database-[database]/[[page]]/store.ts     |   0
 .../database-[database]/backups/+page.svelte  |  23 +-
 .../database-[database]/backups/+page.ts      |  28 +-
 .../backups/containerHeader.svelte            |   0
 .../backups/createPolicy.svelte               |   0
 .../database-[database]/backups/locked.svelte |   0
 .../database-[database]/backups/policy.svelte |   8 +-
 .../backups/restoreModal.svelte               |   0
 .../database-[database]/backups/store.ts      |   0
 .../database-[database]/backups/table.svelte  |  19 +-
 .../backups/upgradeCard.svelte                |   0
 .../database-[database]/breadcrumbs.svelte    |   0
 .../collection-[collection]/+layout.svelte    |   8 +-
 .../collection-[collection]/+layout.ts        |  11 +-
 .../collection-[collection]/+page.svelte      |   0
 .../collection-[collection]/+page.ts          |  10 +-
 .../activity/+page.svelte                     |   0
 .../collection-[collection]/activity/+page.ts |  11 +-
 .../attributes/+page.svelte                   |   2 +-
 .../attributes/arrow-one.svg                  |   0
 .../attributes/arrow-two.svg                  |   0
 .../attributes/boolean.svelte                 |  40 +--
 .../attributes/createAttributeDropdown.svelte |   0
 .../attributes/datetime.svelte                |  40 +--
 .../attributes/deleteAttribute.svelte         |  10 +-
 .../attributes/edit.svelte                    |   2 +-
 .../attributes/email.svelte                   |  44 +--
 .../attributes/enum.svelte                    |  47 +--
 .../attributes/float.svelte                   |  50 ++--
 .../attributes/integer.svelte                 |  51 ++--
 .../attributes/ip.svelte                      |  42 +--
 .../attributes/relationship.svelte            |  58 ++--
 .../attributes/store.ts                       |   0
 .../attributes/string.svelte                  |  44 +--
 .../attributes/url.svelte                     |  45 +--
 .../breadcrumbs.svelte                        |   0
 .../createAttribute.svelte                    |   2 +-
 .../createDocument.svelte                     |  16 +-
 .../document-[document]/+layout.svelte        |   0
 .../document-[document]/+layout.ts            |   8 +-
 .../document-[document]/+page.svelte          |  17 +-
 .../document-[document]/activity/+page.svelte |   0
 .../document-[document]/activity/+page.ts     |  12 +-
 .../document-[document]/attribute.svelte      |   0
 .../document-[document]/attributeForm.svelte  |   0
 .../document-[document]/attributeItem.svelte  |   0
 .../attributes/boolean.svelte                 |   0
 .../attributes/datetime.svelte                |   0
 .../attributes/email.svelte                   |   0
 .../attributes/enum.svelte                    |   0
 .../attributes/integer.svelte                 |   0
 .../attributes/relationship.svelte            |  18 +-
 .../document-[document]/attributes/store.ts   |   0
 .../attributes/string.svelte                  |   0
 .../document-[document]/attributes/url.svelte |   0
 .../document-[document]/breadcrumbs.svelte    |   0
 .../document-[document]/data/+page.svelte     |  16 +-
 .../document-[document]/delete.svelte         |  14 +-
 .../document-[document]/document.svelte       |  16 +-
 .../document-[document]/header.svelte         |   4 +-
 .../document-[document]/store.ts              |   0
 .../failedModal.svelte                        |   0
 .../collection-[collection]/header.svelte     |   5 +-
 .../indexes/+page.svelte                      |   0
 .../indexes/createIndex.svelte                |   4 +-
 .../indexes/deleteIndex.svelte                |   8 +-
 .../indexes/overviewIndex.svelte              |   0
 .../indexes/select.svelte                     |   0
 .../relationshipsModal.svelte                 |   2 +-
 .../settings/+page.svelte                     |   0
 .../settings/dangerZone.svelte                |   0
 .../settings/deleteCollection.svelte          |   6 +-
 .../settings/displayName.svelte               |   0
 .../settings/updateName.svelte                |  18 +-
 .../settings/updatePermissions.svelte         |  18 +-
 .../settings/updateSecurity.svelte            |  18 +-
 .../settings/updateStatus.svelte              |  18 +-
 .../collection-[collection]/store.ts          |   0
 .../subNavigation.svelte                      |   4 +-
 .../collection-[collection]/table.svelte      |   8 +-
 .../usage/[[period]]/+page.svelte             |   2 +-
 .../usage/[[period]]/+page.ts                 |   4 +-
 .../wizard/step1.svelte                       |   0
 .../wizard/step2.svelte                       |   0
 .../collection-[collection]/wizard/store.ts   |   0
 .../createCollection.svelte                   |   8 +-
 .../database-[database]/delete.svelte         |  10 +-
 .../databases/database-[database]/grid.svelte |   2 +-
 .../database-[database]/header.svelte         |   4 +-
 .../database-[database]/settings/+page.svelte |  10 +-
 .../databases/database-[database]/store.ts    |   0
 .../database-[database]/string.svelte         |  44 +--
 .../database-[database]/table.svelte          |   6 +-
 .../usage/[[period]]/+page.svelte             |   2 +-
 .../usage/[[period]]/+page.ts                 |   4 +-
 .../databases/grid.svelte                     |   3 +-
 .../databases/header.svelte                   |   2 +-
 .../databases/store.ts                        |   0
 .../databases/table.svelte                    |   3 +-
 .../databases/usage/[[period]]/+page.svelte   |   2 +-
 .../databases/usage/[[period]]/+page.ts       |   2 +-
 .../functions/+layout.svelte                  |   0
 .../functions/+layout.ts                      |  10 +-
 .../functions/+page.svelte                    |   3 +-
 .../functions/+page.ts                        |   8 +-
 .../functions/breadcrumbs.svelte              |   0
 .../functions/createFunction.svelte           |  34 ++-
 .../function-[function]/+layout.svelte        |  30 +-
 .../functions/function-[function]/+layout.ts  |  14 +-
 .../function-[function]/+page.svelte          |   4 +-
 .../functions/function-[function]/+page.ts    |  21 +-
 .../function-[function]/activate.svelte       |   8 +-
 .../function-[function]/breadcrumbs.svelte    |   0
 .../function-[function]/cancel.svelte         |  11 +-
 .../function-[function]/create.svelte         |   0
 .../function-[function]/createCli.svelte      |   0
 .../function-[function]/createGit.svelte      |   2 +-
 .../function-[function]/createManual.svelte   |  16 +-
 .../function-[function]/delete.svelte         |   8 +-
 .../deployment-[deployment]/+layout.ts        |   0
 .../deployment-[deployment]/+page.svelte      |   6 +-
 .../deployment-[deployment]/+page.ts          |   7 +-
 .../breadcrumbs.svelte                        |   0
 .../deployment-[deployment]/header.svelte     |   3 +-
 .../deployment-[deployment]/store.ts          |   0
 .../function-[function]/deploymentCard.svelte |   0
 .../deploymentCreatedBy.svelte                |   0
 .../deploymentDomains.svelte                  |   0
 .../deploymentSource.svelte                   |   0
 .../function-[function]/domains/+page.svelte  |   0
 .../function-[function]/domains/+page.ts      |  10 +-
 .../executions/+page.svelte                   |   8 +-
 .../function-[function]/executions/+page.ts   |  14 +-
 .../executions/delete.svelte                  |   7 +-
 .../executions/execute-function/+page.svelte  |  24 +-
 .../executions/execute-function/+page.ts      |   7 +-
 .../executions/quickFilters.svelte            |   0
 .../executions/table.svelte                   |   0
 .../function-[function]/header.svelte         |   4 +-
 .../function-[function]/quickFilters.svelte   |   0
 .../function-[function]/redeployModal.svelte  |  13 +-
 .../function-[function]/settings/+page.svelte |  13 +-
 .../function-[function]/settings/+page.ts     |   4 +-
 .../settings/dangerZone.svelte                |   0
 .../settings/deleteModal.svelte               |   6 +-
 .../settings/disconnectRepo.svelte            |  40 +--
 .../settings/executeFunction.svelte           |   4 +-
 .../settings/gitConfigurationModal.svelte     |  57 ++--
 .../settings/updateConfiguration.svelte       |  53 ++--
 .../settings/updateEvents.svelte              |  40 +--
 .../settings/updateLogging.svelte             |  44 +--
 .../settings/updateName.svelte                |  40 +--
 .../settings/updatePermissions.svelte         |  40 +--
 .../settings/updateRuntime.svelte             |  40 +--
 .../settings/updateSchedule.svelte            |  40 +--
 .../settings/updateScopes.svelte              |  42 +--
 .../settings/updateTimeout.svelte             |  40 +--
 .../functions/function-[function]/store.ts    |   0
 .../function-[function]/table.svelte          |   8 +-
 .../usage/[[period]]/+page.svelte             |   0
 .../usage/[[period]]/+page.ts                 |   4 +-
 .../functions/header.svelte                   |   2 +-
 .../functions/store.ts                        |   0
 .../functions/templates/+page.svelte          |   2 +-
 .../functions/templates/+page.ts              |   2 +-
 .../templates/template-[template]/+layout.ts  |   0
 .../template-[template]/+page.svelte          |   0
 .../templates/template-[template]/+page.ts    |   6 +-
 .../template-[template]/header.svelte         |   3 +-
 .../templates/template-[template]/store.ts    |   0
 .../functions/wizard/step1.svelte             |   0
 .../functions/wizard/step2.svelte             |   0
 .../functions/wizard/step3.svelte             |   0
 .../functions/wizard/step4.svelte             |   0
 .../functions/wizard/step5.svelte             |   0
 .../functions/wizard/store.ts                 |   0
 .../messaging/+layout.svelte                  |   4 +-
 .../messaging/+layout.ts                      |   0
 .../messaging/+page.svelte                    |  10 +-
 .../messaging/+page.ts                        |  20 +-
 .../messaging/actions.svelte                  |   0
 .../messaging/breadcrumbs.svelte              |   4 +-
 .../messaging/bubble-tail-dark.svg            |   0
 .../messaging/bubble-tail-light.svg           |   0
 .../messaging/create.svelte                   |  93 +++---
 .../messaging/createMessageDropdown.svelte    |   0
 .../messaging/failedModal.svelte              |   0
 .../messaging/header.svelte                   |   2 +-
 .../message-[message]/+layout.svelte          |   0
 .../messaging/message-[message]/+layout.ts    |  22 +-
 .../messaging/message-[message]/+page.svelte  |   0
 .../message-[message]/breadcrumbs.svelte      |   4 +-
 .../message-[message]/cancelModal.svelte      |  75 ++---
 .../messaging/message-[message]/delete.svelte |   0
 .../message-[message]/deleteModal.svelte      |   6 +-
 .../message-[message]/emailMessage.svelte     |  23 +-
 .../messaging/message-[message]/header.svelte |   2 +-
 .../message-[message]/overview.svelte         |   0
 .../message-[message]/pushMessage.svelte      |  32 ++-
 .../message-[message]/scheduleModal.svelte    |  87 +++---
 .../message-[message]/sendModal.svelte        |  75 ++---
 .../message-[message]/smsMessage.svelte       |  11 +-
 .../messaging/message-[message]/store.ts      |   0
 .../message-[message]/updateTargets.svelte    |  28 +-
 .../message-[message]/updateTopics.svelte     |  13 +-
 .../messaging/messageStatusPill.svelte        |   0
 .../messaging/provider.svelte                 |   0
 .../messaging/providerType.svelte             |   0
 .../messaging/providers/+page.svelte          |   4 +-
 .../messaging/providers/+page.ts              |  20 +-
 .../messaging/providers/create.svelte         | 189 ++++++++++++
 .../providers/createProviderDropdown.svelte   |   0
 .../messaging/providers/popoverContent.svelte |   0
 .../provider-[provider]/+layout.svelte        |   0
 .../providers/provider-[provider]/+layout.ts  |   4 +-
 .../provider-[provider]/+page.svelte          |   0
 .../provider-[provider]/breadcrumbs.svelte    |   8 +-
 .../provider-[provider]/dangerZone.svelte     |   2 +-
 .../provider-[provider]/deleteProvider.svelte |   8 +-
 .../provider-[provider]/header.svelte         |   3 +-
 .../providers/provider-[provider]/store.ts    |   0
 .../provider-[provider]/updateName.svelte     |  71 ++---
 .../provider-[provider]/updateSettings.svelte | 269 ++++++++++++++++++
 .../provider-[provider]/updateStatus.svelte   | 117 ++++----
 .../providers/settingsFormInput.svelte        |   0
 .../providers/settingsFormList.svelte         |   0
 .../messaging/providers/store.ts              |   0
 .../messaging/providers/table.svelte          |   9 +-
 .../providers/wizard/provider.svelte          |   0
 .../providers/wizard/settings.svelte          |   2 +-
 .../messaging/providers/wizard/store.ts       |   0
 .../push-notification-preview-dark.svg        |   0
 .../push-notification-preview-light.svg       |   0
 .../messaging/pushPhone.svelte                |   0
 .../messaging/sms-preview-dark.svg            |   0
 .../messaging/sms-preview-light.svg           |   0
 .../messaging/smsPhone.svelte                 |   0
 .../messaging/store.ts                        |   0
 .../messaging/topics/+page.svelte             |   8 +-
 .../messaging/topics/+page.ts                 |  20 +-
 .../messaging/topics/create.svelte            |   5 +-
 .../messaging/topics/store.ts                 |   0
 .../messaging/topics/table.svelte             |   6 +-
 .../topics/topic-[topic]/+layout.svelte       |  12 +-
 .../messaging/topics/topic-[topic]/+layout.ts |   2 +-
 .../topics/topic-[topic]/+page.svelte         |  10 +-
 .../messaging/topics/topic-[topic]}/+page.ts  |  38 +--
 .../topic-[topic]/activity/+page.svelte       |   0
 .../topics/topic-[topic]}/activity/+page.ts   |   8 +-
 .../topics/topic-[topic]/breadcrumbs.svelte   |   8 +-
 .../topics/topic-[topic]/deleteTopic.svelte   |   8 +-
 .../topics/topic-[topic]/header.svelte        |   4 +-
 .../topic-[topic]/settings/+page.svelte       |   0
 .../topic-[topic]/settings/dangerZone.svelte  |   0
 .../topic-[topic]/settings/details.svelte     |   0
 .../topic-[topic]/settings/updateName.svelte  |   7 +-
 .../settings/updatePermissions.svelte         |   4 +-
 .../messaging/topics/topic-[topic]/store.ts   |   0
 .../topics/topic-[topic]/table.svelte         |   8 +-
 .../messaging/topicsModal.svelte              |   5 +-
 .../messaging/userTargetsModal.svelte         |   5 +-
 .../messaging/wizard/emailFormList.svelte     |   3 +-
 .../messaging/wizard/pushFormList.svelte      |   3 +-
 .../messaging/wizard/smsFormList.svelte       |   3 +-
 .../messaging/wizard/step1.svelte             |   0
 .../messaging/wizard/step2.svelte             |   0
 .../messaging/wizard/step3.svelte             |   0
 .../messaging/wizard/store.ts                 |   0
 .../overview/+layout.svelte                   |  10 +-
 .../overview/+layout.ts                       |   0
 .../overview/+page.ts                         |   4 +-
 .../overview/bandwidth.svelte                 |   0
 .../overview/breadcrumbs.svelte               |   0
 .../overview/header.svelte                    |   0
 .../overview/intro-dark.png                   | Bin
 .../overview/intro-light.png                  | Bin
 .../overview/keys/+page.svelte                |   0
 .../overview/keys/+page.ts                    |   0
 .../overview/keys/[key]/+page.ts              |   0
 .../+page@project-[region]-[project].svelte}  |   0
 .../overview/keys/[key]/breadcrumbs.svelte    |   0
 .../overview/keys/[key]/delete.svelte         |   2 +-
 .../overview/keys/[key]/header.svelte         |   2 +-
 .../overview/keys/[key]/store.ts              |   0
 .../keys/[key]/updateExpirationDate.svelte    |   0
 .../overview/keys/checkbox.svelte             |   0
 .../overview/keys/expirationInput.svelte      |   0
 .../overview/keys/scopes.svelte               |   0
 .../overview/keys/wizard.svelte               |   4 +-
 .../overview/keys/wizard/step1.svelte         |   0
 .../overview/keys/wizard/step2.svelte         |   0
 .../overview/keys/wizard/store.ts             |   0
 .../overview/onboard-1-dark-desktop.svg       |   0
 .../overview/onboard-1-dark-mobile.svg        |   0
 .../overview/onboard-1-light-desktop.svg      |   0
 .../overview/onboard-1-light-mobile.svg       |   0
 .../overview/onboard-2-dark-desktop.svg       |   0
 .../overview/onboard-2-dark-mobile.svg        |   0
 .../overview/onboard-2-light-desktop.svg      |   0
 .../overview/onboard-2-light-mobile.svg       |   0
 .../overview/onboard.svelte                   |   3 +-
 .../overview/platforms/+page.svelte           |   2 +-
 .../overview/platforms/+page.ts               |   0
 .../overview/platforms/[platform]/+page.ts    |   0
 .../+page@project-[region]-[project].svelte}  |   0
 .../platforms/[platform]/android.svelte       |   0
 .../platforms/[platform]/appleIOS.svelte      |   0
 .../platforms/[platform]/appleMacOS.svelte    |   0
 .../platforms/[platform]/appleTvOS.svelte     |   0
 .../platforms/[platform]/appleWatchOS.svelte  |   0
 .../platforms/[platform]/breadcrumbs.svelte   |   6 +-
 .../platforms/[platform]/delete.svelte        |   2 +-
 .../[platform]/flutterAndroid.svelte          |   0
 .../platforms/[platform]/flutterIOS.svelte    |   0
 .../platforms/[platform]/flutterLinux.svelte  |   0
 .../platforms/[platform]/flutterMacOS.svelte  |   0
 .../[platform]/flutterWindows.svelte          |   0
 .../platforms/[platform]/header.svelte        |   2 +-
 .../overview/platforms/[platform]/store.ts    |   0
 .../overview/platforms/[platform]/web.svelte  |   0
 .../overview/platforms/createAndroid.svelte   |   0
 .../overview/platforms/createApple.svelte     |   0
 .../overview/platforms/createFlutter.svelte   |   0
 .../platforms/createReactNative.svelte        |   0
 .../overview/platforms/createWeb.svelte       |   0
 .../platforms/wizard/android/step1.svelte     |   0
 .../platforms/wizard/android/step2.svelte     |   0
 .../platforms/wizard/android/step3.svelte     |   4 +-
 .../platforms/wizard/apple/step1.svelte       |   0
 .../platforms/wizard/apple/step2.svelte       |   0
 .../platforms/wizard/apple/step3.svelte       |   4 +-
 .../platforms/wizard/flutter/step1.svelte     |   0
 .../platforms/wizard/flutter/step2.svelte     |   0
 .../platforms/wizard/flutter/step3.svelte     |   4 +-
 .../wizard/react-native/step1.svelte          |   0
 .../wizard/react-native/step2.svelte          |   0
 .../wizard/react-native/step3.svelte          |   4 +-
 .../overview/platforms/wizard/step4.svelte    |   0
 .../overview/platforms/wizard/store.ts        |   0
 .../platforms/wizard/web/step1.svelte         |   0
 .../platforms/wizard/web/step2.svelte         |   0
 .../platforms/wizard/web/step3.svelte         |   4 +-
 .../overview/realtime.svelte                  |   0
 .../overview/requests.svelte                  |   0
 .../overview/store.ts                         |   8 +-
 .../promoteVariableModal.svelte               |   0
 .../rawVariableEditor.svelte                  |   0
 .../settings/+layout.svelte                   |   0
 .../settings/+layout.ts                       |   0
 .../settings/+page.svelte                     |  15 +-
 .../settings/+page.ts                         |   8 +-
 .../settings/GitDisconnectModal.svelte        |  15 +-
 .../settings/GitInstallationModal.svelte      |   4 +-
 .../settings/breadcrumbs.svelte               |   0
 .../settings/deleteProject.svelte             |   0
 .../settings/disableAllServices.svelte        |   0
 .../settings/domains/+page.svelte             |   0
 .../settings/domains/+page.ts                 |   8 +-
 .../settings/enableAllServices.svelte         |   0
 .../settings/header.svelte                    |   2 +-
 .../settings/migrations/(import)/index.ts     |   0
 .../settings/migrations/(import)/step1.svelte |   0
 .../settings/migrations/(import)/step2.svelte |   0
 .../migrations/(import)/wizard.svelte         |  62 ++--
 .../settings/migrations/+page.svelte          |   0
 .../settings/migrations/+page.ts              |   4 +-
 .../settings/migrations/details.svelte        |   0
 .../settings/migrations/exportModal.svelte    |   0
 .../settings/migrations/stores.ts             |   0
 .../settings/smtp/+page.svelte                |   2 +-
 .../settings/transferProject.svelte           |   0
 .../settings/updateInstallations.svelte       |   4 +-
 .../settings/updateName.svelte                |   2 +-
 .../settings/updateServices.svelte            |   0
 .../settings/usage/[[invoice]]/+page.svelte   |   0
 .../settings/usage/[[invoice]]/+page.ts       |   9 +-
 .../settings/webhooks/+page.svelte            |   2 +-
 .../settings/webhooks/+page.ts                |   0
 .../webhooks/[webhook]/+layout.svelte         |   0
 .../settings/webhooks/[webhook]/+layout.ts    |   0
 .../settings/webhooks/[webhook]/+page.svelte  |   0
 .../webhooks/[webhook]/breadcrumbs.svelte     |   0
 .../webhooks/[webhook]/dangerZone.svelte      |   0
 .../settings/webhooks/[webhook]/delete.svelte |   2 +-
 .../webhooks/[webhook]/details.svelte         |   0
 .../settings/webhooks/[webhook]/header.svelte |   2 +-
 .../webhooks/[webhook]/regenerate.svelte      |   0
 .../settings/webhooks/[webhook]/store.ts      |   0
 .../webhooks/[webhook]/updateEvents.svelte    |   0
 .../webhooks/[webhook]/updateName.svelte      |   0
 .../webhooks/[webhook]/updateSecurity.svelte  |   0
 .../webhooks/[webhook]/updateSignature.svelte |   0
 .../webhooks/[webhook]/updateURL.svelte       |   0
 .../settings/webhooks/createWebhook.svelte    |   0
 .../settings/webhooks/failedModal.svelte      |   3 +-
 .../webhooks/messageStatusPill.svelte         |   0
 .../settings/webhooks/store.ts                |   0
 .../settings/webhooks/wizard/step1.svelte     |   0
 .../settings/webhooks/wizard/step2.svelte     |   0
 .../settings/webhooks/wizard/step3.svelte     |   0
 .../settings/webhooks/wizard/store.ts         |   0
 .../storage/+layout.svelte                    |   4 +-
 .../storage/+layout.ts                        |   0
 .../storage/+page.svelte                      |   7 +-
 .../storage/+page.ts                          |  10 +-
 .../storage/breadcrumbs.svelte                |   4 +-
 .../storage/bucket-[bucket]/+layout.svelte    |  22 +-
 .../storage/bucket-[bucket]/+layout.ts        |   4 +-
 .../storage/bucket-[bucket]/+page.svelte      |  15 +-
 .../storage/bucket-[bucket]/+page.ts          |  12 +-
 .../bucket-[bucket]/breadcrumbs.svelte        |   0
 .../bucket-[bucket]/create-file/create.svelte |   0
 .../bucket-[bucket]/create-file/step1.svelte  |   0
 .../bucket-[bucket]/create-file/step2.svelte  |   0
 .../bucket-[bucket]/create-file/store.ts      |   0
 .../bucket-[bucket]/deleteBucket.svelte       |   6 +-
 .../storage/bucket-[bucket]/deleteFile.svelte |   7 +-
 .../file-[file]/+layout.svelte                |   0
 .../bucket-[bucket]/file-[file]/+layout.ts    |   4 +-
 .../bucket-[bucket]/file-[file]/+page.svelte  |  27 +-
 .../file-[file]/breadcrumbs.svelte            |   0
 .../file-[file]/deleteFile.svelte             |   8 +-
 .../bucket-[bucket]/file-[file]/header.svelte |   3 +-
 .../bucket-[bucket]/file-[file]/store.ts      |   0
 .../storage/bucket-[bucket]/header.svelte     |   4 +-
 .../bucket-[bucket]/settings/+page.svelte     |  30 +-
 .../storage/bucket-[bucket]/settings/+page.ts |   0
 .../settings/updateMaxFileSize.svelte         |   0
 .../storage/bucket-[bucket]/store.ts          |   0
 .../usage/[[period]]/+page.svelte             |   2 +-
 .../bucket-[bucket]/usage/[[period]]/+page.ts |   7 +-
 .../storage/create.svelte                     |   5 +-
 .../storage/header.svelte                     |   2 +-
 .../storage/usage/[[period]]/+page.svelte     |   2 +-
 .../storage/usage/[[period]]/+page.ts         |   2 +-
 .../store.ts                                  |   0
 .../updateVariables.svelte                    |  28 +-
 .../uploadVariablesModal.svelte               |   0
 src/routes/+layout.ts                         |   5 +-
 621 files changed, 2894 insertions(+), 2267 deletions(-)
 delete mode 100644 src/routes/(console)/project-[project]/auth/templates/+page.ts
 delete mode 100644 src/routes/(console)/project-[project]/messaging/providers/create.svelte
 delete mode 100644 src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/+error.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/+layout.svelte (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/+layout.ts (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/+page.ts (68%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/appleOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/auth0OAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/authentikOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/gitlabOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/googleOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/mainOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/microsoftOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/oidcOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/(providers)/oktaOAuth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/+layout.svelte (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/+page.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/+page.ts (72%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/createTeam.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/createUser.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/header.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/mock-numbers-dark.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/mock-numbers-light.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updateMembershipPrivacy.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updateMockNumbers.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updatePasswordDictionary.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updatePasswordHistory.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updatePersonalDataCheck.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updateSessionAlerts.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updateSessionLength.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updateSessionsLimit.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/security/updateUsersLimit.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/settings/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/+page.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/+page.ts (67%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/+layout.ts (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/activity/+page.svelte (100%)
 rename src/routes/(console)/{project-[project]/messaging/topics/topic-[topic] => project-[region]-[project]/auth/teams/team-[team]}/activity/+page.ts (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/breadcrumbs.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/createMembership.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/dangerZone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/deleteMembership.svelte (83%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/deleteTeam.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/header.svelte (83%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/members/+page.svelte (97%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/members/+page.ts (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/updateName.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/teams/team-[team]/updatePrefs.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/+page.svelte (100%)
 rename src/routes/(console)/{project-[project]/auth/user-[user]/memberships => project-[region]-[project]/auth/templates}/+page.ts (55%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/email-footer-dark.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/email-footer-light.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/email-footer-mobile-dark.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/email-footer-mobile-light.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/email2FATemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailInviteTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailMagicUrlTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailRecoveryTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailSessionAlertTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailSignature.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/emailVerificationTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/localeOptions.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/resetEmail.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/resetSms.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/smsInvitationTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/smsLoginTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/smsTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/smsVerificationTemplate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/templates/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/updateOAuth.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/usage/[[period]]/+page.svelte (83%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/usage/[[period]]/+page.ts (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/+layout.ts (78%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/activity/+page.svelte (100%)
 rename src/routes/(console)/{project-[project]/auth/teams/team-[team] => project-[region]-[project]/auth/user-[user]}/activity/+page.ts (74%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/dangerZone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/deleteAllSessions.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/deleteMembership.svelte (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/deleteMfa.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/deleteSession.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/deleteUser.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/header.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/identities/+page.svelte (100%)
 rename src/routes/(console)/{project-[project]/messaging/topics/topic-[topic] => project-[region]-[project]/auth/user-[user]/identities}/+page.ts (73%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/identities/table.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/memberships/+page.svelte (96%)
 create mode 100644 src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/sessions/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/sessions/+page.ts (66%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/targets/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/targets/+page.ts (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/targets/create.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/targets/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/targets/table.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updateEmail.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updateLabels.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updateMfa.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updateName.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updatePassword.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updatePhone.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updatePrefs.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/auth/user-[user]/updateStatus.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/createVariable.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/+layout.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/+page.ts (68%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/create.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/+layout.svelte (77%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/+layout.ts (79%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/+page.ts (72%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/[[page]]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/+page.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/+page.ts (74%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/containerHeader.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/createPolicy.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/locked.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/policy.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/restoreModal.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/table.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/backups/upgradeCard.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/+layout.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/+layout.ts (70%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/+page.ts (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/activity/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/activity/+page.ts (66%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/+page.svelte (99%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/boolean.svelte (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/datetime.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/edit.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/email.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/enum.svelte (73%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/float.svelte (74%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/integer.svelte (73%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/ip.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/relationship.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/string.svelte (74%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/attributes/url.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/createAttribute.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/createDocument.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts (65%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/document.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/header.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/document-[document]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/failedModal.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/header.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/indexes/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/indexes/select.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/relationshipsModal.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/displayName.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/updateName.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte (83%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/subNavigation.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/table.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte (72%)
 rename src/routes/(console)/{project-[project]/databases/database-[database] => project-[region]-[project]/databases/database-[database]/collection-[collection]}/usage/[[period]]/+page.ts (72%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/wizard/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/wizard/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/collection-[collection]/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/createCollection.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/delete.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/grid.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/header.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/settings/+page.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/string.svelte (74%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/table.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/database-[database]/usage/[[period]]/+page.svelte (78%)
 rename src/routes/(console)/{project-[project]/databases/database-[database]/collection-[collection] => project-[region]-[project]/databases/database-[database]}/usage/[[period]]/+page.ts (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/grid.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/header.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/table.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/usage/[[period]]/+page.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/databases/usage/[[period]]/+page.ts (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/+layout.ts (59%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/+page.svelte (97%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/+page.ts (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/createFunction.svelte (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/+layout.svelte (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/+layout.ts (65%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/+page.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/+page.ts (64%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/activate.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/cancel.svelte (83%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/create.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/createCli.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/createGit.svelte (97%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/createManual.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/delete.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deployment-[deployment]/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deployment-[deployment]/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deployment-[deployment]/+page.ts (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deployment-[deployment]/header.svelte (80%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deployment-[deployment]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deploymentCard.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deploymentCreatedBy.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deploymentDomains.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/deploymentSource.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/domains/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/domains/+page.ts (55%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/+page.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/+page.ts (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/delete.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/execute-function/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/execute-function/+page.ts (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/quickFilters.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/executions/table.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/header.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/quickFilters.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/redeployModal.svelte (83%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/+page.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/+page.ts (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/dangerZone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/deleteModal.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/disconnectRepo.svelte (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/executeFunction.svelte (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/gitConfigurationModal.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateConfiguration.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateEvents.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateLogging.svelte (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateName.svelte (68%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updatePermissions.svelte (72%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateRuntime.svelte (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateSchedule.svelte (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateScopes.svelte (71%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/settings/updateTimeout.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/table.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/usage/[[period]]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/function-[function]/usage/[[period]]/+page.ts (78%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/header.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/+page.svelte (99%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/+page.ts (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/template-[template]/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/template-[template]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/template-[template]/+page.ts (53%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/template-[template]/header.svelte (77%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/templates/template-[template]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/wizard/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/wizard/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/wizard/step3.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/wizard/step4.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/wizard/step5.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/functions/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/+layout.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/+page.ts (74%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/actions.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/breadcrumbs.svelte (76%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/bubble-tail-dark.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/bubble-tail-light.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/create.svelte (65%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/createMessageDropdown.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/failedModal.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/header.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/+layout.ts (70%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/breadcrumbs.svelte (80%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/cancelModal.svelte (58%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/delete.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/deleteModal.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/emailMessage.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/header.svelte (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/overview.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/pushMessage.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/scheduleModal.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/sendModal.svelte (63%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/smsMessage.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/updateTargets.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/message-[message]/updateTopics.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/messageStatusPill.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/provider.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providerType.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/+page.ts (71%)
 create mode 100644 src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/createProviderDropdown.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/popoverContent.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/+layout.ts (75%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/breadcrumbs.svelte (61%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/dangerZone.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/deleteProvider.svelte (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/header.svelte (81%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/updateName.svelte (56%)
 create mode 100644 src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/provider-[provider]/updateStatus.svelte (55%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/settingsFormInput.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/settingsFormList.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/table.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/wizard/provider.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/wizard/settings.svelte (99%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/providers/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/push-notification-preview-dark.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/push-notification-preview-light.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/pushPhone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/sms-preview-dark.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/sms-preview-light.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/smsPhone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/+page.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/+page.ts (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/create.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/table.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/+layout.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/+layout.ts (80%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/+page.svelte (95%)
 rename src/routes/(console)/{project-[project]/auth/user-[user]/identities => project-[region]-[project]/messaging/topics/topic-[topic]}/+page.ts (57%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/activity/+page.svelte (100%)
 rename src/routes/(console)/{project-[project]/auth/user-[user] => project-[region]-[project]/messaging/topics/topic-[topic]}/activity/+page.ts (73%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/breadcrumbs.svelte (61%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/deleteTopic.svelte (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/header.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/settings/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/settings/dangerZone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/settings/details.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/settings/updateName.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/settings/updatePermissions.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topics/topic-[topic]/table.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/topicsModal.svelte (97%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/userTargetsModal.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/emailFormList.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/pushFormList.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/smsFormList.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/step3.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/messaging/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/+layout.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/+page.ts (62%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/bandwidth.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/header.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/intro-dark.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/intro-light.png (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/+page.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/[key]/+page.ts (100%)
 rename src/routes/(console)/{project-[project]/overview/keys/[key]/+page@project-[project].svelte => project-[region]-[project]/overview/keys/[key]/+page@project-[region]-[project].svelte} (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/[key]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/[key]/delete.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/[key]/header.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/[key]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/[key]/updateExpirationDate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/checkbox.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/expirationInput.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/scopes.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/wizard.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/wizard/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/wizard/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/keys/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-1-dark-desktop.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-1-dark-mobile.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-1-light-desktop.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-1-light-mobile.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-2-dark-desktop.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-2-dark-mobile.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-2-light-desktop.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard-2-light-mobile.svg (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/onboard.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/+page.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/+page.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/+page.ts (100%)
 rename src/routes/(console)/{project-[project]/overview/platforms/[platform]/+page@project-[project].svelte => project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte} (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/android.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/appleIOS.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/appleMacOS.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/appleTvOS.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/appleWatchOS.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/breadcrumbs.svelte (69%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/delete.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/flutterAndroid.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/flutterIOS.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/flutterLinux.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/flutterMacOS.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/flutterWindows.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/header.svelte (78%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/[platform]/web.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/createAndroid.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/createApple.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/createFlutter.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/createReactNative.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/createWeb.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/android/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/android/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/android/step3.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/apple/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/apple/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/apple/step3.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/flutter/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/flutter/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/flutter/step3.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/react-native/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/react-native/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/react-native/step3.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/step4.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/web/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/web/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/platforms/wizard/web/step3.svelte (86%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/realtime.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/requests.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/overview/store.ts (64%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/promoteVariableModal.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/rawVariableEditor.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/+page.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/+page.ts (64%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/GitDisconnectModal.svelte (87%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/GitInstallationModal.svelte (91%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/deleteProject.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/disableAllServices.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/domains/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/domains/+page.ts (57%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/enableAllServices.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/header.svelte (95%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/(import)/index.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/(import)/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/(import)/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/(import)/wizard.svelte (56%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/+page.ts (81%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/details.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/exportModal.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/migrations/stores.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/smtp/+page.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/transferProject.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/updateInstallations.svelte (98%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/updateName.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/updateServices.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/usage/[[invoice]]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/usage/[[invoice]]/+page.ts (84%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/+page.svelte (97%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/+page.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/+page.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/dangerZone.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/delete.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/details.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/header.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/regenerate.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/updateEvents.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/updateName.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/updateSecurity.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/updateSignature.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/[webhook]/updateURL.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/createWebhook.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/failedModal.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/messageStatusPill.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/wizard/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/wizard/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/wizard/step3.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/settings/webhooks/wizard/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/+layout.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/+layout.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/+page.svelte (93%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/+page.ts (63%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/breadcrumbs.svelte (76%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/+layout.svelte (73%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/+layout.ts (78%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/+page.svelte (94%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/+page.ts (78%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/create-file/create.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/create-file/step1.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/create-file/step2.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/create-file/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/deleteBucket.svelte (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/deleteFile.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/+layout.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/+layout.ts (77%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/+page.svelte (89%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/deleteFile.svelte (81%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/header.svelte (80%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/file-[file]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/header.svelte (88%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/settings/+page.svelte (96%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/settings/+page.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/usage/[[period]]/+page.svelte (77%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/bucket-[bucket]/usage/[[period]]/+page.ts (76%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/create.svelte (90%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/header.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/usage/[[period]]/+page.svelte (82%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/storage/usage/[[period]]/+page.ts (85%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/store.ts (100%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/updateVariables.svelte (92%)
 rename src/routes/(console)/{project-[project] => project-[region]-[project]}/uploadVariablesModal.svelte (100%)

diff --git a/src/lib/commandCenter/panels/createAttribute.svelte b/src/lib/commandCenter/panels/createAttribute.svelte
index 9613d303be..ee7e3619a1 100644
--- a/src/lib/commandCenter/panels/createAttribute.svelte
+++ b/src/lib/commandCenter/panels/createAttribute.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { initCreateAttribute } from '$routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
-    import { attributeOptions } from '$routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store';
+    import { initCreateAttribute } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
+    import { attributeOptions } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store';
     import Template from './template.svelte';
 
     let search = '';
diff --git a/src/lib/commandCenter/panels/createMessage.svelte b/src/lib/commandCenter/panels/createMessage.svelte
index 19ea7f7d30..874167a8ce 100644
--- a/src/lib/commandCenter/panels/createMessage.svelte
+++ b/src/lib/commandCenter/panels/createMessage.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-    import { providers } from '$routes/(console)/project-[project]/messaging/providers/store';
+    import { providers } from '$routes/(console)/project-[region]-[project]/messaging/providers/store';
     import {
         messageParams,
         providerType,
         targetsById
-    } from '$routes/(console)/project-[project]/messaging/wizard/store';
+    } from '$routes/(console)/project-[region]-[project]/messaging/wizard/store';
     import { MessagingProviderType } from '@appwrite.io/console';
     import Template from './template.svelte';
     import { wizard } from '$lib/stores/wizard';
-    import Create from '$routes/(console)/project-[project]/messaging/create.svelte';
-    import { topicsById } from '$routes/(console)/project-[project]/messaging/store';
+    import Create from '$routes/(console)/project-[region]-[project]/messaging/create.svelte';
+    import { topicsById } from '$routes/(console)/project-[region]-[project]/messaging/store';
 
     let search = '';
 
diff --git a/src/lib/commandCenter/panels/platforms.svelte b/src/lib/commandCenter/panels/platforms.svelte
index 3822d54d96..048f3a3b6e 100644
--- a/src/lib/commandCenter/panels/platforms.svelte
+++ b/src/lib/commandCenter/panels/platforms.svelte
@@ -2,7 +2,7 @@
     import {
         Platform,
         addPlatform
-    } from '$routes/(console)/project-[project]/overview/platforms/+page.svelte';
+    } from '$routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte';
     import Template from './template.svelte';
 
     let search = '';
diff --git a/src/lib/commandCenter/searchers/buckets.ts b/src/lib/commandCenter/searchers/buckets.ts
index eecc30552c..8b81a15740 100644
--- a/src/lib/commandCenter/searchers/buckets.ts
+++ b/src/lib/commandCenter/searchers/buckets.ts
@@ -1,12 +1,13 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { Query, type Models } from '@appwrite.io/console';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import { addSubPanel } from '../subPanels';
 import { FilesPanel } from '../panels';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
     return {
@@ -20,9 +21,12 @@ const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
 };
 
 export const bucketSearcher = (async (query: string) => {
-    const { buckets } = await sdk.forProject.storage.listBuckets([Query.orderDesc('$createdAt')]);
-
+    const $page = get(page);
     const $project = get(project);
+    const { buckets } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .storage.listBuckets([Query.orderDesc('$createdAt')]);
+
     const filtered = buckets.filter((bucket) => bucket.name.includes(query));
 
     if (filtered.length === 1) {
@@ -32,7 +36,9 @@ export const bucketSearcher = (async (query: string) => {
             {
                 label: 'Find files',
                 async callback() {
-                    await goto(`${base}/project-${$project.$id}/storage/bucket-${bucket.$id}`);
+                    await goto(
+                        `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}`
+                    );
                     addSubPanel(FilesPanel);
                 },
                 group: 'buckets',
@@ -44,7 +50,7 @@ export const bucketSearcher = (async (query: string) => {
                 label: 'Permissions',
                 async callback() {
                     await goto(
-                        `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#permissions`
+                        `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}/settings#permissions`
                     );
                     scrollBy({ top: -100 });
                 },
@@ -56,7 +62,7 @@ export const bucketSearcher = (async (query: string) => {
                 label: 'Extensions',
                 async callback() {
                     await goto(
-                        `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#extensions`
+                        `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}/settings#extensions`
                     );
                 },
                 group: 'buckets',
@@ -67,7 +73,7 @@ export const bucketSearcher = (async (query: string) => {
                 label: 'File Security',
                 async callback() {
                     await goto(
-                        `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#file-security`
+                        `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${bucket.$id}/settings#file-security`
                     );
                     scrollBy({ top: -100 });
                 },
diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts
index 8a3a9ed546..d7ece4b2d1 100644
--- a/src/lib/commandCenter/searchers/collections.ts
+++ b/src/lib/commandCenter/searchers/collections.ts
@@ -1,14 +1,18 @@
 import { goto } from '$app/navigation';
-import { database } from '$routes/(console)/project-[project]/databases/database-[database]/store';
-import { project } from '$routes/(console)/project-[project]/store';
+import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 export const collectionsSearcher = (async (query: string) => {
     const databaseId = get(database).$id;
-    const { collections } = await sdk.forProject.databases.listCollections(databaseId);
+    const $page = get(page);
+    const { collections } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .databases.listCollections(databaseId);
 
     const projectId = get(project).$id;
     return collections
diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts
index e1153005c1..bb1691e5ab 100644
--- a/src/lib/commandCenter/searchers/databases.ts
+++ b/src/lib/commandCenter/searchers/databases.ts
@@ -1,12 +1,16 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 export const dbSearcher = (async (query: string) => {
-    const { databases } = await sdk.forProject.databases.list();
+    const $page = get(page);
+    const { databases } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .databases.list();
 
     return databases
         .filter((db) => db.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/files.ts b/src/lib/commandCenter/searchers/files.ts
index bab3a35f8c..48149dc2a2 100644
--- a/src/lib/commandCenter/searchers/files.ts
+++ b/src/lib/commandCenter/searchers/files.ts
@@ -1,26 +1,28 @@
 import { sdk } from '$lib/stores/sdk';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
-import { bucket } from '$routes/(console)/project-[project]/storage/bucket-[bucket]/store';
+import { bucket } from '$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store';
 import { Query } from '@appwrite.io/console';
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 export const fileSearcher = (async (query: string) => {
     const $bucket = get(bucket);
     const $project = get(project);
+    const $page = get(page);
 
-    const { files } = await sdk.forProject.storage.listFiles(
-        $bucket.$id,
-        [Query.orderDesc('')],
-        query || undefined
-    );
+    const { files } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .storage.listFiles($bucket.$id, [Query.orderDesc('')], query || undefined);
 
     return files.map((file) => ({
         label: file.name,
         callback: () => {
-            goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}`);
+            goto(
+                `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}`
+            );
         },
         icon: 'document',
         group: 'files'
diff --git a/src/lib/commandCenter/searchers/functions.ts b/src/lib/commandCenter/searchers/functions.ts
index 174df48aa3..2c7867511d 100644
--- a/src/lib/commandCenter/searchers/functions.ts
+++ b/src/lib/commandCenter/searchers/functions.ts
@@ -1,11 +1,11 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
 import { page } from '$app/stores';
-import { showCreateDeployment } from '$routes/(console)/project-[project]/functions/function-[function]/store';
+import { showCreateDeployment } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store';
 import { base } from '$app/paths';
 
 const getFunctionCommand = (fn: Models.Function, projectId: string) => {
@@ -20,9 +20,11 @@ const getFunctionCommand = (fn: Models.Function, projectId: string) => {
 };
 
 export const functionsSearcher = (async (query: string) => {
-    const { functions } = await sdk.forProject.functions.list();
-
+    const $page = get(page);
     const projectId = get(project).$id;
+    const { functions } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .functions.list();
 
     const filtered = functions.filter((fn) => fn.name.toLowerCase().includes(query.toLowerCase()));
 
diff --git a/src/lib/commandCenter/searchers/messages.ts b/src/lib/commandCenter/searchers/messages.ts
index 0ce8e2d5e4..9db090442a 100644
--- a/src/lib/commandCenter/searchers/messages.ts
+++ b/src/lib/commandCenter/searchers/messages.ts
@@ -1,10 +1,11 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import { type Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
 import { MessagingProviderType } from '@appwrite.io/console';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 const getLabel = (message) => {
     switch (message.providerType) {
@@ -33,9 +34,11 @@ const getIcon = (message) => {
 };
 
 export const messagesSearcher = (async (query: string) => {
-    const { messages } = await sdk.forProject.messaging.listMessages([], query || undefined);
-
+    const $page = get(page);
     const projectId = get(project).$id;
+    const { messages } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .messaging.listMessages([], query || undefined);
 
     return messages
         .filter((message) => getLabel(message).toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/projects.ts b/src/lib/commandCenter/searchers/projects.ts
index a3f88c2420..5787da93ca 100644
--- a/src/lib/commandCenter/searchers/projects.ts
+++ b/src/lib/commandCenter/searchers/projects.ts
@@ -18,7 +18,7 @@ export const projectsSearcher = (async (query: string) => {
             return {
                 label: project.name,
                 callback: () => {
-                    goto(`${base}/project-${project.$id}`);
+                    goto(`${base}/project-${project.region}-${project.$id}`);
                 },
                 group: 'projects'
             } as const;
diff --git a/src/lib/commandCenter/searchers/providers.ts b/src/lib/commandCenter/searchers/providers.ts
index 1211255080..1ff011c35c 100644
--- a/src/lib/commandCenter/searchers/providers.ts
+++ b/src/lib/commandCenter/searchers/providers.ts
@@ -1,10 +1,11 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
-import { getProviderDisplayNameAndIcon } from '$routes/(console)/project-[project]/messaging/provider.svelte';
+import { getProviderDisplayNameAndIcon } from '$routes/(console)/project-[region]-[project]/messaging/provider.svelte';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 const getIcon = (provider: string) => {
     const { icon } = getProviderDisplayNameAndIcon(provider);
@@ -12,9 +13,11 @@ const getIcon = (provider: string) => {
 };
 
 export const providersSearcher = (async (query: string) => {
-    const { providers } = await sdk.forProject.messaging.listProviders([], query || undefined);
-
+    const $page = get(page);
     const projectId = get(project).$id;
+    const { providers } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .messaging.listProviders([], query || undefined);
 
     return providers
         .filter((provider) => provider.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts
index 57c91c9d17..342cf547db 100644
--- a/src/lib/commandCenter/searchers/teams.ts
+++ b/src/lib/commandCenter/searchers/teams.ts
@@ -1,10 +1,11 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 const getTeamCommand = (team: Models.Team<Models.Preferences>, projectId: string) =>
     ({
@@ -17,8 +18,11 @@ const getTeamCommand = (team: Models.Team<Models.Preferences>, projectId: string
     }) satisfies Command;
 
 export const teamSearcher = (async (query: string) => {
-    const { teams } = await sdk.forProject.teams.list([], query);
+    const $page = get(page);
     const projectId = get(project).$id;
+    const { teams } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .teams.list([], query);
 
     if (teams.length === 1) {
         return [
diff --git a/src/lib/commandCenter/searchers/topics.ts b/src/lib/commandCenter/searchers/topics.ts
index 3153a26ac2..83bed62242 100644
--- a/src/lib/commandCenter/searchers/topics.ts
+++ b/src/lib/commandCenter/searchers/topics.ts
@@ -1,14 +1,17 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 export const topicsSearcher = (async (query: string) => {
-    const { topics } = await sdk.forProject.messaging.listTopics([], query || undefined);
-
+    const $page = get(page);
     const projectId = get(project).$id;
+    const { topics } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .messaging.listTopics([], query || undefined);
 
     return topics
         .filter((topic) => topic.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/users.ts b/src/lib/commandCenter/searchers/users.ts
index 7cb13381e7..b7ee178282 100644
--- a/src/lib/commandCenter/searchers/users.ts
+++ b/src/lib/commandCenter/searchers/users.ts
@@ -1,11 +1,12 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[project]/store';
+import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
-import { promptDeleteUser } from '$routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte';
+import { promptDeleteUser } from '$routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte';
 import { base } from '$app/paths';
+import { page } from '$app/stores';
 
 const getUserCommand = (user: Models.User<Models.Preferences>, projectId: string) =>
     ({
@@ -18,8 +19,11 @@ const getUserCommand = (user: Models.User<Models.Preferences>, projectId: string
     }) satisfies Command;
 
 export const userSearcher = (async (query: string) => {
-    const { users } = await sdk.forProject.users.list([], query || undefined);
+    const $page = get(page);
     const projectId = get(project).$id;
+    const { users } = await sdk
+        .forProject($page.params.region, $page.params.project)
+        .users.list([], query || undefined);
 
     if (users.length === 1) {
         return [
diff --git a/src/lib/components/backupRestoreBox.svelte b/src/lib/components/backupRestoreBox.svelte
index 69d3dd60ff..625c14497a 100644
--- a/src/lib/components/backupRestoreBox.svelte
+++ b/src/lib/components/backupRestoreBox.svelte
@@ -33,6 +33,7 @@
 
     function showRestoreNotification(newDatabaseId: string, newDatabaseName: string) {
         if (newDatabaseId && newDatabaseName && lastDatabaseRestorationId !== newDatabaseId) {
+            const region = $page.params.region;
             const project = $page.params.project;
             lastDatabaseRestorationId = newDatabaseId;
 
@@ -44,7 +45,9 @@
                     {
                         name: 'View restored data',
                         method: () => {
-                            goto(`${base}/project-${project}/databases/database-${newDatabaseId}`);
+                            goto(
+                                `${base}/project-${region}-${project}/databases/database-${newDatabaseId}`
+                            );
                         }
                     }
                 ]
diff --git a/src/lib/components/bottomModalAlert.svelte b/src/lib/components/bottomModalAlert.svelte
index 03ace8873f..dd548d7886 100644
--- a/src/lib/components/bottomModalAlert.svelte
+++ b/src/lib/components/bottomModalAlert.svelte
@@ -13,7 +13,7 @@
     import { BillingPlan } from '$lib/constants';
     import { upgradeURL } from '$lib/stores/billing';
     import { addBottomModalAlerts } from '$routes/(console)/bottomAlerts';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { page } from '$app/stores';
     import { trackEvent } from '$lib/actions/analytics';
 
diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte
index d9dc6b9e36..0896d6d528 100644
--- a/src/lib/components/filePicker.svelte
+++ b/src/lib/components/filePicker.svelte
@@ -49,20 +49,21 @@
 
     function getPreview(bucketId: string, fileId: string, size: number = 64) {
         return (
-            sdk.forProject.storage.getFilePreview(bucketId, fileId, size, size).toString() +
-            '&mode=admin'
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.getFilePreview(bucketId, fileId, size, size)
+                .toString() + '&mode=admin'
         );
     }
 
     async function uploadFile() {
         try {
             uploading = true;
-            const file = await sdk.forProject.storage.createFile(
-                selectedBucket,
-                ID.unique(),
-                fileSelector.files[0],
-                [Permission.read(Role.any())]
-            );
+            const file = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.createFile(selectedBucket, ID.unique(), fileSelector.files[0], [
+                    Permission.read(Role.any())
+                ]);
             search.set($search === null ? '' : null);
             selectFile(file);
         } catch (e) {
@@ -108,7 +109,9 @@
     let currentFile: Models.File = null;
     let buckets: Promise<Models.BucketList> = loadBuckets();
     async function loadBuckets() {
-        const response = await sdk.forProject.storage.listBuckets();
+        const response = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .storage.listBuckets();
         const bucket = response.buckets[0] ?? null;
         if (bucket) {
             currentBucket = bucket;
@@ -120,8 +123,9 @@
 
     $: files =
         currentBucket &&
-        sdk.forProject.storage
-            .listFiles(
+        sdk
+            .forProject($page.params.region, $page.params.project)
+            .storage.listFiles(
                 currentBucket.$id,
                 [Query.startsWith('mimeType', mimeTypeQuery), Query.orderDesc('$createdAt')],
                 $search || undefined
@@ -516,7 +520,7 @@
                                     <Button
                                         secondary
                                         external
-                                        href={`${base}/project-${$page.params.project}/storage`}>
+                                        href={`${base}/project-${$page.params.region}-${$page.params.project}/storage`}>
                                         Create bucket
                                     </Button>
                                 </div>
diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte
index eeda3641c1..a567a0d2a5 100644
--- a/src/lib/components/permissions/row.svelte
+++ b/src/lib/components/permissions/row.svelte
@@ -5,6 +5,7 @@
     import { tick } from 'svelte';
     import { AvatarInitials } from '../';
     import Output from '../output.svelte';
+    import { page } from '$app/stores';
 
     export let role: string;
 
@@ -20,11 +21,15 @@
         const role = permission.split(':')[0];
         const id = permission.split(':')[1].split('/')[0];
         if (role === 'user') {
-            const user = await sdk.forProject.users.get(id);
+            const user = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.get(id);
             return user;
         }
         if (role === 'team') {
-            const team = await sdk.forProject.teams.get(id);
+            const team = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.get(id);
             return team;
         }
     }
diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte
index e8d900df27..3908e08857 100644
--- a/src/lib/components/permissions/team.svelte
+++ b/src/lib/components/permissions/team.svelte
@@ -8,6 +8,7 @@
     import type { Permission } from './permissions.svelte';
     import Table from '$lib/elements/table/table.svelte';
     import { TableBody, TableCell, TableRow } from '$lib/elements/table';
+    import { page } from '$app/stores';
 
     export let show: boolean;
     export let groups: Writable<Map<string, Permission>>;
@@ -33,10 +34,9 @@
 
     async function request() {
         if (!show) return;
-        results = await sdk.forProject.teams.list(
-            [Query.limit(5), Query.offset(offset)],
-            search || undefined
-        );
+        results = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .teams.list([Query.limit(5), Query.offset(offset)], search || undefined);
     }
 
     function onSelection(event: Event, role: string) {
diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte
index c6ba21c352..b9b471caa7 100644
--- a/src/lib/components/permissions/user.svelte
+++ b/src/lib/components/permissions/user.svelte
@@ -6,6 +6,7 @@
     import { Query, type Models } from '@appwrite.io/console';
     import type { Writable } from 'svelte/store';
     import type { Permission } from './permissions.svelte';
+    import { page } from '$app/stores';
 
     export let show: boolean;
     export let groups: Writable<Map<string, Permission>>;
@@ -31,10 +32,9 @@
 
     async function request() {
         if (!show) return;
-        results = await sdk.forProject.users.list(
-            [Query.limit(5), Query.offset(offset)],
-            search || undefined
-        );
+        results = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .users.list([Query.limit(5), Query.offset(offset)], search || undefined);
     }
 
     function onSelection(event: Event, role: string) {
diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte
index 8cd9883cc2..09906ced6f 100644
--- a/src/lib/components/uploadBox.svelte
+++ b/src/lib/components/uploadBox.svelte
@@ -8,8 +8,14 @@
 
     let hovering = false;
 
-    const getPreview = (fileId: string, bucketId: string) =>
-        sdk.forProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin';
+    function getPreview(fileId: string, bucketId: string) {
+        return (
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.getFilePreview(bucketId, fileId, 32, 32)
+                .toString() + '&mode=admin'
+        );
+    }
 </script>
 
 {#if $uploader?.isOpen}
@@ -41,7 +47,7 @@
                     {#if file.completed || file.progress === 100}
                         <a
                             class="upload-box-item"
-                            href={`${base}/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/file-${file.$id}`}>
+                            href={`${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$page.params.bucket}/file-${file.$id}`}>
                             <div class="u-margin-inline-end-16">
                                 <Avatar
                                     size={32}
diff --git a/src/lib/elements/flag.svelte b/src/lib/elements/flag.svelte
index d1dfe28494..066a531b3d 100644
--- a/src/lib/elements/flag.svelte
+++ b/src/lib/elements/flag.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { sdk } from '$lib/stores/sdk';
     import { Flag } from '@appwrite.io/console';
+
     export let flag: string;
     export let name: string = flag;
     export let width = 40;
@@ -12,8 +14,9 @@
 
     export function getFlag(country: string, width: number, height: number, quality: number) {
         if (!isValueOfStringEnum(Flag, country)) return '';
-        let flag = sdk.forProject.avatars
-            .getFlag(country, width * 2, height * 2, quality)
+        let flag = sdk
+            .forProject($page.params.region, $page.params.project)
+            .avatars.getFlag(country, width * 2, height * 2, quality)
             ?.toString();
         flag?.includes('&project=')
             ? (flag = flag.replace('&project=', '&mode=admin'))
diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte
index cda4c67a92..401ccab97a 100644
--- a/src/lib/layout/navigation.svelte
+++ b/src/lib/layout/navigation.svelte
@@ -18,8 +18,7 @@
 
     export let isOpen = false;
 
-    $: project = $page.params.project;
-    $: projectPath = `${base}/project-${project}`;
+    $: projectPath = `${base}/project-${$page.params.region}-${$page.params.project}`;
 
     $: subNavigation = $page.data.subNavigation;
     // We need to have this second variable, because we only want narrow
@@ -58,7 +57,7 @@
 
 <div class="side-nav" class:is-open-level-2={hasSubNavigation}>
     <div class="side-nav-level-1" class:is-narrow={narrow}>
-        {#if project}
+        {#if $page.params.project}
             <div class="side-nav-main">
                 <section class="drop-section">
                     <ul class="drop-list">
diff --git a/src/lib/pages/domains/delete.svelte b/src/lib/pages/domains/delete.svelte
index 3af92ff99e..dc225b79f0 100644
--- a/src/lib/pages/domains/delete.svelte
+++ b/src/lib/pages/domains/delete.svelte
@@ -7,6 +7,7 @@
     import type { Models } from '@appwrite.io/console';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import type { Dependencies } from '$lib/constants';
+    import { page } from '$app/stores';
 
     export let showDelete = false;
     export let selectedDomain: Models.ProxyRule;
@@ -14,7 +15,9 @@
 
     async function deleteDomain() {
         try {
-            await sdk.forProject.proxy.deleteRule(selectedDomain.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .proxy.deleteRule(selectedDomain.$id);
             await invalidate(dependency);
             showDelete = false;
             addNotification({
diff --git a/src/lib/pages/domains/wizard/retry.svelte b/src/lib/pages/domains/wizard/retry.svelte
index 66ebfb30ca..6eda12056b 100644
--- a/src/lib/pages/domains/wizard/retry.svelte
+++ b/src/lib/pages/domains/wizard/retry.svelte
@@ -9,6 +9,7 @@
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { page } from '$app/stores';
 
     let retrying = false;
 
@@ -17,7 +18,9 @@
     async function retry() {
         try {
             retrying = true;
-            $domain = await sdk.forProject.proxy.updateRuleVerification($domain.$id);
+            $domain = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .proxy.updateRuleVerification($domain.$id);
             invalidate(Dependencies.FUNCTION_DOMAINS);
             addNotification({
                 message:
diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte
index f6cac57dd9..1cccf73813 100644
--- a/src/lib/pages/domains/wizard/step1.svelte
+++ b/src/lib/pages/domains/wizard/step1.svelte
@@ -5,10 +5,11 @@
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
     import { isSelfHosted } from '$lib/system';
-    import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store';
+    import { func } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store';
     import { domain, typeStore } from './store';
     import { consoleVariables } from '$routes/(console)/store';
     import { ResourceType } from '@appwrite.io/console';
+    import { page } from '$app/stores';
 
     let error = null;
     const isDomainsEnabled = $consoleVariables?._APP_DOMAIN_ENABLED === true;
@@ -16,14 +17,18 @@
     async function createDomain() {
         try {
             if ($domain.$id) {
-                await sdk.forProject.proxy.deleteRule($domain.$id);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .proxy.deleteRule($domain.$id);
             }
 
-            $domain = await sdk.forProject.proxy.createRule(
-                $domain.domain,
-                $typeStore,
-                $typeStore === ResourceType.Function ? $func.$id : undefined
-            );
+            $domain = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .proxy.createRule(
+                    $domain.domain,
+                    $typeStore,
+                    $typeStore === ResourceType.Function ? $func.$id : undefined
+                );
 
             trackEvent(Submit.DomainCreate);
         } catch (e) {
diff --git a/src/lib/stores/database.ts b/src/lib/stores/database.ts
index efec8fed17..338339a781 100644
--- a/src/lib/stores/database.ts
+++ b/src/lib/stores/database.ts
@@ -12,17 +12,20 @@ export const backupsBannerId = 'banner:databaseBackups';
 
 export const showPolicyAlert = writable<boolean>(false);
 
-export async function checkForDatabaseBackupPolicies(database: Models.Database) {
+export async function checkForDatabaseBackupPolicies(
+    region: string,
+    projectId: string,
+    database: Models.Database
+) {
     // fast path: return if user dismissed the banner
     if (!shouldShowNotification(backupsBannerId)) return;
 
     let total = 0;
 
     try {
-        const policies = await sdk.forProject.backups.listPolicies([
-            Query.limit(1),
-            Query.equal('resourceId', database.$id)
-        ]);
+        const policies = await sdk
+            .forProject(region, projectId)
+            .backups.listPolicies([Query.limit(1), Query.equal('resourceId', database.$id)]);
 
         total = policies.total;
     } catch (e) {
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index e7310ac2bd..6e35945452 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -1,13 +1,13 @@
 import type { SvelteComponent } from 'svelte';
-import Apple from '$routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte';
-import Auth0 from '$routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte';
-import Authentik from '$routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte';
-import GitLab from '$routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte';
-import Google from '$routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte';
-import Main from '$routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte';
-import Microsoft from '$routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte';
-import Oidc from '$routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte';
-import Okta from '$routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte';
+import Apple from '$routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte';
+import Auth0 from '$routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte';
+import Authentik from '$routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte';
+import GitLab from '$routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte';
+import Google from '$routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte';
+import Main from '$routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte';
+import Microsoft from '$routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte';
+import Oidc from '$routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte';
+import Okta from '$routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte';
 
 export type Provider = {
     name: string;
diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index a5350a5550..2b61fa51ab 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -49,9 +49,11 @@ function createPreferences() {
         set,
         update,
         get: (route?: Page['route']): Preferences => {
-            const parsedRoute = route ?? get(page).route;
+            const $page = get(page);
+            const projectId = get(page).params.project;
+            route ??= $page.route;
             return (
-                preferences[sdk.forProject.client.config.project]?.[parsedRoute.id] ?? {
+                preferences[projectId]?.[route.id] ?? {
                     limit: null,
                     view: null,
                     columns: null
@@ -60,15 +62,16 @@ function createPreferences() {
         },
 
         getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
-            return (
-                preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ??
-                null
-            );
+            const $page = get(page);
+            const projectId = $page.params.project;
+            return preferences[projectId]?.collections?.[collectionId] ?? null;
         },
         setLimit: (limit: Preferences['limit']) =>
             update((n) => {
-                const path = get(page).route.id;
-                const project = sdk.forProject.client.config.project;
+                const $page = get(page);
+                const path = $page.route.id;
+                const project = $page.params.project;
+
                 if (!n[project]?.[path]) {
                     n[project] ??= {};
                     n[project][path] ??= {};
@@ -80,8 +83,9 @@ function createPreferences() {
             }),
         setView: (view: Preferences['view']) =>
             update((n) => {
-                const path = get(page).route.id;
-                const project = sdk.forProject.client.config.project;
+                const $page = get(page);
+                const path = $page.route.id;
+                const project = $page.params.project;
                 if (!n[project]?.[path]) {
                     n[project] ??= {};
                     n[project][path] ??= {};
@@ -93,8 +97,9 @@ function createPreferences() {
             }),
         setColumns: (columns: Preferences['columns']) =>
             update((n) => {
-                const path = get(page).route.id;
-                const project = sdk.forProject.client.config.project;
+                const $page = get(page);
+                const path = $page.route.id;
+                const project = $page.params.project;
                 if (!n[project]?.[path]) {
                     n[project] ??= {};
                     n[project][path] ??= {};
@@ -106,9 +111,10 @@ function createPreferences() {
             }),
         setCustomCollectionColumns: (columns: Preferences['columns']) =>
             update((n) => {
-                const current = get(page);
-                const project = sdk.forProject.client.config.project;
-                const collection = current.params.collection;
+                const $page = get(page);
+                const project = $page.params.project;
+                const collection = $page.params.collection;
+
                 if (!n[project]?.collections?.[collection]) {
                     n[project] ??= {};
                     n[project].collections ??= {};
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index eca17b2efa..d524c3d28c 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -34,10 +34,13 @@ import {
 } from '$lib/constants';
 
 export function getApiEndpoint(region?: string): string {
-    if (VARS.APPWRITE_ENDPOINT) return VARS.APPWRITE_ENDPOINT;
-    const protocol = globalThis?.location?.protocol;
-    const hostname = globalThis?.location?.hostname;
+    const url = new URL(
+        VARS.APPWRITE_ENDPOINT ? VARS.APPWRITE_ENDPOINT : globalThis?.location.toString()
+    );
+    const protocol = url.protocol;
+    const hostname = url.hostname;
     const subdomain = getSubdomain(region);
+    console.log(`${protocol}//${subdomain}${hostname}/v1`);
     return `${protocol}//${subdomain}${hostname}/v1`;
 }
 
@@ -82,14 +85,6 @@ const sdkForProject = {
     migrations: new Migrations(clientProject)
 };
 
-export const getSdkForProject = (projectId: string) => {
-    if (projectId && projectId !== clientProject.config.project) {
-        clientProject.setProject(projectId);
-    }
-
-    return sdkForProject;
-};
-
 export const sdk = {
     forConsole: {
         client: clientConsole,
@@ -107,8 +102,15 @@ export const sdk = {
         billing: new Billing(clientConsole),
         sources: new Sources(clientConsole)
     },
-    get forProject() {
-        const projectId = getProjectId();
-        return getSdkForProject(projectId);
+    forProject(region: string, projectId: string) {
+        const endpoint = getApiEndpoint(region);
+        if (endpoint !== clientProject.config.endpoint) {
+            clientProject.setEndpoint(endpoint);
+        }
+        if (projectId !== clientProject.config.project) {
+            clientProject.setProject(projectId);
+        }
+
+        return sdkForProject;
     }
 };
diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index e067296f94..9121b4bb5c 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -6,7 +6,7 @@
     import { timeFromNow } from '$lib/helpers/date';
     import { app } from '$lib/stores/app';
     import { sdk } from '$lib/stores/sdk';
-    import { repositories } from '$routes/(console)/project-[project]/functions/function-[function]/store';
+    import { repositories } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store';
     import { installation, installations, repository } from '../store';
     import { createEventDispatcher } from 'svelte';
 
@@ -23,7 +23,9 @@
 
     let selectedInstallation = null;
     async function loadInstallations() {
-        const { installations } = await sdk.forProject.vcs.listInstallations();
+        const { installations } = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .vcs.listInstallations();
         if (installations.length) {
             selectedInstallation = installations[0].$id;
             installation.set(installations.find((entry) => entry.$id === selectedInstallation));
@@ -39,7 +41,9 @@
             $repositories.search !== search
         ) {
             $repositories.repositories = (
-                await sdk.forProject.vcs.listRepositories(installationId, search || undefined)
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .vcs.listRepositories(installationId, search || undefined)
             ).providerRepositories;
         }
 
@@ -61,7 +65,9 @@
                 redirect.searchParams.append(key, callbackState[key]);
             });
         }
-        const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`);
+        const target = new URL(
+            `${sdk.forProject($page.params.region, $page.params.project).client.config.endpoint}/vcs/github/authorize`
+        );
         target.searchParams.set('project', $page.params.project);
         target.searchParams.set('success', redirect.toString());
         target.searchParams.set('failure', redirect.toString());
@@ -120,7 +126,8 @@
     <p class="text u-margin-block-start-16">
         Manage organization configuration in your <a
             class="link"
-            href={`${base}/project-${$page.params.project}/settings`}>project settings</a
+            href={`${base}/project-${$page.params.region}-${$page.params.project}/settings`}
+            >project settings</a
         >.
     </p>
     {#if selectedInstallation}
diff --git a/src/lib/wizards/functions/connectExisting.svelte b/src/lib/wizards/functions/connectExisting.svelte
index 62331ed97e..da8ef5b408 100644
--- a/src/lib/wizards/functions/connectExisting.svelte
+++ b/src/lib/wizards/functions/connectExisting.svelte
@@ -4,7 +4,7 @@
     import GitConfiguration from './steps/gitConfiguration.svelte';
     import type { WizardStepsType } from '$lib/layout/wizard.svelte';
     import { sdk } from '$lib/stores/sdk';
-    import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store';
+    import { func } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store';
     import { choices, installation, repository } from './store';
     import { wizard } from '$lib/stores/wizard';
     import { invalidate } from '$app/navigation';
@@ -13,31 +13,34 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { Runtime } from '@appwrite.io/console';
+    import { page } from '$app/stores';
 
     async function createGitHubInstallation() {
         try {
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                $func.$id,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $installation.$id,
-                $repository.id,
-                $choices.branch,
-                $choices.silentMode || undefined,
-                $choices.rootDir
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    $func.$id,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $installation.$id,
+                    $repository.id,
+                    $choices.branch,
+                    $choices.silentMode || undefined,
+                    $choices.rootDir
+                );
             trackEvent(Submit.FunctionConnectRepo, {
                 customId: !!$func.$id
             });
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 84f47a74c0..a6e3956b4f 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -192,7 +192,7 @@
                     <Button
                         text
                         class="u-margin-block-start-24 u-margin-inline-start-auto"
-                        href={`${base}/project-${$page.params.project}/functions/templates?useCase=starter`}>
+                        href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/templates?useCase=starter`}>
                         All starter templates <span class="icon-cheveron-right" />
                     </Button>
                     <div class="u-sep-block-start common-section" />
@@ -259,7 +259,7 @@
                         text
                         noMargin
                         class="u-margin-inline-start-auto u-margin-block-start-16"
-                        href={`${base}/project-${$page.params.project}/functions/templates`}>
+                        href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/templates`}>
                         <span> All templates </span>
                         <span class="icon-cheveron-right" aria-hidden="true" />
                     </Button>
diff --git a/src/lib/wizards/functions/createGit.svelte b/src/lib/wizards/functions/createGit.svelte
index fdee70acad..ecb1b63e63 100644
--- a/src/lib/wizards/functions/createGit.svelte
+++ b/src/lib/wizards/functions/createGit.svelte
@@ -20,26 +20,30 @@
             if (!isValueOfStringEnum(Runtime, $createFunction.runtime)) {
                 throw new Error(`Invalid runtime: ${$createFunction.runtime}`);
             }
-            const response = await sdk.forProject.functions.create(
-                $createFunction.$id || ID.unique(),
-                $createFunction.name,
-                $createFunction.runtime,
-                $createFunction.execute || undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                $createFunction.entrypoint,
-                $createFunction.commands || undefined,
-                undefined,
-                $installation.$id,
-                $repository.id,
-                $choices.branch,
-                $choices.silentMode || undefined,
-                $choices.rootDir || undefined
+            const response = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.create(
+                    $createFunction.$id || ID.unique(),
+                    $createFunction.name,
+                    $createFunction.runtime,
+                    $createFunction.execute || undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    $createFunction.entrypoint,
+                    $createFunction.commands || undefined,
+                    undefined,
+                    $installation.$id,
+                    $repository.id,
+                    $choices.branch,
+                    $choices.silentMode || undefined,
+                    $choices.rootDir || undefined
+                );
+            goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${response.$id}`
             );
-            goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
             addNotification({
                 message: `${$createFunction.name} has been created`,
                 type: 'success'
diff --git a/src/lib/wizards/functions/createManual.svelte b/src/lib/wizards/functions/createManual.svelte
index c774c35165..b3467a9c51 100644
--- a/src/lib/wizards/functions/createManual.svelte
+++ b/src/lib/wizards/functions/createManual.svelte
@@ -26,25 +26,27 @@
             if (!isValueOfStringEnum(Runtime, $createFunction.runtime)) {
                 throw new Error(`Invalid runtime: ${$createFunction.runtime}`);
             }
-            const response = await sdk.forProject.functions.create(
-                $createFunction.$id || ID.unique(),
-                $createFunction.name,
-                $createFunction.runtime,
-                $createFunction.execute || undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                $createFunction.entrypoint,
-                $createFunction.commands || undefined
+            const response = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.create(
+                    $createFunction.$id || ID.unique(),
+                    $createFunction.name,
+                    $createFunction.runtime,
+                    $createFunction.execute || undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    $createFunction.entrypoint,
+                    $createFunction.commands || undefined
+                );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.createDeployment(response.$id, $createFunctionDeployment[0], true);
+            goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${response.$id}`
             );
-            await sdk.forProject.functions.createDeployment(
-                response.$id,
-                $createFunctionDeployment[0],
-                true
-            );
-            goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
             addNotification({
                 message: `${$createFunction.name} has been created`,
                 type: 'success'
diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte
index 355a62e47f..973f398593 100644
--- a/src/lib/wizards/functions/createTemplate.svelte
+++ b/src/lib/wizards/functions/createTemplate.svelte
@@ -33,43 +33,51 @@
                 (r) => r.name === $templateConfig.runtime
             );
 
-            const response = await sdk.forProject.functions.create(
-                $templateConfig.$id || ID.unique(),
-                $templateConfig.name,
-                $templateConfig.runtime,
-                $templateConfig?.execute ? $template.permissions || undefined : undefined,
-                $template.events || undefined,
-                $template.cron || undefined,
-                $template.timeout || undefined,
-                undefined,
-                undefined,
-                runtimeDetail.entrypoint,
-                runtimeDetail.commands || undefined,
-                $templateConfig?.scopes?.length ? $templateConfig.scopes : undefined,
-                $templateConfig.repositoryBehaviour === 'manual' ? undefined : $installation.$id,
-                $templateConfig.repositoryBehaviour === 'manual' ? undefined : $repository.id,
-                $templateConfig.repositoryBehaviour === 'manual' ? undefined : $choices.branch,
-                $templateConfig.repositoryBehaviour === 'manual'
-                    ? undefined
-                    : $choices.silentMode || undefined,
-                $templateConfig.repositoryBehaviour === 'manual'
-                    ? undefined
-                    : $choices.rootDir || undefined,
-                $template.providerRepositoryId || undefined,
-                $template.providerOwner || undefined,
-                runtimeDetail.providerRootDirectory || undefined,
-                $template.providerVersion || undefined
-            );
+            const response = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.create(
+                    $templateConfig.$id || ID.unique(),
+                    $templateConfig.name,
+                    $templateConfig.runtime,
+                    $templateConfig?.execute ? $template.permissions || undefined : undefined,
+                    $template.events || undefined,
+                    $template.cron || undefined,
+                    $template.timeout || undefined,
+                    undefined,
+                    undefined,
+                    runtimeDetail.entrypoint,
+                    runtimeDetail.commands || undefined,
+                    $templateConfig?.scopes?.length ? $templateConfig.scopes : undefined,
+                    $templateConfig.repositoryBehaviour === 'manual'
+                        ? undefined
+                        : $installation.$id,
+                    $templateConfig.repositoryBehaviour === 'manual' ? undefined : $repository.id,
+                    $templateConfig.repositoryBehaviour === 'manual' ? undefined : $choices.branch,
+                    $templateConfig.repositoryBehaviour === 'manual'
+                        ? undefined
+                        : $choices.silentMode || undefined,
+                    $templateConfig.repositoryBehaviour === 'manual'
+                        ? undefined
+                        : $choices.rootDir || undefined,
+                    $template.providerRepositoryId || undefined,
+                    $template.providerOwner || undefined,
+                    runtimeDetail.providerRootDirectory || undefined,
+                    $template.providerVersion || undefined
+                );
 
             if ($templateConfig.variables) {
                 const promises = Object.entries($templateConfig.variables).map(([key, value]) =>
-                    sdk.forProject.functions.createVariable(response.$id, key, value?.toString())
+                    sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .functions.createVariable(response.$id, key, value?.toString())
                 );
 
                 await Promise.all(promises);
             }
 
-            goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
+            goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${response.$id}`
+            );
             addNotification({
                 message: `${response.name} has been created`,
                 type: 'success'
diff --git a/src/lib/wizards/functions/steps/createRepository.svelte b/src/lib/wizards/functions/steps/createRepository.svelte
index e5610476de..3949661114 100644
--- a/src/lib/wizards/functions/steps/createRepository.svelte
+++ b/src/lib/wizards/functions/steps/createRepository.svelte
@@ -27,11 +27,13 @@
         }
 
         if ($templateConfig.repositoryBehaviour === 'new') {
-            const repo = await sdk.forProject.vcs.createRepository(
-                $installation.$id,
-                $templateConfig.repositoryName,
-                $templateConfig.repositoryPrivate
-            );
+            const repo = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .vcs.createRepository(
+                    $installation.$id,
+                    $templateConfig.repositoryName,
+                    $templateConfig.repositoryPrivate
+                );
             $repository = repo;
 
             addNotification({
@@ -60,7 +62,9 @@
                 redirect.searchParams.append(key, callbackState[key]);
             });
         }
-        const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`);
+        const target = new URL(
+            `${sdk.forProject($page.params.region, $page.params.project).client.config.endpoint}/vcs/github/authorize`
+        );
         target.searchParams.set('project', $page.params.project);
         target.searchParams.set('success', redirect.toString());
         target.searchParams.set('failure', redirect.toString());
@@ -69,7 +73,9 @@
     }
 
     async function loadInstallations() {
-        const { installations } = await sdk.forProject.vcs.listInstallations();
+        const { installations } = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .vcs.listInstallations();
         if (installations.length) {
             $installation = installations[0];
             hasInstallations = true;
diff --git a/src/lib/wizards/functions/steps/functionConfiguration.svelte b/src/lib/wizards/functions/steps/functionConfiguration.svelte
index 02ae938681..e6fd32591f 100644
--- a/src/lib/wizards/functions/steps/functionConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/functionConfiguration.svelte
@@ -8,6 +8,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { choices, createFunction, installation, repository } from '../store';
     import { runtimesList } from '$lib/stores/runtimes';
+    import { page } from '$app/stores';
 
     let showCustomId = false;
 
@@ -17,11 +18,9 @@
         repositoryId: string,
         rootDirectory: string
     ) {
-        const detection = await sdk.forProject.vcs.createRepositoryDetection(
-            installationId,
-            repositoryId,
-            rootDirectory
-        );
+        const detection = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .vcs.createRepositoryDetection(installationId, repositoryId, rootDirectory);
 
         return detection;
     }
diff --git a/src/lib/wizards/functions/steps/gitConfiguration.svelte b/src/lib/wizards/functions/steps/gitConfiguration.svelte
index 1552b668b9..4fa211c414 100644
--- a/src/lib/wizards/functions/steps/gitConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/gitConfiguration.svelte
@@ -1,19 +1,19 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { Box, SvgIcon } from '$lib/components';
     import { FormList, InputChoice, InputText } from '$lib/elements/forms';
     import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
-    import { sortBranches } from '$routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte';
+    import { sortBranches } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateConfiguration.svelte';
     import { choices, installation, repository } from '../store';
 
     $choices.rootDir ??= '';
 
     async function loadBranches() {
-        const { branches } = await sdk.forProject.vcs.listRepositoryBranches(
-            $installation.$id,
-            $repository.id
-        );
+        const { branches } = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .vcs.listRepositoryBranches($installation.$id, $repository.id);
         const sorted = sortBranches(branches);
         $choices.branch = sorted[0]?.name ?? null;
 
diff --git a/src/routes/(console)/(migration-wizard)/index.ts b/src/routes/(console)/(migration-wizard)/index.ts
index da09c51815..e3dc89a318 100644
--- a/src/routes/(console)/(migration-wizard)/index.ts
+++ b/src/routes/(console)/(migration-wizard)/index.ts
@@ -3,6 +3,7 @@ import { wizard } from '$lib/stores/wizard';
 import { requestedMigration } from '$routes/store';
 import { get, writable } from 'svelte/store';
 import Wizard from './wizard.svelte';
+import type { Models } from '@appwrite.io/console';
 
 export const formData = createMigrationFormStore();
 
@@ -17,6 +18,6 @@ export function openMigrationWizard() {
     });
 }
 
-export const selectedProject = writable(null);
+export const selectedProject = writable<string>(null);
 
 export const provider = createMigrationProviderStore();
diff --git a/src/routes/(console)/(migration-wizard)/resource-form.svelte b/src/routes/(console)/(migration-wizard)/resource-form.svelte
index 5ddae52fa8..88ebb305cc 100644
--- a/src/routes/(console)/(migration-wizard)/resource-form.svelte
+++ b/src/routes/(console)/(migration-wizard)/resource-form.svelte
@@ -2,11 +2,7 @@
     import { Alert, Box, EyebrowHeading } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { deepMap } from '$lib/helpers/object';
-    import type { WritableValue } from '$lib/helpers/types';
-    import { type getSdkForProject } from '$lib/stores/sdk';
-
     import { onMount } from 'svelte';
-
     import {
         createMigrationFormStore,
         createMigrationProviderStore,
@@ -16,10 +12,12 @@
     } from '$lib/stores/migration';
     import { wizard } from '$lib/stores/wizard';
     import type { Models } from '@appwrite.io/console';
+    import type { sdk } from '$lib/stores/sdk';
+    import type { WritableValue } from '$lib/helpers/types';
 
     export let formData: ReturnType<typeof createMigrationFormStore>;
     export let provider: ReturnType<typeof createMigrationProviderStore>;
-    export let projectSdk: ReturnType<typeof getSdkForProject>;
+    export let projectSdk: ReturnType<typeof sdk.forProject>;
 
     type ValueOf<T> = T[keyof T];
     type FormData = WritableValue<typeof formData>;
diff --git a/src/routes/(console)/(migration-wizard)/step2.svelte b/src/routes/(console)/(migration-wizard)/step2.svelte
index a19e67603d..27a6896eb9 100644
--- a/src/routes/(console)/(migration-wizard)/step2.svelte
+++ b/src/routes/(console)/(migration-wizard)/step2.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { WizardStep } from '$lib/layout';
-    import { getSdkForProject } from '$lib/stores/sdk';
-
+    import { sdk } from '$lib/stores/sdk';
     import { formData, provider, selectedProject } from '.';
     import ResourceForm from './resource-form.svelte';
 </script>
@@ -18,5 +17,5 @@
             Learn about which resources are supported</a
         >.
     </svelte:fragment>
-    <ResourceForm {provider} {formData} projectSdk={getSdkForProject($selectedProject)} />
+    <ResourceForm {provider} {formData} projectSdk={sdk.forProject('fra1', $selectedProject)} />
 </WizardStep>
diff --git a/src/routes/(console)/(migration-wizard)/wizard.svelte b/src/routes/(console)/(migration-wizard)/wizard.svelte
index 44bc33026b..15fee1c47e 100644
--- a/src/routes/(console)/(migration-wizard)/wizard.svelte
+++ b/src/routes/(console)/(migration-wizard)/wizard.svelte
@@ -3,7 +3,6 @@
     import type { WizardStepsType } from '$lib/layout/wizard.svelte';
     import Wizard from '$lib/layout/wizard.svelte';
     import { migrationFormToResources } from '$lib/stores/migration';
-    import { getSdkForProject } from '$lib/stores/sdk';
     import { wizard } from '$lib/stores/wizard';
     import { onDestroy } from 'svelte';
     import { formData, provider, selectedProject } from '.';
@@ -11,6 +10,7 @@
     import Step2 from './step2.svelte';
     import { requestedMigration } from '$routes/store';
     import { base } from '$app/paths';
+    import { sdk } from '$lib/stores/sdk';
 
     const onExit = () => {
         formData.reset();
@@ -21,12 +21,14 @@
         if ($provider.provider !== 'appwrite') return;
         const resources = migrationFormToResources($formData, $provider.provider);
 
-        await getSdkForProject($selectedProject).migrations.createAppwriteMigration(
-            resources,
-            $provider.endpoint,
-            $provider.projectID,
-            $provider.apiKey
-        );
+        await sdk
+            .forProject('fra1', $selectedProject)
+            .migrations.createAppwriteMigration(
+                resources,
+                $provider.endpoint,
+                $provider.projectID,
+                $provider.apiKey
+            );
 
         await invalidateAll();
         wizard.hide();
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 74df68b7b0..e7f43be1f9 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -34,7 +34,7 @@
     import { addSubPanel } from '$lib/commandCenter/subPanels';
     import { addNotification } from '$lib/stores/notifications';
     import { openMigrationWizard } from './(migration-wizard)';
-    import { project } from './project-[project]/store';
+    import { project } from './project-[region]-[project]/store';
     import { feedback } from '$lib/stores/feedback';
     import { hasStripePublicKey, isCloud, VARS } from '$lib/system';
     import { stripe } from '$lib/stores/stripe';
@@ -153,7 +153,9 @@
                 ({
                     label: kebabToSentenceCase(heading),
                     async callback() {
-                        await goto(`${base}/project-${$project.$id}/auth/security#${heading}`);
+                        await goto(
+                            `${base}/project-${$project.region}-${$project.$id}/auth/security#${heading}`
+                        );
                         scrollBy({ top: -100 });
                     },
                     disabled: !$project?.$id,
@@ -167,7 +169,7 @@
 
             keys: isOnSettingsLayout ? ['g', 'o'] : undefined,
             callback: () => {
-                goto(`${base}/project-${$project.$id}/settings`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/settings`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.endsWith('settings')),
@@ -179,7 +181,7 @@
 
             keys: isOnSettingsLayout ? ['g', 'd'] : undefined,
             callback: () => {
-                goto(`${base}/project-${$project.$id}/settings/domains`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/settings/domains`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('domains')),
@@ -190,7 +192,7 @@
             label: 'Go to webhooks',
             keys: isOnSettingsLayout ? ['g', 'w'] : undefined,
             callback: () => {
-                goto(`${base}/project-${$project.$id}/settings/webhooks`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/settings/webhooks`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('webhooks')),
@@ -202,7 +204,7 @@
             label: 'Go to migrations',
             keys: isOnSettingsLayout ? ['g', 'm'] : undefined,
             callback: () => {
-                goto(`${base}/project-${$project.$id}/settings/migrations`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/settings/migrations`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('migrations')),
@@ -214,7 +216,7 @@
             label: 'Go to SMTP settings',
             keys: isOnSettingsLayout ? ['g', 's'] : undefined,
             callback: () => {
-                goto(`${base}/project-${$project.$id}/settings/smtp`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/settings/smtp`);
             },
             disabled: !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('smtp')),
             group: isOnSettingsLayout ? 'navigation' : 'settings',
diff --git a/src/routes/(console)/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte
index fbeb783aff..af262f621c 100644
--- a/src/routes/(console)/account/payments/addressModal.svelte
+++ b/src/routes/(console)/account/payments/addressModal.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
+    import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Dependencies } from '$lib/constants';
@@ -27,8 +28,10 @@
     let error: string = null;
 
     onMount(async () => {
-        const countryList = await sdk.forProject.locale.listCountries();
-        const locale = await sdk.forProject.locale.get();
+        const countryList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .locale.listCountries();
+        const locale = await sdk.forProject($page.params.region, $page.params.project).locale.get();
         if (locale.countryCode) {
             country = locale.countryCode;
         }
diff --git a/src/routes/(console)/account/payments/billingAddress.svelte b/src/routes/(console)/account/payments/billingAddress.svelte
index ef51b3d5d1..482d7f88ae 100644
--- a/src/routes/(console)/account/payments/billingAddress.svelte
+++ b/src/routes/(console)/account/payments/billingAddress.svelte
@@ -20,6 +20,7 @@
     import { organizationList, type Organization } from '$lib/stores/organization';
     import { base } from '$app/paths';
     import { Pill } from '$lib/elements';
+    import { page } from '$app/stores';
 
     let show = false;
     let showEdit = false;
@@ -31,7 +32,9 @@
     let showLinked = [];
 
     onMount(async () => {
-        countryList = await sdk.forProject.locale.listCountries();
+        countryList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .locale.listCountries();
     });
 
     $: orgList = $organizationList.teams as unknown as Organization[];
diff --git a/src/routes/(console)/account/payments/editAddressModal.svelte b/src/routes/(console)/account/payments/editAddressModal.svelte
index bea14ab0e4..f60f01339a 100644
--- a/src/routes/(console)/account/payments/editAddressModal.svelte
+++ b/src/routes/(console)/account/payments/editAddressModal.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
+    import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Dependencies } from '$lib/constants';
@@ -21,8 +22,10 @@
     ];
 
     onMount(async () => {
-        const countryList = await sdk.forProject.locale.listCountries();
-        const locale = await sdk.forProject.locale.get();
+        const countryList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .locale.listCountries();
+        const locale = await sdk.forProject($page.params.region, $page.params.project).locale.get();
         if (locale.countryCode) {
             selectedAddress.country = locale.countryCode;
         }
diff --git a/src/routes/(console)/account/sessions/+page.svelte b/src/routes/(console)/account/sessions/+page.svelte
index 138e012a9f..38a9247213 100644
--- a/src/routes/(console)/account/sessions/+page.svelte
+++ b/src/routes/(console)/account/sessions/+page.svelte
@@ -29,7 +29,9 @@
     function getBrowser(clientCode: string) {
         const code = clientCode.toLowerCase();
         if (!isValueOfStringEnum(Browser, code)) return '';
-        return sdk.forProject.avatars.getBrowser(code, 40, 40);
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .avatars.getBrowser(code, 40, 40);
     }
 
     function logoutSessionId(sessionId: string) {
diff --git a/src/routes/(console)/bottomAlerts.ts b/src/routes/(console)/bottomAlerts.ts
index fa3e2d5082..f02ed2f299 100644
--- a/src/routes/(console)/bottomAlerts.ts
+++ b/src/routes/(console)/bottomAlerts.ts
@@ -21,7 +21,7 @@ if (isCloud) {
         importance: 8,
         cta: {
             text: 'Try now',
-            link: ({ project }) => `${base}/project-${project.$id}/databases`
+            link: ({ project }) => `${base}/project-${project.region}-${project.$id}/databases`
         },
         learnMore: {
             text: 'Learn more',
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index d163390725..8837779266 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -26,7 +26,7 @@
     import { loading } from '$routes/store';
     import type { Models } from '@appwrite.io/console';
     import { ID, Region } from '@appwrite.io/console';
-    import { openImportWizard } from '../project-[project]/settings/migrations/(import)';
+    import { openImportWizard } from '../project-[region]-[project]/settings/migrations/(import)';
     import { readOnly } from '$lib/stores/billing';
     import type { RegionList } from '$lib/sdk/billing';
     import { onMount } from 'svelte';
@@ -111,7 +111,7 @@
             trackEvent(Submit.ProjectCreate, {
                 teamId: $page.params.organization
             });
-            await goto(`${base}/project-${project.$id}/settings/migrations`);
+            await goto(`${base}/project-${project.region}-${project.$id}/settings/migrations`);
             openImportWizard();
             loading.set(false);
         } catch (e) {
@@ -175,7 +175,7 @@
                         project.platforms.map((platform) => getPlatformInfo(platform.type))
                     )}
                     <li>
-                        <GridItem1 href={`${base}/project-${project.$id}`}>
+                        <GridItem1 href={`${base}/project-${project.region}-${project.$id}`}>
                             <svelte:fragment slot="eyebrow">
                                 {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
                             </svelte:fragment>
diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 0eb06bbef7..13aabe204b 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -10,6 +10,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
+    import { page } from '$app/stores';
 
     export let show = false;
     let addresses: AddressesList;
@@ -40,11 +41,13 @@
                 : null
             : null;
 
-        const locale = await sdk.forProject.locale.get();
+        const locale = await sdk.forProject($page.params.region, $page.params.project).locale.get();
         if (locale?.countryCode) {
             country = locale.countryCode;
         }
-        const countryList = await sdk.forProject.locale.listCountries();
+        const countryList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .locale.listCountries();
         options = countryList.countries.map((country) => {
             return {
                 value: country.code,
diff --git a/src/routes/(console)/organization-[organization]/createProject.svelte b/src/routes/(console)/organization-[organization]/createProject.svelte
index 85bccc0f06..1d6cca340a 100644
--- a/src/routes/(console)/organization-[organization]/createProject.svelte
+++ b/src/routes/(console)/organization-[organization]/createProject.svelte
@@ -40,7 +40,7 @@
                 type: 'success',
                 message: `${name} has been created`
             });
-            await goto(`${base}/project-${project.$id}`);
+            await goto(`${base}/project-${project.region}-${project.$id}`);
         } catch (e) {
             error = e.message;
             trackError(e, Submit.ProjectCreate);
diff --git a/src/routes/(console)/organization-[organization]/createProjectCloud.svelte b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
index a8cfdcc15f..90a7c620df 100644
--- a/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
+++ b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
@@ -39,7 +39,7 @@
                 type: 'success',
                 message: `${$createProject.name} has been created`
             });
-            await goto(`${base}/project-${project.$id}`);
+            await goto(`${base}/project-${project.region}-${project.$id}`);
             wizard.hide();
         } catch (e) {
             addNotification({
diff --git a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
index ccf789e5ab..0cf4ef2457 100644
--- a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Button, FormList, InputEmail, InputSelect, InputText } from '$lib/elements/forms';
@@ -39,8 +40,10 @@
     let error: string;
 
     onMount(async () => {
-        const countryList = await sdk.forProject.locale.listCountries();
-        const locale = await sdk.forProject.locale.get();
+        const countryList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .locale.listCountries();
+        const locale = await sdk.forProject($page.params.region, $page.params.project).locale.get();
         if (locale.countryCode) {
             country = locale.countryCode;
         }
diff --git a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte
index 91cf374b55..cd7e3b7a65 100644
--- a/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/Soc2Modal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { FormList, InputEmail, InputSelect, InputText } from '$lib/elements/forms';
@@ -40,8 +41,10 @@
     let error: string;
 
     onMount(async () => {
-        const countryList = await sdk.forProject.locale.listCountries();
-        const locale = await sdk.forProject.locale.get();
+        const countryList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .locale.listCountries();
+        const locale = await sdk.forProject($page.params.region, $page.params.project).locale.get();
         if (locale.countryCode) {
             country = locale.countryCode;
         }
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 5516b61b78..278f0c94fa 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -21,8 +21,8 @@
     export let projects: OrganizationUsage['projects'];
     export let metric: Metric;
 
-    function getProjectUsageLink(projectId: string): string {
-        return `${base}/project-${projectId}/settings/usage`;
+    function getProjectUsageLink(region: string, projectId: string): string {
+        return `${base}/project-${region}-${projectId}/settings/usage`;
     }
 
     function groupByProject(metric: Metric): Array<{ projectId: string; usage: number }> {
@@ -71,7 +71,8 @@
                             <TableCell title="Usage">{format(project.usage)}</TableCell>
                         </TableRow>
                     {:else}
-                        <TableRowLink href={getProjectUsageLink(project.projectId)}>
+                        <TableRowLink
+                            href={getProjectUsageLink(project.region ?? 'fra1', project.projectId)}>
                             <TableCell title="Project">
                                 {data.projectNames[project.projectId]?.name ?? 'Unknown'}
                             </TableCell>
diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.ts b/src/routes/(console)/project-[project]/auth/templates/+page.ts
deleted file mode 100644
index e797770de1..0000000000
--- a/src/routes/(console)/project-[project]/auth/templates/+page.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { sdk } from '$lib/stores/sdk';
-
-export const load = async () => {
-    const codes = await sdk.forProject.locale.listCodes();
-    return {
-        localeCodes: codes.localeCodes
-    };
-};
diff --git a/src/routes/(console)/project-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[project]/messaging/providers/create.svelte
deleted file mode 100644
index 09c3c22687..0000000000
--- a/src/routes/(console)/project-[project]/messaging/providers/create.svelte
+++ /dev/null
@@ -1,168 +0,0 @@
-<script lang="ts">
-    import { Wizard } from '$lib/layout';
-    import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-    import Provider from './wizard/provider.svelte';
-    import Settings from './wizard/settings.svelte';
-    import { sdk } from '$lib/stores/sdk';
-    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { addNotification } from '$lib/stores/notifications';
-    import { goto } from '$app/navigation';
-    import { base } from '$app/paths';
-    import { project } from '../../store';
-    import { wizard } from '$lib/stores/wizard';
-    import { provider, providerParams } from './wizard/store';
-    import { ID, type Models } from '@appwrite.io/console';
-    import { Providers } from '../provider.svelte';
-
-    async function create() {
-        try {
-            let response: Models.Provider;
-            const providerId = $providerParams[$provider].providerId || ID.unique();
-            switch ($provider) {
-                case Providers.Twilio:
-                    response = await sdk.forProject.messaging.createTwilioProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].from,
-                        $providerParams[$provider].accountSid,
-                        $providerParams[$provider].authToken,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.Msg91:
-                    response = await sdk.forProject.messaging.createMsg91Provider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].templateId,
-                        $providerParams[$provider].senderId,
-                        $providerParams[$provider].authKey,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.Telesign:
-                    response = await sdk.forProject.messaging.createTelesignProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].from,
-                        $providerParams[$provider].customerId,
-                        $providerParams[$provider].apiKey,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.Textmagic:
-                    response = await sdk.forProject.messaging.createTextmagicProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].from,
-                        $providerParams[$provider].username,
-                        $providerParams[$provider].apiKey,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.Vonage:
-                    response = await sdk.forProject.messaging.createVonageProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].from,
-                        $providerParams[$provider].apiKey,
-                        $providerParams[$provider].apiSecret,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.Mailgun:
-                    response = await sdk.forProject.messaging.createMailgunProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].apiKey,
-                        $providerParams[$provider].domain,
-                        $providerParams[$provider].isEuRegion,
-                        $providerParams[$provider].fromName || undefined,
-                        $providerParams[$provider].fromEmail,
-                        $providerParams[$provider].replyToName || undefined,
-                        $providerParams[$provider].replyToEmail || undefined,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.Sendgrid:
-                    response = await sdk.forProject.messaging.createSendgridProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].apiKey,
-                        $providerParams[$provider].fromName || undefined,
-                        $providerParams[$provider].fromEmail,
-                        $providerParams[$provider].replyToName || undefined,
-                        $providerParams[$provider].replyToEmail || undefined,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.SMTP:
-                    response = await sdk.forProject.messaging.createSmtpProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].host,
-                        $providerParams[$provider].port || undefined,
-                        $providerParams[$provider].username || undefined,
-                        $providerParams[$provider].password || undefined,
-                        $providerParams[$provider].encryption,
-                        $providerParams[$provider].autoTLS,
-                        $providerParams[$provider].mailer || undefined,
-                        $providerParams[$provider].fromName || undefined,
-                        $providerParams[$provider].fromEmail,
-                        $providerParams[$provider].replyToName || undefined,
-                        $providerParams[$provider].replyToEmail || undefined,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.FCM:
-                    response = await sdk.forProject.messaging.createFcmProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        JSON.parse($providerParams[$provider].serviceAccountJSON),
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-                case Providers.APNS:
-                    response = await sdk.forProject.messaging.createApnsProvider(
-                        providerId,
-                        $providerParams[$provider].name,
-                        $providerParams[$provider].authKey,
-                        $providerParams[$provider].authKeyId,
-                        $providerParams[$provider].teamId,
-                        $providerParams[$provider].bundleId,
-                        $providerParams[$provider].sandbox,
-                        $providerParams[$provider].enabled
-                    );
-                    break;
-            }
-            wizard.hide();
-            addNotification({
-                type: 'success',
-                message: `${response.name} has been created`
-            });
-            trackEvent(Submit.MessagingProviderCreate, {
-                provider: $provider
-            });
-            await goto(
-                `${base}/project-${$project.$id}/messaging/providers/provider-${response.$id}`
-            );
-        } catch (error) {
-            addNotification({
-                type: 'error',
-                message: error.message
-            });
-            trackError(error, Submit.MessagingProviderCreate);
-        }
-    }
-
-    const stepsComponents: WizardStepsType = new Map();
-    stepsComponents.set(1, {
-        label: 'Provider',
-        component: Provider
-    });
-    stepsComponents.set(2, {
-        label: 'Settings',
-        component: Settings
-    });
-</script>
-
-<Wizard title="Create provider" steps={stepsComponents} on:finish={create} />
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
deleted file mode 100644
index c7af0e6ad1..0000000000
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
+++ /dev/null
@@ -1,248 +0,0 @@
-<script lang="ts">
-    import { sdk } from '$lib/stores/sdk';
-    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { addNotification } from '$lib/stores/notifications';
-    import { invalidate } from '$app/navigation';
-    import type { ProviderInput } from '../store';
-    import { Providers, getProviderDisplayNameAndIcon } from '../../provider.svelte';
-    import { Dependencies } from '$lib/constants';
-    import { MessagingProviderType, type Models } from '@appwrite.io/console';
-    import SettingsFormList from '../settingsFormList.svelte';
-    import { CardGrid, Heading } from '$lib/components';
-    import { Button, Form } from '$lib/elements/forms';
-    import { onMount } from 'svelte';
-    import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte';
-
-    export let inputs: (ProviderInput | ProviderInput[])[];
-    export let providerType: MessagingProviderType;
-    export let provider: Providers;
-    export let providerId: string;
-    export let params: object;
-
-    let flattened: ProviderInput[] = [];
-    let formValues: object = {};
-    let originalfiles: Record<string, FileList> = {};
-    let files: Record<string, FileList> = {};
-    let updated = false;
-    let newMemberModal = false;
-    let message = '';
-    let ready = false;
-
-    const { displayName } = getProviderDisplayNameAndIcon(provider);
-
-    switch (providerType) {
-        case MessagingProviderType.Push:
-            message = 'notifications';
-            break;
-        case MessagingProviderType.Sms:
-            message = 'SMS';
-            break;
-        case MessagingProviderType.Email:
-            message = 'emails';
-            break;
-    }
-
-    onMount(() => {
-        flattened = [];
-        for (const i of inputs) {
-            if (Array.isArray(i)) {
-                flattened.push(...i);
-            } else {
-                flattened.push(i);
-            }
-        }
-        for (const input of flattened) {
-            const value = params[input.name];
-            formValues[input.name] = value;
-            if (input.type === 'file' && typeof value == 'string' && value.length > 0) {
-                const dataTransfer = new DataTransfer();
-                const f = new File([value], `${input.name}.${input.allowedFileExtensions}`);
-                dataTransfer.items.add(f);
-                files[input.name] = dataTransfer.files;
-                originalfiles[input.name] = dataTransfer.files;
-            }
-        }
-        ready = true;
-    });
-
-    async function update() {
-        try {
-            const promises = [];
-            for (const [key, value] of Object.entries(files)) {
-                const promise = value[0].text().then((text) => {
-                    formValues[key] = text;
-                });
-                promises.push(promise);
-            }
-            await Promise.all(promises);
-            let response: Models.Provider;
-            switch (provider) {
-                case Providers.Twilio:
-                    response = await sdk.forProject.messaging.updateTwilioProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['accountSid'],
-                        formValues['authToken'],
-                        formValues['from']
-                    );
-                    break;
-                case Providers.Msg91:
-                    response = await sdk.forProject.messaging.updateMsg91Provider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['templateId'],
-                        formValues['senderId'],
-                        formValues['authKey']
-                    );
-                    break;
-                case Providers.Telesign:
-                    response = await sdk.forProject.messaging.updateTelesignProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['customerId'],
-                        formValues['apiKey'],
-                        formValues['from']
-                    );
-                    break;
-                case Providers.Textmagic:
-                    response = await sdk.forProject.messaging.updateTextmagicProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['username'],
-                        formValues['apiKey'],
-                        formValues['from']
-                    );
-                    break;
-                case Providers.Vonage:
-                    response = await sdk.forProject.messaging.updateVonageProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['apiKey'],
-                        formValues['apiSecret'],
-                        formValues['from']
-                    );
-                    break;
-                case Providers.Mailgun:
-                    response = await sdk.forProject.messaging.updateMailgunProvider(
-                        providerId,
-                        undefined,
-                        formValues['apiKey'],
-                        formValues['domain'],
-                        formValues['isEuRegion'],
-                        undefined,
-                        formValues['fromName'] || undefined,
-                        formValues['fromEmail'],
-                        formValues['replyToName'] || undefined,
-                        formValues['replyToEmail'] || undefined
-                    );
-                    break;
-                case Providers.Sendgrid:
-                    response = await sdk.forProject.messaging.updateSendgridProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['apiKey'],
-                        formValues['fromName'] || undefined,
-                        formValues['fromEmail'],
-                        formValues['replyToName'] || undefined,
-                        formValues['replyToEmail'] || undefined
-                    );
-                    break;
-                case Providers.SMTP:
-                    response = await sdk.forProject.messaging.updateSmtpProvider(
-                        providerId,
-                        undefined,
-                        formValues['host'],
-                        formValues['port'] || undefined,
-                        formValues['username'] || undefined,
-                        formValues['password'] || undefined,
-                        formValues['encryption'],
-                        formValues['autoTLS'],
-                        undefined,
-                        formValues['fromName'] || undefined,
-                        formValues['fromEmail'],
-                        formValues['replyToName'] || undefined,
-                        formValues['replyToEmail'] || undefined
-                    );
-                    break;
-                case Providers.FCM:
-                    response = await sdk.forProject.messaging.updateFcmProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        JSON.parse(formValues['serviceAccountJSON'])
-                    );
-                    break;
-                case Providers.APNS:
-                    response = await sdk.forProject.messaging.updateApnsProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        formValues['authKey'],
-                        formValues['authKeyId'],
-                        formValues['teamId'],
-                        formValues['bundleId'],
-                        formValues['sandbox']
-                    );
-                    break;
-            }
-            originalfiles = files;
-            await invalidate(Dependencies.MESSAGING_PROVIDER);
-            addNotification({
-                type: 'success',
-                message: `${response.name} has been updated`
-            });
-            trackEvent(Submit.MessagingProviderUpdate, {
-                provider: provider
-            });
-        } catch (error) {
-            addNotification({
-                type: 'error',
-                message: error.message
-            });
-            trackError(error, Submit.MessagingProviderUpdate);
-        }
-    }
-
-    $: updated =
-        flattened
-            .filter((input) => input.type !== 'file')
-            .some((input) => formValues[input.name] !== params[input.name]) ||
-        Object.keys(files).some((key) => files[key] !== originalfiles[key]);
-</script>
-
-<Form onSubmit={update}>
-    <CardGrid>
-        <div class="grid-1-2-col-1 u-flex u-cross-center u-gap-16" data-private>
-            <Heading tag="h6" size="7">Settings</Heading>
-        </div>
-        <p>
-            Configure the settings to <Button
-                link
-                href={`https://appwrite.io/docs/products/messaging/${provider}`}
-                external>enable {displayName}</Button> to send {message}, or <Button
-                link
-                on:click={() => (newMemberModal = true)}>invite a team member</Button> to complete the
-            provider settings.
-        </p>
-        <svelte:fragment slot="aside">
-            <!-- Must wait until ready or else the files input won't be set properly -->
-            {#if ready}
-                <SettingsFormList bind:files {inputs} bind:params={formValues} />
-            {/if}
-        </svelte:fragment>
-
-        <svelte:fragment slot="actions">
-            <div class="u-flex u-flex-wrap u-gap-12">
-                <Button disabled={!updated} submit>Update</Button>
-            </div>
-        </svelte:fragment>
-    </CardGrid>
-</Form>
-
-<CreateMember bind:showCreate={newMemberModal} />
diff --git a/src/routes/(console)/project-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/+error.svelte
rename to src/routes/(console)/project-[region]-[project]/+error.svelte
diff --git a/src/routes/(console)/project-[project]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/+layout.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/+layout.svelte
index 501cb00488..b48d161ade 100644
--- a/src/routes/(console)/project-[project]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/+layout.svelte
@@ -38,7 +38,7 @@
         {
             label: 'Go to Auth',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/auth`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/auth`);
             },
             keys: ['g', 'a'],
             group: 'navigation'
@@ -46,7 +46,7 @@
         {
             label: 'Go to Databases',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/databases`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/databases`);
             },
             keys: ['g', 'd'],
             group: 'navigation',
@@ -55,7 +55,7 @@
         {
             label: 'Go to Functions',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/functions`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/functions`);
             },
             keys: ['g', 'f'],
             group: 'navigation',
@@ -64,7 +64,7 @@
         {
             label: 'Go to Messaging',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/messaging`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/messaging`);
             },
             keys: ['g', 'm'],
             disabled: $page.url.pathname.endsWith('messaging') || !$canSeeMessages,
@@ -73,7 +73,7 @@
         {
             label: 'Go to Storage',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/storage`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/storage`);
             },
             keys: ['g', 's'],
             group: 'navigation',
@@ -82,7 +82,7 @@
         {
             label: 'Go to Settings',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/settings`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/settings`);
             },
             keys: ['g', 'e'],
             group: 'navigation',
@@ -91,7 +91,7 @@
         {
             label: 'Go to Overview',
             callback: () => {
-                goto(`${base}/project-${$project.$id}`);
+                goto(`${base}/project-${$project.region}-${$project.$id}`);
             },
             keys: ['g', 'o'],
             group: 'navigation'
diff --git a/src/routes/(console)/project-[project]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts
similarity index 89%
rename from src/routes/(console)/project-[project]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/+layout.ts
index 11bbdbddc9..57df9d5285 100644
--- a/src/routes/(console)/project-[project]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/+layout.ts
@@ -1,5 +1,5 @@
 import { Dependencies } from '$lib/constants';
-import { getApiEndpoint, sdk } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { error } from '@sveltejs/kit';
 import type { LayoutLoad } from './$types';
 import { preferences } from '$lib/stores/preferences';
@@ -35,9 +35,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
             }
         }
 
-        console.log(getApiEndpoint(project.region));
-        sdk.forProject.client.setEndpoint(getApiEndpoint(project.region));
-
         return {
             project,
             organization,
diff --git a/src/routes/(console)/project-[project]/+page.ts b/src/routes/(console)/project-[region]-[project]/+page.ts
similarity index 68%
rename from src/routes/(console)/project-[project]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/+page.ts
index 200bfa8584..4662cf3307 100644
--- a/src/routes/(console)/project-[project]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/+page.ts
@@ -3,5 +3,5 @@ import { base } from '$app/paths';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
-    redirect(302, `${base}/project-${params.project}/overview`);
+    redirect(302, `${base}/project-${params.region}-${params.project}/overview`);
 };
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/appleOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/auth0OAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/authentikOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/gitlabOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/googleOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/microsoftOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/oidcOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/(providers)/oktaOAuth.svelte
diff --git a/src/routes/(console)/project-[project]/auth/+layout.svelte b/src/routes/(console)/project-[region]-[project]/auth/+layout.svelte
similarity index 85%
rename from src/routes/(console)/project-[project]/auth/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/+layout.svelte
index 9152250550..b679c32a63 100644
--- a/src/routes/(console)/project-[project]/auth/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/+layout.svelte
@@ -16,7 +16,7 @@
             label: 'Create user',
             callback: async () => {
                 if (!$page.url.pathname.endsWith('auth')) {
-                    await goto(`${base}/project-${$project.$id}/auth`);
+                    await goto(`${base}/project-${$project.region}-${$project.$id}/auth`);
                 }
                 showCreateUser.set(true);
             },
@@ -30,7 +30,7 @@
             label: 'Create team',
             callback: async () => {
                 if (!$page.url.pathname.endsWith('teams')) {
-                    await goto(`${base}/project-${$project.$id}/auth/teams`);
+                    await goto(`${base}/project-${$project.region}-${$project.$id}/auth/teams`);
                 }
                 showCreateTeam.set(true);
             },
@@ -45,7 +45,7 @@
             label: 'Go to teams',
             keys: ['g', 't'],
             callback() {
-                goto(`${base}/project-${$project.$id}/auth/teams`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/auth/teams`);
             },
             group: 'navigation',
             rank: 1,
@@ -55,7 +55,7 @@
             label: 'Go to usage',
             keys: ['g', 'u'],
             callback() {
-                goto(`${base}/project-${$project.$id}/auth/usage`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/auth/usage`);
             },
             group: 'navigation',
             rank: 1,
@@ -65,7 +65,7 @@
             label: 'Go to security',
             keys: ['g', 'e'],
             callback() {
-                goto(`${base}/project-${$project.$id}/auth/security`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/auth/security`);
             },
             group: 'navigation',
             rank: 1,
@@ -75,7 +75,7 @@
             label: 'Go to settings',
             keys: ['g', 's'],
             callback() {
-                goto(`${base}/project-${$project.$id}/auth/settings`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/auth/settings`);
             },
             group: 'navigation',
             rank: 1,
diff --git a/src/routes/(console)/project-[project]/auth/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/auth/+layout.ts
diff --git a/src/routes/(console)/project-[project]/auth/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/auth/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/+page.svelte
index 786ab63c29..04c306f15c 100644
--- a/src/routes/(console)/project-[project]/auth/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
@@ -36,9 +36,10 @@
 
     export let data: PageData;
 
-    const projectId = $page.params.project;
+    $: region = $page.params.region;
+    $: projectId = $page.params.project;
     async function userCreated(event: CustomEvent<Models.User<Record<string, unknown>>>) {
-        await goto(`${base}/project-${projectId}/auth/user-${event.detail.$id}`);
+        await goto(`${base}/project-${region}-${projectId}/auth/user-${event.detail.$id}`);
     }
 </script>
 
@@ -75,7 +76,8 @@
             </TableHeader>
             <TableBody>
                 {#each data.users.users as user}
-                    <TableRowLink href={`${base}/project-${projectId}/auth/user-${user.$id}`}>
+                    <TableRowLink
+                        href={`${base}/project-${region}-${projectId}/auth/user-${user.$id}`}>
                         <TableCell title="Name">
                             <div class="u-flex u-gap-12 u-cross-center">
                                 {#if user.email || user.phone}
@@ -148,7 +150,8 @@
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no users that match your search.</p>
             </div>
-            <Button href={`${base}/project-${projectId}/auth`} secondary>Clear Search</Button>
+            <Button href={`${base}/project-${region}-${projectId}/auth`} secondary
+                >Clear Search</Button>
         </EmptySearch>
     {:else}
         <Empty
diff --git a/src/routes/(console)/project-[project]/auth/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/+page.ts
similarity index 72%
rename from src/routes/(console)/project-[project]/auth/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/+page.ts
index de81bb4b1f..74ce23f313 100644
--- a/src/routes/(console)/project-[project]/auth/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/+page.ts
@@ -5,7 +5,7 @@ import { PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
 import { showCreateUser } from './+page.svelte';
 
-export const load: PageLoad = async ({ url, route }) => {
+export const load: PageLoad = async ({ url, route, params }) => {
     const page = getPage(url);
     const search = getSearch(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
@@ -20,9 +20,8 @@ export const load: PageLoad = async ({ url, route }) => {
         limit,
         search,
         page,
-        users: await sdk.forProject.users.list(
-            [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-            search
-        )
+        users: await sdk
+            .forProject(params.region, params.project)
+            .users.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search)
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/auth/createTeam.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
index 65528f2c00..3c8609da80 100644
--- a/src/routes/(console)/project-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal, CustomId } from '$lib/components';
     import { Pill } from '$lib/elements';
@@ -17,7 +18,9 @@
 
     const create = async () => {
         try {
-            const team = await sdk.forProject.teams.create(id ?? ID.unique(), name);
+            const team = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.create(id ?? ID.unique(), name);
             name = '';
             showCreate = false;
             showCustomId = false;
diff --git a/src/routes/(console)/project-[project]/auth/createUser.svelte b/src/routes/(console)/project-[region]-[project]/auth/createUser.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/auth/createUser.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/createUser.svelte
index cd8e57a7f4..50ebc497a1 100644
--- a/src/routes/(console)/project-[project]/auth/createUser.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createUser.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal, CustomId } from '$lib/components';
     import { Pill } from '$lib/elements/';
@@ -25,13 +26,15 @@
 
     const create = async () => {
         try {
-            const user = await sdk.forProject.users.create(
-                id ?? ID.unique(),
-                mail || undefined,
-                phone || undefined,
-                pass || undefined,
-                name || undefined
-            );
+            const user = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.create(
+                    id ?? ID.unique(),
+                    mail || undefined,
+                    phone || undefined,
+                    pass || undefined,
+                    name || undefined
+                );
             mail = pass = name = '';
             showCreate = false;
             showDropdown = false;
diff --git a/src/routes/(console)/project-[project]/auth/header.svelte b/src/routes/(console)/project-[region]-[project]/auth/header.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/auth/header.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/header.svelte
index c27fb06a92..4f537dcf24 100644
--- a/src/routes/(console)/project-[project]/auth/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/header.svelte
@@ -6,8 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
     import { canWriteProjects } from '$lib/stores/roles';
 
-    const projectId = $page.params.project;
-    const path = `${base}/project-${projectId}/auth`;
+    const path = `${base}/project-${$page.params.region}-${$page.params.project}/auth`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[project]/auth/security/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/mock-numbers-dark.png b/src/routes/(console)/project-[region]-[project]/auth/security/mock-numbers-dark.png
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/mock-numbers-dark.png
rename to src/routes/(console)/project-[region]-[project]/auth/security/mock-numbers-dark.png
diff --git a/src/routes/(console)/project-[project]/auth/security/mock-numbers-light.png b/src/routes/(console)/project-[region]-[project]/auth/security/mock-numbers-light.png
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/mock-numbers-light.png
rename to src/routes/(console)/project-[region]-[project]/auth/security/mock-numbers-light.png
diff --git a/src/routes/(console)/project-[project]/auth/security/updateMembershipPrivacy.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateMembershipPrivacy.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updateMembershipPrivacy.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updateMembershipPrivacy.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateMockNumbers.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updateMockNumbers.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updatePasswordDictionary.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updatePasswordDictionary.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updatePasswordDictionary.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updatePasswordHistory.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updatePasswordHistory.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updatePersonalDataCheck.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updatePersonalDataCheck.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updatePersonalDataCheck.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updatePersonalDataCheck.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updateSessionAlerts.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionAlerts.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updateSessionAlerts.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updateSessionAlerts.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updateSessionLength.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionLength.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updateSessionLength.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updateSessionLength.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionsLimit.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updateSessionsLimit.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updateSessionsLimit.svelte
diff --git a/src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateUsersLimit.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/security/updateUsersLimit.svelte
diff --git a/src/routes/(console)/project-[project]/auth/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/settings/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/settings/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/store.ts b/src/routes/(console)/project-[region]-[project]/auth/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/store.ts
rename to src/routes/(console)/project-[region]-[project]/auth/store.ts
diff --git a/src/routes/(console)/project-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/auth/teams/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte
index d73d425840..6a56398ad5 100644
--- a/src/routes/(console)/project-[project]/auth/teams/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte
@@ -37,8 +37,9 @@
     export let data: PageData;
 
     const project = $page.params.project;
+    const region = $page.params.region;
     const teamCreated = async (event: CustomEvent<Models.Team<Record<string, unknown>>>) => {
-        await goto(`${base}/project-${project}/auth/teams/team-${event.detail.$id}`);
+        await goto(`${base}/project-${region}-${project}/auth/teams/team-${event.detail.$id}`);
     };
 </script>
 
@@ -77,7 +78,8 @@
             </TableHeader>
             <TableBody service="teams" total={data.teams.total}>
                 {#each data.teams.teams as team}
-                    <TableRowLink href={`${base}/project-${project}/auth/teams/team-${team.$id}`}>
+                    <TableRowLink
+                        href={`${base}/project-${region}-${project}/auth/teams/team-${team.$id}`}>
                         <TableCell title="Name">
                             <div class="u-flex u-gap-12 u-cross-center">
                                 <AvatarInitials size={32} name={team.name} />
@@ -105,7 +107,9 @@
                 <b>Sorry, we couldn't find ‘{data.search}'</b>
                 <p>There are no teams that match your search.</p>
             </div>
-            <Button secondary href={`${base}/project-${$page.params.project}/auth/teams`}>
+            <Button
+                secondary
+                href={`${base}/project-${$page.params.region}-${$page.params.project}/auth/teams`}>
                 Clear Search
             </Button>
         </EmptySearch>
diff --git a/src/routes/(console)/project-[project]/auth/teams/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
similarity index 67%
rename from src/routes/(console)/project-[project]/auth/teams/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
index 8691685327..3f9e017937 100644
--- a/src/routes/(console)/project-[project]/auth/teams/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
@@ -4,7 +4,7 @@ import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load';
 import { PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ url, route }) => {
+export const load: PageLoad = async ({ url, route, params }) => {
     const page = getPage(url);
     const search = getSearch(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
@@ -15,9 +15,8 @@ export const load: PageLoad = async ({ url, route }) => {
         limit,
         search,
         page,
-        teams: await sdk.forProject.teams.list(
-            [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-            search
-        )
+        teams: await sdk
+            .forProject(params.region, params.project)
+            .teams.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search)
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts
similarity index 84%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts
index 6aabf07604..1134e2cf86 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts
@@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            team: await sdk.forProject.teams.get(params.team)
+            team: await sdk.forProject(params.region, params.project).teams.get(params.team)
         };
     } catch (e) {
         error(e.code, e.message);
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
similarity index 75%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
index bf12dffa41..7b33b57e89 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
@@ -12,9 +12,8 @@ export const load: PageLoad = async ({ params, url, route }) => {
     return {
         offset,
         limit,
-        logs: await sdk.forProject.messaging.listTopicLogs(params.topic, [
-            Query.limit(limit),
-            Query.offset(offset)
-        ])
+        logs: await sdk
+            .forProject(params.region, params.project)
+            .teams.listLogs(params.team, [Query.limit(limit), Query.offset(offset)])
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte
index 3a0eada370..b6ce1e98c1 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte
@@ -11,7 +11,7 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project?.name
         },
         {
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/createMembership.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/createMembership.svelte
index 0deda1696f..ffa94d0397 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/createMembership.svelte
@@ -18,15 +18,17 @@
 
     async function create() {
         try {
-            const user = await sdk.forProject.teams.createMembership(
-                teamId,
-                roles,
-                email || undefined,
-                undefined,
-                undefined,
-                `${$page.url.origin}${base}/invite`,
-                name || undefined
-            );
+            const user = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.createMembership(
+                    teamId,
+                    roles,
+                    email || undefined,
+                    undefined,
+                    undefined,
+                    `${$page.url.origin}${base}/invite`,
+                    name || undefined
+                );
             addNotification({
                 type: 'success',
                 message: `${name ? name : email} created successfully`
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/dangerZone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/dangerZone.svelte
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteMembership.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte
index 0d94968fb5..87c6625e29 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte
@@ -17,15 +17,14 @@
 
     const deleteMembership = async () => {
         try {
-            await sdk.forProject.teams.deleteMembership(
-                selectedMembership.teamId,
-                selectedMembership.$id
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.deleteMembership(selectedMembership.teamId, selectedMembership.$id);
             showDelete = false;
             dispatch('deleted');
             trackEvent(Submit.MemberDelete);
             await goto(
-                `${base}/project-${$page.params.project}/auth/teams/team-${selectedMembership.teamId}/members`
+                `${base}/project-${$page.params.region}-${$page.params.project}/auth/teams/team-${selectedMembership.teamId}/members`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte
index aab5dfa5d0..673706207f 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte
@@ -14,10 +14,10 @@
 
     const deleteTeam = async () => {
         try {
-            await sdk.forProject.teams.delete(team.$id);
+            await sdk.forProject($page.params.region, $page.params.project).teams.delete(team.$id);
             showDelete = false;
             trackEvent(Submit.TeamDelete);
-            await goto(`${base}/project-${$page.params.project}/auth/teams`);
+            await goto(`${base}/project-${$page.params.region}-${$page.params.project}/auth/teams`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/header.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/header.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/header.svelte
index d28321a6ac..1d0dd8981e 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/header.svelte
@@ -6,9 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
     import { team } from './store';
 
-    const projectId = $page.params.project;
-    const teamId = $page.params.team;
-    const path = `${base}/project-${projectId}/auth/teams/team-${teamId}`;
+    const path = `${base}/project-${$page.params.region}-${$page.params.project}/auth/teams/team-${$page.params.team}`;
     const tabs = [
         {
             href: path,
@@ -32,7 +30,8 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/auth/teams`}>
+        <CoverTitle
+            href={`${base}/project-${$page.params.region}-${$page.params.project}/auth/teams`}>
             {$team?.name}
         </CoverTitle>
         <Id value={$team?.$id} event="team">{$team?.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte
index d562a730a7..4530e4f726 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.svelte
@@ -60,7 +60,7 @@
                 {#each data.memberships.memberships as membership}
                     {@const username = membership.userName ? membership.userName : '-'}
                     <TableRowLink
-                        href={`${base}/project-${project}/auth/user-${membership.userId}`}>
+                        href={`${base}/project-${$page.params.region}-${project}/auth/user-${membership.userId}`}>
                         <TableCellText title="Name">
                             <div class="u-flex u-gap-12 u-cross-center">
                                 <AvatarInitials size={32} name={username} />
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts
similarity index 71%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts
index dede7fe004..c1094d2241 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts
@@ -16,10 +16,12 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
         offset,
         search,
         limit,
-        memberships: await sdk.forProject.teams.listMemberships(
-            teamId,
-            [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-            search
-        )
+        memberships: await sdk
+            .forProject(params.region, params.project)
+            .teams.listMemberships(
+                teamId,
+                [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
+                search
+            )
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/store.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/store.ts
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/store.ts
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte
index 8e0f511096..fe0325bde5 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte
@@ -18,7 +18,9 @@
 
     async function updateName() {
         try {
-            await sdk.forProject.teams.updateName($page.params.team, teamName);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.updateName($page.params.team, teamName);
             await invalidate(Dependencies.TEAM);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/updatePrefs.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/updatePrefs.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte
index be7e7a00ad..f3ddf58c5a 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/updatePrefs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte
@@ -8,6 +8,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { team } from './store';
+    import { page } from '$app/stores';
 
     $: if (prefs) {
         if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($team.prefs))) {
@@ -35,7 +36,9 @@
         try {
             let updatedPrefs = Object.fromEntries(prefs);
 
-            await sdk.forProject.teams.updatePrefs($team.$id, updatedPrefs);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.updatePrefs($team.$id, updatedPrefs);
             await invalidate(Dependencies.TEAM);
             arePrefsDisabled = true;
 
diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.ts
similarity index 55%
rename from src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/templates/+page.ts
index 15b3888716..b742d90785 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/+page.ts
@@ -2,7 +2,8 @@ import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
+    const codes = await sdk.forProject(params.region, params.project).locale.listCodes();
     return {
-        memberships: await sdk.forProject.users.listMemberships(params.user)
+        localeCodes: codes.localeCodes
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-dark.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-dark.png
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/email-footer-dark.png
rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-dark.png
diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-light.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-light.png
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/email-footer-light.png
rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-light.png
diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-dark.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-dark.png
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-dark.png
rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-dark.png
diff --git a/src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-light.png b/src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-light.png
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-light.png
rename to src/routes/(console)/project-[region]-[project]/auth/templates/email-footer-mobile-light.png
diff --git a/src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSignature.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailSignature.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailVerificationTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/emailVerificationTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/localeOptions.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/localeOptions.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/resetSms.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/resetSms.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/resetSms.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/resetSms.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/smsInvitationTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/smsInvitationTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/smsInvitationTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/smsInvitationTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/smsLoginTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/smsLoginTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/smsLoginTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/smsLoginTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/smsTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/smsTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/smsTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/smsTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/smsVerificationTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/smsVerificationTemplate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/smsVerificationTemplate.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/templates/smsVerificationTemplate.svelte
diff --git a/src/routes/(console)/project-[project]/auth/templates/store.ts b/src/routes/(console)/project-[region]-[project]/auth/templates/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/templates/store.ts
rename to src/routes/(console)/project-[region]-[project]/auth/templates/store.ts
diff --git a/src/routes/(console)/project-[project]/auth/updateOAuth.ts b/src/routes/(console)/project-[region]-[project]/auth/updateOAuth.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/updateOAuth.ts
rename to src/routes/(console)/project-[region]-[project]/auth/updateOAuth.ts
diff --git a/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.svelte
index 0310574040..b3c55a7428 100644
--- a/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.svelte
@@ -11,7 +11,7 @@
 
 <Usage
     title="Users"
-    path={`${base}/project-${$page.params.project}/auth/usage`}
+    path={`${base}/project-${$page.params.region}-${$page.params.project}/auth/usage`}
     countMetadata={{
         legend: 'Users',
         title: 'Registered users'
diff --git a/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts
similarity index 85%
rename from src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts
index 0b035de7c3..57ff9ed91d 100644
--- a/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params }) => {
         ? params.period
         : UserUsageRange.ThirtyDays;
     try {
-        return sdk.forProject.users.getUsage(period);
+        return sdk.forProject(params.region, params.project).users.getUsage(period);
     } catch (e) {
         error(e.code, e.message);
     }
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts
similarity index 78%
rename from src/routes/(console)/project-[project]/auth/user-[user]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts
index 092bc28973..698ceaab5a 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts
@@ -10,8 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     try {
         const [user, userFactors] = await Promise.all([
-            sdk.forProject.users.get(params.user),
-            sdk.forProject.users.listMfaFactors(params.user)
+            sdk.forProject(params.region, params.project).users.get(params.user),
+            sdk.forProject(params.region, params.project).users.listMfaFactors(params.user)
         ]);
 
         return {
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
similarity index 74%
rename from src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
index 4fb5bf0f9a..29b0048219 100644
--- a/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
@@ -8,13 +8,11 @@ export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
-
     return {
         offset,
         limit,
-        logs: await sdk.forProject.teams.listLogs(params.team, [
-            Query.limit(limit),
-            Query.offset(offset)
-        ])
+        logs: await sdk
+            .forProject(params.region, params.project)
+            .users.listLogs(params.user, [Query.limit(limit), Query.offset(offset)])
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/dangerZone.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte
index adce57f4aa..20ad60b709 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte
@@ -13,7 +13,9 @@
 
     async function deleteAllSessions() {
         try {
-            await sdk.forProject.users.deleteSessions($page.params.user);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.deleteSessions($page.params.user);
             await invalidate(Dependencies.SESSIONS);
             showDeleteAll = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/deleteMembership.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/auth/user-[user]/deleteMembership.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte
index f08c98a316..60ecfc2711 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/deleteMembership.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte
@@ -15,10 +15,9 @@
 
     async function deleteMembership() {
         try {
-            await sdk.forProject.teams.deleteMembership(
-                selectedMembership.teamId,
-                selectedMembership.$id
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .teams.deleteMembership(selectedMembership.teamId, selectedMembership.$id);
             await invalidate(Dependencies.MEMBERSHIPS);
             showDelete = false;
             addNotification({
@@ -27,7 +26,7 @@
             });
             trackEvent(Submit.MemberDelete);
             await goto(
-                `${base}/project-${$page.params.project}/auth/user-${selectedMembership.userId}/memberships`
+                `${base}/project-${$page.params.region}-${$page.params.project}/auth/user-${selectedMembership.userId}/memberships`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/deleteMfa.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/auth/user-[user]/deleteMfa.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte
index 26d586c60e..9f45e73cb0 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/deleteMfa.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte
@@ -8,6 +8,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { AuthenticatorType } from '@appwrite.io/console';
     import { user } from './store';
+    import { page } from '$app/stores';
 
     export let showDelete = false;
 
@@ -15,7 +16,9 @@
 
     async function deleteProvider() {
         try {
-            await sdk.forProject.users.deleteMfaAuthenticator($user.$id, AuthenticatorType.Totp);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.deleteMfaAuthenticator($user.$id, AuthenticatorType.Totp);
             await invalidate(Dependencies.USER);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/deleteSession.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/auth/user-[user]/deleteSession.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte
index 5e8474301b..412670b0e3 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/deleteSession.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte
@@ -13,7 +13,9 @@
 
     async function deleteSession() {
         try {
-            await sdk.forProject.users.deleteSession($page.params.user, selectedSessionId);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.deleteSession($page.params.user, selectedSessionId);
             await invalidate(Dependencies.SESSIONS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/deleteUser.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/auth/user-[user]/deleteUser.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte
index 35dbc8df80..62c56e4a32 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/deleteUser.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte
@@ -14,14 +14,14 @@
     let error: string;
     const deleteUser = async () => {
         try {
-            await sdk.forProject.users.delete($user.$id);
+            await sdk.forProject($page.params.region, $page.params.project).users.delete($user.$id);
             showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${$user.name ? $user.name : 'User'} has been deleted`
             });
             trackEvent(Submit.UserDelete);
-            await goto(`${base}/project-${$page.params.project}/auth`);
+            await goto(`${base}/project-${$page.params.region}-${$page.params.project}/auth`);
         } catch (e) {
             error = e.message;
             trackError(e, Submit.UserDelete);
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/header.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/header.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/auth/user-[user]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/header.svelte
index 86e0f119ac..a928de0ac7 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/header.svelte
@@ -6,9 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
     import { user } from './store';
 
-    const projectId = $page.params.project;
-    const userId = $page.params.user;
-    const path = `${base}/project-${projectId}/auth/user-${userId}`;
+    const path = `${base}/project-${$page.params.region}-${$page.params.project}/auth/user-${$page.params.user}`;
     const tabs = [
         {
             href: path,
@@ -46,7 +44,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/auth`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${$page.params.project}/auth`}>
             {$user.name ? $user.name : '-'}
         </CoverTitle>
         <Id value={$user.$id} event="user">{$user.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts
similarity index 73%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts
index 9f2a8116e0..475f950a56 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts
@@ -1,36 +1,40 @@
-import { Query } from '@appwrite.io/console';
-import { sdk } from '$lib/stores/sdk';
-import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load';
+import { queries, queryParamToMap } from '$lib/components/filters';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
+import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load';
+import { sdk } from '$lib/stores/sdk';
+import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
-import { queryParamToMap, queries } from '$lib/components/filters';
 
 export const load: PageLoad = async ({ params, url, route, depends }) => {
-    depends(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS);
+    depends(Dependencies.USER_IDENTITIES);
 
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
-    const search = getSearch(url);
     const query = getQuery(url);
+    const search = getSearch(url);
 
     const parsedQueries = queryParamToMap(query || '[]');
     queries.set(parsedQueries);
 
-    return {
-        offset,
-        limit,
-        search,
-        query,
-        subscribers: await sdk.forProject.messaging.listSubscribers(
-            params.topic,
+    const identities = await sdk
+        .forProject(params.region, params.project)
+        .users.listIdentities(
             [
+                Query.equal('userId', params.user),
                 Query.limit(limit),
                 Query.offset(offset),
                 Query.orderDesc(''),
                 ...parsedQueries.values()
             ],
-            search || undefined
-        )
+            search
+        );
+
+    return {
+        offset,
+        limit,
+        query,
+        search,
+        identities
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/identities/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/auth/user-[user]/identities/table.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
index 752ee062f8..89da1329b5 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/identities/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
@@ -23,6 +23,7 @@
     import { oAuthProviders } from '$lib/stores/oauth-providers';
     import { app } from '$lib/stores/app';
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
 
     export let columns: Column[];
     export let data: PageData;
@@ -34,7 +35,9 @@
     async function handleDelete() {
         showDelete = false;
 
-        const promises = selectedIds.map((id) => sdk.forProject.users.deleteIdentity(id));
+        const promises = selectedIds.map((id) =>
+            sdk.forProject($page.params.region, $page.params.project).users.deleteIdentity(id)
+        );
 
         try {
             await Promise.all(promises);
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte
index f7d708717b..81196ccc07 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.svelte
@@ -39,7 +39,7 @@
             <TableBody>
                 {#each data.memberships.memberships as membership}
                     <TableRowLink
-                        href={`${base}/project-${project}/auth/teams/team-${membership.teamId}`}>
+                        href={`${base}/project-${$page.params.region}-${project}/auth/teams/team-${membership.teamId}`}>
                         <TableCellText title="Name">
                             <div class="u-flex u-cross-center u-gap-12">
                                 <AvatarInitials size={32} name={membership.teamName} />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts
new file mode 100644
index 0000000000..6c80431581
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts
@@ -0,0 +1,10 @@
+import { sdk } from '$lib/stores/sdk';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ params }) => {
+    return {
+        memberships: await sdk
+            .forProject(params.region, params.project)
+            .users.listMemberships(params.user)
+    };
+};
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
index dea8b9e39d..1abb3d7cc5 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
@@ -18,6 +18,7 @@
     import DeleteAllSessions from '../deleteAllSessions.svelte';
     import DeleteSessions from '../deleteSession.svelte';
     import type { PageData } from './$types';
+    import { page } from '$app/stores';
 
     export let data: PageData;
 
@@ -28,7 +29,9 @@
     function getBrowser(clientCode: string) {
         const code = clientCode.toLowerCase();
         if (!isValueOfStringEnum(Browser, code)) return '';
-        return sdk.forProject.avatars.getBrowser(code, 40, 40);
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .avatars.getBrowser(code, 40, 40);
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts
similarity index 66%
rename from src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts
index 20a1e6f4ed..9d69ecb88b 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts
@@ -6,6 +6,8 @@ export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.SESSIONS);
 
     return {
-        sessions: await sdk.forProject.users.listSessions(params.user)
+        sessions: await sdk
+            .forProject(params.region, params.project)
+            .users.listSessions(params.user)
     };
 };
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/store.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/store.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
similarity index 75%
rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
index bb0f4968cb..c3dab9c6a9 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
@@ -16,19 +16,21 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     const parsedQueries = queryParamToMap(query || '[]');
     queries.set(parsedQueries);
 
-    const targets = await sdk.forProject.users.listTargets(params.user, [
-        Query.limit(limit),
-        Query.offset(offset),
-        Query.orderDesc(''),
-        ...parsedQueries.values()
-    ]);
+    const targets = await sdk
+        .forProject(params.region, params.project)
+        .users.listTargets(params.user, [
+            Query.limit(limit),
+            Query.offset(offset),
+            Query.orderDesc(''),
+            ...parsedQueries.values()
+        ]);
 
     const promisesById: Record<string, Promise<Models.Provider>> = {};
     targets.targets.forEach((target) => {
         if (target.providerId && !promisesById[target.providerId]) {
-            promisesById[target.providerId] = sdk.forProject.messaging.getProvider(
-                target.providerId
-            );
+            promisesById[target.providerId] = sdk
+                .forProject(params.region, params.project)
+                .messaging.getProvider(target.providerId);
         }
     });
 
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte
index db5825c29c..3560f8b4d3 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/create.svelte
@@ -28,14 +28,16 @@
 
     const create = async () => {
         try {
-            await sdk.forProject.users.createTarget(
-                $page.params.user,
-                id ? id : ID.unique(),
-                providerType,
-                identifier,
-                providerId ?? undefined,
-                name ?? undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.createTarget(
+                    $page.params.user,
+                    id ? id : ID.unique(),
+                    providerType,
+                    identifier,
+                    providerId ?? undefined,
+                    name ?? undefined
+                );
             show = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/store.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/store.ts
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/store.ts
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
index 4527d2a880..ef047b3993 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
@@ -15,8 +15,8 @@
     import type { PageData } from './$types';
     import { columns } from './store';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import ProviderType from '$routes/(console)/project-[project]/messaging/providerType.svelte';
-    import Provider from '$routes/(console)/project-[project]/messaging/provider.svelte';
+    import ProviderType from '$routes/(console)/project-[region]-[project]/messaging/providerType.svelte';
+    import Provider from '$routes/(console)/project-[region]-[project]/messaging/provider.svelte';
     import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -35,7 +35,9 @@
         showDelete = false;
 
         const promises = selectedIds.map((id) =>
-            sdk.forProject.users.deleteTarget($page.params.user, id)
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.deleteTarget($page.params.user, id)
         );
 
         try {
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte
index 8a18491e3a..73c99688ab 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte
@@ -8,15 +8,19 @@
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { user } from './store';
+    import { page } from '$app/stores';
 
     let userEmail: string = null;
+
     onMount(async () => {
         userEmail ??= $user.email;
     });
 
     async function updateEmail() {
         try {
-            await sdk.forProject.users.updateEmail($user.$id, userEmail);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updateEmail($user.$id, userEmail);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: 'Email has been updated',
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte
index 5d28ed15c7..cb3a3a0304 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte
@@ -10,6 +10,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { user } from './store';
     import { Pill } from '$lib/elements';
+    import { page } from '$app/stores';
 
     const alphaNumericRegExp = /^[a-zA-Z0-9]+$/;
     let suggestedLabels = ['admin', 'premium', 'mvp'];
@@ -22,7 +23,9 @@
 
     async function updateLabels() {
         try {
-            await sdk.forProject.users.updateLabels($user.$id, labels);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updateLabels($user.$id, labels);
             await invalidate(Dependencies.USER);
             isDisabled = true;
 
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte
index 47827068dd..a1f4b83dee 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte
@@ -20,6 +20,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { Dependencies } from '$lib/constants';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { page } from '$app/stores';
 
     let showDelete = false;
     let userMfa: boolean = null;
@@ -30,7 +31,9 @@
 
     async function updateMfa() {
         try {
-            await sdk.forProject.users.updateMfa($user.$id, userMfa);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updateMfa($user.$id, userMfa);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `Multi-factor authentication has been ${userMfa ? 'enabled' : 'disabled'}`,
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte
index 74d9db9cce..8ec2ff0d18 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte
@@ -8,6 +8,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { user } from './store';
+    import { page } from '$app/stores';
 
     let userName: string = null;
     onMount(async () => {
@@ -16,7 +17,9 @@
 
     async function updateName() {
         try {
-            await sdk.forProject.users.updateName($user.$id, userName);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updateName($user.$id, userName);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte
index 0045cb093a..4c315e7164 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte
@@ -5,12 +5,15 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { user } from './store';
+    import { page } from '$app/stores';
 
     let newPassword: string = null;
 
     async function updatePassword() {
         try {
-            await sdk.forProject.users.updatePassword($user.$id, newPassword);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updatePassword($user.$id, newPassword);
             newPassword = null;
             addNotification({
                 message: 'Password has been updated',
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte
index 55bd4a771e..1a2e3d92b9 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte
@@ -8,6 +8,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { user } from './store';
+    import { page } from '$app/stores';
 
     let userPhone: string = null;
     onMount(async () => {
@@ -16,7 +17,9 @@
 
     async function updatePhone() {
         try {
-            await sdk.forProject.users.updatePhone($user.$id, userPhone);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updatePhone($user.$id, userPhone);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: 'Phone has been updated',
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte
index 42e685a231..1819d87832 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte
@@ -8,6 +8,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { user } from './store';
+    import { page } from '$app/stores';
 
     $: if (prefs) {
         if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($user.prefs))) {
@@ -31,7 +32,9 @@
         try {
             let updatedPrefs = Object.fromEntries(prefs);
 
-            await sdk.forProject.users.updatePrefs($user.$id, updatedPrefs);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updatePrefs($user.$id, updatedPrefs);
             await invalidate(Dependencies.USER);
             arePrefsDisabled = true;
 
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte
rename to src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte
index fcc6fd09ac..927ec8f8f5 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
+    import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { AvatarInitials, CardGrid, DropList, DropListItem, Heading } from '$lib/components';
     import { Dependencies } from '$lib/constants';
@@ -15,7 +16,9 @@
     async function updateVerificationEmail() {
         showVerificationDropdown = false;
         try {
-            await sdk.forProject.users.updateEmailVerification($user.$id, !$user.emailVerification);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updateEmailVerification($user.$id, !$user.emailVerification);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${
@@ -35,7 +38,9 @@
     async function updateVerificationPhone() {
         showVerificationDropdown = false;
         try {
-            await sdk.forProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updatePhoneVerification($user.$id, !$user.phoneVerification);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${
@@ -54,7 +59,9 @@
     }
     async function updateStatus() {
         try {
-            await sdk.forProject.users.updateStatus($user.$id, !$user.status);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .users.updateStatus($user.$id, !$user.status);
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${
diff --git a/src/routes/(console)/project-[project]/createVariable.svelte b/src/routes/(console)/project-[region]-[project]/createVariable.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/createVariable.svelte
rename to src/routes/(console)/project-[region]-[project]/createVariable.svelte
index 479f6ec425..864b8125eb 100644
--- a/src/routes/(console)/project-[project]/createVariable.svelte
+++ b/src/routes/(console)/project-[region]-[project]/createVariable.svelte
@@ -50,7 +50,7 @@
             <Alert type="info">
                 <p class="text">
                     When there is a naming conflict with a global variable in your <a
-                        href={`${base}/project-${$project.$id}/settings/variables`}
+                        href={`${base}/project-${$project.region}-${$project.$id}/settings/variables`}
                         title="Project settings"
                         class="link">
                         project settings</a> and a function environment variable, the global variable
diff --git a/src/routes/(console)/project-[project]/databases/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/+layout.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/databases/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/+layout.svelte
index ac8c9b711e..4b48dc9dc5 100644
--- a/src/routes/(console)/project-[project]/databases/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/+layout.svelte
@@ -10,7 +10,7 @@
         {
             label: 'Go to usage',
             callback: () => {
-                goto(`${base}/project-${$project.$id}/databases/usage`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/databases/usage`);
             },
             keys: ['g', 'u'],
             disabled:
diff --git a/src/routes/(console)/project-[project]/databases/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/databases/+layout.ts
diff --git a/src/routes/(console)/project-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/+page.svelte
index 9f8faa535d..775a1a7b9d 100644
--- a/src/routes/(console)/project-[project]/databases/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
@@ -24,7 +24,9 @@
 
     async function handleCreate(event: CustomEvent<Models.Database>) {
         showCreate = false;
-        await goto(`${base}/project-${project}/databases/database-${event.detail.$id}`);
+        await goto(
+            `${base}/project-${$page.params.region}-${project}/databases/database-${event.detail.$id}`
+        );
     }
 
     $: $registerCommands([
diff --git a/src/routes/(console)/project-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
similarity index 68%
rename from src/routes/(console)/project-[project]/databases/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/+page.ts
index 216194f28b..1758424ff5 100644
--- a/src/routes/(console)/project-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -28,11 +28,9 @@ export const load: PageLoad = async ({ url, route, depends }) => {
 
 // TODO: @itznotabug we should improve this!
 async function fetchDatabasesAndBackups(limit: number, offset: number) {
-    const databases = await sdk.forProject.databases.list([
-        Query.limit(limit),
-        Query.offset(offset),
-        Query.orderDesc('$createdAt')
-    ]);
+    const databases = await sdk
+        .forProject(params.region, params.project)
+        .databases.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')]);
 
     const [policies, lastBackups] = await Promise.all([
         await fetchPolicies(databases),
@@ -48,12 +46,14 @@ async function fetchPolicies(databases: Models.DatabaseList) {
     await Promise.all(
         databases.databases.map(async (database) => {
             try {
-                const { policies } = await sdk.forProject.backups.listPolicies([
-                    // TODO: are all needed!?
-                    // Query.limit(3),
-                    Query.equal('resourceType', 'database'),
-                    Query.equal('resourceId', database.$id)
-                ]);
+                const { policies } = await sdk
+                    .forProject(params.region, params.project)
+                    .backups.listPolicies([
+                        // TODO: are all needed!?
+                        // Query.limit(3),
+                        Query.equal('resourceType', 'database'),
+                        Query.equal('resourceId', database.$id)
+                    ]);
 
                 if (policies.length > 0) {
                     databasePolicies[database.$id] = policies;
@@ -73,12 +73,14 @@ async function fetchLastBackups(databases: Models.DatabaseList) {
     await Promise.all(
         databases.databases.map(async (database) => {
             try {
-                const { archives } = await sdk.forProject.backups.listArchives([
-                    Query.limit(1),
-                    Query.orderDesc('$createdAt'),
-                    Query.equal('resourceType', 'database'),
-                    Query.equal('resourceId', database.$id)
-                ]);
+                const { archives } = await sdk
+                    .forProject(params.region, params.project)
+                    .backups.listArchives([
+                        Query.limit(1),
+                        Query.orderDesc('$createdAt'),
+                        Query.equal('resourceType', 'database'),
+                        Query.equal('resourceId', database.$id)
+                    ]);
 
                 if (archives.length > 0) {
                     lastBackups[database.$id] = timeFromNow(archives[0].$createdAt);
diff --git a/src/routes/(console)/project-[project]/databases/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/databases/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/create.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/databases/create.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/create.svelte
index 4dc4aa85e6..56443998d0 100644
--- a/src/routes/(console)/project-[project]/databases/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/create.svelte
@@ -13,6 +13,7 @@
     import { upgradeURL } from '$lib/stores/billing';
     import CreatePolicy from './database-[database]/backups/createPolicy.svelte';
     import { cronExpression, type UserBackupPolicy } from '$lib/helpers/backups';
+    import { page } from '$app/stores';
 
     export let showCreate = false;
     let totalPolicies: UserBackupPolicy[] = [];
@@ -59,14 +60,16 @@
         const totalPoliciesPromise = totalPolicies.map((policy) => {
             cronExpression(policy);
 
-            return sdk.forProject.backups.createPolicy(
-                ID.unique(),
-                ['databases'],
-                policy.retained,
-                policy.schedule,
-                policy.label,
-                resourceId
-            );
+            return sdk
+                .forProject($page.params.region, $page.params.project)
+                .backups.createPolicy(
+                    ID.unique(),
+                    ['databases'],
+                    policy.retained,
+                    policy.schedule,
+                    policy.label,
+                    resourceId
+                );
         });
 
         await Promise.all(totalPoliciesPromise);
@@ -76,7 +79,9 @@
     const create = async () => {
         try {
             const databaseId = id ? id : ID.unique();
-            const database = await sdk.forProject.databases.create(databaseId, name);
+            const database = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.create(databaseId, name);
             await createPolicies(databaseId);
 
             showCreate = false;
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
similarity index 77%
rename from src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index ecf3610eeb..5b887916ad 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -24,7 +24,7 @@
         $showCreate = false;
         await invalidate(Dependencies.DATABASE);
         await goto(
-            `${base}/project-${project}/databases/database-${databaseId}/collection-${event.detail.$id}`
+            `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/collection-${event.detail.$id}`
         );
     }
 
@@ -34,7 +34,9 @@
             callback() {
                 $showCreate = true;
                 if (!$page.url.pathname.endsWith(databaseId)) {
-                    goto(`${base}/project-${project}/databases/database-${databaseId}`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}`
+                    );
                 }
             },
             keys: $page.url.pathname.endsWith(databaseId) ? ['c'] : ['c', 'c'],
@@ -46,7 +48,9 @@
             label: 'Create backup policy',
             callback: async () => {
                 if (!$page.url.pathname.endsWith('backups')) {
-                    goto(`${base}/project-${project}/databases/database-${databaseId}/backups`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/backups`
+                    );
                 }
                 showCreatePolicy.set(true);
             },
@@ -59,7 +63,9 @@
             label: 'Create manual backup',
             callback: async () => {
                 if (!$page.url.pathname.endsWith('backups')) {
-                    goto(`${base}/project-${project}/databases/database-${databaseId}/backups`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/backups`
+                    );
                 }
                 showCreateBackup.set(true);
             },
@@ -71,7 +77,9 @@
         {
             label: 'Go to collections',
             callback() {
-                goto(`${base}/project-${project}/databases/database-${databaseId}`);
+                goto(
+                    `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}`
+                );
             },
             disabled:
                 $page.url.pathname.endsWith(databaseId) ||
@@ -82,7 +90,9 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`${base}/project-${project}/databases/database-${databaseId}/usage`);
+                goto(
+                    `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/usage`
+                );
             },
             disabled:
                 $page.url.pathname.includes('/usage') || $page.url.pathname.includes('collection-'),
@@ -92,7 +102,9 @@
         {
             label: 'Go to backups',
             callback() {
-                goto(`${base}/project-${project}/databases/database-${databaseId}/backups`);
+                goto(
+                    `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/backups`
+                );
             },
             disabled:
                 $page.url.pathname.includes('/backups') ||
@@ -103,7 +115,9 @@
         {
             label: 'Go to settings',
             callback() {
-                goto(`${base}/project-${project}/databases/database-${databaseId}/settings`);
+                goto(
+                    `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/settings`
+                );
             },
             disabled:
                 $page.url.pathname.includes('/settings') ||
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
similarity index 79%
rename from src/routes/(console)/project-[project]/databases/database-[database]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
index ddf96d3d4e..b8eee53614 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
@@ -12,7 +12,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            database: await sdk.forProject.databases.get(params.database)
+            database: await sdk
+                .forProject(params.region, params.project)
+                .databases.get(params.database)
         };
     } catch (e) {
         error(e.code, e.message);
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
similarity index 72%
rename from src/routes/(console)/project-[project]/databases/database-[database]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
index 03433c2a23..57d5f5f0e0 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
@@ -10,11 +10,13 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     const limit = getLimit(url, route, CARD_LIMIT);
     const view = getView(url, route, View.Grid);
     const offset = pageToOffset(page, limit);
-    const collections = await sdk.forProject.databases.listCollections(params.database, [
-        Query.limit(limit),
-        Query.offset(offset),
-        Query.orderDesc('')
-    ]);
+    const collections = await sdk
+        .forProject(params.region, params.project)
+        .databases.listCollections(params.database, [
+            Query.limit(limit),
+            Query.offset(offset),
+            Query.orderDesc('')
+        ]);
 
     return {
         offset,
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/[[page]]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/[[page]]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/[[page]]/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/[[page]]/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
index a8837be156..d992dc620f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
@@ -21,6 +21,7 @@
     import { showCreateBackup, showCreatePolicy } from './store';
     import { getProjectId } from '$lib/helpers/project';
     import { trackEvent } from '$lib/actions/analytics';
+    import { page } from '$app/stores';
 
     let policyCreateError: string;
     let totalPolicies: UserBackupPolicy[] = [];
@@ -72,7 +73,9 @@
 
     const createManualBackup = async () => {
         try {
-            await sdk.forProject.backups.createArchive(['databases'], data.database.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .backups.createArchive(['databases'], data.database.$id);
             addNotification({
                 type: 'success',
                 message: 'Database backup has started'
@@ -123,14 +126,16 @@
         const totalPoliciesPromise = totalPolicies.map((policy) => {
             cronExpression(policy);
 
-            return sdk.forProject.backups.createPolicy(
-                ID.unique(),
-                ['databases'],
-                policy.retained,
-                policy.schedule,
-                policy.label,
-                data.database.$id
-            );
+            return sdk
+                .forProject($page.params.region, $page.params.project)
+                .backups.createPolicy(
+                    ID.unique(),
+                    ['databases'],
+                    policy.retained,
+                    policy.schedule,
+                    policy.label,
+                    data.database.$id
+                );
         });
 
         try {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts
similarity index 74%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts
index 6014bbc283..5e12a3c05f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts
@@ -16,19 +16,23 @@ export const load = async ({ params, url, route, depends }) => {
 
     try {
         [backups, policies] = await Promise.all([
-            sdk.forProject.backups.listArchives([
-                Query.limit(limit),
-                Query.offset(offset),
-                Query.orderDesc('$createdAt'),
-                Query.equal('resourceType', 'database'),
-                Query.equal('resourceId', params.database)
-            ]),
+            sdk
+                .forProject(params.region, params.project)
+                .backups.listArchives([
+                    Query.limit(limit),
+                    Query.offset(offset),
+                    Query.orderDesc('$createdAt'),
+                    Query.equal('resourceType', 'database'),
+                    Query.equal('resourceId', params.database)
+                ]),
 
-            sdk.forProject.backups.listPolicies([
-                Query.orderDesc('$createdAt'),
-                Query.equal('resourceType', 'database'),
-                Query.equal('resourceId', params.database)
-            ])
+            sdk
+                .forProject(params.region, params.project)
+                .backups.listPolicies([
+                    Query.orderDesc('$createdAt'),
+                    Query.equal('resourceType', 'database'),
+                    Query.equal('resourceId', params.database)
+                ])
         ]);
     } catch (e) {
         // ignore
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/createPolicy.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/locked.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/locked.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/locked.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte
index a4f905710a..3a42618a68 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte
@@ -2,7 +2,6 @@
     import Card from '$lib/components/card.svelte';
     import { DropList, DropListItem, Modal } from '$lib/components';
     import { Button, FormList, InputCheckbox } from '$lib/elements/forms/index';
-
     import { app } from '$lib/stores/app';
     import { sdk } from '$lib/stores/sdk';
     import { addNotification } from '$lib/stores/notifications';
@@ -10,9 +9,8 @@
     import { Dependencies } from '$lib/constants';
     import { parseExpression } from 'cron-parser';
     import { toLocaleDateTime } from '$lib/helpers/date';
-
+    import { page } from '$app/stores';
     import { tooltip } from '$lib/actions/tooltip';
-
     import EmptyDark from '$lib/images/backups/backups-dark.png';
     import EmptyLight from '$lib/images/backups/backups-light.png';
     import type { BackupPolicy, BackupPolicyList } from '$lib/sdk/backups';
@@ -32,7 +30,9 @@
 
     async function deletePolicy() {
         try {
-            await sdk.forProject.backups.deletePolicy(selectedPolicy.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .backups.deletePolicy(selectedPolicy.$id);
             addNotification({
                 type: 'success',
                 message: 'Backup policy has been deleted'
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/restoreModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/restoreModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/restoreModal.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/restoreModal.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
index d2a0feaac2..89121f6b0f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
@@ -27,6 +27,7 @@
     import { copy } from '$lib/helpers/copy';
     import { LabelCard } from '$lib/components/index.js';
     import { Dependencies } from '$lib/constants';
+    import { page } from '$app/stores';
 
     export let data: PageData;
 
@@ -64,7 +65,9 @@
         const message = `${selectedBackups.length} backup${selectedBackups.length > 1 ? 's have been' : ''} deleted`;
 
         const promises = selectedBackups.map((archiveId) =>
-            sdk.forProject.backups.deleteArchive(archiveId)
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .backups.deleteArchive(archiveId)
         );
 
         try {
@@ -93,12 +96,14 @@
         }
 
         try {
-            await sdk.forProject.backups.createRestoration(
-                selectedBackup.$id,
-                ['databases'],
-                newDatabaseInfo.id ?? ID.unique(),
-                newDatabaseInfo.name
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .backups.createRestoration(
+                    selectedBackup.$id,
+                    ['databases'],
+                    newDatabaseInfo.id ?? ID.unique(),
+                    newDatabaseInfo.name
+                );
             addNotification({
                 type: 'success',
                 message: 'Database restore initiated'
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/upgradeCard.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/upgradeCard.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/backups/upgradeCard.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/upgradeCard.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index 42e112f949..5e44556873 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -26,7 +26,7 @@
     import type { Option } from './attributes/store';
     import { CreateAttributePanel } from '$lib/commandCenter/panels';
     import { database } from '../store';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { page } from '$app/stores';
     import CreateIndex from './indexes/createIndex.svelte';
     import { wizard } from '$lib/stores/wizard';
@@ -143,7 +143,7 @@
             label: 'Display Name',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#display-name`
+                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#display-name`
                 );
             },
             group: 'collections',
@@ -157,7 +157,7 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#permissions`
+                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#permissions`
                 );
             },
             group: 'collections',
@@ -171,7 +171,7 @@
             label: 'Document security',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#document-security`
+                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#document-security`
                 );
             },
             group: 'collections',
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts
similarity index 70%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts
index 5f71632d25..fb946c0112 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts
@@ -11,11 +11,12 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.COLLECTION);
     try {
         const [collection, allCollections] = await Promise.all([
-            sdk.forProject.databases.getCollection(params.database, params.collection),
-            sdk.forProject.databases.listCollections(params.database, [
-                Query.orderDesc(''),
-                Query.limit(100)
-            ])
+            sdk
+                .forProject(params.region, params.project)
+                .databases.getCollection(params.database, params.collection),
+            sdk
+                .forProject(params.region, params.project)
+                .databases.listCollections(params.database, [Query.orderDesc(''), Query.limit(100)])
         ]);
 
         return {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
similarity index 85%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
index 22d618aacf..107d096f6b 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
@@ -22,15 +22,13 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
         limit,
         view,
         query,
-        documents: await sdk.forProject.databases.listDocuments(
-            params.database,
-            params.collection,
-            [
+        documents: await sdk
+            .forProject(params.region, params.project)
+            .databases.listDocuments(params.database, params.collection, [
                 Query.limit(limit),
                 Query.offset(offset),
                 Query.orderDesc(''),
                 ...parsedQueries.values()
-            ]
-        )
+            ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
similarity index 66%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
index 3698e62235..955c1796c1 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
@@ -12,10 +12,11 @@ export const load: PageLoad = async ({ params, url, route }) => {
     return {
         offset,
         limit,
-        logs: await sdk.forProject.databases.listCollectionLogs(
-            params.database,
-            params.collection,
-            [Query.limit(limit), Query.offset(offset)]
-        )
+        logs: await sdk
+            .forProject(params.region, params.project)
+            .databases.listCollectionLogs(params.database, params.collection, [
+                Query.limit(limit),
+                Query.offset(offset)
+            ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
similarity index 99%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
index 5a827c7fc5..92f74f8581 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
@@ -126,7 +126,7 @@
                                 {#if isRelationship(attribute)}
                                     <span>
                                         with <a
-                                            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
+                                            href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
                                             ><b data-private>{attribute?.key}</b></a>
                                     </span>
                                 {/if}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
similarity index 71%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
index fffeef5a52..aa7c6d3841 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
@@ -1,5 +1,7 @@
 <script context="module" lang="ts">
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
+    import { get } from 'svelte/store';
     import type { Models } from '@appwrite.io/console';
 
     export async function submitBoolean(
@@ -8,14 +10,17 @@
         key: string,
         data: Partial<Models.AttributeBoolean>
     ) {
-        await sdk.forProject.databases.createBooleanAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createBooleanAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.default,
+                data.array
+            );
     }
     export async function updateBoolean(
         databaseId: string,
@@ -23,14 +28,17 @@
         data: Partial<Models.AttributeBoolean>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateBooleanAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateBooleanAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
index 94d53f1e2c..c885c62f02 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
@@ -1,6 +1,8 @@
 <script context="module" lang="ts">
     import type { Models } from '@appwrite.io/console';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
+    import { get } from 'svelte/store';
 
     export async function submitDatetime(
         databaseId: string,
@@ -8,14 +10,17 @@
         key: string,
         data: Partial<Models.AttributeDatetime>
     ) {
-        await sdk.forProject.databases.createDatetimeAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createDatetimeAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.default,
+                data.array
+            );
     }
 
     export async function updateDatetime(
@@ -24,14 +29,17 @@
         data: Partial<Models.AttributeDatetime>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateDatetimeAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateDatetimeAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
index cddc5d5c03..60df3b2655 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
@@ -18,11 +18,9 @@
     let checked = false;
     async function handleDelete() {
         try {
-            await sdk.forProject.databases.deleteAttribute(
-                databaseId,
-                $collection.$id,
-                selectedAttribute.key
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.deleteAttribute(databaseId, $collection.$id, selectedAttribute.key);
             await invalidate(Dependencies.COLLECTION);
             showDelete = false;
             addNotification({
@@ -31,7 +29,7 @@
             });
             trackEvent(Submit.AttributeDelete);
             await goto(
-                `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes`
+                `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
index 1676df8027..59c8e0d3d0 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
@@ -37,7 +37,7 @@
             await invalidate(Dependencies.COLLECTION);
             if (!$page.url.pathname.includes('attributes')) {
                 await goto(
-                    `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
                 );
             }
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
index 9f9f757262..b99d4ec1c9 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
@@ -1,6 +1,7 @@
 <script context="module" lang="ts">
     import type { Models } from '@appwrite.io/console';
-
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
 
     export async function submitEmail(
@@ -9,14 +10,17 @@
         key: string,
         data: Partial<Models.AttributeEmail>
     ) {
-        await sdk.forProject.databases.createEmailAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createEmailAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.default,
+                data.array
+            );
     }
 
     export async function updateEmail(
@@ -25,25 +29,27 @@
         data: Partial<Models.AttributeEmail>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateEmailAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateEmailAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
 <script lang="ts">
+    import { createConservative } from '$lib/helpers/stores';
     import { InputChoice, InputEmail } from '$lib/elements/forms';
 
     export let editing = false;
     export let data: Partial<Models.AttributeEmail>;
 
-    import { createConservative } from '$lib/helpers/stores';
-
     let savedDefault = data.default;
 
     function handleDefaultState(hideDefault: boolean) {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
similarity index 73%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
index 9fba777849..32f5cc19a2 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
@@ -1,4 +1,6 @@
 <script context="module" lang="ts">
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
 
@@ -8,15 +10,18 @@
         key: string,
         data: Partial<Models.AttributeEnum>
     ) {
-        await sdk.forProject.databases.createEnumAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.elements,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createEnumAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.elements,
+                data.required,
+                data.default,
+                data.array
+            );
     }
 
     export async function updateEnum(
@@ -25,26 +30,28 @@
         data: Partial<Models.AttributeEnum>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateEnumAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.elements,
-            data.required,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateEnumAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.elements,
+                data.required,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
 <script lang="ts">
+    import { createConservative } from '$lib/helpers/stores';
     import { InputChoice, InputSelect, InputTags } from '$lib/elements/forms';
 
     export let editing = false;
     export let data: Partial<Models.AttributeEnum>;
 
-    import { createConservative } from '$lib/helpers/stores';
-
     let savedDefault = data.default;
 
     function handleDefaultState(hideDefault: boolean) {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
similarity index 74%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
index 1578ef58fa..35c81172bb 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
@@ -1,6 +1,8 @@
 <script context="module" lang="ts">
-    import type { Models } from '@appwrite.io/console';
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
+    import type { Models } from '@appwrite.io/console';
 
     export async function submitFloat(
         databaseId: string,
@@ -8,16 +10,19 @@
         key: string,
         data: Partial<Models.AttributeFloat>
     ) {
-        await sdk.forProject.databases.createFloatAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.min,
-            data.max,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createFloatAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.min,
+                data.max,
+                data.default,
+                data.array
+            );
     }
 
     export async function updateFloat(
@@ -26,16 +31,19 @@
         data: Partial<Models.AttributeFloat>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateFloatAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.min,
-            data.max,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateFloatAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.min,
+                data.max,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
similarity index 73%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
index e9c81f4c99..7014080f29 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
@@ -1,4 +1,6 @@
 <script context="module" lang="ts">
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
 
@@ -8,16 +10,19 @@
         key: string,
         data: Partial<Models.AttributeInteger>
     ) {
-        await sdk.forProject.databases.createIntegerAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.min,
-            data.max,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createIntegerAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.min,
+                data.max,
+                data.default,
+                data.array
+            );
     }
 
     export async function updateInteger(
@@ -26,20 +31,24 @@
         data: Partial<Models.AttributeInteger>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateIntegerAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.min,
-            data.max,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateIntegerAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.min,
+                data.max,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
 <script lang="ts">
+    import { createConservative } from '$lib/helpers/stores';
     import { InputNumber, InputChoice } from '$lib/elements/forms';
 
     export let data: Partial<Models.AttributeInteger> = {
@@ -51,8 +60,6 @@
     };
     export let editing = false;
 
-    import { createConservative } from '$lib/helpers/stores';
-
     let savedDefault = data.default;
 
     function handleDefaultState(hideDefault: boolean) {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
index 46b9c904c0..ec2995298a 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
@@ -1,6 +1,8 @@
 <script context="module" lang="ts">
-    import type { Models } from '@appwrite.io/console';
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
+    import type { Models } from '@appwrite.io/console';
 
     export async function submitIp(
         databaseId: string,
@@ -8,14 +10,17 @@
         key: string,
         data: Partial<Models.AttributeIp>
     ) {
-        await sdk.forProject.databases.createIpAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createIpAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.default,
+                data.array
+            );
     }
     export async function updateIp(
         databaseId: string,
@@ -23,14 +28,17 @@
         data: Partial<Models.AttributeIp>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateIpAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateIpAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
index 1af15500bc..f16db25230 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
@@ -1,6 +1,8 @@
 <script context="module" lang="ts">
-    import { ID, Query, type Models, RelationshipType, RelationMutate } from '@appwrite.io/console';
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
+    import { ID, Query, type Models, RelationshipType, RelationMutate } from '@appwrite.io/console';
 
     export async function submitRelationship(
         databaseId: string,
@@ -14,16 +16,19 @@
         if (!isValueOfStringEnum(RelationMutate, data.onDelete)) {
             throw new Error(`Invalid on delete: ${data.onDelete}`);
         }
-        await sdk.forProject.databases.createRelationshipAttribute(
-            databaseId,
-            collectionId,
-            data.relatedCollection,
-            data.relationType,
-            data.twoWay,
-            data.key,
-            data.twoWayKey ?? ID.unique(),
-            data.onDelete
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createRelationshipAttribute(
+                databaseId,
+                collectionId,
+                data.relatedCollection,
+                data.relationType,
+                data.twoWay,
+                data.key,
+                data.twoWayKey ?? ID.unique(),
+                data.onDelete
+            );
     }
 
     export async function updateRelationship(
@@ -35,21 +40,22 @@
         if (!isValueOfStringEnum(RelationMutate, data.onDelete)) {
             throw new Error(`Invalid on delete: ${data.onDelete}`);
         }
-
-        await sdk.forProject.databases.updateRelationshipAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.onDelete,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateRelationshipAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.onDelete,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
 <script lang="ts">
     import { InputText, InputSelect, InputSelectSearch } from '$lib/elements/forms';
     import { onMount } from 'svelte';
-    import { page } from '$app/stores';
     import { Box, LabelCard } from '$lib/components';
     import { collection } from '../store';
     import arrowOne from './arrow-one.svg';
@@ -85,14 +91,14 @@
     // Lifecycle hooks
     async function getCollections(search: string = null) {
         if (search) {
-            const collections = await sdk.forProject.databases.listCollections(
-                databaseId,
-                [Query.orderDesc('')],
-                search
-            );
+            const collections = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.listCollections(databaseId, [Query.orderDesc('')], search);
             return collections;
         } else {
-            const collections = await sdk.forProject.databases.listCollections(databaseId);
+            const collections = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.listCollections(databaseId);
             return collections;
         }
     }
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
similarity index 74%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
index a14302350e..85decf0222 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
@@ -1,4 +1,6 @@
 <script context="module" lang="ts">
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
 
@@ -8,15 +10,18 @@
         key: string,
         data: Partial<Models.AttributeString>
     ) {
-        await sdk.forProject.databases.createStringAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.size,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createStringAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.size,
+                data.required,
+                data.default,
+                data.array
+            );
     }
     export async function updateString(
         databaseId: string,
@@ -24,15 +29,18 @@
         data: Partial<Models.AttributeString>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateStringAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.size,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateStringAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.size,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
index b058a56b24..75dd37f433 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
@@ -1,6 +1,8 @@
 <script context="module" lang="ts">
-    import type { Models } from '@appwrite.io/console';
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
+    import type { Models } from '@appwrite.io/console';
 
     export async function submitUrl(
         databaseId: string,
@@ -8,14 +10,17 @@
         key: string,
         data: Partial<Models.AttributeUrl>
     ) {
-        await sdk.forProject.databases.createUrlAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createUrlAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.required,
+                data.default,
+                data.array
+            );
     }
 
     export async function updateUrl(
@@ -24,25 +29,27 @@
         data: Partial<Models.AttributeUrl>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateUrlAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateUrlAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
 <script lang="ts">
+    import { createConservative } from '$lib/helpers/stores';
     import { InputChoice, InputURL } from '$lib/elements/forms';
 
     export let data: Partial<Models.AttributeUrl>;
     export let editing = false;
 
-    import { createConservative } from '$lib/helpers/stores';
-
     let savedDefault = data.default;
 
     function handleDefaultState(hideDefault: boolean) {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index 06420a1a1d..aa89f0b158 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -34,7 +34,7 @@
             await invalidate(Dependencies.COLLECTION);
             if (!$page.url.pathname.includes('attributes')) {
                 await goto(
-                    `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
                 );
             }
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
index 741463c6f3..f2e4cf3189 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
@@ -33,13 +33,15 @@
 
     async function create() {
         try {
-            await sdk.forProject.databases.createDocument(
-                databaseId,
-                collectionId,
-                $createDocument.id ?? ID.unique(),
-                $createDocument.document,
-                $createDocument.permissions
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.createDocument(
+                    databaseId,
+                    collectionId,
+                    $createDocument.id ?? ID.unique(),
+                    $createDocument.document,
+                    $createDocument.permissions
+                );
             await invalidate(Dependencies.DOCUMENTS);
 
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
similarity index 89%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
index ea8663adcf..1642fda565 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
@@ -11,11 +11,9 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => {
     const { collection } = await parent();
 
     try {
-        const document = await sdk.forProject.databases.getDocument(
-            params.database,
-            params.collection,
-            params.document
-        );
+        const document = await sdk
+            .forProject(params.region, params.project)
+            .databases.getDocument(params.database, params.collection, params.document);
 
         /**
          * Sanitize DateTime to remove UTC Timezone section.
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
index 0ee809bd91..ce01798c0f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
@@ -13,6 +13,7 @@
     import { Dependencies } from '$lib/constants';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { collection } from '../store';
+    import { page } from '$app/stores';
 
     let showDelete = false;
     let permissions = $doc?.$permissions;
@@ -21,13 +22,15 @@
 
     async function updatePermissions() {
         try {
-            await sdk.forProject.databases.updateDocument(
-                $doc.$databaseId,
-                $doc.$collectionId,
-                $doc.$id,
-                $doc.data,
-                permissions
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateDocument(
+                    $doc.$databaseId,
+                    $doc.$collectionId,
+                    $doc.$id,
+                    $doc.data,
+                    permissions
+                );
             await invalidate(Dependencies.DOCUMENT);
             arePermsDisabled = true;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
similarity index 65%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
index ca38a4945c..6c59cf14f0 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
@@ -12,11 +12,11 @@ export const load: PageLoad = async ({ params, url, route }) => {
     return {
         offset,
         limit,
-        logs: await sdk.forProject.databases.listDocumentLogs(
-            params.database,
-            params.collection,
-            params.document,
-            [Query.limit(limit), Query.offset(offset)]
-        )
+        logs: await sdk
+            .forProject(params.region, params.project)
+            .databases.listDocumentLogs(params.database, params.collection, params.document, [
+                Query.limit(limit),
+                Query.offset(offset)
+            ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
index dd7035578d..8bfc68926d 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
@@ -58,17 +58,17 @@
 
     async function getDocuments(search: string = null) {
         if (search) {
-            const documents = await sdk.forProject.databases.listDocuments(
-                databaseId,
-                attribute.relatedCollection,
-                [Query.startsWith('$id', search), Query.orderDesc('')]
-            );
+            const documents = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.listDocuments(databaseId, attribute.relatedCollection, [
+                    Query.startsWith('$id', search),
+                    Query.orderDesc('')
+                ]);
             return documents;
         } else {
-            const documents = await sdk.forProject.databases.listDocuments(
-                databaseId,
-                attribute.relatedCollection
-            );
+            const documents = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.listDocuments(databaseId, attribute.relatedCollection);
             return documents;
         }
     }
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
index b96634b095..d962e17575 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
@@ -48,13 +48,15 @@
 
     async function updateData() {
         try {
-            await sdk.forProject.databases.updateDocument(
-                databaseId,
-                collectionId,
-                documentId,
-                $work,
-                $work.$permissions
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateDocument(
+                    databaseId,
+                    collectionId,
+                    documentId,
+                    $work,
+                    $work.$permissions
+                );
 
             invalidate(Dependencies.DOCUMENT);
             trackEvent(Submit.DocumentUpdate);
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
index eedf18f028..c8135b77ff 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
@@ -26,11 +26,13 @@
 
     const handleDelete = async () => {
         try {
-            await sdk.forProject.databases.deleteDocument(
-                databaseId,
-                $page.params.collection,
-                $page.params.document
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.deleteDocument(
+                    databaseId,
+                    $page.params.collection,
+                    $page.params.document
+                );
             showDelete = false;
             addNotification({
                 type: 'success',
@@ -38,7 +40,7 @@
             });
             trackEvent(Submit.DocumentDelete);
             await goto(
-                `${base}/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}`
+                `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
index 2c0f7faa7f..7f5799eeed 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
@@ -52,13 +52,15 @@
 
     async function updateData() {
         try {
-            await sdk.forProject.databases.updateDocument(
-                databaseId,
-                collectionId,
-                documentId,
-                $work,
-                $work.$permissions
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateDocument(
+                    databaseId,
+                    collectionId,
+                    documentId,
+                    $work,
+                    $work.$permissions
+                );
             await invalidate(Dependencies.DOCUMENT);
 
             currentDoc = JSON.stringify($work);
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
index 5e01de2735..57f6483015 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
@@ -10,7 +10,7 @@
     const databaseId = $page.params.database;
     const collectionId = $page.params.collection;
     const documentId = $page.params.document;
-    const path = `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}/document-${documentId}`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collectionId}/document-${documentId}`;
     const tabs = [
         {
             href: path,
@@ -35,7 +35,7 @@
 <Cover>
     <svelte:fragment slot="header">
         <CoverTitle
-            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}>
+            href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}>
             {$doc?.$id}
         </CoverTitle>
         <Id value={$doc?.$id} event="document">Document ID</Id>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte
index bee3fa5f0b..86de2dff04 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte
@@ -10,7 +10,7 @@
     $: projectId = $page.params.project;
     $: databaseId = $page.params.database;
     $: collectionId = $page.params.collection;
-    $: path = `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`;
+    $: path = `${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collectionId}`;
     $: tabs = [
         {
             href: path,
@@ -51,7 +51,8 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/databases/database-${databaseId}`}>
+        <CoverTitle
+            href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}`}>
             {$collection?.name}
         </CoverTitle>
         {#key $collection?.$id}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
index 5c0bba01f7..c845640c37 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
@@ -60,7 +60,7 @@
         }
 
         try {
-            await sdk.forProject.databases.createIndex(
+            await sdk.forProject($page.params.region, $page.params.project).databases.createIndex(
                 databaseId,
                 $collection.$id,
                 key,
@@ -74,7 +74,7 @@
             ]);
 
             goto(
-                `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes`
+                `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes`
             );
 
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
index 4550516fbf..e515bc5ad5 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
@@ -17,11 +17,9 @@
 
     async function handleDelete() {
         try {
-            await sdk.forProject.databases.deleteIndex(
-                databaseId,
-                $collection.$id,
-                selectedIndex.key
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.deleteIndex(databaseId, $collection.$id, selectedIndex.key);
             await invalidate(Dependencies.COLLECTION);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
index 1f0079879a..edeb3c1627 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
@@ -35,7 +35,7 @@
             <ClickableList>
                 {#each paginatedItems as doc}
                     <ClickableListItem
-                        href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${selectedRelationship.relatedCollection}/document-${doc.$id}`}
+                        href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${selectedRelationship.relatedCollection}/document-${doc.$id}`}
                         on:click={() => (show = false)}>
                         {#if args?.length}
                             {#each args as arg, i}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
index 849d5b65e0..16fa943e42 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
@@ -16,7 +16,9 @@
 
     async function handleDelete() {
         try {
-            await sdk.forProject.databases.deleteCollection(databaseId, $collection.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.deleteCollection(databaseId, $collection.$id);
             await invalidate(Dependencies.DATABASE);
             showDelete = false;
             addNotification({
@@ -25,7 +27,7 @@
             });
             trackEvent(Submit.CollectionDelete);
             await goto(
-                `${base}/project-${$page.params.project}/databases/database-${$page.params.database}`
+                `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$page.params.database}`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
index 6170e6b24f..1c40d27a74 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
@@ -20,14 +20,16 @@
 
     async function updateName() {
         try {
-            await sdk.forProject.databases.updateCollection(
-                databaseId,
-                $collection.$id,
-                collectionName,
-                $collection.$permissions,
-                $collection.documentSecurity,
-                $collection.enabled
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateCollection(
+                    databaseId,
+                    $collection.$id,
+                    collectionName,
+                    $collection.$permissions,
+                    $collection.documentSecurity,
+                    $collection.enabled
+                );
             await invalidate(Dependencies.COLLECTION);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
similarity index 85%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
index b32bb7723f..0ee1b6fde5 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
@@ -24,14 +24,16 @@
 
     async function updatePermissions() {
         try {
-            await sdk.forProject.databases.updateCollection(
-                databaseId,
-                $collection.$id,
-                $collection.name,
-                collectionPermissions,
-                $collection.documentSecurity,
-                $collection.enabled
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateCollection(
+                    databaseId,
+                    $collection.$id,
+                    $collection.name,
+                    collectionPermissions,
+                    $collection.documentSecurity,
+                    $collection.enabled
+                );
             await invalidate(Dependencies.COLLECTION);
             addNotification({
                 message: 'Permissions have been updated',
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
similarity index 85%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
index a2019cdc40..a89260ff54 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
@@ -20,14 +20,16 @@
 
     async function updateSecurity() {
         try {
-            await sdk.forProject.databases.updateCollection(
-                databaseId,
-                $collection.$id,
-                $collection.name,
-                $collection.$permissions,
-                collectionDocumentSecurity,
-                $collection.enabled
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateCollection(
+                    databaseId,
+                    $collection.$id,
+                    $collection.name,
+                    $collection.$permissions,
+                    collectionDocumentSecurity,
+                    $collection.enabled
+                );
             await invalidate(Dependencies.COLLECTION);
             addNotification({
                 message: 'Security has been updated',
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
index 70661890a4..36198dbdc6 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
@@ -21,14 +21,16 @@
 
     async function toggleCollection() {
         try {
-            await sdk.forProject.databases.updateCollection(
-                databaseId,
-                $collection.$id,
-                $collection.name,
-                $collection.$permissions,
-                $collection.documentSecurity,
-                enabled
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.updateCollection(
+                    databaseId,
+                    $collection.$id,
+                    $collection.name,
+                    $collection.$permissions,
+                    $collection.documentSecurity,
+                    enabled
+                );
             await invalidate(Dependencies.COLLECTION);
             addNotification({
                 message: `${$collection.name} has been updated`,
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
index 26d60dc96e..b5ff20651d 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
@@ -17,7 +17,7 @@
 <section class="drop-section u-flex-vertical u-gap-8">
     <a
         class="u-flex u-cross-center u-sep-block-end u-padding-block-12 is-not-desktop"
-        href={`${base}/project-${project}/databases/database-${databaseId}?openNavbar=true`}>
+        href={`${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}?openNavbar=true`}>
         <span class="icon-cheveron-left" aria-hidden="true" />
         <h5 class="eyebrow-heading-3 u-margin-inline-auto">Collections</h5>
     </a>
@@ -31,7 +31,7 @@
     {#if data?.allCollections?.total}
         <ul class="drop-list">
             {#each sortedCollections as collection}
-                {@const href = `${base}/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
+                {@const href = `${base}/project-${$page.params.region}-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
                 {@const isSelected = collectionId === collection.$id}
                 <li class="drop-list-item">
                     <a class="drop-button" class:is-selected={isSelected} {href}>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
index fbfc7544e2..52643ef3ef 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
@@ -124,7 +124,9 @@
         showDelete = false;
 
         const promises = selectedDb.map((documentId) =>
-            sdk.forProject.databases.deleteDocument(databaseId, collectionId, documentId)
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.deleteDocument(databaseId, collectionId, documentId)
         );
         try {
             await Promise.all(promises);
@@ -176,7 +178,7 @@
     <TableBody>
         {#each data.documents.documents as document}
             <TableRowLink
-                href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${$collection.$id}/document-${document.$id}`}>
+                href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${$collection.$id}/document-${document.$id}`}>
                 <TableCellCheck bind:selectedIds={selectedDb} id={document.$id} />
 
                 <TableCell width={150}>
@@ -203,7 +205,7 @@
                                             on:keyup={clickOnEnter}
                                             on:click|preventDefault|stopPropagation={() =>
                                                 goto(
-                                                    `${base}/project-${projectId}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}`
+                                                    `${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}`
                                                 )}>
                                             {#each args as arg, i}
                                                 {#if arg !== undefined}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
similarity index 72%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
index 60177715ed..a00eba3ae7 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
@@ -11,7 +11,7 @@
 
 <Usage
     title="Databases"
-    path={`${base}/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}/usage`}
+    path={`${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
similarity index 72%
rename from src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
index 64b477a482..deec39cec2 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
@@ -7,5 +7,7 @@ export const load: PageLoad = async ({ params }) => {
     const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
         ? params.period
         : DatabaseUsageRange.ThirtyDays;
-    return sdk.forProject.databases.getDatabaseUsage(params.database, period);
+    return sdk
+        .forProject(params.region, params.project)
+        .databases.getCollectionUsage(params.database, params.collection, period);
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
index 88d7e040d9..c92c8d2483 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
@@ -23,11 +23,9 @@
     const create = async () => {
         error = null;
         try {
-            const collection = await sdk.forProject.databases.createCollection(
-                databaseId,
-                id ? id : ID.unique(),
-                name
-            );
+            const collection = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.createCollection(databaseId, id ? id : ID.unique(), name);
             showCreate = false;
             dispatch('created', collection);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
index 4f565c56de..1c80bd3bf9 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
@@ -56,7 +56,9 @@
         try {
             const queries = buildQueries();
 
-            collections = await sdk.forProject.databases.listCollections(databaseId, queries);
+            collections = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.listCollections(databaseId, queries);
 
             const collectionPromises = collections.collections.map(async (collection) => {
                 return {
@@ -76,13 +78,15 @@
 
     const handleDelete = async () => {
         try {
-            await sdk.forProject.databases.delete(databaseId);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.delete(databaseId);
             showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${$database.name} has been deleted`
             });
-            await goto(`${base}/project-${$page.params.project}/databases`);
+            await goto(`${base}/project-${$page.params.region}-${$page.params.project}/databases`);
             trackEvent(Submit.DatabaseDelete);
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
index 3c3b124dca..5cc8c1a251 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
@@ -18,7 +18,7 @@
     event="collection">
     {#each data.collections.collections as collection}
         <GridItem1
-            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
+            href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
             <svelte:fragment slot="title">{collection.name}</svelte:fragment>
             <svelte:fragment slot="status">
                 {#if !collection.enabled}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
index f06be01388..d5e107c9bd 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
@@ -9,7 +9,7 @@
 
     const projectId = $page.params.project;
     const databaseId = $page.params.database;
-    const path = `${base}/project-${projectId}/databases/database-${databaseId}`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}`;
     const tabs = [
         {
             href: path,
@@ -40,7 +40,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/databases`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/databases`}>
             {$database.name}
         </CoverTitle>
         <Id value={$database.$id}>{$database.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
index ad8b9f4856..d0b64f86c4 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
@@ -25,9 +25,9 @@
     });
 
     async function loadCollectionCount() {
-        const { total } = await sdk.forProject.databases.listCollections($database.$id, [
-            Query.limit(1)
-        ]);
+        const { total } = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.listCollections($database.$id, [Query.limit(1)]);
         return total;
     }
 
@@ -39,7 +39,9 @@
 
     async function updateName() {
         try {
-            await sdk.forProject.databases.update($page.params.database, databaseName);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.update($page.params.database, databaseName);
             await invalidate(Dependencies.DATABASE);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
similarity index 74%
rename from src/routes/(console)/project-[project]/databases/database-[database]/string.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
index 4b09b53842..d56d13300f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
@@ -1,4 +1,6 @@
 <script context="module" lang="ts">
+    import { get } from 'svelte/store';
+    import { page } from '$app/stores';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
 
@@ -8,15 +10,18 @@
         key: string,
         data: Partial<Models.AttributeString>
     ) {
-        await sdk.forProject.databases.createStringAttribute(
-            databaseId,
-            collectionId,
-            key,
-            data.size,
-            data.required,
-            data.default,
-            data.array
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.createStringAttribute(
+                databaseId,
+                collectionId,
+                key,
+                data.size,
+                data.required,
+                data.default,
+                data.array
+            );
     }
     export async function updateString(
         databaseId: string,
@@ -24,15 +29,18 @@
         data: Partial<Models.AttributeString>,
         originalKey?: string
     ) {
-        await sdk.forProject.databases.updateStringAttribute(
-            databaseId,
-            collectionId,
-            originalKey,
-            data.required,
-            data.default,
-            data.size,
-            data.key !== originalKey ? data.key : undefined
-        );
+        const $page = get(page);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .databases.updateStringAttribute(
+                databaseId,
+                collectionId,
+                originalKey,
+                data.required,
+                data.default,
+                data.size,
+                data.key !== originalKey ? data.key : undefined
+            );
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
index 6b95d6e992..ba007e99f8 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
@@ -37,7 +37,9 @@
         showDelete = false;
 
         const promises = selected.map((collectionId) =>
-            sdk.forProject.databases.deleteCollection(databaseId, collectionId)
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .databases.deleteCollection(databaseId, collectionId)
         );
         try {
             await Promise.all(promises);
@@ -76,7 +78,7 @@
     <TableBody>
         {#each data.collections.collections as collection}
             <TableRowLink
-                href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
+                href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
                 {#if $canWriteCollections}
                     <TableCellCheck bind:selectedIds={selected} id={collection.$id} />
                 {/if}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
similarity index 78%
rename from src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
index 1ff1c4eb10..9ec7d811ce 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
@@ -12,7 +12,7 @@
 
 <Usage
     title="Databases"
-    path={`${base}/project-${$page.params.project}/databases/database-${$page.params.database}/usage`}
+    path={`${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$page.params.database}/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
similarity index 75%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
index 4d876b8846..9b8f7d9a95 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
@@ -7,5 +7,7 @@ export const load: PageLoad = async ({ params }) => {
     const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
         ? params.period
         : DatabaseUsageRange.ThirtyDays;
-    return sdk.forProject.databases.getCollectionUsage(params.database, params.collection, period);
+    return sdk
+        .forProject(params.region, params.project)
+        .databases.getDatabaseUsage(params.database, period);
 };
diff --git a/src/routes/(console)/project-[project]/databases/grid.svelte b/src/routes/(console)/project-[region]-[project]/databases/grid.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/databases/grid.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/grid.svelte
index 25a687959a..18f50fa933 100644
--- a/src/routes/(console)/project-[project]/databases/grid.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/grid.svelte
@@ -16,7 +16,8 @@
     event="database"
     service="databases">
     {#each data.databases.databases as database}
-        <GridItem1 href={`${base}/project-${project}/databases/database-${database.$id}`}>
+        <GridItem1
+            href={`${base}/project-${$page.params.region}-${project}/databases/database-${database.$id}`}>
             <svelte:fragment slot="title">{database.name}</svelte:fragment>
             <svelte:fragment slot="subtitle">
                 {#if data.lastBackups && data.lastBackups[database.$id]}
diff --git a/src/routes/(console)/project-[project]/databases/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/header.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/databases/header.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/header.svelte
index 4ae1293a7f..0401a24f8e 100644
--- a/src/routes/(console)/project-[project]/databases/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/header.svelte
@@ -6,7 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `${base}/project-${projectId}/databases`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/databases`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[project]/databases/store.ts b/src/routes/(console)/project-[region]-[project]/databases/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/table.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/table.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/table.svelte
index 523641e95b..d7ab5b6e46 100644
--- a/src/routes/(console)/project-[project]/databases/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/table.svelte
@@ -40,7 +40,8 @@
     </TableHeader>
     <TableBody>
         {#each data.databases.databases as database}
-            <TableRowLink href={`${base}/project-${projectId}/databases/database-${database.$id}`}>
+            <TableRowLink
+                href={`${base}/project-${$page.params.region}-${projectId}/databases/database-${database.$id}`}>
                 {#each $columns as column}
                     {#if column.show}
                         {#if column.id === '$id'}
diff --git a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte
index d261dd5f98..8d5f850eb3 100644
--- a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte
@@ -11,7 +11,7 @@
 
 <Usage
     title="Databases"
-    path={`${base}/project-${$page.params.project}/databases/usage`}
+    path={`${base}/project-${$page.params.region}-${$page.params.project}/databases/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
similarity index 84%
rename from src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
index 47e4f5dfad..d39742634a 100644
--- a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params }) => {
         ? params.period
         : DatabaseUsageRange.ThirtyDays;
     try {
-        return sdk.forProject.databases.getUsage(period);
+        return sdk.forProject(params.region, params.project).databases.getUsage(period);
     } catch (e) {
         error(e.code, e.message);
     }
diff --git a/src/routes/(console)/project-[project]/functions/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/functions/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts
similarity index 59%
rename from src/routes/(console)/project-[project]/functions/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/functions/+layout.ts
index cab65d7c3c..e89f42e0b7 100644
--- a/src/routes/(console)/project-[project]/functions/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts
@@ -5,13 +5,15 @@ import { Query } from '@appwrite.io/console';
 import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
 
-export const load: LayoutLoad = async ({ depends }) => {
+export const load: LayoutLoad = async ({ depends, params }) => {
     depends(Dependencies.FUNCTION_INSTALLATIONS);
 
     const [runtimesList, installations, templatesList] = await Promise.all([
-        sdk.forProject.functions.listRuntimes(),
-        sdk.forProject.vcs.listInstallations([Query.limit(100)]),
-        sdk.forProject.functions.listTemplates(undefined, undefined, 100)
+        sdk.forProject(params.region, params.project).functions.listRuntimes(),
+        sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]),
+        sdk
+            .forProject(params.region, params.project)
+            .functions.listTemplates(undefined, undefined, 100)
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[project]/functions/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/+page.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/functions/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/+page.svelte
index e70f65f21c..c642197f05 100644
--- a/src/routes/(console)/project-[project]/functions/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/+page.svelte
@@ -101,7 +101,8 @@
             on:click={openWizard}
             service="functions">
             {#each data.functions.functions as func}
-                <GridItem1 href={`${base}/project-${project}/functions/function-${func.$id}`}>
+                <GridItem1
+                    href={`${base}/project-${$page.params.region}-${project}/functions/function-${func.$id}`}>
                     <svelte:fragment slot="title">
                         <div class="u-flex u-gap-16 u-cross-center">
                             <div class="avatar is-medium">
diff --git a/src/routes/(console)/project-[project]/functions/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/+page.ts
similarity index 75%
rename from src/routes/(console)/project-[project]/functions/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/+page.ts
index e122346371..0019ac1039 100644
--- a/src/routes/(console)/project-[project]/functions/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/+page.ts
@@ -14,10 +14,8 @@ export const load: PageLoad = async ({ url, depends, route }) => {
     return {
         offset,
         limit,
-        functions: await sdk.forProject.functions.list([
-            Query.limit(limit),
-            Query.offset(offset),
-            Query.orderDesc('')
-        ])
+        functions: await sdk
+            .forProject(params.region, params.project)
+            .functions.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')])
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/functions/createFunction.svelte b/src/routes/(console)/project-[region]-[project]/functions/createFunction.svelte
similarity index 75%
rename from src/routes/(console)/project-[project]/functions/createFunction.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/createFunction.svelte
index 23b1a075f4..105f0e99b7 100644
--- a/src/routes/(console)/project-[project]/functions/createFunction.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/createFunction.svelte
@@ -30,25 +30,31 @@
             if (!isValueOfStringEnum(Runtime, $createFunction.runtime)) {
                 throw new Error(`Invalid runtime: ${$createFunction.runtime}`);
             }
-            const response = await sdk.forProject.functions.create(
-                $createFunction.id ?? ID.unique(),
-                $createFunction.name,
-                $createFunction.runtime,
-                $createFunction.execute || undefined,
-                $createFunction.events || undefined,
-                $createFunction.schedule || undefined,
-                $createFunction.timeout || undefined,
-                undefined,
-                undefined,
-                $createFunction.entrypoint || undefined
-            );
+            const response = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.create(
+                    $createFunction.id ?? ID.unique(),
+                    $createFunction.name,
+                    $createFunction.runtime,
+                    $createFunction.execute || undefined,
+                    $createFunction.events || undefined,
+                    $createFunction.schedule || undefined,
+                    $createFunction.timeout || undefined,
+                    undefined,
+                    undefined,
+                    $createFunction.entrypoint || undefined
+                );
             await Promise.all(
                 $createFunction.vars.map((v) =>
-                    sdk.forProject.functions.createVariable(response.$id, v.key, v.value)
+                    sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .functions.createVariable(response.$id, v.key, v.value)
                 )
             );
             await invalidate(Dependencies.FUNCTIONS);
-            await goto(`${base}/project-${projectId}/functions/function-${response.$id}`);
+            await goto(
+                `${base}/project-${$page.params.region}-${projectId}/functions/function-${response.$id}`
+            );
             addNotification({
                 message: `${$createFunction.name} has been created`,
                 type: 'success'
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte
similarity index 75%
rename from src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte
index 922bb922ca..fb61ee0f43 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte
@@ -42,7 +42,9 @@
             label: 'Create deployment',
             async callback() {
                 if (!$page.url.pathname.endsWith($func.$id)) {
-                    await goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}`);
+                    await goto(
+                        `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}`
+                    );
                 }
                 showCreateDeployment.set(true);
             },
@@ -55,7 +57,7 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#permissions`
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings#permissions`
                 );
                 scrollBy({ top: -100 });
             },
@@ -67,7 +69,7 @@
             label: 'Events',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#events`
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings#events`
                 );
                 scrollBy({ top: -100 });
             },
@@ -79,7 +81,7 @@
             label: 'Variables',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#variables`
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings#variables`
                 );
             },
             icon: 'list',
@@ -90,7 +92,7 @@
             label: 'Timeout',
             callback() {
                 goto(
-                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#timeout`
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings#timeout`
                 );
             },
             icon: 'x-circle',
@@ -101,7 +103,7 @@
             label: 'Schedule',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#schedule`
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings#schedule`
                 );
                 scrollBy({ top: -100 });
             },
@@ -112,7 +114,9 @@
         {
             label: 'Go to deployments',
             callback() {
-                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}`
+                );
             },
             keys: ['g', 'd'],
             group: 'navigation',
@@ -122,7 +126,9 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}/usage`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/usage`
+                );
             },
             keys: ['g', 'u'],
             group: 'navigation',
@@ -132,7 +138,9 @@
         {
             label: 'Go to executions',
             callback() {
-                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/executions`
+                );
             },
             keys: ['g', 'e'],
             group: 'navigation',
@@ -142,7 +150,9 @@
         {
             label: 'Go to settings',
             callback() {
-                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}/settings`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings`
+                );
             },
             keys: ['g', 's'],
             group: 'navigation',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts
similarity index 65%
rename from src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts
index 54ed89d668..6bc3e535fd 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts
@@ -12,12 +12,14 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     try {
         const [func, proxyRuleList] = await Promise.all([
-            sdk.forProject.functions.get(params.function),
-            sdk.forProject.proxy.listRules([
-                Query.equal('resourceType', 'function'),
-                Query.equal('resourceId', params.function),
-                Query.limit(1)
-            ])
+            sdk.forProject(params.region, params.project).functions.get(params.function),
+            sdk
+                .forProject(params.region, params.project)
+                .proxy.listRules([
+                    Query.equal('resourceType', 'function'),
+                    Query.equal('resourceId', params.function),
+                    Query.limit(1)
+                ])
         ]);
 
         return {
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.svelte
index fbd5bca71c..625f9e15f5 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.svelte
@@ -182,7 +182,7 @@
                     <div class="u-flex u-flex-wrap">
                         <Button
                             text
-                            href={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${activeDeployment.$id}`}>
+                            href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$page.params.function}/deployment-${activeDeployment.$id}`}>
                             Build logs
                         </Button>
                         {#if $canWriteFunctions}
@@ -198,7 +198,7 @@
                         {/if}
                         <Button
                             secondary
-                            href={`${base}/project-${$page.params.project}/functions/function-${$func.$id}/executions/execute-function`}
+                            href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$func.$id}/executions/execute-function`}
                             disabled={isCloud && $readOnly && !GRACE_PERIOD_OVERRIDE}>
                             Execute
                         </Button>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
similarity index 64%
rename from src/routes/(console)/project-[project]/functions/function-[function]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
index 02b02627d4..9f666a8f34 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
@@ -20,16 +20,17 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
         limit,
         query,
         activeDeployment: data.function.deployment
-            ? await sdk.forProject.functions.getDeployment(
-                  params.function,
-                  data.function.deployment
-              )
+            ? await sdk
+                  .forProject(params.region, params.project)
+                  .functions.getDeployment(params.function, data.function.deployment)
             : null,
-        deploymentList: await sdk.forProject.functions.listDeployments(params.function, [
-            Query.limit(limit),
-            Query.offset(offset),
-            Query.orderDesc(''),
-            ...parsedQueries.values()
-        ])
+        deploymentList: await sdk
+            .forProject(params.region, params.project)
+            .functions.listDeployments(params.function, [
+                Query.limit(limit),
+                Query.offset(offset),
+                Query.orderDesc(''),
+                ...parsedQueries.values()
+            ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/activate.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/activate.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/functions/function-[function]/activate.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/activate.svelte
index 4da5196f38..9c25382a3d 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/activate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/activate.svelte
@@ -6,6 +6,7 @@
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
+    import { page } from '$app/stores';
 
     export let showActivate = false;
     export let selectedDeployment: Models.Deployment = null;
@@ -14,10 +15,9 @@
 
     const handleSubmit = async () => {
         try {
-            await sdk.forProject.functions.updateDeployment(
-                selectedDeployment.resourceId,
-                selectedDeployment.$id
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.updateDeployment(selectedDeployment.resourceId, selectedDeployment.$id);
             showActivate = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/cancel.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/cancel.svelte
index 77f91bca23..9f71b7cd7a 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/cancel.svelte
@@ -6,6 +6,7 @@
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
     import type { Models } from '@appwrite.io/console';
 
     export let showCancel = false;
@@ -13,10 +14,12 @@
 
     async function handleSubmit() {
         try {
-            await sdk.forProject.functions.updateDeploymentBuild(
-                selectedDeployment.resourceId,
-                selectedDeployment.$id
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.updateDeploymentBuild(
+                    selectedDeployment.resourceId,
+                    selectedDeployment.$id
+                );
             await invalidate(Dependencies.FUNCTION);
             showCancel = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/create.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/create.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/create.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/create.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/createCli.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/createCli.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/createGit.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/createGit.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/functions/function-[function]/createGit.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/createGit.svelte
index 05ef839540..104c29ff49 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/createGit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/createGit.svelte
@@ -81,7 +81,7 @@
                             Learn more
                         </Button>
                         <Button
-                            href={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/settings`}>
+                            href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$page.params.function}/settings`}>
                             Install Git
                         </Button>
                     </div>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/createManual.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/functions/function-[function]/createManual.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/createManual.svelte
index 347e9df0a1..4e46b5917c 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/createManual.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/createManual.svelte
@@ -29,13 +29,15 @@
 
     async function create() {
         try {
-            await sdk.forProject.functions.createDeployment(
-                functionId,
-                files[0],
-                active,
-                entrypoint || undefined,
-                buildCommand || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.createDeployment(
+                    functionId,
+                    files[0],
+                    active,
+                    entrypoint || undefined,
+                    buildCommand || undefined
+                );
             await invalidate(Dependencies.DEPLOYMENTS);
             files = undefined;
             active = true;
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/delete.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/delete.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/functions/function-[function]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/delete.svelte
index b0b9ce6bf3..4579998036 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/delete.svelte
@@ -6,6 +6,7 @@
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
     import type { Models } from '@appwrite.io/console';
 
     export let showDelete = false;
@@ -13,10 +14,9 @@
 
     async function handleSubmit() {
         try {
-            await sdk.forProject.functions.deleteDeployment(
-                selectedDeployment.resourceId,
-                selectedDeployment.$id
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.deleteDeployment(selectedDeployment.resourceId, selectedDeployment.$id);
             await invalidate(Dependencies.FUNCTION);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 73a3e73dfd..4001d80e96 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -31,8 +31,10 @@
 
     function getDownload(deploymentId: string) {
         return (
-            sdk.forProject.functions.getDeploymentDownload($func.$id, deploymentId).toString() +
-            '&mode=admin'
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.getDeploymentDownload($func.$id, deploymentId)
+                .toString() + '&mode=admin'
         );
     }
 
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
index bb5cd33b09..60b59ebfb4 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
@@ -6,10 +6,9 @@ export const load: PageLoad = async ({ params, depends, parent }) => {
     const { function: func } = await parent();
     depends(Dependencies.DEPLOYMENT);
 
-    const deployment = await sdk.forProject.functions.getDeployment(
-        params.function,
-        params.deployment
-    );
+    const deployment = await sdk
+        .forProject(params.region, params.project)
+        .functions.getDeployment(params.function, params.deployment);
 
     return {
         deployment,
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
similarity index 80%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
index 69d87cbe0a..eb1ca31644 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
@@ -11,7 +11,8 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/functions/function-${functionId}`}>
+        <CoverTitle
+            href={`${base}/project-${$page.params.region}-${projectId}/functions/function-${functionId}`}>
             Deployment
         </CoverTitle>
         <Id value={$deployment.$id}>{$deployment.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/store.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/store.ts
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deploymentCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentCard.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deploymentCard.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentCard.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentCreatedBy.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentCreatedBy.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deploymentDomains.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentDomains.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deploymentDomains.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentDomains.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentSource.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/deploymentSource.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
similarity index 55%
rename from src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
index e5f407297d..97ffc057cd 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
@@ -7,9 +7,11 @@ export const load: PageLoad = async ({ depends, params }) => {
     depends(Dependencies.FUNCTION_DOMAINS);
 
     return {
-        rules: await sdk.forProject.proxy.listRules([
-            Query.equal('resourceType', ResourceType.Function),
-            Query.equal('resourceId', params.function)
-        ])
+        rules: await sdk
+            .forProject(params.region, params.project)
+            .proxy.listRules([
+                Query.equal('resourceType', ResourceType.Function),
+                Query.equal('resourceId', params.function)
+            ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
index 7e0d3b4ef7..155b9ac78f 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
@@ -10,7 +10,7 @@
     import { func } from '../store';
     import { organization } from '$lib/stores/organization';
     import { getServiceLimit, showUsageRatesModal } from '$lib/stores/billing';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import Create from '../create.svelte';
     import { abbreviateNumber } from '$lib/helpers/numbers';
     import { base } from '$app/paths';
@@ -216,7 +216,7 @@
             <ViewSelector view={View.Table} {columns} hideView allowNoColumns hideText />
             <Button
                 event="execute_function"
-                href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
+                href={`${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
                 disabled={!$func.$id || !$func?.deployment}>
                 <span class="text">Execute</span>
             </Button>
@@ -237,7 +237,7 @@
                 <ViewSelector view={View.Table} {columns} hideView allowNoColumns />
                 <Button
                     event="execute_function"
-                    href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
+                    href={`${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
                     disabled={!$func.$id || !$func?.deployment}>
                     <span class="text">Execute</span>
                 </Button>
@@ -272,7 +272,7 @@
                 <svelte:fragment slot="title">Your execution logs are disabled</svelte:fragment>
                 To view execution logs and errors, enable them in your
                 <a
-                    href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/settings`}
+                    href={`${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/settings`}
                     class="link">
                     Function settings</a
                 >.
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts
index 2d4d66858f..62766efa26 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts
@@ -19,11 +19,13 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
         offset,
         limit,
         query,
-        executions: await sdk.forProject.functions.listExecutions(params.function, [
-            Query.limit(limit),
-            Query.offset(offset),
-            Query.orderDesc(''),
-            ...parsedQueries.values()
-        ])
+        executions: await sdk
+            .forProject(params.region, params.project)
+            .functions.listExecutions(params.function, [
+                Query.limit(limit),
+                Query.offset(offset),
+                Query.orderDesc(''),
+                ...parsedQueries.values()
+            ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/delete.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/delete.svelte
index a7b5b2082f..01a5ece617 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/delete.svelte
@@ -6,15 +6,18 @@
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import type { Models } from '@appwrite.io/console';
+    import { page } from '$app/stores';
     import { func } from '../store';
+    import type { Models } from '@appwrite.io/console';
 
     export let showDelete = false;
     export let selectedExecution: Models.Execution;
 
     async function handleSubmit() {
         try {
-            await sdk.forProject.functions.deleteExecution($func.$id, selectedExecution.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.deleteExecution($func.$id, selectedExecution.$id);
             await invalidate(Dependencies.EXECUTIONS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.svelte
index 0943144878..72c204a85c 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.svelte
@@ -46,7 +46,7 @@
     } from '$lib/helpers/date';
     import { last } from '$lib/helpers/array';
 
-    let previousPage: string = `${base}/project-${$page.params.project}/functions/function-${$page.params.function}/executions`;
+    let previousPage: string = `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$page.params.function}/executions`;
 
     afterNavigate(({ from }) => {
         previousPage = from?.url?.pathname || previousPage;
@@ -100,17 +100,19 @@
                 headersObject[name] = value;
             }
 
-            await sdk.forProject.functions.createExecution(
-                func.$id,
-                body,
-                true,
-                path,
-                method,
-                headersObject,
-                isScheduled ? dateTime.toISOString() : undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.createExecution(
+                    func.$id,
+                    body,
+                    true,
+                    path,
+                    method,
+                    headersObject,
+                    isScheduled ? dateTime.toISOString() : undefined
+                );
             await goto(
-                `${base}/project-${$page.params.project}/functions/function-${func.$id}/executions`
+                `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${func.$id}/executions`
             );
             invalidate(Dependencies.EXECUTIONS);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.ts
similarity index 69%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.ts
index 1d11c67341..0af3bdd813 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/execute-function/+page.ts
@@ -9,10 +9,9 @@ export const load: PageLoad = async ({ params, depends, parent }) => {
     return {
         func: data.function,
         activeDeployment: data.function.deployment
-            ? await sdk.forProject.functions.getDeployment(
-                  params.function,
-                  data.function.deployment
-              )
+            ? await sdk
+                  .forProject(params.region, params.project)
+                  .functions.getDeployment(params.function, data.function.deployment)
             : null
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/quickFilters.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/quickFilters.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/quickFilters.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/quickFilters.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/table.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/header.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/functions/function-[function]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/header.svelte
index 2b2b5e5c7c..e1a31320c0 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/header.svelte
@@ -9,7 +9,7 @@
 
     const projectId = $page.params.project;
     const functionId = $page.params.function;
-    const path = `${base}/project-${projectId}/functions/function-${functionId}`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/functions/function-${functionId}`;
     const tabs = [
         {
             href: path,
@@ -45,7 +45,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/functions`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/functions`}>
             {$func?.name}
         </CoverTitle>
         {#if $func?.$id}
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/quickFilters.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/quickFilters.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/quickFilters.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/quickFilters.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/functions/function-[function]/redeployModal.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte
index dce772c9a4..639a15d477 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/redeployModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte
@@ -7,6 +7,7 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
+    import { page } from '$app/stores';
     import type { Models } from '@appwrite.io/console';
 
     export let show = false;
@@ -15,11 +16,13 @@
 
     async function redeploy() {
         try {
-            await sdk.forProject.functions.createBuild(
-                $func.$id,
-                selectedDeployment.$id,
-                selectedDeployment.buildId
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.createBuild(
+                    $func.$id,
+                    selectedDeployment.$id,
+                    selectedDeployment.buildId
+                );
             addNotification({
                 type: 'success',
                 message: `Redeploying ${$func.name}`
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
index dd2e6e69e3..79e2782c20 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
@@ -21,22 +21,29 @@
     import { Alert, Heading } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { trackEvent } from '$lib/actions/analytics';
+    import { page } from '$app/stores';
 
     export let data;
     let showAlert = true;
 
     const sdkCreateVariable = async (key: string, value: string) => {
-        await sdk.forProject.functions.createVariable($func.$id, key, value);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .functions.createVariable($func.$id, key, value);
         await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]);
     };
 
     const sdkUpdateVariable = async (variableId: string, key: string, value: string) => {
-        await sdk.forProject.functions.updateVariable($func.$id, variableId, key, value);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .functions.updateVariable($func.$id, variableId, key, value);
         await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]);
     };
 
     const sdkDeleteVariable = async (variableId: string) => {
-        await sdk.forProject.functions.deleteVariable($func.$id, variableId);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .functions.deleteVariable($func.$id, variableId);
         await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]);
     };
 </script>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
similarity index 86%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
index 818c56a6ee..5fc5e80dc5 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
@@ -7,8 +7,8 @@ export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.FUNCTIONS);
 
     const [globalVariables, variables] = await Promise.all([
-        sdk.forProject.projectApi.listVariables(),
-        sdk.forProject.functions.listVariables(params.function)
+        sdk.forProject(params.region, params.project).projectApi.listVariables(),
+        sdk.forProject(params.region, params.project).functions.listVariables(params.function)
     ]);
 
     // Conflicting variables first
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/dangerZone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/dangerZone.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/deleteModal.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/deleteModal.svelte
index 589f01e394..11f6087669 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/deleteModal.svelte
@@ -13,13 +13,15 @@
 
     const handleSubmit = async () => {
         try {
-            await sdk.forProject.functions.delete(functionId);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.delete(functionId);
             showDelete = false;
             addNotification({
                 type: 'success',
                 message: `Function has been deleted`
             });
-            await goto(`${base}/project-${$page.params.project}/functions`);
+            await goto(`${base}/project-${$page.params.region}-${$page.params.project}/functions`);
             trackEvent(Submit.FunctionDelete);
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/disconnectRepo.svelte
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/disconnectRepo.svelte
index 699aebab29..0cfa857b37 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/disconnectRepo.svelte
@@ -23,25 +23,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                '',
-                '',
-                '',
-                true,
-                ''
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    '',
+                    '',
+                    '',
+                    true,
+                    ''
+                );
             await invalidate(Dependencies.FUNCTION);
             dispatch('success');
             addNotification({
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte
index 8d43b7f151..2212d0ad83 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte
@@ -3,7 +3,7 @@
     import { CardGrid, Heading, SvgIcon } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { func } from '../store';
 </script>
 
@@ -30,7 +30,7 @@
     <svelte:fragment slot="actions">
         <Button
             secondary
-            href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}>
+            href={`${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}>
             Execute
         </Button>
     </svelte:fragment>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
index baf802e2ce..4cc29540e7 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
@@ -52,25 +52,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                selectedInstallationId,
-                selectedRepoId,
-                selectedBranch,
-                silentMode,
-                selectedDir
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    selectedInstallationId,
+                    selectedRepoId,
+                    selectedBranch,
+                    silentMode,
+                    selectedDir
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 type: 'success',
@@ -93,10 +95,9 @@
             $repositories.search !== search
         ) {
             $repositories.repositories = (
-                await sdk.forProject.vcs.listRepositories(
-                    selectedInstallationId,
-                    search || undefined
-                )
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .vcs.listRepositories(selectedInstallationId, search || undefined)
             ).providerRepositories;
         }
 
@@ -107,10 +108,9 @@
     }
     async function getBranches() {
         if (!show || !selectedInstallationId) return;
-        branchesList = await sdk.forProject.vcs.listRepositoryBranches(
-            selectedInstallationId,
-            selectedRepoId
-        );
+        branchesList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .vcs.listRepositoryBranches(selectedInstallationId, selectedRepoId);
 
         branchesList.branches = sortBranches(branchesList.branches);
 
@@ -160,7 +160,8 @@
             <p class="text">
                 Manage organization configuration in your <a
                     class="link"
-                    href={`${base}/project-${$page.params.project}/settings`}>project settings</a
+                    href={`${base}/project-${$page.params.region}-${$page.params.project}/settings`}
+                    >project settings</a
                 >.
             </p>
             {#if repositoriesList.length}
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateConfiguration.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateConfiguration.svelte
index 666b1e0a73..f1318a42fa 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateConfiguration.svelte
@@ -38,7 +38,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { Runtime, type Models } from '@appwrite.io/console';
     import { func } from '../store';
-    import GitInstallationModal from '$routes/(console)/project-[project]/settings/GitInstallationModal.svelte';
+    import GitInstallationModal from '$routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte';
     import GitConfigurationModal from './gitConfigurationModal.svelte';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { onMount } from 'svelte';
@@ -83,10 +83,9 @@
     async function loadRepository() {
         try {
             if ($func.installationId && $func.providerRepositoryId) {
-                repository = await sdk.forProject.vcs.getRepository(
-                    $func.installationId,
-                    $func.providerRepositoryId
-                );
+                repository = await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .vcs.getRepository($func.installationId, $func.providerRepositoryId);
             }
         } catch (err) {
             console.warn(err);
@@ -118,25 +117,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                entrypoint,
-                commands,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                selectedBranch,
-                silentMode,
-                selectedDir
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    entrypoint,
+                    commands,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    selectedBranch,
+                    silentMode,
+                    selectedDir
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 type: 'success',
@@ -153,7 +154,9 @@
     }
 
     async function getBranches(installation: string, repo: string) {
-        branchesList = await sdk.forProject.vcs.listRepositoryBranches(installation, repo);
+        branchesList = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .vcs.listRepositoryBranches(installation, repo);
         branchesList.branches = sortBranches(branchesList.branches);
 
         selectedBranch = $func?.providerBranch ?? branchesList.branches[0].name;
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte
index fe63e7726a..0a2f6f0900 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateEvents.svelte
@@ -34,25 +34,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                Array.from($eventSet),
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    Array.from($eventSet),
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 message: 'Events have been updated',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte
index 53cf050e68..d78de0a8bc 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateLogging.svelte
@@ -8,7 +8,7 @@
     import InputSwitch from '$lib/elements/forms/inputSwitch.svelte';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { onMount } from 'svelte';
     import { func } from '../store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
@@ -27,25 +27,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                functionLogging,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    functionLogging,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 type: 'success',
@@ -78,7 +80,7 @@
                     <svelte:fragment slot="description">
                         <p>
                             When disabled, execution logs and errors will not be shown in the <a
-                                href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions`}
+                                href={`${base}/project-${$project.region}-${$project.$id}/functions/function-${$func.$id}/executions`}
                                 class="link">
                                 Executions</a> tab
                         </p>
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte
similarity index 68%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte
index 3051debe42..97fe28d0f1 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateName.svelte
@@ -24,25 +24,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                functionName,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    functionName,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte
similarity index 72%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte
index 41a8ecbe36..899c853b9e 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updatePermissions.svelte
@@ -28,25 +28,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                permissions,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    permissions,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 message: 'Permissions have been updated',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
index d7925fea5f..b26a4a2b85 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -34,25 +34,27 @@
             if (!isValueOfStringEnum(Runtime, runtime)) {
                 throw new Error(`Invalid runtime: ${runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 message: 'Runtime has been updated',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte
index d59ccecf84..2e3144ad93 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateSchedule.svelte
@@ -24,25 +24,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                functionSchedule,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    functionSchedule,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
similarity index 71%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
index 4b800b2a99..2af6b4df01 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
@@ -11,7 +11,7 @@
     import { func } from '../store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { Runtime } from '@appwrite.io/console';
-    import Scopes from '$routes/(console)/project-[project]/overview/keys/scopes.svelte';
+    import Scopes from '$routes/(console)/project-[region]-[project]/overview/keys/scopes.svelte';
     import { symmetricDifference } from '$lib/helpers/array';
 
     const functionId = $page.params.function;
@@ -26,25 +26,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                $func.timeout || undefined,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                functionScopes,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    $func.timeout || undefined,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    functionScopes,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte
index 9c4f077539..c975bc5e18 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateTimeout.svelte
@@ -24,25 +24,27 @@
             if (!isValueOfStringEnum(Runtime, $func.runtime)) {
                 throw new Error(`Invalid runtime: ${$func.runtime}`);
             }
-            await sdk.forProject.functions.update(
-                functionId,
-                $func.name,
-                $func.runtime,
-                $func.execute || undefined,
-                $func.events || undefined,
-                $func.schedule || undefined,
-                timeout,
-                $func.enabled || undefined,
-                $func.logging || undefined,
-                $func.entrypoint || undefined,
-                $func.commands || undefined,
-                $func.scopes || undefined,
-                $func.installationId || undefined,
-                $func.providerRepositoryId || undefined,
-                $func.providerBranch || undefined,
-                $func.providerSilentMode || undefined,
-                $func.providerRootDirectory || undefined
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.update(
+                    functionId,
+                    $func.name,
+                    $func.runtime,
+                    $func.execute || undefined,
+                    $func.events || undefined,
+                    $func.schedule || undefined,
+                    timeout,
+                    $func.enabled || undefined,
+                    $func.logging || undefined,
+                    $func.entrypoint || undefined,
+                    $func.commands || undefined,
+                    $func.scopes || undefined,
+                    $func.installationId || undefined,
+                    $func.providerRepositoryId || undefined,
+                    $func.providerBranch || undefined,
+                    $func.providerSilentMode || undefined,
+                    $func.providerRootDirectory || undefined
+                );
             await invalidate(Dependencies.FUNCTION);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/store.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
index af89e599f9..1e17597ad5 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
@@ -46,8 +46,10 @@
 
     function getDownload(deploymentId: string) {
         return (
-            sdk.forProject.functions.getDeploymentDownload($func.$id, deploymentId).toString() +
-            '&mode=admin'
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .functions.getDeploymentDownload($func.$id, deploymentId)
+                .toString() + '&mode=admin'
         );
     }
 </script>
@@ -149,7 +151,7 @@
                             {/if}
                             <DropListLink
                                 icon="terminal"
-                                href={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${deployment.$id}`}>
+                                href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$page.params.function}/deployment-${deployment.$id}`}>
                                 Logs
                             </DropListLink>
                             <DropListLink
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts
similarity index 78%
rename from src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts
index 1766c60a0f..18656e0910 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts
@@ -9,7 +9,9 @@ export const load: PageLoad = async ({ params }) => {
         const period = isValueOfStringEnum(FunctionUsageRange, params.period)
             ? params.period
             : FunctionUsageRange.ThirtyDays;
-        return sdk.forProject.functions.getFunctionUsage(params.function, period);
+        return sdk
+            .forProject(params.region, params.project)
+            .functions.getFunctionUsage(params.function, period);
     } catch (e) {
         error(e.code, e.message);
     }
diff --git a/src/routes/(console)/project-[project]/functions/header.svelte b/src/routes/(console)/project-[region]-[project]/functions/header.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/functions/header.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/header.svelte
index 824ee2c335..aab1d3d83f 100644
--- a/src/routes/(console)/project-[project]/functions/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/header.svelte
@@ -6,7 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
 
     $: projectId = $page.params.project;
-    $: path = `${base}/project-${projectId}/functions`;
+    $: path = `${base}/project-${$page.params.region}-${projectId}/functions`;
     $: tabs = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[project]/functions/store.ts b/src/routes/(console)/project-[region]-[project]/functions/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/store.ts
rename to src/routes/(console)/project-[region]-[project]/functions/store.ts
diff --git a/src/routes/(console)/project-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte
similarity index 99%
rename from src/routes/(console)/project-[project]/functions/templates/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte
index 3ba5404c25..3b59d9e91f 100644
--- a/src/routes/(console)/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte
@@ -248,7 +248,7 @@
 
                                 <div class="u-flex u-gap-16 u-main-end u-margin-block-start-24">
                                     <Button
-                                        href={`${base}/project-${$page.params.project}/functions/templates/template-${template.id}`}
+                                        href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/templates/template-${template.id}`}
                                         text>
                                         <span class="text">View details</span>
                                     </Button>
diff --git a/src/routes/(console)/project-[project]/functions/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
similarity index 95%
rename from src/routes/(console)/project-[project]/functions/templates/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
index 1f8f6301ae..abf21eb708 100644
--- a/src/routes/(console)/project-[project]/functions/templates/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
@@ -59,6 +59,6 @@ export const load: PageLoad = async ({ url, route, depends, parent }) => {
         useCases,
         sum: templates.length,
         templates: templates.splice(((page === 0 ? 1 : page) - 1) * limit, limit),
-        functions: await sdk.forProject.functions.list()
+        functions: await sdk.forProject(params.region, params.project).functions.list()
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/templates/template-[template]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/templates/template-[template]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+layout.ts
diff --git a/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts
similarity index 53%
rename from src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts
index 2eefc0d95f..de196797a4 100644
--- a/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts
@@ -6,7 +6,9 @@ export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.FUNCTIONS);
 
     return {
-        template: await sdk.forProject.functions.getTemplate(params.template),
-        functions: await sdk.forProject.functions.list()
+        template: await sdk
+            .forProject(params.region, params.project)
+            .functions.getTemplate(params.template),
+        functions: await sdk.forProject(params.region, params.project).functions.list()
     };
 };
diff --git a/src/routes/(console)/project-[project]/functions/templates/template-[template]/header.svelte b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/header.svelte
similarity index 77%
rename from src/routes/(console)/project-[project]/functions/templates/template-[template]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/header.svelte
index 5ad5d15271..5ce5a84dea 100644
--- a/src/routes/(console)/project-[project]/functions/templates/template-[template]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/header.svelte
@@ -8,7 +8,8 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${$page.params.project}/functions/templates`}>
+        <CoverTitle
+            href={`${base}/project-${$page.params.region}-${$page.params.project}/functions/templates`}>
             {$template.name}
         </CoverTitle>
         <Id value={$template.id} event="user">{$template.id}</Id>
diff --git a/src/routes/(console)/project-[project]/functions/templates/template-[template]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/templates/template-[template]/store.ts
rename to src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/store.ts
diff --git a/src/routes/(console)/project-[project]/functions/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/functions/wizard/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/wizard/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/wizard/step1.svelte
diff --git a/src/routes/(console)/project-[project]/functions/wizard/step2.svelte b/src/routes/(console)/project-[region]-[project]/functions/wizard/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/wizard/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/wizard/step2.svelte
diff --git a/src/routes/(console)/project-[project]/functions/wizard/step3.svelte b/src/routes/(console)/project-[region]-[project]/functions/wizard/step3.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/wizard/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/wizard/step3.svelte
diff --git a/src/routes/(console)/project-[project]/functions/wizard/step4.svelte b/src/routes/(console)/project-[region]-[project]/functions/wizard/step4.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/wizard/step4.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/wizard/step4.svelte
diff --git a/src/routes/(console)/project-[project]/functions/wizard/step5.svelte b/src/routes/(console)/project-[region]-[project]/functions/wizard/step5.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/wizard/step5.svelte
rename to src/routes/(console)/project-[region]-[project]/functions/wizard/step5.svelte
diff --git a/src/routes/(console)/project-[project]/functions/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/functions/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/functions/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/functions/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+layout.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/messaging/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/+layout.svelte
index 50ee249dc1..a0b2b18774 100644
--- a/src/routes/(console)/project-[project]/messaging/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+layout.svelte
@@ -31,7 +31,7 @@
             label: 'Go to Topics',
             keys: ['g', 't'],
             callback() {
-                goto(`${base}/project-${$project.$id}/messaging/topics`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/messaging/topics`);
             },
             disabled:
                 $page.url.pathname.endsWith('topics') || $page.url.pathname.includes('message-'),
@@ -42,7 +42,7 @@
             label: 'Go to Providers',
             keys: ['g', 'p'],
             callback() {
-                goto(`${base}/project-${$project.$id}/messaging/providers`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/messaging/providers`);
             },
             disabled:
                 $page.url.pathname.endsWith('providers') || $page.url.pathname.includes('message-'),
diff --git a/src/routes/(console)/project-[project]/messaging/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/+layout.ts
diff --git a/src/routes/(console)/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/messaging/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
index efac29adc8..ba09258035 100644
--- a/src/routes/(console)/project-[project]/messaging/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
@@ -67,7 +67,9 @@
     async function handleDelete() {
         showDelete = false;
 
-        const promises = selected.map((id) => sdk.forProject.messaging.delete(id));
+        const promises = selected.map((id) =>
+            sdk.forProject($page.params.region, $page.params.project).messaging.delete(id)
+        );
 
         try {
             await Promise.all(promises);
@@ -153,7 +155,7 @@
             <TableBody>
                 {#each data.messages.messages as message (message.$id)}
                     <TableRowLink
-                        href={`${base}/project-${project}/messaging/message-${message.$id}`}>
+                        href={`${base}/project-${$page.params.region}-${project}/messaging/message-${message.$id}`}>
                         {#if $canWriteMessages}
                             <TableCellCheck
                                 bind:selectedIds={selected}
@@ -257,7 +259,9 @@
                 <Button external href="https://appwrite.io/docs/products/messaging/messages" text>
                     Documentation
                 </Button>
-                <Button secondary href={`${base}/project-${$page.params.project}/messaging`}>
+                <Button
+                    secondary
+                    href={`${base}/project-${$page.params.region}-${$page.params.project}/messaging`}>
                     Clear search
                 </Button>
             </div>
diff --git a/src/routes/(console)/project-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
similarity index 74%
rename from src/routes/(console)/project-[project]/messaging/+page.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/+page.ts
index 1e84dd190f..64845f1e40 100644
--- a/src/routes/(console)/project-[project]/messaging/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
@@ -33,15 +33,17 @@ export const load: PageLoad = async ({ depends, url, route }) => {
         query,
         page,
         view,
-        messages: (await sdk.forProject.messaging.listMessages(
-            [
-                Query.limit(limit),
-                Query.offset(offset),
-                Query.orderDesc(''),
-                ...parsedQueries.values()
-            ],
-            search || undefined
-        )) as {
+        messages: (await sdk
+            .forProject(params.region, params.project)
+            .messaging.listMessages(
+                [
+                    Query.limit(limit),
+                    Query.offset(offset),
+                    Query.orderDesc(''),
+                    ...parsedQueries.values()
+                ],
+                search || undefined
+            )) as {
             total: number;
             messages: (Models.Message & { data: Record<string, string> })[]; // Add typing for message.data
         }
diff --git a/src/routes/(console)/project-[project]/messaging/actions.svelte b/src/routes/(console)/project-[region]-[project]/messaging/actions.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/actions.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/actions.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte
similarity index 76%
rename from src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte
index b3d6b6a09e..1d201d373d 100644
--- a/src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte
@@ -10,11 +10,11 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.region}-${$project.$id}/messaging`,
             title: 'Messaging'
         }
     ];
diff --git a/src/routes/(console)/project-[project]/messaging/bubble-tail-dark.svg b/src/routes/(console)/project-[region]-[project]/messaging/bubble-tail-dark.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/bubble-tail-dark.svg
rename to src/routes/(console)/project-[region]-[project]/messaging/bubble-tail-dark.svg
diff --git a/src/routes/(console)/project-[project]/messaging/bubble-tail-light.svg b/src/routes/(console)/project-[region]-[project]/messaging/bubble-tail-light.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/bubble-tail-light.svg
rename to src/routes/(console)/project-[region]-[project]/messaging/bubble-tail-light.svg
diff --git a/src/routes/(console)/project-[project]/messaging/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/create.svelte
similarity index 65%
rename from src/routes/(console)/project-[project]/messaging/create.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/create.svelte
index 4f62b5fa1a..1e25d6ebce 100644
--- a/src/routes/(console)/project-[project]/messaging/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/create.svelte
@@ -13,6 +13,7 @@
     import { wizard } from '$lib/stores/wizard';
     import { providerType, messageParams } from './wizard/store';
     import { ID, MessagingProviderType, type Models } from '@appwrite.io/console';
+    import { page } from '$app/stores';
 
     async function create() {
         try {
@@ -21,31 +22,35 @@
 
             switch ($providerType) {
                 case MessagingProviderType.Email:
-                    response = await sdk.forProject.messaging.createEmail(
-                        messageId,
-                        $messageParams[$providerType].subject,
-                        $messageParams[$providerType].content,
-                        $messageParams[$providerType].topics,
-                        $messageParams[$providerType].users,
-                        $messageParams[$providerType].targets,
-                        undefined,
-                        undefined,
-                        undefined,
-                        $messageParams[$providerType].draft,
-                        $messageParams[$providerType].html,
-                        $messageParams[$providerType].scheduledAt
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createEmail(
+                            messageId,
+                            $messageParams[$providerType].subject,
+                            $messageParams[$providerType].content,
+                            $messageParams[$providerType].topics,
+                            $messageParams[$providerType].users,
+                            $messageParams[$providerType].targets,
+                            undefined,
+                            undefined,
+                            undefined,
+                            $messageParams[$providerType].draft,
+                            $messageParams[$providerType].html,
+                            $messageParams[$providerType].scheduledAt
+                        );
                     break;
                 case MessagingProviderType.Sms:
-                    response = await sdk.forProject.messaging.createSms(
-                        messageId,
-                        $messageParams[$providerType].content,
-                        $messageParams[$providerType].topics,
-                        $messageParams[$providerType].users,
-                        $messageParams[$providerType].targets,
-                        $messageParams[$providerType].draft,
-                        $messageParams[$providerType].scheduledAt
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createSms(
+                            messageId,
+                            $messageParams[$providerType].content,
+                            $messageParams[$providerType].topics,
+                            $messageParams[$providerType].users,
+                            $messageParams[$providerType].targets,
+                            $messageParams[$providerType].draft,
+                            $messageParams[$providerType].scheduledAt
+                        );
                     break;
                 case MessagingProviderType.Push:
                     {
@@ -60,24 +65,26 @@
                             });
                         }
 
-                        response = await sdk.forProject.messaging.createPush(
-                            messageId,
-                            $messageParams[$providerType].title,
-                            $messageParams[$providerType].body,
-                            $messageParams[$providerType].topics,
-                            $messageParams[$providerType].users,
-                            $messageParams[$providerType].targets,
-                            customData,
-                            undefined,
-                            fileCompoundId,
-                            undefined,
-                            undefined,
-                            undefined,
-                            undefined,
-                            undefined,
-                            $messageParams[$providerType].draft,
-                            $messageParams[$providerType].scheduledAt
-                        );
+                        response = await sdk
+                            .forProject($page.params.region, $page.params.project)
+                            .messaging.createPush(
+                                messageId,
+                                $messageParams[$providerType].title,
+                                $messageParams[$providerType].body,
+                                $messageParams[$providerType].topics,
+                                $messageParams[$providerType].users,
+                                $messageParams[$providerType].targets,
+                                customData,
+                                undefined,
+                                fileCompoundId,
+                                undefined,
+                                undefined,
+                                undefined,
+                                undefined,
+                                undefined,
+                                $messageParams[$providerType].draft,
+                                $messageParams[$providerType].scheduledAt
+                            );
                     }
                     break;
             }
@@ -102,7 +109,9 @@
                 providerType: $providerType,
                 status: response.status
             });
-            await goto(`${base}/project-${$project.$id}/messaging/message-${response.$id}`);
+            await goto(
+                `${base}/project-${$project.region}-${$project.$id}/messaging/message-${response.$id}`
+            );
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/messaging/createMessageDropdown.svelte b/src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/createMessageDropdown.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/createMessageDropdown.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/failedModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/failedModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/failedModal.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/header.svelte b/src/routes/(console)/project-[region]-[project]/messaging/header.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/messaging/header.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/header.svelte
index f46fce4429..7c3b5aba37 100644
--- a/src/routes/(console)/project-[project]/messaging/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/header.svelte
@@ -6,7 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `${base}/project-${projectId}/messaging`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/messaging`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts
similarity index 70%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts
index 7e3985ea37..735a61d07e 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts
@@ -10,11 +10,15 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.MESSAGING_MESSAGE);
 
     try {
-        const message = await sdk.forProject.messaging.getMessage(params.message);
+        const message = await sdk
+            .forProject(params.region, params.project)
+            .messaging.getMessage(params.message);
 
         const topicsById: Record<string, Models.Topic> = {};
         const topicsPromise = Promise.allSettled(
-            message.topics.map((topicId) => sdk.forProject.messaging.getTopic(topicId))
+            message.topics.map((topicId) =>
+                sdk.forProject(params.region, params.project).messaging.getTopic(topicId)
+            )
         ).then((results) => {
             results.forEach((result) => {
                 if (result.status === 'fulfilled') {
@@ -24,8 +28,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         });
 
         const targetsById: Record<string, Models.Target> = {};
-        const targetsPromise = sdk.forProject.messaging
-            .listTargets(params.message)
+        const targetsPromise = sdk
+            .forProject(params.region, params.project)
+            .messaging.listTargets(params.message)
             .then((response) => {
                 response.targets.forEach((target) => {
                     targetsById[target.$id] = target;
@@ -36,9 +41,12 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
         const usersById: Record<string, Models.User<Models.Preferences>> = {};
         const usersPromise = Object.values(targetsById).map((target) =>
-            sdk.forProject.users.get(target.userId).then((user) => {
-                usersById[user.$id] = user;
-            })
+            sdk
+                .forProject(params.region, params.project)
+                .users.get(target.userId)
+                .then((user) => {
+                    usersById[user.$id] = user;
+                })
         );
 
         await Promise.allSettled(usersPromise);
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte
similarity index 80%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte
index 8f0dc331ad..2b49f54c94 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte
@@ -11,11 +11,11 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.region}-${$project.$id}/messaging`,
             title:
                 $message.data.title ?? $message.data.subject ?? $message.data.content ?? 'Message'
         }
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/cancelModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/cancelModal.svelte
similarity index 58%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/cancelModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/cancelModal.svelte
index 39802b18d0..d37b8b43bd 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/cancelModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/cancelModal.svelte
@@ -7,6 +7,7 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { MessagingProviderType, type Models } from '@appwrite.io/console';
     import { Dependencies } from '$lib/constants';
+    import { page } from '$app/stores';
 
     export let show = false;
     export let message: Models.Message & { data: Record<string, unknown> };
@@ -14,42 +15,48 @@
     const update = async () => {
         try {
             if (message.providerType == MessagingProviderType.Email) {
-                await sdk.forProject.messaging.updateEmail(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    true
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateEmail(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        true
+                    );
             } else if (message.providerType == MessagingProviderType.Sms) {
-                await sdk.forProject.messaging.updateSms(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    true
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateSms(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        true
+                    );
             } else if (message.providerType == MessagingProviderType.Push) {
-                await sdk.forProject.messaging.updatePush(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    true
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updatePush(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        true
+                    );
             }
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/delete.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/delete.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/delete.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/deleteModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte
index 6d335bd78d..103a642cee 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/deleteModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte
@@ -16,7 +16,9 @@
 
     const deleteMessage = async () => {
         try {
-            await sdk.forProject.messaging.delete(message.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.delete(message.$id);
             show = false;
             let notificationMessage = '';
             switch (message.status) {
@@ -36,7 +38,7 @@
                 message: notificationMessage
             });
             trackEvent(Submit.MessagingMessageDelete);
-            await goto(`${base}/project-${$page.params.project}/messaging`);
+            await goto(`${base}/project-${$page.params.region}-${$page.params.project}/messaging`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/emailMessage.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/emailMessage.svelte
index 6fcaad6d47..fc839de703 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/emailMessage.svelte
@@ -15,6 +15,7 @@
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
+    import { page } from '$app/stores';
 
     export let message: Models.Message & { data: Record<string, string> };
 
@@ -31,16 +32,18 @@
 
     async function update() {
         try {
-            await sdk.forProject.messaging.updateEmail(
-                message.$id,
-                undefined,
-                undefined,
-                undefined,
-                subject,
-                content,
-                undefined,
-                html
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.updateEmail(
+                    message.$id,
+                    undefined,
+                    undefined,
+                    undefined,
+                    subject,
+                    content,
+                    undefined,
+                    html
+                );
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
                 message: 'Message has been updated',
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/header.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/header.svelte
similarity index 85%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/header.svelte
index 27688a3d1f..a1409d8df6 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/header.svelte
@@ -10,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/messaging`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/messaging`}>
             {$message.data.title ?? $message.data.subject ?? $message.data.content ?? 'Message'}
         </CoverTitle>
         <Id value={$message.$id} event="message">{$message.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/overview.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/overview.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/overview.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/overview.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte
index 843947b85e..e180260bf5 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte
@@ -21,6 +21,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { validateData } from '../wizard/pushFormList.svelte';
+    import { page } from '$app/stores';
 
     /* eslint  @typescript-eslint/no-explicit-any: 'off' */
     export let message: Models.Message & { data: Record<string, any> };
@@ -37,10 +38,9 @@
         title = message.data.title;
         body = message.data.body;
         if (message.data?.image) {
-            file = await sdk.forProject.storage.getFile(
-                message.data.image?.bucketId,
-                message.data.image?.fileId
-            );
+            file = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.getFile(message.data.image?.bucketId, message.data.image?.fileId);
         }
 
         const dataEntries: [string, string][] = [];
@@ -60,17 +60,19 @@
                 }
                 return acc;
             }, {});
-            await sdk.forProject.messaging.updatePush(
-                message.$id,
-                undefined,
-                undefined,
-                undefined,
-                title,
-                body,
-                data,
-                undefined,
-                fileCompoundId
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.updatePush(
+                    message.$id,
+                    undefined,
+                    undefined,
+                    undefined,
+                    title,
+                    body,
+                    data,
+                    undefined,
+                    fileCompoundId
+                );
             originalCustomData = structuredClone(customData);
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/scheduleModal.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/scheduleModal.svelte
index a8d749d2ca..5dc3e417dc 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/scheduleModal.svelte
@@ -8,6 +8,7 @@
     import { MessagingProviderType, type Models } from '@appwrite.io/console';
     import { Dependencies } from '$lib/constants';
     import { isSameDay, toLocaleDateISO, toLocaleTimeISO } from '$lib/helpers/date';
+    import { page } from '$app/stores';
 
     export let show = false;
     export let message: Models.Message & { data: Record<string, unknown> };
@@ -44,48 +45,54 @@
     const update = async () => {
         try {
             if (message.providerType == MessagingProviderType.Email) {
-                await sdk.forProject.messaging.updateEmail(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    false,
-                    undefined,
-                    undefined,
-                    undefined,
-                    dateTime.toISOString()
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateEmail(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        false,
+                        undefined,
+                        undefined,
+                        undefined,
+                        dateTime.toISOString()
+                    );
             } else if (message.providerType == MessagingProviderType.Sms) {
-                await sdk.forProject.messaging.updateSms(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    false,
-                    dateTime.toISOString()
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateSms(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        false,
+                        dateTime.toISOString()
+                    );
             } else if (message.providerType == MessagingProviderType.Push) {
-                await sdk.forProject.messaging.updatePush(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    false,
-                    dateTime.toISOString()
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updatePush(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        false,
+                        dateTime.toISOString()
+                    );
             }
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/sendModal.svelte
similarity index 63%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/sendModal.svelte
index fdfaa1d5ce..e85b6a2dbe 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/sendModal.svelte
@@ -7,6 +7,7 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { MessagingProviderType, type Models } from '@appwrite.io/console';
     import { Dependencies } from '$lib/constants';
+    import { page } from '$app/stores';
 
     export let show = false;
     export let message: Models.Message & { data: Record<string, unknown> };
@@ -27,42 +28,48 @@
     const update = async () => {
         try {
             if (message.providerType == MessagingProviderType.Email) {
-                await sdk.forProject.messaging.updateEmail(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    false
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateEmail(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        false
+                    );
             } else if (message.providerType == MessagingProviderType.Sms) {
-                await sdk.forProject.messaging.updateSms(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    false
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateSms(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        false
+                    );
             } else if (message.providerType == MessagingProviderType.Push) {
-                await sdk.forProject.messaging.updatePush(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    undefined,
-                    false
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updatePush(
+                        message.$id,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        undefined,
+                        false
+                    );
             }
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/smsMessage.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/smsMessage.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/smsMessage.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/smsMessage.svelte
index d71353c40a..4ab95ec87d 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/smsMessage.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/smsMessage.svelte
@@ -9,6 +9,7 @@
     import { trackEvent, Submit, trackError } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     export let message: Models.Message & { data: Record<string, string> };
 
@@ -21,13 +22,9 @@
 
     async function update() {
         try {
-            await sdk.forProject.messaging.updateSms(
-                message.$id,
-                undefined,
-                undefined,
-                undefined,
-                content
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.updateSms(message.$id, undefined, undefined, undefined, content);
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
                 message: 'Message has been updated',
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte
index 8c112fba95..a5ca001490 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTargets.svelte
@@ -19,6 +19,7 @@
     import { Button, Form } from '$lib/elements/forms';
     import UserTargetsModal from '../userTargetsModal.svelte';
     import { isValueOfStringEnum } from '$lib/helpers/types';
+    import { page } from '$app/stores';
 
     export let message: Models.Message & { data: Record<string, unknown> };
     export let selectedTargetsById: Record<string, Models.Target>;
@@ -48,26 +49,17 @@
     async function update() {
         try {
             if (message.providerType == MessagingProviderType.Email) {
-                await sdk.forProject.messaging.updateEmail(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    targetIds
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateEmail(message.$id, undefined, undefined, targetIds);
             } else if (message.providerType == MessagingProviderType.Sms) {
-                await sdk.forProject.messaging.updateSms(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    targetIds
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateSms(message.$id, undefined, undefined, targetIds);
             } else if (message.providerType == MessagingProviderType.Push) {
-                await sdk.forProject.messaging.updatePush(
-                    message.$id,
-                    undefined,
-                    undefined,
-                    targetIds
-                );
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updatePush(message.$id, undefined, undefined, targetIds);
             }
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTopics.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/messaging/message-[message]/updateTopics.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte
index be240b2d13..448076c5ac 100644
--- a/src/routes/(console)/project-[project]/messaging/message-[message]/updateTopics.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte
@@ -20,6 +20,7 @@
     import { onMount } from 'svelte';
     import { getTotal } from '../wizard/store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
+    import { page } from '$app/stores';
 
     export let message: Models.Message;
     export let selectedTopicsById: Record<string, Models.Topic>;
@@ -49,11 +50,17 @@
     async function update() {
         try {
             if (message.providerType == MessagingProviderType.Email) {
-                await sdk.forProject.messaging.updateEmail(message.$id, topicIds);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateEmail(message.$id, topicIds);
             } else if (message.providerType == MessagingProviderType.Sms) {
-                await sdk.forProject.messaging.updateSms(message.$id, topicIds);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updateSms(message.$id, topicIds);
             } else if (message.providerType == MessagingProviderType.Push) {
-                await sdk.forProject.messaging.updatePush(message.$id, topicIds);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .messaging.updatePush(message.$id, topicIds);
             }
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/messaging/messageStatusPill.svelte b/src/routes/(console)/project-[region]-[project]/messaging/messageStatusPill.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/messageStatusPill.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/messageStatusPill.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/provider.svelte b/src/routes/(console)/project-[region]-[project]/messaging/provider.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/provider.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/provider.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providerType.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providerType.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providerType.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providerType.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/messaging/providers/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
index d75a1464c1..04910aae74 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
@@ -83,7 +83,9 @@
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no providers that match your search.</p>
             </div>
-            <Button secondary href={`${base}/project-${$page.params.project}/messaging/providers`}>
+            <Button
+                secondary
+                href={`${base}/project-${$page.params.region}-${$page.params.project}/messaging/providers`}>
                 Clear search
             </Button>
         </EmptySearch>
diff --git a/src/routes/(console)/project-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
similarity index 71%
rename from src/routes/(console)/project-[project]/messaging/providers/+page.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
index 06efd872a9..fe8003fdd7 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
@@ -33,14 +33,16 @@ export const load: PageLoad = async ({ depends, url, route }) => {
         query,
         page,
         view,
-        providers: await sdk.forProject.messaging.listProviders(
-            [
-                Query.limit(limit),
-                Query.offset(offset),
-                Query.orderDesc(''),
-                ...parsedQueries.values()
-            ],
-            search || undefined
-        )
+        providers: await sdk
+            .forProject(params.region, params.project)
+            .messaging.listProviders(
+                [
+                    Query.limit(limit),
+                    Query.offset(offset),
+                    Query.orderDesc(''),
+                    ...parsedQueries.values()
+                ],
+                search || undefined
+            )
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
new file mode 100644
index 0000000000..321e4143ee
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
@@ -0,0 +1,189 @@
+<script lang="ts">
+    import { Wizard } from '$lib/layout';
+    import type { WizardStepsType } from '$lib/layout/wizard.svelte';
+    import Provider from './wizard/provider.svelte';
+    import Settings from './wizard/settings.svelte';
+    import { sdk } from '$lib/stores/sdk';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { addNotification } from '$lib/stores/notifications';
+    import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
+    import { project } from '../../store';
+    import { wizard } from '$lib/stores/wizard';
+    import { provider, providerParams } from './wizard/store';
+    import { ID, type Models } from '@appwrite.io/console';
+    import { Providers } from '../provider.svelte';
+    import { page } from '$app/stores';
+
+    async function create() {
+        try {
+            let response: Models.Provider;
+            const providerId = $providerParams[$provider].providerId || ID.unique();
+            switch ($provider) {
+                case Providers.Twilio:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createTwilioProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].from,
+                            $providerParams[$provider].accountSid,
+                            $providerParams[$provider].authToken,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.Msg91:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createMsg91Provider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].templateId,
+                            $providerParams[$provider].senderId,
+                            $providerParams[$provider].authKey,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.Telesign:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createTelesignProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].from,
+                            $providerParams[$provider].customerId,
+                            $providerParams[$provider].apiKey,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.Textmagic:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createTextmagicProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].from,
+                            $providerParams[$provider].username,
+                            $providerParams[$provider].apiKey,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.Vonage:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createVonageProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].from,
+                            $providerParams[$provider].apiKey,
+                            $providerParams[$provider].apiSecret,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.Mailgun:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createMailgunProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].apiKey,
+                            $providerParams[$provider].domain,
+                            $providerParams[$provider].isEuRegion,
+                            $providerParams[$provider].fromName || undefined,
+                            $providerParams[$provider].fromEmail,
+                            $providerParams[$provider].replyToName || undefined,
+                            $providerParams[$provider].replyToEmail || undefined,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.Sendgrid:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createSendgridProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].apiKey,
+                            $providerParams[$provider].fromName || undefined,
+                            $providerParams[$provider].fromEmail,
+                            $providerParams[$provider].replyToName || undefined,
+                            $providerParams[$provider].replyToEmail || undefined,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.SMTP:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createSmtpProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].host,
+                            $providerParams[$provider].port || undefined,
+                            $providerParams[$provider].username || undefined,
+                            $providerParams[$provider].password || undefined,
+                            $providerParams[$provider].encryption,
+                            $providerParams[$provider].autoTLS,
+                            $providerParams[$provider].mailer || undefined,
+                            $providerParams[$provider].fromName || undefined,
+                            $providerParams[$provider].fromEmail,
+                            $providerParams[$provider].replyToName || undefined,
+                            $providerParams[$provider].replyToEmail || undefined,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.FCM:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createFcmProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            JSON.parse($providerParams[$provider].serviceAccountJSON),
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+                case Providers.APNS:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.createApnsProvider(
+                            providerId,
+                            $providerParams[$provider].name,
+                            $providerParams[$provider].authKey,
+                            $providerParams[$provider].authKeyId,
+                            $providerParams[$provider].teamId,
+                            $providerParams[$provider].bundleId,
+                            $providerParams[$provider].sandbox,
+                            $providerParams[$provider].enabled
+                        );
+                    break;
+            }
+            wizard.hide();
+            addNotification({
+                type: 'success',
+                message: `${response.name} has been created`
+            });
+            trackEvent(Submit.MessagingProviderCreate, {
+                provider: $provider
+            });
+            await goto(
+                `${base}/project-${$project.region}-${$project.$id}/messaging/providers/provider-${response.$id}`
+            );
+        } catch (error) {
+            addNotification({
+                type: 'error',
+                message: error.message
+            });
+            trackError(error, Submit.MessagingProviderCreate);
+        }
+    }
+
+    const stepsComponents: WizardStepsType = new Map();
+    stepsComponents.set(1, {
+        label: 'Provider',
+        component: Provider
+    });
+    stepsComponents.set(2, {
+        label: 'Settings',
+        component: Settings
+    });
+</script>
+
+<Wizard title="Create provider" steps={stepsComponents} on:finish={create} />
diff --git a/src/routes/(console)/project-[project]/messaging/providers/createProviderDropdown.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/createProviderDropdown.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/createProviderDropdown.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/popoverContent.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/popoverContent.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/popoverContent.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/popoverContent.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts
similarity index 75%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts
index c0e35225af..480c7be2e1 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+layout.ts
@@ -10,6 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        provider: await sdk.forProject.messaging.getProvider(params.provider)
+        provider: await sdk
+            .forProject(params.region, params.project)
+            .messaging.getProvider(params.provider)
     };
 };
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
similarity index 61%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
index 0d8b2c1c83..09e63d399a 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
@@ -2,7 +2,7 @@
     import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { provider } from './store';
 
     $: breadcrumbs = [
@@ -11,15 +11,15 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.region}-${$project.$id}/messaging`,
             title: 'Messaging'
         },
         {
-            href: `${base}/project-${$project.$id}/messaging/providers/provider-${$provider?.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}/messaging/providers/provider-${$provider?.$id}`,
             title: $provider?.name
         }
     ];
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
index ad935aaf8f..70ac7604f6 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
@@ -16,7 +16,7 @@
     import { provider } from './store';
     import { goto } from '$app/navigation';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import DeleteProvider from './deleteProvider.svelte';
     import { base } from '$app/paths';
 </script>
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
index 2f039855a2..d22420cb4c 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
@@ -14,14 +14,18 @@
 
     const deleteProvider = async () => {
         try {
-            await sdk.forProject.messaging.deleteProvider($provider.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.deleteProvider($provider.$id);
             showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${$provider.name} has been deleted`
             });
             trackEvent(Submit.MessagingProviderDelete);
-            await goto(`${base}/project-${$page.params.project}/messaging/providers`);
+            await goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/messaging/providers`
+            );
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/header.svelte
similarity index 81%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/header.svelte
index 7a55ce558e..c28e9d4cbe 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/header.svelte
@@ -10,7 +10,8 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/messaging/providers`}>
+        <CoverTitle
+            href={`${base}/project-${$page.params.region}-${projectId}/messaging/providers`}>
             {$provider?.name ? $provider?.name : '-'}
         </CoverTitle>
         <Id value={$provider?.$id} event="provider">{$provider?.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte
similarity index 56%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte
index 93991d10e7..b037c4e44a 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte
@@ -9,6 +9,7 @@
     import { trackEvent, Submit, trackError } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     let providerName: string = null;
     onMount(async () => {
@@ -21,64 +22,54 @@
             const providerId = $provider.$id;
             switch ($provider.provider) {
                 case Providers.Twilio:
-                    response = await sdk.forProject.messaging.updateTwilioProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTwilioProvider(providerId, providerName);
                     break;
                 case Providers.Msg91:
-                    response = await sdk.forProject.messaging.updateMsg91Provider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateMsg91Provider(providerId, providerName);
                     break;
                 case Providers.Telesign:
-                    response = await sdk.forProject.messaging.updateTelesignProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTelesignProvider(providerId, providerName);
                     break;
                 case Providers.Textmagic:
-                    response = await sdk.forProject.messaging.updateTextmagicProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTextmagicProvider(providerId, providerName);
                     break;
                 case Providers.Vonage:
-                    response = await sdk.forProject.messaging.updateVonageProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateVonageProvider(providerId, providerName);
                     break;
                 case Providers.Mailgun:
-                    response = await sdk.forProject.messaging.updateMailgunProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateMailgunProvider(providerId, providerName);
                     break;
                 case Providers.Sendgrid:
-                    response = await sdk.forProject.messaging.updateSendgridProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateSendgridProvider(providerId, providerName);
                     break;
                 case Providers.SMTP:
-                    response = await sdk.forProject.messaging.updateSmtpProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateSmtpProvider(providerId, providerName);
                     break;
                 case Providers.FCM:
-                    response = await sdk.forProject.messaging.updateFcmProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateFcmProvider(providerId, providerName);
                     break;
                 case Providers.APNS:
-                    response = await sdk.forProject.messaging.updateApnsProvider(
-                        providerId,
-                        providerName
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateApnsProvider(providerId, providerName);
                     break;
             }
             await invalidate(Dependencies.MESSAGING_PROVIDER);
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
new file mode 100644
index 0000000000..b7a6eb2ec3
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
@@ -0,0 +1,269 @@
+<script lang="ts">
+    import { sdk } from '$lib/stores/sdk';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { addNotification } from '$lib/stores/notifications';
+    import { invalidate } from '$app/navigation';
+    import type { ProviderInput } from '../store';
+    import { Providers, getProviderDisplayNameAndIcon } from '../../provider.svelte';
+    import { Dependencies } from '$lib/constants';
+    import { MessagingProviderType, type Models } from '@appwrite.io/console';
+    import SettingsFormList from '../settingsFormList.svelte';
+    import { CardGrid, Heading } from '$lib/components';
+    import { Button, Form } from '$lib/elements/forms';
+    import { onMount } from 'svelte';
+    import { page } from '$app/stores';
+    import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte';
+
+    export let inputs: (ProviderInput | ProviderInput[])[];
+    export let providerType: MessagingProviderType;
+    export let provider: Providers;
+    export let providerId: string;
+    export let params: object;
+
+    let flattened: ProviderInput[] = [];
+    let formValues: object = {};
+    let originalfiles: Record<string, FileList> = {};
+    let files: Record<string, FileList> = {};
+    let updated = false;
+    let newMemberModal = false;
+    let message = '';
+    let ready = false;
+
+    const { displayName } = getProviderDisplayNameAndIcon(provider);
+
+    switch (providerType) {
+        case MessagingProviderType.Push:
+            message = 'notifications';
+            break;
+        case MessagingProviderType.Sms:
+            message = 'SMS';
+            break;
+        case MessagingProviderType.Email:
+            message = 'emails';
+            break;
+    }
+
+    onMount(() => {
+        flattened = [];
+        for (const i of inputs) {
+            if (Array.isArray(i)) {
+                flattened.push(...i);
+            } else {
+                flattened.push(i);
+            }
+        }
+        for (const input of flattened) {
+            const value = params[input.name];
+            formValues[input.name] = value;
+            if (input.type === 'file' && typeof value == 'string' && value.length > 0) {
+                const dataTransfer = new DataTransfer();
+                const f = new File([value], `${input.name}.${input.allowedFileExtensions}`);
+                dataTransfer.items.add(f);
+                files[input.name] = dataTransfer.files;
+                originalfiles[input.name] = dataTransfer.files;
+            }
+        }
+        ready = true;
+    });
+
+    async function update() {
+        try {
+            const promises = [];
+            for (const [key, value] of Object.entries(files)) {
+                const promise = value[0].text().then((text) => {
+                    formValues[key] = text;
+                });
+                promises.push(promise);
+            }
+            await Promise.all(promises);
+            let response: Models.Provider;
+            switch (provider) {
+                case Providers.Twilio:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTwilioProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['accountSid'],
+                            formValues['authToken'],
+                            formValues['from']
+                        );
+                    break;
+                case Providers.Msg91:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateMsg91Provider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['templateId'],
+                            formValues['senderId'],
+                            formValues['authKey']
+                        );
+                    break;
+                case Providers.Telesign:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTelesignProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['customerId'],
+                            formValues['apiKey'],
+                            formValues['from']
+                        );
+                    break;
+                case Providers.Textmagic:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTextmagicProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['username'],
+                            formValues['apiKey'],
+                            formValues['from']
+                        );
+                    break;
+                case Providers.Vonage:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateVonageProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['apiKey'],
+                            formValues['apiSecret'],
+                            formValues['from']
+                        );
+                    break;
+                case Providers.Mailgun:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateMailgunProvider(
+                            providerId,
+                            undefined,
+                            formValues['apiKey'],
+                            formValues['domain'],
+                            formValues['isEuRegion'],
+                            undefined,
+                            formValues['fromName'] || undefined,
+                            formValues['fromEmail'],
+                            formValues['replyToName'] || undefined,
+                            formValues['replyToEmail'] || undefined
+                        );
+                    break;
+                case Providers.Sendgrid:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateSendgridProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['apiKey'],
+                            formValues['fromName'] || undefined,
+                            formValues['fromEmail'],
+                            formValues['replyToName'] || undefined,
+                            formValues['replyToEmail'] || undefined
+                        );
+                    break;
+                case Providers.SMTP:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateSmtpProvider(
+                            providerId,
+                            undefined,
+                            formValues['host'],
+                            formValues['port'] || undefined,
+                            formValues['username'] || undefined,
+                            formValues['password'] || undefined,
+                            formValues['encryption'],
+                            formValues['autoTLS'],
+                            undefined,
+                            formValues['fromName'] || undefined,
+                            formValues['fromEmail'],
+                            formValues['replyToName'] || undefined,
+                            formValues['replyToEmail'] || undefined
+                        );
+                    break;
+                case Providers.FCM:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateFcmProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            JSON.parse(formValues['serviceAccountJSON'])
+                        );
+                    break;
+                case Providers.APNS:
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateApnsProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            formValues['authKey'],
+                            formValues['authKeyId'],
+                            formValues['teamId'],
+                            formValues['bundleId'],
+                            formValues['sandbox']
+                        );
+                    break;
+            }
+            originalfiles = files;
+            await invalidate(Dependencies.MESSAGING_PROVIDER);
+            addNotification({
+                type: 'success',
+                message: `${response.name} has been updated`
+            });
+            trackEvent(Submit.MessagingProviderUpdate, {
+                provider: provider
+            });
+        } catch (error) {
+            addNotification({
+                type: 'error',
+                message: error.message
+            });
+            trackError(error, Submit.MessagingProviderUpdate);
+        }
+    }
+
+    $: updated =
+        flattened
+            .filter((input) => input.type !== 'file')
+            .some((input) => formValues[input.name] !== params[input.name]) ||
+        Object.keys(files).some((key) => files[key] !== originalfiles[key]);
+</script>
+
+<Form onSubmit={update}>
+    <CardGrid>
+        <div class="grid-1-2-col-1 u-flex u-cross-center u-gap-16" data-private>
+            <Heading tag="h6" size="7">Settings</Heading>
+        </div>
+        <p>
+            Configure the settings to <Button
+                link
+                href={`https://appwrite.io/docs/products/messaging/${provider}`}
+                external>enable {displayName}</Button> to send {message}, or <Button
+                link
+                on:click={() => (newMemberModal = true)}>invite a team member</Button> to complete the
+            provider settings.
+        </p>
+        <svelte:fragment slot="aside">
+            <!-- Must wait until ready or else the files input won't be set properly -->
+            {#if ready}
+                <SettingsFormList bind:files {inputs} bind:params={formValues} />
+            {/if}
+        </svelte:fragment>
+
+        <svelte:fragment slot="actions">
+            <div class="u-flex u-flex-wrap u-gap-12">
+                <Button disabled={!updated} submit>Update</Button>
+            </div>
+        </svelte:fragment>
+    </CardGrid>
+</Form>
+
+<CreateMember bind:showCreate={newMemberModal} />
diff --git a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
similarity index 55%
rename from src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
index adb34d307f..a18b6db6ab 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
@@ -11,6 +11,7 @@
     import Provider, { Providers } from '../../provider.svelte';
     import ProviderType from '../../providerType.svelte';
     import { provider as providerData } from './store';
+    import { page } from '$app/stores';
 
     let enabled: boolean = null;
 
@@ -24,88 +25,76 @@
             const providerId = $providerData.$id;
             switch ($providerData.provider) {
                 case Providers.Twilio:
-                    response = await sdk.forProject.messaging.updateTwilioProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTwilioProvider(providerId, undefined, enabled);
                     break;
                 case Providers.Msg91:
-                    response = await sdk.forProject.messaging.updateMsg91Provider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateMsg91Provider(providerId, undefined, enabled);
                     break;
                 case Providers.Telesign:
-                    response = await sdk.forProject.messaging.updateTelesignProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTelesignProvider(providerId, undefined, enabled);
                     break;
                 case Providers.Textmagic:
-                    response = await sdk.forProject.messaging.updateTextmagicProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateTextmagicProvider(providerId, undefined, enabled);
                     break;
                 case Providers.Vonage:
-                    response = await sdk.forProject.messaging.updateVonageProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateVonageProvider(providerId, undefined, enabled);
                     break;
                 case Providers.Mailgun:
-                    response = await sdk.forProject.messaging.updateMailgunProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateMailgunProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            enabled
+                        );
                     break;
                 case Providers.Sendgrid:
-                    response = await sdk.forProject.messaging.updateSendgridProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateSendgridProvider(providerId, undefined, enabled);
                     break;
                 case Providers.SMTP:
-                    response = await sdk.forProject.messaging.updateSmtpProvider(
-                        providerId,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateSmtpProvider(
+                            providerId,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            undefined,
+                            enabled
+                        );
                     break;
                 case Providers.FCM:
-                    response = await sdk.forProject.messaging.updateFcmProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateFcmProvider(providerId, undefined, enabled);
                     break;
                 case Providers.APNS:
-                    response = await sdk.forProject.messaging.updateApnsProvider(
-                        providerId,
-                        undefined,
-                        enabled
-                    );
+                    response = await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .messaging.updateApnsProvider(providerId, undefined, enabled);
                     break;
             }
             await invalidate(Dependencies.MESSAGING_PROVIDER);
diff --git a/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormInput.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormInput.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormList.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/settingsFormList.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/settingsFormList.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/messaging/providers/table.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
index 938fa84a80..e415266413 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
@@ -17,7 +17,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import type { PageData } from './$types';
     import { columns } from './store';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import Provider from '../provider.svelte';
     import ProviderType from '../providerType.svelte';
     import { Pill } from '$lib/elements';
@@ -25,6 +25,7 @@
     import { Dependencies } from '$lib/constants';
     import { sdk } from '$lib/stores/sdk';
     import { canWriteProviders } from '$lib/stores/roles';
+    import { page } from '$app/stores';
 
     export let data: PageData;
 
@@ -35,7 +36,9 @@
     async function handleDelete() {
         showDelete = false;
 
-        const promises = selectedIds.map((id) => sdk.forProject.messaging.deleteProvider(id));
+        const promises = selectedIds.map((id) =>
+            sdk.forProject($page.params.region, $page.params.project).messaging.deleteProvider(id)
+        );
 
         try {
             await Promise.all(promises);
@@ -79,7 +82,7 @@
         {#each data.providers.providers as provider (provider.$id)}
             <TableRowLink
                 href={$canWriteProviders
-                    ? `${base}/project-${$project.$id}/messaging/providers/provider-${provider.$id}`
+                    ? `${base}/project-${$project.region}-${$project.$id}/messaging/providers/provider-${provider.$id}`
                     : '#'}>
                 {#if $canWriteProviders}
                     <TableCellCheck bind:selectedIds id={provider.$id} />
diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/provider.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/provider.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte
similarity index 99%
rename from src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte
index 00a9304453..a96fd46632 100644
--- a/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/settings.svelte
@@ -8,7 +8,7 @@
     import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte';
     import Provider from '../../provider.svelte';
     import { MessagingProviderType } from '@appwrite.io/console';
-    import ProviderTypeComponent from '$routes/(console)/project-[project]/messaging/providerType.svelte';
+    import ProviderTypeComponent from '$routes/(console)/project-[region]-[project]/messaging/providerType.svelte';
     import {
         Collapsible,
         CollapsibleItem,
diff --git a/src/routes/(console)/project-[project]/messaging/providers/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/providers/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/providers/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/push-notification-preview-dark.svg b/src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-dark.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/push-notification-preview-dark.svg
rename to src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-dark.svg
diff --git a/src/routes/(console)/project-[project]/messaging/push-notification-preview-light.svg b/src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-light.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/push-notification-preview-light.svg
rename to src/routes/(console)/project-[region]-[project]/messaging/push-notification-preview-light.svg
diff --git a/src/routes/(console)/project-[project]/messaging/pushPhone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/pushPhone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/pushPhone.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/pushPhone.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/sms-preview-dark.svg b/src/routes/(console)/project-[region]-[project]/messaging/sms-preview-dark.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/sms-preview-dark.svg
rename to src/routes/(console)/project-[region]-[project]/messaging/sms-preview-dark.svg
diff --git a/src/routes/(console)/project-[project]/messaging/sms-preview-light.svg b/src/routes/(console)/project-[region]-[project]/messaging/sms-preview-light.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/sms-preview-light.svg
rename to src/routes/(console)/project-[region]-[project]/messaging/sms-preview-light.svg
diff --git a/src/routes/(console)/project-[project]/messaging/smsPhone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/smsPhone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/smsPhone.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/smsPhone.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/messaging/topics/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte
index c309482523..960d0eb297 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.svelte
@@ -45,7 +45,9 @@
     ]);
 
     const topicCreated = async (event: CustomEvent<Models.Team<Record<string, unknown>>>) => {
-        await goto(`${base}/project-${project}/messaging/topics/topic-${event.detail.$id}`);
+        await goto(
+            `${base}/project-${$page.params.region}-${project}/messaging/topics/topic-${event.detail.$id}`
+        );
     };
 </script>
 
@@ -112,7 +114,9 @@
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no topics that match your search.</p>
             </div>
-            <Button secondary href={`${base}/project-${$page.params.project}/messaging/topics`}>
+            <Button
+                secondary
+                href={`${base}/project-${$page.params.region}-${$page.params.project}/messaging/topics`}>
                 Clear Search
             </Button>
         </EmptySearch>
diff --git a/src/routes/(console)/project-[project]/messaging/topics/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
similarity index 69%
rename from src/routes/(console)/project-[project]/messaging/topics/+page.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
index a1503363c2..4e314b90af 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
@@ -22,14 +22,16 @@ export const load: PageLoad = async ({ depends, url, route }) => {
         search,
         query,
         page,
-        topics: await sdk.forProject.messaging.listTopics(
-            [
-                Query.limit(limit),
-                Query.offset(offset),
-                Query.orderDesc(''),
-                ...parsedQueries.values()
-            ],
-            search || undefined
-        )
+        topics: await sdk
+            .forProject(params.region, params.project)
+            .messaging.listTopics(
+                [
+                    Query.limit(limit),
+                    Query.offset(offset),
+                    Query.orderDesc(''),
+                    ...parsedQueries.values()
+                ],
+                search || undefined
+            )
     };
 };
diff --git a/src/routes/(console)/project-[project]/messaging/topics/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/messaging/topics/create.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
index 6ec708a0b1..2ff3535eba 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
@@ -7,6 +7,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { ID } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
+    import { page } from '$app/stores';
 
     export let showCreate = false;
 
@@ -17,7 +18,9 @@
 
     const create = async () => {
         try {
-            const topic = await sdk.forProject.messaging.createTopic(id ?? ID.unique(), name);
+            const topic = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.createTopic(id ?? ID.unique(), name);
             name = '';
             showCreate = false;
             showCustomId = false;
diff --git a/src/routes/(console)/project-[project]/messaging/topics/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/topics/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/topics/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/messaging/topics/table.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
index 971430a887..a2953d8cc6 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
@@ -34,7 +34,9 @@
     async function handleDelete() {
         showDelete = false;
 
-        const promises = selectedIds.map((id) => sdk.forProject.messaging.deleteTopic(id));
+        const promises = selectedIds.map((id) =>
+            sdk.forProject($page.params.region, $page.params.project).messaging.deleteTopic(id)
+        );
 
         try {
             await Promise.all(promises);
@@ -75,7 +77,7 @@
     <TableBody>
         {#each data.topics.topics as topic (topic.$id)}
             <TableRowLink
-                href={`${base}/project-${$page.params.project}/messaging/topics/topic-${topic.$id}`}>
+                href={`${base}/project-${$page.params.region}-${$page.params.project}/messaging/topics/topic-${topic.$id}`}>
                 {#if $canWriteTopics}
                     <TableCellCheck bind:selectedIds id={topic.$id} />
                 {/if}
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.svelte
index 7db149a3e0..2d94abb947 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.svelte
@@ -3,7 +3,7 @@
     import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { registerCommands } from '$lib/commandCenter';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
 
     const topicId = $page.params.topic;
 
@@ -12,7 +12,7 @@
             label: 'Go to Subscribers',
             callback() {
                 goto(
-                    `${base}/project-${$project.$id}/messaging/topics/topic-${topicId}/subscribers`
+                    `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${topicId}/subscribers`
                 );
             },
             keys: ['g', 's'],
@@ -23,7 +23,9 @@
         {
             label: 'Go to Activity',
             callback() {
-                goto(`${base}/project-${$project.$id}/messaging/topics/topic-${topicId}/activity`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${topicId}/activity`
+                );
             },
             keys: ['g', 'a'],
             disabled: $page.url.pathname.endsWith('activity'),
@@ -33,7 +35,9 @@
         {
             label: 'Go to Overview',
             callback() {
-                goto(`${base}/project-${$project.$id}/messaging/topics/topic-${topicId}`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${topicId}`
+                );
             },
             keys: ['g', 'o'],
             disabled: $page.url.pathname.endsWith(`topic-${topicId}`),
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts
similarity index 80%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts
index 6b82ae854d..595659ee3d 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts
@@ -10,6 +10,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        topic: await sdk.forProject.messaging.getTopic(params.topic)
+        topic: await sdk.forProject(params.region, params.project).messaging.getTopic(params.topic)
     };
 };
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
index f8d6fb2d06..724ea6be39 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
@@ -57,11 +57,9 @@
             (targetId) => !(targetId in subscribersByTargetId)
         );
         const promises = targetIds.map(async (targetId) => {
-            const subscriber = await sdk.forProject.messaging.createSubscriber(
-                $page.params.topic,
-                ID.unique(),
-                targetId
-            );
+            const subscriber = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.createSubscriber($page.params.topic, ID.unique(), targetId);
             subscribersByTargetId[targetId] = subscriber;
         });
 
@@ -148,7 +146,7 @@
             </div>
             <Button
                 secondary
-                href={`${base}/project-${$page.params.project}/messaging/topics/topic-${$page.params.topic}/subscribers`}>
+                href={`${base}/project-${$page.params.region}-${$page.params.project}/messaging/topics/topic-${$page.params.topic}/subscribers`}>
                 Clear Search
             </Button>
         </EmptySearch>
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts
similarity index 57%
rename from src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts
index 3e0f841c54..d4b3e9cc84 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts
@@ -1,38 +1,38 @@
-import { queries, queryParamToMap } from '$lib/components/filters';
-import { Dependencies, PAGE_LIMIT } from '$lib/constants';
-import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load';
-import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
+import { sdk } from '$lib/stores/sdk';
+import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load';
+import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
+import { queryParamToMap, queries } from '$lib/components/filters';
 
 export const load: PageLoad = async ({ params, url, route, depends }) => {
-    depends(Dependencies.USER_IDENTITIES);
+    depends(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS);
 
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
-    const query = getQuery(url);
     const search = getSearch(url);
+    const query = getQuery(url);
 
     const parsedQueries = queryParamToMap(query || '[]');
     queries.set(parsedQueries);
 
-    const identities = await sdk.forProject.users.listIdentities(
-        [
-            Query.equal('userId', params.user),
-            Query.limit(limit),
-            Query.offset(offset),
-            Query.orderDesc(''),
-            ...parsedQueries.values()
-        ],
-        search
-    );
-
     return {
         offset,
         limit,
-        query,
         search,
-        identities
+        query,
+        subscribers: await sdk
+            .forProject(params.region, params.project)
+            .messaging.listSubscribers(
+                params.topic,
+                [
+                    Query.limit(limit),
+                    Query.offset(offset),
+                    Query.orderDesc(''),
+                    ...parsedQueries.values()
+                ],
+                search || undefined
+            )
     };
 };
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
similarity index 73%
rename from src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
index 103be41a45..933026955d 100644
--- a/src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
@@ -8,12 +8,12 @@ export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
+
     return {
         offset,
         limit,
-        logs: await sdk.forProject.users.listLogs(params.user, [
-            Query.limit(limit),
-            Query.offset(offset)
-        ])
+        logs: await sdk
+            .forProject(params.region, params.project)
+            .messaging.listTopicLogs(params.topic, [Query.limit(limit), Query.offset(offset)])
     };
 };
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
similarity index 61%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
index d4aafa9116..c71b0bd340 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
@@ -2,7 +2,7 @@
     import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { topic } from './store';
 
     $: breadcrumbs = [
@@ -11,15 +11,15 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.region}-${$project.$id}/messaging`,
             title: 'Messaging'
         },
         {
-            href: `${base}/project-${$project.$id}/messaging/topics/topic-${$topic?.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}/messaging/topics/topic-${$topic?.$id}`,
             title: $topic?.name
         }
     ];
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
index ae0481e7a6..f9603532d6 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
@@ -13,7 +13,9 @@
     export let showDelete = false;
     const deleteTopic = async () => {
         try {
-            await sdk.forProject.messaging.deleteTopic($topic.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.deleteTopic($topic.$id);
 
             showDelete = false;
             addNotification({
@@ -21,7 +23,9 @@
                 message: `${$topic.name} has been deleted`
             });
             trackEvent(Submit.MessagingTopicDelete);
-            await goto(`${base}/project-${$page.params.project}/messaging/topics`);
+            await goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/messaging/topics`
+            );
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/header.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/header.svelte
index d64d26a908..b0818da8df 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/header.svelte
@@ -9,7 +9,7 @@
 
     const projectId = $page.params.project;
     const topicId = $page.params.topic;
-    const path = `${base}/project-${projectId}/messaging/topics/topic-${topicId}`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/messaging/topics/topic-${topicId}`;
     const tabs = [
         {
             href: path,
@@ -32,7 +32,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/messaging/topics`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/messaging/topics`}>
             {$topic.name}
         </CoverTitle>
         <Id value={$topic.$id} event="topic">{$topic.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/+page.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/details.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/details.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
index ad1e1998b8..434aeefab0 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
@@ -8,14 +8,19 @@
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
 
     let name: string = null;
+
     onMount(async () => {
         name ??= $topic.name;
     });
+
     async function updateName() {
         try {
-            await sdk.forProject.messaging.updateTopic($topic.$id, name);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.updateTopic($topic.$id, name);
             await invalidate(Dependencies.MESSAGING_TOPIC);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
index 7fff861435..2d4e5a2804 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
@@ -23,7 +23,9 @@
 
     async function updatePermissions() {
         try {
-            await sdk.forProject.messaging.updateTopic(topicId, undefined, permissions);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.updateTopic(topicId, undefined, permissions);
             await invalidate(Dependencies.MESSAGING_TOPIC);
             addNotification({
                 message: 'Permissions have been updated',
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts
diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
index 515ea66058..668a0c1c10 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
@@ -20,7 +20,7 @@
     import type { PageData } from './$types';
     import ProviderType from '../../providerType.svelte';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { targetsById } from '../../store';
@@ -40,7 +40,9 @@
         showDelete = false;
 
         async function deleteSubscriber(subscriberId: string) {
-            await sdk.forProject.messaging.deleteSubscriber($page.params.topic, subscriberId);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .messaging.deleteSubscriber($page.params.topic, subscriberId);
             const { target } = subscribers[subscriberId];
             const { [target.$id]: _, ...rest } = $targetsById;
             $targetsById = rest;
@@ -95,7 +97,7 @@
         {#each data.subscribers.subscribers as subscriber (subscriber.$id)}
             {@const target = subscriber.target}
             <TableRowLink
-                href={`${base}/project-${$project.$id}/auth/user-${subscriber.target.userId}`}>
+                href={`${base}/project-${$project.region}-${$project.$id}/auth/user-${subscriber.target.userId}`}>
                 <TableCellCheck bind:selectedIds id={subscriber.$id} />
 
                 {#each columns as column}
diff --git a/src/routes/(console)/project-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/messaging/topicsModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
index a2aad2b570..684f9cee57 100644
--- a/src/routes/(console)/project-[project]/messaging/topicsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
@@ -6,6 +6,7 @@
     import { Query, type Models, MessagingProviderType } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
     import { getTotal } from './wizard/store';
+    import { page } from '$app/stores';
     import ProviderType from './providerType.svelte';
 
     export let providerType: MessagingProviderType;
@@ -44,7 +45,9 @@
             queries.push(Query.greaterThan('pushTotal', 0));
         }
 
-        const response = await sdk.forProject.messaging.listTopics(queries, search || undefined);
+        const response = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .messaging.listTopics(queries, search || undefined);
 
         totalResults = response.total;
         topicResultsById = {};
diff --git a/src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
index 7c7ca0266f..9376454c9b 100644
--- a/src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
@@ -10,6 +10,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { Query, type Models, MessagingProviderType } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
+    import { page } from '$app/stores';
     import ProviderType from './providerType.svelte';
 
     export let title: string;
@@ -48,7 +49,9 @@
             queries.push(Query.notEqual('phone', ''));
         }
 
-        const response = await sdk.forProject.users.list(queries, search || undefined);
+        const response = await sdk
+            .forProject($page.params.region, $page.params.project)
+            .users.list(queries, search || undefined);
 
         totalResults = response.total;
         userResultsById = {};
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte
index 693d209fb7..21044a8150 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte
@@ -15,6 +15,7 @@
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
 
     let showCustomId = false;
     let showTest = false;
@@ -26,7 +27,7 @@
         console.log(email);
 
         // TODO: replace with test method
-        sdk.forProject.messaging.createEmail(
+        sdk.forProject($page.params.region, $page.params.project).messaging.createEmail(
             ID.unique(),
             $messageParams[MessagingProviderType.Email]?.subject || undefined,
             $messageParams[MessagingProviderType.Email]?.content || undefined,
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte
index dc8a5b02a2..544060f22f 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte
@@ -45,6 +45,7 @@
     import { sdk } from '$lib/stores/sdk';
     import PushPhone from '../pushPhone.svelte';
     import { onMount } from 'svelte';
+    import { page } from '$app/stores';
     import InputFilePicker from '$lib/elements/forms/inputFilePicker.svelte';
 
     let showCustomId = false;
@@ -63,7 +64,7 @@
         console.log(email);
 
         // TODO: replace with test method
-        sdk.forProject.messaging.createPush(
+        sdk.forProject($page.params.region, $page.params.project).messaging.createPush(
             ID.unique(),
             $messageParams[MessagingProviderType.Push]?.title || undefined,
             $messageParams[MessagingProviderType.Push]?.body || undefined,
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/smsFormList.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/smsFormList.svelte
index 9b315caa18..88c3738b8b 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/smsFormList.svelte
@@ -7,6 +7,7 @@
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
     import SMSPhone from '../smsPhone.svelte';
 
     let showCustomId = false;
@@ -18,7 +19,7 @@
         // const email = selected === 'self' ? $user.email : otherEmail;
 
         // TODO: replace with test method
-        sdk.forProject.messaging.createSms(
+        sdk.forProject($page.params.region, $page.params.project).messaging.createSms(
             ID.unique(),
             $messageParams[MessagingProviderType.Sms]?.content || undefined,
             $messageParams[MessagingProviderType.Sms]?.topics || [],
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/wizard/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/step1.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/step2.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/wizard/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/step2.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/step3.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/step3.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/wizard/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/step3.svelte
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/messaging/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/messaging/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/overview/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/+layout.svelte
index d0f59d1fc0..efd8720227 100644
--- a/src/routes/(console)/project-[project]/overview/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte
@@ -29,7 +29,7 @@
     import { canWriteProjects } from '$lib/stores/roles';
 
     $: projectId = $page.params.project;
-    $: path = `${base}/project-${projectId}/overview`;
+    $: path = `${base}/project-${$page.params.region}-${projectId}/overview`;
     let period: UsagePeriods = '30d';
 
     onMount(handle);
@@ -97,7 +97,7 @@
                             <Requests {period} on:change={(e) => changePeriod(e.detail)} />
                         </div>
                         <a
-                            href={`${base}/project-${projectId}/databases`}
+                            href={`${base}/project-${$page.params.region}-${projectId}/databases`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
@@ -124,7 +124,7 @@
                             </div>
                         </a>
                         <a
-                            href={`${base}/project-${projectId}/storage`}
+                            href={`${base}/project-${$page.params.region}-${projectId}/storage`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
@@ -152,7 +152,7 @@
                             </div>
                         </a>
                         <a
-                            href={`${base}/project-${projectId}/auth`}
+                            href={`${base}/project-${$page.params.region}-${projectId}/auth`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
@@ -173,7 +173,7 @@
                             </div>
                         </a>
                         <a
-                            href={`${base}/project-${projectId}/functions`}
+                            href={`${base}/project-${$page.params.region}-${projectId}/functions`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
diff --git a/src/routes/(console)/project-[project]/overview/+layout.ts b/src/routes/(console)/project-[region]-[project]/overview/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/overview/+layout.ts
diff --git a/src/routes/(console)/project-[project]/overview/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/+page.ts
similarity index 62%
rename from src/routes/(console)/project-[project]/overview/+page.ts
rename to src/routes/(console)/project-[region]-[project]/overview/+page.ts
index 8b3b6cca33..d53943a64c 100644
--- a/src/routes/(console)/project-[project]/overview/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/overview/+page.ts
@@ -6,8 +6,8 @@ import { selectedTab } from './store';
 
 export const load: PageLoad = async ({ params }) => {
     if (get(selectedTab) === 'keys') {
-        redirect(302, `${base}/project-${params.project}/overview/keys`);
+        redirect(302, `${base}/project-${params.region}-${params.project}/overview/keys`);
     } else {
-        redirect(302, `${base}/project-${params.project}/overview/platforms`);
+        redirect(302, `${base}/project-${params.region}-${params.project}/overview/platforms`);
     }
 };
diff --git a/src/routes/(console)/project-[project]/overview/bandwidth.svelte b/src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/bandwidth.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte
diff --git a/src/routes/(console)/project-[project]/overview/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/overview/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/header.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/header.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/header.svelte
diff --git a/src/routes/(console)/project-[project]/overview/intro-dark.png b/src/routes/(console)/project-[region]-[project]/overview/intro-dark.png
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/intro-dark.png
rename to src/routes/(console)/project-[region]-[project]/overview/intro-dark.png
diff --git a/src/routes/(console)/project-[project]/overview/intro-light.png b/src/routes/(console)/project-[region]-[project]/overview/intro-light.png
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/intro-light.png
rename to src/routes/(console)/project-[region]-[project]/overview/intro-light.png
diff --git a/src/routes/(console)/project-[project]/overview/keys/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/+page.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/keys/+page.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/+page.ts
rename to src/routes/(console)/project-[region]-[project]/overview/keys/+page.ts
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/+page.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/+page.ts
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/+page@project-[region]-[project].svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/+page@project-[region]-[project].svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/delete.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/delete.svelte
index cbf3d0b7da..872967a54b 100644
--- a/src/routes/(console)/project-[project]/overview/keys/[key]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/delete.svelte
@@ -22,7 +22,7 @@
                 message: `${$key.name} has been deleted`
             });
             trackEvent(Submit.KeyDelete);
-            await goto(`${base}/project-${$project.$id}/overview/keys`);
+            await goto(`${base}/project-${$project.region}-${$project.$id}/overview/keys`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/header.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/header.svelte
index 09259d5588..753a6a7f97 100644
--- a/src/routes/(console)/project-[project]/overview/keys/[key]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/header.svelte
@@ -10,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/overview/keys`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/overview/keys`}>
             {$key?.name}
         </CoverTitle>
         <Id value={$key?.secret}>API key secret</Id>
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/store.ts
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/store.ts
diff --git a/src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/[key]/updateExpirationDate.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/checkbox.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/checkbox.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/checkbox.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/checkbox.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/expirationInput.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/expirationInput.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/scopes.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/scopes.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/scopes.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/scopes.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/wizard.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/wizard.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/overview/keys/wizard.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/wizard.svelte
index e6c6701fae..c4da8075bb 100644
--- a/src/routes/(console)/project-[project]/overview/keys/wizard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/keys/wizard.svelte
@@ -28,7 +28,9 @@
             trackEvent(Submit.KeyCreate, {
                 scopes: $key.scopes
             });
-            goto(`${base}/project-${$page.params.project}/overview/keys/${$id}`);
+            goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/overview/keys/${$id}`
+            );
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/overview/keys/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/wizard/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/wizard/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/wizard/step1.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/wizard/step2.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/wizard/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/wizard/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/keys/wizard/step2.svelte
diff --git a/src/routes/(console)/project-[project]/overview/keys/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/overview/keys/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/keys/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/overview/keys/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-dark-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-desktop.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-1-dark-desktop.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-desktop.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-dark-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-mobile.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-1-dark-mobile.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-dark-mobile.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-light-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-desktop.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-1-light-desktop.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-desktop.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-1-light-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-mobile.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-1-light-mobile.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-1-light-mobile.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-dark-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-desktop.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-2-dark-desktop.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-desktop.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-dark-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-mobile.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-2-dark-mobile.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-dark-mobile.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-light-desktop.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-desktop.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-2-light-desktop.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-desktop.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard-2-light-mobile.svg b/src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-mobile.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/onboard-2-light-mobile.svg
rename to src/routes/(console)/project-[region]-[project]/overview/onboard-2-light-mobile.svg
diff --git a/src/routes/(console)/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/overview/onboard.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/onboard.svelte
index 677258ccc6..47d727bf28 100644
--- a/src/routes/(console)/project-[project]/overview/onboard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte
@@ -13,6 +13,7 @@
     import Wizard from './keys/wizard.svelte';
     import { canWriteKeys, canWritePlatforms } from '$lib/stores/roles';
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
 
     export let projectId: string;
 
@@ -138,7 +139,7 @@
                         </li>
                         <li class="grid-box-item">
                             <a
-                                href={`${base}/project-${projectId}/settings/webhooks`}
+                                href={`${base}/project-${$page.params.region}-${projectId}/settings/webhooks`}
                                 style="line-height: 1.5;"
                                 class="card u-width-full-line">
                                 <span class="u-flex u-cross-center u-gap-16">
diff --git a/src/routes/(console)/project-[project]/overview/platforms/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/overview/platforms/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte
index a3c2d6bfdc..126dbe8542 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte
@@ -62,7 +62,7 @@
     }
     let showDropdown = false;
     let showDropdownEmpty = false;
-    const path = `${base}/project-${$page.params.project}/overview/platforms`;
+    const path = `${base}/project-${$page.params.region}-${$page.params.project}/overview/platforms`;
 
     const getPlatformInfo = (platform: string) => {
         if (platform.includes('flutter')) {
diff --git a/src/routes/(console)/project-[project]/overview/platforms/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/+page.ts
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/+page.ts
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page.ts
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/+page@project-[region]-[project].svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/android.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/android.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/android.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleIOS.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleIOS.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleIOS.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleMacOS.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleMacOS.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleTvOS.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleTvOS.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleWatchOS.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/appleWatchOS.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/breadcrumbs.svelte
similarity index 69%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/breadcrumbs.svelte
index c30a96d9a7..bd2600d16f 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/breadcrumbs.svelte
@@ -11,15 +11,15 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.$id}/overview/platforms`,
+            href: `${base}/project-${$project.region}-${$project.$id}/overview/platforms`,
             title: 'Platforms'
         },
         {
-            href: `${base}/project-${$project.$id}/overview/platforms/${$platform.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}/overview/platforms/${$platform.$id}`,
             title: $platform.name
         }
     ];
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte
index 305dad410c..85cd732f6f 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte
@@ -22,7 +22,7 @@
                 message: `${$platform.name} has been deleted`
             });
             trackEvent(Submit.PlatformDelete);
-            await goto(`${base}/project-${$project.$id}/overview/platforms`);
+            await goto(`${base}/project-${$project.region}-${$project.$id}/overview/platforms`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterAndroid.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterAndroid.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterIOS.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterIOS.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterLinux.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterLinux.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterMacOS.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterMacOS.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterWindows.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/flutterWindows.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte
similarity index 78%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte
index 8ab370595a..5a43ed9076 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte
@@ -9,7 +9,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/overview/platforms`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/overview/platforms`}>
             {$platform?.name}
         </CoverTitle>
     </svelte:fragment>
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/store.ts
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts
diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/web.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/web.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/createApple.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step1.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step2.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step3.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step3.svelte
index e2c956664b..73053baada 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/android/step3.svelte
@@ -4,8 +4,10 @@
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
+    import { page } from '$app/stores';
 
-    const { endpoint, project } = sdk.forProject.client.config;
+    const { endpoint, project } = sdk.forProject($page.params.region, $page.params.project).client
+        .config;
     const code = `import io.appwrite.Client
 import io.appwrite.services.Account
 
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step1.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step2.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step3.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step3.svelte
index 8ae1e3d869..d4ff97b360 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/apple/step3.svelte
@@ -3,9 +3,11 @@
     import { WizardStep } from '$lib/layout';
     import { isCloud } from '$lib/system';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
     import Id from '$lib/components/id.svelte';
 
-    const { endpoint, project } = sdk.forProject.client.config;
+    const { endpoint, project } = sdk.forProject($page.params.region, $page.params.project).client
+        .config;
     const code = `import Appwrite
 
 ${
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step1.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step2.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step3.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step3.svelte
index 2a0a1b97f8..48241ffa39 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/flutter/step3.svelte
@@ -3,9 +3,11 @@
     import { WizardStep } from '$lib/layout';
     import { isCloud } from '$lib/system';
     import { sdk } from '$lib/stores/sdk';
+    import { page } from '$app/stores';
     import Id from '$lib/components/id.svelte';
 
-    const { endpoint, project } = sdk.forProject.client.config;
+    const { endpoint, project } = sdk.forProject($page.params.region, $page.params.project).client
+        .config;
     const code = `import 'package:appwrite/appwrite.dart';
 
 Client client = Client();
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step1.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step1.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step2.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step2.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step3.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step3.svelte
index 13d20b5a0d..b7ed2ad075 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/wizard/react-native/step3.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/react-native/step3.svelte
@@ -4,9 +4,11 @@
     import { isCloud } from '$lib/system';
     import { sdk } from '$lib/stores/sdk';
     import { createPlatform } from '../store';
+    import { page } from '$app/stores';
     import Id from '$lib/components/id.svelte';
 
-    const { endpoint, project } = sdk.forProject.client.config;
+    const { endpoint, project } = sdk.forProject($page.params.region, $page.params.project).client
+        .config;
     const code = `import { Client, Account, ID } from 'react-native-appwrite';
 
 const client = new Client()${
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/step4.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/step4.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step1.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step2.svelte
diff --git a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step3.svelte
similarity index 86%
rename from src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step3.svelte
index e9b8202087..e5414f4d52 100644
--- a/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/web/step3.svelte
@@ -4,8 +4,10 @@
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
+    import { page } from '$app/stores';
 
-    const { endpoint, project } = sdk.forProject.client.config;
+    const { endpoint, project } = sdk.forProject($page.params.region, $page.params.project).client
+        .config;
     const code = `const client = new Client();
 ${
     isCloud
diff --git a/src/routes/(console)/project-[project]/overview/realtime.svelte b/src/routes/(console)/project-[region]-[project]/overview/realtime.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/realtime.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/realtime.svelte
diff --git a/src/routes/(console)/project-[project]/overview/requests.svelte b/src/routes/(console)/project-[region]-[project]/overview/requests.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/overview/requests.svelte
rename to src/routes/(console)/project-[region]-[project]/overview/requests.svelte
diff --git a/src/routes/(console)/project-[project]/overview/store.ts b/src/routes/(console)/project-[region]-[project]/overview/store.ts
similarity index 64%
rename from src/routes/(console)/project-[project]/overview/store.ts
rename to src/routes/(console)/project-[region]-[project]/overview/store.ts
index 2c18cefa96..bd869930a6 100644
--- a/src/routes/(console)/project-[project]/overview/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/overview/store.ts
@@ -1,7 +1,8 @@
 import { sdk } from '$lib/stores/sdk';
 import { cachedStore } from '$lib/helpers/cache';
-import { writable, type Writable } from 'svelte/store';
+import { get, writable, type Writable } from 'svelte/store';
 import type { Models, ProjectUsageRange } from '@appwrite.io/console';
+import { page } from '$app/stores';
 
 export const usage = cachedStore<
     Models.UsageProject,
@@ -11,7 +12,10 @@ export const usage = cachedStore<
 >('projectUsage', function ({ set }) {
     return {
         load: async (start, end, period) => {
-            const usages = await sdk.forProject.project.getUsage(start, end, period);
+            const $page = get(page);
+            const usages = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .project.getUsage(start, end, period);
             set(usages);
         }
     };
diff --git a/src/routes/(console)/project-[project]/promoteVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/promoteVariableModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/promoteVariableModal.svelte
rename to src/routes/(console)/project-[region]-[project]/promoteVariableModal.svelte
diff --git a/src/routes/(console)/project-[project]/rawVariableEditor.svelte b/src/routes/(console)/project-[region]-[project]/rawVariableEditor.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/rawVariableEditor.svelte
rename to src/routes/(console)/project-[region]-[project]/rawVariableEditor.svelte
diff --git a/src/routes/(console)/project-[project]/settings/+layout.svelte b/src/routes/(console)/project-[region]-[project]/settings/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/settings/+layout.ts b/src/routes/(console)/project-[region]-[project]/settings/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/settings/+layout.ts
diff --git a/src/routes/(console)/project-[project]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/+page.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/+page.svelte
index b0de7bba2e..f1375a5dd0 100644
--- a/src/routes/(console)/project-[project]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/+page.svelte
@@ -15,8 +15,9 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Button, FormList, InputSelect } from '$lib/elements/forms';
     import { Submit, trackEvent } from '$lib/actions/analytics';
-    import Transfer from './transferProject.svelte';
+    import { page } from '$app/stores';
     import { canWriteProjects } from '$lib/stores/roles';
+    import Transfer from './transferProject.svelte';
 
     export let data;
 
@@ -59,17 +60,23 @@
     });
 
     async function sdkCreateVariable(key: string, value: string) {
-        await sdk.forProject.projectApi.createVariable(key, value);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .projectApi.createVariable(key, value);
         await invalidate(Dependencies.PROJECT_VARIABLES);
     }
 
     async function sdkUpdateVariable(variableId: string, key: string, value: string) {
-        await sdk.forProject.projectApi.updateVariable(variableId, key, value);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .projectApi.updateVariable(variableId, key, value);
         await invalidate(Dependencies.PROJECT_VARIABLES);
     }
 
     async function sdkDeleteVariable(variableId: string) {
-        await sdk.forProject.projectApi.deleteVariable(variableId);
+        await sdk
+            .forProject($page.params.region, $page.params.project)
+            .projectApi.deleteVariable(variableId);
         await invalidate(Dependencies.PROJECT_VARIABLES);
     }
 </script>
diff --git a/src/routes/(console)/project-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts
similarity index 64%
rename from src/routes/(console)/project-[project]/settings/+page.ts
rename to src/routes/(console)/project-[region]-[project]/settings/+page.ts
index a9f2ac14ae..e6f31e223f 100644
--- a/src/routes/(console)/project-[project]/settings/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts
@@ -3,15 +3,17 @@ import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ depends, url }) => {
+export const load: PageLoad = async ({ depends, url, params }) => {
     depends(Dependencies.PROJECT_VARIABLES);
     depends(Dependencies.PROJECT_INSTALLATIONS);
     const limit = PAGE_LIMIT;
     const offset = Number(url.searchParams.get('offset') ?? 0);
 
     const [variables, installations] = await Promise.all([
-        sdk.forProject.projectApi.listVariables(),
-        sdk.forProject.vcs.listInstallations([Query.limit(limit), Query.offset(offset)])
+        sdk.forProject(params.region, params.project).projectApi.listVariables(),
+        sdk
+            .forProject(params.region, params.project)
+            .vcs.listInstallations([Query.limit(limit), Query.offset(offset)])
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte
similarity index 87%
rename from src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte
index b414f37bda..73f7673e16 100644
--- a/src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte
@@ -9,13 +9,16 @@
     import { Query, type Models } from '@appwrite.io/console';
     import { SvgIcon } from '$lib/components';
     import { toLocaleDateTime } from '$lib/helpers/date';
+    import { page } from '$app/stores';
 
     export let showGitDisconnect: boolean;
     export let selectedInstallation: Models.Installation;
 
     async function handleSubmit() {
         try {
-            await sdk.forProject.vcs.deleteInstallation(selectedInstallation.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .vcs.deleteInstallation(selectedInstallation.$id);
             await invalidate(Dependencies.PROJECT_INSTALLATIONS);
             addNotification({
                 message: `${selectedInstallation.organization} has been disconnected from this project`,
@@ -36,10 +39,12 @@
     }
 
     async function loadFunctions() {
-        return await sdk.forProject.functions.list([
-            Query.limit(100),
-            Query.equal('installationId', selectedInstallation.$id)
-        ]);
+        return await sdk
+            .forProject($page.params.region, $page.params.project)
+            .functions.list([
+                Query.limit(100),
+                Query.equal('installationId', selectedInstallation.$id)
+            ]);
     }
 </script>
 
diff --git a/src/routes/(console)/project-[project]/settings/GitInstallationModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/settings/GitInstallationModal.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte
index 06e4fcae6e..25bc41bd8a 100644
--- a/src/routes/(console)/project-[project]/settings/GitInstallationModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte
@@ -9,7 +9,9 @@
     function connectGitHub() {
         const redirect = new URL($page.url);
         redirect.searchParams.append('alert', 'installation-created');
-        const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`);
+        const target = new URL(
+            `${sdk.forProject($page.params.region, $page.params.project).client.config.endpoint}/vcs/github/authorize`
+        );
         target.searchParams.set('project', $page.params.project);
         target.searchParams.set('success', redirect.toString());
         target.searchParams.set('failure', redirect.toString());
diff --git a/src/routes/(console)/project-[project]/settings/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/settings/deleteProject.svelte b/src/routes/(console)/project-[region]-[project]/settings/deleteProject.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/deleteProject.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/deleteProject.svelte
diff --git a/src/routes/(console)/project-[project]/settings/disableAllServices.svelte b/src/routes/(console)/project-[region]-[project]/settings/disableAllServices.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/disableAllServices.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/disableAllServices.svelte
diff --git a/src/routes/(console)/project-[project]/settings/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/domains/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/domains/+page.svelte
diff --git a/src/routes/(console)/project-[project]/settings/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts
similarity index 57%
rename from src/routes/(console)/project-[project]/settings/domains/+page.ts
rename to src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts
index 16a598b515..faf8c9675f 100644
--- a/src/routes/(console)/project-[project]/settings/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.ts
@@ -3,13 +3,13 @@ import { sdk } from '$lib/stores/sdk';
 import { Query, ResourceType } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ depends, url }) => {
+export const load: PageLoad = async ({ depends, url, params }) => {
     depends(Dependencies.DOMAINS);
 
     return {
-        rules: await sdk.forProject.proxy.listRules([
-            Query.equal('resourceType', ResourceType.Api)
-        ]),
+        rules: await sdk
+            .forProject(params.region, params.project)
+            .proxy.listRules([Query.equal('resourceType', ResourceType.Api)]),
         create: url.searchParams.get('create') !== null
     };
 };
diff --git a/src/routes/(console)/project-[project]/settings/enableAllServices.svelte b/src/routes/(console)/project-[region]-[project]/settings/enableAllServices.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/enableAllServices.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/enableAllServices.svelte
diff --git a/src/routes/(console)/project-[project]/settings/header.svelte b/src/routes/(console)/project-[region]-[project]/settings/header.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/settings/header.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/header.svelte
index 3ae8b74a84..d39584b420 100644
--- a/src/routes/(console)/project-[project]/settings/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/header.svelte
@@ -9,7 +9,7 @@
     import { isCloud } from '$lib/system';
 
     const projectId = $page.params.project;
-    const path = `${base}/project-${projectId}/settings`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/settings`;
     const tabs: TabElement[] = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/index.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/index.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/(import)/index.ts
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/index.ts
diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step1.svelte
diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step2.svelte
diff --git a/src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte
similarity index 56%
rename from src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte
index b6bfd290d1..289ba745a3 100644
--- a/src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte
@@ -13,6 +13,7 @@
     import { started } from '../stores';
     import { showMigrationBox } from '$lib/components/migrationBox.svelte';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     const onExit = () => {
         resetImportStores();
@@ -24,48 +25,53 @@
 
             switch ($provider.provider) {
                 case 'appwrite': {
-                    await sdk.forProject.migrations.createAppwriteMigration(
-                        resources,
-                        $provider.endpoint,
-                        $provider.projectID,
-                        $provider.apiKey
-                    );
+                    await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .migrations.createAppwriteMigration(
+                            resources,
+                            $provider.endpoint,
+                            $provider.projectID,
+                            $provider.apiKey
+                        );
 
                     invalidate(Dependencies.MIGRATIONS);
                     break;
                 }
                 case 'supabase': {
-                    await sdk.forProject.migrations.createSupabaseMigration(
-                        resources,
-                        $provider.endpoint,
-                        $provider.apiKey,
-                        $provider.host,
-                        $provider.username || 'postgres',
-                        $provider.password,
-                        $provider.port || 5432
-                    );
+                    await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .migrations.createSupabaseMigration(
+                            resources,
+                            $provider.endpoint,
+                            $provider.apiKey,
+                            $provider.host,
+                            $provider.username || 'postgres',
+                            $provider.password,
+                            $provider.port || 5432
+                        );
 
                     invalidate(Dependencies.MIGRATIONS);
                     break;
                 }
                 case 'firebase': {
-                    await sdk.forProject.migrations.createFirebaseMigration(
-                        resources,
-                        $provider.serviceAccount
-                    );
+                    await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .migrations.createFirebaseMigration(resources, $provider.serviceAccount);
                     invalidate(Dependencies.MIGRATIONS);
                     break;
                 }
                 case 'nhost': {
-                    await sdk.forProject.migrations.createNHostMigration(
-                        resources,
-                        $provider.subdomain,
-                        $provider.region,
-                        $provider.adminSecret,
-                        $provider.database || $provider.subdomain,
-                        $provider.username || 'postgres',
-                        $provider.password
-                    );
+                    await sdk
+                        .forProject($page.params.region, $page.params.project)
+                        .migrations.createNHostMigration(
+                            resources,
+                            $provider.subdomain,
+                            $provider.region,
+                            $provider.adminSecret,
+                            $provider.database || $provider.subdomain,
+                            $provider.username || 'postgres',
+                            $provider.password
+                        );
 
                     invalidate(Dependencies.MIGRATIONS);
                     break;
diff --git a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
diff --git a/src/routes/(console)/project-[project]/settings/migrations/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts
similarity index 81%
rename from src/routes/(console)/project-[project]/settings/migrations/+page.ts
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts
index 6ce0dd60b5..36b470e5c8 100644
--- a/src/routes/(console)/project-[project]/settings/migrations/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts
@@ -2,11 +2,11 @@ import { Dependencies } from '$lib/constants.js';
 import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
 
-export async function load({ depends }) {
+export async function load({ depends, params }) {
     depends(Dependencies.MIGRATIONS);
 
     try {
-        const { migrations } = await sdk.forProject.migrations.list([
+        const { migrations } = await sdk.forProject(params.region, params.project).migrations.list([
             // hides backups/restorations from migrations page.
             Query.equal('source', ['Appwrite', 'Firebase', 'NHost', 'Supabase']),
             Query.or([
diff --git a/src/routes/(console)/project-[project]/settings/migrations/details.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/details.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte
diff --git a/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
diff --git a/src/routes/(console)/project-[project]/settings/migrations/stores.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/stores.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/migrations/stores.ts
rename to src/routes/(console)/project-[region]-[project]/settings/migrations/stores.ts
diff --git a/src/routes/(console)/project-[project]/settings/smtp/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/settings/smtp/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte
index e735055b19..3d49bcf597 100644
--- a/src/routes/(console)/project-[project]/settings/smtp/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/smtp/+page.svelte
@@ -128,7 +128,7 @@
             <p class="text">
                 You can customize the email service by providing your own SMTP server. View your
                 email templates <a
-                    href={`${base}/project-${$project.$id}/auth/templates`}
+                    href={`${base}/project-${$project.region}-${$project.$id}/auth/templates`}
                     class="link">here</a>
             </p>
             <svelte:fragment slot="aside">
diff --git a/src/routes/(console)/project-[project]/settings/transferProject.svelte b/src/routes/(console)/project-[region]-[project]/settings/transferProject.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/transferProject.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/transferProject.svelte
diff --git a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/settings/updateInstallations.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte
index aaabb6fbae..f72be23404 100644
--- a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte
@@ -63,7 +63,9 @@
     function configureGitHub() {
         const redirect = new URL($page.url);
         redirect.searchParams.append('alert', 'installation-updated');
-        const target = new URL(`${sdk.forProject.client.config.endpoint}/vcs/github/authorize`);
+        const target = new URL(
+            `${sdk.forProject($page.params.region, $page.params.project).client.config.endpoint}/vcs/github/authorize`
+        );
         target.searchParams.set('project', $page.params.project);
         target.searchParams.set('success', redirect.toString());
         target.searchParams.set('failure', redirect.toString());
diff --git a/src/routes/(console)/project-[project]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/settings/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
index 231abbf48a..481062d815 100644
--- a/src/routes/(console)/project-[project]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
@@ -56,7 +56,7 @@
             <Button
                 secondary
                 event="view_keys"
-                href={`${base}/project-${projectId}/overview/keys#integrations`}>
+                href={`${base}/project-${$page.params.region}-${projectId}/overview/keys#integrations`}>
                 View API keys
             </Button>
         </svelte:fragment>
diff --git a/src/routes/(console)/project-[project]/settings/updateServices.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateServices.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/updateServices.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/updateServices.svelte
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
similarity index 84%
rename from src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
index 2cb455ae0f..c432d29b86 100644
--- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
@@ -1,11 +1,11 @@
 import type { Aggregation, Invoice } from '$lib/sdk/billing';
 import { accumulateUsage } from '$lib/sdk/usage';
-import { getSdkForProject, sdk } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, parent }) => {
-    const { invoice, project } = params;
+    const { invoice, project, region } = params;
     const { organization } = await parent();
 
     let startDate: string = organization.billingCurrentInvoiceDate;
@@ -26,10 +26,7 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     const [invoices, usage] = await Promise.all([
         sdk.forConsole.billing.listInvoices(organization.$id, [Query.orderDesc('from')]),
-        /**
-         * Workaround because project id might not be populated yet.
-         */
-        getSdkForProject(project).project.getUsage(startDate, endDate)
+        sdk.forProject(region, project).project.getUsage(startDate, endDate)
     ]);
 
     if (invoice) {
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/settings/webhooks/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
index 8c2bc4b409..9063f3da8f 100644
--- a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
@@ -77,7 +77,7 @@
             <TableBody service="webhooks" total={data.webhooks.total}>
                 {#each data.webhooks.webhooks as webhook}
                     <TableRowLink
-                        href={`${base}/project-${projectId}/settings/webhooks/${webhook.$id}`}>
+                        href={`${base}/project-${$page.params.region}-${projectId}/settings/webhooks/${webhook.$id}`}>
                         {#each $columns as column (column.id)}
                             {#if column.show}
                                 {#if column.id === '$id'}
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/+page.ts
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/dangerZone.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/dangerZone.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/delete.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte
index 6fa515a6c3..2fc48dae77 100644
--- a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/delete.svelte
@@ -22,7 +22,7 @@
                 message: `${$webhook.name} has been deleted`
             });
             trackEvent(Submit.WebhookDelete);
-            await goto(`${base}/project-${$project.$id}/settings/webhooks`);
+            await goto(`${base}/project-${$project.region}-${$project.$id}/settings/webhooks`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/details.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/details.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/details.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/details.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/header.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/header.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/header.svelte
index 1bb3b8b0bb..a64993d694 100644
--- a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/header.svelte
@@ -10,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/settings/webhooks`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/settings/webhooks`}>
             {$webhook?.name}
         </CoverTitle>
         <Id value={$webhook?.$id} event="webhook">{$webhook?.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/regenerate.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/regenerate.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/regenerate.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/store.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/store.ts
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/store.ts
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateEvents.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateEvents.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateName.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateName.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSignature.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateSignature.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateURL.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateURL.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/updateURL.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/createWebhook.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/createWebhook.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/createWebhook.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/createWebhook.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/failedModal.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/settings/webhooks/failedModal.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/failedModal.svelte
index 22f8221b02..897986ebbf 100644
--- a/src/routes/(console)/project-[project]/settings/webhooks/failedModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/failedModal.svelte
@@ -14,7 +14,8 @@
     const projectId = $page.params.project;
 
     $: webhookPath = webhook
-        ? `${base}/project-${projectId}/settings/webhooks/` + (webhook['$id'] ?? '')
+        ? `${base}/project-${$page.params.region}-${projectId}/settings/webhooks/` +
+          (webhook['$id'] ?? '')
         : '';
 
     let enabled = webhook ? webhook.enabled : false;
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/messageStatusPill.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/messageStatusPill.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/messageStatusPill.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/messageStatusPill.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/store.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/store.ts
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/store.ts
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/wizard/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/step1.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/wizard/step2.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/wizard/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/step2.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/wizard/step3.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/step3.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/wizard/step3.svelte
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/step3.svelte
diff --git a/src/routes/(console)/project-[project]/settings/webhooks/wizard/store.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/settings/webhooks/wizard/store.ts
rename to src/routes/(console)/project-[region]-[project]/settings/webhooks/wizard/store.ts
diff --git a/src/routes/(console)/project-[project]/storage/+layout.svelte b/src/routes/(console)/project-[region]-[project]/storage/+layout.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/storage/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/+layout.svelte
index 2b56ac2230..3ad9dc7507 100644
--- a/src/routes/(console)/project-[project]/storage/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/+layout.svelte
@@ -13,7 +13,7 @@
             label: 'Create bucket',
             callback: () => {
                 if (!$page.url.pathname.endsWith('storage')) {
-                    goto(`${base}/project-${$project.$id}/storage`);
+                    goto(`${base}/project-${$project.region}-${$project.$id}/storage`);
                 }
                 $showCreateBucket = true;
             },
@@ -25,7 +25,7 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`${base}/project-${$project.$id}/storage/usage`);
+                goto(`${base}/project-${$project.region}-${$project.$id}/storage/usage`);
             },
             keys: ['g', 'u'],
             disabled:
diff --git a/src/routes/(console)/project-[project]/storage/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/+layout.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/storage/+layout.ts
diff --git a/src/routes/(console)/project-[project]/storage/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/storage/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/+page.svelte
index 65ae055b8f..022179eb89 100644
--- a/src/routes/(console)/project-[project]/storage/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte
@@ -22,7 +22,9 @@
 
     async function bucketCreated(event: CustomEvent<Models.Bucket>) {
         $showCreateBucket = false;
-        await goto(`${base}/project-${project}/storage/bucket-${event.detail.$id}`);
+        await goto(
+            `${base}/project-${$page.params.region}-${project}/storage/bucket-${event.detail.$id}`
+        );
     }
 </script>
 
@@ -42,7 +44,8 @@
             service="buckets"
             on:click={() => ($showCreateBucket = true)}>
             {#each data.buckets.buckets as bucket}
-                <GridItem1 href={`${base}/project-${project}/storage/bucket-${bucket.$id}`}>
+                <GridItem1
+                    href={`${base}/project-${$page.params.region}-${project}/storage/bucket-${bucket.$id}`}>
                     <svelte:fragment slot="title">{bucket.name}</svelte:fragment>
                     <svelte:fragment slot="status">
                         {#if !bucket.enabled}
diff --git a/src/routes/(console)/project-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts
similarity index 63%
rename from src/routes/(console)/project-[project]/storage/+page.ts
rename to src/routes/(console)/project-[region]-[project]/storage/+page.ts
index cb8268b862..b09a9ce595 100644
--- a/src/routes/(console)/project-[project]/storage/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts
@@ -4,7 +4,7 @@ import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ url, route }) => {
+export const load: PageLoad = async ({ url, route, params }) => {
     const page = getPage(url);
     const limit = getLimit(url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
@@ -12,10 +12,8 @@ export const load: PageLoad = async ({ url, route }) => {
     return {
         offset,
         limit,
-        buckets: await sdk.forProject.storage.listBuckets([
-            Query.limit(limit),
-            Query.offset(offset),
-            Query.orderDesc('')
-        ])
+        buckets: await sdk
+            .forProject(params.region, params.project)
+            .storage.listBuckets([Query.limit(limit), Query.offset(offset), Query.orderDesc('')])
     };
 };
diff --git a/src/routes/(console)/project-[project]/storage/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/breadcrumbs.svelte
similarity index 76%
rename from src/routes/(console)/project-[project]/storage/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/breadcrumbs.svelte
index acdceadec4..8f5fca2636 100644
--- a/src/routes/(console)/project-[project]/storage/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/breadcrumbs.svelte
@@ -10,11 +10,11 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.$id}`,
+            href: `${base}/project-${$project.region}-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.$id}/storage`,
+            href: `${base}/project-${$project.region}-${$project.$id}/storage`,
             title: 'Storage'
         }
     ];
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.svelte
similarity index 73%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.svelte
index 06189da1f3..9a8c022719 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.svelte
@@ -18,7 +18,9 @@
             label: 'Create file',
             async callback() {
                 if (!$page.url.pathname.endsWith($bucket.$id)) {
-                    goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}`);
+                    goto(
+                        `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}`
+                    );
                 }
                 showCreateFile();
             },
@@ -30,7 +32,7 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#permissions`
+                    `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings#permissions`
                 );
                 scrollBy({ top: -100 });
             },
@@ -42,7 +44,7 @@
             label: 'Extensions',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#extensions`
+                    `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings#extensions`
                 );
             },
             group: 'buckets',
@@ -53,7 +55,7 @@
             label: 'File security',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#file-security`
+                    `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings#file-security`
                 );
                 scrollBy({ top: -100 });
             },
@@ -64,7 +66,9 @@
         {
             label: 'Go to files',
             callback() {
-                goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}`
+                );
             },
             disabled: $page.url.pathname.endsWith($bucket.$id),
             keys: ['g', 'f'],
@@ -74,7 +78,9 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/usage`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/usage`
+                );
             },
             disabled: $page.url.pathname.endsWith('usage'),
             keys: ['g', 'u'],
@@ -84,7 +90,9 @@
         {
             label: 'Go to settings',
             callback() {
-                goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings`);
+                goto(
+                    `${base}/project-${$project.region}-${$project.$id}/storage/bucket-${$bucket.$id}/settings`
+                );
             },
             disabled: $page.url.pathname.endsWith('settings') || !$canWriteBuckets,
             keys: ['g', 's'],
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts
similarity index 78%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts
index 85e862d891..3de7dc104a 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts
@@ -12,7 +12,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            bucket: await sdk.forProject.storage.getBucket(params.bucket)
+            bucket: await sdk
+                .forProject(params.region, params.project)
+                .storage.getBucket(params.bucket)
         };
     } catch (e) {
         error(e.code, e.message);
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte
index e9a7fc50b3..e20ee2a984 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte
@@ -64,7 +64,10 @@
             ? bytesToSize(data.organizationUsage.storageTotal, 'GB')
             : null;
     const getPreview = (fileId: string) =>
-        sdk.forProject.storage.getFilePreview(bucketId, fileId, 64, 64).toString() + '&mode=admin';
+        sdk
+            .forProject($page.params.region, $page.params.project)
+            .storage.getFilePreview(bucketId, fileId, 64, 64)
+            .toString() + '&mode=admin';
 
     async function fileDeleted(event: CustomEvent<Models.File>) {
         showDelete = false;
@@ -74,7 +77,9 @@
 
     async function deleteFile(file: Models.File) {
         try {
-            await sdk.forProject.storage.deleteFile(file.bucketId, file.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.deleteFile(file.bucketId, file.$id);
             await invalidate(Dependencies.FILES);
             uploader.removeFile(file);
             trackEvent(Submit.FileDelete);
@@ -185,7 +190,7 @@
                         </TableRow>
                     {:else}
                         <TableRowLink
-                            href={`${base}/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}>
+                            href={`${base}/project-${$page.params.region}-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}>
                             <TableCell title="Name">
                                 <div class="u-flex u-gap-12 u-cross-center">
                                     <Avatar size={32} src={getPreview(file.$id)} name={file.name} />
@@ -217,7 +222,7 @@
                                             on:click={() => {
                                                 showDropdown[index] = false;
                                             }}
-                                            href={`${base}/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}
+                                            href={`${base}/project-${$page.params.region}-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}
                                             icon="pencil">Update</DropListLink>
                                         <DropListItem
                                             icon="trash"
@@ -255,7 +260,7 @@
                 </Button>
                 <Button
                     secondary
-                    href={`${base}/project-${$page.params.project}/storage/bucket-${$page.params.bucket}`}>
+                    href={`${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$page.params.bucket}`}>
                     Clear Search
                 </Button>
             </div>
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
similarity index 78%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
index 59898b37fc..e95212ec0c 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
@@ -14,11 +14,13 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
     const offset = pageToOffset(page, limit);
 
     const [files, organizationUsage] = await Promise.all([
-        sdk.forProject.storage.listFiles(
-            params.bucket,
-            [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-            search
-        ),
+        sdk
+            .forProject(params.region, params.project)
+            .storage.listFiles(
+                params.bucket,
+                [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
+                search
+            ),
         isCloud && organization?.$id ? sdk.forConsole.billing.listUsage(organization.$id) : null
     ]);
     return {
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/create.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/create.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step2.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step2.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/store.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/store.ts
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte
similarity index 85%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte
index 9990debae9..c1b305b6eb 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte
@@ -13,13 +13,15 @@
 
     const deleteUser = async () => {
         try {
-            await sdk.forProject.storage.deleteBucket($bucket.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.deleteBucket($bucket.$id);
             showDelete = false;
             addNotification({
                 type: 'success',
                 message: `${$bucket.name} has been deleted`
             });
-            await goto(`${base}/project-${$page.params.project}/storage`);
+            await goto(`${base}/project-${$page.params.region}-${$page.params.project}/storage`);
             trackEvent(Submit.BucketDelete);
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte
index 6c2239ad2d..72c484b78c 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte
@@ -4,8 +4,9 @@
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import type { Models } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
+    import { page } from '$app/stores';
+    import type { Models } from '@appwrite.io/console';
 
     export let file: Models.File;
     export let showDelete = false;
@@ -14,7 +15,9 @@
 
     const deleteFile = async () => {
         try {
-            await sdk.forProject.storage.deleteFile(file.bucketId, file.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.deleteFile(file.bucketId, file.$id);
             showDelete = false;
             dispatch('deleted', file);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
similarity index 77%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
index 0510deb593..161f625f52 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
@@ -12,7 +12,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            file: await sdk.forProject.storage.getFile(params.bucket, params.file)
+            file: await sdk
+                .forProject(params.region, params.project)
+                .storage.getFile(params.bucket, params.file)
         };
     } catch (e) {
         error(e.code, e.message);
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
similarity index 89%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
index 6640b784b5..7247669ddd 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
@@ -15,6 +15,7 @@
     import { Dependencies } from '$lib/constants';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { bucket } from '../store';
+    import { page } from '$app/stores';
 
     let showFileAlert = true;
     onMount(async () => {
@@ -26,10 +27,15 @@
     let arePermsDisabled = true;
 
     const getPreview = (fileId: string) =>
-        sdk.forProject.storage.getFilePreview($file.bucketId, fileId, 410, 250).toString() +
-        '&mode=admin';
+        sdk
+            .forProject($page.params.region, $page.params.project)
+            .storage.getFilePreview($file.bucketId, fileId, 410, 250)
+            .toString() + '&mode=admin';
     const getView = (fileId: string) =>
-        sdk.forProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin';
+        sdk
+            .forProject($page.params.region, $page.params.project)
+            .storage.getFileView($file.bucketId, fileId)
+            .toString() + '&mode=admin';
 
     $: if (filePermissions) {
         if (symmetricDifference(filePermissions, $file.$permissions).length) {
@@ -39,19 +45,18 @@
 
     function downloadFile() {
         return (
-            sdk.forProject.storage.getFileDownload($file.bucketId, $file.$id).toString() +
-            '&mode=admin'
+            sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.getFileDownload($file.bucketId, $file.$id)
+                .toString() + '&mode=admin'
         );
     }
 
     async function updatePermissions() {
         try {
-            await sdk.forProject.storage.updateFile(
-                $file.bucketId,
-                $file.$id,
-                $file.name,
-                filePermissions
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.updateFile($file.bucketId, $file.$id, $file.name, filePermissions);
             await invalidate(Dependencies.FILE);
             arePermsDisabled = true;
             addNotification({
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
similarity index 81%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
index 7f48416215..13a9eb4c5a 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
@@ -13,9 +13,13 @@
 
     const deleteFile = async () => {
         try {
-            await sdk.forProject.storage.deleteFile($file.bucketId, $file.$id);
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.deleteFile($file.bucketId, $file.$id);
             showDelete = false;
-            await goto(`${base}/project-${$page.params.project}/storage/bucket-${$file.bucketId}`);
+            await goto(
+                `${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$file.bucketId}`
+            );
             addNotification({
                 type: 'success',
                 message: `${$file.name} has been deleted`
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
similarity index 80%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
index 5fd06e90ee..4ea97fa702 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
@@ -11,7 +11,8 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/storage/bucket-${bucketId}`}>
+        <CoverTitle
+            href={`${base}/project-${$page.params.region}-${projectId}/storage/bucket-${bucketId}`}>
             {$file?.name}
         </CoverTitle>
         <Id value={$file?.$id} event="file">{$file?.$id}</Id>
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/header.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/header.svelte
index 8052187c82..5e54b94428 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/header.svelte
@@ -9,7 +9,7 @@
 
     const projectId = $page.params.project;
     const bucketId = $page.params.bucket;
-    const path = `${base}/project-${projectId}/storage/bucket-${bucketId}`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/storage/bucket-${bucketId}`;
     const tabs = [
         {
             href: path,
@@ -34,7 +34,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`${base}/project-${projectId}/storage`}>
+        <CoverTitle href={`${base}/project-${$page.params.region}-${projectId}/storage`}>
             {$bucket?.name}
         </CoverTitle>
         {#if $bucket?.$id}
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte
index 572cd88e62..41ec8971c6 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts" context="module">
+    import { page } from '$app/stores';
+    import { get, writable } from 'svelte/store';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 
     type TUpdateBucketMisc = {
@@ -12,6 +14,7 @@
 
     export async function updateBucket(updates: Partial<Models.Bucket>, misc: TUpdateBucketMisc) {
         const bucketData = get(bucket);
+        const $page = get(page);
         const values = { ...bucketData, ...updates };
 
         if (!isValueOfStringEnum(Compression, values.compression)) {
@@ -19,18 +22,20 @@
         }
 
         try {
-            await sdk.forProject.storage.updateBucket(
-                values.$id,
-                values.name,
-                values.$permissions,
-                values.fileSecurity,
-                values.enabled,
-                values.maximumFileSize,
-                values.allowedFileExtensions,
-                values.compression,
-                values.encryption,
-                values.antivirus
-            );
+            await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.updateBucket(
+                    values.$id,
+                    values.name,
+                    values.$permissions,
+                    values.fileSecurity,
+                    values.enabled,
+                    values.maximumFileSize,
+                    values.allowedFileExtensions,
+                    values.compression,
+                    values.encryption,
+                    values.antivirus
+                );
 
             await invalidate(Dependencies.BUCKET);
 
@@ -80,7 +85,6 @@
     import { sdk } from '$lib/stores/sdk';
     import { Compression, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
-    import { get, writable } from 'svelte/store';
     import Delete from '../deleteBucket.svelte';
     import { bucket } from '../store';
     import UpdateMaxFileSize from './updateMaxFileSize.svelte';
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.ts
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/store.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
similarity index 77%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
index f169fdab3d..6b15e22371 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
@@ -11,7 +11,7 @@
 
 <Usage
     title="Files"
-    path={`${base}/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
+    path={`${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
similarity index 76%
rename from src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
index de6a068c65..68fc0c6f37 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
@@ -8,10 +8,9 @@ export const load: PageLoad = async ({ params }) => {
     const period = isValueOfStringEnum(StorageUsageRange, params.period)
         ? params.period
         : StorageUsageRange.ThirtyDays;
-    const response = (await sdk.forProject.storage.getBucketUsage(
-        params.bucket,
-        period
-    )) as unknown as UsageBuckets;
+    const response = (await sdk
+        .forProject(params.region, params.project)
+        .storage.getBucketUsage(params.bucket, period)) as unknown as UsageBuckets;
 
     return {
         filesTotal: response.filesTotal,
diff --git a/src/routes/(console)/project-[project]/storage/create.svelte b/src/routes/(console)/project-[region]-[project]/storage/create.svelte
similarity index 90%
rename from src/routes/(console)/project-[project]/storage/create.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/create.svelte
index a8b4643d4e..c6ba1bd172 100644
--- a/src/routes/(console)/project-[project]/storage/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/create.svelte
@@ -7,6 +7,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { ID } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
+    import { page } from '$app/stores';
 
     export let showCreate = false;
 
@@ -19,7 +20,9 @@
 
     const create = async () => {
         try {
-            const bucket = await sdk.forProject.storage.createBucket(id ? id : ID.unique(), name);
+            const bucket = await sdk
+                .forProject($page.params.region, $page.params.project)
+                .storage.createBucket(id ? id : ID.unique(), name);
             showCreate = false;
             dispatch('created', bucket);
             addNotification({
diff --git a/src/routes/(console)/project-[project]/storage/header.svelte b/src/routes/(console)/project-[region]-[project]/storage/header.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/storage/header.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/header.svelte
index 43aa2b0e5a..72f204826f 100644
--- a/src/routes/(console)/project-[project]/storage/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/header.svelte
@@ -6,7 +6,7 @@
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `${base}/project-${projectId}/storage`;
+    const path = `${base}/project-${$page.params.region}-${projectId}/storage`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.svelte
similarity index 82%
rename from src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.svelte
index 08e6f956ce..d493651efe 100644
--- a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.svelte
@@ -11,7 +11,7 @@
 
 <Usage
     title="Buckets"
-    path={`${base}/project-${$page.params.project}/storage/usage`}
+    path={`${base}/project-${$page.params.region}-${$page.params.project}/storage/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts
similarity index 85%
rename from src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts
index 6c174caa71..e518039668 100644
--- a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params }) => {
         const period = isValueOfStringEnum(StorageUsageRange, params.period)
             ? params.period
             : StorageUsageRange.ThirtyDays;
-        return sdk.forProject.storage.getUsage(period);
+        return sdk.forProject(params.region, params.project).storage.getUsage(period);
     } catch (e) {
         error(e.code, e.message);
     }
diff --git a/src/routes/(console)/project-[project]/store.ts b/src/routes/(console)/project-[region]-[project]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/store.ts
rename to src/routes/(console)/project-[region]-[project]/store.ts
diff --git a/src/routes/(console)/project-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/updateVariables.svelte
rename to src/routes/(console)/project-[region]-[project]/updateVariables.svelte
index 3336648f07..c27bb6a141 100644
--- a/src/routes/(console)/project-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
-
     import {
         Table,
         TableBody,
@@ -26,12 +25,13 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
-    import { project } from '$routes/(console)/project-[project]/store';
+    import { project } from '$routes/(console)/project-[region]-[project]/store';
     import Alert from '$lib/components/alert.svelte';
     import PromoteVariableModal from './promoteVariableModal.svelte';
     import CreateVariable from './createVariable.svelte';
     import RawVariableEditor from './rawVariableEditor.svelte';
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
 
     export let variableList: Models.VariableList;
     export let globalVariableList: Models.VariableList | undefined = undefined;
@@ -127,12 +127,22 @@
             const isConflicting = globalVariable !== undefined;
 
             if (isConflicting) {
-                await sdk.forProject.projectApi.deleteVariable(globalVariable.$id);
-                await sdk.forProject.projectApi.createVariable(variable.key, variable.value);
-                await sdk.forProject.functions.deleteVariable(variable.resourceId, variable.$id);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .projectApi.deleteVariable(globalVariable.$id);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .projectApi.createVariable(variable.key, variable.value);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .functions.deleteVariable(variable.resourceId, variable.$id);
             } else {
-                await sdk.forProject.projectApi.createVariable(variable.key, variable.value);
-                await sdk.forProject.functions.deleteVariable(variable.resourceId, variable.$id);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .projectApi.createVariable(variable.key, variable.value);
+                await sdk
+                    .forProject($page.params.region, $page.params.project)
+                    .functions.deleteVariable(variable.resourceId, variable.$id);
             }
 
             selectedVar = null;
@@ -188,7 +198,7 @@
         <p>
             Set the environment variables or secret keys that will be passed to your function.
             Global variables can be found in <a
-                href={`${base}/project-${$project.$id}/settings#variables`}
+                href={`${base}/project-${$project.region}-${$project.$id}/settings#variables`}
                 title="Project settings"
                 class="link">
                 project settings</a
@@ -230,7 +240,7 @@
                             {/if}
                             a naming conflict with a global variable. View global variables in
                             <a
-                                href={`${base}/project-${$project.$id}/settings`}
+                                href={`${base}/project-${$project.region}-${$project.$id}/settings`}
                                 title="Project settings"
                                 class="link">
                                 project settings</a
diff --git a/src/routes/(console)/project-[project]/uploadVariablesModal.svelte b/src/routes/(console)/project-[region]-[project]/uploadVariablesModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/uploadVariablesModal.svelte
rename to src/routes/(console)/project-[region]-[project]/uploadVariablesModal.svelte
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index ffdaa77bec..77fd3e8b13 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -1,7 +1,7 @@
 import '@appwrite.io/pink';
 import '@appwrite.io/pink-icons';
 import 'tippy.js/dist/tippy.css';
-import { getApiEndpoint, sdk } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
 import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
@@ -15,9 +15,6 @@ export const ssr = false;
 export const load: LayoutLoad = async ({ depends, url, route }) => {
     depends(Dependencies.ACCOUNT);
 
-    console.log(getApiEndpoint());
-    sdk.forProject.client.setEndpoint(getApiEndpoint());
-
     const [account, error] = (await sdk.forConsole.account
         .get()
         .then((response) => [response, null])

From b4fc5324fcbf2688e81908bede368c094e7e2f5c Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 10 Dec 2024 02:29:01 +0100
Subject: [PATCH 063/177] fix: leftovers

---
 src/lib/stores/preferences.ts                 |  8 +++++---
 src/lib/stores/sdk.ts                         |  5 ++---
 .../databases/+page.ts                        | 20 +++++++++++--------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index 2b61fa51ab..419cf3b4b9 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -50,10 +50,11 @@ function createPreferences() {
         update,
         get: (route?: Page['route']): Preferences => {
             const $page = get(page);
-            const projectId = get(page).params.project;
-            route ??= $page.route;
+            const projectId = $page.params.project;
+            const routeId = route?.id ?? $page.route.id;
+
             return (
-                preferences[projectId]?.[route.id] ?? {
+                preferences[projectId]?.[routeId] ?? {
                     limit: null,
                     view: null,
                     columns: null
@@ -64,6 +65,7 @@ function createPreferences() {
         getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
             const $page = get(page);
             const projectId = $page.params.project;
+
             return preferences[projectId]?.collections?.[collectionId] ?? null;
         },
         setLimit: (limit: Preferences['limit']) =>
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index d524c3d28c..5ae1b6de3f 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -1,4 +1,3 @@
-import { getProjectId } from '$lib/helpers/project';
 import { VARS } from '$lib/system';
 import {
     Account,
@@ -40,7 +39,7 @@ export function getApiEndpoint(region?: string): string {
     const protocol = url.protocol;
     const hostname = url.hostname;
     const subdomain = getSubdomain(region);
-    console.log(`${protocol}//${subdomain}${hostname}/v1`);
+
     return `${protocol}//${subdomain}${hostname}/v1`;
 }
 
@@ -63,7 +62,7 @@ const clientConsole = new Client();
 clientConsole.setEndpoint(endpoint).setProject('console');
 
 const clientProject = new Client();
-clientProject.setEndpoint(endpoint).setMode('admin');
+clientProject.setMode('admin');
 
 const sdkForProject = {
     client: clientProject,
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
index 1758424ff5..bca9575435 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -3,10 +3,10 @@ import { getLimit, getPage, getView, pageToOffset, View } from '$lib/helpers/loa
 import { sdk } from '$lib/stores/sdk';
 import { type Models, Query } from '@appwrite.io/console';
 import { timeFromNow } from '$lib/helpers/date';
-import type { PageLoad } from './$types';
+import type { PageLoad, RouteParams } from './$types';
 import type { BackupPolicy } from '$lib/sdk/backups';
 
-export const load: PageLoad = async ({ url, route, depends }) => {
+export const load: PageLoad = async ({ url, route, depends, params }) => {
     depends(Dependencies.DATABASES);
 
     const page = getPage(url);
@@ -14,7 +14,11 @@ export const load: PageLoad = async ({ url, route, depends }) => {
     const view = getView(url, route, View.Grid);
     const offset = pageToOffset(page, limit);
 
-    const { databases, policies, lastBackups } = await fetchDatabasesAndBackups(limit, offset);
+    const { databases, policies, lastBackups } = await fetchDatabasesAndBackups(
+        limit,
+        offset,
+        params
+    );
 
     return {
         offset,
@@ -27,20 +31,20 @@ export const load: PageLoad = async ({ url, route, depends }) => {
 };
 
 // TODO: @itznotabug we should improve this!
-async function fetchDatabasesAndBackups(limit: number, offset: number) {
+async function fetchDatabasesAndBackups(limit: number, offset: number, params: RouteParams) {
     const databases = await sdk
         .forProject(params.region, params.project)
         .databases.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')]);
 
     const [policies, lastBackups] = await Promise.all([
-        await fetchPolicies(databases),
-        await fetchLastBackups(databases)
+        await fetchPolicies(databases, params),
+        await fetchLastBackups(databases, params)
     ]);
 
     return { databases, policies, lastBackups };
 }
 
-async function fetchPolicies(databases: Models.DatabaseList) {
+async function fetchPolicies(databases: Models.DatabaseList, params: RouteParams) {
     const databasePolicies: Record<string, BackupPolicy[]> = {};
 
     await Promise.all(
@@ -67,7 +71,7 @@ async function fetchPolicies(databases: Models.DatabaseList) {
     return databasePolicies;
 }
 
-async function fetchLastBackups(databases: Models.DatabaseList) {
+async function fetchLastBackups(databases: Models.DatabaseList, params: RouteParams) {
     const lastBackups: Record<string, string> = {};
 
     await Promise.all(

From 61e27bd947f5ecc78927a1fcc73674dd0b8b5ff8 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 10 Dec 2024 11:01:23 +0530
Subject: [PATCH 064/177] add: autofocus to custom ids.

---
 .../wizards/functions/steps/functionConfiguration.svelte   | 1 +
 src/lib/wizards/functions/steps/manualDetails.svelte       | 1 +
 .../wizards/functions/steps/templateConfiguration.svelte   | 1 +
 src/routes/(console)/createOrganization.svelte             | 2 +-
 src/routes/(console)/onboarding/+page.svelte               | 7 ++++++-
 .../organization-[organization]/createProject.svelte       | 2 +-
 .../organization-[organization]/wizard/step1.svelte        | 1 +
 .../(console)/project-[project]/auth/createTeam.svelte     | 2 +-
 .../(console)/project-[project]/auth/createUser.svelte     | 2 +-
 .../document-[document]/attributeForm.svelte               | 2 +-
 .../databases/database-[database]/createCollection.svelte  | 2 +-
 .../project-[project]/functions/wizard/step1.svelte        | 1 +
 .../project-[project]/messaging/topics/create.svelte       | 2 +-
 .../messaging/wizard/emailFormList.svelte                  | 1 +
 .../storage/bucket-[bucket]/create-file/step1.svelte       | 2 +-
 .../(console)/project-[project]/storage/create.svelte      | 2 +-
 16 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/lib/wizards/functions/steps/functionConfiguration.svelte b/src/lib/wizards/functions/steps/functionConfiguration.svelte
index 02ae938681..cafa196af6 100644
--- a/src/lib/wizards/functions/steps/functionConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/functionConfiguration.svelte
@@ -71,6 +71,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Function"
                 bind:id={$createFunction.$id}
diff --git a/src/lib/wizards/functions/steps/manualDetails.svelte b/src/lib/wizards/functions/steps/manualDetails.svelte
index e28665915e..55fe5655c3 100644
--- a/src/lib/wizards/functions/steps/manualDetails.svelte
+++ b/src/lib/wizards/functions/steps/manualDetails.svelte
@@ -48,6 +48,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Function"
                 bind:id={$createFunction.$id}
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index 02028bab46..481cd5026d 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -73,6 +73,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Function"
                 bind:id={$templateConfig.$id}
diff --git a/src/routes/(console)/createOrganization.svelte b/src/routes/(console)/createOrganization.svelte
index b9d1bb477f..3c4d7b2194 100644
--- a/src/routes/(console)/createOrganization.svelte
+++ b/src/routes/(console)/createOrganization.svelte
@@ -75,7 +75,7 @@
                 </Pill>
             </div>
         {:else}
-            <CustomId bind:show={showCustomId} name="Organization" bind:id />
+            <CustomId autofocus bind:show={showCustomId} name="Organization" bind:id />
         {/if}
     </FormList>
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte
index e714c1a5a8..40515ff1f6 100644
--- a/src/routes/(console)/onboarding/+page.svelte
+++ b/src/routes/(console)/onboarding/+page.svelte
@@ -125,7 +125,12 @@
                         </Pill>
                     </div>
                 {:else}
-                    <CustomId bind:show={showCustomId} name="Organization" isProject bind:id />
+                    <CustomId
+                        autofocus
+                        bind:show={showCustomId}
+                        name="Organization"
+                        isProject
+                        bind:id />
                 {/if}
                 {#if isCloud}
                     <div class="u-margin-block-start-8">
diff --git a/src/routes/(console)/organization-[organization]/createProject.svelte b/src/routes/(console)/organization-[organization]/createProject.svelte
index 85bccc0f06..8638642ac7 100644
--- a/src/routes/(console)/organization-[organization]/createProject.svelte
+++ b/src/routes/(console)/organization-[organization]/createProject.svelte
@@ -61,7 +61,7 @@
                 </Pill>
             </div>
         {:else}
-            <CustomId bind:show={showCustomId} name="Project" isProject bind:id />
+            <CustomId autofocus bind:show={showCustomId} name="Project" isProject bind:id />
         {/if}
     </FormList>
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/organization-[organization]/wizard/step1.svelte b/src/routes/(console)/organization-[organization]/wizard/step1.svelte
index acbf986518..331a27fc36 100644
--- a/src/routes/(console)/organization-[organization]/wizard/step1.svelte
+++ b/src/routes/(console)/organization-[organization]/wizard/step1.svelte
@@ -31,6 +31,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Project"
                 isProject={true}
diff --git a/src/routes/(console)/project-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[project]/auth/createTeam.svelte
index 65528f2c00..6cf75eb24a 100644
--- a/src/routes/(console)/project-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[project]/auth/createTeam.svelte
@@ -58,7 +58,7 @@
                 </Pill>
             </div>
         {:else}
-            <CustomId bind:show={showCustomId} name="Team" bind:id />
+            <CustomId autofocus bind:show={showCustomId} name="Team" bind:id />
         {/if}
     </FormList>
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/project-[project]/auth/createUser.svelte b/src/routes/(console)/project-[project]/auth/createUser.svelte
index cd8e57a7f4..e123e3f03d 100644
--- a/src/routes/(console)/project-[project]/auth/createUser.svelte
+++ b/src/routes/(console)/project-[project]/auth/createUser.svelte
@@ -84,7 +84,7 @@
                 </Pill>
             </div>
         {:else}
-            <CustomId bind:show={showDropdown} name="User" bind:id />
+            <CustomId autofocus bind:show={showDropdown} name="User" bind:id />
         {/if}
     </FormList>
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
index 53b239306c..d8b6f43547 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
@@ -29,7 +29,7 @@
                     </Pill>
                 </div>
             {:else}
-                <CustomId bind:show={showCustomId} name="Document" bind:id={customId} />
+                <CustomId autofocus bind:show={showCustomId} name="Document" bind:id={customId} />
             {/if}
         {/if}
     </ul>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
index 88d7e040d9..26e5991d81 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
@@ -71,10 +71,10 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Collection"
                 bind:id
-                autofocus={false}
                 fullWidth={true} />
         {/if}
     </FormList>
diff --git a/src/routes/(console)/project-[project]/functions/wizard/step1.svelte b/src/routes/(console)/project-[project]/functions/wizard/step1.svelte
index 26b97c1187..d8c08dd1e0 100644
--- a/src/routes/(console)/project-[project]/functions/wizard/step1.svelte
+++ b/src/routes/(console)/project-[project]/functions/wizard/step1.svelte
@@ -52,6 +52,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Function"
                 bind:id={$createFunction.id}
diff --git a/src/routes/(console)/project-[project]/messaging/topics/create.svelte b/src/routes/(console)/project-[project]/messaging/topics/create.svelte
index 6ec708a0b1..944d51447b 100644
--- a/src/routes/(console)/project-[project]/messaging/topics/create.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/create.svelte
@@ -58,7 +58,7 @@
                 </Pill>
             </div>
         {:else}
-            <CustomId bind:show={showCustomId} name="Topic" bind:id />
+            <CustomId autofocus bind:show={showCustomId} name="Topic" bind:id />
         {/if}
     </FormList>
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
index fd6bd9a027..b4568b02d0 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
@@ -115,6 +115,7 @@
         </div>
     {:else}
         <CustomId
+            autofocus
             bind:show={showCustomId}
             name="Message"
             bind:id={$messageParams[$providerType].messageId}
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index ff4c02639c..8c848afd78 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -62,7 +62,7 @@
             </div>
         {:else}
             <div class="custom-id-wrapper">
-                <CustomId bind:show={showCustomId} name="File" bind:id={$createFile.id} />
+                <CustomId autofocus bind:show={showCustomId} name="File" bind:id={$createFile.id} />
             </div>
         {/if}
     </FormList>
diff --git a/src/routes/(console)/project-[project]/storage/create.svelte b/src/routes/(console)/project-[project]/storage/create.svelte
index a8b4643d4e..c2b128226d 100644
--- a/src/routes/(console)/project-[project]/storage/create.svelte
+++ b/src/routes/(console)/project-[project]/storage/create.svelte
@@ -63,7 +63,7 @@
                 </Pill>
             </div>
         {:else}
-            <CustomId bind:show={showCustomId} name="Bucket" bind:id />
+            <CustomId autofocus bind:show={showCustomId} name="Bucket" bind:id />
         {/if}
     </FormList>
     <svelte:fragment slot="footer">

From e887b36e0735bd1e00cea3989ee02b5611d811c6 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 11 Dec 2024 13:34:36 +0100
Subject: [PATCH 065/177] fix: build

---
 src/lib/stores/sdk.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index 5ae1b6de3f..76b7064e5f 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -31,10 +31,12 @@ import {
     SUBDOMAIN_NYC,
     SUBDOMAIN_SYD
 } from '$lib/constants';
+import { building } from '$app/environment';
 
 export function getApiEndpoint(region?: string): string {
+    if (building) return '';
     const url = new URL(
-        VARS.APPWRITE_ENDPOINT ? VARS.APPWRITE_ENDPOINT : globalThis?.location.toString()
+        VARS.APPWRITE_ENDPOINT ? VARS.APPWRITE_ENDPOINT : globalThis?.location?.toString()
     );
     const protocol = url.protocol;
     const hostname = url.hostname;

From b5d6620e406c3c5375de05a9c2db559fa07784ce Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 12 Dec 2024 12:08:54 +0530
Subject: [PATCH 066/177] ci: empty commit


From c85d9c7bff0be3beff235995dc83bf9a31341fc8 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 12 Dec 2024 13:20:36 +0530
Subject: [PATCH 067/177] update: copies, ui as per new designs.

---
 .../billing/budgetAlert.svelte                | 12 +--
 .../billing/budgetCap.svelte                  | 10 +-
 .../billing/paymentMethods.svelte             | 95 ++++++++-----------
 .../billing/planSummary.svelte                |  5 +-
 4 files changed, 53 insertions(+), 69 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index 116c72e47a..02632fad9d 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -79,7 +79,7 @@
 
 <Form onSubmit={updateBudget}>
     <CardGrid>
-        <Heading tag="h2" size="6">Budget alerts</Heading>
+        <Heading tag="h2" size="6">Billing alerts</Heading>
 
         <p class="text">
             {#if $organization?.billingPlan === BillingPlan.FREE}
@@ -94,15 +94,9 @@
             {#if $organization?.billingPlan === BillingPlan.FREE}
                 <Alert type="info">
                     <svelte:fragment slot="title"
-                        >Budget alerts are a Pro plan feature
+                        >Billing alerts are a Pro plan feature
                     </svelte:fragment>
-                    Upgrade to a Pro plan to set a budget alerts for your organization. For more information
-                    on what you can do with a Pro plan,
-                    <a
-                        class="link"
-                        href="https://appwrite.io/pricing"
-                        target="_blank"
-                        rel="noopener noreferrer">view our pricing guide.</a>
+                    Upgrade to a Pro plan to manage when you receive billing alerts for your organization.
                 </Alert>
             {:else}
                 <FormList>
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index 0d3503c0aa..20586264cd 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -55,8 +55,6 @@
         <p class="text">
             Restrict your resource usage by setting a budget cap. Cap usage is reset at the
             beginning of each billing cycle.
-            <button class="link" type="button" on:click={() => ($showUsageRatesModal = true)}
-                >Learn more about usage rates.</button>
         </p>
         <svelte:fragment slot="aside">
             {#if $organization?.billingPlan === BillingPlan.FREE}
@@ -76,8 +74,12 @@
                 <FormList>
                     <InputSwitch id="cap-active" label="Enable budget cap" bind:value={capActive}>
                         <svelte:fragment slot="description">
-                            Budget cap limits do not include the base amount of your plan. Cap usage
-                            is reset at the beginning of each billing cycle.
+                            Budget cap limits do not include the base amount of your plan. <button
+                                class="link"
+                                type="button"
+                                on:click={() => ($showUsageRatesModal = true)}
+                                >Learn more about usage rates.
+                            </button>
                         </svelte:fragment>
                     </InputSwitch>
                     {#if capActive}
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 1a7938d240..9c50f62b36 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -20,7 +20,6 @@
     import DeleteOrgPayment from './deleteOrgPayment.svelte';
     import ReplaceCard from './replaceCard.svelte';
     import EditPaymentModal from '$routes/(console)/account/payments/editPaymentModal.svelte';
-    import { tooltip } from '$lib/actions/tooltip';
     import PaymentModal from '$lib/components/billing/paymentModal.svelte';
     import { user } from '$lib/stores/user';
 
@@ -198,8 +197,8 @@
         {#if $organization?.billingPlan !== BillingPlan.FREE}
             <!-- TODO: Add a simple button if a backup payment doesn't exist. -->
             <div class="u-flex u-flex-vertical u-gap-8">
-                <h4 class="u-bold body-text-2">Backup</h4>
                 {#if $organization?.backupPaymentMethodId}
+                    <h4 class="u-bold body-text-2">Backup</h4>
                     <CreditCardInfo isBox paymentMethod={backupPaymentMethod}>
                         <DropList bind:show={showDropdownBackup} placement="bottom-start" noArrow>
                             <Button
@@ -248,59 +247,47 @@
                     {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
                         (o) => !!o.last4 && o.$id !== $organization?.paymentMethodId
                     )}
-                    <article class="card u-grid u-cross-center u-width-full-line dashed">
-                        <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
-                            <div class="common-section">
-                                <DropList bind:show={showDropdownBackup} placement="bottom-start">
-                                    <Button
-                                        secondary
-                                        round
-                                        on:click={() => {
-                                            if (filteredPaymentMethods.length) {
-                                                showDropdownBackup = !showDropdownBackup;
-                                            } else {
-                                                isSelectedBackup = true;
-                                                showPayment = true;
-                                            }
-                                        }}>
-                                        <i class="icon-plus" />
-                                    </Button>
-                                    <svelte:fragment slot="list">
-                                        {#if $paymentMethods.total}
-                                            {#each filteredPaymentMethods as paymentMethod}
-                                                <DropListItem
-                                                    on:click={() => {
-                                                        showDropdownBackup = true;
-                                                        addBackupPaymentMethod(paymentMethod?.$id);
-                                                    }}>
-                                                    <span class="u-flex u-cross-center u-gap-8">
-                                                        <p class="text">
-                                                            Card ending in {paymentMethod.last4}
-                                                        </p>
-                                                        <CreditCardBrandImage
-                                                            brand={paymentMethod?.brand} />
-                                                    </span>
-                                                </DropListItem>
-                                            {/each}
-                                        {/if}
-                                        <DropListItem on:click={() => (showPayment = true)}>
-                                            Add new payment method
-                                        </DropListItem>
-                                    </svelte:fragment>
-                                </DropList>
-                            </div>
-                            <div class="common-section u-flex u-cross-center u-gap-4">
+                    <div
+                        class="u-bold body-text-2 u-flex u-cross-center u-gap-8 u-padding-block-start-8">
+                        <DropList bind:show={showDropdownBackup} placement="bottom-start">
+                            <Button
+                                text
+                                noMargin
+                                on:click={() => {
+                                    if (filteredPaymentMethods.length) {
+                                        showDropdownBackup = !showDropdownBackup;
+                                    } else {
+                                        isSelectedBackup = true;
+                                        showPayment = true;
+                                    }
+                                }}>
+                                <i class="icon-plus" />
                                 <span class="text"> Add a backup payment method </span>
-                                <span
-                                    class="icon-info"
-                                    style="font-size: var(--icon-size-small)"
-                                    use:tooltip={{
-                                        content:
-                                            'When your default payment method fails, a backup method will be used to pay your invoice automatically'
-                                    }} />
-                            </div>
-                        </div>
-                    </article>
+                            </Button>
+                            <svelte:fragment slot="list">
+                                {#if $paymentMethods.total}
+                                    {#each filteredPaymentMethods as paymentMethod}
+                                        <DropListItem
+                                            on:click={() => {
+                                                showDropdownBackup = true;
+                                                addBackupPaymentMethod(paymentMethod?.$id);
+                                            }}>
+                                            <span class="u-flex u-cross-center u-gap-8">
+                                                <p class="text">
+                                                    Card ending in {paymentMethod.last4}
+                                                </p>
+                                                <CreditCardBrandImage
+                                                    brand={paymentMethod?.brand} />
+                                            </span>
+                                        </DropListItem>
+                                    {/each}
+                                {/if}
+                                <DropListItem on:click={() => (showPayment = true)}>
+                                    Add new payment method
+                                </DropListItem>
+                            </svelte:fragment>
+                        </DropList>
+                    </div>
                 {/if}
             </div>
         {/if}
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index 331e11addd..668a110d55 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -199,7 +199,7 @@
             {#if $organization?.billingPlan === BillingPlan.FREE}
                 <!-- TODO: make center on mobile and have different styles. -->
                 <div
-                    class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line">
+                    class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line u-main-end">
                     <Button secondary href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
                     </Button>
@@ -216,7 +216,8 @@
                     </Button>
                 </div>
             {:else if $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
-                <div class="u-flex u-gap-16 u-flex-wrap">
+                <div
+                    class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line u-main-end">
                     <Button
                         text
                         disabled={$organization?.markedForDeletion}

From 9523c1d67f0f65320b112a963361c122096adcb9 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 12 Dec 2024 13:33:43 +0530
Subject: [PATCH 068/177] fix: diagnostic checks.

---
 .../(console)/organization-[organization]/billing/+page.svelte   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
index 23802e0815..c901315b2e 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte
@@ -17,7 +17,6 @@
     import { confirmPayment } from '$lib/stores/stripe';
     import { sdk } from '$lib/stores/sdk';
     import { toLocaleDate } from '$lib/helpers/date';
-    import { BillingPlan } from '$lib/constants';
     import RetryPaymentModal from './retryPaymentModal.svelte';
     import { selectedInvoice, showRetryModal } from './store';
     import { Button } from '$lib/elements/forms';

From a1cabc83fa00667fe68d64f7db9b4c0275c07af1 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Thu, 12 Dec 2024 12:25:06 +0100
Subject: [PATCH 069/177] fix: more explicit projectId handling

---
 src/lib/components/avatarInitials.svelte      |  2 +-
 src/lib/components/cardContainer.svelte       |  2 +-
 .../components/creditCardBrandImage.svelte    |  2 +-
 src/lib/components/limit.svelte               |  2 +-
 src/lib/components/viewSelector.svelte        | 13 +--
 src/lib/elements/flag.svelte                  | 12 +--
 src/lib/helpers/load.ts                       | 19 ++--
 src/lib/stores/preferences.ts                 | 90 ++++++++-----------
 src/lib/stores/uploader.ts                    | 21 +++--
 .../(console)/(migration-wizard)/index.ts     |  1 -
 src/routes/(console)/+layout.svelte           |  4 +-
 .../(console)/account/activity/+page.ts       |  2 +-
 .../(console)/account/organizations/+page.ts  |  2 +-
 .../(console)/account/sessions/+page.svelte   |  5 +-
 .../organization-[organization]/+page.ts      |  2 +-
 .../members/+page.ts                          |  2 +-
 .../usage/[[invoice]]/ProjectBreakdown.svelte |  4 +-
 .../project-[region]-[project]/auth/+page.ts  |  2 +-
 .../auth/teams/+page.ts                       |  2 +-
 .../auth/teams/team-[team]/activity/+page.ts  |  2 +-
 .../auth/teams/team-[team]/members/+page.ts   |  2 +-
 .../auth/user-[user]/activity/+page.ts        |  2 +-
 .../auth/user-[user]/identities/+page.ts      |  2 +-
 .../auth/user-[user]/sessions/+page.svelte    |  6 +-
 .../auth/user-[user]/targets/+page.ts         |  2 +-
 .../databases/+page.ts                        |  4 +-
 .../databases/database-[database]/+page.ts    |  4 +-
 .../database-[database]/backups/+page.ts      |  4 +-
 .../collection-[collection]/+page.svelte      |  5 +-
 .../collection-[collection]/+page.ts          |  4 +-
 .../collection-[collection]/activity/+page.ts |  2 +-
 .../createAttribute.svelte                    | 11 ++-
 .../document-[document]/activity/+page.ts     |  2 +-
 .../collection-[collection]/table.svelte      |  5 +-
 .../functions/+page.ts                        |  4 +-
 .../functions/function-[function]/+page.ts    |  2 +-
 .../function-[function]/executions/+page.ts   |  2 +-
 .../functions/templates/+page.ts              |  4 +-
 .../messaging/+page.ts                        |  6 +-
 .../messaging/providers/+page.ts              |  6 +-
 .../messaging/topics/+page.ts                 |  4 +-
 .../messaging/topics/topic-[topic]/+page.ts   |  2 +-
 .../topics/topic-[topic]/activity/+page.ts    |  2 +-
 .../settings/migrations/(import)/step2.svelte |  7 +-
 .../settings/webhooks/+page.ts                |  2 +-
 .../storage/+page.ts                          |  2 +-
 .../storage/bucket-[bucket]/+page.ts          |  2 +-
 .../bucket-[bucket]/create-file/create.svelte |  2 +
 48 files changed, 149 insertions(+), 144 deletions(-)

diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte
index f18ba99fd4..1696404a57 100644
--- a/src/lib/components/avatarInitials.svelte
+++ b/src/lib/components/avatarInitials.svelte
@@ -7,7 +7,7 @@
     export let background: string | undefined = undefined;
     export let color = 'black';
 
-    $: src = sdk.forConsole.avatars.getInitials(name, size * 2, size * 2, background).toString();
+    $: src = sdk.forConsole.avatars.getInitials(name, size * 2, size * 2, background);
 </script>
 
 <Avatar {name} {size} {src} {color} />
diff --git a/src/lib/components/cardContainer.svelte b/src/lib/components/cardContainer.svelte
index 0590e6182a..8021ec796c 100644
--- a/src/lib/components/cardContainer.svelte
+++ b/src/lib/components/cardContainer.svelte
@@ -16,7 +16,7 @@
 
     $: planLimit = getServiceLimit(serviceId) || Infinity;
 
-    $: limit = preferences.get($page.route)?.limit ?? CARD_LIMIT;
+    $: limit = preferences.get($page.params.project, $page.route)?.limit ?? CARD_LIMIT;
 </script>
 
 <ul
diff --git a/src/lib/components/creditCardBrandImage.svelte b/src/lib/components/creditCardBrandImage.svelte
index 1a542bb532..b30f23f412 100644
--- a/src/lib/components/creditCardBrandImage.svelte
+++ b/src/lib/components/creditCardBrandImage.svelte
@@ -9,7 +9,7 @@
 
     function getCreditCardImage(brand: string, width = 46, height = 32) {
         if (!isValueOfStringEnum(CreditCard, brand)) return '';
-        return sdk.forConsole.avatars.getCreditCard(brand, width, height).toString();
+        return sdk.forConsole.avatars.getCreditCard(brand, width, height);
     }
 </script>
 
diff --git a/src/lib/components/limit.svelte b/src/lib/components/limit.svelte
index 2150f5c3f5..9e71cbabc1 100644
--- a/src/lib/components/limit.svelte
+++ b/src/lib/components/limit.svelte
@@ -20,7 +20,7 @@
         const url = new URL($pageStore.url);
         const previousLimit = Number(url.searchParams.get('limit'));
         url.searchParams.set('limit', limit.toString());
-        preferences.setLimit(limit);
+        preferences.setLimit($pageStore.params.project, $pageStore.route, limit);
 
         if (url.searchParams.has('page')) {
             const page = Number(url.searchParams.get('page'));
diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte
index d0d69ed658..13331cee8f 100644
--- a/src/lib/components/viewSelector.svelte
+++ b/src/lib/components/viewSelector.svelte
@@ -23,7 +23,10 @@
 
     onMount(async () => {
         if (isCustomCollection) {
-            const prefs = preferences.getCustomCollectionColumns($page.params.collection);
+            const prefs = preferences.getCustomCollectionColumns(
+                $page.params.project,
+                $page.params.collection
+            );
             columns.set(
                 $columns.map((column) => {
                     column.show = prefs?.includes(column.id) ?? true;
@@ -31,7 +34,7 @@
                 })
             );
         } else {
-            const prefs = preferences.get($page.route);
+            const prefs = preferences.get($page.params.project, $page.route);
 
             // Override the shown columns only if a preference was set
             if (prefs?.columns) {
@@ -48,9 +51,9 @@
             const columns = ctx.filter((n) => n.show).map((n) => n.id);
 
             if (isCustomCollection) {
-                preferences.setCustomCollectionColumns(columns);
+                preferences.setCustomCollectionColumns($page.params.project, $page.route, columns);
             } else {
-                preferences.setColumns(columns);
+                preferences.setColumns($page.params.project, $page.route, columns);
             }
         });
     });
@@ -62,7 +65,7 @@
     }
 
     function updateViewPreferences(view: View) {
-        preferences.setView(view);
+        preferences.setView($page.params.project, $page.route, view);
     }
 
     $: selectedColumnsNumber = $columns.reduce((acc, column) => {
diff --git a/src/lib/elements/flag.svelte b/src/lib/elements/flag.svelte
index 066a531b3d..410307c9a0 100644
--- a/src/lib/elements/flag.svelte
+++ b/src/lib/elements/flag.svelte
@@ -14,14 +14,10 @@
 
     export function getFlag(country: string, width: number, height: number, quality: number) {
         if (!isValueOfStringEnum(Flag, country)) return '';
-        let flag = sdk
-            .forProject($page.params.region, $page.params.project)
-            .avatars.getFlag(country, width * 2, height * 2, quality)
-            ?.toString();
-        flag?.includes('&project=')
-            ? (flag = flag.replace('&project=', '&mode=admin'))
-            : flag + '&mode=admin';
-        return flag;
+
+        return sdk
+            .forProject($page.params.region, 'console')
+            .avatars.getFlag(country, width * 2, height * 2, quality);
     }
 </script>
 
diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts
index 88cd98c381..82176ad349 100644
--- a/src/lib/helpers/load.ts
+++ b/src/lib/helpers/load.ts
@@ -9,8 +9,15 @@ export function getPage(url: URL): number {
     return Number(url.searchParams.get('page'));
 }
 
-export function getLimit(url: URL, route: Page['route'], fallback: number): number {
-    return Number(url.searchParams.get('limit') ?? preferences.get(route).limit ?? fallback);
+export function getLimit(
+    projectId: string,
+    url: URL,
+    route: Page['route'],
+    fallback: number
+): number {
+    return Number(
+        url.searchParams.get('limit') ?? preferences.get(projectId, route).limit ?? fallback
+    );
 }
 
 export enum View {
@@ -18,14 +25,14 @@ export enum View {
     Grid = 'grid'
 }
 
-export function getView(url: URL, route: Page['route'], fallback: View): View {
-    return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid
+export function getView(projectId: string, url: URL, route: Page['route'], fallback: View): View {
+    return (url.searchParams.get('view') ?? preferences.get(projectId, route).view) === View.Grid
         ? View.Grid
         : (View.Table ?? fallback);
 }
 
-export function getColumns(route: Page['route'], fallback: string[]): string[] {
-    return preferences.get(route).columns ?? fallback;
+export function getColumns(projectId: string, route: Page['route'], fallback: string[]): string[] {
+    return preferences.get(projectId, route).columns ?? fallback;
 }
 
 export function getSearch(url: URL): string | undefined {
diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index 419cf3b4b9..84c00a0be3 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -1,5 +1,4 @@
 import { browser } from '$app/environment';
-import { page } from '$app/stores';
 import type { View } from '$lib/helpers/load';
 import type { Page } from '@sveltejs/kit';
 import { get, writable } from 'svelte/store';
@@ -48,81 +47,62 @@ function createPreferences() {
         subscribe,
         set,
         update,
-        get: (route?: Page['route']): Preferences => {
-            const $page = get(page);
-            const projectId = $page.params.project;
-            const routeId = route?.id ?? $page.route.id;
-
-            return (
-                preferences[projectId]?.[routeId] ?? {
-                    limit: null,
-                    view: null,
-                    columns: null
-                }
-            );
-        },
-
-        getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
-            const $page = get(page);
-            const projectId = $page.params.project;
-
-            return preferences[projectId]?.collections?.[collectionId] ?? null;
-        },
-        setLimit: (limit: Preferences['limit']) =>
+        get: (projectId: string, route: Page['route']): Preferences =>
+            preferences[projectId]?.[route.id] ?? {
+                limit: null,
+                view: null,
+                columns: null
+            },
+
+        getCustomCollectionColumns: (
+            projectId: string,
+            collectionId: string
+        ): Preferences['columns'] => preferences[projectId]?.collections?.[collectionId] ?? null,
+        setLimit: (projectId: string, route: Page['route'], limit: Preferences['limit']) =>
             update((n) => {
-                const $page = get(page);
-                const path = $page.route.id;
-                const project = $page.params.project;
-
-                if (!n[project]?.[path]) {
-                    n[project] ??= {};
-                    n[project][path] ??= {};
+                if (!n[projectId]?.[route.id]) {
+                    n[projectId] ??= {};
+                    n[projectId][route.id] ??= {};
                 }
 
-                n[project][path].limit = limit;
+                n[projectId][route.id].limit = limit;
 
                 return n;
             }),
-        setView: (view: Preferences['view']) =>
+        setView: (projectId: string, route: Page['route'], view: Preferences['view']) =>
             update((n) => {
-                const $page = get(page);
-                const path = $page.route.id;
-                const project = $page.params.project;
-                if (!n[project]?.[path]) {
-                    n[project] ??= {};
-                    n[project][path] ??= {};
+                if (!n[projectId]?.[route.id]) {
+                    n[projectId] ??= {};
+                    n[projectId][route.id] ??= {};
                 }
 
-                n[project][path].view = view;
+                n[projectId][route.id].view = view;
 
                 return n;
             }),
-        setColumns: (columns: Preferences['columns']) =>
+        setColumns: (projectId: string, route: Page['route'], columns: Preferences['columns']) =>
             update((n) => {
-                const $page = get(page);
-                const path = $page.route.id;
-                const project = $page.params.project;
-                if (!n[project]?.[path]) {
-                    n[project] ??= {};
-                    n[project][path] ??= {};
+                if (!n[projectId]?.[route.id]) {
+                    n[projectId] ??= {};
+                    n[projectId][route.id] ??= {};
                 }
 
-                n[project][path].columns = columns;
+                n[projectId][route.id].columns = columns;
 
                 return n;
             }),
-        setCustomCollectionColumns: (columns: Preferences['columns']) =>
+        setCustomCollectionColumns: (
+            projectId: string,
+            route: Page['route'],
+            columns: Preferences['columns']
+        ) =>
             update((n) => {
-                const $page = get(page);
-                const project = $page.params.project;
-                const collection = $page.params.collection;
-
-                if (!n[project]?.collections?.[collection]) {
-                    n[project] ??= {};
-                    n[project].collections ??= {};
+                if (!n[projectId]?.collections?.[route.id]) {
+                    n[projectId] ??= {};
+                    n[projectId].collections ??= {};
                 }
 
-                n[project].collections[collection] = columns;
+                n[projectId].collections[route.id] = columns;
 
                 return n;
             }),
diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts
index ff78d25234..b25e3da81c 100644
--- a/src/lib/stores/uploader.ts
+++ b/src/lib/stores/uploader.ts
@@ -1,6 +1,5 @@
 import { Client, type Models, Storage } from '@appwrite.io/console';
 import { writable } from 'svelte/store';
-import { getProjectId } from '$lib/helpers/project';
 import { getApiEndpoint } from '$lib/stores/sdk';
 
 type UploaderFile = {
@@ -18,11 +17,10 @@ export type Uploader = {
     files: UploaderFile[];
 };
 
-const temporaryStorage = () => {
-    const clientProject = new Client()
-        .setEndpoint(getApiEndpoint())
-        .setMode('admin')
-        .setProject(getProjectId());
+const temporaryStorage = (region: string, projectId: string) => {
+    const clientProject = new Client().setMode('admin');
+    const endpoint = getApiEndpoint(region);
+    clientProject.setEndpoint(endpoint).setProject(projectId);
 
     return new Storage(clientProject);
 };
@@ -66,7 +64,14 @@ const createUploader = () => {
                 isCollapsed: false,
                 files: []
             }),
-        uploadFile: async (bucketId: string, id: string, file: File, permissions: string[]) => {
+        uploadFile: async (
+            region: string,
+            projectId: string,
+            bucketId: string,
+            id: string,
+            file: File,
+            permissions: string[]
+        ) => {
             const newFile: UploaderFile = {
                 $id: id,
                 bucketId: bucketId,
@@ -81,7 +86,7 @@ const createUploader = () => {
                 n.files.unshift(newFile);
                 return n;
             });
-            const uploadedFile = await temporaryStorage().createFile(
+            const uploadedFile = await temporaryStorage(region, projectId).createFile(
                 bucketId,
                 id ?? 'unique()',
                 file,
diff --git a/src/routes/(console)/(migration-wizard)/index.ts b/src/routes/(console)/(migration-wizard)/index.ts
index e3dc89a318..9c065b9bf0 100644
--- a/src/routes/(console)/(migration-wizard)/index.ts
+++ b/src/routes/(console)/(migration-wizard)/index.ts
@@ -3,7 +3,6 @@ import { wizard } from '$lib/stores/wizard';
 import { requestedMigration } from '$routes/store';
 import { get, writable } from 'svelte/store';
 import Wizard from './wizard.svelte';
-import type { Models } from '@appwrite.io/console';
 
 export const formData = createMigrationFormStore();
 
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index e7f43be1f9..1d6d89e314 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -272,9 +272,9 @@
     }
 
     database.subscribe(async (database) => {
-        if (!database) return;
+        if (!database || !$page.params.region || !$page.params.project) return;
         // the component checks `isCloud` internally.
-        await checkForDatabaseBackupPolicies(database);
+        await checkForDatabaseBackupPolicies($page.params.region, $page.params.project, database);
     });
 
     let currentOrganizationId = null;
diff --git a/src/routes/(console)/account/activity/+page.ts b/src/routes/(console)/account/activity/+page.ts
index 4f02c49120..4dfa80227f 100644
--- a/src/routes/(console)/account/activity/+page.ts
+++ b/src/routes/(console)/account/activity/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit('console', url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts
index 0b89b1d302..cafa665eb8 100644
--- a/src/routes/(console)/account/organizations/+page.ts
+++ b/src/routes/(console)/account/organizations/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
+    const limit = getLimit('console', url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/account/sessions/+page.svelte b/src/routes/(console)/account/sessions/+page.svelte
index 38a9247213..dc443717d7 100644
--- a/src/routes/(console)/account/sessions/+page.svelte
+++ b/src/routes/(console)/account/sessions/+page.svelte
@@ -29,9 +29,8 @@
     function getBrowser(clientCode: string) {
         const code = clientCode.toLowerCase();
         if (!isValueOfStringEnum(Browser, code)) return '';
-        return sdk
-            .forProject($page.params.region, $page.params.project)
-            .avatars.getBrowser(code, 40, 40);
+
+        return sdk.forConsole.avatars.getBrowser(code, 40, 40);
     }
 
     function logoutSessionId(sessionId: string) {
diff --git a/src/routes/(console)/organization-[organization]/+page.ts b/src/routes/(console)/organization-[organization]/+page.ts
index 0282852c28..27056c2897 100644
--- a/src/routes/(console)/organization-[organization]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, url, route, depends, parent }) =>
     const { scopes } = await parent();
     depends(Dependencies.ORGANIZATION);
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
+    const limit = getLimit('console', url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
     if (!scopes.includes('projects.read') && scopes.includes('billing.read')) {
         return redirect(301, `/console/organization-${params.organization}/billing`);
diff --git a/src/routes/(console)/organization-[organization]/members/+page.ts b/src/routes/(console)/organization-[organization]/members/+page.ts
index 69d4cb1f51..2ca1102a72 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.ts
+++ b/src/routes/(console)/organization-[organization]/members/+page.ts
@@ -8,7 +8,7 @@ export const load: PageLoad = async ({ url, params, route, depends }) => {
     depends(Dependencies.ORGANIZATION);
     depends(Dependencies.MEMBERS);
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit('console', url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 278f0c94fa..4da76596da 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -71,8 +71,8 @@
                             <TableCell title="Usage">{format(project.usage)}</TableCell>
                         </TableRow>
                     {:else}
-                        <TableRowLink
-                            href={getProjectUsageLink(project.region ?? 'fra1', project.projectId)}>
+                        <!-- TODO: hardcoded region -->
+                        <TableRowLink href={getProjectUsageLink('fra1', project.projectId)}>
                             <TableCell title="Project">
                                 {data.projectNames[project.projectId]?.name ?? 'Unknown'}
                             </TableCell>
diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/+page.ts
index 74ce23f313..db6ad38c72 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/+page.ts
@@ -8,7 +8,7 @@ import { showCreateUser } from './+page.svelte';
 export const load: PageLoad = async ({ url, route, params }) => {
     const page = getPage(url);
     const search = getSearch(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     if (typeof url.searchParams.get('create') === 'string') {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
index 3f9e017937..d24fe0665c 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
@@ -7,7 +7,7 @@ import type { PageLoad } from './$types';
 export const load: PageLoad = async ({ url, route, params }) => {
     const page = getPage(url);
     const search = getSearch(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
index 7b33b57e89..c5512bfd73 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts
index c1094d2241..73a4cc029a 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/members/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
     const teamId = params.team;
     const page = getPage(url);
     const search = getSearch(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
index 29b0048219..4ef4251269 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     return {
         offset,
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts
index 475f950a56..252dceca5e 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     depends(Dependencies.USER_IDENTITIES);
 
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
     const search = getSearch(url);
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
index 1abb3d7cc5..8d15b3abd7 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
@@ -18,7 +18,6 @@
     import DeleteAllSessions from '../deleteAllSessions.svelte';
     import DeleteSessions from '../deleteSession.svelte';
     import type { PageData } from './$types';
-    import { page } from '$app/stores';
 
     export let data: PageData;
 
@@ -29,9 +28,8 @@
     function getBrowser(clientCode: string) {
         const code = clientCode.toLowerCase();
         if (!isValueOfStringEnum(Browser, code)) return '';
-        return sdk
-            .forProject($page.params.region, $page.params.project)
-            .avatars.getBrowser(code, 40, 40);
+
+        return sdk.forConsole.avatars.getBrowser(code, 40, 40);
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
index c3dab9c6a9..e7a6aa7fe6 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     depends(Dependencies.USER_TARGETS);
 
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
index bca9575435..15f90f67d5 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -10,8 +10,8 @@ export const load: PageLoad = async ({ url, route, depends, params }) => {
     depends(Dependencies.DATABASES);
 
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
-    const view = getView(url, route, View.Grid);
+    const limit = getLimit(params.project, url, route, CARD_LIMIT);
+    const view = getView(params.project, url, route, View.Grid);
     const offset = pageToOffset(page, limit);
 
     const { databases, policies, lastBackups } = await fetchDatabasesAndBackups(
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
index 57d5f5f0e0..c9e4ba10bb 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
@@ -7,8 +7,8 @@ import { CARD_LIMIT, Dependencies } from '$lib/constants';
 export const load: PageLoad = async ({ params, url, route, depends }) => {
     depends(Dependencies.COLLECTIONS);
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
-    const view = getView(url, route, View.Grid);
+    const limit = getLimit(params.project, url, route, CARD_LIMIT);
+    const view = getView(params.project, url, route, View.Grid);
     const offset = pageToOffset(page, limit);
     const collections = await sdk
         .forProject(params.region, params.project)
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts
index 5e12a3c05f..2f7fefba43 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts
@@ -7,8 +7,8 @@ import type { BackupArchive, BackupArchiveList, BackupPolicyList } from '$lib/sd
 export const load = async ({ params, url, route, depends }) => {
     depends(Dependencies.BACKUPS);
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
-    const view = getView(url, route, View.Grid);
+    const limit = getLimit(params.project, url, route, CARD_LIMIT);
+    const view = getView(params.project, url, route, View.Grid);
     const offset = pageToOffset(page, limit);
 
     let backups: BackupArchiveList = { total: 0, archives: [] };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
index 5a7a96e4b7..83ea35cd1d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
@@ -23,7 +23,10 @@
     let showCreateDropdown = false;
     let selectedAttribute: Option['name'] = null;
 
-    $: selected = preferences.getCustomCollectionColumns($page.params.collection);
+    $: selected = preferences.getCustomCollectionColumns(
+        $page.params.project,
+        $page.params.collection
+    );
     $: columns.set(
         $collection.attributes.map((attribute) => ({
             id: attribute.key,
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
index 107d096f6b..16860c77ff 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
@@ -8,8 +8,8 @@ import { queries, queryParamToMap } from '$lib/components/filters';
 export const load: PageLoad = async ({ params, depends, url, route }) => {
     depends(Dependencies.DOCUMENTS);
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
-    const view = getView(url, route, View.Grid);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
+    const view = getView(params.project, url, route, View.Grid);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
index 955c1796c1..dc9a44c26b 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index aa89f0b158..573ccccf54 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -28,9 +28,16 @@
         try {
             await $option.create(databaseId, collectionId, key, data);
 
-            let selectedColumns = preferences.getCustomCollectionColumns(collectionId);
+            let selectedColumns = preferences.getCustomCollectionColumns(
+                $page.params.project,
+                collectionId
+            );
             selectedColumns.push(key ?? data?.key);
-            preferences.setCustomCollectionColumns(selectedColumns);
+            preferences.setCustomCollectionColumns(
+                $page.params.project,
+                $page.route,
+                selectedColumns
+            );
             await invalidate(Dependencies.COLLECTION);
             if (!$page.url.pathname.includes('attributes')) {
                 await goto(
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
index 6c59cf14f0..070f181276 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
index 52643ef3ef..372ec904fc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
@@ -99,7 +99,10 @@
         };
     }
 
-    $: selected = preferences.getCustomCollectionColumns($page.params.collection);
+    $: selected = preferences.getCustomCollectionColumns(
+        $page.params.project,
+        $page.params.collection
+    );
 
     $: {
         columns.set(
diff --git a/src/routes/(console)/project-[region]-[project]/functions/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/+page.ts
index 0019ac1039..7fa73f2629 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/+page.ts
@@ -4,11 +4,11 @@ import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT, Dependencies } from '$lib/constants';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ url, depends, route }) => {
+export const load: PageLoad = async ({ url, depends, route, params }) => {
     depends(Dependencies.FUNCTIONS);
 
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
+    const limit = getLimit(params.project, url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
index 9f666a8f34..9b23d5d084 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
     const data = await parent();
     depends(Dependencies.DEPLOYMENTS);
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts
index 62766efa26..fa8be5fd01 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.ts
@@ -8,7 +8,7 @@ import { queries, queryParamToMap } from '$lib/components/filters';
 export const load: PageLoad = async ({ params, depends, url, route }) => {
     depends(Dependencies.EXECUTIONS);
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
index abf21eb708..0b29728e1e 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
@@ -3,13 +3,13 @@ import { getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/lo
 import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ url, route, depends, parent }) => {
+export const load: PageLoad = async ({ url, route, depends, parent, params }) => {
     depends(Dependencies.FUNCTIONS);
 
     const limit = CARD_LIMIT;
     const page = getPage(url);
     const search = getSearch(url);
-    const view = getView(url, route, View.Grid);
+    const view = getView(params.project, url, route, View.Grid);
     const offset = pageToOffset(page, limit);
     const filter = {
         useCases: url.searchParams.getAll('useCase'),
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
index 64845f1e40..1380807dfd 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
@@ -13,13 +13,13 @@ import { sdk } from '$lib/stores/sdk';
 import { Query, type Models } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ depends, url, route }) => {
+export const load: PageLoad = async ({ depends, url, route, params }) => {
     depends(Dependencies.MESSAGING_MESSAGES);
 
     const page = getPage(url);
     const search = getSearch(url);
-    const view = getView(url, route, View.Grid);
-    const limit = getLimit(url, route, CARD_LIMIT);
+    const view = getView(params.project, url, route, View.Grid);
+    const limit = getLimit(params.project, url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
index fe8003fdd7..8a2e109220 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
@@ -13,13 +13,13 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { queries, queryParamToMap } from '$lib/components/filters';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ depends, url, route }) => {
+export const load: PageLoad = async ({ depends, url, route, params }) => {
     depends(Dependencies.MESSAGING_PROVIDERS);
 
     const page = getPage(url);
     const search = getSearch(url);
-    const view = getView(url, route, View.Grid);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const view = getView(params.project, url, route, View.Grid);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
index 4e314b90af..2f3c2d76b6 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
@@ -5,11 +5,11 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { queryParamToMap, queries } from '$lib/components/filters';
 import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ depends, url, route }) => {
+export const load: PageLoad = async ({ depends, url, route, params }) => {
     depends(Dependencies.MESSAGING_TOPICS);
     const page = getPage(url);
     const search = getSearch(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const query = getQuery(url);
 
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts
index d4b3e9cc84..34a9e0eb6b 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     depends(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS);
 
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
     const search = getSearch(url);
     const query = getQuery(url);
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
index 933026955d..f60702362c 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, url, route }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step2.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step2.svelte
index a786481319..cf0ade6672 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step2.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/step2.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
-
+    import { page } from '$app/stores';
     import ResourceForm from '$routes/(console)/(migration-wizard)/resource-form.svelte';
     import { formData, provider } from '.';
 </script>
@@ -18,5 +18,8 @@
             Learn about which resources are supported</a
         >.
     </svelte:fragment>
-    <ResourceForm {formData} {provider} projectSdk={sdk.forProject} />
+    <ResourceForm
+        {formData}
+        {provider}
+        projectSdk={sdk.forProject($page.params.region, $page.params.project)} />
 </WizardStep>
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts
index 10e665b003..048eb91ce5 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.ts
@@ -7,7 +7,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     depends(Dependencies.WEBHOOKS);
 
     const page = getPage(url);
-    const view = getView(url, route, View.Grid);
+    const view = getView(params.project, url, route, View.Grid);
 
     return {
         page,
diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts
index b09a9ce595..6fe61a15bb 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts
@@ -6,7 +6,7 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ url, route, params }) => {
     const page = getPage(url);
-    const limit = getLimit(url, route, CARD_LIMIT);
+    const limit = getLimit(params.project, url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
index e95212ec0c..daf8d39e49 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
@@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
     depends(Dependencies.FILES);
     const page = getPage(url);
     const search = getSearch(url);
-    const limit = getLimit(url, route, PAGE_LIMIT);
+    const limit = getLimit(params.project, url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
     const [files, organizationUsage] = await Promise.all([
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/create.svelte
index 92a1e965d5..0c0ce134a5 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/create.svelte
@@ -32,6 +32,8 @@
 
         try {
             const uploadPromise = uploader.uploadFile(
+                $page.params.region,
+                $page.params.project,
                 bucketId,
                 fileId,
                 $createFile.files[0],

From dcaff792941dbd3eac727ca6a1975157456d4760 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Thu, 12 Dec 2024 12:29:49 +0100
Subject: [PATCH 070/177] fix: tests

---
 tests/unit/setup.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/unit/setup.ts b/tests/unit/setup.ts
index 2b65f14eb2..4fb13dd265 100644
--- a/tests/unit/setup.ts
+++ b/tests/unit/setup.ts
@@ -3,16 +3,20 @@ import { beforeAll, vi } from 'vitest';
 
 beforeAll(() => {
     vi.mock('$app/environment', () => ({
-        browser: true
+        dev: true,
+        building: false,
+        browser: true,
+        page: {
+            params: {
+                project: 'tests',
+                region: 'tests'
+            }
+        }
     }));
     vi.mock('$app/navigation', () => ({
         goto: vi.fn(),
         beforeNavigate: vi.fn()
     }));
-    vi.mock('$app/environment', () => ({
-        dev: true,
-        browser: true
-    }));
     vi.mock('$env/static/public', () => import.meta.env);
     vi.mock('$env/dynamic/public', () => ({
         env: import.meta.env

From cc426eee37f546ebe2ba4237b25f2b3a8fa0f237 Mon Sep 17 00:00:00 2001
From: Pushkar <bansalpushkar100@gmail.com>
Date: Thu, 12 Dec 2024 21:02:14 +0530
Subject: [PATCH 071/177] modify deploymeny cancel message

---
 .../functions/function-[function]/cancel.svelte                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
index 77f91bca23..514f7f442e 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
@@ -21,7 +21,7 @@
             showCancel = false;
             addNotification({
                 type: 'success',
-                message: `Deployment has been deleted`
+                message: `Deployment cancelled`
             });
             trackEvent(Submit.DeploymentCancel);
         } catch (error) {

From 70483f4a8992b80506329fb5934ab72b654baf2d Mon Sep 17 00:00:00 2001
From: pushkar707 <77536989+pushkar707@users.noreply.github.com>
Date: Fri, 13 Dec 2024 17:40:07 +0530
Subject: [PATCH 072/177] Update: deployment cancelled message

Co-authored-by: Darshan <itznotabug@gmail.com>
---
 .../functions/function-[function]/cancel.svelte                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
index 514f7f442e..500e63c287 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
@@ -21,7 +21,7 @@
             showCancel = false;
             addNotification({
                 type: 'success',
-                message: `Deployment cancelled`
+                message: `Deployment has been cancelled`
             });
             trackEvent(Submit.DeploymentCancel);
         } catch (error) {

From 0b50b581202ef7eb114b8f3282f852ad4e689e83 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 14 Dec 2024 11:39:56 +0530
Subject: [PATCH 073/177] fix: create collection modal not showing on mobile.

---
 src/lib/layout/shell.svelte                       | 15 +++++++++------
 src/lib/stores/layout.ts                          |  2 ++
 .../collection-[collection]/subNavigation.svelte  |  6 +++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 2ea2eeb79f..2db0781b96 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -7,21 +7,21 @@
     import { activeHeaderAlert } from '$routes/(console)/store';
     import { setContext } from 'svelte';
     import { writable } from 'svelte/store';
+    import { showSubNavigation } from '$lib/stores/layout';
 
-    export let isOpen = false;
     export let showSideNavigation = false;
 
     let y: number;
 
     page.subscribe(({ url }) => {
-        isOpen = url.searchParams.get('openNavbar') === 'true';
+        $showSubNavigation = url.searchParams.get('openNavbar') === 'true';
     });
 
     const toggleMenu = () => {
         y = 0;
-        isOpen = !isOpen;
+        $showSubNavigation = !$showSubNavigation;
         if (browser) {
-            if (isOpen) {
+            if ($showSubNavigation) {
                 document.body.classList.add('u-overflow-hidden');
             } else {
                 document.body.classList.remove('u-overflow-hidden');
@@ -52,7 +52,7 @@
 
 <main
     class:grid-with-side={showSideNavigation}
-    class:is-open={isOpen}
+    class:is-open={$showSubNavigation}
     class:u-hide={$wizard.show || $log.show || $wizard.cover}
     class:is-fixed-layout={$activeHeaderAlert?.show}
     style:--p-side-size={sideSize}>
@@ -65,7 +65,10 @@
             class="icon-button is-not-desktop"
             aria-label="Open Menu"
             on:click={toggleMenu}>
-            <span class:icon-x={isOpen} class:icon-menu={!isOpen} aria-hidden="true" />
+            <span
+                class:icon-x={$showSubNavigation}
+                class:icon-menu={!$showSubNavigation}
+                aria-hidden="true" />
         </button>
         <slot name="header" />
     </header>
diff --git a/src/lib/stores/layout.ts b/src/lib/stores/layout.ts
index de3c04aef6..7a9a3ef13a 100644
--- a/src/lib/stores/layout.ts
+++ b/src/lib/stores/layout.ts
@@ -25,3 +25,5 @@ export function updateLayout(args: updateLayoutArguments) {
     header.set(args.header ?? null);
     breadcrumb.set(args.breadcrumb ?? null);
 }
+
+export const showSubNavigation = writable(false);
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
index 26d60dc96e..a6b0f3f1d9 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
@@ -3,6 +3,7 @@
     import { page } from '$app/stores';
     import { showCreate } from '../store';
     import type { PageData } from './$types';
+    import { showSubNavigation } from '$lib/stores/layout';
 
     $: data = $page.data as PageData;
     $: project = $page.params.project;
@@ -24,7 +25,10 @@
     <h5 class="eyebrow-heading-3 u-padding-block-12 is-not-mobile">Collections</h5>
     <button
         class="button is-text is-full-width u-main-start u-padding-inline-0"
-        on:click={() => ($showCreate = true)}>
+        on:click={() => {
+            $showCreate = true;
+            $showSubNavigation = false;
+        }}>
         <span class="icon-plus" aria-hidden="true" />
         <span class="text">Create collection</span>
     </button>

From e4f03e7ff038299f0718b952301c4df45d8cf76d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 14 Dec 2024 11:48:55 +0530
Subject: [PATCH 074/177] fix: tests and usage.

---
 src/lib/layout/navigation.svelte    | 7 +++----
 src/routes/(console)/+layout.svelte | 4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte
index cda4c67a92..c81e065723 100644
--- a/src/lib/layout/navigation.svelte
+++ b/src/lib/layout/navigation.svelte
@@ -15,8 +15,7 @@
     import { showSupportModal } from '$routes/(console)/wizard/support/store';
     import { getContext } from 'svelte';
     import type { Writable } from 'svelte/store';
-
-    export let isOpen = false;
+    import { showSubNavigation } from '$lib/stores/layout';
 
     $: project = $page.params.project;
     $: projectPath = `${base}/project-${project}`;
@@ -44,12 +43,12 @@
     }
 
     function openFeedback() {
-        isOpen = false;
+        $showSubNavigation = false;
         wizard.start(Create);
     }
 
     function openSupport() {
-        isOpen = false;
+        $showSubNavigation = false;
         $showSupportModal = true;
     }
 </script>
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 74df68b7b0..dee3bc09b5 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -238,7 +238,6 @@
             rank: -1
         }
     ]);
-    let isOpen = false;
     onMount(async () => {
         loading.set(false);
         if (!localStorage.getItem('feedbackElapsed')) {
@@ -319,14 +318,13 @@
 <CommandCenter />
 
 <Shell
-    bind:isOpen
     showSideNavigation={$page.url.pathname !== '/console' &&
         !$page?.params.organization &&
         !$page.url.pathname.includes('/console/account') &&
         !$page.url.pathname.includes('/console/card') &&
         !$page.url.pathname.includes('/console/onboarding')}>
     <Header slot="header" />
-    <SideNavigation slot="side" bind:isOpen />
+    <SideNavigation slot="side" />
     <slot />
     <Footer slot="footer" />
 </Shell>

From 5ea0d3a1a99cbb62230e1b37a91c7c55806f37be Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 15 Dec 2024 08:14:36 +0000
Subject: [PATCH 075/177] Fix: show correct error

---
 .../organization-[organization]/billing/budgetCap.svelte        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index e76bcd2ed4..ee66a00c44 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -37,7 +37,7 @@
         } catch (error) {
             addNotification({
                 type: 'error',
-                message: `There was an error enabling your budget cap`
+                message: error.message
             });
             trackError(error, Submit.BudgetCapUpdate);
         }

From 411847f439e5867097aad918dd49bd27e562d63d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 15 Dec 2024 18:44:05 +0530
Subject: [PATCH 076/177] fix: markdown and styles in ai assistant.

---
 package.json                           |  2 +
 pnpm-lock.yaml                         | 28 ++++++++++++
 src/lib/commandCenter/panels/ai.svelte | 59 +++++++++++++++++++++++---
 3 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index ca116f366d..f189113b97 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
         "plausible-tracker": "^0.3.9",
         "pretty-bytes": "^6.1.1",
         "prismjs": "^1.29.0",
+        "remarkable": "^2.0.1",
         "svelte-confetti": "^1.4.0",
         "tippy.js": "^6.3.7"
     },
@@ -52,6 +53,7 @@
         "@testing-library/user-event": "^14.5.2",
         "@types/deep-equal": "^1.0.4",
         "@types/prismjs": "^1.26.5",
+        "@types/remarkable": "^2.0.8",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
         "@vitest/ui": "^1.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e107684f4f..627a97cc9f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -59,6 +59,9 @@ importers:
       prismjs:
         specifier: ^1.29.0
         version: 1.29.0
+      remarkable:
+        specifier: ^2.0.1
+        version: 2.0.1
       svelte-confetti:
         specifier: ^1.4.0
         version: 1.4.0(svelte@4.2.19)
@@ -102,6 +105,9 @@ importers:
       '@types/prismjs':
         specifier: ^1.26.5
         version: 1.26.5
+      '@types/remarkable':
+        specifier: ^2.0.8
+        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.6.3))(eslint@8.57.1)(typescript@5.6.3)
@@ -1327,6 +1333,9 @@ packages:
   '@types/pug@2.0.10':
     resolution: {integrity: sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==}
 
+  '@types/remarkable@2.0.8':
+    resolution: {integrity: sha512-eKXqPZfpQl1kOADjdKchHrp2gwn9qMnGXhH/AtZe0UrklzhGJkawJo/Y/D0AlWcdWoWamFNIum8+/nkAISQVGg==}
+
   '@types/shimmer@1.2.0':
     resolution: {integrity: sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==}
 
@@ -1559,6 +1568,9 @@ packages:
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
+  autolinker@3.16.2:
+    resolution: {integrity: sha512-JiYl7j2Z19F9NdTmirENSUUIIL/9MytEWtmzhfmsKPCp9E+G35Y0UNCMoM9tFigxT59qSc8Ml2dlZXOCVTYwuA==}
+
   available-typed-arrays@1.0.7:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
@@ -3062,6 +3074,11 @@ packages:
     resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
     engines: {node: '>= 0.4'}
 
+  remarkable@2.0.1:
+    resolution: {integrity: sha512-YJyMcOH5lrR+kZdmB0aJJ4+93bEojRZ1HGDn9Eagu6ibg7aVZhc3OWbbShRid+Q5eAfsEqWxpe+g5W5nYNfNiA==}
+    engines: {node: '>= 6.0.0'}
+    hasBin: true
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -5143,6 +5160,8 @@ snapshots:
 
   '@types/pug@2.0.10': {}
 
+  '@types/remarkable@2.0.8': {}
+
   '@types/shimmer@1.2.0': {}
 
   '@types/stack-utils@2.0.3': {}
@@ -5435,6 +5454,10 @@ snapshots:
 
   asynckit@0.4.0: {}
 
+  autolinker@3.16.2:
+    dependencies:
+      tslib: 2.8.1
+
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
@@ -7144,6 +7167,11 @@ snapshots:
       es-errors: 1.3.0
       set-function-name: 2.0.2
 
+  remarkable@2.0.1:
+    dependencies:
+      argparse: 1.0.10
+      autolinker: 3.16.2
+
   require-directory@2.1.1: {}
 
   require-in-the-middle@7.4.0:
diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte
index d64c93e517..da09311f7d 100644
--- a/src/lib/commandCenter/panels/ai.svelte
+++ b/src/lib/commandCenter/panels/ai.svelte
@@ -1,6 +1,9 @@
 <script lang="ts">
+    import { Remarkable } from 'remarkable';
     import Template from './template.svelte';
 
+    const markdownInstance = new Remarkable();
+
     import { Alert, AvatarInitials, Code, LoadingDots, SvgIcon } from '$lib/components';
     import { user } from '$lib/stores/user';
     import { useCompletion } from 'ai/svelte';
@@ -19,8 +22,6 @@
         credentials: 'include'
     });
 
-    let question = $input;
-
     const examples = [
         'How to add platform in the console?',
         'How can I manage users, permissions, and access control in Appwrite?',
@@ -87,10 +88,47 @@
 
     $: answer = parseCompletion($completion);
 
+    function renderMarkdown(answer: string): string {
+        const trimmedAnswer = answer
+            .trim()
+            .replace(/[ \t]+/g, ' ')
+            .replace(/\n[ \t]+/g, '\n')
+            .replace(/\n+/g, '\n');
+
+        // targeting links in plain text.
+        const processedAnswer = trimmedAnswer
+            .replace(/(\[(.*?)]\((.*?)\))|https?:\/\/\S+/g, (match, fullMarkdownLink, _, __) =>
+                fullMarkdownLink ? match : `[${match}](${match})`
+            )
+            .replace(/https?:\/\/\S+##/g, (url) => url.replace(/##/, '#'));
+
+        const formattedAnswer = processedAnswer.replace(
+            /(^|\n)Sources:/g,
+            (_, prefix) => `${prefix}\nSources:`
+        );
+
+        let renderedHTML = markdownInstance.render(formattedAnswer);
+
+        // add target blank to open links in a new tab.
+        renderedHTML = renderedHTML.replace(/<a\s+href="([^"]+)"/g, '<a href="$1" target="_blank"');
+
+        return renderedHTML;
+    }
+
     function getInitials(name: string) {
         const [first, last] = name.split(' ');
         return `${first?.[0] ?? ''}${last?.[0] ?? ''}`;
     }
+
+    let previousQuestion = '';
+    $: if ($input) {
+        previousQuestion = $input;
+    }
+
+    $: if (!$isLoading && answer) {
+        // reset input if answer received.
+        $input = '';
+    }
 </script>
 
 <Template
@@ -142,7 +180,7 @@
         <div class="content">
             <div class="u-flex u-gap-8 u-cross-center">
                 <div class="avatar is-size-x-small">{getInitials($user.name)}</div>
-                <p class="u-opacity-75">{question}</p>
+                <p class="u-opacity-75">{previousQuestion}</p>
             </div>
             <div class="u-flex u-gap-8 u-margin-block-start-24">
                 <div class="logo">
@@ -154,7 +192,7 @@
                     {:else}
                         {#each answer as part}
                             {#if part.type === 'text'}
-                                <p>{part.value.trimStart()}</p>
+                                <p>{@html renderMarkdown(part.value.trim())}</p>
                             {:else if part.type === 'code'}
                                 {#key part.value}
                                     <div
@@ -196,7 +234,6 @@
                 class="input-text-wrapper u-width-full-line"
                 style="--amount-of-buttons: 1;"
                 on:submit|preventDefault={(e) => {
-                    question = $input;
                     handleSubmit(e);
                 }}>
                 <!--  svelte-ignore a11y-autofocus -->
@@ -269,10 +306,20 @@
         .answer {
             overflow: hidden;
 
-            p {
+            p:first-of-type {
                 white-space: pre-wrap;
             }
         }
+
+        :global(.answer ul),
+        :global(.answer ol) {
+            gap: 1rem;
+            display: grid;
+        }
+
+        :global(.answer a) {
+            text-decoration: underline;
+        }
     }
 
     .footer {

From 99626fc9ff751473e8bb506d5bc772da7a3e71b4 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 15 Dec 2024 18:58:19 +0530
Subject: [PATCH 077/177] fix: use-case display title casing

---
 .../project-[project]/functions/templates/+page.svelte         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[project]/functions/templates/+page.svelte
index 3ba5404c25..a740c7e2f0 100644
--- a/src/routes/(console)/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/templates/+page.svelte
@@ -21,6 +21,7 @@
     import type { Models } from '@appwrite.io/console';
     import { functionsList } from '../store';
     import { debounce } from '$lib/helpers/debounce';
+    import { capitalize } from '$lib/helpers/string';
 
     export let data;
 
@@ -148,7 +149,7 @@
                                             class="is-small"
                                             checked={isChecked(useCase)}
                                             on:change={(e) => applyFilter('useCase', useCase, e)} />
-                                        <span class="u-trim-1">{useCase}</span>
+                                        <span class="u-trim-1">{capitalize(useCase)}</span>
                                     </label>
                                 </li>
                             {/each}

From f516387c65fb042df25836dac4522b0c7dc3cf73 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 15 Dec 2024 19:15:29 +0530
Subject: [PATCH 078/177] fix: indexing key.

---
 .../indexes/createIndex.svelte                | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
index 5c0bba01f7..634de7ffa3 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
@@ -2,7 +2,7 @@
     import { goto, invalidate } from '$app/navigation';
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, FormList, InputSelect, InputText } from '$lib/elements/forms';
@@ -11,8 +11,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { IndexType } from '@appwrite.io/console';
     import { isRelationship } from '../document-[document]/attributes/store';
-    import { indexes, type Attributes } from '../store';
-    import { collection } from '../store';
+    import { type Attributes, collection, indexes } from '../store';
     import Select from './select.svelte';
 
     export let showCreateIndex = false;
@@ -20,8 +19,8 @@
 
     const databaseId = $page.params.database;
 
+    let key = '';
     let error: string;
-    let key = `index_${$indexes.length + 1}`;
     let types = [
         { value: IndexType.Key, label: 'Key' },
         { value: IndexType.Unique, label: 'Unique' },
@@ -38,6 +37,17 @@
 
     let attributeList = [{ value: '', order: '' }];
 
+    function generateIndexKey() {
+        let indexKeys = $indexes.map((index) => index.key);
+
+        let highestIndex = indexKeys.reduce((max, key) => {
+            const match = key.match(/^index_(\d+)$/);
+            return match ? Math.max(max, parseInt(match[1], 10)) : max;
+        }, indexKeys.length);
+
+        return `index_${highestIndex + 1}`;
+    }
+
     function initialize() {
         attributeList = externalAttribute
             ? [{ value: externalAttribute.key, order: 'ASC' }]
@@ -49,6 +59,7 @@
     $: if (showCreateIndex) {
         error = null;
         initialize();
+        key = generateIndexKey();
     }
 
     $: addAttributeDisabled = !attributeList.at(-1)?.value || !attributeList.at(-1)?.order;

From bc20be4210f3d445203750f384a9a832750452f6 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 15 Dec 2024 19:30:32 +0530
Subject: [PATCH 079/177] add: subject to support wizard form.

---
 src/routes/(console)/supportWizard.svelte        | 4 +++-
 src/routes/(console)/wizard/support/step1.svelte | 9 ++++++++-
 src/routes/(console)/wizard/support/store.ts     | 2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/supportWizard.svelte b/src/routes/(console)/supportWizard.svelte
index 615b43c9c2..eb21414aaa 100644
--- a/src/routes/(console)/supportWizard.svelte
+++ b/src/routes/(console)/supportWizard.svelte
@@ -20,6 +20,7 @@
     onDestroy(() => {
         $supportData = {
             message: null,
+            subject: null,
             category: 'general',
             file: null
         };
@@ -39,8 +40,8 @@
                 'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-                subject: 'support',
                 email: $user.email,
+                subject: $supportData.subject,
                 firstName: $user?.name || 'Unknown',
                 message: $supportData.message,
                 tags: ['cloud'],
@@ -75,6 +76,7 @@
     function resetData() {
         $supportData = {
             message: null,
+            subject: null,
             category: 'general',
             file: null,
             project: null
diff --git a/src/routes/(console)/wizard/support/step1.svelte b/src/routes/(console)/wizard/support/step1.svelte
index 06f8f265b9..b780da48ea 100644
--- a/src/routes/(console)/wizard/support/step1.svelte
+++ b/src/routes/(console)/wizard/support/step1.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { FormList, InputSelect, InputTextarea } from '$lib/elements/forms';
+    import { FormList, InputSelect, InputText, InputTextarea } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
     import { supportData } from './store';
     import { Pill } from '$lib/elements';
@@ -50,6 +50,13 @@
                     bind:value={$supportData.project}
                     {options} />
             {/if}
+            <InputText
+                label="Subject"
+                id="subject"
+                placeholder="Briefly summarize your issue..."
+                bind:value={$supportData.subject}
+                required />
+
             <InputTextarea
                 label="Tell us a bit more"
                 id="message"
diff --git a/src/routes/(console)/wizard/support/store.ts b/src/routes/(console)/wizard/support/store.ts
index 368fbae244..535579f795 100644
--- a/src/routes/(console)/wizard/support/store.ts
+++ b/src/routes/(console)/wizard/support/store.ts
@@ -2,6 +2,7 @@ import { writable } from 'svelte/store';
 
 export type SupportData = {
     message: string;
+    subject: string;
     category: string;
     file?: File | null;
     project?: string;
@@ -9,6 +10,7 @@ export type SupportData = {
 
 export const supportData = writable<SupportData>({
     message: '',
+    subject: '',
     category: 'general',
     file: null
 });

From 7ff085d0870f428d1f27eb3a6ff29e483fb1bdd8 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 16 Dec 2024 11:15:38 +0530
Subject: [PATCH 080/177] new: support layout.

---
 src/lib/components/support.svelte | 236 +++++++++++++++++-------------
 src/lib/helpers/date.ts           |   5 +
 src/lib/layout/header.svelte      |   2 +-
 3 files changed, 142 insertions(+), 101 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 66d922d410..8ed77f6ec4 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
     import { Button } from '$lib/elements/forms';
-    import { app } from '$lib/stores/app';
     import { wizard } from '$lib/stores/wizard';
     import SupportWizard from '$routes/(console)/supportWizard.svelte';
-    import { showSupportModal } from '$routes/(console)/wizard/support/store';
-    import { isCloud } from '$lib/system';
+    import { isSupportOnline, showSupportModal } from '$routes/(console)/wizard/support/store';
     import { organization } from '$lib/stores/organization';
     import { BillingPlan } from '$lib/constants';
     import { trackEvent } from '$lib/actions/analytics';
-    import { localeTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
+    import { localeShortTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
     import { upgradeURL } from '$lib/stores/billing';
+    import { Card } from '$lib/components/index';
+    import { app } from '$lib/stores/app';
 
     export let show = false;
 
@@ -17,107 +17,143 @@
         $organization?.billingPlan === BillingPlan.PRO ||
         $organization?.billingPlan === BillingPlan.SCALE;
 
-    $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeTimezoneName()}`;
+    $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeShortTimezoneName()}`;
+
+    type SupportOption = {
+        cta?: string;
+        icon: string;
+        label: string;
+        link?: string;
+        description: string;
+        showSupport: boolean;
+    };
+
+    const supportOptions: SupportOption[] = [
+        {
+            showSupport: true,
+            icon: 'support',
+            label: 'Premium support',
+            description: 'Get priority email support from the Appwrite team'
+        },
+
+        {
+            icon: 'discord',
+            cta: 'Discord',
+            showSupport: false,
+            label: 'Community support',
+            link: 'https://appwrite.io/discord',
+            description: 'Get support from our community through Discord'
+        },
+        {
+            icon: 'github',
+            cta: 'Open issue',
+            showSupport: false,
+            label: 'Open GitHub issue',
+            link: 'https://github.com/appwrite',
+            description: 'Report a bug or pitch a new feature'
+        }
+    ];
 </script>
 
-{#if isCloud}
-    <section class="drop-section u-grid u-gap-24 u-padding-24">
-        <div>
-            <h4 class="eyebrow-heading-3">Premium support</h4>
-            {#if isPaid}
+<section class="drop-section support-section">
+    <h4 class="heading-level-6">Support</h4>
+
+    {#each supportOptions as option}
+        <Card
+            isTile
+            class="restore-modal-inner-card u-flex u-flex-vertical u-gap-12"
+            style="border-radius: var(--border-radius-small, 8px); padding: 0.65rem;">
+            <div class="u-flex u-flex-vertical u-gap-4">
+                <h4 class="body-text-2 u-bold">{option.label}</h4>
+
                 <p class="u-line-height-1-5 u-margin-block-start-8">
-                    Get personalized support from the Appwrite team from <b>{supportTimings}</b>
+                    {option.description}
                 </p>
-            {/if}
-        </div>
-        {#if $organization?.billingPlan === BillingPlan.FREE}
-            <Button
-                fullWidth
-                href={$upgradeURL}
-                on:click={() => {
-                    trackEvent('click_organization_upgrade', {
-                        from: 'button',
-                        source: 'support_menu'
-                    });
-                }}>
-                <span class="text">Get Premium support</span>
-            </Button>
-        {:else}
-            <Button
-                secondary
-                fullWidth
-                on:click={() => {
-                    show = false;
-                    $showSupportModal = false;
-                    wizard.start(SupportWizard);
-                }}>
-                <span class="text">Contact our Support Team</span>
-            </Button>
-        {/if}
-    </section>
-{/if}
-<section class="drop-section u-grid u-gap-24 u-padding-24">
-    <div>
-        <h4 class="eyebrow-heading-3">Troubleshooting</h4>
+            </div>
 
-        <div class="u-margin-block-start-8 u-width-full-line">
-            {#key $app.themeInUse}
-                <iframe
-                    style="color-scheme: none"
-                    title="Appwrite Status"
-                    src={`https://status.appwrite.online/badge?theme=${
-                        $app.themeInUse === 'dark' ? 'dark' : 'light'
-                    }`}
-                    width="250"
-                    height="30"
-                    frameborder="0"
-                    scrolling="no">
-                </iframe>
-            {/key}
-        </div>
-    </div>
+            {#if option.showSupport}
+                <div class="u-flex u-gap-12 u-cross-center">
+                    {#if !isPaid}
+                        <Button
+                            href={$upgradeURL}
+                            on:click={() => {
+                                trackEvent('click_organization_upgrade', {
+                                    from: 'button',
+                                    source: 'support_menu'
+                                });
+                            }}
+                            ><span class="text">Get Premium support</span>
+                        </Button>
+                    {:else}
+                        <Button
+                            secondary
+                            on:click={() => {
+                                show = false;
+                                $showSupportModal = false;
+                                wizard.start(SupportWizard);
+                            }}>
+                            <span class="text">Contact support</span>
+                        </Button>
+                    {/if}
 
-    <div class="u-flex u-gap-16">
-        <a
-            href="https://appwrite.io/docs"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="button is-secondary u-padding-inline-12 u-stretch u-main-center u-gap-4 u-flex-basis-auto">
-            <span class="icon-book-open" aria-hidden="true" />
-            <span class="text">Docs</span>
-        </a>
-        <a
-            href="https://github.com/appwrite/appwrite/issues"
-            aria-label="Open issue on GitHub"
-            target="_blank"
-            rel="noopener noreferrer"
-            class="button is-secondary u-padding-inline-12 u-stretch u-main-center u-gap-4 u-flex-basis-auto">
-            <span class="icon-github" aria-hidden="true" />
-            <span class="text">Open issue</span>
-        </a>
-    </div>
-</section>
-<section class="drop-section u-grid u-gap-8 u-padding-24">
-    <div>
-        <h4 class="eyebrow-heading-3">Community support</h4>
-        <p class="text u-margin-block-start-8">Get help from our community</p>
+                    <div class="u-flex u-gap-4 u-cross-center">
+                        {#if isSupportOnline()}
+                            <span
+                                class="icon-check-circle u-color-text-success"
+                                aria-hidden="true" />
+                        {/if}
+
+                        {supportTimings}
+                    </div>
+                </div>
+            {:else}
+                <Button
+                    href={option.link}
+                    external
+                    secondary
+                    class="u-flex u-cross-center u-gap-6"
+                    on:click={() => {
+                        trackEvent('click_organization_upgrade', {
+                            from: 'button',
+                            source: 'support_menu'
+                        });
+                    }}>
+                    <span class={`icon-${option.icon}`} />
+                    <span>{option.cta}</span>
+                </Button>
+            {/if}
+        </Card>
+    {/each}
+
+    <div class="u-width-full-line">
+        {#key $app.themeInUse}
+            <iframe
+                style="color-scheme: none"
+                title="Appwrite Status"
+                src={`https://status.appwrite.online/badge?theme=${
+                    $app.themeInUse === 'dark' ? 'dark' : 'light'
+                }`}
+                width="250"
+                height="30"
+                frameborder="0"
+                scrolling="no">
+            </iframe>
+        {/key}
     </div>
-    <ul class="u-flex u-gap-8">
-        <li>
-            <Button href="https://github.com/appwrite" text noMargin external ariaLabel="Github">
-                <span class="icon-github" aria-hidden="true" />
-            </Button>
-        </li>
-        <li>
-            <Button
-                href="https://appwrite.io/discord"
-                round
-                text
-                noMargin
-                external
-                ariaLabel="Discord">
-                <span class="icon-discord" aria-hidden="true" />
-            </Button>
-        </li>
-    </ul>
 </section>
+
+<style>
+    .support-section {
+        gap: 1rem;
+        padding: 20px;
+        display: flex;
+        flex-direction: column;
+    }
+
+    @media (max-width: 768px) {
+        .support-section {
+            gap: 1.25rem;
+            padding: 0.5rem;
+        }
+    }
+</style>
diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts
index f8275753b0..87bc7dc5f3 100644
--- a/src/lib/helpers/date.ts
+++ b/src/lib/helpers/date.ts
@@ -128,6 +128,11 @@ export const localeTimezoneName = () => {
     return dateWithTimezone.split(', ')[1];
 };
 
+export const localeShortTimezoneName = () => {
+    const timezone = localeTimezoneName();
+    return timezone.match(/[A-Z]/g)?.join('') || timezone;
+};
+
 export const isSameDay = (date1: Date, date2: Date) => {
     return (
         date1.getFullYear() === date2.getFullYear() &&
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 390cad41b9..124cbba96a 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -127,7 +127,7 @@
         </DropList>
 
         {#if isCloud}
-            <DropList width="18.5" bind:show={showSupport} scrollable={true}>
+            <DropList width="25" bind:show={showSupport} scrollable={true}>
                 <Button text on:click={() => (showSupport = !showSupport)}>
                     <span class="text">Support</span>
                 </Button>

From 908e6eab8f1fad6123186d934173a4e7ed031237 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 16 Dec 2024 13:16:06 +0530
Subject: [PATCH 081/177] fix: padding on addons.

---
 src/lib/components/collapsibleItem.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte
index a16b634608..92dd4e13da 100644
--- a/src/lib/components/collapsibleItem.svelte
+++ b/src/lib/components/collapsibleItem.svelte
@@ -56,9 +56,9 @@
 
 <style lang="scss">
     // TODO: remove once pink is updated
-    .collapsible-item {
+    .collapsible-item:not(.is-info) {
         .collapsible-wrapper {
-            padding-left: 0;
+            padding-left: 0.5rem;
         }
         .collapsible-wrapper.is-disabled {
             cursor: not-allowed;

From 937a8f2391b0ac11e07074f6f3e73ae7c3402ac9 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 16 Dec 2024 17:11:50 +0530
Subject: [PATCH 082/177] fix: custom id not added to messages.

---
 .../messaging/wizard/emailFormList.svelte                 | 8 +++++++-
 .../messaging/wizard/pushFormList.svelte                  | 8 +++++++-
 .../project-[project]/messaging/wizard/smsFormList.svelte | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
index 693d209fb7..fd6bd9a027 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
@@ -10,7 +10,7 @@
         InputTextarea
     } from '$lib/elements/forms';
     import { Pill } from '$lib/elements';
-    import { Modal } from '$lib/components';
+    import { CustomId, Modal } from '$lib/components';
     import { user } from '$lib/stores/user';
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
@@ -113,5 +113,11 @@
                     Message ID
                 </span></Pill>
         </div>
+    {:else}
+        <CustomId
+            bind:show={showCustomId}
+            name="Message"
+            bind:id={$messageParams[$providerType].messageId}
+            fullWidth />
     {/if}
 </FormList>
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
index dc8a5b02a2..6c7e1bafec 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
@@ -38,7 +38,7 @@
         Label
     } from '$lib/elements/forms';
     import { Pill } from '$lib/elements';
-    import { Modal } from '$lib/components';
+    import { CustomId, Modal } from '$lib/components';
     import { user } from '$lib/stores/user';
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
@@ -232,6 +232,12 @@
                         Message ID
                     </span></Pill>
             </div>
+        {:else}
+            <CustomId
+                bind:show={showCustomId}
+                name="Message"
+                bind:id={$messageParams[$providerType].messageId}
+                fullWidth />
         {/if}
     </FormList>
     <PushPhone
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
index 9b315caa18..917a40ad84 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
@@ -2,7 +2,7 @@
     import { messageParams, providerType } from './store';
     import { Button, FormList, InputEmail, InputRadio, InputTextarea } from '$lib/elements/forms';
     import { Pill } from '$lib/elements';
-    import { Modal } from '$lib/components';
+    import { CustomId, Modal } from '$lib/components';
     import { user } from '$lib/stores/user';
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { ID, MessagingProviderType } from '@appwrite.io/console';
@@ -91,6 +91,12 @@
                         Message ID
                     </span></Pill>
             </div>
+        {:else}
+            <CustomId
+                bind:show={showCustomId}
+                name="Message"
+                bind:id={$messageParams[$providerType].messageId}
+                fullWidth />
         {/if}
     </FormList>
     <SMSPhone content={$messageParams[$providerType]['content']} classes="is-only-desktop" />

From aecbf50b483005d087b1faae26ec878fa48cd8b4 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 16 Dec 2024 17:48:44 +0530
Subject: [PATCH 083/177] fix: show a topic may not have targets.

---
 .../messaging/topicsModal.svelte              | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/routes/(console)/project-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[project]/messaging/topicsModal.svelte
index a2aad2b570..9c1e7e2185 100644
--- a/src/routes/(console)/project-[project]/messaging/topicsModal.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topicsModal.svelte
@@ -3,7 +3,7 @@
     import { Button, FormList, InputCheckbox, InputSearch } from '$lib/elements/forms';
     import { Table, TableBody, TableCell, TableRow } from '$lib/elements/table';
     import { sdk } from '$lib/stores/sdk';
-    import { Query, type Models, MessagingProviderType } from '@appwrite.io/console';
+    import { MessagingProviderType, type Models, Query } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
     import { getTotal } from './wizard/store';
     import ProviderType from './providerType.svelte';
@@ -22,6 +22,8 @@
     let selected: Record<string, Models.Topic> = {};
     let hasSelection = false;
 
+    let emptyTopicsExists = false;
+
     function reset() {
         offset = 0;
         search = '';
@@ -36,16 +38,22 @@
         if (!show) return;
         const queries = [Query.limit(5), Query.offset(offset)];
 
-        if (providerType === MessagingProviderType.Email) {
-            queries.push(Query.greaterThan('emailTotal', 0));
-        } else if (providerType === MessagingProviderType.Sms) {
-            queries.push(Query.greaterThan('smsTotal', 0));
-        } else if (providerType === MessagingProviderType.Push) {
-            queries.push(Query.greaterThan('pushTotal', 0));
-        }
-
         const response = await sdk.forProject.messaging.listTopics(queries, search || undefined);
 
+        if (response.total !== 0) {
+            switch (providerType) {
+                case MessagingProviderType.Email:
+                    emptyTopicsExists = response.topics.every((topic) => topic.emailTotal === 0);
+                    break;
+                case MessagingProviderType.Sms:
+                    emptyTopicsExists = response.topics.every((topic) => topic.smsTotal === 0);
+                    break;
+                case MessagingProviderType.Push:
+                    emptyTopicsExists = response.topics.every((topic) => topic.pushTotal === 0);
+                    break;
+            }
+        }
+
         totalResults = response.total;
         topicResultsById = {};
         response.topics.forEach((topic) => {
@@ -94,7 +102,9 @@
     <div class="u-flex u-flex-vertical u-gap-32">
         <p class="text">
             Select existing topics you want to send this message to its targets. The message will be
-            sent only to <ProviderType type={providerType} noIcon /> targets.
+            sent only to
+            <ProviderType type={providerType} noIcon />
+            targets.
         </p>
         <div class="u-flex u-flex-vertical u-gap-16">
             <InputSearch
@@ -103,7 +113,7 @@
                 placeholder="Search for topics"
                 bind:value={search} />
             <div>
-                {#if Object.keys(topicResultsById).length > 0}
+                {#if Object.keys(topicResultsById).length > 0 && !emptyTopicsExists}
                     <div class="u-flex-vertical u-gap-8">
                         <FormList>
                             <Table noMargin noStyles>
@@ -155,9 +165,12 @@
                                 <Button
                                     external
                                     href="https://appwrite.io/docs/products/messaging/topics"
-                                    text>Documentation</Button>
+                                    text
+                                    >Documentation
+                                </Button>
                                 <Button secondary on:click={() => (search = '')}
-                                    >Clear search</Button>
+                                    >Clear search
+                                </Button>
                             </div>
                         </div>
                     </EmptySearch>
@@ -166,15 +179,19 @@
                         <div class="common-section">
                             <div class="u-text-center common-section">
                                 <p class="text u-line-height-1-5">
-                                    You have no topics. Create a topic to see them here.
+                                    You have no topics{emptyTopicsExists
+                                        ? ` with ${providerType.toUpperCase()} targets`
+                                        : ''}. Create a topic to see them here.
                                 </p>
                                 <p class="text u-line-height-1-5">
-                                    Need a hand? Learn more in our <Button
+                                    Need a hand? Learn more in our
+                                    <Button
                                         link
                                         external
                                         href="https://appwrite.io/docs/products/messaging/topics"
-                                        >documentation</Button
-                                    >.
+                                        >documentation
+                                    </Button>
+                                    .
                                 </p>
                             </div>
                         </div>

From d232fb5e92488ee1a9b32f48cb00fe8c272ea314 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 16 Dec 2024 14:23:03 +0100
Subject: [PATCH 084/177] Set todo's for changeing

---
 src/lib/components/support.svelte                               | 2 ++
 src/lib/layout/containerButton.svelte                           | 1 +
 .../organization-[organization]/billing/budgetCap.svelte        | 1 +
 .../(console)/project-[project]/auth/templates/+page.svelte     | 1 +
 .../databases/database-[database]/backups/+page.svelte          | 2 ++
 5 files changed, 7 insertions(+)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 66d922d410..1f57ba233f 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -13,6 +13,7 @@
 
     export let show = false;
 
+    // TODO: fix to use plan details with 'premiumSupport' property
     $: isPaid =
         $organization?.billingPlan === BillingPlan.PRO ||
         $organization?.billingPlan === BillingPlan.SCALE;
@@ -30,6 +31,7 @@
                 </p>
             {/if}
         </div>
+        <!-- TODO: fix to use plan details with 'premiumSupport' property -->
         {#if $organization?.billingPlan === BillingPlan.FREE}
             <Button
                 fullWidth
diff --git a/src/lib/layout/containerButton.svelte b/src/lib/layout/containerButton.svelte
index e0b0512d35..de0c99f2b6 100644
--- a/src/lib/layout/containerButton.svelte
+++ b/src/lib/layout/containerButton.svelte
@@ -6,6 +6,7 @@
     import { organization } from '$lib/stores/organization';
 
     export let title: string;
+    // TODO: this .FREE plan so be checked against the correct plan value, not the actual tier
     export let tooltipContent =
         $organization?.billingPlan === BillingPlan.FREE
             ? `Upgrade to add more ${title.toLocaleLowerCase()}`
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index ee66a00c44..83ee9c25bc 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -59,6 +59,7 @@
                 class="link">Learn more about usage rates.</button>
         </p>
         <svelte:fragment slot="aside">
+            <!--            TODO: show this based on the plan detail for budgetcap-->
             {#if $organization?.billingPlan === BillingPlan.FREE}
                 <Alert type="info">
                     <svelte:fragment slot="title">
diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
index 369080543f..6b10dc0488 100644
--- a/src/routes/(console)/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
@@ -268,6 +268,7 @@
             </Collapsible>
         </svelte:fragment>
     </CardGrid>-->
+    <!--    // TODO change check to plan details emailBranding property-->
     {#if isCloud && $organization?.billingPlan === BillingPlan.FREE}
         <EmailSignature />
     {/if}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
index a8837be156..d449d5a320 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
@@ -24,12 +24,14 @@
 
     let policyCreateError: string;
     let totalPolicies: UserBackupPolicy[] = [];
+    // TODO: check the plan to see if the custom policies are disabled
     let isDisabled = isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE);
 
     export let data: PageData;
 
     $: hasPolicyCreationLimitations = () => {
         // allow when on Pro and no policy exists
+        // TODO: check the plan to see if the custom policies are disabled and limitations
         if ($organization?.billingPlan === BillingPlan.PRO) {
             return data.policies.total > 0;
         } else if ($organization?.billingPlan === BillingPlan.SCALE) {

From 8ce6af3fe3efffc5e78bd903fba3acf69faa9908 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 16 Dec 2024 14:25:45 +0100
Subject: [PATCH 085/177] Add mocknumbers todo

---
 .../project-[project]/auth/security/updateMockNumbers.svelte     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
index 10e230e573..9ceb597583 100644
--- a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
+++ b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
@@ -26,6 +26,7 @@
     $: initialNumbers = $project?.authMockNumbers?.map((num) => ({ ...num })) ?? [];
     $: isSubmitDisabled = JSON.stringify(numbers) === JSON.stringify(initialNumbers);
 
+    //TODO check for plan details on if mocknumbers is allowed
     let isComponentDisabled: boolean =
         isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE);
     let emptyStateTitle: string = isSelfHosted

From 2e93e7142980e6f6368f23e8bd5435491a0f7813 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 16 Dec 2024 15:35:04 +0100
Subject: [PATCH 086/177] Use the selected bytes dropdown for calculating the
 max value

---
 .../bucket-[bucket]/settings/updateMaxFileSize.svelte      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index a345f525da..9509002bda 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -16,6 +16,11 @@
     const service = currentPlan['fileSize'];
     const { value, unit, baseValue, units } = createByteUnitPair($bucket.maximumFileSize, 1000);
     const options = units.map((v) => ({ label: v.name, value: v.name }));
+    $: selectedUnit = $unit;
+
+    $: maxValue = function formMaxFileSize() {
+        return (service * 1000 * 1000) / units.find((unit) => unit.name === selectedUnit).value;
+    };
 
     function updateMaxSize() {
         updateBucket(
@@ -64,7 +69,7 @@
                     disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}
                     placeholder={$bucket.maximumFileSize.toString()}
                     min={0}
-                    max={isCloud ? service : Infinity}
+                    max={isCloud ? maxValue() : Infinity}
                     bind:value={$value} />
                 <InputSelect
                     id="bytes"

From eb064bd84129c5daf2d905155436906f70b1f84a Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 17 Dec 2024 10:54:53 +0530
Subject: [PATCH 087/177] add: autofocus.

---
 .../project-[project]/messaging/wizard/pushFormList.svelte       | 1 +
 .../project-[project]/messaging/wizard/smsFormList.svelte        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
index 6c7e1bafec..3316183d1b 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
@@ -234,6 +234,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Message"
                 bind:id={$messageParams[$providerType].messageId}
diff --git a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
index 917a40ad84..091b8f3fbb 100644
--- a/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
+++ b/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
@@ -93,6 +93,7 @@
             </div>
         {:else}
             <CustomId
+                autofocus
                 bind:show={showCustomId}
                 name="Message"
                 bind:id={$messageParams[$providerType].messageId}

From e1fa344d3972a7d681ac9dde2548013d849f028d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 17 Dec 2024 11:09:18 +0530
Subject: [PATCH 088/177] address comments, fix colors.

---
 src/lib/components/support.svelte | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 8ed77f6ec4..08e96dbbbb 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -61,7 +61,7 @@
     {#each supportOptions as option}
         <Card
             isTile
-            class="restore-modal-inner-card u-flex u-flex-vertical u-gap-12"
+            class="support-option-card u-flex u-flex-vertical u-gap-12"
             style="border-radius: var(--border-radius-small, 8px); padding: 0.65rem;">
             <div class="u-flex u-flex-vertical u-gap-4">
                 <h4 class="body-text-2 u-bold">{option.label}</h4>
@@ -142,18 +142,21 @@
     </div>
 </section>
 
-<style>
+<style lang="scss">
     .support-section {
         gap: 1rem;
         padding: 20px;
         display: flex;
         flex-direction: column;
-    }
 
-    @media (max-width: 768px) {
-        .support-section {
+        @media (max-width: 768px) {
             gap: 1.25rem;
             padding: 0.5rem;
         }
     }
+
+    :global(.theme-light .support-option-card) {
+        border: 1px solid var(--color-border-neutral, #ededf0);
+        background: var(--color-bgColor-neutral-default, #fafafb);
+    }
 </style>

From 94378a48a32a9b897a8dde40355d9230f1870de7 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 17 Dec 2024 14:06:41 +0530
Subject: [PATCH 089/177] ci: empty commit


From 25f5bd036ac13bd9d2a16d6cde710b6660c4d08f Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 17 Dec 2024 14:08:03 +0530
Subject: [PATCH 090/177] ci: empty commit


From e4f5de6645dae7394f22da7dc1bc1dfd6aa4af77 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 17 Dec 2024 14:14:39 +0530
Subject: [PATCH 091/177] ci: empty commit


From bfa142dc55b4e6983fc1a3b222f64d42c13d9e84 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Wed, 18 Dec 2024 09:30:37 +0900
Subject: [PATCH 092/177] Add specification selector into wizard

---
 src/lib/wizards/functions/cover.svelte        |  3 +-
 .../wizards/functions/createTemplate.svelte   |  6 ++-
 .../steps/templateConfiguration.svelte        | 40 +++++++++++++++++++
 src/lib/wizards/functions/store.ts            |  1 +
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 84f47a74c0..28452bf7bd 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -19,7 +19,8 @@
             repositoryBehaviour: 'new',
             repositoryName: template.id,
             repositoryPrivate: true,
-            repositoryId: null
+            repositoryId: null,
+            specification: null
         });
         wizard.start(CreateTemplate);
     }
diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte
index 355a62e47f..6017fc46df 100644
--- a/src/lib/wizards/functions/createTemplate.svelte
+++ b/src/lib/wizards/functions/createTemplate.svelte
@@ -58,7 +58,8 @@
                 $template.providerRepositoryId || undefined,
                 $template.providerOwner || undefined,
                 runtimeDetail.providerRootDirectory || undefined,
-                $template.providerVersion || undefined
+                $template.providerVersion || undefined,
+                $templateConfig.specification || undefined
             );
 
             if ($templateConfig.variables) {
@@ -78,7 +79,8 @@
                 customId: !!response.$id,
                 runtime: response.runtime,
                 deployment_type: $templateConfig.repositoryBehaviour,
-                scopes: $templateConfig.scopes
+                scopes: $templateConfig.scopes,
+                specification: $templateConfig.specification
             });
             resetState();
         } catch (error) {
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index 481cd5026d..07c35cd912 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -4,6 +4,7 @@
     import { FormList, InputSelect, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
     import { runtimesList } from '$lib/stores/runtimes';
+    import { specificationsList } from '$lib/stores/specifications';
     import { template, templateConfig } from '../store';
 
     let showCustomId = false;
@@ -12,6 +13,10 @@
         if (!$templateConfig.runtime) {
             throw new Error('Please select a runtime.');
         }
+
+        if (!$templateConfig.specification) {
+            throw new Error('Please select a specification.');
+        }
     }
 
     async function loadRuntimes() {
@@ -27,6 +32,22 @@
 
         return options;
     }
+
+    async function loadSpecifications() {
+        const specificationOptions = (await $specificationsList).specifications.map((size) => ({
+            label:
+                `${size.cpus} CPU, ${size.memory} MB RAM` +
+                (!size.enabled ? ` (Upgrade to use this)` : ''),
+            value: size.slug,
+            disabled: !size.enabled
+        }));
+
+        if (!$templateConfig.specification && specificationOptions.length > 0) {
+            $templateConfig.specification = specificationOptions[0].value;
+        }
+
+        return specificationOptions;
+    }
 </script>
 
 <WizardStep {beforeSubmit}>
@@ -61,6 +82,25 @@
                 {options}
                 bind:value={$templateConfig.runtime} />
         {/await}
+        {#await loadSpecifications()}
+            <InputSelect
+                label="CPU and memory"
+                id="specification"
+                placeholder="Loading specifications..."
+                required
+                disabled
+                options={[]}
+                value={null} />
+        {:then specificationOptions}
+            <InputSelect
+                label="CPU and memory"
+                id="specification"
+                placeholder="Select specification"
+                required
+                disabled={specificationOptions.length < 1}
+                options={specificationOptions}
+                bind:value={$templateConfig.specification} />
+        {/await}
     </FormList>
 
     <FormList class="u-margin-block-start-24">
diff --git a/src/lib/wizards/functions/store.ts b/src/lib/wizards/functions/store.ts
index 205c2847e5..6ae23d6094 100644
--- a/src/lib/wizards/functions/store.ts
+++ b/src/lib/wizards/functions/store.ts
@@ -15,6 +15,7 @@ export const templateConfig = writable<{
     repositoryId: string;
     execute?: boolean;
     scopes?: string[];
+    specification?: string;
 }>();
 export const repository = writable<Models.ProviderRepository>();
 export const installation = writable<Models.Installation>();

From 21f3d9453774f9565d2ec7816af6a40230ba4a6e Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Wed, 18 Dec 2024 12:36:51 +0900
Subject: [PATCH 093/177] Add create manual

---
 src/lib/wizards/functions/createManual.svelte | 13 ++++++++++++-
 .../functions/steps/manualDetails.svelte      | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/createManual.svelte b/src/lib/wizards/functions/createManual.svelte
index c774c35165..6bcfeba33d 100644
--- a/src/lib/wizards/functions/createManual.svelte
+++ b/src/lib/wizards/functions/createManual.svelte
@@ -37,7 +37,18 @@
                 undefined,
                 undefined,
                 $createFunction.entrypoint,
-                $createFunction.commands || undefined
+                $createFunction.commands || undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                $createFunction.specification
             );
             await sdk.forProject.functions.createDeployment(
                 response.$id,
diff --git a/src/lib/wizards/functions/steps/manualDetails.svelte b/src/lib/wizards/functions/steps/manualDetails.svelte
index 55fe5655c3..b361dfdd18 100644
--- a/src/lib/wizards/functions/steps/manualDetails.svelte
+++ b/src/lib/wizards/functions/steps/manualDetails.svelte
@@ -6,16 +6,26 @@
     import { onMount } from 'svelte';
     import { createFunction } from '../store';
     import { runtimesList } from '$lib/stores/runtimes';
+    import { specificationsList } from '$lib/stores/specifications';
 
     let showCustomId = false;
 
     let options = [];
+    let specificationOptions = [];
 
     onMount(async () => {
         options = (await $runtimesList).runtimes.map((runtime) => ({
             label: `${runtime.name} - ${runtime.version}`,
             value: runtime.$id
         }));
+
+        specificationOptions = (await $specificationsList).specifications.map((size) => ({
+            label:
+                `${size.cpus} CPU, ${size.memory} MB RAM` +
+                (!size.enabled ? ` (Upgrade to use this)` : ''),
+            value: size.slug,
+            disabled: !size.enabled
+        }));
     });
 </script>
 
@@ -39,6 +49,15 @@
             {options}
             required />
 
+        <InputSelect
+            label="CPU and memory"
+            id="specification"
+            placeholder="Select specification"
+            required
+            disabled={specificationOptions.length < 1}
+            options={specificationOptions}
+            bind:value={$createFunction.specification} />
+
         {#if !showCustomId}
             <div>
                 <Pill button on:click={() => (showCustomId = !showCustomId)}>

From c95befed8615eda0e2a2cc2c284349372e8b84f1 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Wed, 18 Dec 2024 16:38:28 +0900
Subject: [PATCH 094/177] Add tooltip to specifications

---
 .../components/specificationsTooltip.svelte   | 30 +++++++++++++++++++
 .../steps/templateConfiguration.svelte        |  7 +++++
 2 files changed, 37 insertions(+)
 create mode 100644 src/lib/wizards/functions/components/specificationsTooltip.svelte

diff --git a/src/lib/wizards/functions/components/specificationsTooltip.svelte b/src/lib/wizards/functions/components/specificationsTooltip.svelte
new file mode 100644
index 0000000000..701989a4ed
--- /dev/null
+++ b/src/lib/wizards/functions/components/specificationsTooltip.svelte
@@ -0,0 +1,30 @@
+<div class="u-flex-vertical u-gap-16">
+    <div class="u-flex-vertical u-gap-8">
+        <p>Additional CPU and RAM are available for Pro and Scale teams.</p>
+        <p>
+            <a
+                class="link"
+                target="_blank"
+                rel="noopener noreferrer"
+                href="https://appwrite.io/docs/products/functions/specificatinos">Learn more</a>
+        </p>
+    </div>
+</div>
+
+<style>
+    div {
+        color: hsl(var(--color-neutral-50));
+        line-height: 1.25rem;
+        &:first-child {
+            color: hsl(var(--color-neutral-70));
+        }
+    }
+
+    :global(.theme-dark) div {
+        color: hsl(var(--color-neutral-20));
+
+        &:first-child {
+            color: hsl(var(--color-neutral-10));
+        }
+    }
+</style>
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index 07c35cd912..fbce477fb5 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -5,7 +5,11 @@
     import { WizardStep } from '$lib/layout';
     import { runtimesList } from '$lib/stores/runtimes';
     import { specificationsList } from '$lib/stores/specifications';
+    import { BillingPlan } from '$lib/constants';
+    import SpecificationsTooltip from '../components/specificationsTooltip.svelte';
     import { template, templateConfig } from '../store';
+    import { organization } from '$lib/stores/organization';
+    import { isCloud } from '$lib/system';
 
     let showCustomId = false;
 
@@ -99,6 +103,9 @@
                 required
                 disabled={specificationOptions.length < 1}
                 options={specificationOptions}
+                popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
+                    ? SpecificationsTooltip
+                    : null}
                 bind:value={$templateConfig.specification} />
         {/await}
     </FormList>

From d9a84726517612f66c2b51733846888b73448150 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Wed, 18 Dec 2024 11:11:13 +0100
Subject: [PATCH 095/177] Inform the user to first add a billing address to
 their account

---
 .../billing/replaceAddress.svelte                   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 0eb06bbef7..2df6d1bc2c 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
-    import { Modal, RadioBoxes } from '$lib/components';
+    import { Alert, Modal, RadioBoxes } from '$lib/components';
     import { Button, FormItem, FormList, InputSelect, InputText } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
     import { organization } from '$lib/stores/organization';
@@ -10,6 +10,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
+    import { base } from '$app/paths';
 
     export let show = false;
     let addresses: AddressesList;
@@ -185,10 +186,18 @@
                 </FormList>
             </RadioBoxes>
         </FormList>
+    {:else}
+        <Alert
+            >There are no billing addresses linked to your account, please <a
+                href={`${base}/account/payments`}
+                class="link">add one</a> first</Alert>
     {/if}
     <svelte:fragment slot="footer">
         <Button text on:click={() => (show = false)}>Cancel</Button>
-        <Button secondary submit disabled={selectedAddress === $organization.billingAddressId}>
+        <Button
+            secondary
+            submit
+            disabled={selectedAddress === $organization.billingAddressId || !addresses?.total}>
             Save
         </Button>
     </svelte:fragment>

From 06179684b32004b17651081ab7a22c00ed004c8d Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 18 Dec 2024 12:45:17 +0100
Subject: [PATCH 096/177] test: update e2e endpoint

---
 playwright.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright.config.ts b/playwright.config.ts
index 2b7c941e4c..3f39d87611 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -12,7 +12,7 @@ const config: PlaywrightTestConfig = {
     webServer: {
         timeout: 120000,
         env: {
-            PUBLIC_APPWRITE_ENDPOINT: 'https://console-testing.appwrite.org/v1',
+            PUBLIC_APPWRITE_ENDPOINT: 'https://console-testing-2.appwrite.org/v1',
             PUBLIC_CONSOLE_MODE: 'cloud',
             PUBLIC_STRIPE_KEY:
                 'pk_test_51LT5nsGYD1ySxNCyd7b304wPD8Y1XKKWR6hqo6cu3GIRwgvcVNzoZv4vKt5DfYXL1gRGw4JOqE19afwkJYJq1g3K004eVfpdWn'

From 3ee44cb4573d05234057c9be17fbe55da75db35d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Wed, 18 Dec 2024 18:22:16 +0530
Subject: [PATCH 097/177] address comments.

---
 .../function-[function]/deployment-[deployment]/+page.svelte    | 2 +-
 .../functions/function-[function]/deploymentSource.svelte       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 457369eec7..734e4f3062 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -26,7 +26,7 @@
     let showActivate = false;
 
     let enableScrollButton = false;
-    let codePanelContent: HTMLElement; /* var to avoid frequent querySelector calls */
+    let codePanelContent: HTMLElement;
 
     function handleActivate() {
         invalidate(Dependencies.DEPLOYMENTS);
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte
index b07d96d974..c81332f21f 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte
@@ -21,7 +21,7 @@
                 icon="github"
                 iconStyle="font-size:20px">
                 <Trim alternativeTrim>
-                    <span style="white-space: pre-wrap">
+                    <span style:white-space="pre-wrap">
                         {deployment.providerRepositoryOwner}/{deployment.providerRepositoryName}
                     </span>
                 </Trim>

From 65d477f65940b0a8708f3f0b04879416a02a37a0 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 10:39:28 +0100
Subject: [PATCH 098/177] Use button instead of link

---
 .../billing/replaceAddress.svelte                     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 2df6d1bc2c..e322dfe0f9 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -11,6 +11,8 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
     import { base } from '$app/paths';
+    import { wizard } from '$lib/stores/wizard';
+    import { redirect } from '@sveltejs/kit';
 
     export let show = false;
     let addresses: AddressesList;
@@ -188,9 +190,12 @@
         </FormList>
     {:else}
         <Alert
-            >There are no billing addresses linked to your account, please <a
-                href={`${base}/account/payments`}
-                class="link">add one</a> first</Alert>
+            buttons={[
+                {
+                    slot: 'Add address',
+                    href: `${base}/account/payments`
+                }
+            ]}>There are no billing addresses linked to your account.</Alert>
     {/if}
     <svelte:fragment slot="footer">
         <Button text on:click={() => (show = false)}>Cancel</Button>

From f7d40f764d1a9ba5e6e868bf4f5a4b7da783325f Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 10:41:40 +0100
Subject: [PATCH 099/177] Remove unused imports

---
 .../organization-[organization]/billing/replaceAddress.svelte   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index e322dfe0f9..a57cecf48b 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -11,8 +11,6 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
     import { base } from '$app/paths';
-    import { wizard } from '$lib/stores/wizard';
-    import { redirect } from '@sveltejs/kit';
 
     export let show = false;
     let addresses: AddressesList;

From db0519f519af4d11cae68af953892573cc58eb76 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 15:33:21 +0100
Subject: [PATCH 100/177] Remove todo

---
 src/lib/layout/containerButton.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/layout/containerButton.svelte b/src/lib/layout/containerButton.svelte
index de0c99f2b6..e0b0512d35 100644
--- a/src/lib/layout/containerButton.svelte
+++ b/src/lib/layout/containerButton.svelte
@@ -6,7 +6,6 @@
     import { organization } from '$lib/stores/organization';
 
     export let title: string;
-    // TODO: this .FREE plan so be checked against the correct plan value, not the actual tier
     export let tooltipContent =
         $organization?.billingPlan === BillingPlan.FREE
             ? `Upgrade to add more ${title.toLocaleLowerCase()}`

From 850613b0cf6e87ba69375c2edfc0d86018fd834e Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 15:33:26 +0100
Subject: [PATCH 101/177] Add typings

---
 src/lib/sdk/billing.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index c2127ac7f7..811dce6d4e 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -282,6 +282,10 @@ export type Plan = {
     isAvailable: boolean;
     selfService: boolean;
     premiumSupport: boolean;
+    budgeting: boolean;
+    supportsMockNumbers: boolean;
+    backupsEnabled: boolean;
+    backupPolicies: number;
 };
 
 export type PlansInfo = {

From 2432635fbaf5dc6bfda215856eb925eae2f93af9 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 16:05:35 +0100
Subject: [PATCH 102/177] Add feature flag checks

---
 src/lib/sdk/billing.ts                        |  1 +
 .../billing/budgetCap.svelte                  |  5 ++---
 .../(console)/project-[project]/+layout.ts    |  6 +++++-
 .../auth/security/updateMockNumbers.svelte    |  6 ++----
 .../auth/templates/+page.svelte               |  6 ++----
 .../database-[database]/backups/+page.svelte  | 17 ++++++-----------
 .../backups/containerHeader.svelte            | 19 +++++++------------
 7 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 811dce6d4e..8cb3b58a92 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -286,6 +286,7 @@ export type Plan = {
     supportsMockNumbers: boolean;
     backupsEnabled: boolean;
     backupPolicies: number;
+    emailBranding: boolean;
 };
 
 export type PlansInfo = {
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index cfec9bea01..e313d59a56 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -6,7 +6,7 @@
     import { Button, Form, FormList, InputNumber, InputSwitch } from '$lib/elements/forms';
     import { showUsageRatesModal, upgradeURL } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import { organization } from '$lib/stores/organization';
+    import { organization, currentPlan } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
 
@@ -59,8 +59,7 @@
                 class="link">Learn more about usage rates.</button>
         </p>
         <svelte:fragment slot="aside">
-            <!--            TODO: show this based on the plan detail for budgetcap-->
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if !$currentPlan.budgeting}
                 <Alert type="info">
                     <svelte:fragment slot="title">
                         Budget caps are a Pro plan feature
diff --git a/src/routes/(console)/project-[project]/+layout.ts b/src/routes/(console)/project-[project]/+layout.ts
index 57df9d5285..018462d75a 100644
--- a/src/routes/(console)/project-[project]/+layout.ts
+++ b/src/routes/(console)/project-[project]/+layout.ts
@@ -7,9 +7,11 @@ import { failedInvoice } from '$lib/stores/billing';
 import { isCloud } from '$lib/system';
 import type { Organization } from '$lib/stores/organization';
 import { defaultRoles, defaultScopes } from '$lib/constants';
+import type { Plan } from '$lib/sdk/billing';
 
 export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.PROJECT);
+    let currentPlan: Plan = null;
 
     try {
         const project = await sdk.forConsole.projects.get(params.project);
@@ -27,6 +29,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         let roles = isCloud ? [] : defaultRoles;
         let scopes = isCloud ? [] : defaultScopes;
         if (isCloud) {
+            currentPlan = await sdk.forConsole.billing.getPlan(project.teamId);
             const res = await sdk.forConsole.billing.getRoles(project.teamId);
             roles = res.roles;
             scopes = res.scopes;
@@ -39,7 +42,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
             project,
             organization,
             roles,
-            scopes
+            scopes,
+            currentPlan
         };
     } catch (e) {
         error(e.code, e.message);
diff --git a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
index 9ceb597583..cd1830a267 100644
--- a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
+++ b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
@@ -9,8 +9,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
-    import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { currentPlan } from '$lib/stores/organization';
     import { isCloud, isSelfHosted } from '$lib/system';
     import MockNumbersLight from './mock-numbers-light.png';
     import MockNumbersDark from './mock-numbers-dark.png';
@@ -26,9 +25,8 @@
     $: initialNumbers = $project?.authMockNumbers?.map((num) => ({ ...num })) ?? [];
     $: isSubmitDisabled = JSON.stringify(numbers) === JSON.stringify(initialNumbers);
 
-    //TODO check for plan details on if mocknumbers is allowed
     let isComponentDisabled: boolean =
-        isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE);
+        isSelfHosted || (isCloud && !$currentPlan.supportsMockNumbers);
     let emptyStateTitle: string = isSelfHosted
         ? 'Available on Appwrite Cloud'
         : 'Upgrade to add mock phone numbers';
diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
index 6b10dc0488..278fb0ca7c 100644
--- a/src/routes/(console)/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
@@ -50,8 +50,7 @@
     // import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './store';
     import { baseEmailTemplate, emailTemplate } from './store';
     import { Button } from '$lib/elements/forms';
-    import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { currentPlan } from '$lib/stores/organization';
     import EmailSignature from './emailSignature.svelte';
     import { isCloud } from '$lib/system';
     import type {
@@ -268,8 +267,7 @@
             </Collapsible>
         </svelte:fragment>
     </CardGrid>-->
-    <!--    // TODO change check to plan details emailBranding property-->
-    {#if isCloud && $organization?.billingPlan === BillingPlan.FREE}
+    {#if isCloud && !$currentPlan.emailBranding}
         <EmailSignature />
     {/if}
 </Container>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
index d449d5a320..f7d3b0bb22 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
@@ -11,9 +11,9 @@
     import { addNotification, dismissAllNotifications } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { invalidate } from '$app/navigation';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { isCloud, isSelfHosted } from '$lib/system';
-    import { organization } from '$lib/stores/organization';
+    import { currentPlan } from '$lib/stores/organization';
     import { onMount } from 'svelte';
     import { feedback } from '$lib/stores/feedback';
     import { cronExpression, type UserBackupPolicy } from '$lib/helpers/backups';
@@ -24,19 +24,12 @@
 
     let policyCreateError: string;
     let totalPolicies: UserBackupPolicy[] = [];
-    // TODO: check the plan to see if the custom policies are disabled
-    let isDisabled = isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE);
+    let isDisabled = isSelfHosted || (isCloud && !$currentPlan.backupsEnabled);
 
     export let data: PageData;
 
     $: hasPolicyCreationLimitations = () => {
-        // allow when on Pro and no policy exists
-        // TODO: check the plan to see if the custom policies are disabled and limitations
-        if ($organization?.billingPlan === BillingPlan.PRO) {
-            return data.policies.total > 0;
-        } else if ($organization?.billingPlan === BillingPlan.SCALE) {
-            return false;
-        }
+        return data.policies.total >= $currentPlan.backupPolicies;
     };
 
     const showFeedbackNotification = () => {
@@ -187,6 +180,8 @@
                     buttonType="secondary"
                     buttonDisabled={isDisabled}
                     hasLimitations={hasPolicyCreationLimitations()}
+                    maxPolicies={$currentPlan.backupPolicies}
+                    policiesCreated={data.policies.total}
                     buttonMethod={() => {
                         $showCreatePolicy = true;
                         trackEvent('click_policy_create');
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
index a01b1c5819..ce79b0d158 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -4,14 +4,13 @@
     import { Pill } from '$lib/elements';
     import { wizard } from '$lib/stores/wizard';
     import SupportWizard from '$routes/(console)/supportWizard.svelte';
-    import { BillingPlan } from '$lib/constants';
-    import { organization } from '$lib/stores/organization';
 
     export let isFlex = true;
     export let title: string;
 
     export let buttonText: string = null;
-    export let hasLimitations: boolean = true;
+    export let policiesCreated: number = 0;
+    export let maxPolicies: number = 0;
     export let buttonMethod: () => void = null;
     export let buttonEvent: string = buttonText?.toLocaleLowerCase();
     export let buttonDisabled = false;
@@ -27,16 +26,16 @@
     <div class="u-flex u-cross-child-center u-cross-center u-gap-12">
         <div class="body-text-1 u-bold backups-title">{title}</div>
 
-        {#if hasLimitations && $organization.billingPlan === BillingPlan.PRO}
+        {#if title === 'Policies' && policiesCreated >= maxPolicies}
             <div style="height: 40px; padding-block-start: 4px">
                 <DropList bind:show={showDropdown} width="16">
                     <Pill button on:click={() => (showDropdown = true)}>
-                        <span class="icon-info" />1/1 created
+                        <span class="icon-info" />{policiesCreated}/{maxPolicies} created
                     </Pill>
                     <svelte:fragment slot="list">
                         <slot name="tooltip">
                             <span>
-                                You are limited to one policy on Pro plan.
+                                You are limited to one policy on your plan.
                                 <button
                                     class="u-underline"
                                     on:click={() => {
@@ -52,14 +51,10 @@
         {/if}
     </div>
 
-    {#if !hasLimitations}
+    {#if title === 'Backups' || policiesCreated < maxPolicies}
         <Button
             event={buttonEvent}
-            on:click={hasLimitations
-                ? () => {
-                      showDropdown = true;
-                  }
-                : buttonMethod}
+            on:click={buttonMethod}
             disabled={buttonDisabled}
             text={buttonType === 'text'}
             secondary={buttonType === 'secondary'}>

From 01e8fc902aeff45f5b069a26f157fc6a64612950 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 16:06:37 +0100
Subject: [PATCH 103/177] Remove unused limitation check

---
 .../databases/database-[database]/backups/+page.svelte       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
index f7d3b0bb22..62fbb33b36 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
@@ -28,10 +28,6 @@
 
     export let data: PageData;
 
-    $: hasPolicyCreationLimitations = () => {
-        return data.policies.total >= $currentPlan.backupPolicies;
-    };
-
     const showFeedbackNotification = () => {
         let counter = localStorage.getItem('createBackupsCounter');
         const parsedCounter = counter ? parseInt(counter, 10) : 0;
@@ -179,7 +175,6 @@
                     buttonEvent="create_backup"
                     buttonType="secondary"
                     buttonDisabled={isDisabled}
-                    hasLimitations={hasPolicyCreationLimitations()}
                     maxPolicies={$currentPlan.backupPolicies}
                     policiesCreated={data.policies.total}
                     buttonMethod={() => {

From da949235fe4b89b806c160b5ee08b175f2af1530 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 16:38:38 +0100
Subject: [PATCH 104/177] Remove unused prop, and correct email branding value
 check

---
 .../(console)/project-[project]/auth/templates/+page.svelte     | 2 +-
 .../databases/database-[database]/backups/+page.svelte          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
index 278fb0ca7c..e030a535d2 100644
--- a/src/routes/(console)/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
@@ -267,7 +267,7 @@
             </Collapsible>
         </svelte:fragment>
     </CardGrid>-->
-    {#if isCloud && !$currentPlan.emailBranding}
+    {#if isCloud && $currentPlan.emailBranding}
         <EmailSignature />
     {/if}
 </Container>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
index 62fbb33b36..e4359ad0fd 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
@@ -194,7 +194,6 @@
                     buttonText="Manual backup"
                     buttonEvent="create_backup"
                     buttonType="secondary"
-                    hasLimitations={false}
                     buttonDisabled={isDisabled}
                     buttonMethod={() => {
                         $showCreateBackup = true;

From 557dbba25d986b955d309c9812646486c4d11b75 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Fri, 20 Dec 2024 10:56:07 +0900
Subject: [PATCH 105/177] Add tooltips for free users

---
 .../components/specificationsTooltip.svelte   | 40 ++++++++-----------
 .../functions/steps/manualDetails.svelte      |  7 ++++
 .../settings/updateRuntime.svelte             |  8 +++-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/lib/wizards/functions/components/specificationsTooltip.svelte b/src/lib/wizards/functions/components/specificationsTooltip.svelte
index 701989a4ed..7b870f3765 100644
--- a/src/lib/wizards/functions/components/specificationsTooltip.svelte
+++ b/src/lib/wizards/functions/components/specificationsTooltip.svelte
@@ -1,30 +1,24 @@
+<script lang="ts">
+    import { Button } from '$lib/elements/forms';
+    import { upgradeURL } from '$lib/stores/billing';
+</script>
+
 <div class="u-flex-vertical u-gap-16">
-    <div class="u-flex-vertical u-gap-8">
-        <p>Additional CPU and RAM are available for Pro and Scale teams.</p>
-        <p>
-            <a
-                class="link"
-                target="_blank"
-                rel="noopener noreferrer"
-                href="https://appwrite.io/docs/products/functions/specificatinos">Learn more</a>
-        </p>
+    <p>Additional CPU and RAM are available for Pro and Scale teams.</p>
+    <div class="u-flex u-gap-8 u-cross-center">
+        <a
+            class="u-bold u-block"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://appwrite.io/docs/products/functions/specifications">Learn more</a>
+        <Button href={$upgradeURL} secondary fullWidthMobile event={'specifications_cta_upgrade'}>
+            <span class="text">Upgrade Plan</span>
+        </Button>
     </div>
 </div>
 
 <style>
-    div {
-        color: hsl(var(--color-neutral-50));
-        line-height: 1.25rem;
-        &:first-child {
-            color: hsl(var(--color-neutral-70));
-        }
-    }
-
-    :global(.theme-dark) div {
-        color: hsl(var(--color-neutral-20));
-
-        &:first-child {
-            color: hsl(var(--color-neutral-10));
-        }
+    a {
+        flex-grow: 1;
     }
 </style>
diff --git a/src/lib/wizards/functions/steps/manualDetails.svelte b/src/lib/wizards/functions/steps/manualDetails.svelte
index b361dfdd18..9167474d0e 100644
--- a/src/lib/wizards/functions/steps/manualDetails.svelte
+++ b/src/lib/wizards/functions/steps/manualDetails.svelte
@@ -7,6 +7,10 @@
     import { createFunction } from '../store';
     import { runtimesList } from '$lib/stores/runtimes';
     import { specificationsList } from '$lib/stores/specifications';
+    import { isCloud } from '$lib/system';
+    import { organization } from '$lib/stores/organization';
+    import { BillingPlan } from '$lib/constants';
+    import SpecificationsTooltip from '../components/specificationsTooltip.svelte';
 
     let showCustomId = false;
 
@@ -56,6 +60,9 @@
             required
             disabled={specificationOptions.length < 1}
             options={specificationOptions}
+            popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
+                ? SpecificationsTooltip
+                : null}
             bind:value={$createFunction.specification} />
 
         {#if !showCustomId}
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
index c447e6e361..a151d3e7a7 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -3,7 +3,7 @@
     import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { CardGrid, Heading } from '$lib/components';
-    import { Dependencies } from '$lib/constants';
+    import { BillingPlan, Dependencies } from '$lib/constants';
     import { Button, Form, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
@@ -14,6 +14,9 @@
     import { runtimesList } from '$lib/stores/runtimes';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { Runtime } from '@appwrite.io/console';
+    import { isCloud } from '$lib/system';
+    import { organization } from '$lib/stores/organization';
+    import SpecificationsTooltip from '$lib/wizards/functions/components/specificationsTooltip.svelte';
 
     const functionId = $page.params.function;
     let runtime: string = null;
@@ -105,6 +108,9 @@
                     placeholder="Select runtime specification"
                     bind:value={specification}
                     options={specificationOptions}
+                    popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
+                        ? SpecificationsTooltip
+                        : null}
                     required
                     hideRequired />
             </FormList>

From 855bf18e3c86465c72ecedba386c3e292fc6563a Mon Sep 17 00:00:00 2001
From: Ernst Mulders <ernst.mulders@gmail.com>
Date: Fri, 20 Dec 2024 10:39:43 +0100
Subject: [PATCH 106/177] Update
 src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte

Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
---
 .../database-[database]/backups/containerHeader.svelte          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
index ce79b0d158..d289bab625 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -35,7 +35,7 @@
                     <svelte:fragment slot="list">
                         <slot name="tooltip">
                             <span>
-                                You are limited to one policy on your plan.
+                                You are limited to {maxPolicies} policy on your plan.
                                 <button
                                     class="u-underline"
                                     on:click={() => {

From 89b4496313a3211f6c2b84264157d5f23e1b83df Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 20 Dec 2024 11:02:02 +0100
Subject: [PATCH 107/177] Add check to which plan the org is changing when
 applying the credits

---
 src/routes/(console)/apply-credit/+page.svelte | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index 884fd1763e..d39827c037 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -189,6 +189,18 @@
     $: selectedOrg = $organizationList?.teams?.find(
         (team) => team.$id === selectedOrgId
     ) as Organization;
+
+    function getNewBillingPlan(organization: Organization): BillingPlan {
+        if (organization?.billingPlan === BillingPlan.SCALE) {
+            return BillingPlan.SCALE;
+        } else if (campaign?.plan) {
+            return campaign.plan;
+        } else {
+            return BillingPlan.PRO;
+        }
+    }
+
+    $: billingPlan = getNewBillingPlan(selectedOrg);
 </script>
 
 <svelte:head>

From 94576911f51a5f21f01f583a35dfd9b9d420c8e0 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 20 Dec 2024 11:22:15 +0100
Subject: [PATCH 108/177] Fix typo

---
 src/lib/components/billing/estimatedTotalBox.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/billing/estimatedTotalBox.svelte b/src/lib/components/billing/estimatedTotalBox.svelte
index b7ab73af7d..a6c8db6a7c 100644
--- a/src/lib/components/billing/estimatedTotalBox.svelte
+++ b/src/lib/components/billing/estimatedTotalBox.svelte
@@ -64,7 +64,7 @@
     </span>
 
     <p class="text u-margin-block-start-16">
-        You'll pay <span class="u-bold">{formatCurrency(estimatedTotal)}</span> now, with our first
+        You'll pay <span class="u-bold">{formatCurrency(estimatedTotal)}</span> now, with your first
         billing cycle starting on
         <span class="u-bold"
             >{!currentPlan.trialDays

From 8c36c6202aab9f2d0b52e474ce390667eac35cfd Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 20 Dec 2024 11:24:04 +0100
Subject: [PATCH 109/177] Fix education plan not showing change to pro plan
 when applying credits

---
 src/routes/(console)/apply-credit/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index d39827c037..9bc53d5cbd 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -280,7 +280,7 @@
                     </div>
                 </div>
             {/if}
-            {#if selectedOrg?.$id && selectedOrg?.billingPlan !== BillingPlan.FREE}
+            {#if selectedOrg?.$id && selectedOrg?.billingPlan !== BillingPlan.FREE && selectedOrg?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
                 <section
                     class="card u-margin-block-start-24"
                     style:--p-card-padding="1.5rem"

From 3b9138c21ff372a677ee9bc477df01e2b97736ec Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 20 Dec 2024 13:40:50 +0100
Subject: [PATCH 110/177] Filter the new users count to not include future days

---
 .../usage/[[invoice]]/+page.svelte                          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 82c211c198..287d24e611 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -143,9 +143,11 @@
         <Heading tag="h6" size="7">Users</Heading>
 
         <p class="text">The total number of users across all projects in your organization.</p>
-
         <svelte:fragment slot="aside">
             {#if data.organizationUsage.users}
+                {@const users = data.organizationUsage.users.filter(
+                    (user) => new Date(user.date) < new Date()
+                )}
                 {@const current = data.organizationUsage.usersTotal}
                 {@const max = getServiceLimit('users', tier, plan)}
                 <ProgressBarBig
@@ -169,7 +171,7 @@
                             {
                                 name: 'Users',
                                 data: accumulateFromEndingTotal(
-                                    data.organizationUsage.users,
+                                    users,
                                     data.organizationUsage.usersTotal
                                 )
                             }

From 9a841825a2acb0add94684e37deba6f51273efb5 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 20 Dec 2024 14:00:09 +0100
Subject: [PATCH 111/177] Move users usage data tot .ts

---
 .../usage/[[invoice]]/+page.svelte                           | 5 +----
 .../organization-[organization]/usage/[[invoice]]/+page.ts   | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 287d24e611..636f88fddb 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -145,9 +145,6 @@
         <p class="text">The total number of users across all projects in your organization.</p>
         <svelte:fragment slot="aside">
             {#if data.organizationUsage.users}
-                {@const users = data.organizationUsage.users.filter(
-                    (user) => new Date(user.date) < new Date()
-                )}
                 {@const current = data.organizationUsage.usersTotal}
                 {@const max = getServiceLimit('users', tier, plan)}
                 <ProgressBarBig
@@ -171,7 +168,7 @@
                             {
                                 name: 'Users',
                                 data: accumulateFromEndingTotal(
-                                    users,
+                                    data.usersUsageToDate,
                                     data.organizationUsage.usersTotal
                                 )
                             }
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index 9ffafbac21..74dffcda2c 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -72,12 +72,15 @@ export const load: PageLoad = async ({ params, parent }) => {
         }
     }
 
+    const usersUsageToDate = usage.users.filter((user) => new Date(user.date) < new Date());
+
     return {
         organizationUsage: usage,
         projectNames,
         invoices,
         currentInvoice,
         organizationMembers,
-        plan
+        plan,
+        usersUsageToDate
     };
 };

From 583218383cdd74f59cc704ee28e4670b3c001c63 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 23 Dec 2024 13:54:52 +0100
Subject: [PATCH 112/177] Show estimated usage and upgrade button again for GH
 education plan

---
 .../organization-[organization]/billing/planSummary.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index c84356b753..d75261d43f 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -186,7 +186,7 @@
             </Collapsible>
         </svelte:fragment>
         <svelte:fragment slot="actions">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
                 <div class="u-flex u-gap-16 u-flex-wrap">
                     <Button text href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
@@ -202,7 +202,7 @@
                         Upgrade
                     </Button>
                 </div>
-            {:else if $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
+            {:else}
                 <div class="u-flex u-gap-16 u-flex-wrap">
                     <Button
                         text

From 01b4dd1d94cece7c048bf9db5cb6272ddc34ca9f Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 23 Dec 2024 14:09:37 +0100
Subject: [PATCH 113/177] Switch to if statement setup

---
 src/routes/(console)/apply-credit/+page.svelte | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index 9bc53d5cbd..df8a16bf97 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -190,17 +190,11 @@
         (team) => team.$id === selectedOrgId
     ) as Organization;
 
-    function getNewBillingPlan(organization: Organization): BillingPlan {
-        if (organization?.billingPlan === BillingPlan.SCALE) {
-            return BillingPlan.SCALE;
-        } else if (campaign?.plan) {
-            return campaign.plan;
-        } else {
-            return BillingPlan.PRO;
-        }
+    $: if (selectedOrg?.billingPlan === BillingPlan.SCALE) {
+        billingPlan = BillingPlan.SCALE;
+    } else if (campaign?.plan) {
+        billingPlan = campaign.plan;
     }
-
-    $: billingPlan = getNewBillingPlan(selectedOrg);
 </script>
 
 <svelte:head>

From ef116a39d0b8ab45b6dbe2761deaa65518769fca Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 23 Dec 2024 14:27:39 +0100
Subject: [PATCH 114/177] Change to ternary

---
 src/routes/(console)/+layout.ts                | 1 +
 src/routes/(console)/apply-credit/+page.svelte | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts
index 1f5bbfc3eb..0521240c12 100644
--- a/src/routes/(console)/+layout.ts
+++ b/src/routes/(console)/+layout.ts
@@ -25,6 +25,7 @@ export const load: LayoutLoad = async ({ fetch, depends, parent }) => {
     let plansInfo = new Map<Tier, Plan>();
     if (isCloud) {
         const plansArray = await sdk.forConsole.billing.getPlansInfo();
+        console.log('plansArray', plansArray);
         plansInfo = plansArray.plans.reduce((map, plan) => {
             map.set(plan.$id as Tier, plan);
             return map;
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index df8a16bf97..95af6175f5 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -190,11 +190,10 @@
         (team) => team.$id === selectedOrgId
     ) as Organization;
 
-    $: if (selectedOrg?.billingPlan === BillingPlan.SCALE) {
-        billingPlan = BillingPlan.SCALE;
-    } else if (campaign?.plan) {
-        billingPlan = campaign.plan;
-    }
+    $: billingPlan =
+        selectedOrg?.billingPlan === BillingPlan.SCALE
+            ? BillingPlan.SCALE
+            : (campaign?.plan ?? BillingPlan.PRO);
 </script>
 
 <svelte:head>

From b3af21dcfd52c01efccf68a20dfa1bfcb9c63817 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 23 Dec 2024 15:40:32 +0100
Subject: [PATCH 115/177] Remove console.log

---
 src/routes/(console)/+layout.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts
index 0521240c12..1f5bbfc3eb 100644
--- a/src/routes/(console)/+layout.ts
+++ b/src/routes/(console)/+layout.ts
@@ -25,7 +25,6 @@ export const load: LayoutLoad = async ({ fetch, depends, parent }) => {
     let plansInfo = new Map<Tier, Plan>();
     if (isCloud) {
         const plansArray = await sdk.forConsole.billing.getPlansInfo();
-        console.log('plansArray', plansArray);
         plansInfo = plansArray.plans.reduce((map, plan) => {
             map.set(plan.$id as Tier, plan);
             return map;

From 38fa2cf5fe22af9032d107a510341fa068c91c88 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Tue, 24 Dec 2024 14:23:25 +0100
Subject: [PATCH 116/177] Add new appwrite logo to git authorize page

---
 .../git/authorize-contributor/+page.svelte    | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/routes/(authenticated)/git/authorize-contributor/+page.svelte b/src/routes/(authenticated)/git/authorize-contributor/+page.svelte
index 1f6a9f1b98..9e2c270ee8 100644
--- a/src/routes/(authenticated)/git/authorize-contributor/+page.svelte
+++ b/src/routes/(authenticated)/git/authorize-contributor/+page.svelte
@@ -1,5 +1,8 @@
 <script lang="ts">
     import { page } from '$app/stores';
+    import { app } from '$lib/stores/app';
+    import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
+    import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
     import { Vcs, Client } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { getApiEndpoint } from '$lib/stores/sdk';
@@ -78,25 +81,19 @@
                 href="https://appwrite.io/"
                 target="_blank"
                 style="display: grid;place-items: center;">
-                <svg
-                    width="132"
-                    height="34"
-                    viewBox="0 0 132 34"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path
-                        d="M30.3916 17.6788C30.3916 22.216 26.7133 25.8941 22.1756 25.8941C20.0679 25.8941 18.1458 25.1004 16.6913 23.796C19.0212 22.7471 20.6433 20.4053 20.6433 17.6847C20.6433 14.9606 19.0172 12.6164 16.6824 11.5695C18.1381 10.2604 20.0636 9.46356 22.1756 9.46356C26.7133 9.46356 30.3916 13.1416 30.3916 17.6788Z"
-                        fill="#A3A8BD" />
-                    <path
-                        d="M18.8914 11.1213C13.8456 7.30847 6.5638 10.387 5.78442 16.6629C5.42225 19.5797 6.64589 22.4677 8.99326 24.2365C14.0419 28.0459 21.3216 24.9621 22.0967 18.6856C22.4563 15.7725 21.2344 12.8892 18.8914 11.1213V11.1213ZM17.9776 12.3319C22.0943 15.438 21.3042 21.835 16.5556 23.8467C14.352 24.7803 11.8175 24.4674 9.90703 23.0258C5.79061 19.9196 6.58046 13.5226 11.329 11.511C13.5327 10.5776 16.0672 10.8904 17.9776 12.3319Z"
-                        fill="#A3A8BD" />
-                    <path
-                        d="M39.8456 11.6498C40.9732 11.6498 41.9342 11.9416 42.7289 12.5255C43.5236 13.1095 44.07 13.8834 44.3683 14.8473V11.7912H45.7751V22.9159H44.3683V19.8599C44.07 20.8247 43.5236 21.599 42.7289 22.1829C41.9342 22.7668 40.9732 23.0588 39.8456 23.0588C38.8404 23.0588 37.9405 22.8278 37.1457 22.3661C36.3511 21.9045 35.7331 21.2422 35.2915 20.3793C34.8501 19.5166 34.6292 18.5079 34.6292 17.3535C34.6292 16.1858 34.8501 15.1705 35.2915 14.3077C35.7331 13.4457 36.3477 12.7873 37.1357 12.3321C37.9235 11.8771 38.8268 11.6498 39.8456 11.6498ZM40.2123 12.9123C38.9625 12.9123 37.9607 13.3095 37.2064 14.1042C36.4531 14.8989 36.0764 15.982 36.0764 17.3535C36.0764 18.7253 36.4531 19.8085 37.2064 20.6031C37.9607 21.3976 38.9625 21.7948 40.2123 21.7948C41 21.7948 41.7098 21.6117 42.3409 21.245C42.9728 20.8787 43.4687 20.359 43.8286 19.6867C44.1884 19.0143 44.3683 18.2367 44.3683 17.3535C44.3683 16.4705 44.1884 15.6934 43.8286 15.0216C43.4687 14.3495 42.9728 13.8294 42.3409 13.4623C41.7098 13.0956 41 12.9123 40.2123 12.9123ZM54.8213 11.6498C55.8401 11.6498 56.7401 11.8771 57.5211 12.3321C58.3023 12.7873 58.9137 13.4457 59.3552 14.3077C59.7967 15.1705 60.0174 16.1858 60.0174 17.3535C60.0174 18.5079 59.7967 19.5166 59.3552 20.3793C58.9137 21.2422 58.2986 21.9045 57.5111 22.3661C56.7232 22.8278 55.8265 23.0588 54.8213 23.0588C53.6801 23.0588 52.7158 22.7668 51.9279 22.1829C51.14 21.599 50.5969 20.8247 50.2985 19.8599V28.1725H48.8715V11.7912H50.2985V14.8473C50.5969 13.8834 51.14 13.1095 51.9279 12.5255C52.7158 11.9416 53.6801 11.6498 54.8213 11.6498ZM54.4343 12.9123C53.6465 12.9123 52.9366 13.0956 52.3045 13.4623C51.6734 13.8294 51.1812 14.3495 50.8282 15.0216C50.4752 15.6934 50.2985 16.4705 50.2985 17.3535C50.2985 18.2367 50.4752 19.0143 50.8282 19.6867C51.1812 20.359 51.6734 20.8787 52.3045 21.245C52.9366 21.6117 53.6465 21.7948 54.4343 21.7948C55.6975 21.7948 56.7028 21.3976 57.4503 20.6031C58.197 19.8085 58.5702 18.7253 58.5702 17.3535C58.5702 15.982 58.197 14.8989 57.4503 14.1042C56.7028 13.3095 55.6975 12.9123 54.4343 12.9123ZM68.5338 11.6498C69.5527 11.6498 70.4527 11.8771 71.2337 12.3321C72.0149 12.7873 72.6264 13.4457 73.068 14.3077C73.5093 15.1705 73.7302 16.1858 73.7302 17.3535C73.7302 18.5079 73.5093 19.5166 73.068 20.3793C72.6264 21.2422 72.0115 21.9045 71.2237 22.3661C70.4359 22.8278 69.5393 23.0588 68.5338 23.0588C67.3928 23.0588 66.4285 22.7668 65.6407 22.1829C64.8527 21.599 64.3097 20.8247 64.0114 19.8599V28.1725H62.5843V11.7912H64.0114V14.8473C64.3097 13.8834 64.8527 13.1095 65.6407 12.5255C66.4285 11.9416 67.3928 11.6498 68.5338 11.6498ZM68.1472 12.9123C67.3594 12.9123 66.6492 13.0956 66.0173 13.4623C65.3862 13.8294 64.8941 14.3495 64.5409 15.0216C64.1879 15.6934 64.0114 16.4705 64.0114 17.3535C64.0114 18.2367 64.1879 19.0143 64.5409 19.6867C64.8941 20.359 65.3862 20.8787 66.0173 21.245C66.6492 21.6117 67.3594 21.7948 68.1472 21.7948C69.4103 21.7948 70.4156 21.3976 71.1629 20.6031C71.9097 19.8085 72.283 18.7253 72.283 17.3535C72.283 15.982 71.9097 14.8989 71.1629 14.1042C70.4156 13.3095 69.4103 12.9123 68.1472 12.9123ZM89.5209 11.6295H92.2108L89.1746 22.9159H85.9957L83.5714 14.7058L81.0851 22.9159H77.9074L74.8915 11.6295H77.7646L79.5987 20.3491L82.1038 11.6295H85.1399L87.6667 20.3491L89.5209 11.6295ZM96.5102 13.7882C96.9307 13.0687 97.4874 12.5017 98.18 12.0871C98.8735 11.6734 99.6478 11.4666 100.503 11.4666V14.5427H99.6678C97.5627 14.5427 96.5102 15.5205 96.5102 17.476V22.9159H93.6373V11.6295H96.5102V13.7882ZM101.767 8.38884C101.767 7.92721 101.93 7.55055 102.256 7.25894C102.582 6.96675 103.01 6.8205 103.539 6.8205C104.069 6.8205 104.497 6.96675 104.823 7.25894C105.149 7.55055 105.312 7.92721 105.312 8.38884C105.312 8.83718 105.149 9.20749 104.823 9.49993C104.497 9.7922 104.069 9.93846 103.539 9.93846C103.01 9.93846 102.582 9.7922 102.256 9.49993C101.93 9.20749 101.767 8.83718 101.767 8.38884ZM102.093 11.6295H104.966V22.9159H102.093V11.6295ZM112.485 20.4502H113.605V22.9159H112.097C110.833 22.9159 109.866 22.6106 109.193 21.9997C108.521 21.3879 108.185 20.3694 108.185 18.9436V14.0536H106.616V11.6295H108.185V8.8376H111.058V11.6295H113.584V14.0536H111.058V18.984C111.058 19.5274 111.166 19.908 111.384 20.1253C111.601 20.3419 111.968 20.4502 112.485 20.4502ZM126.278 16.8443C126.278 17.1298 126.245 17.456 126.177 17.8224H117.904C117.945 18.8276 118.216 19.5679 118.72 20.0432C119.222 20.5184 119.847 20.7561 120.594 20.7561C121.26 20.7561 121.813 20.5931 122.254 20.2669C122.695 19.9416 122.977 19.5006 123.099 18.9436H126.135C125.986 19.7314 125.667 20.4374 125.179 21.062C124.689 21.6872 124.061 22.1763 123.294 22.5293C122.526 22.8822 121.674 23.0588 120.737 23.0588C119.636 23.0588 118.658 22.8246 117.802 22.3561C116.947 21.8875 116.281 21.2185 115.806 20.3491C115.33 19.4796 115.092 18.454 115.092 17.2727C115.092 16.0906 115.33 15.0618 115.806 14.1864C116.281 13.31 116.947 12.6408 117.802 12.1794C118.658 11.7176 119.636 11.4868 120.737 11.4868C121.85 11.4868 122.825 11.7176 123.66 12.1794C124.495 12.6408 125.141 13.2759 125.596 14.084C126.051 14.892 126.278 15.8121 126.278 16.8443ZM123.385 16.56C123.426 15.6356 123.185 14.9357 122.662 14.4607C122.139 13.9853 121.497 13.7478 120.737 13.7478C119.962 13.7478 119.31 13.9853 118.78 14.4607C118.25 14.9357 117.958 15.6356 117.904 16.56H123.385Z"
-                        fill="#A3A8BD" />
-                    <path
-                        d="M14.1624 14.8366C14.1527 14.8608 14.0268 15.3542 13.8918 15.9395C13.7513 16.5247 13.5288 17.4485 13.4032 17.9949C13.1613 18.9961 13.0161 19.6539 13.0161 19.7409C13.0161 19.7649 13.1662 19.7845 13.3498 19.7845H13.6837L13.8335 19.1169C13.9207 18.7543 14.1143 17.9223 14.2689 17.2694C14.4237 16.6165 14.6122 15.8233 14.6849 15.5039C14.7574 15.1847 14.83 14.8948 14.8445 14.8608C14.859 14.8173 14.7767 14.803 14.5251 14.803C14.3365 14.803 14.172 14.8173 14.1624 14.8366ZM11.565 16.9307L11.1201 17.4145L11.2509 17.5693C11.3232 17.6562 11.5218 17.874 11.6909 18.0531L12.0006 18.3817H12.8809L12.4648 17.932C12.2373 17.6904 12.0487 17.458 12.0487 17.4291C12.0487 17.3952 12.2229 17.1777 12.4359 16.9454C12.6486 16.7086 12.8228 16.5052 12.8228 16.4811C12.8228 16.4616 12.639 16.4472 12.4166 16.4472H12.0151L11.565 16.9307ZM14.9507 16.4762C14.9507 16.4908 15.033 16.5825 15.1345 16.6841C15.512 17.0614 15.7779 17.3808 15.7633 17.4434C15.7538 17.4775 15.5698 17.7047 15.3474 17.9416L14.9461 18.3817H15.3958L15.8456 18.377L16.2565 17.9271C16.4841 17.6758 16.6678 17.453 16.6678 17.4242C16.6678 17.4001 16.4744 17.1727 16.2324 16.9165L15.7975 16.4472H15.3764C15.1394 16.4472 14.9507 16.4616 14.9507 16.4762Z"
-                        fill="#A3A8BD" />
-                </svg>
+                {#if $app.themeInUse === 'dark'}
+                    <img
+                        src={AppwriteLogoDark}
+                        width="120"
+                        class="u-block u-only-dark"
+                        alt="Appwrite Logo" />
+                {:else}
+                    <img
+                        src={AppwriteLogoLight}
+                        width="120"
+                        class="u-block u-only-light"
+                        alt="Appwrite Logo" />
+                {/if}
             </a>
         </div>
     </div>

From c9db84b6c0a5c0bf2f69cf3a0ccfefbb8c80ad3b Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 27 Dec 2024 13:51:13 +0100
Subject: [PATCH 117/177] Add spacing

---
 src/routes/(console)/onboarding/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte
index 40515ff1f6..3f112011ca 100644
--- a/src/routes/(console)/onboarding/+page.svelte
+++ b/src/routes/(console)/onboarding/+page.svelte
@@ -27,11 +27,11 @@
         ? [
               {
                   value: BillingPlan.FREE,
-                  label: `${tierToPlan(BillingPlan.FREE).name} - ${formatCurrency($plansInfo.get(BillingPlan.FREE).price)}/month`
+                  label: `${tierToPlan(BillingPlan.FREE).name} - ${formatCurrency($plansInfo.get(BillingPlan.FREE).price)} / month`
               },
               {
                   value: BillingPlan.PRO,
-                  label: `${tierToPlan(BillingPlan.PRO).name} - ${formatCurrency($plansInfo.get(BillingPlan.PRO).price)}/month + add-ons`
+                  label: `${tierToPlan(BillingPlan.PRO).name} - ${formatCurrency($plansInfo.get(BillingPlan.PRO).price)} / month + add-ons`
               }
               // {
               //     value: BillingPlan.SCALE,

From cedc1af747e9c1dfb3a2d4190f4a10e6e6ff99f1 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Mon, 30 Dec 2024 15:17:05 +0000
Subject: [PATCH 118/177] Update specification label

---
 .../functions/function-[function]/settings/updateRuntime.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
index a151d3e7a7..1f06dbe9cd 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -103,7 +103,7 @@
                     required
                     hideRequired />
                 <InputSelect
-                    label="Specification"
+                    label="CPU and memory"
                     id="size"
                     placeholder="Select runtime specification"
                     bind:value={specification}

From f00d1be8940e9f25415513d08edf496d236ba32d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Wed, 1 Jan 2025 13:03:44 +0530
Subject: [PATCH 119/177] remove: roles alert.

---
 .../createMember.svelte                          | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte
index 0fa0315f7d..ec06b001ce 100644
--- a/src/routes/(console)/organization-[organization]/createMember.svelte
+++ b/src/routes/(console)/organization-[organization]/createMember.svelte
@@ -60,22 +60,6 @@
 </script>
 
 <Modal title="Invite member" {error} size="big" bind:show={showCreate} onSubmit={create}>
-    {#if isCloud}
-        {#if $organization?.billingPlan === BillingPlan.PRO}
-            <!-- <Alert type="info">
-                You can add unlimited organization members on the {plan.name} plan for
-                <b>{formatCurrency(plan.addons.member.price)} each per billing period</b>.
-            </Alert> -->
-            <Alert type="info">
-                New roles are free until 1st January 2025. <a
-                    class="link"
-                    href="https://appwrite.io/docs/advanced/platform/roles"
-                    target="_blank"
-                    rel="noopener noreferrer">Learn more</a
-                >.
-            </Alert>
-        {/if}
-    {/if}
     <FormList>
         <InputEmail
             required

From 57087b60c7c316066ec808073065cc1598f58bd3 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Wed, 1 Jan 2025 13:05:40 +0530
Subject: [PATCH 120/177] fix: tests.

---
 .../(console)/organization-[organization]/createMember.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte
index ec06b001ce..683501c13e 100644
--- a/src/routes/(console)/organization-[organization]/createMember.svelte
+++ b/src/routes/(console)/organization-[organization]/createMember.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { Alert, Modal } from '$lib/components';
+    import { Modal } from '$lib/components';
     import { InputText, InputEmail, Button, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { createEventDispatcher } from 'svelte';
     import { organization } from '$lib/stores/organization';
     import { invalidate } from '$app/navigation';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { isCloud, isSelfHosted } from '$lib/system';
     import { roles } from '$lib/stores/billing';

From 9896068ca651cf2f401060e316004059bbe5ce08 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 2 Jan 2025 13:36:25 +0530
Subject: [PATCH 121/177] address comments.

---
 .../billing/budgetAlert.svelte                |   7 +-
 .../billing/planSummary.svelte                | 306 ++++++++++--------
 2 files changed, 169 insertions(+), 144 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index 02632fad9d..cd3e6a4cb3 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -40,7 +40,7 @@
         if (alerts.some((alert) => alert === selectedAlert)) {
             return;
         }
-        if (alerts.length <= 2) {
+        if (alerts.length <= 3) {
             alerts = [...alerts, selectedAlert ? selectedAlert : parseInt(search)];
             search = '';
             selectedAlert = null;
@@ -60,7 +60,7 @@
             addNotification({
                 type: 'success',
                 isHtml: true,
-                message: `<span>A budget alert has been added to <b>${$organization.name}</b></span>`
+                message: `<span> ${alerts.length === 0 ? 'Budget alerts removed from' : alerts.length > 1 ? `Budget alerts added to` : 'A budget alert has been added to'} <b>${$organization.name}</b> </span>`
             });
             trackEvent(Submit.BudgetAlertsUpdate, {
                 alerts
@@ -112,12 +112,13 @@
                             id="alerts"
                             {options}
                             bind:search
+                            interactiveOutput
                             bind:value={selectedAlert}
                             on:select={() => (search = selectedAlert.toString())} />
                         <div style="align-self: flex-end">
                             <Button
                                 secondary
-                                disabled={alerts.length > 2 || (!search && !selectedAlert)}
+                                disabled={alerts.length > 3 || (!search && !selectedAlert)}
                                 on:click={addAlert}>
                                 Add alert
                             </Button>
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index 668a110d55..f5c219bd3b 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -45,153 +45,168 @@
             </p>
             <Card isTile style="--p-card-padding: 1.5rem;" class="card-only-on-desktop">
                 <Collapsible>
-                    <div class="u-flex">
-                        <span class="body-text-2">
-                            {tierToPlan($organization?.billingPlan)?.name} plan</span>
-                        <div class="body-text-2 u-margin-inline-start-auto">
-                            {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
-                                ? formatCurrency(0)
-                                : currentPlan
-                                  ? formatCurrency(currentPlan?.price)
-                                  : ''}
+                    <div class="u-flex-vertical u-gap-8">
+                        <div class="u-flex">
+                            <span class="body-text-2">
+                                {tierToPlan($organization?.billingPlan)?.name} plan</span>
+                            <div class="body-text-2 u-margin-inline-start-auto">
+                                {isTrial ||
+                                $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
+                                    ? formatCurrency(0)
+                                    : currentPlan
+                                      ? formatCurrency(currentPlan?.price)
+                                      : ''}
+                            </div>
                         </div>
-                    </div>
-                    {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0}
-                        <CollapsibleItem gap={8}>
-                            <svelte:fragment slot="beforetitle">
-                                <span class="body-text-2"><b>Add-ons</b></span><span
-                                    class="inline-tag"
-                                    >{extraMembers ? extraAddons + 1 : extraAddons}</span>
-                                <div class="icon">
-                                    <span class="icon-cheveron-down" aria-hidden="true"></span>
-                                </div>
-                            </svelte:fragment>
-                            <svelte:fragment slot="end">
-                                <div class="body-text-2 u-margin-inline-start-auto">
-                                    <b>
-                                        {formatCurrency(extraUsage >= 0 ? extraUsage : 0)}
-                                    </b>
-                                </div>
-                            </svelte:fragment>
 
-                            <ul>
-                                {#if extraMembers}
-                                    <li class="u-flex-vertical u-gap-4 u-padding-block-8">
-                                        <div class="u-flex u-gap-4">
-                                            <h5 class="body-text-2 u-stretch">
-                                                Additional members
-                                            </h5>
-                                            <div>
-                                                {formatCurrency(
-                                                    extraMembers *
-                                                        (currentPlan?.addons?.member?.price ?? 0)
-                                                )}
-                                            </div>
-                                        </div>
-                                        <div class="u-flex u-gap-4">
-                                            <h5 class="body-text-2 u-stretch u-color-text-offline">
-                                                {extraMembers}
-                                            </h5>
-                                        </div>
-                                    </li>
-                                {/if}
-                                {#if currentInvoice?.usage}
-                                    {#each currentInvoice.usage as excess, i}
-                                        <li
-                                            class="u-flex-vertical u-gap-4 {extraMembers
-                                                ? 'u-padding-block-8'
-                                                : 'u-padding-block-start-8'}"
-                                            class:u-sep-block-start={i > 0 || extraMembers}>
-                                            {#if ['storage', 'bandwidth'].includes(excess.name)}
-                                                {@const excessValue = humanFileSize(excess.value)}
-                                                <div class="u-flex u-main-space-between">
-                                                    <h5 class="body-text-2 u-stretch u-capitalize">
-                                                        {excess.name}
-                                                    </h5>
-                                                    {formatCurrency(excess.amount)}
-                                                </div>
-                                                <h5
-                                                    class="body-text-2 u-stretch u-color-text-offline"
-                                                    title={formatNumberWithCommas(
-                                                        excess.value ?? 0
-                                                    ) + 'bytes'}>
-                                                    {excessValue.value ?? 0}{excessValue.unit}
+                        {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0}
+                            <CollapsibleItem gap={8}>
+                                <svelte:fragment slot="beforetitle">
+                                    <span class="body-text-2"><b>Add-ons</b></span><span
+                                        class="inline-tag"
+                                        >{extraMembers ? extraAddons + 1 : extraAddons}</span>
+                                    <div class="icon">
+                                        <span class="icon-cheveron-down" aria-hidden="true"></span>
+                                    </div>
+                                </svelte:fragment>
+                                <svelte:fragment slot="end">
+                                    <div class="body-text-2 u-margin-inline-start-auto">
+                                        <b>
+                                            {formatCurrency(extraUsage >= 0 ? extraUsage : 0)}
+                                        </b>
+                                    </div>
+                                </svelte:fragment>
+
+                                <ul>
+                                    {#if extraMembers}
+                                        <li class="u-flex-vertical u-gap-4 u-padding-block-8">
+                                            <div class="u-flex u-gap-4">
+                                                <h5 class="body-text-2 u-stretch">
+                                                    Additional members
                                                 </h5>
-                                            {/if}
-                                            {#if ['users', 'executions'].includes(excess.name)}
-                                                <div class="u-flex u-main-space-between">
-                                                    <h5 class="body-text-2 u-stretch u-capitalize">
-                                                        {excess.name}
-                                                    </h5>
-                                                    {formatCurrency(excess.amount)}
+                                                <div>
+                                                    {formatCurrency(
+                                                        extraMembers *
+                                                            (currentPlan?.addons?.member?.price ??
+                                                                0)
+                                                    )}
                                                 </div>
+                                            </div>
+                                            <div class="u-flex u-gap-4">
                                                 <h5
-                                                    class="body-text-2 u-stretch u-color-text-offline"
-                                                    title={formatNumberWithCommas(excess.value)}>
-                                                    {abbreviateNumber(excess.value)}
+                                                    class="body-text-2 u-stretch u-color-text-offline">
+                                                    {extraMembers}
                                                 </h5>
-                                            {/if}
+                                            </div>
                                         </li>
-                                    {/each}
-                                {/if}
-                            </ul>
-                        </CollapsibleItem>
-                    {/if}
+                                    {/if}
+                                    {#if currentInvoice?.usage}
+                                        {#each currentInvoice.usage as excess, i}
+                                            <li
+                                                class="u-flex-vertical u-gap-4 {extraMembers
+                                                    ? 'u-padding-block-8'
+                                                    : 'u-padding-block-start-8'}"
+                                                class:u-sep-block-start={i > 0 || extraMembers}>
+                                                {#if ['storage', 'bandwidth'].includes(excess.name)}
+                                                    {@const excessValue = humanFileSize(
+                                                        excess.value
+                                                    )}
+                                                    <div class="u-flex u-main-space-between">
+                                                        <h5
+                                                            class="body-text-2 u-stretch u-capitalize">
+                                                            {excess.name}
+                                                        </h5>
+                                                        {formatCurrency(excess.amount)}
+                                                    </div>
+                                                    <h5
+                                                        class="body-text-2 u-stretch u-color-text-offline"
+                                                        title={formatNumberWithCommas(
+                                                            excess.value ?? 0
+                                                        ) + 'bytes'}>
+                                                        {excessValue.value ?? 0}{excessValue.unit}
+                                                    </h5>
+                                                {/if}
+                                                {#if ['users', 'executions'].includes(excess.name)}
+                                                    <div class="u-flex u-main-space-between">
+                                                        <h5
+                                                            class="body-text-2 u-stretch u-capitalize">
+                                                            {excess.name}
+                                                        </h5>
+                                                        {formatCurrency(excess.amount)}
+                                                    </div>
+                                                    <h5
+                                                        class="body-text-2 u-stretch u-color-text-offline"
+                                                        title={formatNumberWithCommas(
+                                                            excess.value
+                                                        )}>
+                                                        {abbreviateNumber(excess.value)}
+                                                    </h5>
+                                                {/if}
+                                            </li>
+                                        {/each}
+                                    {/if}
+                                </ul>
+                            </CollapsibleItem>
+                        {/if}
 
-                    {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
-                        <CollapsibleItem noContent gap={4}>
-                            <span class="body-text-2 u-flex u-cross-center u-gap-2"
-                                ><svg
-                                    width="16"
-                                    height="17"
-                                    viewBox="0 0 16 17"
-                                    fill="none"
-                                    xmlns="http://www.w3.org/2000/svg">
-                                    <path
-                                        fill-rule="evenodd"
-                                        clip-rule="evenodd"
-                                        d="M14.166 7.93434C14.4784 8.24676 14.4784 8.75329 14.166 9.06571L8.56603 14.6657C8.25361 14.9781 7.74708 14.9781 7.43466 14.6657L1.83466 9.06571C1.67842 8.90947 1.60032 8.70469 1.60034 8.49992V4.50002C1.60034 3.17454 2.67486 2.10002 4.00034 2.10002H8.00056C8.20523 2.10008 8.40987 2.17818 8.56603 2.33434L14.166 7.93434ZM4.00034 5.30002C4.44217 5.30002 4.80034 4.94185 4.80034 4.50002C4.80034 4.05819 4.44217 3.70002 4.00034 3.70002C3.55851 3.70002 3.20034 4.05819 3.20034 4.50002C3.20034 4.94185 3.55851 5.30002 4.00034 5.30002Z"
-                                        fill="#00BC5D" />
-                                </svg>
-                                Credits to be applied</span>
+                        {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
+                            <CollapsibleItem noContent gap={4}>
+                                <span class="body-text-2 u-flex u-cross-center u-gap-2"
+                                    ><svg
+                                        width="16"
+                                        height="17"
+                                        viewBox="0 0 16 17"
+                                        fill="none"
+                                        xmlns="http://www.w3.org/2000/svg">
+                                        <path
+                                            fill-rule="evenodd"
+                                            clip-rule="evenodd"
+                                            d="M14.166 7.93434C14.4784 8.24676 14.4784 8.75329 14.166 9.06571L8.56603 14.6657C8.25361 14.9781 7.74708 14.9781 7.43466 14.6657L1.83466 9.06571C1.67842 8.90947 1.60032 8.70469 1.60034 8.49992V4.50002C1.60034 3.17454 2.67486 2.10002 4.00034 2.10002H8.00056C8.20523 2.10008 8.40987 2.17818 8.56603 2.33434L14.166 7.93434ZM4.00034 5.30002C4.44217 5.30002 4.80034 4.94185 4.80034 4.50002C4.80034 4.05819 4.44217 3.70002 4.00034 3.70002C3.55851 3.70002 3.20034 4.05819 3.20034 4.50002C3.20034 4.94185 3.55851 5.30002 4.00034 5.30002Z"
+                                            fill="#00BC5D" />
+                                    </svg>
+                                    Credits to be applied</span>
 
-                            <div
-                                class="body-text-2 u-margin-inline-start-auto"
-                                style="color: var(--web-green-500, #10B981)">
-                                -{formatCurrency(
-                                    Math.min(availableCredit, currentInvoice?.amount ?? 0)
-                                )}
-                            </div>
-                        </CollapsibleItem>
-                    {/if}
+                                <div
+                                    class="body-text-2 u-margin-inline-start-auto"
+                                    style="color: var(--web-green-500, #10B981)">
+                                    -{formatCurrency(
+                                        Math.min(availableCredit, currentInvoice?.amount ?? 0)
+                                    )}
+                                </div>
+                            </CollapsibleItem>
+                        {/if}
 
-                    {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
-                        <CollapsibleItem
-                            noContent
-                            gap={4}
-                            style="padding-block-end: unset;"
-                            wrapperStyle="padding-block-end: unset;">
-                            <span class="body-text-2">Current total (USD)</span>
-                            <span class="tooltip u-cross-center" aria-label="total info">
-                                <span
-                                    class="icon-info"
-                                    aria-hidden="true"
-                                    use:tooltip={{
-                                        content:
-                                            'Totals displayed are estimates updated every 24 hours and may not accurately reflect your invoice.'
-                                    }}></span>
-                            </span>
-                            <div class="body-text-2 u-margin-inline-start-auto">
-                                {formatCurrency(
-                                    Math.max(
-                                        (currentInvoice?.amount ?? 0) -
-                                            Math.min(availableCredit, currentInvoice?.amount ?? 0),
-                                        0
-                                    )
-                                )}
-                            </div>
-                        </CollapsibleItem>
-                    {/if}
+                        {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
+                            <CollapsibleItem
+                                noContent
+                                gap={4}
+                                style="margin-block-start: 1rem; padding-block: unset;"
+                                wrapperStyle="padding-block: unset; padding-inline-end: unset;">
+                                <span class="body-text-2">Current total (USD)</span>
+                                <span class="tooltip u-cross-center" aria-label="total info">
+                                    <span
+                                        class="icon-info"
+                                        aria-hidden="true"
+                                        use:tooltip={{
+                                            content:
+                                                'Totals displayed are estimates updated every 24 hours and may not accurately reflect your invoice.'
+                                        }}></span>
+                                </span>
+                                <div class="body-text-2 u-margin-inline-start-auto">
+                                    {formatCurrency(
+                                        Math.max(
+                                            (currentInvoice?.amount ?? 0) -
+                                                Math.min(
+                                                    availableCredit,
+                                                    currentInvoice?.amount ?? 0
+                                                ),
+                                            0
+                                        )
+                                    )}
+                                </div>
+                            </CollapsibleItem>
+                        {/if}
+                    </div>
                 </Collapsible>
             </Card>
         </svelte:fragment>
@@ -239,24 +254,33 @@
 {/if}
 
 <style>
+    :root {
+        --billing-card-border-color: hsl(var(--color-neutral-10));
+    }
+
     :global(.card-only-on-desktop) {
         background: hsl(var(--color-neutral-5));
-        border: 1px solid hsl(var(--color-neutral-10));
         border-radius: var(--corner-radius-medium, 8px);
+        border: 1px solid var(--billing-card-border-color);
     }
 
     :global(.theme-dark .card-only-on-desktop) {
         background: #2c2c2f;
-        border: 1px solid #424248;
+        --billing-card-border-color: #424248;
+    }
+
+    :global(.card-only-on-desktop .collapsible-item:only-of-type) {
+        margin-block-start: 0.5rem;
+        border-block-start: solid 0.0625rem hsl(var(--p-toggle-border-color));
     }
 
     @media (max-width: 768px) {
         :global(.card-only-on-desktop) {
-            padding: unset;
+            padding: 0.5rem;
             box-shadow: unset;
             border-radius: unset;
 
-            /* yes, these `!important`s are needed*/
+            /* yes, these `!important`s are needed */
             border: unset !important;
             background: unset !important;
         }

From 267aceb9f2849612209326d72d677651b9590600 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 2 Jan 2025 13:50:14 +0530
Subject: [PATCH 122/177] resolve conflicts.

---
 .../organization-[organization]/billing/planSummary.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index f5c219bd3b..cbac0c086a 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -211,7 +211,7 @@
             </Card>
         </svelte:fragment>
         <svelte:fragment slot="actions">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
                 <!-- TODO: make center on mobile and have different styles. -->
                 <div
                     class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line u-main-end">
@@ -230,7 +230,7 @@
                         Upgrade
                     </Button>
                 </div>
-            {:else if $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
+            {:else}
                 <div
                     class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line u-main-end">
                     <Button

From 1461d5a41baac72b85464090bdefaf78955b3e61 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 2 Jan 2025 14:40:42 +0530
Subject: [PATCH 123/177] ci: empty commit


From 27d7f07de438a8757c8eefe62181c429ef3f954a Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 2 Jan 2025 15:32:36 +0530
Subject: [PATCH 124/177] ci: empty commit


From 4b23e82615c5c41df37fd31d18fe39f24ecea736 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 6 Jan 2025 10:32:14 +0100
Subject: [PATCH 125/177] Show correct upload file size

---
 .../storage/bucket-[bucket]/create-file/step1.svelte        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index 8c848afd78..bdce4159b4 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -5,14 +5,14 @@
     import { Button, FormList, InputFile } from '$lib/elements/forms';
     import { humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
     import WizardStep from '$lib/layout/wizardStep.svelte';
-    import { getServiceLimit, tierToPlan, upgradeURL } from '$lib/stores/billing';
-    import { organization } from '$lib/stores/organization';
+    import { tierToPlan, upgradeURL } from '$lib/stores/billing';
+    import { organization, currentPlan } from '$lib/stores/organization';
     import { isCloud } from '$lib/system';
     import { bucket } from '../store';
     import { createFile } from './store';
 
     let showCustomId = false;
-    const service = getServiceLimit('fileSize');
+    const service = $currentPlan['fileSize'];
 </script>
 
 <WizardStep>

From eb44a215a33ea68c9b483938f41d0642d60dec97 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 6 Jan 2025 14:24:24 +0100
Subject: [PATCH 126/177] disable replays

---
 src/hooks.client.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks.client.ts b/src/hooks.client.ts
index c6404ee813..bbb414b88b 100644
--- a/src/hooks.client.ts
+++ b/src/hooks.client.ts
@@ -8,7 +8,7 @@ Sentry.init({
     dsn: 'https://c7ce178bdedd486480317b72f282fd39@o1063647.ingest.us.sentry.io/4504158071422976',
     tracesSampleRate: 1,
     replaysSessionSampleRate: 0,
-    replaysOnErrorSampleRate: 1,
+    replaysOnErrorSampleRate: 0,
     integrations: [Sentry.replayIntegration()]
 });
 

From b90ce4218844d5ad3cff8a74ceaf6f635605492c Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 6 Jan 2025 14:26:10 +0100
Subject: [PATCH 127/177] disable replays

---
 src/hooks.client.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hooks.client.ts b/src/hooks.client.ts
index bbb414b88b..9c86799125 100644
--- a/src/hooks.client.ts
+++ b/src/hooks.client.ts
@@ -8,8 +8,7 @@ Sentry.init({
     dsn: 'https://c7ce178bdedd486480317b72f282fd39@o1063647.ingest.us.sentry.io/4504158071422976',
     tracesSampleRate: 1,
     replaysSessionSampleRate: 0,
-    replaysOnErrorSampleRate: 0,
-    integrations: [Sentry.replayIntegration()]
+    replaysOnErrorSampleRate: 0
 });
 
 export const handleError: HandleClientError = Sentry.handleErrorWithSentry(

From 15b30c70ea491d0f0954c2a68e0bd0f02533ca11 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Tue, 7 Jan 2025 20:47:22 +0900
Subject: [PATCH 128/177] Update console docs URL

---
 .../wizards/functions/components/specificationsTooltip.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/components/specificationsTooltip.svelte b/src/lib/wizards/functions/components/specificationsTooltip.svelte
index 7b870f3765..5ef18e313f 100644
--- a/src/lib/wizards/functions/components/specificationsTooltip.svelte
+++ b/src/lib/wizards/functions/components/specificationsTooltip.svelte
@@ -10,7 +10,7 @@
             class="u-bold u-block"
             target="_blank"
             rel="noopener noreferrer"
-            href="https://appwrite.io/docs/products/functions/specifications">Learn more</a>
+            href="https://appwrite.io/docs/advanced/platform/specifications">Learn more</a>
         <Button href={$upgradeURL} secondary fullWidthMobile event={'specifications_cta_upgrade'}>
             <span class="text">Upgrade Plan</span>
         </Button>

From a5749c700621afffd16d131472bc1178806b7442 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Tue, 7 Jan 2025 21:55:05 +0900
Subject: [PATCH 129/177] Update docs URL

---
 .../wizards/functions/components/specificationsTooltip.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/components/specificationsTooltip.svelte b/src/lib/wizards/functions/components/specificationsTooltip.svelte
index 5ef18e313f..279f5a0f11 100644
--- a/src/lib/wizards/functions/components/specificationsTooltip.svelte
+++ b/src/lib/wizards/functions/components/specificationsTooltip.svelte
@@ -10,7 +10,7 @@
             class="u-bold u-block"
             target="_blank"
             rel="noopener noreferrer"
-            href="https://appwrite.io/docs/advanced/platform/specifications">Learn more</a>
+            href="https://appwrite.io/docs/advanced/platform/gb-hours">Learn more</a>
         <Button href={$upgradeURL} secondary fullWidthMobile event={'specifications_cta_upgrade'}>
             <span class="text">Upgrade Plan</span>
         </Button>

From b65eaaa78bd2cb395f85a7e668f3fdda66050c45 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Wed, 8 Jan 2025 10:08:02 +0100
Subject: [PATCH 130/177] Check and handle if the console is visited from the
 start building pro button on the site

---
 src/lib/helpers/pricingRedirect.ts                  | 13 +++++++++++++
 .../(console)/create-organization/+page.svelte      |  6 +++++-
 src/routes/(console)/onboarding/+page.svelte        |  8 ++------
 .../organization-[organization]/+page.svelte        |  8 ++------
 src/routes/(public)/(guest)/register/+page.svelte   |  3 +++
 src/routes/+layout.ts                               |  6 ++++++
 6 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 src/lib/helpers/pricingRedirect.ts

diff --git a/src/lib/helpers/pricingRedirect.ts b/src/lib/helpers/pricingRedirect.ts
new file mode 100644
index 0000000000..5de04212f6
--- /dev/null
+++ b/src/lib/helpers/pricingRedirect.ts
@@ -0,0 +1,13 @@
+import { goto } from '$app/navigation';
+import { base } from '$app/paths';
+
+export function checkPricingRefAndRedirect(searchParams: URLSearchParams, shouldRegister = false) {
+    if (searchParams.has('type')) {
+        const paramType = searchParams.get('type');
+        if (paramType === 'createPro') {
+            shouldRegister
+                ? goto(`${base}/register?type=createPro`)
+                : goto(`${base}/create-organization?type=createPro`);
+        }
+    }
+}
diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index c463a5d4a3..63cc1f2100 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -79,7 +79,11 @@
                 billingPlan = plan as BillingPlan;
             }
         }
-        if (anyOrgFree) {
+        if (
+            anyOrgFree ||
+            ($page.url.searchParams.has('type') &&
+                $page.url.searchParams.get('type') === 'createPro')
+        ) {
             billingPlan = BillingPlan.PRO;
         }
     });
diff --git a/src/routes/(console)/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte
index 3f112011ca..b4a9b4abac 100644
--- a/src/routes/(console)/onboarding/+page.svelte
+++ b/src/routes/(console)/onboarding/+page.svelte
@@ -17,6 +17,7 @@
     import { tierToPlan, type Tier, plansInfo } from '$lib/stores/billing';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { base } from '$app/paths';
+    import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 
     let name: string;
     let id: string;
@@ -42,12 +43,7 @@
 
     onMount(() => {
         if (isCloud) {
-            if ($page.url.searchParams.has('type')) {
-                const paramType = $page.url.searchParams.get('type');
-                if (paramType === 'createPro') {
-                    goto(`${base}/create-organization`);
-                }
-            }
+            checkPricingRefAndRedirect($page.url.searchParams);
         }
     });
 
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index d163390725..76607b4297 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -32,6 +32,7 @@
     import { onMount } from 'svelte';
     import { organization } from '$lib/stores/organization';
     import { canWriteProjects } from '$lib/stores/roles';
+    import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 
     export let data;
 
@@ -123,12 +124,7 @@
     onMount(async () => {
         if (isCloud) {
             regions = await sdk.forConsole.billing.listRegions();
-            if ($page.url.searchParams.has('type')) {
-                const paramType = $page.url.searchParams.get('type');
-                if (paramType === 'createPro') {
-                    goto(`${base}/create-organization`);
-                }
-            }
+            checkPricingRefAndRedirect($page.url.searchParams);
         }
     });
 
diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte
index f8fab2e6f5..96fe43ae03 100644
--- a/src/routes/(public)/(guest)/register/+page.svelte
+++ b/src/routes/(public)/(guest)/register/+page.svelte
@@ -20,6 +20,7 @@
     import { isCloud } from '$lib/system';
     import { page } from '$app/stores';
     import { redirectTo } from '$routes/store';
+    import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 
     export let data;
 
@@ -52,6 +53,8 @@
                 $page.url.searchParams.delete('redirect');
                 if (redirect) {
                     await goto(`${redirect}${$page.url.search}`);
+                } else if (isCloud) {
+                    checkPricingRefAndRedirect($page.url.searchParams);
                 } else {
                     await goto(`${base}/${$page.url.search ?? ''}`);
                 }
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 77fd3e8b13..134ef1e229 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -9,6 +9,8 @@ import { redirectTo } from './store';
 import { base } from '$app/paths';
 import type { Account } from '$lib/stores/user';
 import type { AppwriteException } from '@appwrite.io/console';
+import { isCloud } from '$lib/system';
+import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 
 export const ssr = false;
 
@@ -46,6 +48,10 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 
     if (!isPublicRoute) {
+        if (isCloud) {
+            checkPricingRefAndRedirect(url.searchParams, true);
+        }
+
         redirect(303, withParams(`${base}/login`, url.searchParams));
     }
 };

From 62fb063e63428b8186f93da8377e77cd87d5e65e Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Wed, 8 Jan 2025 19:05:17 +0530
Subject: [PATCH 131/177] change: upgrade button style.

---
 .../organization-[organization]/billing/planSummary.svelte       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index d3afdbd583..260338e863 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -218,7 +218,6 @@
                         View estimated usage
                     </Button>
                     <Button
-                        text
                         disabled={$organization?.markedForDeletion}
                         href={$upgradeURL}
                         on:click={() =>

From 792b4e48de2f099598ca089adda57d062dc63056 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Wed, 8 Jan 2025 19:28:44 +0530
Subject: [PATCH 132/177] change: button style.

---
 .../organization-[organization]/billing/planSummary.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index 260338e863..ab9e3ae106 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -181,7 +181,7 @@
                                 noContent
                                 gap={4}
                                 style="margin-block-start: 1rem; padding-block: unset;"
-                                wrapperStyle="padding-block: unset; padding-inline-end: unset;">
+                                wrapperStyle="padding-block: unset; padding-inline: unset;">
                                 <span class="body-text-2">Current total (USD)</span>
                                 <span class="tooltip u-cross-center" aria-label="total info">
                                     <span
@@ -214,7 +214,7 @@
             {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
                 <div
                     class="u-flex u-flex-vertical-mobile u-cross-center u-gap-16 u-flex-wrap u-width-full-line u-main-end">
-                    <Button secondary href={`${base}/organization-${$organization?.$id}/usage`}>
+                    <Button text href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
                     </Button>
                     <Button

From 25cb2824ffc4a757175e93f9da59b8af12273ec7 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:13:21 +0000
Subject: [PATCH 133/177] chore: change Beta label to Experimental for
 relationships

Clarify the terminology since Appwrite Cloud is in Beta and the
relationships feature is Experimental. This also matches the terminology
used in the docs.
---
 .../collection-[collection]/attributes/edit.svelte              | 2 +-
 .../collection-[collection]/createAttribute.svelte              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
index 1676df8027..4810959dca 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
@@ -71,7 +71,7 @@
             {option?.name}
             {#if option?.type === 'relationship'}
                 <div class="tag eyebrow-heading-3">
-                    <span class="text u-x-small">Beta</span>
+                    <span class="text u-x-small">Experimental</span>
                 </div>
             {/if}
         </div>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index 06420a1a1d..152f7211bf 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -72,7 +72,7 @@
             <span class="u-flex u-gap-16 u-cross-center">
                 {selectedOption}
                 <div class="tag eyebrow-heading-3">
-                    <span class="text u-x-small">Beta</span>
+                    <span class="text u-x-small">Experimental</span>
                 </div>
             </span>
         {:else}

From 3ae83a3b6ef2b86612f924b978ce6c83cd0e176d Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Wed, 26 Jun 2024 21:09:09 +0000
Subject: [PATCH 134/177] fix: hide attribute type icon for relationships on
 mobile

The experimental tag is too big for the modal pushing the close button
off screen, requiring horizontal scroll. To prevent that, we'll just
hide the attribute type icon on the left so there's enough room for the
experimental tag and the close button.
---
 src/lib/components/modal.svelte                           | 2 ++
 .../collection-[collection]/attributes/edit.svelte        | 8 +++++++-
 .../collection-[collection]/createAttribute.svelte        | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index c043fc1dcc..cf70c44a65 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -8,6 +8,7 @@
     export let show = false;
     export let size: 'small' | 'big' | 'huge' = null;
     export let icon: string = null;
+    export let iconNotMobile: boolean = false;
     export let state: 'success' | 'warning' | 'error' | 'info' = null;
     export let error: string = null;
     export let closable = true;
@@ -39,6 +40,7 @@
                     {#if icon}
                         <div
                             class="avatar is-medium"
+                            class:is-not-mobile={iconNotMobile}
                             class:is-success={state === 'success'}
                             class:is-warning={state === 'warning'}
                             class:is-danger={state === 'error'}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
index 4810959dca..1ba209dee1 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
@@ -65,7 +65,13 @@
     }
 </script>
 
-<Modal {error} size="big" bind:show={showEdit} onSubmit={submit} icon={option?.icon}>
+<Modal
+    {error}
+    size="big"
+    bind:show={showEdit}
+    onSubmit={submit}
+    icon={option?.icon}
+    iconNotMobile={option?.type === 'relationship'}>
     <svelte:fragment slot="title">
         <div class="u-flex u-cross-center u-gap-8">
             {option?.name}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index 152f7211bf..f873a94fd2 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -66,7 +66,13 @@
     }
 </script>
 
-<Modal {error} size="big" bind:show={showCreate} onSubmit={submit} icon={$option?.icon}>
+<Modal
+    {error}
+    size="big"
+    bind:show={showCreate}
+    onSubmit={submit}
+    icon={$option?.icon}
+    iconNotMobile={selectedOption === 'Relationship'}>
     <svelte:fragment slot="title">
         {#if selectedOption === 'Relationship'}
             <span class="u-flex u-gap-16 u-cross-center">

From 2b78dc51be4c73407b737bb39af1c5cbeeef876e Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 9 Jan 2025 09:19:47 +0530
Subject: [PATCH 135/177] remove: todo.

---
 .../organization-[organization]/billing/budgetAlert.svelte       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index cd3e6a4cb3..67f0846d4b 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -100,7 +100,6 @@
                 </Alert>
             {:else}
                 <FormList>
-                    <!-- TODO: confirm copy, design mentions only Pro plan -->
                     <Alert type="info">
                         You can set a maximum of 4 billing alerts per organization.
                     </Alert>

From c51bf9cddcf22bcda483447864a321205ed24d1c Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 9 Jan 2025 09:23:44 +0530
Subject: [PATCH 136/177] ci: empty commit


From 92c45a5621eeea2489ab7e9f19dcb13baba2c2f9 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 11:21:53 +0000
Subject: [PATCH 137/177] feat: add sms to usage

---
 src/lib/sdk/billing.ts                        |  5 ++
 src/lib/stores/billing.ts                     |  9 +++-
 .../usage/[[invoice]]/+page.svelte            | 53 +++++++++++++++++++
 .../usage/[[invoice]]/+page.ts                |  4 +-
 .../usage/[[invoice]]/ProjectBreakdown.svelte | 34 +++++++++---
 5 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 8cb3b58a92..95c9f5c77d 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -195,7 +195,11 @@ export type OrganizationUsage = {
         executions: number;
         bandwidth: number;
         users: number;
+        authPhoneTotal: number;
+        authPhoneEstimate: number;
     }>;
+    authPhoneTotal: number;
+    authPhoneEstimate: number;
 };
 
 export type AggregationList = {
@@ -270,6 +274,7 @@ export type Plan = {
     executions: number;
     realtime: number;
     logs: number;
+    authPhone: number;
     addons: {
         bandwidth: AdditionalResource;
         executions: AdditionalResource;
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index c14b4b9494..734445daa6 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -128,15 +128,20 @@ export type PlanServices =
     | 'teams'
     | 'users'
     | 'usersAddon'
-    | 'webhooks';
+    | 'webhooks'
+    | 'authPhone';
 
 export function getServiceLimit(serviceId: PlanServices, tier: Tier = null, plan?: Plan): number {
+
+    if (serviceId === 'authPhone') {
+        return 10;
+    }
     if (!isCloud) return 0;
     if (!serviceId) return 0;
     const info = get(plansInfo);
     if (!info) return 0;
     plan ??= info.get(tier ?? get(organization)?.billingPlan);
-    return plan?.[serviceId];
+    return plan?.[serviceId] ?? 0;
 }
 
 export const failedInvoice = cachedStore<
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 636f88fddb..089bcaa560 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -18,6 +18,8 @@
     import { BillingPlan } from '$lib/constants';
     import { trackEvent } from '$lib/actions/analytics';
     import TotalMembers from './totalMembers.svelte';
+    import { tooltip } from '$lib/actions/tooltip';
+    import { formatCurrency } from '$lib/helpers/numbers';
 
     export let data;
 
@@ -376,6 +378,57 @@
             {/if}
         </svelte:fragment>
     </CardGrid>
+    <CardGrid>
+        <Heading tag="h6" size="7">SMS OTP</Heading>
+        <p class="text">
+            OTPs are billed per SMS message, with rates varying by recipient country. For a detailed
+            cost breakdown, see the <a
+                href="https://appwrite.io/docs/advanced/platform/otp-sms"
+                class="link">pricing page</a
+            >.
+        </p>
+        <svelte:fragment slot="aside">
+            {#if data.organizationUsage.authPhoneTotal}
+                <div class="u-flex u-main-space-between">
+                    <p>
+                        <span class="heading-level-4"
+                            >{formatNum(data.organizationUsage.authPhoneTotal)}</span>
+                        <span class="body-text-1 u-bold">SMS OTPs</span>
+                    </p>
+                    <p class="u-flex u-gap-8 u-cross-center">
+                        <span class="u-color-text-offline">Estimated cost</span>
+                        <span class="body-text-2">
+                            {formatCurrency(data.organizationUsage.authPhoneEstimate)}
+                            <span
+                                class="icon-info u-color-text-offline"
+                                use:tooltip={{
+                                    content:
+                                        'The first 10 SMS OTP messages are provided at no cost. Pricing may vary as it depends on telecom rates and vendor agreements.'
+                                }} />
+                        </span>
+                    </p>
+                </div>
+
+                {#if project?.length > 0}
+                    <ProjectBreakdown
+                        projects={project}
+                        metric="authPhoneTotal"
+                        estimate="authPhoneEstimate"
+                        {data} />
+                {/if}
+            {:else}
+                <Card isDashed>
+                    <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
+                        <span
+                            class="icon-chart-square-bar text-large"
+                            aria-hidden="true"
+                            style="font-size: 32px;" />
+                        <p class="u-bold">No data to show</p>
+                    </div>
+                </Card>
+            {/if}
+        </svelte:fragment>
+    </CardGrid>
     <TotalMembers members={data?.organizationMembers} />
 
     <p class="text common-section u-color-text-gray">
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index 74dffcda2c..65bc7ca863 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -27,7 +27,9 @@ export const load: PageLoad = async ({ params, parent }) => {
                 executionsTotal: null,
                 projects: null,
                 executionsMBSecondsTotal: null,
-                buildsMBSecondsTotal: null
+                buildsMBSecondsTotal: null,
+                authPhoneTotal: null,
+                authPhoneEstimate: null,
             }
         };
     }
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 5516b61b78..aaba059543 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -10,41 +10,52 @@
         TableRowLink,
         TableScroll
     } from '$lib/elements/table';
-    import { abbreviateNumber } from '$lib/helpers/numbers';
+    import { abbreviateNumber, formatCurrency } from '$lib/helpers/numbers';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
     import type { OrganizationUsage } from '$lib/sdk/billing';
     import { base } from '$app/paths';
     import { canSeeProjects } from '$lib/stores/roles';
 
-    type Metric = 'users' | 'storage' | 'bandwidth' | 'executions';
+    type Metric = 'users' | 'storage' | 'bandwidth' | 'executions' | 'authPhoneTotal';
+    type Estimate = 'authPhoneEstimate';
+
     export let data: PageData;
     export let projects: OrganizationUsage['projects'];
     export let metric: Metric;
+    export let estimate: Estimate | undefined = undefined;
 
     function getProjectUsageLink(projectId: string): string {
         return `${base}/project-${projectId}/settings/usage`;
     }
 
-    function groupByProject(metric: Metric): Array<{ projectId: string; usage: number }> {
+    function groupByProject(
+        metric: Metric,
+        estimate?: Estimate
+    ): Array<{ projectId: string; usage: number; estimate?: number }> {
         const data = [];
         for (const project of projects) {
             const usage = project[metric];
+            if (!usage) {
+                continue;
+            }
             data.push({
                 projectId: project.projectId,
-                usage: usage ?? 0
+                usage: usage ?? 0,
+                estimate: estimate ? project[estimate] : undefined
             });
         }
         return data;
     }
 
     function format(value: number): string {
-        const humanized = humanFileSize(value);
         switch (metric) {
+            case 'authPhoneTotal':
             case 'executions':
             case 'users':
                 return abbreviateNumber(value);
             case 'storage':
             case 'bandwidth':
+                const humanized = humanFileSize(value);
                 return humanized.value + humanized.unit;
         }
     }
@@ -57,18 +68,25 @@
             <TableHeader>
                 <TableCellHead>Project</TableCellHead>
                 <TableCellHead>Usage</TableCellHead>
+                {#if estimate}
+                    <TableCellHead>Estimated Cost</TableCellHead>
+                {/if}
                 {#if $canSeeProjects}
                     <TableCellHead />
                 {/if}
             </TableHeader>
             <TableBody>
-                {#each groupByProject(metric).sort((a, b) => b.usage - a.usage) as project}
+                {#each groupByProject(metric, estimate).sort((a, b) => b.usage - a.usage) as project}
                     {#if !$canSeeProjects}
                         <TableRow>
                             <TableCell title="Project">
                                 {data.projectNames[project.projectId]?.name ?? 'Unknown'}
                             </TableCell>
                             <TableCell title="Usage">{format(project.usage)}</TableCell>
+                            {#if project.estimate}
+                                <TableCell title="Estimate"
+                                    >{formatCurrency(project.estimate)}</TableCell>
+                            {/if}
                         </TableRow>
                     {:else}
                         <TableRowLink href={getProjectUsageLink(project.projectId)}>
@@ -76,6 +94,10 @@
                                 {data.projectNames[project.projectId]?.name ?? 'Unknown'}
                             </TableCell>
                             <TableCell title="Usage">{format(project.usage)}</TableCell>
+                            {#if project.estimate}
+                                <TableCell title="Estimate"
+                                    >{formatCurrency(project.estimate)}</TableCell>
+                            {/if}
                             <TableCell right={true}>
                                 <span
                                     class="icon-cheveron-right u-cross-child-center ignore-icon-rotate" />

From d496093bb4223786819921888592d73eb8aa3d2f Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 11:25:03 +0000
Subject: [PATCH 138/177] chore: fmt

---
 src/lib/stores/billing.ts                                       | 1 -
 .../organization-[organization]/usage/[[invoice]]/+page.ts      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 734445daa6..5c4b4bee9e 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -132,7 +132,6 @@ export type PlanServices =
     | 'authPhone';
 
 export function getServiceLimit(serviceId: PlanServices, tier: Tier = null, plan?: Plan): number {
-
     if (serviceId === 'authPhone') {
         return 10;
     }
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index 65bc7ca863..4138acfa16 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -29,7 +29,7 @@ export const load: PageLoad = async ({ params, parent }) => {
                 executionsMBSecondsTotal: null,
                 buildsMBSecondsTotal: null,
                 authPhoneTotal: null,
-                authPhoneEstimate: null,
+                authPhoneEstimate: null
             }
         };
     }

From 9f68ee7e0f70d5f2ef4046f0d35bf8c6f98252df Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 11:33:33 +0000
Subject: [PATCH 139/177] fix: eslint

---
 .../usage/[[invoice]]/ProjectBreakdown.svelte                  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index aaba059543..8b6306293d 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -55,8 +55,7 @@
                 return abbreviateNumber(value);
             case 'storage':
             case 'bandwidth':
-                const humanized = humanFileSize(value);
-                return humanized.value + humanized.unit;
+                return humanFileSize(value).value + humanFileSize(value).unit;
         }
     }
 </script>

From 3b9c702c76d7215de0ef411465fcb3a0f7840b0b Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 12:01:36 +0000
Subject: [PATCH 140/177] fix: copy

---
 .../organization-[organization]/usage/[[invoice]]/+page.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 089bcaa560..a68b0452e3 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -403,7 +403,7 @@
                                 class="icon-info u-color-text-offline"
                                 use:tooltip={{
                                     content:
-                                        'The first 10 SMS OTP messages are provided at no cost. Pricing may vary as it depends on telecom rates and vendor agreements.'
+                                        'The first 10 SMS OTP messages each month are provided at no cost. Pricing may vary as it depends on telecom rates and vendor agreements.'
                                 }} />
                         </span>
                     </p>

From d8ae8f6ec1c4c263b2807acde6f0acc797fa2486 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:13:10 +0000
Subject: [PATCH 141/177] chore: design review

---
 src/lib/components/collapsibleItem.svelte                     | 2 +-
 .../usage/[[invoice]]/ProjectBreakdown.svelte                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte
index 92dd4e13da..075b4431fd 100644
--- a/src/lib/components/collapsibleItem.svelte
+++ b/src/lib/components/collapsibleItem.svelte
@@ -58,7 +58,7 @@
     // TODO: remove once pink is updated
     .collapsible-item:not(.is-info) {
         .collapsible-wrapper {
-            padding-left: 0.5rem;
+            padding-left: 0rem;
         }
         .collapsible-wrapper.is-disabled {
             cursor: not-allowed;
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 8b6306293d..b0d979b5c9 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -61,9 +61,9 @@
 </script>
 
 <Collapsible>
-    <CollapsibleItem>
+    <CollapsibleItem open>
         <svelte:fragment slot="title">Project breakdown</svelte:fragment>
-        <TableScroll noMargin style="table-layout: auto">
+        <TableScroll dense noStyles noMargin style="table-layout: auto">
             <TableHeader>
                 <TableCellHead>Project</TableCellHead>
                 <TableCellHead>Usage</TableCellHead>

From aee8bbd183e4dfe64ef2d7fe24a965161b42cae6 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:29:11 +0000
Subject: [PATCH 142/177] fix: right padding

---
 src/lib/components/collapsibleItem.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/collapsibleItem.svelte b/src/lib/components/collapsibleItem.svelte
index 075b4431fd..7cc30bca06 100644
--- a/src/lib/components/collapsibleItem.svelte
+++ b/src/lib/components/collapsibleItem.svelte
@@ -58,7 +58,7 @@
     // TODO: remove once pink is updated
     .collapsible-item:not(.is-info) {
         .collapsible-wrapper {
-            padding-left: 0rem;
+            padding: 0;
         }
         .collapsible-wrapper.is-disabled {
             cursor: not-allowed;

From 5c1240e8b19d613208dab86ad99b984111cee66e Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:00:20 +0000
Subject: [PATCH 143/177] ui: deadline warning

---
 .../organization-[organization]/usage/[[invoice]]/+page.svelte   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index a68b0452e3..00cff028b8 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -387,6 +387,7 @@
                 class="link">pricing page</a
             >.
         </p>
+        <p>You will not be charged for SMS OTP for messages before February 10th</p>
         <svelte:fragment slot="aside">
             {#if data.organizationUsage.authPhoneTotal}
                 <div class="u-flex u-main-space-between">

From 90036b32ab0b4016d221880978fb36b82b7d5ab3 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:00:55 +0000
Subject: [PATCH 144/177] ui: breakdown title

---
 .../usage/[[invoice]]/ProjectBreakdown.svelte | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index b0d979b5c9..e591da9735 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -24,6 +24,15 @@
     export let metric: Metric;
     export let estimate: Estimate | undefined = undefined;
 
+    function getMetricTitle(metric: Metric): string {
+        switch (metric) {
+            case 'authPhoneTotal':
+                return 'Amount';
+            default:
+                return 'Usage';
+        }
+    }
+
     function getProjectUsageLink(projectId: string): string {
         return `${base}/project-${projectId}/settings/usage`;
     }
@@ -50,6 +59,7 @@
     function format(value: number): string {
         switch (metric) {
             case 'authPhoneTotal':
+                return value.toString();
             case 'executions':
             case 'users':
                 return abbreviateNumber(value);
@@ -61,14 +71,14 @@
 </script>
 
 <Collapsible>
-    <CollapsibleItem open>
+    <CollapsibleItem>
         <svelte:fragment slot="title">Project breakdown</svelte:fragment>
         <TableScroll dense noStyles noMargin style="table-layout: auto">
             <TableHeader>
                 <TableCellHead>Project</TableCellHead>
-                <TableCellHead>Usage</TableCellHead>
+                <TableCellHead>{getMetricTitle(metric)}</TableCellHead>
                 {#if estimate}
-                    <TableCellHead>Estimated Cost</TableCellHead>
+                    <TableCellHead>Estimated cost</TableCellHead>
                 {/if}
                 {#if $canSeeProjects}
                     <TableCellHead />
@@ -81,9 +91,10 @@
                             <TableCell title="Project">
                                 {data.projectNames[project.projectId]?.name ?? 'Unknown'}
                             </TableCell>
-                            <TableCell title="Usage">{format(project.usage)}</TableCell>
+                            <TableCell title={getMetricTitle(metric)}
+                                >{format(project.usage)}</TableCell>
                             {#if project.estimate}
-                                <TableCell title="Estimate"
+                                <TableCell title="Estimated cost"
                                     >{formatCurrency(project.estimate)}</TableCell>
                             {/if}
                         </TableRow>
@@ -92,9 +103,10 @@
                             <TableCell title="Project">
                                 {data.projectNames[project.projectId]?.name ?? 'Unknown'}
                             </TableCell>
-                            <TableCell title="Usage">{format(project.usage)}</TableCell>
+                            <TableCell title={getMetricTitle(metric)}
+                                >{format(project.usage)}</TableCell>
                             {#if project.estimate}
-                                <TableCell title="Estimate"
+                                <TableCell title="Estimated cost"
                                     >{formatCurrency(project.estimate)}</TableCell>
                             {/if}
                             <TableCell right={true}>

From 760122d4e4d43e1dde72b9826a5591379e8f2015 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 17:19:14 +0000
Subject: [PATCH 145/177] feat: project level

---
 src/lib/helpers/diallingCodes.ts              | 191 ++++++++++++++++++
 src/lib/sdk/usage.ts                          |  15 ++
 .../usage/[[invoice]]/+page.svelte            |   4 +-
 .../usage/[[invoice]]/ProjectBreakdown.svelte |   4 +-
 .../settings/usage/[[invoice]]/+page.svelte   |  69 +++++++
 5 files changed, 279 insertions(+), 4 deletions(-)
 create mode 100644 src/lib/helpers/diallingCodes.ts

diff --git a/src/lib/helpers/diallingCodes.ts b/src/lib/helpers/diallingCodes.ts
new file mode 100644
index 0000000000..dab27f26fe
--- /dev/null
+++ b/src/lib/helpers/diallingCodes.ts
@@ -0,0 +1,191 @@
+const dialingCodes = {
+    '213': 'Algeria',
+    '376': 'Andorra',
+    '244': 'Angola',
+    '54': 'Argentina',
+    '374': 'Armenia',
+    '297': 'Aruba',
+    '61': 'Australia',
+    '43': 'Austria',
+    '994': 'Azerbaijan',
+    '973': 'Bahrain',
+    '880': 'Bangladesh',
+    '375': 'Belarus',
+    '32': 'Belgium',
+    '501': 'Belize',
+    '229': 'Benin',
+    '975': 'Bhutan',
+    '591': 'Bolivia',
+    '387': 'Bosnia and Herzegovina',
+    '267': 'Botswana',
+    '55': 'Brazil',
+    '673': 'Brunei',
+    '359': 'Bulgaria',
+    '226': 'Burkina Faso',
+    '257': 'Burundi',
+    '855': 'Cambodia',
+    '237': 'Cameroon',
+    '1': 'North America',
+    '238': 'Cape Verde Islands',
+    '56': 'Chile',
+    '86': 'China',
+    '57': 'Colombia',
+    '269': 'Comoros and Mayotte',
+    '242': 'Congo',
+    '682': 'Cook Islands',
+    '506': 'Costa Rica',
+    '385': 'Croatia',
+    '53': 'Cuba',
+    '357': 'Cyprus',
+    '420': 'Czech Republic',
+    '45': 'Denmark',
+    '253': 'Djibouti',
+    '593': 'Ecuador',
+    '20': 'Egypt',
+    '503': 'El Salvador',
+    '240': 'Equatorial Guinea',
+    '291': 'Eritrea',
+    '372': 'Estonia',
+    '251': 'Ethiopia',
+    '500': 'Falkland Islands',
+    '298': 'Faroe Islands',
+    '679': 'Fiji',
+    '358': 'Finland',
+    '33': 'France',
+    '594': 'French Guiana',
+    '689': 'French Polynesia',
+    '241': 'Gabon',
+    '220': 'Gambia',
+    '995': 'Georgia',
+    '49': 'Germany',
+    '233': 'Ghana',
+    '350': 'Gibraltar',
+    '30': 'Greece',
+    '299': 'Greenland',
+    '590': 'Guadeloupe',
+    '1671': 'Guam',
+    '502': 'Guatemala',
+    '224': 'Guinea',
+    '245': 'Guinea-Bissau',
+    '592': 'Guyana',
+    '509': 'Haiti',
+    '504': 'Honduras',
+    '852': 'Hong Kong',
+    '36': 'Hungary',
+    '354': 'Iceland',
+    '91': 'India',
+    '62': 'Indonesia',
+    '98': 'Iran',
+    '964': 'Iraq',
+    '353': 'Ireland',
+    '972': 'Israel',
+    '39': 'Italy',
+    '81': 'Japan',
+    '962': 'Jordan',
+    '254': 'Kenya',
+    '686': 'Kiribati',
+    '850': 'North Korea',
+    '82': 'South Korea',
+    '965': 'Kuwait',
+    '996': 'Kyrgyzstan',
+    '856': 'Laos',
+    '371': 'Latvia',
+    '961': 'Lebanon',
+    '266': 'Lesotho',
+    '231': 'Liberia',
+    '218': 'Libya',
+    '423': 'Liechtenstein',
+    '370': 'Lithuania',
+    '352': 'Luxembourg',
+    '853': 'Macao',
+    '389': 'Macedonia',
+    '261': 'Madagascar',
+    '265': 'Malawi',
+    '60': 'Malaysia',
+    '960': 'Maldives',
+    '223': 'Mali',
+    '356': 'Malta',
+    '692': 'Marshall Islands',
+    '596': 'Martinique',
+    '222': 'Mauritania',
+    '52': 'Mexico',
+    '691': 'Micronesia',
+    '373': 'Moldova',
+    '377': 'Monaco',
+    '976': 'Mongolia',
+    '212': 'Morocco',
+    '258': 'Mozambique',
+    '95': 'Myanmar',
+    '264': 'Namibia',
+    '674': 'Nauru',
+    '977': 'Nepal',
+    '31': 'Netherlands',
+    '687': 'New Caledonia',
+    '64': 'New Zealand',
+    '505': 'Nicaragua',
+    '227': 'Niger',
+    '234': 'Nigeria',
+    '683': 'Niue',
+    '672': 'Norfolk Islands',
+    '1670': 'Northern Mariana Islands',
+    '47': 'Norway',
+    '968': 'Oman',
+    '680': 'Palau',
+    '507': 'Panama',
+    '675': 'Papua New Guinea',
+    '595': 'Paraguay',
+    '51': 'Peru',
+    '63': 'Philippines',
+    '48': 'Poland',
+    '351': 'Portugal',
+    '974': 'Qatar',
+    '262': 'Reunion',
+    '40': 'Romania',
+    '7': 'Russia, Kazakhstan, Uzbekistan, Turkmenistan, and Tajikistan',
+    '250': 'Rwanda',
+    '378': 'San Marino',
+    '239': 'Sao Tome and Principe',
+    '966': 'Saudi Arabia',
+    '221': 'Senegal',
+    '381': 'Serbia',
+    '248': 'Seychelles',
+    '232': 'Sierra Leone',
+    '65': 'Singapore',
+    '421': 'Slovak Republic',
+    '386': 'Slovenia',
+    '677': 'Solomon Islands',
+    '252': 'Somalia',
+    '27': 'South Africa',
+    '34': 'Spain',
+    '94': 'Sri Lanka',
+    '290': 'St. Helena',
+    '249': 'Sudan',
+    '597': 'Suriname',
+    '268': 'Swaziland',
+    '46': 'Sweden',
+    '41': 'Switzerland',
+    '963': 'Syria',
+    '886': 'Taiwan',
+    '66': 'Thailand',
+    '228': 'Togo',
+    '676': 'Tonga',
+    '216': 'Tunisia',
+    '90': 'Turkey',
+    '688': 'Tuvalu',
+    '256': 'Uganda',
+    '380': 'Ukraine',
+    '971': 'United Arab Emirates',
+    '44': 'United Kingdom',
+    '598': 'Uruguay',
+    '678': 'Vanuatu',
+    '58': 'Venezuela',
+    '84': 'Vietnam',
+    '967': 'Yemen',
+    '260': 'Zambia',
+    '255': 'Zanzibar',
+    '263': 'Zimbabwe'
+};
+
+export function getCountryName(diallingCode: string): string {
+    return dialingCodes[diallingCode] ?? 'Unknown';
+}
diff --git a/src/lib/sdk/usage.ts b/src/lib/sdk/usage.ts
index f47e143418..304bad1f6f 100644
--- a/src/lib/sdk/usage.ts
+++ b/src/lib/sdk/usage.ts
@@ -299,4 +299,19 @@ export type UsageProject = {
      * Aggregated statistics of total number of buckets.
      */
     bucketsTotal: number;
+
+    /**
+     * Aggregated statistics of total number of SMS sent.
+     */
+    authPhoneTotal: number;
+
+    /**
+     * Aggregated statistics of estimated SMS cost.
+     */
+    authPhoneEstimate: number;
+
+    /**
+     * Aggregated statistics of total number SMS by country
+     */
+    authPhoneCountriesBreakdown: Models.MetricBreakdown[];
 };
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 00cff028b8..697c0dcf5c 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -19,7 +19,7 @@
     import { trackEvent } from '$lib/actions/analytics';
     import TotalMembers from './totalMembers.svelte';
     import { tooltip } from '$lib/actions/tooltip';
-    import { formatCurrency } from '$lib/helpers/numbers';
+    import { formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
 
     export let data;
 
@@ -393,7 +393,7 @@
                 <div class="u-flex u-main-space-between">
                     <p>
                         <span class="heading-level-4"
-                            >{formatNum(data.organizationUsage.authPhoneTotal)}</span>
+                            >{formatNumberWithCommas(data.organizationUsage.authPhoneTotal)}</span>
                         <span class="body-text-1 u-bold">SMS OTPs</span>
                     </p>
                     <p class="u-flex u-gap-8 u-cross-center">
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index e591da9735..8542fe75c5 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -10,7 +10,7 @@
         TableRowLink,
         TableScroll
     } from '$lib/elements/table';
-    import { abbreviateNumber, formatCurrency } from '$lib/helpers/numbers';
+    import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
     import type { OrganizationUsage } from '$lib/sdk/billing';
     import { base } from '$app/paths';
@@ -59,7 +59,7 @@
     function format(value: number): string {
         switch (metric) {
             case 'authPhoneTotal':
-                return value.toString();
+                return formatNumberWithCommas(value);
             case 'executions':
             case 'users':
                 return abbreviateNumber(value);
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
index d7666f5bca..c24e99a609 100644
--- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -2,6 +2,7 @@
     import { Container } from '$lib/layout';
     import { CardGrid, Heading, Card, ProgressBarBig } from '$lib/components';
     import {
+        TableRow,
         TableBody,
         TableCell,
         TableCellHead,
@@ -18,6 +19,10 @@
     import { total } from '$lib/layout/usage.svelte';
     import { BillingPlan } from '$lib/constants.js';
     import { base } from '$app/paths';
+    import { formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
+    import Collapsible from '$lib/components/collapsible.svelte';
+    import CollapsibleItem from '$lib/components/collapsibleItem.svelte';
+    import { getCountryName } from '$lib/helpers/diallingCodes.js';
 
     export let data;
 
@@ -380,6 +385,70 @@
             {/if}
         </svelte:fragment>
     </CardGrid>
+    <CardGrid>
+        <Heading tag="h6" size="7">SMS OTP</Heading>
+
+        <p class="text">
+            Calculated for all SMS OTP sent across your project. Resets at the start of each billing
+            cycle.
+        </p>
+        <svelte:fragment slot="aside">
+            {#if data.usage.authPhoneTotal}
+                <div class="u-flex u-main-space-between">
+                    <p>
+                        <span class="heading-level-4"
+                            >{formatNumberWithCommas(data.usage.authPhoneTotal)}</span>
+                        <span class="body-text-1 u-bold">SMS OTPs</span>
+                    </p>
+                    <p class="u-flex u-gap-8 u-cross-center">
+                        <span class="u-color-text-offline">Estimated cost</span>
+                        <span class="body-text-2">
+                            {formatCurrency(data.usage.authPhoneEstimate)}
+                        </span>
+                    </p>
+                </div>
+                {#if data.usage.authPhoneCountryBreakdown.length > 0}
+                    <Collapsible>
+                        <CollapsibleItem>
+                            <svelte:fragment slot="title">Region breakdown</svelte:fragment>
+                            <Table noMargin noStyles style="table-layout: auto">
+                                <TableHeader>
+                                    <TableCellHead>Region</TableCellHead>
+                                    <TableCellHead>Amount</TableCellHead>
+                                    <TableCellHead>Estimated cost</TableCellHead>
+                                </TableHeader>
+                                <TableBody>
+                                    {#each data.usage.authPhoneCountryBreakdown as phone}
+                                        <TableRow>
+                                            <TableCell title="Region">
+                                                {getCountryName(phone.name)}
+                                            </TableCell>
+                                            <TableCell title="Usage">
+                                                {formatNumberWithCommas(phone.value)}
+                                            </TableCell>
+                                            <TableCell title="Estimated cost">
+                                                {formatCurrency(phone.estimate)}
+                                            </TableCell>
+                                        </TableRow>
+                                    {/each}
+                                </TableBody>
+                            </Table>
+                        </CollapsibleItem>
+                    </Collapsible>
+                {/if}
+            {:else}
+                <Card isDashed>
+                    <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
+                        <span
+                            class="icon-chart-square-bar text-large"
+                            aria-hidden="true"
+                            style="font-size: 32px;" />
+                        <p class="u-bold">No data to show</p>
+                    </div>
+                </Card>
+            {/if}
+        </svelte:fragment>
+    </CardGrid>
     <p class="text u-text-color-gray u-margin-block-start-16">
         Metrics are estimates updated every 24 hours and may not accurately reflect your invoice.
     </p>

From af828c92f56a327e948ff948b31a0505c7217542 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Thu, 9 Jan 2025 17:27:15 +0000
Subject: [PATCH 146/177] chore: remove service limit

---
 src/lib/stores/billing.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 5c4b4bee9e..9b42358d15 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -132,9 +132,6 @@ export type PlanServices =
     | 'authPhone';
 
 export function getServiceLimit(serviceId: PlanServices, tier: Tier = null, plan?: Plan): number {
-    if (serviceId === 'authPhone') {
-        return 10;
-    }
     if (!isCloud) return 0;
     if (!serviceId) return 0;
     const info = get(plansInfo);

From f8712c3ea4904de8465f45620da788b8efe9adcc Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Thu, 9 Jan 2025 12:50:56 -0800
Subject: [PATCH 147/177] fix(avatars): fall back to email if name is empty

The fetch avatar API won't render properly if an empty string is
provided for the name so we should fall back to the email if the name
is empty.
---
 src/lib/layout/header.svelte                                  | 4 ++--
 src/routes/(console)/account/header.svelte                    | 2 +-
 src/routes/(console)/account/organizations/+page.svelte       | 2 +-
 .../(console)/organization-[organization]/header.svelte       | 2 +-
 .../organization-[organization]/settings/+page.svelte         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 390cad41b9..5158456e76 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -156,9 +156,9 @@
         {#if $user}
             <div class="drop-wrapper" class:is-open={showDropdown} bind:this={droplistElement}>
                 <button class="user-profile-button" on:click={() => (showDropdown = !showDropdown)}>
-                    <AvatarInitials size={40} name={$user.name} />
+                    <AvatarInitials size={40} name={$user.name || $user.email} />
                     <span class="user-profile-info is-only-desktop">
-                        <span class="name" data-private>{$user.name}</span>
+                        <span class="name" data-private>{$user.name || $user.email}</span>
                         {#if $organization}
                             <span class="title" data-private>{$organization.name}</span>
                         {/if}
diff --git a/src/routes/(console)/account/header.svelte b/src/routes/(console)/account/header.svelte
index 86adaa5bdd..ce5d6fc0c5 100644
--- a/src/routes/(console)/account/header.svelte
+++ b/src/routes/(console)/account/header.svelte
@@ -52,7 +52,7 @@
 <Cover>
     <svelte:fragment slot="header">
         <CoverTitle>
-            {$user.name}
+            {$user.name || $user.email}
         </CoverTitle>
         <div class="u-margin-inline-start-auto">
             <Button secondary on:click={logout}>Logout</Button>
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
index 04404d65c0..37aafa8cb7 100644
--- a/src/routes/(console)/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -28,7 +28,7 @@
 
     const getMemberships = async (teamId: string) => {
         const memberships = await sdk.forConsole.teams.listMemberships(teamId);
-        return memberships.memberships.map((team) => team.userName);
+        return memberships.memberships.map((team) => team.userName || team.userEmail);
     };
 
     function isCloudOrg(
diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index 090c9b82a7..c2438d1f38 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -58,7 +58,7 @@
         } else newOrgModal.set(true);
     }
 
-    $: avatars = $members.memberships?.map((m) => m.userName) ?? [];
+    $: avatars = $members.memberships?.map((m) => m.userName || m.userEmail) ?? [];
     $: organizationId = $page.params.organization;
     $: path = `${base}/organization-${organizationId}`;
     $: tabs = [
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/settings/+page.svelte
index c70eb1a8ec..98b236e6d7 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/+page.svelte
@@ -42,7 +42,7 @@
         }
     }
 
-    $: avatars = $members.memberships.map((team) => team.userName);
+    $: avatars = $members.memberships.map((m) => m.userName || m.userEmail);
     $: orgProjects = `${$projects.total} ${$projects.total === 1 ? 'project' : 'projects'}`;
     $: orgMembers = `${$organization.total} ${$organization.total === 1 ? 'member' : 'members'}`;
 </script>

From dff6ecd6ef924247b7634b05b7f036f1dbc81696 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 10 Jan 2025 14:52:59 +0530
Subject: [PATCH 148/177] address comments.

---
 .../billing/budgetAlert.svelte                        | 11 ++++++-----
 .../billing/paymentMethods.svelte                     |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index 67f0846d4b..f2881c78b4 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -3,7 +3,7 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Alert, CardGrid, Heading } from '$lib/components';
     import { BillingPlan, Dependencies } from '$lib/constants';
-    import { upgradeURL } from '$lib/stores/billing';
+    import { tierToPlan, upgradeURL } from '$lib/stores/billing';
     import { Button, Form, FormList, InputSelectSearch } from '$lib/elements/forms';
     import {
         Table,
@@ -82,16 +82,17 @@
         <Heading tag="h2" size="6">Billing alerts</Heading>
 
         <p class="text">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
                 Get notified by email when your organization meets a percentage of your budget cap. <b
-                    >Free organizations will receive one notification at 75% resource usage.</b>
+                    >{tierToPlan($organization.billingPlan).name} organizations will receive one notification
+                    at 75% resource usage.</b>
             {:else}
                 Get notified by email when your organization meets or exceeds a percentage of your
                 specified billing alert(s).
             {/if}
         </p>
         <svelte:fragment slot="aside">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
                 <Alert type="info">
                     <svelte:fragment slot="title"
                         >Billing alerts are a Pro plan feature
@@ -156,7 +157,7 @@
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
                 <Button
                     secondary
                     href={$upgradeURL}
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 9c50f62b36..892c7c0176 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -194,8 +194,7 @@
                 </article>
             {/if}
         </div>
-        {#if $organization?.billingPlan !== BillingPlan.FREE}
-            <!-- TODO: Add a simple button if a backup payment doesn't exist. -->
+        {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
             <div class="u-flex u-flex-vertical u-gap-8">
                 {#if $organization?.backupPaymentMethodId}
                     <h4 class="u-bold body-text-2">Backup</h4>

From be917bd88dedaf6a5e4da149d3ea2f7deada3a83 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 10 Jan 2025 15:02:47 +0530
Subject: [PATCH 149/177] add: tooltip.

---
 .../billing/paymentMethods.svelte             | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 892c7c0176..ebffd54261 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -20,6 +20,7 @@
     import DeleteOrgPayment from './deleteOrgPayment.svelte';
     import ReplaceCard from './replaceCard.svelte';
     import EditPaymentModal from '$routes/(console)/account/payments/editPaymentModal.svelte';
+    import { tooltip } from '$lib/actions/tooltip';
     import PaymentModal from '$lib/components/billing/paymentModal.svelte';
     import { user } from '$lib/stores/user';
 
@@ -249,20 +250,29 @@
                     <div
                         class="u-bold body-text-2 u-flex u-cross-center u-gap-8 u-padding-block-start-8">
                         <DropList bind:show={showDropdownBackup} placement="bottom-start">
-                            <Button
-                                text
-                                noMargin
-                                on:click={() => {
-                                    if (filteredPaymentMethods.length) {
-                                        showDropdownBackup = !showDropdownBackup;
-                                    } else {
-                                        isSelectedBackup = true;
-                                        showPayment = true;
-                                    }
-                                }}>
-                                <i class="icon-plus" />
-                                <span class="text"> Add a backup payment method </span>
-                            </Button>
+                            <div class="u-flex u-gap-8 u-cross-center">
+                                <Button
+                                    text
+                                    noMargin
+                                    on:click={() => {
+                                        if (filteredPaymentMethods.length) {
+                                            showDropdownBackup = !showDropdownBackup;
+                                        } else {
+                                            isSelectedBackup = true;
+                                            showPayment = true;
+                                        }
+                                    }}>
+                                    <span class="icon-plus" />
+                                    <span class="text"> Add a backup payment method </span>
+                                </Button>
+                                <span
+                                    class="icon-info u-cursor-pointer"
+                                    style="font-size: var(--icon-size-small)"
+                                    use:tooltip={{
+                                        content:
+                                            'When your default payment method fails, a backup method will be used to pay your invoice automatically'
+                                    }} />
+                            </div>
                             <svelte:fragment slot="list">
                                 {#if $paymentMethods.total}
                                     {#each filteredPaymentMethods as paymentMethod}

From 8811fa12d86d2e1e26a22f5302d7cee3ddd3ebdc Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:54:29 +0000
Subject: [PATCH 150/177] chore: bump console sdk

---
 package.json   |  2 +-
 pnpm-lock.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index f189113b97..6386a59f2d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "1.4.4",
+        "@appwrite.io/console": "^1.4.6",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 627a97cc9f..c7575548e4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: 1.4.4
-        version: 1.4.4
+        specifier: ^1.4.6
+        version: 1.4.6
       '@appwrite.io/pink':
         specifier: 0.25.0
         version: 0.25.0
@@ -95,7 +95,7 @@ importers:
         version: 6.6.3
       '@testing-library/svelte':
         specifier: ^5.2.4
-        version: 5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0(@types/node@22.9.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.81.0))
+        version: 5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0)
       '@testing-library/user-event':
         specifier: ^14.5.2
         version: 14.5.2(@testing-library/dom@10.4.0)
@@ -199,8 +199,8 @@ packages:
   '@analytics/type-utils@0.6.2':
     resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
 
-  '@appwrite.io/console@1.4.4':
-    resolution: {integrity: sha512-0B7PEHJIi0eS8+WQOs7RNwY+j3gffMTz6DKyvZAEJbe4550UnmTn4i8pxmyaiEVbhlqIVZ+QD8jVrjXqtkPK6Q==}
+  '@appwrite.io/console@1.4.6':
+    resolution: {integrity: sha512-oGA5gkecpy9E/fKJkaGn26JP9mgknc2Vn8hS6xhRBhmUPg8Vqlz0vgPpx1EQbPB2C5HWIf4yToSicOH31XGx6Q==}
 
   '@appwrite.io/pink-icons@0.25.0':
     resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==}
@@ -3834,7 +3834,7 @@ snapshots:
 
   '@analytics/type-utils@0.6.2': {}
 
-  '@appwrite.io/console@1.4.4': {}
+  '@appwrite.io/console@1.4.6': {}
 
   '@appwrite.io/pink-icons@0.25.0': {}
 
@@ -5075,7 +5075,7 @@ snapshots:
       lodash: 4.17.21
       redent: 3.0.0
 
-  '@testing-library/svelte@5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0(@types/node@22.9.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.81.0))':
+  '@testing-library/svelte@5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0)':
     dependencies:
       '@testing-library/dom': 10.4.0
       svelte: 4.2.19

From 5294517128201b4a7c59ce06a0b2c81547466e3a Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 10 Jan 2025 18:30:53 +0530
Subject: [PATCH 151/177] address comments, fix styles.

---
 src/lib/components/support.svelte             | 190 ++++++++++--------
 src/lib/layout/header.svelte                  |  19 +-
 .../wizard/support/mobileSupportModal.svelte  |  24 ++-
 3 files changed, 139 insertions(+), 94 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index d1b48681e2..6514b17652 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -9,9 +9,12 @@
     import { Card } from '$lib/components/index';
     import { app } from '$lib/stores/app';
     import { currentPlan } from '$lib/stores/organization';
+    import { isCloud } from '$lib/system';
 
     export let show = false;
 
+    export let showHeader = true;
+
     $: hasPremiumSupport = $currentPlan?.premiumSupport ?? false;
 
     $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeShortTimezoneName()}`;
@@ -46,97 +49,108 @@
             cta: 'Open issue',
             showSupport: false,
             label: 'Open GitHub issue',
-            link: 'https://github.com/appwrite',
+            link: 'https://github.com/appwrite/appwrite/issues/new/choose',
             description: 'Report a bug or pitch a new feature'
         }
     ];
+
+    const showCloudSupport = (index) => {
+        return (index === 0 && isCloud) || index > 0;
+    };
 </script>
 
 <section class="drop-section support-section">
-    <h4 class="heading-level-6">Support</h4>
-
-    {#each supportOptions as option}
-        <Card
-            isTile
-            class="support-option-card u-flex u-flex-vertical u-gap-12"
-            style="border-radius: var(--border-radius-small, 8px); padding: 0.65rem;">
-            <div class="u-flex u-flex-vertical u-gap-4">
-                <h4 class="body-text-2 u-bold">{option.label}</h4>
-
-                <p class="u-line-height-1-5 u-margin-block-start-8">
-                    {option.description}
-                </p>
-            </div>
-
-            {#if option.showSupport}
-                <div class="u-flex u-gap-12 u-cross-center">
-                    {#if !hasPremiumSupport}
-                        <Button
-                            href={$upgradeURL}
-                            on:click={() => {
-                                trackEvent('click_organization_upgrade', {
-                                    from: 'button',
-                                    source: 'support_menu'
-                                });
-                            }}
-                            ><span class="text">Get Premium support</span>
-                        </Button>
-                    {:else}
-                        <Button
-                            secondary
-                            on:click={() => {
-                                show = false;
-                                $showSupportModal = false;
-                                wizard.start(SupportWizard);
-                            }}>
-                            <span class="text">Contact support</span>
-                        </Button>
-                    {/if}
-
-                    <div class="u-flex u-gap-4 u-cross-center">
-                        {#if isSupportOnline()}
-                            <span
-                                class="icon-check-circle u-color-text-success"
-                                aria-hidden="true" />
+    {#if showHeader}
+        <h4 class="heading-level-6">Support</h4>
+    {/if}
+
+    {#each supportOptions as option, index}
+        {#if showCloudSupport(index)}
+            <Card
+                isTile
+                class="support-option-card u-flex u-flex-vertical u-gap-12"
+                style="border-radius: var(--border-radius-small, 8px); padding: 0.65rem;">
+                <div class="u-flex u-flex-vertical u-gap-4">
+                    <h4 class="body-text-2 u-bold">{option.label}</h4>
+
+                    <p class="u-line-height-1-5 u-margin-block-start-8">
+                        {option.description}
+                    </p>
+                </div>
+
+                {#if option.showSupport}
+                    <div class="u-flex u-gap-12 u-cross-center">
+                        {#if !hasPremiumSupport}
+                            <Button
+                                href={$upgradeURL}
+                                on:click={() => {
+                                    trackEvent('click_organization_upgrade', {
+                                        from: 'button',
+                                        source: 'support_menu'
+                                    });
+                                }}>
+                                <span class="text">Get Premium support</span>
+                            </Button>
+                        {:else}
+                            <Button
+                                secondary
+                                class="secondary-button"
+                                on:click={() => {
+                                    show = false;
+                                    $showSupportModal = false;
+                                    wizard.start(SupportWizard);
+                                }}>
+                                <span class="text">Contact support</span>
+                            </Button>
                         {/if}
 
-                        {supportTimings}
+                        <div class="u-flex u-gap-6 u-cross-center">
+                            <span
+                                aria-hidden="true"
+                                class="{isSupportOnline()
+                                    ? 'icon-check-circle u-color-text-success'
+                                    : 'icon-x-circle'} u-padding-block-end-1" />
+
+                            {supportTimings}
+                        </div>
                     </div>
-                </div>
-            {:else}
-                <Button
-                    href={option.link}
-                    external
-                    secondary
-                    class="u-flex u-cross-center u-gap-6"
-                    on:click={() => {
-                        trackEvent('click_organization_upgrade', {
-                            from: 'button',
-                            source: 'support_menu'
-                        });
-                    }}>
-                    <span class={`icon-${option.icon}`} />
-                    <span>{option.cta}</span>
-                </Button>
-            {/if}
-        </Card>
+                {:else}
+                    <Button
+                        href={option.link}
+                        external
+                        secondary
+                        class="secondary-button u-flex u-cross-center u-gap-6"
+                        on:click={() => {
+                            trackEvent('click_organization_upgrade', {
+                                from: 'button',
+                                source: 'support_menu'
+                            });
+                        }}>
+                        <span class={`icon-${option.icon}`} />
+                        <span>{option.cta}</span>
+                    </Button>
+                {/if}
+            </Card>
+        {/if}
     {/each}
 
-    <div class="u-width-full-line">
-        {#key $app.themeInUse}
-            <iframe
-                style="color-scheme: none"
-                title="Appwrite Status"
-                src={`https://status.appwrite.online/badge?theme=${
-                    $app.themeInUse === 'dark' ? 'dark' : 'light'
-                }`}
-                width="250"
-                height="30"
-                frameborder="0"
-                scrolling="no">
-            </iframe>
-        {/key}
-    </div>
+    {#if isCloud}
+        <div class="u-width-full-line">
+            {#key $app.themeInUse}
+                <iframe
+                    style="color-scheme: none"
+                    title="Appwrite Status"
+                    src={`https://status.appwrite.online/badge?theme=${
+                        $app.themeInUse === 'dark' ? 'dark' : 'light'
+                    }`}
+                    width="250"
+                    height="30"
+                    frameborder="0"
+                    scrolling="no">
+                </iframe>
+            {/key}
+        </div>
+    {/if}
 </section>
 
 <style lang="scss">
@@ -152,8 +166,24 @@
         }
     }
 
+    :global(.u-gap-6) {
+        gap: 0.375rem;
+    }
+
+    :global(.theme-dark .support-option-card) {
+        background: #1c1c20 !important;
+    }
+
+    :global(.theme-dark .support-option-card .secondary-button) {
+        background: #131315 !important;
+    }
+
     :global(.theme-light .support-option-card) {
         border: 1px solid var(--color-border-neutral, #ededf0);
         background: var(--color-bgColor-neutral-default, #fafafb);
     }
+
+    :global(.theme-light .support-option-card .secondary-button) {
+        background: #fff !important;
+    }
 </style>
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 124cbba96a..4818efd2e8 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -125,17 +125,14 @@
                 <Feedback />
             </svelte:fragment>
         </DropList>
-
-        {#if isCloud}
-            <DropList width="25" bind:show={showSupport} scrollable={true}>
-                <Button text on:click={() => (showSupport = !showSupport)}>
-                    <span class="text">Support</span>
-                </Button>
-                <svelte:fragment slot="other">
-                    <Support bind:show={showSupport} />
-                </svelte:fragment>
-            </DropList>
-        {/if}
+        <DropList width="25" bind:show={showSupport} scrollable={true}>
+            <Button text on:click={() => (showSupport = !showSupport)}>
+                <span class="text">Support</span>
+            </Button>
+            <svelte:fragment slot="other">
+                <Support bind:show={showSupport} />
+            </svelte:fragment>
+        </DropList>
         <Button
             actions={[
                 (node) => {
diff --git a/src/routes/(console)/wizard/support/mobileSupportModal.svelte b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
index 31f2108c6f..91818eddcb 100644
--- a/src/routes/(console)/wizard/support/mobileSupportModal.svelte
+++ b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
@@ -5,6 +5,24 @@
     export let show: boolean;
 </script>
 
-<Modal title="Contact us" bind:show>
-    <Support />
-</Modal>
+<div class="mobile-support-dialog-modal">
+    <Modal title="Support" headerDivider={false} size="small" bind:show>
+        <div class="inner-modal-wrapper">
+            <Support showHeader={false} />
+        </div>
+    </Modal>
+</div>
+
+<style>
+    :global(.mobile-support-dialog-modal dialog) {
+        background-color: #fff;
+    }
+
+    :global(.theme-dark .mobile-support-dialog-modal dialog) {
+        background-color: #131315;
+    }
+
+    .inner-modal-wrapper {
+        padding-block-start: 0.5rem;
+    }
+</style>

From 21bdfe8046fea96675dcda94b0eaaac4dcf794ae Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:09:51 +0000
Subject: [PATCH 152/177] chore: better semver

---
 package.json   | 2 +-
 pnpm-lock.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6386a59f2d..8a2056de8a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "^1.4.6",
+        "@appwrite.io/console": "1.4.6",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c7575548e4..399c267073 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,7 +9,7 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: ^1.4.6
+        specifier: 1.4.6
         version: 1.4.6
       '@appwrite.io/pink':
         specifier: 0.25.0

From 7c569050f15088ae0ba1660291fb54c70147e51d Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:18:19 +0000
Subject: [PATCH 153/177] fix: docs link, card title

---
 .../usage/[[invoice]]/+page.svelte                          | 6 +++---
 .../settings/usage/[[invoice]]/+page.svelte                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 697c0dcf5c..dc2ee003a1 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -379,15 +379,15 @@
         </svelte:fragment>
     </CardGrid>
     <CardGrid>
-        <Heading tag="h6" size="7">SMS OTP</Heading>
+        <Heading tag="h6" size="7">Phone OTP</Heading>
         <p class="text">
             OTPs are billed per SMS message, with rates varying by recipient country. For a detailed
             cost breakdown, see the <a
-                href="https://appwrite.io/docs/advanced/platform/otp-sms"
+                href="https://appwrite.io/docs/advanced/platform/phone-otp"
                 class="link">pricing page</a
             >.
         </p>
-        <p>You will not be charged for SMS OTP for messages before February 10th</p>
+        <p>You will not be charged for SMS OTP for messages before February 10th.</p>
         <svelte:fragment slot="aside">
             {#if data.organizationUsage.authPhoneTotal}
                 <div class="u-flex u-main-space-between">
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
index c24e99a609..a7c254f00d 100644
--- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -386,12 +386,12 @@
         </svelte:fragment>
     </CardGrid>
     <CardGrid>
-        <Heading tag="h6" size="7">SMS OTP</Heading>
-
+        <Heading tag="h6" size="7">Phone OTP</Heading>
         <p class="text">
             Calculated for all SMS OTP sent across your project. Resets at the start of each billing
             cycle.
         </p>
+        <p>You will not be charged for SMS OTP for messages before February 10th.</p>
         <svelte:fragment slot="aside">
             {#if data.usage.authPhoneTotal}
                 <div class="u-flex u-main-space-between">

From 110285d9168eb9c89873ca21f576dea64222d275 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:23:51 +0000
Subject: [PATCH 154/177] fix: terminology

---
 .../usage/[[invoice]]/+page.svelte                        | 6 +++---
 .../settings/usage/[[invoice]]/+page.svelte               | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index dc2ee003a1..3cebea75e6 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -387,14 +387,14 @@
                 class="link">pricing page</a
             >.
         </p>
-        <p>You will not be charged for SMS OTP for messages before February 10th.</p>
+        <p>You will not be charged for Phone OTPs before February 10th.</p>
         <svelte:fragment slot="aside">
             {#if data.organizationUsage.authPhoneTotal}
                 <div class="u-flex u-main-space-between">
                     <p>
                         <span class="heading-level-4"
                             >{formatNumberWithCommas(data.organizationUsage.authPhoneTotal)}</span>
-                        <span class="body-text-1 u-bold">SMS OTPs</span>
+                        <span class="body-text-1 u-bold">OTPs</span>
                     </p>
                     <p class="u-flex u-gap-8 u-cross-center">
                         <span class="u-color-text-offline">Estimated cost</span>
@@ -404,7 +404,7 @@
                                 class="icon-info u-color-text-offline"
                                 use:tooltip={{
                                     content:
-                                        'The first 10 SMS OTP messages each month are provided at no cost. Pricing may vary as it depends on telecom rates and vendor agreements.'
+                                        'The first 10 messages each month are provided at no cost. Pricing may vary as it depends on telecom rates and vendor agreements.'
                                 }} />
                         </span>
                     </p>
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
index a7c254f00d..49a6215280 100644
--- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -388,17 +388,17 @@
     <CardGrid>
         <Heading tag="h6" size="7">Phone OTP</Heading>
         <p class="text">
-            Calculated for all SMS OTP sent across your project. Resets at the start of each billing
-            cycle.
+            Calculated for all Phone OTP sent across your project. Resets at the start of each
+            billing cycle.
         </p>
-        <p>You will not be charged for SMS OTP for messages before February 10th.</p>
+        <p>You will not be charged for Phone OTPs before February 10th.</p>
         <svelte:fragment slot="aside">
             {#if data.usage.authPhoneTotal}
                 <div class="u-flex u-main-space-between">
                     <p>
                         <span class="heading-level-4"
                             >{formatNumberWithCommas(data.usage.authPhoneTotal)}</span>
-                        <span class="body-text-1 u-bold">SMS OTPs</span>
+                        <span class="body-text-1 u-bold">OTPs</span>
                     </p>
                     <p class="u-flex u-gap-8 u-cross-center">
                         <span class="u-color-text-offline">Estimated cost</span>

From ebcdc112c590877abaf11b24f6ab3d52d401e83c Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 11 Jan 2025 10:55:47 +0530
Subject: [PATCH 155/177] fix: perplexity template crash.

---
 src/lib/wizards/functions/steps/templatePermissions.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/steps/templatePermissions.svelte b/src/lib/wizards/functions/steps/templatePermissions.svelte
index d72be2f797..116fbf0681 100644
--- a/src/lib/wizards/functions/steps/templatePermissions.svelte
+++ b/src/lib/wizards/functions/steps/templatePermissions.svelte
@@ -10,7 +10,10 @@
     onMount(() => {
         $templateConfig.execute = $template.permissions.includes('any');
         templateScopes = scopes
-            .filter((scope) => $template.scopes.includes(scope.scope))
+            // hot fix for perplexity chat templates,
+            // backend doesn't have scopes for this template.
+            // TODO: @itznotabug fix on backend too.
+            .filter((scope) => ($template.scopes ?? []).includes(scope.scope))
             .map((scope) => ({
                 ...scope,
                 active: true

From 026ffcda43c707f632d522f5c54172a3bc78855b Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 11 Jan 2025 10:59:08 +0530
Subject: [PATCH 156/177] fix: comment.

---
 src/lib/wizards/functions/steps/templatePermissions.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/wizards/functions/steps/templatePermissions.svelte b/src/lib/wizards/functions/steps/templatePermissions.svelte
index 116fbf0681..a8559b5d4f 100644
--- a/src/lib/wizards/functions/steps/templatePermissions.svelte
+++ b/src/lib/wizards/functions/steps/templatePermissions.svelte
@@ -10,7 +10,7 @@
     onMount(() => {
         $templateConfig.execute = $template.permissions.includes('any');
         templateScopes = scopes
-            // hot fix for perplexity chat templates,
+            // hot fix for perplexity chat template,
             // backend doesn't have scopes for this template.
             // TODO: @itznotabug fix on backend too.
             .filter((scope) => ($template.scopes ?? []).includes(scope.scope))

From 0b404dfaf894283518357f99f53811f0724b75f1 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 13 Jan 2025 11:53:48 +0530
Subject: [PATCH 157/177] address comments, fix styles.

---
 src/lib/components/support.svelte                | 10 +++++++---
 src/lib/layout/header.svelte                     | 14 +++++++++++++-
 src/routes/(console)/wizard/support/step1.svelte |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 6514b17652..2f6c5b3d8e 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -68,12 +68,12 @@
         {#if showCloudSupport(index)}
             <Card
                 isTile
-                class="support-option-card u-flex u-flex-vertical u-gap-12"
+                class="support-option-card u-flex u-flex-vertical u-gap-16"
                 style="border-radius: var(--border-radius-small, 8px); padding: 0.65rem;">
                 <div class="u-flex u-flex-vertical u-gap-4">
                     <h4 class="body-text-2 u-bold">{option.label}</h4>
 
-                    <p class="u-line-height-1-5 u-margin-block-start-8">
+                    <p class="u-line-height-1-5">
                         {option.description}
                     </p>
                 </div>
@@ -156,7 +156,7 @@
 <style lang="scss">
     .support-section {
         gap: 1rem;
-        padding: 20px;
+        padding: 1rem;
         display: flex;
         flex-direction: column;
 
@@ -170,6 +170,10 @@
         gap: 0.375rem;
     }
 
+    :global(.support-option-card) {
+        padding: 0.75rem !important;
+    }
+
     :global(.theme-dark .support-option-card) {
         background: #1c1c20 !important;
     }
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 4818efd2e8..a714854f91 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -125,7 +125,12 @@
                 <Feedback />
             </svelte:fragment>
         </DropList>
-        <DropList width="25" bind:show={showSupport} scrollable={true}>
+        <DropList
+            class="support-drop-section"
+            bind:show={showSupport}
+            scrollable={true}
+            noArrow
+            placement="bottom-end">
             <Button text on:click={() => (showSupport = !showSupport)}>
                 <span class="text">Support</span>
             </Button>
@@ -262,3 +267,10 @@
         {/if}
     </nav>
 </div>
+
+<style>
+    :global(.support-drop-section) {
+        width: 28.375rem;
+        margin-block-start: 0.15rem;
+    }
+</style>
diff --git a/src/routes/(console)/wizard/support/step1.svelte b/src/routes/(console)/wizard/support/step1.svelte
index b780da48ea..68d2a37397 100644
--- a/src/routes/(console)/wizard/support/step1.svelte
+++ b/src/routes/(console)/wizard/support/step1.svelte
@@ -53,7 +53,7 @@
             <InputText
                 label="Subject"
                 id="subject"
-                placeholder="Briefly summarize your issue..."
+                placeholder="What do you need help with?"
                 bind:value={$supportData.subject}
                 required />
 

From 6a719aaac1f3bb8f6e068203a0c42ffa45a24047 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 13 Jan 2025 14:19:38 +0530
Subject: [PATCH 158/177] fix: layout shift.

---
 .../organization-[organization]/change-plan/+page.svelte      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index 7f4dadac2b..1ec959e437 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -269,9 +269,7 @@
                 bind:billingPlan
                 bind:selfService
                 anyOrgFree={!!anyOrgFree}
-                class={anyOrgFree && billingPlan !== BillingPlan.FREE
-                    ? 'u-margin-block-start-16'
-                    : ''} />
+                class="u-margin-block-16" />
 
             {#if isDowngrade}
                 {#if billingPlan === BillingPlan.FREE}

From 71bc63999412e4bb231e3d31a48f526cc58cc42e Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 13 Jan 2025 17:22:25 +0530
Subject: [PATCH 159/177] fix: tag dimensions on button and anchor.

---
 src/lib/elements/pill.svelte | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/lib/elements/pill.svelte b/src/lib/elements/pill.svelte
index 773a82cd38..47dd471fae 100644
--- a/src/lib/elements/pill.svelte
+++ b/src/lib/elements/pill.svelte
@@ -73,3 +73,11 @@
         <slot />
     </div>
 {/if}
+
+<style>
+    /* button and anchor tags seem to have special dimens, this should be auto fixed in pink2. */
+    :global(.tag):where(button, a) {
+        --p-tag-height: 2.125rem;
+        --p-tag-content-height: 2.024rem;
+    }
+</style>

From ce24c5b77576409b4ffc9facc6f1da5bcca3d50d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 13 Jan 2025 17:39:10 +0530
Subject: [PATCH 160/177] address comments.

---
 .../organization-[organization]/billing/budgetAlert.svelte  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index f2881c78b4..948eeab9e1 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -16,7 +16,7 @@
     } from '$lib/elements/table';
     import { symmetricDifference } from '$lib/helpers/array';
     import { addNotification } from '$lib/stores/notifications';
-    import { organization } from '$lib/stores/organization';
+    import { currentPlan, organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
 
@@ -82,7 +82,7 @@
         <Heading tag="h2" size="6">Billing alerts</Heading>
 
         <p class="text">
-            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
+            {#if !$currentPlan.budgeting}
                 Get notified by email when your organization meets a percentage of your budget cap. <b
                     >{tierToPlan($organization.billingPlan).name} organizations will receive one notification
                     at 75% resource usage.</b>
@@ -92,7 +92,7 @@
             {/if}
         </p>
         <svelte:fragment slot="aside">
-            {#if $organization?.billingPlan === BillingPlan.FREE || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION}
+            {#if !$currentPlan.budgeting}
                 <Alert type="info">
                     <svelte:fragment slot="title"
                         >Billing alerts are a Pro plan feature

From 9c2154b03bd1b58a15ce9c94be023455340f030c Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 13 Jan 2025 18:41:24 +0530
Subject: [PATCH 161/177] address comments.

---
 src/lib/components/support.svelte | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 2f6c5b3d8e..4c88d82f58 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -175,11 +175,13 @@
     }
 
     :global(.theme-dark .support-option-card) {
-        background: #1c1c20 !important;
+        // todo: get pink2 color vars
+        background: #1c1c20;
     }
 
     :global(.theme-dark .support-option-card .secondary-button) {
-        background: #131315 !important;
+      // todo: get pink2 color vars
+      background: #131315;
     }
 
     :global(.theme-light .support-option-card) {
@@ -188,6 +190,6 @@
     }
 
     :global(.theme-light .support-option-card .secondary-button) {
-        background: #fff !important;
+        background: var(--color-bgColor-neutral-primary, #fff);
     }
 </style>

From 3c6f2eb77469438e3eb36567ad7d98037ce3ba40 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 13 Jan 2025 19:54:48 +0530
Subject: [PATCH 162/177] update: color tokens.

---
 src/lib/components/support.svelte | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 4c88d82f58..d28cce1032 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -175,13 +175,11 @@
     }
 
     :global(.theme-dark .support-option-card) {
-        // todo: get pink2 color vars
-        background: #1c1c20;
+        background: var(--color-bgColor-neutral-default, #19191c);
     }
 
     :global(.theme-dark .support-option-card .secondary-button) {
-      // todo: get pink2 color vars
-      background: #131315;
+        background: var(--color-bgColor-neutral-primary, #131315);
     }
 
     :global(.theme-light .support-option-card) {

From c75db74558eafeb3f5ee6d864cd487f746c1c5c5 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 14 Jan 2025 13:32:04 +0530
Subject: [PATCH 163/177] address comment: `add a comment explaining why we
 need this workaround`.

---
 src/lib/helpers/date.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts
index 87bc7dc5f3..f7d7f3a4b2 100644
--- a/src/lib/helpers/date.ts
+++ b/src/lib/helpers/date.ts
@@ -128,6 +128,18 @@ export const localeTimezoneName = () => {
     return dateWithTimezone.split(', ')[1];
 };
 
+/**
+ * This function processes the timezone name using regex to:
+ *
+ * 1. Trim and simplify the text for UI display (e.g., IST, UST, etc.).
+ * 2. Handle cases where `timeZoneName: 'shortGeneric'` returns names like `India Time`,
+ *    which do not fit well in the support modal UI.
+ * 3. Not using `timeZoneName: 'short'`, as it can display `GMT+-` formatted timezones,
+ *    which may not be ideal.
+ *
+ * Refer to:
+ * https://github.com/appwrite/console/pull/1564#discussion_r1913977798
+ */
 export const localeShortTimezoneName = () => {
     const timezone = localeTimezoneName();
     return timezone.match(/[A-Z]/g)?.join('') || timezone;

From 2c9ff6547f6f3f72bc66095d9d2d6e6d2931eaff Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 17 Jan 2025 13:09:43 +0530
Subject: [PATCH 164/177] hotfix: add a default value until I can test
 multi-region instance.

---
 src/lib/stores/preferences.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index a5350a5550..fcd1f79e01 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -62,7 +62,7 @@ function createPreferences() {
         getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
             return (
                 preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ??
-                null
+                []
             );
         },
         setLimit: (limit: Preferences['limit']) =>

From b416032b0d83a233c07fe3bc090d36062dda7b14 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 18 Jan 2025 18:42:59 +0530
Subject: [PATCH 165/177] ran: formatter.

---
 CONTRIBUTING.md               | 46 +++++++++++++++++------------------
 README.md                     |  4 +--
 src/lib/stores/preferences.ts |  3 +--
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8fcb73389c..3d78e77a4c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,9 +108,9 @@ pnpm run lint
 
 Diagnostic tool that checks for the following:
 
--   Unused CSS
--   Svelte A11y hints
--   TypeScript compiler errors
+- Unused CSS
+- Svelte A11y hints
+- TypeScript compiler errors
 
 ```bash
 pnpm run check
@@ -130,11 +130,11 @@ doc-548-submit-a-pull-request-section-to-contribution-guide
 
 When `TYPE` can be:
 
--   **feat** - is a new feature
--   **doc** - documentation only changes
--   **cicd** - changes related to CI/CD system
--   **fix** - a bug fix
--   **refactor** - code change that neither fixes a bug nor adds a feature
+- **feat** - is a new feature
+- **doc** - documentation only changes
+- **cicd** - changes related to CI/CD system
+- **fix** - a bug fix
+- **refactor** - code change that neither fixes a bug nor adds a feature
 
 **All PRs must include a commit message with a description of the changes made!**
 
@@ -175,12 +175,12 @@ $ git push origin [name_of_your_new_branch]
 
 Before committing always make sure to run all available tools to improve the codebase:
 
--   Formatter
-    -   `pnpm run format`
--   Tests
-    -   `pnpm test`
--   Diagnostics
-    -   `pnpm run check`
+- Formatter
+    - `pnpm run format`
+- Tests
+    - `pnpm test`
+- Diagnostics
+    - `pnpm run check`
 
 ### Performance
 
@@ -188,9 +188,9 @@ Page load times are a key consideration for users of all browsers and device typ
 
 There are some general things we can do in front-end development:
 
--   Minimize HTTP requests
--   Minimize blocking – content should be readable before client-side processing
--   Lazy load "supplementary" content, especially images
+- Minimize HTTP requests
+- Minimize blocking – content should be readable before client-side processing
+- Lazy load "supplementary" content, especially images
 
 ### Don't Repeat Yourself (DRY)
 
@@ -202,12 +202,12 @@ If you stick to this principle, you will ensure that you will only ever need to
 
 Separate _structure_ from _presentation_ from _behavior_ to aid maintainability and understanding.
 
--   Keep CSS (presentation), JS (behavior) and HTML (structure) in the same respective Svelte component
--   Avoid writing inline CSS or Javascript in HTML
--   Avoid writing CSS or HTML in Javascript
--   Don't choose HTML elements to imply style
--   Where appropriate, use CSS or Svelte rather than Javascript for animations and transitions
--   Try to use templates when defining markup in Javascript
+- Keep CSS (presentation), JS (behavior) and HTML (structure) in the same respective Svelte component
+- Avoid writing inline CSS or Javascript in HTML
+- Avoid writing CSS or HTML in Javascript
+- Don't choose HTML elements to imply style
+- Where appropriate, use CSS or Svelte rather than Javascript for animations and transitions
+- Try to use templates when defining markup in Javascript
 
 ### Write code to be read
 
diff --git a/README.md b/README.md
index e37369791b..9e113f1215 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@
 
 Appwrite Console has been built with the following frameworks:
 
--   [Svelte](https://svelte.dev/)
--   [Svelte Kit](https://kit.svelte.dev/)
+- [Svelte](https://svelte.dev/)
+- [Svelte Kit](https://kit.svelte.dev/)
 
 ## Developer Experience
 
diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index fcd1f79e01..d75cfcad19 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -61,8 +61,7 @@ function createPreferences() {
 
         getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
             return (
-                preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ??
-                []
+                preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ?? []
             );
         },
         setLimit: (limit: Preferences['limit']) =>

From 1ff9cdbb23a3485947f878e32d13dc394e84dff8 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sat, 18 Jan 2025 19:55:41 +0530
Subject: [PATCH 166/177] ci: empty commit


From 78b61da2f1133e9d59709cf321f0fb22dbb37d0d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 19 Jan 2025 12:12:10 +0530
Subject: [PATCH 167/177] run: formatter again!

---
 CONTRIBUTING.md | 46 +++++++++++++++++++++++-----------------------
 README.md       |  4 ++--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3d78e77a4c..8fcb73389c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,9 +108,9 @@ pnpm run lint
 
 Diagnostic tool that checks for the following:
 
-- Unused CSS
-- Svelte A11y hints
-- TypeScript compiler errors
+-   Unused CSS
+-   Svelte A11y hints
+-   TypeScript compiler errors
 
 ```bash
 pnpm run check
@@ -130,11 +130,11 @@ doc-548-submit-a-pull-request-section-to-contribution-guide
 
 When `TYPE` can be:
 
-- **feat** - is a new feature
-- **doc** - documentation only changes
-- **cicd** - changes related to CI/CD system
-- **fix** - a bug fix
-- **refactor** - code change that neither fixes a bug nor adds a feature
+-   **feat** - is a new feature
+-   **doc** - documentation only changes
+-   **cicd** - changes related to CI/CD system
+-   **fix** - a bug fix
+-   **refactor** - code change that neither fixes a bug nor adds a feature
 
 **All PRs must include a commit message with a description of the changes made!**
 
@@ -175,12 +175,12 @@ $ git push origin [name_of_your_new_branch]
 
 Before committing always make sure to run all available tools to improve the codebase:
 
-- Formatter
-    - `pnpm run format`
-- Tests
-    - `pnpm test`
-- Diagnostics
-    - `pnpm run check`
+-   Formatter
+    -   `pnpm run format`
+-   Tests
+    -   `pnpm test`
+-   Diagnostics
+    -   `pnpm run check`
 
 ### Performance
 
@@ -188,9 +188,9 @@ Page load times are a key consideration for users of all browsers and device typ
 
 There are some general things we can do in front-end development:
 
-- Minimize HTTP requests
-- Minimize blocking – content should be readable before client-side processing
-- Lazy load "supplementary" content, especially images
+-   Minimize HTTP requests
+-   Minimize blocking – content should be readable before client-side processing
+-   Lazy load "supplementary" content, especially images
 
 ### Don't Repeat Yourself (DRY)
 
@@ -202,12 +202,12 @@ If you stick to this principle, you will ensure that you will only ever need to
 
 Separate _structure_ from _presentation_ from _behavior_ to aid maintainability and understanding.
 
-- Keep CSS (presentation), JS (behavior) and HTML (structure) in the same respective Svelte component
-- Avoid writing inline CSS or Javascript in HTML
-- Avoid writing CSS or HTML in Javascript
-- Don't choose HTML elements to imply style
-- Where appropriate, use CSS or Svelte rather than Javascript for animations and transitions
-- Try to use templates when defining markup in Javascript
+-   Keep CSS (presentation), JS (behavior) and HTML (structure) in the same respective Svelte component
+-   Avoid writing inline CSS or Javascript in HTML
+-   Avoid writing CSS or HTML in Javascript
+-   Don't choose HTML elements to imply style
+-   Where appropriate, use CSS or Svelte rather than Javascript for animations and transitions
+-   Try to use templates when defining markup in Javascript
 
 ### Write code to be read
 
diff --git a/README.md b/README.md
index 9e113f1215..e37369791b 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@
 
 Appwrite Console has been built with the following frameworks:
 
-- [Svelte](https://svelte.dev/)
-- [Svelte Kit](https://kit.svelte.dev/)
+-   [Svelte](https://svelte.dev/)
+-   [Svelte Kit](https://kit.svelte.dev/)
 
 ## Developer Experience
 

From cca4a811427647f8f378dedec851a0d1e69a3f09 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 20 Jan 2025 16:18:15 +0530
Subject: [PATCH 168/177] fix: error during attribute creation.

---
 src/lib/stores/preferences.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index 84c00a0be3..11c4323552 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -57,7 +57,7 @@ function createPreferences() {
         getCustomCollectionColumns: (
             projectId: string,
             collectionId: string
-        ): Preferences['columns'] => preferences[projectId]?.collections?.[collectionId] ?? null,
+        ): Preferences['columns'] => preferences[projectId]?.collections?.[collectionId] ?? [],
         setLimit: (projectId: string, route: Page['route'], limit: Preferences['limit']) =>
             update((n) => {
                 if (!n[projectId]?.[route.id]) {

From 860cc5e41ccb50bd62f8b54815b2f5eb36c2c63b Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Mon, 20 Jan 2025 13:53:27 +0100
Subject: [PATCH 169/177] Show only the size limit for the bucket

---
 .../bucket-[bucket]/create-file/step1.svelte  | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index bdce4159b4..90a49a46e6 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -1,43 +1,37 @@
 <script lang="ts">
     import { Alert, CustomId } from '$lib/components';
-    import { BillingPlan } from '$lib/constants';
+    import { page } from '$app/stores';
     import { Pill } from '$lib/elements';
-    import { Button, FormList, InputFile } from '$lib/elements/forms';
+    import { FormList, InputFile } from '$lib/elements/forms';
     import { humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
     import WizardStep from '$lib/layout/wizardStep.svelte';
-    import { tierToPlan, upgradeURL } from '$lib/stores/billing';
-    import { organization, currentPlan } from '$lib/stores/organization';
+    import { currentPlan } from '$lib/stores/organization';
     import { isCloud } from '$lib/system';
     import { bucket } from '../store';
     import { createFile } from './store';
+    import { base } from '$app/paths';
 
     let showCustomId = false;
+    let fileError: string = null;
     const service = $currentPlan['fileSize'];
+    const projectId = $page.params.project;
 </script>
 
 <WizardStep>
     <svelte:fragment slot="title">File</svelte:fragment>
     <svelte:fragment slot="subtitle">Upload a file to add it to your bucket.</svelte:fragment>
 
-    {#if isCloud}
-        {@const size = humanFileSize(sizeToBytes(service, 'MB', 1000))}
-        {@const plan = tierToPlan($organization?.billingPlan)}
+    {#if isCloud && fileError === 'File size exceeds the limit'}
+        {@const size = humanFileSize($bucket.maximumFileSize ?? sizeToBytes(service, 'MB', 1000))}
         <Alert type="info">
             <p class="text">
-                The {plan.name} plan has a maximum upload file size limit of {Math.floor(
-                    parseInt(size.value)
-                )}{size.unit}.
-                {#if $organization?.billingPlan === BillingPlan.FREE}
-                    Upgrade to allow files of a larger size.
-                {/if}
+                The maximum file upload size for this bucket is {parseInt(size.value)}{size.unit}.
+                Edit this number in your
+                <a
+                    href={`${base}/project-${projectId}/storage/bucket-${$bucket.$id}/settings`}
+                    style:text-decoration="underline">bucket settings</a
+                >.
             </p>
-            <svelte:fragment slot="action">
-                {#if $organization?.billingPlan === BillingPlan.FREE}
-                    <div class="alert-buttons u-flex">
-                        <Button text href={$upgradeURL}>Upgrade plan</Button>
-                    </div>
-                {/if}
-            </svelte:fragment>
         </Alert>
     {/if}
 
@@ -47,6 +41,7 @@
                 required
                 bind:files={$createFile.files}
                 allowedFileExtensions={$bucket.allowedFileExtensions}
+                bind:error={fileError}
                 maxSize={isCloud
                     ? $bucket.maximumFileSize
                     : ($bucket.maximumFileSize ?? sizeToBytes(service, 'MB', 1000))} />

From d898d916a27050289bbc8443528ded2a654b80b7 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Tue, 21 Jan 2025 10:14:40 +0100
Subject: [PATCH 170/177] new copy

---
 .../storage/bucket-[bucket]/create-file/step1.svelte            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index 90a49a46e6..f0e5a595fb 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -26,7 +26,7 @@
         <Alert type="info">
             <p class="text">
                 The maximum file upload size for this bucket is {parseInt(size.value)}{size.unit}.
-                Edit this number in your
+                You can adjust it in your&nbsp;
                 <a
                     href={`${base}/project-${projectId}/storage/bucket-${$bucket.$id}/settings`}
                     style:text-decoration="underline">bucket settings</a

From adc77129386d5e43c45fdd2029cf748d1cefeccb Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Tue, 21 Jan 2025 10:18:00 +0100
Subject: [PATCH 171/177] new copy

---
 .../storage/bucket-[bucket]/create-file/step1.svelte            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index f0e5a595fb..43454a4614 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -26,7 +26,7 @@
         <Alert type="info">
             <p class="text">
                 The maximum file upload size for this bucket is {parseInt(size.value)}{size.unit}.
-                You can adjust it in your&nbsp;
+                You can adjust it in your
                 <a
                     href={`${base}/project-${projectId}/storage/bucket-${$bucket.$id}/settings`}
                     style:text-decoration="underline">bucket settings</a

From 6608d052157781b515709d338d66b3c89f1fb60a Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Wed, 22 Jan 2025 14:12:00 +0900
Subject: [PATCH 172/177] Update Console SDK Version

---
 package.json   |  2 +-
 pnpm-lock.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 8a2056de8a..428927dc57 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "1.4.6",
+        "@appwrite.io/console": "1.4.7",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 399c267073..a31a13a9ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: 1.4.6
-        version: 1.4.6
+        specifier: 1.4.7
+        version: 1.4.7
       '@appwrite.io/pink':
         specifier: 0.25.0
         version: 0.25.0
@@ -95,7 +95,7 @@ importers:
         version: 6.6.3
       '@testing-library/svelte':
         specifier: ^5.2.4
-        version: 5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0)
+        version: 5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0(@types/node@22.9.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.81.0))
       '@testing-library/user-event':
         specifier: ^14.5.2
         version: 14.5.2(@testing-library/dom@10.4.0)
@@ -199,8 +199,8 @@ packages:
   '@analytics/type-utils@0.6.2':
     resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
 
-  '@appwrite.io/console@1.4.6':
-    resolution: {integrity: sha512-oGA5gkecpy9E/fKJkaGn26JP9mgknc2Vn8hS6xhRBhmUPg8Vqlz0vgPpx1EQbPB2C5HWIf4yToSicOH31XGx6Q==}
+  '@appwrite.io/console@1.4.7':
+    resolution: {integrity: sha512-5zx+c5nWRm/UJNxgtOi4vj1pYW+wusfnOX2hqEGDLLuNZRc1rViYRefNuezosp5SPtjClCIYn9TGuFlz/XLwhw==}
 
   '@appwrite.io/pink-icons@0.25.0':
     resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==}
@@ -3834,7 +3834,7 @@ snapshots:
 
   '@analytics/type-utils@0.6.2': {}
 
-  '@appwrite.io/console@1.4.6': {}
+  '@appwrite.io/console@1.4.7': {}
 
   '@appwrite.io/pink-icons@0.25.0': {}
 
@@ -5075,7 +5075,7 @@ snapshots:
       lodash: 4.17.21
       redent: 3.0.0
 
-  '@testing-library/svelte@5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0)':
+  '@testing-library/svelte@5.2.4(svelte@4.2.19)(vite@5.4.11(@types/node@22.9.0)(sass@1.81.0))(vitest@1.6.0(@types/node@22.9.0)(@vitest/ui@1.6.0)(jsdom@22.1.0)(sass@1.81.0))':
     dependencies:
       '@testing-library/dom': 10.4.0
       svelte: 4.2.19

From 19e52351d45823fdb662d2cd52e801c4435c110e Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Wed, 22 Jan 2025 17:36:04 +0900
Subject: [PATCH 173/177] Fix github secrets

---
 .github/workflows/publish.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index efb347fd2a..66fe72d429 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,8 +17,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5
@@ -54,8 +54,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5
@@ -90,8 +90,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5

From 403744e9bbf72bfb2721ec9944498bfce57088c7 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Wed, 22 Jan 2025 17:39:21 +0900
Subject: [PATCH 174/177] Use vars for username instead of secret

---
 .github/workflows/publish.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 66fe72d429..ab33a8f375 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  username: ${{ vars.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
@@ -54,7 +54,7 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  username: ${{ vars.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
@@ -90,7 +90,7 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  username: ${{ vars.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta

From 1234691724b30d06333f4e25465faf01bf898271 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 22 Jan 2025 12:38:40 +0100
Subject: [PATCH 175/177] ci: fix docker hub credentials

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index efb347fd2a..c5a88598b4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,8 +17,8 @@ jobs:
             - name: Log in to Docker Hub
               uses: docker/login-action@v3
               with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
             - name: Extract metadata (tags, labels) for Docker
               id: meta
               uses: docker/metadata-action@v5

From 9af0556e165c26f921416840f2d643dd03b9e554 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Wed, 22 Jan 2025 14:54:18 +0100
Subject: [PATCH 176/177] fix: realtime using project namespace

---
 src/lib/components/backupRestoreBox.svelte    | 22 +++++-----
 src/lib/components/migrationBox.svelte        | 17 +++++---
 src/lib/pages/domains/create.svelte           |  7 +--
 .../project-[region]-[project]/+layout.svelte | 14 +++---
 .../database-[database]/backups/+page.svelte  | 19 +++++---
 .../collection-[collection]/+layout.svelte    | 18 ++++----
 .../function-[function]/+layout.svelte        | 43 +++++++++----------
 .../deployment-[deployment]/+page.svelte      |  9 ++--
 .../executions/+page.svelte                   | 13 +++---
 .../settings/migrations/+page.svelte          | 15 ++++---
 10 files changed, 98 insertions(+), 79 deletions(-)

diff --git a/src/lib/components/backupRestoreBox.svelte b/src/lib/components/backupRestoreBox.svelte
index 625c14497a..41dd6b4fb0 100644
--- a/src/lib/components/backupRestoreBox.svelte
+++ b/src/lib/components/backupRestoreBox.svelte
@@ -125,16 +125,18 @@
         // fast path: don't subscribe if org is on a free plan or is self-hosted.
         if (isSelfHosted || (isCloud && $organization.billingPlan === BillingPlan.FREE)) return;
 
-        return sdk.forConsole.client.subscribe('console', (response) => {
-            if (!response.channels.includes(`projects.${getProjectId()}`)) return;
-
-            if (
-                response.events.includes('archives.*') ||
-                response.events.includes('restorations.*')
-            ) {
-                updateOrAddItem(response.payload);
-            }
-        });
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe('console', (response) => {
+                if (!response.channels.includes(`projects.${getProjectId()}`)) return;
+
+                if (
+                    response.events.includes('archives.*') ||
+                    response.events.includes('restorations.*')
+                ) {
+                    updateOrAddItem(response.payload);
+                }
+            });
     });
 </script>
 
diff --git a/src/lib/components/migrationBox.svelte b/src/lib/components/migrationBox.svelte
index 9be9e2c486..57868cdb46 100644
--- a/src/lib/components/migrationBox.svelte
+++ b/src/lib/components/migrationBox.svelte
@@ -1,4 +1,5 @@
 <script lang="ts" context="module">
+    import { page } from '$app/stores';
     import { parseIfString } from '$lib/helpers/object';
     import { getProjectId } from '$lib/helpers/project';
     import { sdk } from '$lib/stores/sdk';
@@ -49,13 +50,15 @@
     })();
 
     onMount(() => {
-        return sdk.forConsole.client.subscribe<Models.Migration>(['console'], async (response) => {
-            if (!response.channels.includes(`projects.${getProjectId()}`)) return;
-            if (response.events.includes('migrations.*')) {
-                if (response.payload.source === 'Backup') return;
-                migration = response.payload;
-            }
-        });
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe<Models.Migration>(['console'], async (response) => {
+                if (!response.channels.includes(`projects.${getProjectId()}`)) return;
+                if (response.events.includes('migrations.*')) {
+                    if (response.payload.source === 'Backup') return;
+                    migration = response.payload;
+                }
+            });
     });
 </script>
 
diff --git a/src/lib/pages/domains/create.svelte b/src/lib/pages/domains/create.svelte
index 2626b8bf8a..a849a45518 100644
--- a/src/lib/pages/domains/create.svelte
+++ b/src/lib/pages/domains/create.svelte
@@ -9,13 +9,14 @@
     import { onMount } from 'svelte';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
+    import { page } from '$app/stores';
 
     onMount(() => {
         domain.set({ $id: '', domain: '' });
 
-        return sdk.forConsole.client.subscribe<Models.ProxyRule>('console', (data) =>
-            domain.set(data.payload)
-        );
+        return sdk
+            .forProject($page.params.region, $page.params.region)
+            .client.subscribe<Models.ProxyRule>('console', (data) => domain.set(data.payload));
     });
 
     async function onFinish() {
diff --git a/src/routes/(console)/project-[region]-[project]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/+layout.svelte
index b48d161ade..e9f5c8d0a3 100644
--- a/src/routes/(console)/project-[region]-[project]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/+layout.svelte
@@ -25,13 +25,15 @@
     } from '$lib/stores/roles';
 
     onMount(() => {
-        return sdk.forConsole.client.subscribe(['project', 'console'], (response) => {
-            if (response.events.includes('stats.connections')) {
-                for (const [projectId, value] of Object.entries(response.payload)) {
-                    stats.add(projectId, [new Date(response.timestamp).toISOString(), value]);
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe(['project', 'console'], (response) => {
+                if (response.events.includes('stats.connections')) {
+                    for (const [projectId, value] of Object.entries(response.payload)) {
+                        stats.add(projectId, [new Date(response.timestamp).toISOString(), value]);
+                    }
                 }
-            }
-        });
+            });
     });
 
     $: $registerCommands([
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
index babdff73e3..756cc10a09 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
@@ -159,14 +159,19 @@
     };
 
     onMount(() => {
-        return sdk.forConsole.client.subscribe('console', (response) => {
-            // fast path return.
-            if (!response.channels.includes(`projects.${getProjectId()}`)) return;
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe(['project', 'console'], (response) => {
+                // fast path return.
+                if (!response.channels.includes(`projects.${getProjectId()}`)) return;
 
-            if (response.events.includes('archives.*') || response.events.includes('policies.*')) {
-                invalidate(Dependencies.BACKUPS);
-            }
-        });
+                if (
+                    response.events.includes('archives.*') ||
+                    response.events.includes('policies.*')
+                ) {
+                    invalidate(Dependencies.BACKUPS);
+                }
+            });
     });
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index 5e44556873..39c413e1db 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -37,14 +37,16 @@
     let unsubscribe: { (): void };
 
     onMount(() => {
-        unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
-            if (
-                response.events.includes('databases.*.collections.*.attributes.*') ||
-                response.events.includes('databases.*.collections.*.indexes.*')
-            ) {
-                invalidate(Dependencies.COLLECTION);
-            }
-        });
+        unsubscribe = sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe(['project', 'console'], (response) => {
+                if (
+                    response.events.includes('databases.*.collections.*.attributes.*') ||
+                    response.events.includes('databases.*.collections.*.indexes.*')
+                ) {
+                    invalidate(Dependencies.COLLECTION);
+                }
+            });
     });
 
     onDestroy(() => {
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte
index fb61ee0f43..749dedbd4f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.svelte
@@ -13,28 +13,27 @@
 
     onMount(() => {
         let previousStatus = null;
-        return sdk.forConsole.client.subscribe<Models.Deployment>('console', (message) => {
-            if (previousStatus === message.payload.status) {
-                return;
-            }
-            previousStatus = message.payload.status;
-            if (message.events.includes('functions.*.deployments.*.create')) {
-                invalidate(Dependencies.DEPLOYMENTS);
-
-                return;
-            }
-            if (message.events.includes('functions.*.deployments.*.update')) {
-                invalidate(Dependencies.DEPLOYMENTS);
-                invalidate(Dependencies.FUNCTION);
-
-                return;
-            }
-            if (message.events.includes('functions.*.deployments.*.delete')) {
-                invalidate(Dependencies.DEPLOYMENTS);
-
-                return;
-            }
-        });
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe<Models.Deployment>('console', (message) => {
+                if (previousStatus === message.payload.status) {
+                    return;
+                }
+                previousStatus = message.payload.status;
+                if (message.events.includes('functions.*.deployments.*.create')) {
+                    invalidate(Dependencies.DEPLOYMENTS);
+                    return;
+                }
+                if (message.events.includes('functions.*.deployments.*.update')) {
+                    invalidate(Dependencies.DEPLOYMENTS);
+                    invalidate(Dependencies.FUNCTION);
+                    return;
+                }
+                if (message.events.includes('functions.*.deployments.*.delete')) {
+                    invalidate(Dependencies.DEPLOYMENTS);
+                    return;
+                }
+            });
     });
 
     $: $registerCommands([
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 79bd15f23f..fc6ea85275 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -56,9 +56,9 @@
             return;
         }
 
-        const unsubscribe = sdk.forConsole.client.subscribe<Models.Deployment>(
-            'console',
-            (message) => {
+        const unsubscribe = sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe<Models.Deployment>('console', (message) => {
                 if (
                     message.events.includes(
                         `functions.${$page.params.function}.deployments.${$page.params.deployment}.update`
@@ -69,8 +69,7 @@
                         invalidate(Dependencies.DEPLOYMENT);
                     }
                 }
-            }
-        );
+            });
 
         return () => {
             unsubscribe();
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
index 155b9ac78f..025c3a2303 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/+page.svelte
@@ -22,6 +22,7 @@
     import QuickFilters from './quickFilters.svelte';
     import { Pill } from '$lib/elements';
     import { tags } from '$lib/components/filters/store';
+    import { page } from '$app/stores';
 
     export let data;
 
@@ -146,11 +147,13 @@
     let showMobileFilters = false;
     onMount(() => {
         data?.query ? (showMobileFilters = true) : (showMobileFilters = false);
-        return sdk.forConsole.client.subscribe('console', (response) => {
-            if (response.events.includes('functions.*.executions.*')) {
-                invalidate(Dependencies.EXECUTIONS);
-            }
-        });
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe('functions.*.executiole', (response) => {
+                if (response.events.includes('functions.*.executions.*')) {
+                    invalidate(Dependencies.EXECUTIONS);
+                }
+            });
     });
 
     function clearAll() {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
index 1e7034cf3f..9e141d15fd 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
@@ -26,6 +26,7 @@
     import { readOnly } from '$lib/stores/billing';
     import type { Models } from '@appwrite.io/console';
     import { canWriteProjects } from '$lib/stores/roles';
+    import { page } from '$app/stores';
 
     export let data;
     let migration: Models.Migration = null;
@@ -44,12 +45,14 @@
         return 'pending';
     };
 
-    onMount(async () => {
-        sdk.forConsole.client.subscribe(['project', 'console'], (response) => {
-            if (response.events.includes('migrations.*')) {
-                invalidate(Dependencies.MIGRATIONS);
-            }
-        });
+    onMount(() => {
+        return sdk
+            .forProject($page.params.region, $page.params.project)
+            .client.subscribe(['project', 'console'], (response) => {
+                if (response.events.includes('migrations.*')) {
+                    invalidate(Dependencies.MIGRATIONS);
+                }
+            });
     });
 
     $: $registerCommands([

From 03bd2b4cc785bafe51d761b4c976c413db94182f Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Tue, 28 Jan 2025 17:36:36 +0100
Subject: [PATCH 177/177] fix: more links

---
 src/lib/commandCenter/searchers/buckets.ts    |  9 +++---
 .../commandCenter/searchers/collections.ts    |  4 +--
 src/lib/commandCenter/searchers/databases.ts  |  5 ++--
 src/lib/commandCenter/searchers/functions.ts  | 28 +++++++++++++------
 src/lib/commandCenter/searchers/messages.ts   | 10 +++----
 src/lib/commandCenter/searchers/providers.ts  |  4 +--
 src/lib/commandCenter/searchers/teams.ts      | 18 ++++++------
 src/lib/commandCenter/searchers/topics.ts     |  6 ++--
 src/lib/commandCenter/searchers/users.ts      | 22 +++++++++------
 .../auth/breadcrumbs.svelte                   |  4 +--
 .../auth/teams/team-[team]/breadcrumbs.svelte |  7 +++--
 .../auth/user-[user]/breadcrumbs.svelte       |  7 +++--
 .../databases/breadcrumbs.svelte              |  4 +--
 .../database-[database]/breadcrumbs.svelte    |  6 ++--
 .../breadcrumbs.svelte                        |  8 +++---
 .../document-[document]/breadcrumbs.svelte    |  8 +++---
 .../functions/breadcrumbs.svelte              |  5 ++--
 .../function-[function]/breadcrumbs.svelte    |  7 +++--
 .../breadcrumbs.svelte                        |  8 +++---
 .../messaging/breadcrumbs.svelte              |  5 ++--
 .../message-[message]/breadcrumbs.svelte      |  5 ++--
 .../overview/breadcrumbs.svelte               |  3 +-
 .../overview/keys/[key]/breadcrumbs.svelte    |  7 +++--
 .../settings/breadcrumbs.svelte               |  5 ++--
 .../webhooks/[webhook]/breadcrumbs.svelte     |  7 +++--
 .../bucket-[bucket]/breadcrumbs.svelte        |  7 +++--
 .../bucket-[bucket]/create-file/step1.svelte  |  3 +-
 .../file-[file]/breadcrumbs.svelte            |  8 +++---
 28 files changed, 122 insertions(+), 98 deletions(-)

diff --git a/src/lib/commandCenter/searchers/buckets.ts b/src/lib/commandCenter/searchers/buckets.ts
index 8b81a15740..6c6a30f4fb 100644
--- a/src/lib/commandCenter/searchers/buckets.ts
+++ b/src/lib/commandCenter/searchers/buckets.ts
@@ -9,11 +9,11 @@ import { FilesPanel } from '../panels';
 import { base } from '$app/paths';
 import { page } from '$app/stores';
 
-const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
+const getBucketCommand = (bucket: Models.Bucket, region: string, projectId: string) => {
     return {
         label: `${bucket.name}`,
         callback() {
-            goto(`${base}/project-${projectId}/storage/bucket-${bucket.$id}`);
+            goto(`${base}/project-${region}-${projectId}/storage/bucket-${bucket.$id}`);
         },
         group: 'buckets',
         icon: 'folder'
@@ -23,6 +23,7 @@ const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
 export const bucketSearcher = (async (query: string) => {
     const $page = get(page);
     const $project = get(project);
+    const region = $page.params.region;
     const { buckets } = await sdk
         .forProject($page.params.region, $page.params.project)
         .storage.listBuckets([Query.orderDesc('$createdAt')]);
@@ -32,7 +33,7 @@ export const bucketSearcher = (async (query: string) => {
     if (filtered.length === 1) {
         const bucket = filtered[0];
         return [
-            getBucketCommand(bucket, $project.$id),
+            getBucketCommand(bucket, region, $project.$id),
             {
                 label: 'Find files',
                 async callback() {
@@ -84,5 +85,5 @@ export const bucketSearcher = (async (query: string) => {
         ];
     }
 
-    return filtered.map((bucket) => getBucketCommand(bucket, $project.$id));
+    return filtered.map((bucket) => getBucketCommand(bucket, $project.region, $project.$id));
 }) satisfies Searcher;
diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts
index d7ece4b2d1..1045b17d24 100644
--- a/src/lib/commandCenter/searchers/collections.ts
+++ b/src/lib/commandCenter/searchers/collections.ts
@@ -1,6 +1,5 @@
 import { goto } from '$app/navigation';
 import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
@@ -14,7 +13,6 @@ export const collectionsSearcher = (async (query: string) => {
         .forProject($page.params.region, $page.params.project)
         .databases.listCollections(databaseId);
 
-    const projectId = get(project).$id;
     return collections
         .filter((col) => col.name.toLowerCase().includes(query.toLowerCase()))
         .map(
@@ -24,7 +22,7 @@ export const collectionsSearcher = (async (query: string) => {
                     label: col.name,
                     callback: () => {
                         goto(
-                            `${base}/project-${projectId}/databases/database-${databaseId}/collection-${col.$id}`
+                            `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${databaseId}/collection-${col.$id}`
                         );
                     }
                 }) as const
diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts
index bb1691e5ab..605afbb92b 100644
--- a/src/lib/commandCenter/searchers/databases.ts
+++ b/src/lib/commandCenter/searchers/databases.ts
@@ -1,5 +1,4 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
@@ -20,7 +19,9 @@ export const dbSearcher = (async (query: string) => {
                     group: 'databases',
                     label: db.name,
                     callback: () => {
-                        goto(`${base}/project-${get(project).$id}/databases/database-${db.$id}`);
+                        goto(
+                            `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${db.$id}`
+                        );
                     },
                     icon: 'database'
                 }) as const
diff --git a/src/lib/commandCenter/searchers/functions.ts b/src/lib/commandCenter/searchers/functions.ts
index 2c7867511d..0914919939 100644
--- a/src/lib/commandCenter/searchers/functions.ts
+++ b/src/lib/commandCenter/searchers/functions.ts
@@ -8,11 +8,11 @@ import { page } from '$app/stores';
 import { showCreateDeployment } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store';
 import { base } from '$app/paths';
 
-const getFunctionCommand = (fn: Models.Function, projectId: string) => {
+const getFunctionCommand = (fn: Models.Function, region: string, projectId: string) => {
     return {
         label: fn.name,
         callback: () => {
-            goto(`${base}/project-${projectId}/functions/function-${fn.$id}`);
+            goto(`${base}/project-${region}-${projectId}/functions/function-${fn.$id}`);
         },
         group: 'functions',
         icon: 'lightning-bolt'
@@ -31,14 +31,16 @@ export const functionsSearcher = (async (query: string) => {
     if (filtered.length === 1) {
         const func = filtered[0];
         return [
-            getFunctionCommand(func, projectId),
+            getFunctionCommand(func, $page.params.region, projectId),
             {
                 label: 'Create deployment',
                 nested: true,
                 async callback() {
                     const $page = get(page);
                     if (!$page.url.pathname.endsWith(func.$id)) {
-                        await goto(`${base}/project-${projectId}/functions/function-${func.$id}`);
+                        await goto(
+                            `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}`
+                        );
                     }
                     showCreateDeployment.set(true);
                 },
@@ -49,7 +51,9 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to deployments',
                 nested: true,
                 callback() {
-                    goto(`${base}/project-${projectId}/functions/function-${func.$id}`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}`
+                    );
                 },
                 group: 'functions'
             },
@@ -57,7 +61,9 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to usage',
                 nested: true,
                 callback() {
-                    goto(`${base}/project-${projectId}/functions/function-${func.$id}/usage`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/usage`
+                    );
                 },
                 group: 'functions'
             },
@@ -65,7 +71,9 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to executions',
                 nested: true,
                 callback() {
-                    goto(`${base}/project-${projectId}/functions/function-${func.$id}/executions`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/executions`
+                    );
                 },
                 group: 'functions'
             },
@@ -73,12 +81,14 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to settings',
                 nested: true,
                 callback() {
-                    goto(`${base}/project-${projectId}/functions/function-${func.$id}/settings`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/settings`
+                    );
                 },
                 group: 'functions'
             }
         ];
     }
 
-    return filtered.map((fn) => getFunctionCommand(fn, projectId));
+    return filtered.map((fn) => getFunctionCommand(fn, $page.params.region, projectId));
 }) satisfies Searcher;
diff --git a/src/lib/commandCenter/searchers/messages.ts b/src/lib/commandCenter/searchers/messages.ts
index 9db090442a..3e5e72c277 100644
--- a/src/lib/commandCenter/searchers/messages.ts
+++ b/src/lib/commandCenter/searchers/messages.ts
@@ -1,9 +1,8 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import { type Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
-import { MessagingProviderType } from '@appwrite.io/console';
+import { MessagingProviderType, type Models } from '@appwrite.io/console';
 import { base } from '$app/paths';
 import { page } from '$app/stores';
 
@@ -20,7 +19,7 @@ const getLabel = (message) => {
     }
 };
 
-const getIcon = (message) => {
+const getIcon = (message: Models.Message) => {
     switch (message.providerType) {
         case MessagingProviderType.Push:
             return 'device-mobile';
@@ -35,7 +34,6 @@ const getIcon = (message) => {
 
 export const messagesSearcher = (async (query: string) => {
     const $page = get(page);
-    const projectId = get(project).$id;
     const { messages } = await sdk
         .forProject($page.params.region, $page.params.project)
         .messaging.listMessages([], query || undefined);
@@ -48,7 +46,9 @@ export const messagesSearcher = (async (query: string) => {
                     group: 'messages',
                     label: getLabel(message),
                     callback: () => {
-                        goto(`${base}/project-${projectId}/messaging/message-${message.$id}`);
+                        goto(
+                            `${base}/project-${$page.params.region}-${$page.params.project}/messaging/message-${message.$id}`
+                        );
                     },
                     icon: getIcon(message)
                 }) as const
diff --git a/src/lib/commandCenter/searchers/providers.ts b/src/lib/commandCenter/searchers/providers.ts
index 1ff011c35c..4a30a9e65f 100644
--- a/src/lib/commandCenter/searchers/providers.ts
+++ b/src/lib/commandCenter/searchers/providers.ts
@@ -1,5 +1,4 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
@@ -14,7 +13,6 @@ const getIcon = (provider: string) => {
 
 export const providersSearcher = (async (query: string) => {
     const $page = get(page);
-    const projectId = get(project).$id;
     const { providers } = await sdk
         .forProject($page.params.region, $page.params.project)
         .messaging.listProviders([], query || undefined);
@@ -28,7 +26,7 @@ export const providersSearcher = (async (query: string) => {
                     label: provider.name,
                     callback: () => {
                         goto(
-                            `${base}/project-${projectId}/messaging/providers/provider-${provider.$id}`
+                            `${base}/project-${$page.params.region}-${$page.params.project}/messaging/providers/provider-${provider.$id}`
                         );
                     },
                     image: getIcon(provider.provider)
diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts
index 342cf547db..47de6470ec 100644
--- a/src/lib/commandCenter/searchers/teams.ts
+++ b/src/lib/commandCenter/searchers/teams.ts
@@ -1,17 +1,16 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
 import { base } from '$app/paths';
 import { page } from '$app/stores';
 
-const getTeamCommand = (team: Models.Team<Models.Preferences>, projectId: string) =>
+const getTeamCommand = (team: Models.Team<Models.Preferences>, region: string, projectId: string) =>
     ({
         label: team.name,
         callback: () => {
-            goto(`${base}/project-${projectId}/auth/teams/team-${team.$id}`);
+            goto(`${base}/project-${region}-${projectId}/auth/teams/team-${team.$id}`);
         },
         group: 'teams',
         icon: 'user-circle'
@@ -19,18 +18,19 @@ const getTeamCommand = (team: Models.Team<Models.Preferences>, projectId: string
 
 export const teamSearcher = (async (query: string) => {
     const $page = get(page);
-    const projectId = get(project).$id;
     const { teams } = await sdk
         .forProject($page.params.region, $page.params.project)
         .teams.list([], query);
 
     if (teams.length === 1) {
         return [
-            getTeamCommand(teams[0], projectId),
+            getTeamCommand(teams[0], $page.params.region, $page.params.project),
             {
                 label: 'Go to members',
                 callback: () => {
-                    goto(`${base}/project-${projectId}/auth/teams/team-${teams[0].$id}/members`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${$page.params.project}/auth/teams/team-${teams[0].$id}/members`
+                    );
                 },
                 group: 'teams',
                 nested: true
@@ -39,12 +39,14 @@ export const teamSearcher = (async (query: string) => {
             {
                 label: 'Go to activity',
                 callback: () => {
-                    goto(`${base}/project-${projectId}/auth/teams/team-${teams[0].$id}/activity`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${$page.params.project}/auth/teams/team-${teams[0].$id}/activity`
+                    );
                 },
                 group: 'teams',
                 nested: true
             }
         ];
     }
-    return teams.map((team) => getTeamCommand(team, projectId));
+    return teams.map((team) => getTeamCommand(team, $page.params.region, $page.params.project));
 }) satisfies Searcher;
diff --git a/src/lib/commandCenter/searchers/topics.ts b/src/lib/commandCenter/searchers/topics.ts
index 83bed62242..7e47149ded 100644
--- a/src/lib/commandCenter/searchers/topics.ts
+++ b/src/lib/commandCenter/searchers/topics.ts
@@ -1,5 +1,4 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
@@ -8,7 +7,6 @@ import { page } from '$app/stores';
 
 export const topicsSearcher = (async (query: string) => {
     const $page = get(page);
-    const projectId = get(project).$id;
     const { topics } = await sdk
         .forProject($page.params.region, $page.params.project)
         .messaging.listTopics([], query || undefined);
@@ -21,7 +19,9 @@ export const topicsSearcher = (async (query: string) => {
                     group: 'topics',
                     label: topic.name,
                     callback: () => {
-                        goto(`${base}/project-${projectId}/messaging/topics/topic-${topic.$id}`);
+                        goto(
+                            `${base}/project-${$page.params.region}-${$page.params.project}/messaging/topics/topic-${topic.$id}`
+                        );
                     },
                     icon: 'send'
                 }) as const
diff --git a/src/lib/commandCenter/searchers/users.ts b/src/lib/commandCenter/searchers/users.ts
index b7ee178282..31bfeadeef 100644
--- a/src/lib/commandCenter/searchers/users.ts
+++ b/src/lib/commandCenter/searchers/users.ts
@@ -1,6 +1,5 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
@@ -8,11 +7,11 @@ import { promptDeleteUser } from '$routes/(console)/project-[region]-[project]/a
 import { base } from '$app/paths';
 import { page } from '$app/stores';
 
-const getUserCommand = (user: Models.User<Models.Preferences>, projectId: string) =>
+const getUserCommand = (user: Models.User<Models.Preferences>, region: string, projectId: string) =>
     ({
         label: user.name,
         callback: () => {
-            goto(`${base}/project-${projectId}/auth/user-${user.$id}`);
+            goto(`${base}/project-${region}-${projectId}/auth/user-${user.$id}`);
         },
         group: 'users',
         icon: 'user-circle'
@@ -20,14 +19,13 @@ const getUserCommand = (user: Models.User<Models.Preferences>, projectId: string
 
 export const userSearcher = (async (query: string) => {
     const $page = get(page);
-    const projectId = get(project).$id;
     const { users } = await sdk
         .forProject($page.params.region, $page.params.project)
         .users.list([], query || undefined);
 
     if (users.length === 1) {
         return [
-            getUserCommand(users[0], projectId),
+            getUserCommand(users[0], $page.params.region, $page.params.project),
             {
                 label: 'Delete user',
                 callback: () => {
@@ -40,7 +38,9 @@ export const userSearcher = (async (query: string) => {
             {
                 label: 'Go to activity',
                 callback: () => {
-                    goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/activity`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${$page.params.project}/auth/user-${users[0].$id}/activity`
+                    );
                 },
                 group: 'users',
                 nested: true
@@ -48,7 +48,9 @@ export const userSearcher = (async (query: string) => {
             {
                 label: 'Go to sessions',
                 callback: () => {
-                    goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/sessions`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${$page.params.project}/auth/user-${users[0].$id}/sessions`
+                    );
                 },
                 group: 'users',
                 nested: true
@@ -56,12 +58,14 @@ export const userSearcher = (async (query: string) => {
             {
                 label: 'Go to memberships',
                 callback: () => {
-                    goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/memberships`);
+                    goto(
+                        `${base}/project-${$page.params.region}-${$page.params.project}/auth/user-${users[0].$id}/memberships`
+                    );
                 },
                 group: 'users',
                 nested: true
             }
         ];
     }
-    return users.map((user) => getUserCommand(user, projectId));
+    return users.map((user) => getUserCommand(user, $page.params.region, $page.params.project));
 }) satisfies Searcher;
diff --git a/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte
index 7fe41fa7c1..db806d0381 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/breadcrumbs.svelte
@@ -10,11 +10,11 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$project.region}-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/auth`,
+            href: `${base}/project-${$project.region}-${$project?.$id}/auth`,
             title: 'Auth'
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte
index b6ce1e98c1..04e22dcac8 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -11,15 +12,15 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project.region}-${$project.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/auth`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/auth`,
             title: 'Auth'
         },
         {
-            href: `${base}/project-${$project?.$id}/auth/teams/team-${$team?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/auth/teams/team-${$team?.$id}`,
             title: $team?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/breadcrumbs.svelte
index a457244f17..4217743d32 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -11,15 +12,15 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/auth`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/auth`,
             title: 'Auth'
         },
         {
-            href: `${base}/project-${$project?.$id}/auth/user-${$user?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/auth/user-${$user?.$id}`,
             title: $user?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
index 4c775c0f58..ef7fa53619 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
@@ -11,11 +11,11 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$page.data.project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$page.data.project?.$id}/databases`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases`,
             title: 'Databases'
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
index f5d6ec07db..8d730764da 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
@@ -11,15 +11,15 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$page.data.project.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $page.data.project.name
         },
         {
-            href: `${base}/project-${$page.data.project.$id}/databases`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases`,
             title: 'Databases'
         },
         {
-            href: `${base}/project-${$page.data.project.$id}/databases/database-${$database.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$database.$id}`,
             title: $database.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
index 2e54f9fd68..c588496c32 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
-    import { project } from '../../../store';
     import { database } from '../store';
     import { collection } from './store';
 
@@ -10,15 +10,15 @@
             title: '...'
         },
         {
-            href: `${base}/project-${$project?.$id}/databases`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases`,
             title: 'Databases'
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$database?.$id}`,
             title: $database?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
             title: $collection?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
index 0ba31c3432..88418f11fd 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
-    import { project } from '../../../../store';
     import { database } from '../../store';
     import { collection } from '../store';
     import { doc } from './store';
@@ -11,15 +11,15 @@
             title: '...'
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$database?.$id}`,
             title: $database?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
             title: $collection?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/document-${$doc?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/document-${$doc?.$id}`,
             title: $doc?.$id
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte
index 680afb49cf..514ebe0eb7 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
@@ -10,11 +11,11 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/functions`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/functions`,
             title: 'Functions'
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte
index 5b626d71d9..a9279c6b69 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -11,15 +12,15 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/functions`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/functions`,
             title: 'Functions'
         },
         {
-            href: `${base}/project-${$project?.$id}/functions/function-${$func?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$func?.$id}`,
             title: $func?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
index 7b9ff99bfe..45f96c86b6 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
-    import { project } from '../../../store';
     import { func } from '../store';
     import { deployment } from './store';
 
@@ -10,15 +10,15 @@
             title: '...'
         },
         {
-            href: `${base}/project-${$project?.$id}/functions`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/functions`,
             title: 'Functions'
         },
         {
-            href: `${base}/project-${$project?.$id}/functions/function-${$func?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$func?.$id}`,
             title: $func?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/functions/function-${$func?.$id}/deployment-${$deployment?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/functions/function-${$func?.$id}/deployment-${$deployment?.$id}`,
             title: 'Deployment'
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte
index 1d201d373d..2e825950c4 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
@@ -10,11 +11,11 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.region}-${$project.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.region}-${$project.$id}/messaging`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/messaging`,
             title: 'Messaging'
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte
index 2b49f54c94..3a96376c17 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -11,11 +12,11 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project.region}-${$project.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project.region}-${$project.$id}/messaging`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/messaging`,
             title:
                 $message.data.title ?? $message.data.subject ?? $message.data.content ?? 'Message'
         }
diff --git a/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte
index fad7b3cbcb..5fff6c258a 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
@@ -10,7 +11,7 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte
index 426594191e..a163a9fe62 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -11,15 +12,15 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/overview/keys`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/overview/keys`,
             title: 'API keys'
         },
         {
-            href: `${base}/project-${$project?.$id}/overview/keys/${$key?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/overview/keys/${$key?.$id}`,
             title: $key?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte
index 0db760fa7c..cef3df7146 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
@@ -10,11 +11,11 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/settings`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/settings`,
             title: 'Settings'
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
index 13d6f9b1b7..e4fc8517cd 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -11,15 +12,15 @@
             title: $organization?.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/settings/webhooks`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/settings/webhooks`,
             title: 'Settings'
         },
         {
-            href: `${base}/project-${$project?.$id}/settings/webhooks/webhook/${$webhook?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/settings/webhooks/webhook/${$webhook?.$id}`,
             title: $webhook?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
index dc28fe8a60..054a1811ca 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -11,15 +12,15 @@
             title: $organization.name
         },
         {
-            href: `${base}/project-${$project?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}`,
             title: $project.name
         },
         {
-            href: `${base}/project-${$project?.$id}/storage`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/storage`,
             title: 'Storage'
         },
         {
-            href: `${base}/project-${$project?.$id}/storage/bucket-${$bucket?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$bucket?.$id}`,
             title: $bucket?.name
         }
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index 43454a4614..6a0eac10bb 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -14,7 +14,6 @@
     let showCustomId = false;
     let fileError: string = null;
     const service = $currentPlan['fileSize'];
-    const projectId = $page.params.project;
 </script>
 
 <WizardStep>
@@ -28,7 +27,7 @@
                 The maximum file upload size for this bucket is {parseInt(size.value)}{size.unit}.
                 You can adjust it in your
                 <a
-                    href={`${base}/project-${projectId}/storage/bucket-${$bucket.$id}/settings`}
+                    href={`${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$bucket.$id}/settings`}
                     style:text-decoration="underline">bucket settings</a
                 >.
             </p>
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
index 45bd9c3552..c47b79901c 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
-    import { project } from '../../../store';
     import { bucket } from '../store';
     import { file } from './store';
 
@@ -10,15 +10,15 @@
             title: '...'
         },
         {
-            href: `${base}/project-${$project?.$id}/storage`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/storage`,
             title: 'Storage'
         },
         {
-            href: `${base}/project-${$project?.$id}/storage/bucket-${$bucket?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$bucket?.$id}`,
             title: $bucket?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/storage/bucket-${$bucket?.$id}/file-${$file?.$id}`,
+            href: `${base}/project-${$page.params.region}-${$page.params.project}/storage/bucket-${$bucket?.$id}/file-${$file?.$id}`,
             title: $file?.name
         }
     ];