From 45fa40496fe3190d6fc6ae30281814879a728f03 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 19 Jan 2024 14:53:39 +0000
Subject: [PATCH 1/5] Added default sizing for buttons in button group, swapped
 Multistep block component style props for consistency

---
 packages/client/manifest.json                 | 34 +++++++++----------
 .../src/components/app/ButtonGroup.svelte     |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 676d161864..2a9bc6f258 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -6098,23 +6098,6 @@
           }
         ]
       },
-      {
-        "tag": "style",
-        "type": "select",
-        "label": "Size",
-        "key": "size",
-        "options": [
-          {
-            "label": "Medium",
-            "value": "spectrum--medium"
-          },
-          {
-            "label": "Large",
-            "value": "spectrum--large"
-          }
-        ],
-        "defaultValue": "spectrum--medium"
-      },
       {
         "tag": "style",
         "type": "select",
@@ -6131,6 +6114,23 @@
           }
         ],
         "defaultValue": "bottom"
+      },
+      {
+        "tag": "style",
+        "type": "select",
+        "label": "Size",
+        "key": "size",
+        "options": [
+          {
+            "label": "Medium",
+            "value": "spectrum--medium"
+          },
+          {
+            "label": "Large",
+            "value": "spectrum--large"
+          }
+        ],
+        "defaultValue": "spectrum--medium"
       }
     ],
     "actions": [
diff --git a/packages/client/src/components/app/ButtonGroup.svelte b/packages/client/src/components/app/ButtonGroup.svelte
index 4954704b1b..3ee703e253 100644
--- a/packages/client/src/components/app/ButtonGroup.svelte
+++ b/packages/client/src/components/app/ButtonGroup.svelte
@@ -29,7 +29,7 @@
           type,
           quiet,
           disabled,
-          size,
+          size: size || "M",
         }}
       />
     {/each}

From 50078f4f0f85b7a67bd549c9b73f7a165df62aa4 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 19 Jan 2024 14:59:08 +0000
Subject: [PATCH 2/5] Fix issue where flagClient could be undefined when
 running outside of test mode

---
 packages/server/src/utilities/redis.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/utilities/redis.ts b/packages/server/src/utilities/redis.ts
index d833ed2c10..a4154b7b95 100644
--- a/packages/server/src/utilities/redis.ts
+++ b/packages/server/src/utilities/redis.ts
@@ -94,7 +94,7 @@ export async function setTestFlag(id: string) {
 }
 
 export async function checkTestFlag(id: string) {
-  const flag = await flagClient.get(id)
+  const flag = await flagClient?.get(id)
   return !!(flag && flag.testing)
 }
 

From 6ad865aa2b3c10e1c0ead6eac164eec2a9af7c82 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Fri, 19 Jan 2024 15:08:53 +0000
Subject: [PATCH 3/5] Updated submodules

---
 packages/account-portal | 2 +-
 packages/pro            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/account-portal b/packages/account-portal
index 11469c40d7..05c90ce551 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 11469c40d73ea58f2aec80c12c1946289b67c6f2
+Subproject commit 05c90ce55144e260da6688335c16783eab79bf96
diff --git a/packages/pro b/packages/pro
index 31f11bcd33..ce7722ed44 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 31f11bcd3323d2105a83ebfdee8facc2900bb879
+Subproject commit ce7722ed4474718596b465dcfd49bef36cab2e42

From 331a4e83a82a784ea653a502dd3f584db49372f3 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 19 Jan 2024 15:13:04 +0000
Subject: [PATCH 4/5] submodules

---
 packages/account-portal | 2 +-
 packages/pro            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/account-portal b/packages/account-portal
index 11469c40d7..05c90ce551 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 11469c40d73ea58f2aec80c12c1946289b67c6f2
+Subproject commit 05c90ce55144e260da6688335c16783eab79bf96
diff --git a/packages/pro b/packages/pro
index 31f11bcd33..ce7722ed44 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 31f11bcd3323d2105a83ebfdee8facc2900bb879
+Subproject commit ce7722ed4474718596b465dcfd49bef36cab2e42

From c48f71ab76a3fff26bc0afde62563ffe328b786e Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 19 Jan 2024 15:42:36 +0000
Subject: [PATCH 5/5] Bump version to 2.15.2

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 5fe9a6b261..3ab56dc0b1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.1",
+  "version": "2.15.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*",