From 2cce6f0c04d8eed08be6c9c7a82fe17257b00328 Mon Sep 17 00:00:00 2001
From: Vladimir Y <dev.vladimir.y@gmail.com>
Date: Sun, 2 Feb 2020 19:27:00 +0300
Subject: [PATCH] fix lost focus issue introduced in v4.2.0, #248

---
 src/web/browser-window/app/_accounts/account.component.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/web/browser-window/app/_accounts/account.component.ts b/src/web/browser-window/app/_accounts/account.component.ts
index 9aa617197..5440dfc05 100644
--- a/src/web/browser-window/app/_accounts/account.component.ts
+++ b/src/web/browser-window/app/_accounts/account.component.ts
@@ -329,14 +329,13 @@ export class AccountComponent extends NgChangesObservableComponent implements On
                     startWith(IPC_MAIN_API_NOTIFICATION_ACTIONS.ActivateBrowserWindow()),
                     filter(IPC_MAIN_API_NOTIFICATION_ACTIONS.is.ActivateBrowserWindow),
                 ),
-                this.account$,
             ]).pipe(
-                filter(([selectedLogin, , account]) => account.accountConfig.login === selectedLogin),
+                filter(([selectedLogin]) => this.account.accountConfig.login === selectedLogin),
                 debounceTime(ONE_SECOND_MS * 0.3),
-            ).subscribe(async ([, , account]) => {
+            ).subscribe(async () => {
                 this.focusPrimaryWebView();
                 await this.api.ipcMainClient()("selectAccount")({
-                    databaseView: account.databaseView,
+                    databaseView: this.account.databaseView,
                     // WARN electron: "webView.getWebContentsId()" is available only after "webView.dom-ready" triggered
                     webContentId: primaryWebView.getWebContentsId(),
                 });