feature: update the UI on pullFromPostmaster (#1338)

* feature: update the UI on pullFromPostmaster * lint fix
NigelBreslaw · Apr 19, 2024 · 027d9d2 · 027d9d2
1 parent 9100bb5
commit 027d9d2
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 55 deletions.
diff --git a/native/app/store/AccountInventoryLogic.ts b/native/app/store/AccountInventoryLogic.ts
@@ -22,7 +22,11 @@ import {
 } from "@/app/inventory/Common.ts";
 import type { AccountSliceGetter, AccountSliceSetter } from "@/app/store/AccountSlice.ts";
 import { itemsDefinition, rawProfileData } from "@/app/store/Definitions.ts";
-import { VAULT_CHARACTER_ID } from "@/app/utilities/Constants.ts";
+import {
+  GLOBAL_CONSUMABLES_CHARACTER_ID,
+  GLOBAL_MODS_CHARACTER_ID,
+  VAULT_CHARACTER_ID,
+} from "@/app/utilities/Constants.ts";
 import { typeAndPowerSort } from "@/app/utilities/Helpers.ts";
 import { create } from "mutative";
 
@@ -325,12 +329,14 @@ function returnInventoryArray(dataArray: DestinyItem[], bucketHash: number): Des
 // Update UI logic
 // ------------------------------
 
-export function removeFromInventory(get: AccountSliceGetter, set: AccountSliceSetter, destinyItem: DestinyItem) {
+export function removeInventoryItem(get: AccountSliceGetter, set: AccountSliceSetter, destinyItem: DestinyItem) {
   if (destinyItem.previousCharacterId === "") {
     console.error("ERROR: removeFromGuardian expected previousCharacterId to be set");
     return;
   }
 
+  console.log("removeInventoryItem", destinyItem);
+
   if (destinyItem.previousCharacterId === VAULT_CHARACTER_ID) {
     // TODO: Cope with stackable items
     const previousGeneralVault = get().generalVault;
@@ -370,7 +376,8 @@ export function removeFromInventory(get: AccountSliceGetter, set: AccountSliceSe
   }
 }
 
-export function addToInventory(get: AccountSliceGetter, set: AccountSliceSetter, destinyItem: DestinyItem) {
+export function addInventoryItem(get: AccountSliceGetter, set: AccountSliceSetter, destinyItem: DestinyItem) {
+  console.log("addInventoryItem", destinyItem);
   // Vault or other?
   if (destinyItem.characterId === VAULT_CHARACTER_ID) {
     // TODO: Cope with stackable items
@@ -445,6 +452,36 @@ export function swapEquipAndInventoryItem(get: AccountSliceGetter, set: AccountS
   set({ guardians: updatedGuardians });
 }
 
+export function transformSuccessfulPullFromPostmasterItem(destinyItem: DestinyItem): DestinyItem {
+  let characterId: string;
+  console.log(
+    "transformSuccessfulPullFromPostmasterItem",
+    destinyItem.characterId,
+    SectionBuckets[destinyItem.recoveryBucketHash],
+  );
+  switch (destinyItem.recoveryBucketHash) {
+    case SectionBuckets.Mods: {
+      characterId = GLOBAL_MODS_CHARACTER_ID;
+      break;
+    }
+    case SectionBuckets.Consumables: {
+      characterId = GLOBAL_CONSUMABLES_CHARACTER_ID;
+      break;
+    }
+    default: {
+      characterId = destinyItem.characterId;
+    }
+  }
+  const bucketHash = destinyItem.recoveryBucketHash;
+  const newDestinyItem: DestinyItem = {
+    ...destinyItem,
+    characterId,
+    bucketHash,
+  };
+
+  return newDestinyItem;
+}
+
 const deepSightItemHash: number[] = [101423981, 213377779, 1948344346, 2373253941, 2400712188, 3394691176, 3632593563];
 
 export function hasSocketedResonance(itemInstanceId: string): boolean {

diff --git a/native/app/store/AccountSlice.ts b/native/app/store/AccountSlice.ts
@@ -34,11 +34,12 @@ import {
 import type { StateCreator } from "zustand";
 import type { IStore } from "@/app/store/GGStore.ts";
 import {
-  addToInventory,
+  addInventoryItem,
   checkForCraftedMasterwork,
   hasSocketedResonance,
-  removeFromInventory,
+  removeInventoryItem,
   swapEquipAndInventoryItem,
+  transformSuccessfulPullFromPostmasterItem,
   updateAllPages,
 } from "@/app/store/AccountInventoryLogic.ts";
 import { bitmaskContains } from "@/app/utilities/Helpers.ts";
@@ -77,8 +78,7 @@ export interface AccountSlice {
   setTimestamps: (responseMintedTimestamp: string, secondaryComponentsMintedTimestamp: string) => void;
   moveItem: (updatedDestinyItem: DestinyItem) => void;
   equipItem: (updatedDestinyItem: DestinyItem) => void;
-  removeFromLostItems: (updatedDestinyItem: DestinyItem) => void;
-  addInventoryItem: (updatedDestinyItem: DestinyItem) => void;
+  pullFromPostmaster: (updatedDestinyItem: DestinyItem) => DestinyItem;
   findDestinyItem: (itemDetails: DestinyItemIdentifier) => DestinyItem;
   setSecondarySpecial: (characterId: string, itemHash: number) => void;
 }
@@ -130,8 +130,8 @@ export const createAccountSlice: StateCreator<IStore, [], [], AccountSlice> = (s
 
   moveItem: (updatedDestinyItem) => {
     const p1 = performance.now();
-    removeFromInventory(get, set, updatedDestinyItem);
-    addToInventory(get, set, updatedDestinyItem);
+    removeInventoryItem(get, set, updatedDestinyItem);
+    addInventoryItem(get, set, updatedDestinyItem);
     const p2 = performance.now();
     console.log("moveItem", `${(p2 - p1).toFixed(4)} ms`);
     updateAllPages(get, set);
@@ -140,11 +140,17 @@ export const createAccountSlice: StateCreator<IStore, [], [], AccountSlice> = (s
     swapEquipAndInventoryItem(get, set, updatedDestinyItem);
     updateAllPages(get, set);
   },
-  removeFromLostItems: (updatedDestinyItem) => {
-    removeFromInventory(get, set, updatedDestinyItem);
-  },
-  addInventoryItem: (updatedDestinyItem) => {
-    addToInventory(get, set, updatedDestinyItem);
+  pullFromPostmaster: (updatedDestinyItem) => {
+    // remove the item from the lost items
+    removeInventoryItem(get, set, updatedDestinyItem);
+    // Mutate the item to be part of the characters items or a global bucket
+    const transformedItem = transformSuccessfulPullFromPostmasterItem(updatedDestinyItem);
+    // Add the item back
+    addInventoryItem(get, set, transformedItem);
+
+    updateAllPages(get, set);
+
+    return transformedItem;
   },
   findDestinyItem: (itemDetails) =>
     findDestinyItem(get, {

diff --git a/native/app/transfer/TransferLogic.ts b/native/app/transfer/TransferLogic.ts
@@ -9,12 +9,7 @@ import {
 } from "@/app/inventory/Common.ts";
 import { itemsDefinition } from "@/app/store/Definitions.ts";
 import { useGGStore } from "@/app/store/GGStore.ts";
-import {
-  GLOBAL_CONSUMABLES_CHARACTER_ID,
-  GLOBAL_INVENTORY_NAMES,
-  GLOBAL_MODS_CHARACTER_ID,
-  VAULT_CHARACTER_ID,
-} from "@/app/utilities/Constants.ts";
+import { GLOBAL_INVENTORY_NAMES, VAULT_CHARACTER_ID } from "@/app/utilities/Constants.ts";
 import { bitmaskContains } from "@/app/utilities/Helpers.ts";
 import { apiKey } from "@/constants/env.ts";
 import { number, object, optional, safeParse, string } from "valibot";
@@ -52,7 +47,7 @@ export async function processTransferItem(
       quantityToMove,
       "equipOnTarget:",
       equipOnTarget,
-    ); //, destinyItem);
+    );
   }
 
   const transferItem: TransferItem = {
@@ -79,15 +74,8 @@ export async function processTransferItem(
     const parsedResult = safeParse(responseSchema, result[0]);
     if (parsedResult.success) {
       if (parsedResult.output.ErrorStatus === "Success") {
-        // remove the item from the lost items
-        useGGStore.getState().removeFromLostItems(result[1]);
-
-        // Mutate the item to be part of the characters items or a global bucket
-        const transformedItem = transformSuccessfulPullFromPostmasterItem(result[1]);
-
-        // Add the item back
-        useGGStore.getState().addInventoryItem(result[1]);
-
+        // Update the UI and get a transformed item to continue the transfer
+        const transformedItem = useGGStore.getState().pullFromPostmaster(result[1]);
         // Send the item on its way
         processTransferItem(toCharacterId, transformedItem, quantityToMove, equipOnTarget);
         return;
@@ -162,31 +150,6 @@ export async function processTransferItem(
   }
 }
 
-function transformSuccessfulPullFromPostmasterItem(destinyItem: DestinyItem): DestinyItem {
-  let characterId: string;
-  switch (destinyItem.recoveryBucketHash) {
-    case SectionBuckets.Mods: {
-      characterId = GLOBAL_MODS_CHARACTER_ID;
-      break;
-    }
-    case SectionBuckets.Consumables: {
-      characterId = GLOBAL_CONSUMABLES_CHARACTER_ID;
-      break;
-    }
-    default: {
-      characterId = destinyItem.characterId;
-    }
-  }
-  const bucketHash = destinyItem.recoveryBucketHash;
-  const newDestinyItem: DestinyItem = {
-    ...destinyItem,
-    characterId,
-    bucketHash,
-  };
-
-  return newDestinyItem;
-}
-
 async function _unequipItem(destinyItem: DestinyItem): Promise<boolean> {
   let allowExotic = destinyItem.tierType === TierType.Exotic;