From 7f98ce347db791001169edd4c1fe91f5735c3aa4 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Mon, 11 Oct 2021 17:46:43 +0200
Subject: [PATCH] Re-focus to last open tab before user was prompted for log in

---
 src/background/runtime.background.ts | 4 ++++
 src/browser/browserApi.ts            | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/background/runtime.background.ts b/src/background/runtime.background.ts
index 89a1674cbc3..a704613e34e 100644
--- a/src/background/runtime.background.ts
+++ b/src/background/runtime.background.ts
@@ -79,6 +79,10 @@ export default class RuntimeBackground {
                     await this.processMessage(retryItem.msg, retryItem.sender, null);
 
                     await BrowserApi.closeLoginTab();
+
+                    if (retryItem?.sender?.tab?.id) {
+                        await BrowserApi.focusSpecifiedTab(retryItem.sender.tab.id);
+                    }
                 }
                 break;
             case 'addToLockedVaultPendingNotifications':
diff --git a/src/browser/browserApi.ts b/src/browser/browserApi.ts
index 87e269ec5d0..c48572641fe 100644
--- a/src/browser/browserApi.ts
+++ b/src/browser/browserApi.ts
@@ -111,6 +111,10 @@ export class BrowserApi {
         chrome.tabs.remove(tabToClose);
     }
 
+    static async focusSpecifiedTab(tabId: number) {
+        chrome.tabs.update(tabId, { active: true, highlighted: true });
+    }
+
     static closePopup(win: Window) {
         if (BrowserApi.isWebExtensionsApi && BrowserApi.isFirefoxOnAndroid) {
             // Reactivating the active tab dismisses the popup tab. The promise final