From b8924dec4730db1ad2cf9c55a3686a949f7ba19f Mon Sep 17 00:00:00 2001
From: Diya Wadhwani <wadhwani2399@gmail.com>
Date: Fri, 8 May 2026 16:54:58 -0700
Subject: [PATCH 1/2] fix(ui): Fixed Owner Message Popup on Image Upload

---
 src/components/OwnerMessage/OwnerMessage.jsx | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/OwnerMessage/OwnerMessage.jsx b/src/components/OwnerMessage/OwnerMessage.jsx
index df9d99d251..3699761ff9 100644
--- a/src/components/OwnerMessage/OwnerMessage.jsx
+++ b/src/components/OwnerMessage/OwnerMessage.jsx
@@ -54,8 +54,9 @@ function OwnerMessage({
   const isImageMessage = value => typeof value === 'string' && value.includes(';base64');
 
   function toggle() {
+    console.log('toggle called, message:', message, 'ownerMessage:', ownerMessage);
     setModal(!modal);
-    setDisableTextInput(false);
+    setDisableTextInput(isImageMessage(message));
   }
 
   function toggleDeleteWarning() {
@@ -97,6 +98,7 @@ function OwnerMessage({
       toast.success(
         isStandard ? 'Standard message update successfully!' : 'Message update successfully!',
       );
+      await getMessage();
     } else {
       toast.error(`Standard message save failed! Error: ${response}`);
     }
@@ -244,12 +246,24 @@ function OwnerMessage({
           <Input
             type="textarea"
             placeholder="Write your message here... (Max 100 characters)"
-            value={message}
+            value={hasSelectedImage ? '✓ Image selected — click Update/Create to save' : message}
             onChange={event => setMessage(event.target.value)}
             maxLength="100"
             disabled={disableTextInput}
             className={styles.inputs}
           />
+          {hasSelectedImage && (
+            <button
+              type="button"
+              style={{ marginTop: '0.5rem', fontSize: '0.8rem', cursor: 'pointer' }}
+              onClick={() => {
+                setMessage('');
+                setDisableTextInput(false);
+              }}
+            >
+              ✕ Remove image
+            </button>
+          )}
           {!hasSelectedImage && (
             <>
               <p className="paragraph" style={{ marginTop: '1rem' }}>

From d11e956e2f7f5fdbbf4e23b3414866f503a57190 Mon Sep 17 00:00:00 2001
From: Diya Wadhwani <wadhwani2399@gmail.com>
Date: Fri, 8 May 2026 16:55:24 -0700
Subject: [PATCH 2/2] fix(ui): Fixed Owner Message Popup on Image Upload

---
 src/components/OwnerMessage/OwnerMessage.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/OwnerMessage/OwnerMessage.jsx b/src/components/OwnerMessage/OwnerMessage.jsx
index 3699761ff9..5a9ebc1f4c 100644
--- a/src/components/OwnerMessage/OwnerMessage.jsx
+++ b/src/components/OwnerMessage/OwnerMessage.jsx
@@ -54,7 +54,6 @@ function OwnerMessage({
   const isImageMessage = value => typeof value === 'string' && value.includes(';base64');
 
   function toggle() {
-    console.log('toggle called, message:', message, 'ownerMessage:', ownerMessage);
     setModal(!modal);
     setDisableTextInput(isImageMessage(message));
   }