refactor: Guard against undefined definitions (#2086)

NigelBreslaw · Jul 20, 2024 · 3c648cd · 3c648cd
1 parent db8e90a
commit 3c648cd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/native/app/inventory/logic/Sockets.ts b/native/app/inventory/logic/Sockets.ts
@@ -253,7 +253,7 @@ export function expandAndCreateSockets(itemHash: ItemHash): Sockets | null {
 function addSocketCategoryDefinition(sockets: Sockets) {
   for (const category of sockets.socketCategories) {
     if (category.socketCategoryHash) {
-      const categoryDefinition = DestinySocketCategoryDefinition[category.socketCategoryHash];
+      const categoryDefinition = DestinySocketCategoryDefinition?.[category.socketCategoryHash];
       if (categoryDefinition) {
         category.name = categoryDefinition.displayProperties.name;
         category.description = categoryDefinition.displayProperties.description;

diff --git a/native/app/store/Definitions.ts b/native/app/store/Definitions.ts
@@ -222,7 +222,7 @@ function buildStatGroupDefinitionHelper(definition: StatGroupDefinition): StatGr
   const statHashes = Object.keys(definition);
 
   for (const statHash of statHashes) {
-    const statGroup = definition[statHash]?.scaledStats;
+    const statGroup = definition?.[statHash]?.scaledStats;
     if (!statGroup) {
       console.error("No statGroupDefinition found");
       continue;

diff --git a/native/app/store/DefinitionsSlice.ts b/native/app/store/DefinitionsSlice.ts
@@ -239,7 +239,7 @@ async function downloadAndStoreBungieDefinitions(bungieManifest: BungieManifest
       // This also saves interpolateStatValue() from having to do a calculation.
       const socketGroupDefinition = completedDefinitions[1] as unknown as StatGroupDefinition;
       for (const stat in socketGroupDefinition) {
-        const socketGroup = socketGroupDefinition[stat];
+        const socketGroup = socketGroupDefinition?.[stat];
         if (socketGroup) {
           for (const statHash of socketGroup.scaledStats) {
             if (deepEqual(statHash.displayInterpolation, NonInterpolationTable)) {

diff --git a/native/app/utilities/Constants.ts b/native/app/utilities/Constants.ts
@@ -5,10 +5,10 @@ import type { DestinyItem } from "@/app/inventory/logic/Types.ts";
 
 export function updateBucketSizes() {
   BUCKET_SIZES[SectionBuckets.Consumables] =
-    DestinyInventoryBucketDefinition[SectionBuckets.Consumables]?.itemCount ?? 5;
-  BUCKET_SIZES[SectionBuckets.Mods] = DestinyInventoryBucketDefinition[SectionBuckets.Mods]?.itemCount ?? 5;
-  BUCKET_SIZES[SectionBuckets.LostItem] = DestinyInventoryBucketDefinition[SectionBuckets.LostItem]?.itemCount ?? 5;
-  BUCKET_SIZES[SectionBuckets.Vault] = DestinyInventoryBucketDefinition[SectionBuckets.Vault]?.itemCount ?? 5;
+    DestinyInventoryBucketDefinition?.[SectionBuckets.Consumables]?.itemCount ?? 5;
+  BUCKET_SIZES[SectionBuckets.Mods] = DestinyInventoryBucketDefinition?.[SectionBuckets.Mods]?.itemCount ?? 5;
+  BUCKET_SIZES[SectionBuckets.LostItem] = DestinyInventoryBucketDefinition?.[SectionBuckets.LostItem]?.itemCount ?? 5;
+  BUCKET_SIZES[SectionBuckets.Vault] = DestinyInventoryBucketDefinition?.[SectionBuckets.Vault]?.itemCount ?? 5;
 }
 
 export function updateDestinyText() {