pr reviews: correctly set references header

FlowCrypt · Nov 30, 2024 · 0c1633b · 0c1633b
1 parent e59f3b8
commit 0c1633b
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/extension/chrome/elements/compose-modules/compose-render-module.ts b/extension/chrome/elements/compose-modules/compose-render-module.ts
@@ -101,8 +101,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
         const msgId = inReplyToMessage.payload?.headers?.find(header => header.name === 'Message-Id' || header.name === 'Message-ID')?.value;
         const references = inReplyToMessage.payload?.headers?.find(header => header.name === 'References')?.value;
         if (msgId && references) {
-          this.view.sendBtnModule.additionalMsgHeaders['In-Reply-To'] = msgId;
-          this.view.sendBtnModule.additionalMsgHeaders.References = references + ' ' + msgId;
+          this.setReplyHeaders(msgId, references);
         }
       }
       this.view.replyParams.subject = `${this.responseMethod === 'reply' ? 'Re' : 'Fwd'}: ${this.view.replyParams.subject}`;
@@ -120,8 +119,7 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
         );
         if (this.view.quoteModule.messageToReplyOrForward) {
           const msgId = this.view.quoteModule.messageToReplyOrForward.headers['message-id'];
-          this.view.sendBtnModule.additionalMsgHeaders['In-Reply-To'] = msgId;
-          this.view.sendBtnModule.additionalMsgHeaders.References = this.view.quoteModule.messageToReplyOrForward.headers.references + ' ' + msgId;
+          this.setReplyHeaders(msgId, this.view.quoteModule.messageToReplyOrForward.headers.references);
           if (this.view.replyPubkeyMismatch) {
             await this.renderReplyMsgAsReplyPubkeyMismatch();
           } else if (this.view.quoteModule.messageToReplyOrForward.isOnlySigned) {
@@ -276,6 +274,13 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
     }
   };
 
+  private setReplyHeaders = (msgId?: string, references?: string) => {
+    if (msgId) {
+      this.view.sendBtnModule.additionalMsgHeaders['In-Reply-To'] = msgId;
+      this.view.sendBtnModule.additionalMsgHeaders.References = [references, msgId].filter(Boolean).join(' ');
+    }
+  };
+
   private initComposeBoxStyles = () => {
     if (this.view.isReplyBox) {
       this.view.S.cached('body').addClass('reply_box');