From 8855884644eb8208a2f6465a7cc2c94ac87f754a Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <acoroiu@bitwarden.com>
Date: Tue, 10 Feb 2026 15:11:12 +0100
Subject: [PATCH] [PM-29313] [Defect] TDE JIT Provisioning - Extension showing
 locked icon even if user already logged in (#18672)

* fix: add better error handling to badge service

* fix: lint
---
 .../src/platform/badge/badge.service.ts       | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/platform/badge/badge.service.ts b/apps/browser/src/platform/badge/badge.service.ts
index f6d799b2a80..0ecb8210dd0 100644
--- a/apps/browser/src/platform/badge/badge.service.ts
+++ b/apps/browser/src/platform/badge/badge.service.ts
@@ -1,5 +1,6 @@
 import {
   BehaviorSubject,
+  catchError,
   combineLatest,
   combineLatestWith,
   concatMap,
@@ -73,9 +74,25 @@ export class BadgeService {
             map((evt) => evt.tab),
             combineLatestWith(this.stateFunctions),
             switchMap(([tab, dynamicStateFunctions]) => {
-              const functions = [...Object.values(dynamicStateFunctions), defaultTabStateFunction];
+              const functions = [
+                ...Object.entries(dynamicStateFunctions),
+                ["default" as string, defaultTabStateFunction] as const,
+              ];
 
-              return combineLatest(functions.map((f) => f(tab).pipe(startWith(undefined)))).pipe(
+              return combineLatest(
+                functions.map(([name, f]) =>
+                  f(tab).pipe(
+                    startWith(undefined),
+                    catchError((error: unknown) => {
+                      this.logService.error(
+                        `BadgeService: State function "${name}" threw an error`,
+                        error,
+                      );
+                      return of(undefined);
+                    }),
+                  ),
+                ),
+              ).pipe(
                 map((states) => ({
                   tab,
                   states: states.filter((s): s is BadgeStateSetting => s !== undefined),