From a65b29eb880f264fbc4fc78d3468f6109bc7044b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 27 Nov 2023 18:50:44 +0000
Subject: [PATCH 1/4] banner changes for new pricing, fix for onboarding to
 prevent flash of UI before onboarding tutorial

---
 packages/backend-core/src/objectStore/objectStore.ts |  4 ++--
 .../src/pages/builder/portal/apps/_layout.svelte     |  2 +-
 .../src/pages/builder/portal/apps/index.svelte       | 12 ++++++++++++
 packages/pro                                         |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index cdaf19fa55..cfd988f5e0 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -260,12 +260,12 @@ export async function listAllObjects(bucketName: string, path: string) {
 }
 
 /**
- * Generate a presigned url with a default TTL of 1 hour
+ * Generate a presigned url with a default TTL of 1 day
  */
 export function getPresignedUrl(
   bucketName: string,
   key: string,
-  durationSeconds: number = 3600
+  durationSeconds: number = 86400
 ) {
   const objectStore = ObjectStore(bucketName, { presigning: true })
   const params = {
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index 38c0274eca..8810edca9c 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -14,7 +14,7 @@
   import PortalSideBar from "./_components/PortalSideBar.svelte"
 
   // Don't block loading if we've already hydrated state
-  let loaded = $apps.length != null
+  let loaded = !!$apps?.length
 
   onMount(async () => {
     try {
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index ad0d3658ea..fb0ba8bc2e 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -1,5 +1,6 @@
 <script>
   import {
+    banner,
     Heading,
     Layout,
     Button,
@@ -10,6 +11,7 @@
     Notification,
     Body,
     Search,
+    BANNER_TYPES,
   } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
@@ -198,6 +200,16 @@
       if (usersLimitLockAction) {
         usersLimitLockAction()
       }
+      banner.queue([
+        {
+          message:
+            "We've updated our pricing - read the blog post to learn more.",
+          type: BANNER_TYPES.NEUTRAL,
+          extraButtonText: "Learn More",
+          extraButtonAction: () =>
+            window.open("https://budibase.com/blog/updates/pricing-v3"),
+        },
+      ])
     } catch (error) {
       notifications.error("Error getting init info")
     }
diff --git a/packages/pro b/packages/pro
index 618613f357..1037b032d4 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 618613f3575b01f74940d9f58fdb53a9a5b2dc1a
+Subproject commit 1037b032d49244678204704d1bca779a29e395eb

From 5301c1edd9667823c691d7669bd274359e7379eb Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 27 Nov 2023 19:03:37 +0000
Subject: [PATCH 2/4] update presigned url time

---
 packages/backend-core/src/objectStore/objectStore.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index cfd988f5e0..1971c09e9d 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -260,12 +260,12 @@ export async function listAllObjects(bucketName: string, path: string) {
 }
 
 /**
- * Generate a presigned url with a default TTL of 1 day
+ * Generate a presigned url with a default TTL of 36 hours
  */
 export function getPresignedUrl(
   bucketName: string,
   key: string,
-  durationSeconds: number = 86400
+  durationSeconds: number = 129600
 ) {
   const objectStore = ObjectStore(bucketName, { presigning: true })
   const params = {

From b357b6d2e8cea53e628faaa94b51a8b55a73e668 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Nov 2023 08:59:34 +0000
Subject: [PATCH 3/4] only show pricing banner in prod and once

---
 .../pages/builder/portal/apps/index.svelte    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index fb0ba8bc2e..6a15d756cd 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -200,16 +200,20 @@
       if (usersLimitLockAction) {
         usersLimitLockAction()
       }
-      banner.queue([
-        {
-          message:
-            "We've updated our pricing - read the blog post to learn more.",
-          type: BANNER_TYPES.NEUTRAL,
-          extraButtonText: "Learn More",
-          extraButtonAction: () =>
-            window.open("https://budibase.com/blog/updates/pricing-v3"),
-        },
-      ])
+      if (!$admin.isDev) {
+        await banner.show({
+          messages: [
+            {
+              message:
+                      "We've updated our pricing - read the blog post to learn more.",
+              type: BANNER_TYPES.NEUTRAL,
+              extraButtonText: "Learn More",
+              extraButtonAction: () =>
+                      window.open("https://budibase.com/blog/updates/pricing-v3"),
+            },
+          ],
+        })
+      }
     } catch (error) {
       notifications.error("Error getting init info")
     }

From 3a0d409e9b0d0fbedea0789fcc95fd47c965438c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Tue, 28 Nov 2023 09:06:25 +0000
Subject: [PATCH 4/4] point banner to pricing website

---
 packages/builder/src/pages/builder/portal/apps/index.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index 6a15d756cd..fac5c502b3 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -205,11 +205,11 @@
           messages: [
             {
               message:
-                      "We've updated our pricing - read the blog post to learn more.",
+                "We've updated our pricing - read the blog post to learn more.",
               type: BANNER_TYPES.NEUTRAL,
               extraButtonText: "Learn More",
               extraButtonAction: () =>
-                      window.open("https://budibase.com/blog/updates/pricing-v3"),
+                window.open("https://budibase.com/pricing"),
             },
           ],
         })