@@ -140,24 +124,23 @@ export const ColonyResourcesSection = ({
- {activeTab === 1 &&
- renderCompounds(colonyId, totalResources, compoundsLevels)}
+ {activeTab === 1 && renderCompounds(colonyId, resources, compounds)}
{activeTab === 2 &&
renderDockyardTab(
- totalResources,
- shipsLevels,
+ resources,
+ ships,
shipsCost,
- compoundsLevels.dockyard,
+ compounds.dockyard || 0,
techLevels,
- celestiaAvailable,
+ celestia,
colonyId
)}
{activeTab === 3 &&
renderDefencesPanel(
- totalResources,
- defencesLevels,
+ resources,
+ defences,
defencesCost,
- compoundsLevels.dockyard,
+ compounds.dockyard || 0,
techLevels,
colonyId
)}
@@ -169,23 +152,23 @@ export const ColonyResourcesSection = ({
function renderCompounds(
colonyId: number,
spendable: Resources,
- compounds: CompoundsLevels
+ compounds: ColonyCompounds
) {
return (
);
}
function renderDockyardTab(
spendable: Resources,
- ships: ShipsLevels,
+ ships: Fleet,
shipCost: ShipsCost,
dockyard: number,
- techs: TechLevels,
+ techs: Techs,
celestia: number,
colonyId: number
) {
@@ -204,10 +187,10 @@ function renderDockyardTab(
function renderDefencesPanel(
spendable: Resources,
- defences: DefenceLevels,
+ defences: Defences,
defencesCost: DefenceCost,
dockyard: number,
- techs: TechLevels,
+ techs: Techs,
colonyId: number
) {
return (
@@ -224,7 +207,7 @@ function renderDefencesPanel(
function renderUniversePanel(
planetId: number,
- techLevels: TechLevels,
+ techLevels: Techs,
colonyId: number
) {
return (
diff --git a/client/src/colony/ColonyTab.tsx b/client/src/colony/ColonyTab.tsx
index b2ad087..b169b41 100644
--- a/client/src/colony/ColonyTab.tsx
+++ b/client/src/colony/ColonyTab.tsx
@@ -5,13 +5,10 @@ import quartzImg from '../assets/gameElements/compounds/quartz4.webp';
import tritiumImg from '../assets/gameElements/compounds/tritium4.webp';
import energyImg from '../assets/gameElements/compounds/energy4.webp';
import dockyardImg from '../assets/gameElements/compounds/dockyard4.webp';
-import {
- type CompoundsLevels,
- type EnergyCost,
- type Resources,
- ColonyUpgradeType,
-} from '../shared/types';
+import { ColonyCompounds } from '../hooks/useColonyCompounds';
+import { type EnergyCost, ColonyUpgradeType } from '../shared/types';
import CompoundsBox from '../boxes/CompoundsBox';
+import { Resources } from '../hooks/usePlanetResources';
import {
EnergyPlantDescription,
QuartzMineDescription,
@@ -25,27 +22,25 @@ interface CompoundConfigType {
img: string;
title: string;
functionCallName: number;
- compoundName: keyof CompoundsLevels;
+ compoundName: keyof ColonyCompounds;
energyKey: keyof EnergyCost;
}
interface Props {
- spendableResources?: Resources;
- compoundsLevels: CompoundsLevels;
+ resources?: Resources;
+ compounds: ColonyCompounds;
colonyId: number;
}
export const ColonyCompoundTabPanel = ({
- spendableResources,
- compoundsLevels,
+ resources,
+ compounds,
colonyId,
...rest
}: Props) => {
const compoundsConfig: CompoundConfigType[] = [
{
- description: (
-
- ),
+ description:
,
img: steelImg,
title: 'Steel Mine',
functionCallName: ColonyUpgradeType.SteelMine,
@@ -53,9 +48,7 @@ export const ColonyCompoundTabPanel = ({
energyKey: 'steel',
},
{
- description: (
-
- ),
+ description:
,
img: quartzImg,
title: 'Quartz Mine',
functionCallName: ColonyUpgradeType.QuartzMine,
@@ -63,11 +56,7 @@ export const ColonyCompoundTabPanel = ({
energyKey: 'quartz',
},
{
- description: (
-
- ),
+ description:
,
img: tritiumImg,
title: 'Tritium Mine',
functionCallName: ColonyUpgradeType.TritiumMine,
@@ -75,11 +64,7 @@ export const ColonyCompoundTabPanel = ({
energyKey: 'tritium',
},
{
- description: (
-
- ),
+ description:
,
img: energyImg,
title: 'Energy Plant',
functionCallName: ColonyUpgradeType.EnergyPlant,
@@ -87,9 +72,7 @@ export const ColonyCompoundTabPanel = ({
energyKey: 'energy',
},
{
- description: (
-
- ),
+ description:
,
img: dockyardImg,
title: 'Dockyard',
functionCallName: ColonyUpgradeType.Dockyard,
@@ -101,7 +84,7 @@ export const ColonyCompoundTabPanel = ({
return (
{compoundsConfig.map((compound) => {
- const level = Number(compoundsLevels?.[compound.compoundName]);
+ const level = compounds[compound.compoundName] || 0;
return (
);
diff --git a/client/src/components/buttons/ButtonAttackPlanet.tsx b/client/src/components/buttons/ButtonAttackPlanet.tsx
index c97a3c5..4b515a1 100644
--- a/client/src/components/buttons/ButtonAttackPlanet.tsx
+++ b/client/src/components/buttons/ButtonAttackPlanet.tsx
@@ -17,8 +17,6 @@ import {
type Position,
MissionCategory,
} from '../../shared/types';
-import useSendFleet from '../../hooks/writeHooks/useSendFleet';
-import { useGetActiveMissions } from '../../hooks/FleetHooks';
import {
calculateTotalCargoCapacity,
getDistance,
@@ -27,7 +25,6 @@ import {
getFuelConsumption,
} from '../../shared/utils/FleetUtils';
import { convertSecondsToTime } from '../../shared/utils';
-import { TransactionStatus } from '../ui/TransactionStatus';
import { numberWithCommas } from '../../shared/utils';
import Slider from '@mui/material/Slider';
import KeyboardDoubleArrowUpIcon from '@mui/icons-material/KeyboardDoubleArrowUp';
@@ -184,7 +181,7 @@ function ButtonAttackPlanet({
const [isButtotClicked, setisButtotClicked] = useState(false);
const [speed, setSpeed] = useState(100);
- const missions = useGetActiveMissions(planetId);
+ // const missions = useGetActiveMissions(planetId);
const isMissionLimitReached =
missions && techs && missions.length === Number(techs.digital) + 1;
@@ -231,21 +228,21 @@ function ButtonAttackPlanet({
setCargoCapacity(calculateTotalCargoCapacity(fleet));
}, [distance, fleet, ownPosition, speed, techs]);
- const { writeAsync: attack, data: attackData } = useSendFleet(
- fleet,
- destinationPosition,
- MissionCategory['Attack'],
- speed,
- colonyId
- );
-
- const { writeAsync: transport, data: transportData } = useSendFleet(
- fleet,
- destinationPosition,
- MissionCategory['Transport'],
- speed,
- colonyId
- );
+ // const { writeAsync: attack, data: attackData } = useSendFleet(
+ // fleet,
+ // destinationPosition,
+ // MissionCategory['Attack'],
+ // speed,
+ // colonyId
+ // );
+
+ // const { writeAsync: transport, data: transportData } = useSendFleet(
+ // fleet,
+ // destinationPosition,
+ // MissionCategory['Transport'],
+ // speed,
+ // colonyId
+ // );
const ships = ['carrier', 'scraper', 'sparrow', 'frigate', 'armade'];
@@ -458,16 +455,6 @@ function ButtonAttackPlanet({
- {isButtotClicked && (
-
- )}
) : noRequirements ? (
- {isButtotClicked && (
-
- )}
);
}
diff --git a/client/src/components/buttons/CollectResources.tsx b/client/src/components/buttons/CollectResources.tsx
deleted file mode 100644
index 3aed870..0000000
--- a/client/src/components/buttons/CollectResources.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { useState } from 'react';
-import { Box } from '@mui/material';
-import { styled } from '@mui/system';
-import { TransactionStatus } from '../ui/TransactionStatus';
-import { GAMEADDRESS } from '../../constants/addresses';
-import game from '../../constants/nogame.json';
-import { useContractWrite, useContract } from '@starknet-react/core';
-import { StyledButton } from '../../shared/styled/Button';
-
-const StyledBox = styled(Box)(() => ({
- position: 'relative',
- display: 'flex',
- justifyContent: 'center', // center horizontally
- alignItems: 'center', // center vertically
-}));
-
-interface Props {
- selectedColonyId: number;
-}
-
-export function UseCollectResources({ selectedColonyId }: Props) {
- const [isClicked, setIsClicked] = useState(false);
-
- const { contract } = useContract({
- abi: game.abi,
- address: GAMEADDRESS,
- });
- const { writeAsync: motherCollect, data: motherData } = useContractWrite({
- calls: [contract?.populateTransaction.collect_resources?.()],
- });
-
- const { writeAsync: colonyCollect, data: colonyData } = useContractWrite({
- calls: [
- contract?.populateTransaction.collect_colony_resources?.(
- selectedColonyId
- ),
- ],
- });
-
- const handleMotherOnClick = () => {
- void motherCollect();
- setIsClicked(true);
- };
-
- const handleColonyOnClick = () => {
- void colonyCollect();
- setIsClicked(true);
- };
-
- return (
- <>
-
-
- Collect Resources
-
-
- {isClicked ? (
-
- ) : (
- <>
- )}
-
- );
-}
diff --git a/client/src/components/buttons/GenerateColony.tsx b/client/src/components/buttons/GenerateColony.tsx
index fb93470..94ff458 100644
--- a/client/src/components/buttons/GenerateColony.tsx
+++ b/client/src/components/buttons/GenerateColony.tsx
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
import { Box } from '@mui/material';
import { styled } from '@mui/system';
-import { TransactionStatus } from '../ui/TransactionStatus';
import { StyledButton } from '../../shared/styled/Button';
import { useDojo } from '../../dojo/useDojo';
@@ -55,14 +54,6 @@ export function GenerateColony({ isActivated }: Props) {
)}
- {/* {isClicked ? (
-
- ) : (
- <>
- )} */}
);
}
diff --git a/client/src/components/modals/PlanetOverview.tsx b/client/src/components/modals/PlanetOverview.tsx
index f80cca5..b0c73b2 100644
--- a/client/src/components/modals/PlanetOverview.tsx
+++ b/client/src/components/modals/PlanetOverview.tsx
@@ -10,17 +10,8 @@ import {
type Resources,
type ShipsLevels,
} from '../../shared/types';
-import {
- useSpendableResources,
- useCollectibleResources,
-} from '../../hooks/ResourcesHooks';
-import { useShipsLevels, useDefencesLevels } from '../../hooks/LevelsHooks';
import { getPlanetAndColonyIds, numberWithCommas } from '../../shared/utils';
-import {
- useGetColonyResources,
- useGetColonyDefences,
-} from '../../hooks/ColoniesHooks';
-import { useGetColonyShips } from '../../hooks/ColoniesHooks';
+import { usePlanetShips } from '../../hooks/usePlanetShips';
export const StyledBox = styled(Box)({
fontWeight: 400,
@@ -127,7 +118,7 @@ export default function PlanetModal({ planetId, image, position }: Props) {
const collectibleResources = useCollectibleResources(Number(planetId));
const [planet, colony] = getPlanetAndColonyIds(planetId);
- const shipsLevels = useShipsLevels(Number(planetId));
+ const shipsLevels = usePlanetShips(planetId);
const colonyShips = useGetColonyShips(planet, colony);
const actualShips =
colonyShips && shipsLevels && colony === 0 ? shipsLevels : colonyShips;
diff --git a/client/src/components/ui/Button.tsx b/client/src/components/ui/Button.tsx
index 6ae61b1..5bb88b6 100644
--- a/client/src/components/ui/Button.tsx
+++ b/client/src/components/ui/Button.tsx
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
import { StyledButton } from '../../shared/styled/Button';
-import { TransactionStatus } from './TransactionStatus';
-// import { InvokeFunctionResponse } from "starknet";
+
interface Props {
name: string;
callback?: () => void;
@@ -37,7 +36,6 @@ export function ButtonUpgrade({
Upgrade
)}
- {isClicked ? : <>}
{!disabled && noRequirements && (
)}
- {isClicked ? : <>}
{!disabled && noRequirements && (
{
- // Type guard to check if data is of the type with 'finality_status'
- if (data && 'finality_status' in data) {
- // Now TypeScript knows 'finality_status' is a valid property
- if (data.finality_status === 'ACCEPTED_ON_L2') {
- setTransactionSuccess(true);
- }
- }
- }, [data]);
-
- const handleModalClose = () => {
- setShowModal(false);
- };
-
- const loadingBody = (
-
-
-
- {name} Tx is being submitted
-
-
-
-
-
-
-
-
- {name} Tx Accepted On L2
-
-
-
-
- {/* Additional message about potential delay in data update */}
-
- Note: The displayed data might take several seconds to update. Try
- refreshing the page in a few minutes.
-
-
-