From 661fddf43363a8a5bbc410e2ce70de2a0f056265 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Mon, 31 Jul 2023 16:29:46 +0530
Subject: [PATCH] refactor: fix potential issues when converting to string [no
 ci]

---
 packages/web/src/javascripts/Components/Modal/Modal.tsx       | 2 +-
 .../Components/SmartViewBuilder/CompoundPredicateBuilder.tsx  | 2 +-
 packages/web/src/javascripts/Utils/Utils.ts                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/web/src/javascripts/Components/Modal/Modal.tsx b/packages/web/src/javascripts/Components/Modal/Modal.tsx
index 1ed75207f..7d35c64ce 100644
--- a/packages/web/src/javascripts/Components/Modal/Modal.tsx
+++ b/packages/web/src/javascripts/Components/Modal/Modal.tsx
@@ -209,7 +209,7 @@ const Modal = ({
                   <Button
                     primary={action.type === 'primary'}
                     colorStyle={action.type === 'destructive' ? 'danger' : undefined}
-                    key={action.label.toString()}
+                    key={index}
                     onClick={action.onClick}
                     className={classNames(
                       action.mobileSlot ? 'hidden md:block' : '',
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
index 67b0decc9..549e36d2c 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
@@ -75,7 +75,7 @@ const CompoundPredicateBuilder = ({ controller }: Props) => {
             {predicate.keypath && (
               <PredicateValue
                 keypath={predicate.keypath as PredicateKeypath}
-                value={predicate.value.toString()}
+                value={typeof predicate.value !== 'string' ? JSON.stringify(predicate.value) : predicate.value}
                 setValue={(value: string) => {
                   setPredicate(index, { value })
                 }}
diff --git a/packages/web/src/javascripts/Utils/Utils.ts b/packages/web/src/javascripts/Utils/Utils.ts
index c0a3364ae..0ecb9d8d8 100644
--- a/packages/web/src/javascripts/Utils/Utils.ts
+++ b/packages/web/src/javascripts/Utils/Utils.ts
@@ -221,8 +221,8 @@ export const getBase64FromBlob = (blob: Blob) => {
   return new Promise<string>((resolve, reject) => {
     const reader = new FileReader()
     reader.onloadend = () => {
-      if (reader.result) {
-        resolve(reader.result.toString())
+      if (reader.result && typeof reader.result === 'string') {
+        resolve(reader.result)
       } else {
         reject()
       }