Fix collectibles

DestinyItemManager · Nov 4, 2024 · faba8fc · faba8fc
1 parent bff01d3
commit faba8fc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/app/records/presentation-nodes.ts b/src/app/records/presentation-nodes.ts
@@ -28,6 +28,7 @@ import {
   DestinyRecordState,
   DestinyScope,
 } from 'bungie-api-ts/destiny2';
+import { minBy } from 'es-toolkit';
 import { unlockedItemsForCharacterOrProfilePlugSet } from './plugset-helpers';
 
 export interface DimPresentationNodeLeaf {
@@ -597,11 +598,13 @@ export function getCollectibleState(
 ) {
   return collectibleDef.scope === DestinyScope.Character
     ? profileResponse.characterCollectibles?.data
-      ? // Find the version of the collectible that's unlocked, if any
-        Object.values(profileResponse.characterCollectibles.data).find(
-          (c) =>
-            (c.collectibles[collectibleDef.hash].state ?? 0) & DestinyCollectibleState.NotAcquired,
-        )?.collectibles[collectibleDef.hash].state
+      ? minBy(
+          // Find the version of the collectible that's unlocked, if any
+          Object.values(profileResponse.characterCollectibles.data)
+            .map((c) => c.collectibles[collectibleDef.hash].state)
+            .filter((s) => s !== undefined),
+          (state) => state & DestinyCollectibleState.NotAcquired,
+        )
       : undefined
     : profileResponse.profileCollectibles?.data?.collectibles[collectibleDef.hash]?.state;
 }