From 1fc24e12e78652a6ed96da800c3317cfa47777fb Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 1 Oct 2021 16:05:48 +0100
Subject: [PATCH 1/2] Hide upgrade button / modal from non-root account holders

---
 .../builder/src/pages/builder/app/[application]/_layout.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index ae21a9dbb9..aaf948883d 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -92,7 +92,7 @@
         <ActionGroup />
       </div>
       <div class="toprightnav">
-        {#if $admin.cloud}
+        {#if $admin.cloud && $auth.user.account}
           <UpgradeModal />
         {/if}
         <VersionModal />

From 61fcb672898b38e5eceb000c74d5c5bc75430b2a Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Fri, 1 Oct 2021 16:12:07 +0100
Subject: [PATCH 2/2] Load account portal url from environment

---
 packages/builder/src/components/upgrade/UpgradeModal.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/upgrade/UpgradeModal.svelte b/packages/builder/src/components/upgrade/UpgradeModal.svelte
index 570dcc06a1..f78b7abdea 100644
--- a/packages/builder/src/components/upgrade/UpgradeModal.svelte
+++ b/packages/builder/src/components/upgrade/UpgradeModal.svelte
@@ -1,10 +1,11 @@
 <script>
   import { Modal, ModalContent, Button } from "@budibase/bbui"
+  import { admin } from "stores/portal"
 
   let upgradeModal
 
   const onConfirm = () => {
-    window.open("https://account.budibase.app/portal/install", "_blank")
+    window.open(`${$admin.accountPortalUrl}/portal/install`, "_blank")
   }
 </script>