Merge remote-tracking branch 'origin/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

@@ -40,6 +40,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
   private removeNextReplyBoxBorders = false;
   private lastSwitchToEncryptedReply = false;
   private replyOption: ReplyOption | undefined;
+  private lastReplyOption: ReplyOption | undefined;
 
   private sel = {
     // gmail_variant=standard|new
@@ -642,6 +643,8 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     const legacyDraftReplyRegex = new RegExp(/\[(flowcrypt|cryptup):link:draft_reply:([0-9a-fr\-]+)]/);
     const newReplyBoxes = $('div.nr.tMHS5d, td.amr > div.nr, div.gA td.I5').not('.reply_message_evaluated').filter(':visible').get();
     if (newReplyBoxes.length) {
+      // removing this line will cause unexpected draft creation bug reappear
+      // https://github.com/FlowCrypt/flowcrypt-browser/issues/5616#issuecomment-1972897692
       this.replyOption = undefined;
       // cache for subseqent loop runs
       const convoRootEl = this.getConvoRootEl(newReplyBoxes[0]);
@@ -688,6 +691,10 @@ export class GmailElementReplacer extends WebmailElementReplacer {
             const replyOption = this.parseReplyOption(replyBox);
             if (replyOption) {
               this.replyOption = replyOption;
+              this.lastReplyOption = replyOption;
+            } else if (this.lastReplyOption) {
+              this.replyOption = this.lastReplyOption;
+              this.lastReplyOption = undefined;
             }
             replyParams.replyOption = this.replyOption;
             // either is a draft in the middle, or the convo already had (last) box replaced: should also be useless draft
@@ -708,8 +715,10 @@ export class GmailElementReplacer extends WebmailElementReplacer {
             if (hasDraft || alreadyHasSecureReplyBox) {
               replyBox.addClass('reply_message_evaluated remove_borders').parent().append(secureReplyBoxXssSafe); // xss-safe-factory
               replyBox.hide();
+              this.lastReplyOption = undefined;
             } else if (isReplyButtonView) {
               replyBox.replaceWith(secureReplyBoxXssSafe); // xss-safe-factory
+              this.lastReplyOption = undefined;
               this.replyOption = undefined;
             } else {
               const deleteReplyEl = document.querySelector('.oh.J-Z-I.J-J5-Ji.T-I-ax7');

test/source/tests/gmail.ts

@@ -457,6 +457,29 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test
       })
     );
 
+    test(
+      'mail.google.com - switch to encrypted forward',
+      testWithBrowser(async (t, browser) => {
+        await BrowserRecipe.setUpCommonAcct(t, browser, 'ci.tests.gmail');
+        const gmailPage = await openGmailPage(t, browser);
+        await gotoGmailPage(gmailPage, '/FMfcgzGtwgfMhWTlgRwwKWzRhqNZzwXz'); // go to encrypted convo
+        await Util.sleep(5);
+        await gmailPage.waitAndClick('.adn [data-tooltip="More"]', { delay: 1 });
+        await gmailPage.waitAndClick('[act="25"]', { delay: 1 }); // click forward
+        await Util.sleep(3);
+        await gmailPage.waitAll('[data-tooltip^="Send"]'); // The Send button from the Standard reply box
+        await gmailPage.waitForContent(
+          '.reply_message_evaluated .error_notification',
+          'The last message was encrypted, but you are composing a message without encryption. Switch to encrypted compose'
+        );
+        await gmailPage.waitAndClick('#switch_to_encrypted_reply'); // Switch to encrypted compose
+        await Util.sleep(3);
+        const replyBox2 = await gmailPage.getFrame(['/chrome/elements/compose.htm'], { sleep: 5 });
+        await Util.sleep(3);
+        await replyBox2.waitForContent('@input-body', '---------- Forwarded message ---------');
+      })
+    );
+
     test(
       'mail.google.com - secure reply and forward in dot menu',
       testWithBrowser(async (t, browser) => {