From d8c7fadd4618cf04b9f17a754d7913da1ec34913 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 5 May 2022 08:57:36 +0100
Subject: [PATCH 1/2] Add missing component store to client library SDK

---
 packages/client/src/components/app/forms/FormStep.svelte | 2 +-
 packages/client/src/sdk.js                               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/FormStep.svelte b/packages/client/src/components/app/forms/FormStep.svelte
index 22972c5c48..4441f515ee 100644
--- a/packages/client/src/components/app/forms/FormStep.svelte
+++ b/packages/client/src/components/app/forms/FormStep.svelte
@@ -22,7 +22,7 @@
     if (
       formContext &&
       $builderStore.inBuilder &&
-      $componentStore?.selectedComponentPath?.includes($component.id)
+      $componentStore.selectedComponentPath?.includes($component.id)
     ) {
       formContext.formApi.setStep(step)
     }
diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js
index 50ec07ba98..db31da7164 100644
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@@ -7,6 +7,7 @@ import {
   builderStore,
   uploadStore,
   rowSelectionStore,
+  componentStore,
 } from "stores"
 import { styleable } from "utils/styleable"
 import { linkable } from "utils/linkable"
@@ -24,6 +25,7 @@ export default {
   screenStore,
   builderStore,
   uploadStore,
+  componentStore,
   styleable,
   linkable,
   getAction,

From cc08c263c80de17470017ca1044d5e83538704fd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 5 May 2022 08:57:49 +0100
Subject: [PATCH 2/2] Fix duplicate component action in settings bar

---
 packages/client/src/components/preview/SettingsBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index bf0b48250a..154a115c98 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -155,7 +155,7 @@
       icon="Duplicate"
       on:click={() => {
         builderStore.actions.duplicateComponent(
-          $builderStore.selectedComponent._id
+          $builderStore.selectedComponentId
         )
       }}
       title="Duplicate component"