fix structure owners & transfers #2544
+69
−74
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,13 +4,17 @@ import { create } from "zustand"; | |
| interface WorldState { | ||
| isWorldLoading: boolean; | ||
| isMarketLoading: boolean; | ||
| isStructuresLoading: boolean; | ||
| setWorldLoading: (loading: boolean) => void; | ||
| setMarketLoading: (loading: boolean) => void; | ||
| setStructuresLoading: (loading: boolean) => void; | ||
| } | ||
|
|
||
| export const useWorldStore = create<WorldState>((set) => ({ | ||
| isWorldLoading: true, | ||
| isMarketLoading: true, | ||
| isStructuresLoading: true, | ||
| setWorldLoading: (loading: boolean) => set({ isWorldLoading: loading }), | ||
| setMarketLoading: (loading: boolean) => set({ isMarketLoading: loading }), | ||
| setStructuresLoading: (loading: boolean) => set({ isStructuresLoading: loading }), | ||
| })); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,20 +3,24 @@ import { lazy, Suspense, useEffect, useMemo, useState } from "react"; | |
| import { Redirect } from "wouter"; | ||
| import useUIStore from "../../hooks/store/useUIStore"; | ||
|
|
||
| import { | ||
| addMarketSubscription, | ||
| addToSubscription, | ||
| addToSubscriptionOneKeyModelbyRealmEntityId, | ||
| addToSubscriptionTwoKeyModelbyRealmEntityId, | ||
| } from "@/dojo/queries"; | ||
| import { useDojo } from "@/hooks/context/DojoContext"; | ||
| import { PlayerStructure, useEntities } from "@/hooks/helpers/useEntities"; | ||
| import { useStructureEntityId } from "@/hooks/helpers/useStructureEntityId"; | ||
| import { useFetchBlockchainData } from "@/hooks/store/useBlockchainStore"; | ||
| import { useWorldStore } from "@/hooks/store/useWorldLoading"; | ||
| import { ADMIN_BANK_ENTITY_ID } from "@bibliothecadao/eternum"; | ||
| import { getComponentValue } from "@dojoengine/recs"; | ||
| import { getEntityIdFromKeys } from "@dojoengine/utils"; | ||
| import { env } from "../../../env"; | ||
| import { IS_MOBILE } from "../config"; | ||
| import { LoadingOroborus } from "../modules/loading-oroborus"; | ||
| import { LoadingScreen } from "../modules/LoadingScreen"; | ||
| // Lazy load components | ||
|
|
||
| const SelectedArmy = lazy(() => | ||
|
|
@@ -117,12 +121,6 @@ export const World = ({ backgroundImage }: { backgroundImage: string }) => { | |
| [structures, subscriptions], | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if ( | ||
| !structureEntityId || | ||
|
|
@@ -133,13 +131,6 @@ export const World = ({ backgroundImage }: { backgroundImage: string }) => { | |
| return; | ||
| } | ||
|
|
||
| const position = getComponentValue( | ||
| dojo.setup.components.Position, | ||
| getEntityIdFromKeys([BigInt(structureEntityId)]), | ||
|
|
@@ -155,9 +146,13 @@ export const World = ({ backgroundImage }: { backgroundImage: string }) => { | |
|
|
||
| const fetch = async () => { | ||
| try { | ||
| await Promise.all([ | ||
| addToSubscriptionOneKeyModelbyRealmEntityId( | ||
| dojo.network.toriiClient, | ||
| dojo.network.contractComponents as any, | ||
| [...filteredStructures.map((structure) => structure.entity_id.toString())], | ||
| ), | ||
| addToSubscriptionTwoKeyModelbyRealmEntityId( | ||
| dojo.network.toriiClient, | ||
| dojo.network.contractComponents as any, | ||
| [...filteredStructures.map((structure) => structure.entity_id.toString())], | ||
|
|
@@ -179,14 +174,11 @@ export const World = ({ backgroundImage }: { backgroundImage: string }) => { | |
| ), | ||
| addMarketSubscription(dojo.network.toriiClient, dojo.network.contractComponents as any), | ||
| ]); | ||
| } catch (error) { | ||
| console.error("Fetch failed", error); | ||
| } finally { | ||
| setWorldLoading(false); | ||
| setMarketLoading(false); | ||
| } | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ import { useFragmentMines } from "@/hooks/helpers/useFragmentMines"; | |
| import { useGuilds } from "@/hooks/helpers/useGuilds"; | ||
| import { useHyperstructureProgress, useHyperstructures } from "@/hooks/helpers/useHyperstructures"; | ||
| import { useResourceBalance } from "@/hooks/helpers/useResources"; | ||
| import { useWorldStore } from "@/hooks/store/useWorldLoading"; | ||
| import { FragmentMinePanel } from "@/ui/components/fragmentMines/FragmentMinePanel"; | ||
| import { HintSection } from "@/ui/components/hints/HintModal"; | ||
| import { DisplayedAccess, HyperstructurePanel } from "@/ui/components/hyperstructures/HyperstructurePanel"; | ||
|
|
@@ -16,16 +17,9 @@ import { ViewOnMapIcon } from "@/ui/components/military/ArmyManagementCard"; | |
| import { Checkbox } from "@/ui/elements/Checkbox"; | ||
| import { HintModalButton } from "@/ui/elements/HintModalButton"; | ||
| import { ResourceIcon } from "@/ui/elements/ResourceIcon"; | ||
| import { currencyFormat, currencyIntlFormat, divideByPrecision } from "@/ui/utils/utils"; | ||
| import { BattleSide, ContractAddress, ID, ResourcesIds, findResourceById } from "@bibliothecadao/eternum"; | ||
| import { Metadata } from "@dojoengine/recs"; | ||
| import { S } from "@dojoengine/recs/dist/types-3444e4c1"; | ||
| import { getEntities } from "@dojoengine/state"; | ||
| import { ToriiClient } from "@dojoengine/torii-wasm"; | ||
|
|
@@ -39,10 +33,18 @@ export const WorldStructuresMenu = ({ className }: { className?: string }) => { | |
| network: { toriiClient, contractComponents }, | ||
| } = useDojo(); | ||
|
|
||
| const isStructuresLoading = useWorldStore((state) => state.isStructuresLoading); | ||
| const setStructuresLoading = useWorldStore((state) => state.setStructuresLoading); | ||
|
|
||
| useEffect(() => { | ||
| const fetchData = async () => { | ||
| try { | ||
| await fetchHyperstructureData( | ||
| toriiClient, | ||
| contractComponents as any, | ||
| isStructuresLoading, | ||
| setStructuresLoading, | ||
| ); | ||
| } catch (error) { | ||
| console.error("Failed to fetch hyperstructure data:", error); | ||
| } | ||
|
|
@@ -140,6 +142,14 @@ export const WorldStructuresMenu = ({ className }: { className?: string }) => { | |
| [selectedTab, hyperstructures, fragmentMines, showOnlyMine, account.address, myHyperstructures], | ||
| ); | ||
|
|
||
| if (isStructuresLoading) { | ||
| return ( | ||
| <div className="flex items-center justify-center h-full"> | ||
| <div className="text-gold">Loading structures...</div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <HintModalButton className="absolute top-1 right-1" section={HintSection.WorldStructures} /> | ||
|
|
@@ -333,16 +343,17 @@ const EntityHeader = ({ entity }: { entity: any }) => { | |
| ); | ||
| }; | ||
|
|
||
| const fetchHyperstructureData = async ( | ||
| client: ToriiClient, | ||
| components: Component<S, Metadata, undefined>[], | ||
| isStructuresLoading: boolean, | ||
| setStructuresLoading: (loading: boolean) => void, | ||
| ) => { | ||
| if (!isStructuresLoading) { | ||
| return; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Consider adding a timeout to prevent infinite loading states |
||
| console.log("Fetching hyperstructure data"); | ||
| await getEntities( | ||
| client, | ||
| { | ||
|
|
@@ -363,13 +374,6 @@ const fetchHyperstructureData = async (client: ToriiClient, components: Componen | |
| models: ["s0_eternum-Epoch", "s0_eternum-Progress"], | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| }, | ||
|
|
@@ -378,5 +382,7 @@ const fetchHyperstructureData = async (client: ToriiClient, components: Componen | |
| [], | ||
| 40_000, | ||
| false, | ||
| ).finally(() => { | ||
| setStructuresLoading(false); | ||
| }); | ||
| }; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider adding error handling and retry logic for failed entity fetches