From 51e9aaf3a4e1b66eab62814a4651c572ca243da9 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Fri, 31 Oct 2025 16:11:26 -0700
Subject: [PATCH] fix id logic

---
 .../popup/services/vault-popup-list-filters.service.spec.ts   | 4 ++--
 .../vault/popup/services/vault-popup-list-filters.service.ts  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
index 692e21d0084..537489153f2 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts
@@ -437,7 +437,7 @@ describe("VaultPopupListFiltersService", () => {
 
   describe("folders$", () => {
     it('returns no folders when "No Folder" is the only option', (done) => {
-      folderViews$.next([{ id: null, name: "No Folder" }]);
+      folderViews$.next([{ id: "", name: "No Folder" }]);
 
       service.folders$.subscribe((folders) => {
         expect(folders).toEqual([]);
@@ -447,7 +447,7 @@ describe("VaultPopupListFiltersService", () => {
 
     it('moves "No Folder" to the end of the list', (done) => {
       folderViews$.next([
-        { id: null, name: "No Folder" },
+        { id: "", name: "No Folder" },
         { id: "2345", name: "Folder 2" },
         { id: "1234", name: "Folder 1" },
       ]);
diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
index 78dd81174cb..6047acdeb81 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts
@@ -390,7 +390,7 @@ export class VaultPopupListFiltersService {
             FolderView[],
             PopupCipherViewLike[],
           ] => {
-            if (folders.length === 1 && folders[0].id) {
+            if (folders.length === 1 && !folders[0].id) {
               // Do not display folder selections when only the "no folder" option is available.
               return [filters as PopupListFilter, [], cipherViews];
             }
@@ -409,7 +409,7 @@ export class VaultPopupListFiltersService {
               };
 
               // Move the "no folder" option to the end of the list
-              arrangedFolders = [...folders.filter((f) => !f.id), updatedNoFolder];
+              arrangedFolders = [...folders.filter((f) => f.id), updatedNoFolder];
             }
             return [filters as PopupListFilter, arrangedFolders, cipherViews];
           },