fix: Fixed issue where Conflicts view is shown but the list is empty

packages/models/src/Domain/Runtime/Collection/Collection.ts

@@ -278,7 +278,7 @@ export abstract class Collection<
     this.typedMap[element.content_type] = array
   }
 
-  public numberOfItemsWithConflicts(): number {
+  public uuidsOfItemsWithConflicts(): string[] {
-    return this.conflictMap.directMapSize
+    return this.conflictMap.getAllDirectKeys()
   }
 }

packages/snjs/lib/Services/Items/ItemManager.ts

@@ -1420,6 +1420,6 @@ export class ItemManager
   }
 
   public numberOfNotesWithConflicts(): number {
-    return this.collection.numberOfItemsWithConflicts()
+    return this.findItems(this.collection.uuidsOfItemsWithConflicts()).filter(Models.isNote).length
   }
 }

packages/utils/src/Domain/Uuid/UuidMap.ts

@@ -37,6 +37,10 @@ export class UuidMap {
     return this.directMap.get(uuid) || []
   }
 
+  public getAllDirectKeys(): string[] {
+    return Array.from(this.directMap.keys())
+  }
+
   public getInverseRelationships(uuid: string): string[] {
     return this.inverseMap.get(uuid) || []
   }