refactor: Apply same fix to mods + consumables (#1742)

NigelBreslaw · May 24, 2024 · 722c764 · 722c764
1 parent 4b421b9
commit 722c764
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 69 deletions.
diff --git a/native/app/inventory/sections/LootItemRow.tsx b/native/app/inventory/sections/LootItemRow.tsx
@@ -18,7 +18,6 @@ export default function LootItemRow({ iconData }: Props) {
         flexDirection: "row",
         justifyContent: "space-between",
         alignContent: "space-between",
-        alignItems: "center",
         marginLeft: DEFAULT_MARGIN,
         marginRight: DEFAULT_MARGIN,
         maxWidth: INV_MAX_WIDTH,

diff --git a/native/app/store/AccountInventoryLogic.ts b/native/app/store/AccountInventoryLogic.ts
@@ -32,7 +32,6 @@ import {
   type LostItemsSection,
   type SeparatorSection,
   type UISections,
-  type VaultFlexSection,
   type VaultSpacerSection,
 } from "@/app/inventory/logic/Helpers.ts";
 import { getDamageTypeIconUri } from "@/app/inventory/logic/Constants.ts";
@@ -152,28 +151,20 @@ function buildUIData(get: AccountSliceGetter, sectionBuckets: number[]): UISecti
       dataArray.push(separator);
 
       if (bucket === SectionBuckets.Consumables) {
-        const globalConsumables: VaultFlexSection = {
-          id: `${bucket}_global_consumables_section`,
-          type: UISection.VaultFlex,
-          inventory: [],
-        };
         if (consumables) {
-          globalConsumables.inventory = returnInventoryArray(consumables, bucket);
+          const consumableIcons = returnInventoryArray(consumables, bucket);
+          const lootIconSections = getLootIconSections(consumableIcons, "global_consumables_section");
+          dataArray.push(...lootIconSections);
         }
-        dataArray.push(globalConsumables);
         continue;
       }
 
       if (bucket === SectionBuckets.Mods) {
-        const globalMods: VaultFlexSection = {
-          id: `${bucket}_global_mods_section`,
-          type: UISection.VaultFlex,
-          inventory: [],
-        };
         if (mods) {
-          globalMods.inventory = returnInventoryArray(mods, bucket);
+          const modsIcons = returnInventoryArray(mods, bucket);
+          const lootIconSections = getLootIconSections(modsIcons, "global_mods_section");
+          dataArray.push(...lootIconSections);
         }
-        dataArray.push(globalMods);
         continue;
       }
 
@@ -276,58 +267,7 @@ function returnVaultUiData(
       }
 
       const lootIconSections = getLootIconSections(totalItemsArray, bucket.toString());
-      // push each section to the dataArray
       dataArray.push(...lootIconSections);
-
-      // let itemsLeft = totalItemsArray.length;
-      // let count = 0;
-      // const needsMinimumSpacer = totalItemsArray.length < 20;
-      // while (itemsLeft > 0) {
-      //   // is there 21 or more items left?
-      //   if (itemsLeft > 20) {
-      //     const vault5x5Cell: Vault5x5Section = {
-      //       id: `${bucket}_5x5_section${count}`,
-      //       type: UISection.Vault5x5,
-      //       inventory: [],
-      //     };
-
-      //     const startingPoint = Math.max(0, totalItemsArray.length - itemsLeft);
-
-      //     const itemsToAdd: DestinyIconData[] = [];
-      //     for (let i = startingPoint; i < startingPoint + 25; i++) {
-      //       const item = totalItemsArray[i];
-      //       if (item) {
-      //         itemsToAdd.push(item);
-      //       } else {
-      //         break;
-      //       }
-      //     }
-      //     vault5x5Cell.inventory = itemsToAdd;
-      //     dataArray.push(vault5x5Cell);
-      //     itemsLeft -= 25;
-      //     count++;
-      //   } else {
-      //     const vaultFlexCell: VaultFlexSection = {
-      //       id: `${bucket}_flex_section`,
-      //       type: UISection.VaultFlex,
-      //       inventory: [],
-      //       minimumSpacerHeight: needsMinimumSpacer ? get().getVaultSpacerSize(bucket) : undefined,
-      //     };
-
-      //     const startingPoint = Math.max(0, totalItemsArray.length - itemsLeft);
-
-      //     const itemsToAdd: DestinyIconData[] = [];
-      //     for (let i = startingPoint; i < startingPoint + itemsLeft; i++) {
-      //       const item = totalItemsArray[i];
-      //       if (item) {
-      //         itemsToAdd.push(item);
-      //       }
-      //     }
-      //     vaultFlexCell.inventory = itemsToAdd;
-      //     dataArray.push(vaultFlexCell);
-      //     itemsLeft = 0;
-      //   }
-      // }
     }
   }
   return dataArray;

diff --git a/native/app/store/UIDataSlice.ts b/native/app/store/UIDataSlice.ts
@@ -53,13 +53,13 @@ function getVaultSpacerSize(get: UIDataSliceGetter, bucket: SectionBuckets): num
   if (bucket === SectionBuckets.Consumables) {
     const totalConsumables = consumables.length;
     const totalRows = Math.ceil(totalConsumables / 5);
-    return ICON_SIZE * totalRows + ICON_MARGIN * (totalRows - 1);
+    return (ICON_SIZE + ICON_MARGIN) * totalRows;
   }
 
   if (bucket === SectionBuckets.Mods) {
     const totalMods = mods.length;
     const totalRows = Math.ceil(totalMods / 5);
-    return ICON_SIZE * totalRows + ICON_MARGIN * (totalRows - 1);
+    return (ICON_SIZE + ICON_MARGIN) * totalRows;
   }
   return 0;
 }