clean

BibliothecaDAO · Dec 11, 2024 · e3b2744 · e3b2744
1 parent 6f4918f
commit e3b2744
Show file tree

Hide file tree

Showing 13 changed files with 244 additions and 292 deletions.
diff --git a/client/src/dojo/modelManager/__tests__/BattleManager.test.ts b/client/src/dojo/modelManager/__tests__/BattleManager.test.ts
@@ -66,14 +66,14 @@ import { describe, it } from "vitest";
 // });
 
 describe("getBattle", () => {
-    it("should return a valid battle for a valid mock", () => {
-  //     const mockBattle = generateMockBatle(true);
-  //     vi.mocked(getComponentValue).mockReturnValueOnce(mockBattle);
-  //     const battleManager = new BattleManager(BATTLE_ENTITY_ID, mockDojoResult);
-  //     const battle = battleManager.getBattle();
-  //     expect(battle).toBeDefined();
-  //     expect(battle).toBe(mockBattle);
-    });
+  it("should return a valid battle for a valid mock", () => {
+    //     const mockBattle = generateMockBatle(true);
+    //     vi.mocked(getComponentValue).mockReturnValueOnce(mockBattle);
+    //     const battleManager = new BattleManager(BATTLE_ENTITY_ID, mockDojoResult);
+    //     const battle = battleManager.getBattle();
+    //     expect(battle).toBeDefined();
+    //     expect(battle).toBe(mockBattle);
+  });
 });
 
 // describe("isBattle", () => {

