Merge branch 'develop' into feat/rtl-support

chatwoot · Feb 22, 2023 · a4972c3 · a4972c3
2 parents 91a592d + 8935933
commit a4972c3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -974,15 +974,9 @@ export default {
     },
     getMessagePayloadForWhatsapp(message) {
       const multipleMessagePayload = [];
-      const messagePayload = {
-        conversationId: this.currentChat.id,
-        message,
-        private: false,
-      };
-
-      multipleMessagePayload.push(messagePayload);
 
       if (this.attachedFiles && this.attachedFiles.length) {
+        let caption = message;
         this.attachedFiles.forEach(attachment => {
           const attachedFile = this.globalConfig.directUploadsEnabled
             ? attachment.blobSignedId
@@ -991,10 +985,18 @@ export default {
             conversationId: this.currentChat.id,
             files: [attachedFile],
             private: false,
-            message: '',
+            message: caption,
           };
           multipleMessagePayload.push(attachmentPayload);
+          caption = '';
         });
+      } else {
+        const messagePayload = {
+          conversationId: this.currentChat.id,
+          message,
+          private: false,
+        };
+        multipleMessagePayload.push(messagePayload);
       }
 
       return multipleMessagePayload;