From 316ae87a663e3523e45ad10954e2ba5ccd8c2304 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Wed, 20 Dec 2023 10:28:35 +0100
Subject: [PATCH 1/3] fix: usage page broken when no projects

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

diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts
index 8f5203de96..b1ef9a272b 100644
--- a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -43,7 +43,7 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     const queries: string[] = [];
 
-    if (usage.projects.length > 0) {
+    if (usage?.projects?.length > 0) {
         queries.push(
             Query.equal(
                 '$id',

From 759cf2b924cb2aa2ea4327fb596b23cff6a42258 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Wed, 20 Dec 2023 10:32:01 +0100
Subject: [PATCH 2/3] fix: `de` to `fra`

---
 src/lib/sdk/billing.ts                                          | 2 +-
 src/routes/console/onboarding/+page.svelte                      | 2 +-
 .../organization-[organization]/createProjectCloud.svelte       | 2 +-
 src/routes/console/organization-[organization]/wizard/store.ts  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 7f535263d4..32f6f0a2b1 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -185,7 +185,7 @@ export type AggregationList = {
 };
 
 export type AllowedRegions =
-    | 'eu-de'
+    | 'eu-fra'
     | 'us-nyc'
     | 'us-sfo'
     | 'ap-in'
diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte
index 244d861367..c2b26314ee 100644
--- a/src/routes/console/onboarding/+page.svelte
+++ b/src/routes/console/onboarding/+page.svelte
@@ -39,7 +39,7 @@
                 id ?? ID.unique(),
                 name,
                 org.$id,
-                isCloud ? 'eu-de' : 'default'
+                isCloud ? 'eu-fra' : 'default'
             );
             await invalidate(Dependencies.ACCOUNT);
             goto(`/console/project-${project.$id}`);
diff --git a/src/routes/console/organization-[organization]/createProjectCloud.svelte b/src/routes/console/organization-[organization]/createProjectCloud.svelte
index 03dc414a87..6128fea00f 100644
--- a/src/routes/console/organization-[organization]/createProjectCloud.svelte
+++ b/src/routes/console/organization-[organization]/createProjectCloud.svelte
@@ -52,7 +52,7 @@
         $createProject = {
             id: null,
             name: null,
-            region: 'eu-de'
+            region: 'eu-fra'
         };
     });
 
diff --git a/src/routes/console/organization-[organization]/wizard/store.ts b/src/routes/console/organization-[organization]/wizard/store.ts
index d171e8202e..5bcbc44729 100644
--- a/src/routes/console/organization-[organization]/wizard/store.ts
+++ b/src/routes/console/organization-[organization]/wizard/store.ts
@@ -7,5 +7,5 @@ export const createProject = writable<{
 }>({
     id: null,
     name: null,
-    region: 'eu-de'
+    region: 'eu-fra'
 });

From e1a70395a799713587b8170926564089f4b7e17b Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Wed, 20 Dec 2023 10:39:49 +0100
Subject: [PATCH 3/3] fix: regions

---
 src/lib/sdk/billing.ts                         | 18 +++++++++---------
 src/routes/console/onboarding/+page.svelte     |  2 +-
 .../createProjectCloud.svelte                  |  2 +-
 .../wizard/store.ts                            |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 32f6f0a2b1..31c2a07972 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -185,15 +185,15 @@ export type AggregationList = {
 };
 
 export type AllowedRegions =
-    | 'eu-fra'
-    | 'us-nyc'
-    | 'us-sfo'
-    | 'ap-in'
-    | 'eu-gb'
-    | 'eu-nl'
-    | 'ap-sg'
-    | 'ap-ca'
-    | 'ap-au'
+    | 'fra'
+    | 'nyc'
+    | 'sfo'
+    | 'blr'
+    | 'lon'
+    | 'ams'
+    | 'sgp'
+    | 'tor'
+    | 'syd'
     | 'default'; //TODO: remove after migration
 
 export type Region = {
diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte
index c2b26314ee..5cf93944cd 100644
--- a/src/routes/console/onboarding/+page.svelte
+++ b/src/routes/console/onboarding/+page.svelte
@@ -39,7 +39,7 @@
                 id ?? ID.unique(),
                 name,
                 org.$id,
-                isCloud ? 'eu-fra' : 'default'
+                isCloud ? 'fra' : 'default'
             );
             await invalidate(Dependencies.ACCOUNT);
             goto(`/console/project-${project.$id}`);
diff --git a/src/routes/console/organization-[organization]/createProjectCloud.svelte b/src/routes/console/organization-[organization]/createProjectCloud.svelte
index 6128fea00f..7072e6b0f0 100644
--- a/src/routes/console/organization-[organization]/createProjectCloud.svelte
+++ b/src/routes/console/organization-[organization]/createProjectCloud.svelte
@@ -52,7 +52,7 @@
         $createProject = {
             id: null,
             name: null,
-            region: 'eu-fra'
+            region: 'fra'
         };
     });
 
diff --git a/src/routes/console/organization-[organization]/wizard/store.ts b/src/routes/console/organization-[organization]/wizard/store.ts
index 5bcbc44729..d79bd1dedc 100644
--- a/src/routes/console/organization-[organization]/wizard/store.ts
+++ b/src/routes/console/organization-[organization]/wizard/store.ts
@@ -7,5 +7,5 @@ export const createProject = writable<{
 }>({
     id: null,
     name: null,
-    region: 'eu-fra'
+    region: 'fra'
 });