From a0b0631a718a6ca6a04a6d8b7e4c73abc82469ff Mon Sep 17 00:00:00 2001
From: Harini Janakiraman <harinijanakiraman@gmail.com>
Date: Fri, 19 Aug 2022 15:32:04 +1000
Subject: [PATCH 1/2] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5f1fa589..b84719b8 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,9 @@ Connect to your database, manage data in table-UI with role based access control
 
 Set up Rowy on your Google Cloud Platform project with this easy deploy button.
 
-[![Run on Google Cloud](https://deploy.cloud.run/button.svg)](https://deploy.rowy.app/)
+[<img width="250" alt="Guided quick start button" src="https://user-images.githubusercontent.com/307298/185548050-e9208fb6-fe53-4c84-bbfa-53c08e03c15f.png">](https://rowy.app/)
 
-https://deploy.rowy.app/
+https://rowy.app
 
 ## Documentation
 
@@ -91,7 +91,7 @@ https://user-images.githubusercontent.com/307298/157185793-f67511cd-7b7b-4229-95
 
 Set up Rowy on your Google Cloud project with this one-click deploy button. Your data and cloud functions stay on your own Firestore/GCP.
 
-[![Run on Google Cloud](https://deploy.cloud.run/button.svg)](https://deploy.rowy.app/)
+[![Run on Google Cloud](https://deploy.cloud.run/button.svg)](https://rowy.app/)
 
 The one-click deploy makes the process of setting up easy with a step by step
 guide and ensures your project is setup correctly.

From 33dd82ac6bdb21bb9f8c8b1ed0cbac3c350ab18e Mon Sep 17 00:00:00 2001
From: Miriam Shams-Rainey <mshamsrainey@gmail.com>
Date: Fri, 16 Sep 2022 23:44:49 -0400
Subject: [PATCH 2/2] #816: Fixed Logic for Custom Icons in Action Field

---
 src/components/fields/Action/ActionFab.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx
index 67f00847..0e4db6cd 100644
--- a/src/components/fields/Action/ActionFab.tsx
+++ b/src/components/fields/Action/ActionFab.tsx
@@ -28,6 +28,16 @@ const replacer = (data: any) => (m: string, key: string) => {
 };
 
 const getStateIcon = (actionState: "undo" | "redo" | string, config: any) => {
+  if (!get(config, "customIcons.enabled", false)) {
+    switch (actionState) {
+      case "undo":
+        return <UndoIcon />;
+      case "redo":
+        return <RedoIcon />;
+      default:
+        return <RunIcon />;
+    }
+  }
   switch (actionState) {
     case "undo":
       return get(config, "customIcons.undo") || <UndoIcon />;