From 0bbe17f6e2becdf5146677d51cbc71cc099aaec9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 7 Jun 2019 13:20:23 -0400
Subject: [PATCH] fix removing no folder when showNoFolderCiphers

---
 jslib                                    | 2 +-
 src/popup/vault/groupings.component.html | 3 +--
 src/popup/vault/groupings.component.ts   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jslib b/jslib
index f4f90f83cd..8375f7381a 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit f4f90f83cd40c4ce6c4ceeedb9d359af463a02ed
+Subproject commit 8375f7381ad1d113fbf2fe2bd65e90ec4a1631b7
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index 9ab27863dd..5058a58072 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -74,8 +74,7 @@
                 </a>
             </div>
         </div>
-        <div class="box list"
-            *ngIf="nestedFolders && nestedFolders.length && (!showNoFolderCiphers || nestedFolders.length > 1)">
+        <div class="box list" *ngIf="nestedFolders && nestedFolders.length">
             <div class="box-header">
                 {{'folders' | i18n}}
                 <span class="flex-right">{{folderCount}}</span>
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index 7d76f2ac3e..ba54e9c106 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -154,9 +154,9 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
     async load() {
         await super.load(false);
         await this.loadCiphers();
-        if (this.showNoFolderCiphers && this.folders.length > 0) {
+        if (this.showNoFolderCiphers && this.nestedFolders.length > 0) {
             // Remove "No Folder" from folder listing
-            this.folders = this.folders.slice(0, this.folders.length - 1);
+            this.nestedFolders = this.nestedFolders.slice(0, this.nestedFolders.length - 1);
         }
 
         super.loaded = true;