From 7d56e81732813be188cc0e85db83a899461cf8cb Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Wed, 5 Nov 2025 20:17:05 +0530
Subject: [PATCH 1/2] fix: blank project settings after canceling plan upgrade
 modal

---
 .../rows/columns/types/relationship.svelte    |  2 +-
 .../updateVariables.svelte                    | 28 ++++++++++++-------
 .../updateVariablesModal.svelte               | 10 +++++--
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
index f790579c56..bfdb540885 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
@@ -87,7 +87,7 @@
                 databaseId,
                 tableId: column.relatedTable,
                 // limit `5` as `25` would look too much on sheet!
-                queries: [Query.select(displayNames), Query.limit(5)]
+                queries: [Query.select(displayNames), Query.limit(10)]
             });
 
         cachedRowsCopyList = rows;
diff --git a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
index 86f24b136d..205cac43ac 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
@@ -273,10 +273,14 @@
         within your project.
     {:else}
         Set the environment variables or secret keys that will be passed to your {product}. Global
-        variables can be found in <Link
-            href={`${base}/project-${$project.region}-${$project.$id}/settings#variables`}>
-            project settings</Link
-        >.
+        variables can be found in {#if $project && $project.region && $project.$id}
+            <Link
+                href={`${base}/project-${$project.region}-${$project.$id}/settings#variables`}>
+                project settings</Link
+            >.
+        {:else}
+            project settings.
+        {/if}
     {/if}
     <svelte:fragment slot="aside">
         <Layout.Stack gap="l">
@@ -323,12 +327,16 @@
                                 Some environment variables have
                             {/if}
                             a naming conflict with a global variable. View global variables in
-                            <a
-                                href={`${base}/project-${$project.region}-${$project.$id}/settings`}
-                                title="Project settings"
-                                class="link">
-                                project settings</a
-                            >.
+                            {#if $project && $project.region && $project.$id}
+                                <a
+                                    href={`${base}/project-${$project.region}-${$project.$id}/settings`}
+                                    title="Project settings"
+                                    class="link">
+                                    project settings</a
+                                >.
+                            {:else}
+                                project settings.
+                            {/if}
                         </p>
                     </Alert.Inline>
                 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte b/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte
index 58e6026c0e..0022899444 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte
@@ -53,9 +53,13 @@
     <Layout.Stack>
         {#if !isGlobal}
             <Alert.Inline>
-                When there is a naming conflict with a global variable in your <Link
-                    href={`${base}/project-${$project.region}-${$project.$id}/settings/variables`}>
-                    project settings</Link>
+                When there is a naming conflict with a global variable in your {#if $project && $project.region && $project.$id}
+                    <Link
+                        href={`${base}/project-${$project.region}-${$project.$id}/settings/variables`}>
+                        project settings</Link>
+                {:else}
+                    project settings
+                {/if}
                 and a {product} environment variable, the global variable will be ignored.
             </Alert.Inline>
         {/if}

From 3e3e3891ed2a71fb2a63b64edca60369924101d8 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Wed, 5 Nov 2025 20:17:05 +0530
Subject: [PATCH 2/2] fix: blank project settings after canceling plan upgrade
 modal

---
 .../updateVariables.svelte                    | 28 ++++++++++++-------
 .../updateVariablesModal.svelte               | 10 +++++--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
index 86f24b136d..205cac43ac 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariables.svelte
@@ -273,10 +273,14 @@
         within your project.
     {:else}
         Set the environment variables or secret keys that will be passed to your {product}. Global
-        variables can be found in <Link
-            href={`${base}/project-${$project.region}-${$project.$id}/settings#variables`}>
-            project settings</Link
-        >.
+        variables can be found in {#if $project && $project.region && $project.$id}
+            <Link
+                href={`${base}/project-${$project.region}-${$project.$id}/settings#variables`}>
+                project settings</Link
+            >.
+        {:else}
+            project settings.
+        {/if}
     {/if}
     <svelte:fragment slot="aside">
         <Layout.Stack gap="l">
@@ -323,12 +327,16 @@
                                 Some environment variables have
                             {/if}
                             a naming conflict with a global variable. View global variables in
-                            <a
-                                href={`${base}/project-${$project.region}-${$project.$id}/settings`}
-                                title="Project settings"
-                                class="link">
-                                project settings</a
-                            >.
+                            {#if $project && $project.region && $project.$id}
+                                <a
+                                    href={`${base}/project-${$project.region}-${$project.$id}/settings`}
+                                    title="Project settings"
+                                    class="link">
+                                    project settings</a
+                                >.
+                            {:else}
+                                project settings.
+                            {/if}
                         </p>
                     </Alert.Inline>
                 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte b/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte
index 58e6026c0e..0022899444 100644
--- a/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/updateVariablesModal.svelte
@@ -53,9 +53,13 @@
     <Layout.Stack>
         {#if !isGlobal}
             <Alert.Inline>
-                When there is a naming conflict with a global variable in your <Link
-                    href={`${base}/project-${$project.region}-${$project.$id}/settings/variables`}>
-                    project settings</Link>
+                When there is a naming conflict with a global variable in your {#if $project && $project.region && $project.$id}
+                    <Link
+                        href={`${base}/project-${$project.region}-${$project.$id}/settings/variables`}>
+                        project settings</Link>
+                {:else}
+                    project settings
+                {/if}
                 and a {product} environment variable, the global variable will be ignored.
             </Alert.Inline>
         {/if}