From e36c36f401b5dc63b1a6cc37ded86544065a78b9 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Thu, 21 Sep 2023 20:04:05 +0530
Subject: [PATCH] chore: fix conflicts count not taking into account exclusive
 vault mode (#2505)

---
 .../src/Domain/Runtime/Display/ItemDisplayController.ts   | 4 ++++
 packages/snjs/lib/Services/Items/ItemManager.ts           | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts b/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts
index 34d1c83a6..263b7b12b 100644
--- a/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts
+++ b/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts
@@ -31,6 +31,10 @@ export class ItemDisplayController<I extends DisplayItem, O extends AnyDisplayOp
     return this.sortedItems
   }
 
+  public hasExclusiveVaultOptions(): boolean {
+    return this.vaultOptions ? !isExclusionaryOptionsValue(this.vaultOptions.getOptions()) : false
+  }
+
   public getDisplayOptions(): DisplayControllerDisplayOptions & O {
     return this.options
   }
diff --git a/packages/snjs/lib/Services/Items/ItemManager.ts b/packages/snjs/lib/Services/Items/ItemManager.ts
index 73f072553..7ac666ad6 100644
--- a/packages/snjs/lib/Services/Items/ItemManager.ts
+++ b/packages/snjs/lib/Services/Items/ItemManager.ts
@@ -875,7 +875,13 @@ export class ItemManager extends Services.AbstractService implements Services.It
   }
 
   public numberOfNotesWithConflicts(): number {
-    return this.findItems(this.collection.uuidsOfItemsWithConflicts()).filter(Models.isNote).length
+    const uuids = this.collection.uuidsOfItemsWithConflicts()
+    const items = this.navigationDisplayController.hasExclusiveVaultOptions()
+      ? this.navigationDisplayController
+          .items()
+          .filter((item) => Models.isNote(item) && this.collection.uuidsOfItemsWithConflicts().includes(item.uuid))
+      : this.findItems(uuids)
+    return items.length
   }
 
   getItemLinkedFiles(item: Models.DecryptedItemInterface): Models.FileItem[] {