From e8b010d7e2a02436382785696edb9a1f99a4983c Mon Sep 17 00:00:00 2001
From: Shaun Hamilton <shauhami020@gmail.com>
Date: Mon, 20 Feb 2023 19:34:34 +0000
Subject: [PATCH] fix(client): selector return, invalid prop val (#49447)

* fix(client): correctly return type from selector

* fix(client): remove incorrect prop [button-spacer]
---
 client/src/components/formHelpers/form.tsx         | 1 -
 client/src/templates/Challenges/redux/selectors.js | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/components/formHelpers/form.tsx b/client/src/components/formHelpers/form.tsx
index a604175dd50..516ac60e941 100644
--- a/client/src/components/formHelpers/form.tsx
+++ b/client/src/components/formHelpers/form.tsx
@@ -103,7 +103,6 @@ export const StrictSolutionForm = ({
           <FormFields formFields={formFields} options={options} />
           <BlockSaveButton
             disabled={(pristine && !enableSubmit) || (error as boolean)}
-            bgSize='none'
           >
             {buttonText}
           </BlockSaveButton>
diff --git a/client/src/templates/Challenges/redux/selectors.js b/client/src/templates/Challenges/redux/selectors.js
index 8515685af8e..dfb14bc9cd6 100644
--- a/client/src/templates/Challenges/redux/selectors.js
+++ b/client/src/templates/Challenges/redux/selectors.js
@@ -101,6 +101,10 @@ export const currentBlockIdsSelector = state => {
     challengeType
   );
 
+  if (!currentBlockIds) {
+    return [];
+  }
+
   return currentBlockIds;
 };