Merge branch 'develop' into feat/CW-5648

app/javascript/dashboard/components/widgets/WootWriter/Editor.vue

@@ -405,7 +405,7 @@ function addSignature() {
   // see if the content is empty, if it is before appending the signature
   // we need to add a paragraph node and move the cursor at the start of the editor
   const contentWasEmpty = isBodyEmpty(content);
-  content = appendSignature(content, props.signature);
+  content = appendSignature(content, props.signature, props.channelType);
   // need to reload first, ensuring that the editorView is updated
   reloadState(content);
 

app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue

@@ -577,7 +577,7 @@ export default {
       }
 
       return this.sendWithSignature
-        ? appendSignature(message, this.messageSignature)
+        ? appendSignature(message, this.messageSignature, this.channelType)
         : removeSignature(message, this.messageSignature);
     },
     removeFromDraft() {
@@ -769,7 +769,11 @@ export default {
         // if signature is enabled, append it to the message
         // appendSignature ensures that the signature is not duplicated
         // so we don't need to check if the signature is already present
-        message = appendSignature(message, this.messageSignature);
+        message = appendSignature(
+          message,
+          this.messageSignature,
+          this.channelType
+        );
       }
 
       const updatedMessage = replaceVariablesInMessage({
@@ -811,7 +815,11 @@ export default {
       this.message = '';
       if (this.sendWithSignature && !this.isPrivate) {
         // if signature is enabled, append it to the message
-        this.message = appendSignature(this.message, this.messageSignature);
+        this.message = appendSignature(
+          this.message,
+          this.messageSignature,
+          this.channelType
+        );
       }
       this.attachedFiles = [];
       this.isRecordingAudio = false;