fix tests

Author: sosnovsky

extension/chrome/settings/inbox/inbox.ts

@@ -185,12 +185,7 @@ export class InboxView extends View {
   private addBrowserMsgListeners = () => {
     BrowserMsg.addListener('add_end_session_btn', () => this.injector.insertEndSessionBtn(this.acctEmail));
     BrowserMsg.addListener('set_active_window', async ({ frameId }: Bm.ComposeWindow) => {
-      if ($(`.secure_compose_window.active[data-frame-id="${frameId}"]`).length) {
-        return; // already active
-      }
-      $(`.secure_compose_window`).removeClass('previous_active');
-      $(`.secure_compose_window.active`).addClass('previous_active').removeClass('active');
-      $(`.secure_compose_window[data-frame-id="${frameId}"]`).addClass('active');
+      this.injector.setActiveComposeWindow(frameId);
     });
     BrowserMsg.addListener('close_compose_window', async ({ frameId }: Bm.ComposeWindow) => {
       $(`.secure_compose_window[data-frame-id="${frameId}"]`).remove();

extension/js/common/inject.ts

@@ -68,15 +68,28 @@ export class Injector {
     const alreadyOpenedCount = this.S.now('secure_compose_window').length;
     if (alreadyOpenedCount < 3) {
       const composeWin = $(this.factory.embeddedCompose(draftId, openInFullScreen, thunderbirdMsgId, replyOption, replyMsgId));
+      const frameId = composeWin.data('frame-id') as string;
       composeWin.attr('data-order', alreadyOpenedCount + 1);
+      composeWin.on('click focusin', () => this.setActiveComposeWindow(frameId));
+      composeWin.find('iframe').on('focus', () => this.setActiveComposeWindow(frameId));
       this.S.cached('body').append(composeWin); // xss-safe-factory
+      this.setActiveComposeWindow(frameId);
       return true;
     } else {
       Ui.toast('Only 3 FlowCrypt windows can be opened at a time', false, 3, 'top', 'error');
       return false;
     }
   };
 
+  public setActiveComposeWindow = (frameId: string) => {
+    if ($(`.secure_compose_window.active[data-frame-id="${frameId}"]`).length) {
+      return; // already active
+    }
+    $(`.secure_compose_window`).removeClass('previous_active');
+    $(`.secure_compose_window.active`).addClass('previous_active').removeClass('active');
+    $(`.secure_compose_window[data-frame-id="${frameId}"]`).addClass('active');
+  };
+
   public btns = () => {
     if (this.S.now('compose_button_container').length === 0) {
       // don't inject too early

extension/js/content_scripts/webmail/generic/setup-webmail-content-script.ts

@@ -152,12 +152,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi
   ) => {
     BrowserMsg.addListener('set_active_window', async req => {
       const { frameId } = req as Bm.ComposeWindow;
-      if ($(`.secure_compose_window.active[data-frame-id="${frameId}"]`).length) {
-        return; // already active
-      }
-      $(`.secure_compose_window`).removeClass('previous_active');
-      $(`.secure_compose_window.active`).addClass('previous_active').removeClass('active');
-      $(`.secure_compose_window[data-frame-id="${frameId}"]`).addClass('active');
+      inject.setActiveComposeWindow(frameId);
     });
     BrowserMsg.addListener('close_compose_window', async req => {
       const { frameId } = req as Bm.ComposeWindow;