From f1af23dc1f3fa7f98fff4a1746ae26e3b2ff3558 Mon Sep 17 00:00:00 2001 From: Justin Baur <19896123+justindbaur@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:01:49 -0500 Subject: [PATCH] Fix Vault Loading (#13484) --- .../src/vault/popup/services/vault-popup-items.service.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts index 0b3e7eba492..c71c2ca32c3 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts @@ -94,8 +94,12 @@ export class VaultPopupItemsService { runInsideAngular(this.ngZone), tap(() => this._ciphersLoading$.next()), waitUntilSync(this.syncService), - switchMap(() => Utils.asyncToObservable(() => this.cipherService.getAllDecrypted(userId))), - withLatestFrom(this.cipherService.failedToDecryptCiphers$(userId)), + switchMap(() => + combineLatest([ + Utils.asyncToObservable(() => this.cipherService.getAllDecrypted(userId)), + this.cipherService.failedToDecryptCiphers$(userId), + ]), + ), map(([ciphers, failedToDecryptCiphers]) => [...failedToDecryptCiphers, ...ciphers]), ), ),