prevent undesirable "TryToLogin" action firing

vladimiry · Feb 13, 2021 · 1903c18 · 1903c18
1 parent 3b0cf9a
commit 1903c18
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/web/browser-window/app/_accounts/account-view-primary.component.ts b/src/web/browser-window/app/_accounts/account-view-primary.component.ts
@@ -1,6 +1,6 @@
 import {Component, Injector, OnInit} from "@angular/core";
 import {Subject, combineLatest, from, race} from "rxjs";
-import {distinctUntilChanged, filter, map, pairwise, take, takeUntil} from "rxjs/operators";
+import {distinctUntilChanged, filter, map, pairwise, take, takeUntil, withLatestFrom} from "rxjs/operators";
 import {equals, pick} from "remeda";
 
 import {ACCOUNTS_ACTIONS} from "src/web/browser-window/app/store/actions";
@@ -52,9 +52,13 @@ export class AccountViewPrimaryComponent extends AccountViewAbstractComponent im
                             !equals(this.pickLoginDelayFields(prev.accountConfig), this.pickLoginDelayFields(curr.accountConfig))
                         );
                     }),
-                    map(([, curr]) => curr),
                 )
-            ]).subscribe(([{webView}, account]) => {
+            ]).pipe(
+                withLatestFrom(this.account$),
+            ).subscribe(([[{webView}], account]) => {
+                if (account.notifications.pageType.type === "unknown") {
+                    return;
+                }
                 this.log("info", [`dispatch "TryToLogin"`]);
                 this.action(ACCOUNTS_ACTIONS.TryToLogin({account, webView}));
             }),