Merge branch 'master' into issue-5905-add-secure-reply-all-to-gmail-context-menu-live-test

Author: martgil

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

@@ -618,8 +618,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) => {
@@ -645,9 +645,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;
       }

package-lock.json

@@ -9,7 +9,7 @@
     "@openpgp/web-stream-tools": "^0.1.3",
     "@types/chai": "4.3.19",
     "@types/chai-as-promised": "7.1.8",
-    "@types/chrome": "0.0.299",
+    "@types/chrome": "0.0.300",
     "@types/jquery": "3.5.32",
     "@types/mailparser": "3.4.5",
     "ava": "5.3.1",
@@ -28,14 +28,14 @@
     "lint-staged": "^15.4.3",
     "mailparser": "3.7.2",
     "mkdirp": "3.0.1",
-    "openpgp": "6.0.1",
+    "openpgp": "6.1.0",
     "pdfjs-dist": "4.10.38",
     "prettier": "^3.4.1",
     "puppeteer": "24.1.1",
-    "stylelint": "16.14.0",
+    "stylelint": "16.14.1",
     "stylelint-config-standard": "37.0.0",
     "typescript": "5.7.3",
-    "typescript-eslint": "^8.21.0",
+    "typescript-eslint": "^8.22.0",
     "undici-types": "^7.3.0",
     "web-ext": "8.3.0",
     "webpack-cli": "^6.0.1"
@@ -45,7 +45,7 @@
     "@types/thunderbird-webext-browser": "^127.0.0",
     "bootstrap": "4.6.2",
     "clipboard": "2.0.11",
-    "dompurify": "3.2.3",
+    "dompurify": "3.2.4",
     "filesize": "10.1.2",
     "iso-8859-2": "1.0.0",
     "jquery": "3.7.1",

package.json

@@ -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) => {