#5906 Keep original reply message when switching to secure mode (#5914)

* fix: keep original reply message when switching to secure mode

* fix: message id get

Author: Ioan Moldovan

extension/js/content_scripts/webmail/gmail/gmail-element-replacer.ts

@@ -619,8 +619,8 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     return from ? Str.parseEmail(from) : undefined;
   };
 
-  private getLastMsgReplyParams = (convoRootEl: JQuery, replyOption?: ReplyOption): FactoryReplyParams => {
-    return { replyMsgId: this.determineMsgId($(convoRootEl).find(this.sel.msgInner).last()), replyOption };
+  private getLastMsgReplyParams = (convoRootEl: JQuery, replyOption?: ReplyOption, replyBoxMessageId?: string | null): FactoryReplyParams => {
+    return { replyMsgId: replyBoxMessageId ?? this.determineMsgId($(convoRootEl).find(this.sel.msgInner).last()), replyOption };
   };
 
   private getConvoRootEl = (anyInnerElement: HTMLElement) => {
@@ -646,9 +646,13 @@ export class GmailElementReplacer extends WebmailElementReplacer {
       // removing this line will cause unexpected draft creation bug reappear
       // https://github.com/FlowCrypt/flowcrypt-browser/issues/5616#issuecomment-1972897692
       this.replyOption = undefined;
+      // Try to get message id from plain reply box
+      // https://github.com/FlowCrypt/flowcrypt-browser/issues/5906
+      const replyBoxMessageId = newReplyBoxes[0].closest('.gA.gt')?.previousElementSibling?.getAttribute('data-legacy-message-id');
+
       // cache for subseqent loop runs
       const convoRootEl = this.getConvoRootEl(newReplyBoxes[0]);
-      const replyParams = this.getLastMsgReplyParams(convoRootEl);
+      const replyParams = this.getLastMsgReplyParams(convoRootEl, undefined, replyBoxMessageId);
       if (msgId) {
         replyParams.replyMsgId = msgId;
       }

test/source/tests/gmail.ts

@@ -402,6 +402,32 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test
       })
     );
 
+    // https://github.com/FlowCrypt/flowcrypt-browser/issues/5906
+    test(
+      'mail.google.com - Keep original reply message when switching to secure mode',
+      testWithBrowser(async (t, browser) => {
+        await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail');
+        const gmailPage = await openGmailPage(t, browser);
+        await gotoGmailPage(gmailPage, '/FMfcgzGqRGfPBbNLWvfPvDbxnHBwkdGf'); // plain convo
+        await Util.sleep(30);
+        await gmailPage.waitAndClick('[role="listitem"] .adf.ads', { delay: 1 }); // click first message of thread
+        await Util.sleep(3);
+        const messages = await gmailPage.target.$$('[role="listitem"] .adn.ads');
+        const plainReplyButton = await messages[0].$('[data-tooltip="Reply"]');
+        await Util.sleep(1);
+        await plainReplyButton!.click();
+        await gmailPage.waitAndClick('#switch_to_encrypted_reply'); // Switch to encrypted compose
+        await Util.sleep(2);
+        await gmailPage.waitAll('.reply_message');
+        await pageHasSecureReplyContainer(t, browser, gmailPage, { isReplyPromptAccepted: true, composeFrameCount: 2 });
+        const replyBox = await gmailPage.getFrame(['/chrome/elements/compose.htm', '&skipClickPrompt=___cu_true___'], { sleep: 5 });
+        await Util.sleep(3);
+        await replyBox.waitAndClick('@action-expand-quoted-text');
+        // Check if quoted message doesn't contain last message
+        expect(await replyBox.read('@input-body')).to.not.contain(`Here's reply`);
+      })
+    );
+
     test(
       'mail.google.com - switch to encrypted reply for middle message',
       testWithBrowser(async (t, browser) => {