From fe4bebeee16e4d6fbe914386c0d66d53406f25ad Mon Sep 17 00:00:00 2001 From: Starknet Dev Date: Sun, 2 Jun 2024 10:14:56 +0100 Subject: [PATCH 1/3] - fix build - remove unneeded components --- ui/src/app/containers/Onboarding.tsx | 33 ---------------- ui/src/app/containers/TopUp.tsx | 10 ----- ui/src/app/page.tsx | 57 ++-------------------------- ui/src/app/provider.tsx | 34 ++++++----------- 4 files changed, 15 insertions(+), 119 deletions(-) diff --git a/ui/src/app/containers/Onboarding.tsx b/ui/src/app/containers/Onboarding.tsx index 1353205b5..8849319d6 100644 --- a/ui/src/app/containers/Onboarding.tsx +++ b/ui/src/app/containers/Onboarding.tsx @@ -59,7 +59,6 @@ interface SectionContentProps { lordsAmount: number ) => Promise; listConnectors: () => any[]; - updateConnectors: () => void; handleOnboarded: () => void; setScreen: (value: ScreenPage) => void; } @@ -86,7 +85,6 @@ const SectionContent = ({ connector, create, listConnectors, - updateConnectors, handleOnboarded, setScreen, }: SectionContentProps) => { @@ -372,27 +370,6 @@ const SectionContent = ({ {formatCurrency(lordsGameCost * prefundGames)} LORDS Required - - - @@ -551,7 +528,6 @@ interface OnboardingProps { gameContract: Contract; lordsContract: Contract; ethContract: Contract; - updateConnectors: () => void; } const Onboarding = ({ @@ -562,7 +538,6 @@ const Onboarding = ({ gameContract, lordsContract, ethContract, - updateConnectors, }: OnboardingProps) => { const { account, address, connector } = useAccount(); const { connect, connectors } = useConnect(); @@ -695,7 +670,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -724,7 +698,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -753,7 +726,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -782,7 +754,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -826,7 +797,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -854,7 +824,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -882,7 +851,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> @@ -910,7 +878,6 @@ const Onboarding = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} /> diff --git a/ui/src/app/containers/TopUp.tsx b/ui/src/app/containers/TopUp.tsx index f8a44b96b..8a73e6741 100644 --- a/ui/src/app/containers/TopUp.tsx +++ b/ui/src/app/containers/TopUp.tsx @@ -66,7 +66,6 @@ interface SectionContentProps { lordsAmount: number ) => Promise; listConnectors: () => any[]; - updateConnectors: () => void; handleOnboarded: () => void; setScreen: (value: ScreenPage) => void; masterConnected: boolean; @@ -108,7 +107,6 @@ const SectionContent = ({ connector, create, listConnectors, - updateConnectors, handleOnboarded, setScreen, masterConnected, @@ -497,7 +495,6 @@ interface TopUpProps { gameContract: Contract; lordsContract: Contract; ethContract: Contract; - updateConnectors: () => void; showTopUpDialog: (value: boolean) => void; } @@ -509,7 +506,6 @@ const TopUp = ({ gameContract, lordsContract, ethContract, - updateConnectors, showTopUpDialog, }: TopUpProps) => { const { account, address, connector } = useAccount(); @@ -651,7 +647,6 @@ const TopUp = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} masterConnected={masterConnected} @@ -687,7 +682,6 @@ const TopUp = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} masterConnected={masterConnected} @@ -723,7 +717,6 @@ const TopUp = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} masterConnected={masterConnected} @@ -760,7 +753,6 @@ const TopUp = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} masterConnected={masterConnected} @@ -795,7 +787,6 @@ const TopUp = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} masterConnected={masterConnected} @@ -830,7 +821,6 @@ const TopUp = ({ connector={connector} create={create} listConnectors={listConnectors} - updateConnectors={updateConnectors} handleOnboarded={handleOnboarded} setScreen={setScreen} masterConnected={masterConnected} diff --git a/ui/src/app/page.tsx b/ui/src/app/page.tsx index 27bbbcbd5..01377f323 100644 --- a/ui/src/app/page.tsx +++ b/ui/src/app/page.tsx @@ -1,14 +1,6 @@ "use client"; -import { - useAccount, - useConnect, - useContract, - Connector, -} from "@starknet-react/core"; +import { useAccount, useConnect, useContract } from "@starknet-react/core"; import { sepolia } from "@starknet-react/chains"; -import { InjectedConnector } from "starknetkit/injected"; -import { ArgentMobileConnector } from "starknetkit/argentMobile"; -import { WebWalletConnector } from "starknetkit/webwallet"; import { constants } from "starknet"; import { useState, useEffect, useMemo } from "react"; import ActionsScreen from "@/app/containers/ActionsScreen"; @@ -49,7 +41,6 @@ import { getLatestMarketItems, getGoldenTokensByOwner, } from "@/app/hooks/graphql/queries"; -import { ArcadeDialog } from "@/app/components/ArcadeDialog"; import NetworkSwitchError from "@/app/components/navigation/NetworkSwitchError"; import { syscalls } from "@/app/lib/utils/syscalls"; import Game from "@/app/abi/Game.json"; @@ -66,8 +57,6 @@ import { fetchBalances, fetchEthBalance } from "@/app/lib/balances"; import useTransactionManager from "@/app/hooks/useTransactionManager"; import { StarknetProvider } from "@/app//provider"; import { SpecialBeast } from "@/app/components/notifications/SpecialBeast"; -import { useBurner } from "@/app/lib/burner"; -import { connectors } from "@/app/lib/connectors"; import Storage from "@/app/lib/storage"; import Onboarding from "./containers/Onboarding"; import TopUp from "./containers/TopUp"; @@ -92,37 +81,14 @@ const mobileMenuItems: Menu[] = [ ]; export default function Main() { - const [appConnectors, setAppConnectors] = useState< - ( - | Connector - | WebWalletConnector - | InjectedConnector - | ArgentMobileConnector - )[] - >([]); - - const { listConnectors } = useBurner({}); - - const updateConnectors = () => { - const arcadeConnectors = listConnectors(); - setAppConnectors([...arcadeConnectors, ...connectors]); - }; - - useEffect(() => { - updateConnectors(); - }, []); return ( - - + + ); } -interface HomeProps { - updateConnectors: () => void; -} - -function Home({ updateConnectors }: HomeProps) { +function Home() { const { connect, connector, connectors } = useConnect(); const disconnected = useUIStore((state) => state.disconnected); const setDisconnected = useUIStore((state) => state.setDisconnected); @@ -143,7 +109,6 @@ function Home({ updateConnectors }: HomeProps) { const owner = account?.address ? padAddress(account.address) : ""; const isWrongNetwork = useUIStore((state) => state.isWrongNetwork); const setIsWrongNetwork = useUIStore((state) => state.setIsWrongNetwork); - const arcadeDialog = useUIStore((state) => state.arcadeDialog); const onboarded = useUIStore((state) => state.onboarded); const topUpDialog = useUIStore((state) => state.topUpDialog); const showTopUpDialog = useUIStore((state) => state.showTopUpDialog); @@ -548,7 +513,6 @@ function Home({ updateConnectors }: HomeProps) { gameContract={gameContract!} lordsContract={lordsContract!} ethContract={ethContract!} - updateConnectors={updateConnectors} /> ) : status == "connected" && topUpDialog ? ( ) : ( @@ -590,18 +553,6 @@ function Home({ updateConnectors }: HomeProps) { {deathDialog && } - {status == "connected" && arcadeDialog && ( - - )} {introComplete ? (
<> diff --git a/ui/src/app/provider.tsx b/ui/src/app/provider.tsx index d57281a5b..83aa3d14d 100644 --- a/ui/src/app/provider.tsx +++ b/ui/src/app/provider.tsx @@ -3,8 +3,6 @@ import React from "react"; import { Connector, StarknetConfig, - alchemyProvider, - blastProvider, starkscan, jsonRpcProvider, } from "@starknet-react/core"; @@ -53,36 +51,26 @@ const cartridgeConnectors = [ target: process.env.NEXT_PUBLIC_LORDS_ADDRESS!, method: "approve", }, - ], - { - theme: { - colors: { - primary: "#0ad3ff", - secondary: "#78ffd6", - }, - }, - } + ] + // { + // theme: { + // colors: { + // primary: "#0ad3ff", + // secondary: "#78ffd6", + // }, + // }, + // } ) as never as Connector, ]; -export function StarknetProvider({ - connectors, - children, -}: { - connectors: Connector[]; - children: React.ReactNode; -}) { - const apiKey = process.env.NEXT_PUBLIC_RPC_API_KEY!; +export function StarknetProvider({ children }: { children: React.ReactNode }) { const onMainnet = process.env.NEXT_PUBLIC_NETWORK === "mainnet"; const onSepolia = process.env.NEXT_PUBLIC_NETWORK === "sepolia"; - const provider = onMainnet - ? alchemyProvider({ apiKey }) - : blastProvider({ apiKey }); const chains = onMainnet ? [mainnet] : onSepolia ? [sepolia] : [goerli]; return ( Date: Sun, 2 Jun 2024 11:58:06 +0100 Subject: [PATCH 2/3] remove arcade components from header --- ui/src/app/components/navigation/Header.tsx | 29 --------------------- 1 file changed, 29 deletions(-) diff --git a/ui/src/app/components/navigation/Header.tsx b/ui/src/app/components/navigation/Header.tsx index 6daa0f7ea..88dfdef07 100644 --- a/ui/src/app/components/navigation/Header.tsx +++ b/ui/src/app/components/navigation/Header.tsx @@ -154,30 +154,6 @@ export default function Header({ )} - - - - - {checkArcade && ( -
- -
- )}
))} diff --git a/ui/src/app/components/navigation/Header.tsx b/ui/src/app/components/navigation/Header.tsx index 88dfdef07..e01926182 100644 --- a/ui/src/app/components/navigation/Header.tsx +++ b/ui/src/app/components/navigation/Header.tsx @@ -58,9 +58,6 @@ export default function Header({ const resetData = useQueriesStore((state) => state.resetData); const setDisconnected = useUIStore((state) => state.setDisconnected); - const arcadeDialog = useUIStore((state) => state.arcadeDialog); - const showArcadeDialog = useUIStore((state) => state.showArcadeDialog); - const isWrongNetwork = useUIStore((state) => state.isWrongNetwork); const isMuted = useUIStore((state) => state.isMuted); const setIsMuted = useUIStore((state) => state.setIsMuted); const displayCart = useUIStore((state) => state.displayCart); diff --git a/ui/src/app/components/start/Spawn.tsx b/ui/src/app/components/start/Spawn.tsx index 443cebfbb..67e3ba98e 100644 --- a/ui/src/app/components/start/Spawn.tsx +++ b/ui/src/app/components/start/Spawn.tsx @@ -175,7 +175,7 @@ export const Spawn = ({ ? `Connect ${connector.id}` : connector.id === "argentWebWallet" ? "Login With Email" - : "Login with Argent Mobile"} + : "Login with Cartridge Controller"} ))} ))} @@ -153,7 +153,7 @@ const SectionContent = ({ ? `Connect ${connector.id}` : connector.id === "argentWebWallet" ? "Login With Email" - : "Login with Argent Mobile"} + : "Login with Cartridge Controller"} ))} diff --git a/ui/src/app/containers/TopUp.tsx b/ui/src/app/containers/TopUp.tsx index 8a73e6741..08d389f7e 100644 --- a/ui/src/app/containers/TopUp.tsx +++ b/ui/src/app/containers/TopUp.tsx @@ -192,7 +192,7 @@ const SectionContent = ({ ? `Connect ${connector.id}` : connector.id === "argentWebWallet" ? "Login With Email" - : "Login with Argent Mobile"} + : "Login with Cartridge Controller"} ))} @@ -210,7 +210,7 @@ const SectionContent = ({ ? `Connect ${connector.id}` : connector.id === "argentWebWallet" ? "Login With Email" - : "Login with Argent Mobile"} + : "Login with Cartridge Controller"} ))}