From bba35be1dbb6a8e142f70b2415e865dba59de47b Mon Sep 17 00:00:00 2001
From: Gervwyk <gervwyk@gmail.com>
Date: Thu, 7 Apr 2022 11:19:09 +0200
Subject: [PATCH 1/2] fix(blocks-antd): Fix confirm modal button icons, closes
 #1160

---
 .../blocks/propertiesFormTransformer.js       |  2 +-
 .../src/blocks/ConfirmModal/ConfirmModal.js   | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/packages/docs/templates/blocks/propertiesFormTransformer.js b/packages/docs/templates/blocks/propertiesFormTransformer.js
index a35aa8b07..8bbc71f49 100644
--- a/packages/docs/templates/blocks/propertiesFormTransformer.js
+++ b/packages/docs/templates/blocks/propertiesFormTransformer.js
@@ -70,7 +70,7 @@ const button = (path) => ({
   },
   properties: {
     size: 'small',
-    title: 'button:',
+    title: `${path}:`,
     inner: true,
   },
   blocks: [
diff --git a/packages/plugins/blocks/blocks-antd/src/blocks/ConfirmModal/ConfirmModal.js b/packages/plugins/blocks/blocks-antd/src/blocks/ConfirmModal/ConfirmModal.js
index 212e34851..87a5498e9 100644
--- a/packages/plugins/blocks/blocks-antd/src/blocks/ConfirmModal/ConfirmModal.js
+++ b/packages/plugins/blocks/blocks-antd/src/blocks/ConfirmModal/ConfirmModal.js
@@ -38,8 +38,32 @@ const ConfirmModal = ({ blockId, events, content, components: { Icon }, methods,
         className: methods.makeCssClass(properties.modalStyle),
         closable: properties.closable,
         okText: properties.okText || 'Ok',
-        okButtonProps: properties.okButton,
-        cancelButtonProps: properties.cancelButton,
+        okButtonProps:
+          properties.okButton && properties.okButton.icon
+            ? {
+                ...properties.okButton,
+                icon: properties.okButton.icon && (
+                  <Icon
+                    blockId={`${blockId}_ok_icon`}
+                    events={events}
+                    properties={properties.okButton.icon}
+                  />
+                ),
+              }
+            : properties.okButton,
+        cancelButtonProps:
+          properties.cancelButton && properties.cancelButton.icon
+            ? {
+                ...properties.cancelButton,
+                icon: properties.cancelButton.icon && (
+                  <Icon
+                    blockId={`${blockId}_ok_icon`}
+                    events={events}
+                    properties={properties.cancelButton.icon}
+                  />
+                ),
+              }
+            : properties.cancelButton,
         cancelText: properties.cancelText || 'Cancel',
         centered: properties.centered || false,
         mask: properties.mask !== undefined ? properties.mask : true,

From 8987ad8652158bfb66a7334d7745c99d6b49ce11 Mon Sep 17 00:00:00 2001
From: Sam <sam@lowdefy.com>
Date: Tue, 19 Apr 2022 10:11:21 +0200
Subject: [PATCH 2/2] fix: Update docs snapshot test

---
 packages/docs/templates/test/button.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/docs/templates/test/button.test.js b/packages/docs/templates/test/button.test.js
index 22e67c766..955bbe1d4 100644
--- a/packages/docs/templates/test/button.test.js
+++ b/packages/docs/templates/test/button.test.js
@@ -108,7 +108,7 @@ test('button propertiesFormTransformer', () => {
         "properties": Object {
           "inner": true,
           "size": "small",
-          "title": "button:",
+          "title": "block.properties.field:",
         },
         "type": "Card",
       },