diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts index df96edac140..67c369fa0f2 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts @@ -5,6 +5,7 @@ import { BehaviorSubject, combineLatest, combineLatestWith, + filter, firstValueFrom, map, Observable, @@ -72,10 +73,12 @@ export class VaultFilterService implements VaultFilterServiceAbstraction { this._organizationFilter, ]), ), + filter(([folders, ciphers, org]) => !!ciphers), // ciphers may be null, meaning decryption is in progress. Ignore this emission switchMap(([folders, ciphers, org]) => { return this.filterFolders(folders, ciphers, org); }), ); + folderTree$: Observable> = this.filteredFolders$.pipe( map((folders) => this.buildFolderTree(folders)), );