From fe96aa85f2f38942a15bedf15c281e673819c13c Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Thu, 12 Sep 2024 15:59:33 -0400
Subject: [PATCH] [PM-12007] Fix vault timeout action logout with account
 switching (#11008)

* Protect Against Toast Error

* Use `concatMap` Instead of `switchMap`
---
 apps/browser/src/popup/app.component.ts                    | 7 ++++++-
 .../src/services/vault-timeout/vault-timeout.service.ts    | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 84a9ee264c..477152fff8 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -247,7 +247,7 @@ export class AppComponent implements OnInit, OnDestroy {
   // Displaying toasts isn't super useful on the popup due to the reloads we do.
   // However, it is visible for a moment on the FF sidebar logout.
   private async displayLogoutReason(logoutReason: LogoutReason) {
-    let toastOptions: ToastOptions;
+    let toastOptions: ToastOptions | null = null;
     switch (logoutReason) {
       case "invalidSecurityStamp":
       case "sessionExpired": {
@@ -260,6 +260,11 @@ export class AppComponent implements OnInit, OnDestroy {
       }
     }
 
+    if (toastOptions == null) {
+      // We don't have anything to show for this particular reason
+      return;
+    }
+
     this.toastService.showToast(toastOptions);
   }
 }
diff --git a/libs/common/src/services/vault-timeout/vault-timeout.service.ts b/libs/common/src/services/vault-timeout/vault-timeout.service.ts
index d9efef44f4..c40e4687b7 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout.service.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout.service.ts
@@ -1,4 +1,4 @@
-import { combineLatest, filter, firstValueFrom, map, switchMap, timeout } from "rxjs";
+import { combineLatest, concatMap, filter, firstValueFrom, map, timeout } from "rxjs";
 
 import { LogoutReason } from "@bitwarden/auth/common";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -79,7 +79,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
         this.accountService.activeAccount$,
         this.accountService.accountActivity$,
       ]).pipe(
-        switchMap(async ([activeAccount, accountActivity]) => {
+        concatMap(async ([activeAccount, accountActivity]) => {
           const activeUserId = activeAccount?.id;
           for (const userIdString in accountActivity) {
             const userId = userIdString as UserId;