Merge branch 'master' into fix/copy

glific · Sep 3, 2024 · e9a40b1 · e9a40b1
2 parents f77780b + 97bfd7f
commit e9a40b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/containers/Chat/ChatMessages/AddAttachment/AddAttachment.tsx b/src/containers/Chat/ChatMessages/AddAttachment/AddAttachment.tsx
@@ -213,7 +213,6 @@ export const AddAttachment = ({
             }}
             handleCancel={() => {
               setAttachment(false);
-
               setAttachmentURL('');
               setAttachmentAdded(false);
             }}

diff --git a/src/containers/Chat/ChatMessages/ChatInput/ChatInput.tsx b/src/containers/Chat/ChatMessages/ChatInput/ChatInput.tsx
@@ -182,6 +182,17 @@ export const ChatInput = ({
     // check for an empty message or message with just spaces
     if ((!message || /^\s*$/.test(message)) && !attachmentAdded) return;
 
+    //check if it has media if the template type is image
+    if (
+      selectedTemplate &&
+      selectedTemplate.isHsm &&
+      selectedTemplate.type !== 'TEXT' &&
+      !attachmentAdded
+    ) {
+      setAttachment(!attachment);
+      return;
+    }
+
     // check if there is any attachment
     if (attachmentAdded) {
       createMediaMessage({
@@ -288,6 +299,7 @@ export const ChatInput = ({
   const handleCancel = () => {
     resetAttachment();
     resetVariable();
+    setSelectedTemplate(undefined);
     editor.dispatchCommand(CLEAR_EDITOR_COMMAND, undefined);
     editor.focus();
   };