From fae7fd9378388c27beb5a4b95870827b8938a70d Mon Sep 17 00:00:00 2001
From: Robyn MacCallum <robyntmaccallum@gmail.com>
Date: Mon, 16 May 2022 12:18:04 -0400
Subject: [PATCH] Show folders and properly filter collections (#2688)

---
 apps/browser/src/popup/vault/ciphers.component.ts        | 2 +-
 apps/browser/src/popup/vault/vault-filter.component.html | 2 +-
 apps/browser/src/popup/vault/vault-filter.component.ts   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/popup/vault/ciphers.component.ts b/apps/browser/src/popup/vault/ciphers.component.ts
index 8e7b734d14..59d8babd25 100644
--- a/apps/browser/src/popup/vault/ciphers.component.ts
+++ b/apps/browser/src/popup/vault/ciphers.component.ts
@@ -115,7 +115,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
         }
         await this.load(this.buildFilter());
       } else if (params.folderId) {
-        this.showVaultFilter = false;
+        this.showVaultFilter = true;
         this.folderId = params.folderId === "none" ? null : params.folderId;
         this.searchPlaceholder = this.i18nService.t("searchFolder");
         if (this.folderId != null) {
diff --git a/apps/browser/src/popup/vault/vault-filter.component.html b/apps/browser/src/popup/vault/vault-filter.component.html
index c6719bbe9c..44d4ce6583 100644
--- a/apps/browser/src/popup/vault/vault-filter.component.html
+++ b/apps/browser/src/popup/vault/vault-filter.component.html
@@ -115,7 +115,7 @@
         </button>
       </div>
     </div>
-    <div class="box list" *ngIf="!selectedOrganization && nestedFolders?.length">
+    <div class="box list" *ngIf="nestedFolders?.length">
       <h2 class="box-header">
         {{ "folders" | i18n }}
         <span class="flex-right">{{ folderCount }}</span>
diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/popup/vault/vault-filter.component.ts
index 8bae6c7328..ec743e5289 100644
--- a/apps/browser/src/popup/vault/vault-filter.component.ts
+++ b/apps/browser/src/popup/vault/vault-filter.component.ts
@@ -174,7 +174,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   }
 
   async loadCollections() {
-    const allCollections = await this.vaultFilterService.buildCollections();
+    const allCollections = await this.vaultFilterService.buildCollections(
+      this.selectedOrganization
+    );
     this.collections = allCollections.fullList;
     this.nestedCollections = allCollections.nestedList;
   }