Merge branch 'master' into dependabot/npm_and_yarn/ava-6.1.1

Author: sosnovsky

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

@@ -38,7 +38,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
   private currentlyReplacingAttachments = false;
   private switchToEncryptedReply = false;
   private removeNextReplyBoxBorders = false;
-  private shouldShowEditableSecureReply = false;
+  private lastSwitchToEncryptedReply = false;
   private replyOption: ReplyOption | undefined;
 
   private sel = {
@@ -671,7 +671,6 @@ export class GmailElementReplacer extends WebmailElementReplacer {
             replyBox.addClass('reply_message_evaluated');
             continue;
           }
-          this.switchToEncryptedReply = false;
           if (this.removeNextReplyBoxBorders) {
             replyBox.addClass('remove_borders');
             this.removeNextReplyBoxBorders = false;
@@ -686,12 +685,17 @@ export class GmailElementReplacer extends WebmailElementReplacer {
             const isReplyButtonView = replyBoxEl.className.includes('nr');
             const replyBoxes = document.querySelectorAll('iframe.reply_message');
             const alreadyHasSecureReplyBox = replyBoxes.length > 0;
-            this.shouldShowEditableSecureReply = !isReplyButtonView;
             const secureReplyBoxXssSafe = /* xss-safe-factory */ `
               <div class="remove_borders reply_message_iframe_container">
-                ${this.factory.embeddedReply(replyParams, this.shouldShowEditableSecureReply || alreadyHasSecureReplyBox)}
+                ${this.factory.embeddedReply(replyParams, !isReplyButtonView || alreadyHasSecureReplyBox || this.lastSwitchToEncryptedReply)}
               </div>
             `;
+            // Added `lastSwitchToEncryptedReply` logic to handle when a user switches from `plain reply` to `encrypted reply`
+            // by clicking the `Switch to encrypted reply` button.
+            // Initially, this action removes the `plain reply view` and replaces it with the `plain reply button view`,
+            // which previously led to an incorrect status in `switchToEncryptedReply`.
+            // https://github.com/FlowCrypt/flowcrypt-browser/pull/5778
+            this.lastSwitchToEncryptedReply = false;
             if (hasDraft || alreadyHasSecureReplyBox) {
               replyBox.addClass('reply_message_evaluated remove_borders').parent().append(secureReplyBoxXssSafe); // xss-safe-factory
               replyBox.hide();
@@ -700,6 +704,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
               this.replyOption = undefined;
             } else {
               const deleteReplyEl = document.querySelector('.oh.J-Z-I.J-J5-Ji.T-I-ax7');
+              this.lastSwitchToEncryptedReply = this.switchToEncryptedReply;
               if (deleteReplyEl) {
                 // Remove standard reply by clicking `delete` button
                 (deleteReplyEl as HTMLElement).click();
@@ -708,6 +713,7 @@ export class GmailElementReplacer extends WebmailElementReplacer {
             midConvoDraft = true; // last box was processed first (looping in reverse), and all the rest must be drafts
           }
         }
+        this.switchToEncryptedReply = false;
       }
     }
   };