diff --git a/client/src/hooks/helpers/useQuests.tsx b/client/src/hooks/helpers/useQuests.tsx
@@ -63,9 +63,7 @@ export const useQuests = () => {
 };
 
 const useQuestDependencies = () => {
-  const {
-    setup,
-  } = useDojo();
+  const { setup } = useDojo();
 
   const structureEntityId = useUIStore((state) => state.structureEntityId);
 
@@ -203,10 +201,10 @@ export const useQuestClaimStatus = () => {
 
   const questClaimStatus = useMemo(() => {
     const entityBigInt = BigInt(structureEntityId || 0);
-    
-    const checkPrizesClaimed = (prizes: Prize[]) => 
-      prizes.every((prize) => 
-        getComponentValue(Quest, getEntityIdFromKeys([entityBigInt, BigInt(prize.id)]))?.completed
+
+    const checkPrizesClaimed = (prizes: Prize[]) =>
+      prizes.every(
+        (prize) => getComponentValue(Quest, getEntityIdFromKeys([entityBigInt, BigInt(prize.id)]))?.completed,
       );
 
     return Array.from(questDetails.keys()).reduce(

diff --git a/client/src/hooks/helpers/useResources.tsx b/client/src/hooks/helpers/useResources.tsx
@@ -1,15 +1,13 @@
 import { configManager } from "@/dojo/setup";
 import {
   CapacityConfigCategory,
-  ContractAddress,
   ID,
-  Position,
   ResourcesIds,
   resources,
-  type Resource,
+  type Resource
 } from "@bibliothecadao/eternum";
 import { useComponentValue } from "@dojoengine/react";
-import { Has, HasValue, Not, getComponentValue, runQuery, type Entity } from "@dojoengine/recs";
+import { Has, HasValue, getComponentValue, runQuery, type Entity } from "@dojoengine/recs";
 import { useEffect, useMemo, useState } from "react";
 import { ResourceManager } from "../../dojo/modelManager/ResourceManager";
 import { getEntityIdFromKeys } from "../../ui/utils/utils";
@@ -182,45 +180,3 @@ export const useResourceManager = (entityId: ID, resourceId: ResourcesIds) => {
 
   return resourceManager;
 };
-
-export function useOwnedEntitiesOnPosition() {
-  const {
-    account: { account },
-    setup: {
-      components: { Owner, Position, Movable, Bank, Army },
-    },
-  } = useDojo();
-
-  const getOwnedEntitiesOnPosition = (address: ContractAddress, position: Position) => {
-    const { x, y } = position;
-
-    const entities = runQuery([
-      HasValue(Owner, { address }),
-      Not(Movable),
-      Not(Army),
-      // @note: safer to do like this rather than deconstruct because there's a chance entity_id is also there
-      HasValue(Position, { x, y }),
-    ]);
-
-    return Array.from(entities)
-      .map((entityId) => {
-        const position = getComponentValue(Position, entityId);
-        if (!position) return;
-        return position?.entity_id;
-      })
-      .filter(Boolean) as ID[];
-  };
-
-  const getOwnedEntityOnPosition = (entityId: ID) => {
-    const position = getComponentValue(Position, getEntityIdFromKeys([BigInt(entityId)]));
-    const depositEntityIds = position
-      ? getOwnedEntitiesOnPosition(ContractAddress(account.address), { x: Number(position.x), y: Number(position.y) })
-      : [];
-    return depositEntityIds[0];
-  };
-
-  return {
-    getOwnedEntitiesOnPosition,
-    getOwnedEntityOnPosition,
-  };
-}
diff --git a/client/src/ui/components/hyperstructures/HyperstructurePanel.tsx b/client/src/ui/components/hyperstructures/HyperstructurePanel.tsx
@@ -156,11 +156,12 @@ export const HyperstructurePanel = ({ entity }: any) => {
       setNewContributions({});
       setResetContributions(false);
     }
-
   };
 
   const [selectedAccess, setSelectedAccess] = useState<"Public" | "Private" | "GuildOnly">(
-    hyperstructure ? (DisplayedAccess[hyperstructure.access as keyof typeof DisplayedAccess] as "Public" | "Private" | "GuildOnly") : "Private"
+    hyperstructure
+      ? (DisplayedAccess[hyperstructure.access as keyof typeof DisplayedAccess] as "Public" | "Private" | "GuildOnly")
+      : "Private",
   );
 
   return (
@@ -207,21 +208,19 @@ export const HyperstructurePanel = ({ entity }: any) => {
               <div className="flex gap-2 justify-between w-full">
                 <div className="flex items-center justify-between">
                   <div className="flex flex-col items-center gap-1">
-
                     <h4 className="truncate">{entity.name}</h4>
-                    <Button size="xs" onClick={updateLeaderboard}>Reload</Button>
+                    <Button size="xs" onClick={updateLeaderboard}>
+                      Reload
+                    </Button>
                   </div>
-
-
                 </div>
 
                 {account.address === entity.owner && (
                   <div className="flex flex-col gap-2">
-
                     {hyperstructure && entity.isOwner && isLoading !== Loading.SetPrivate ? (
                       <Select
                         onValueChange={(access: keyof typeof Access) => {
-                          setSelectedAccess(access); 
+                          setSelectedAccess(access);
                           setAccess(BigInt(Access[access]));
                         }}
                       >
@@ -248,13 +247,15 @@ export const HyperstructurePanel = ({ entity }: any) => {
                             ))}
                         </SelectContent>
                       </Select>
-                    ) : <div className="text-gold text-sm">Loading...</div>}
-
-{account.address === entity.owner && (
-                    <Button size="xs" variant="default" onClick={() => setEditName(!editName)}>
-                      edit name
-                    </Button>
-                  )}
+                    ) : (
+                      <div className="text-gold text-sm">Loading...</div>
+                    )}
+
+                    {account.address === entity.owner && (
+                      <Button size="xs" variant="default" onClick={() => setEditName(!editName)}>
+                        edit name
+                      </Button>
+                    )}
                   </div>
                 )}
               </div>

diff --git a/client/src/ui/components/trading/ResourceArrivals.tsx b/client/src/ui/components/trading/ResourceArrivals.tsx
@@ -1,17 +1,9 @@
 import { ArrivalInfo } from "@/hooks/helpers/use-resource-arrivals";
 import { Headline } from "@/ui/elements/Headline";
 import { HintModalButton } from "@/ui/elements/HintModalButton";
-import { ID, Resource } from "@bibliothecadao/eternum";
 import { EntityArrival } from "../entities/Entity";
 import { HintSection } from "../hints/HintModal";
 
-export type EntityReadyForDeposit = {
-  carrierId: ID;
-  senderEntityId: ID;
-  recipientEntityId: ID;
-  resources: Resource[];
-};
-
 export const AllResourceArrivals = ({ arrivals, className }: { arrivals: ArrivalInfo[]; className?: string }) => {
   return (
     <div className={`p-2 flex flex-col space-y-1 overflow-y-auto gap-2 ${className ? className : ""}`}>