merge

Provable-Games · Jun 3, 2024 · 7f43213 · 7f43213
2 parents bc7d135 + 1cf3a0a
commit 7f43213
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 157 deletions.
diff --git a/ui/src/app/components/intro/WalletSelect.tsx b/ui/src/app/components/intro/WalletSelect.tsx
@@ -49,7 +49,11 @@ const WalletSelect = ({}: WalletSelectProps) => {
                     key={index}
                     className="w-full"
                   >
-                    {connector.name}
+                    {connector.id === "braavos" || connector.id === "argentX"
+                      ? `Connect ${connector.id}`
+                      : connector.id === "argentWebWallet"
+                      ? "Login With Email"
+                      : "Login with Cartridge Controller"}
                   </Button>
                 ))}
               </div>

diff --git 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);
@@ -154,30 +151,6 @@ export default function Header({
             )}
           </span>
         </Button>
-        {/* <span className="sm:hidden w-5 h-5">
-          <Button
-            size={"fill"}
-            variant={checkArcade ? "outline" : "default"}
-            onClick={() => showArcadeDialog(!arcadeDialog)}
-            disabled={isWrongNetwork || !account}
-            className={`xl:px-5 ${checkArcade ? "" : "animate-pulse"}`}
-          >
-            <ArcadeIcon className="w-5 h-5 justify-center fill-current sm:mr-2" />
-            <span className="hidden sm:block">arcade account</span>
-          </Button>
-        </span> */}
-        {/* <Button
-          size={"xs"}
-          variant={checkArcade ? "outline" : "default"}
-          onClick={() => showArcadeDialog(!arcadeDialog)}
-          disabled={isWrongNetwork || !account}
-          className={`hidden sm:flex xl:px-5 ${
-            checkArcade ? "" : "animate-pulse"
-          }`}
-        >
-          <ArcadeIcon className="w-5 h-5 justify-center fill-current mr-2" />
-          <span className="hidden sm:block">arcade account</span>
-        </Button> */}
         <Button
           size={"xs"}
           variant={"outline"}
@@ -247,11 +220,6 @@ export default function Header({
             >
               {account ? displayAddress(account.address) : "Connect"}
             </Button>
-            {checkArcade && (
-              <div className="absolute top-0 right-0">
-                <ArcadeIcon className="fill-current w-2 sm:w-4" />
-              </div>
-            )}
           </div>
           <Button
             size={"fill"}

diff --git 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"}
                     </Button>
                   ))}
                   <Button onClick={handleButtonClick}>

diff --git a/ui/src/app/containers/Onboarding.tsx b/ui/src/app/containers/Onboarding.tsx
@@ -59,7 +59,6 @@ interface SectionContentProps {
     lordsAmount: number
   ) => Promise<Account | undefined>;
   listConnectors: () => any[];
-  updateConnectors: () => void;
   handleOnboarded: () => void;
   setScreen: (value: ScreenPage) => void;
 }
@@ -86,7 +85,6 @@ const SectionContent = ({
   connector,
   create,
   listConnectors,
-  updateConnectors,
   handleOnboarded,
   setScreen,
 }: SectionContentProps) => {
@@ -132,7 +130,11 @@ const SectionContent = ({
                   }}
                   key={index}
                 >
-                  {connector.name}
+                  {connector.id === "braavos" || connector.id === "argentX"
+                    ? `Connect ${connector.id}`
+                    : connector.id === "argentWebWallet"
+                    ? "Login With Email"
+                    : "Login with Cartridge Controller"}
                 </Button>
               ))}
             </div>
@@ -147,7 +149,11 @@ const SectionContent = ({
                   }}
                   key={index}
                 >
-                  {connector.name}
+                  {connector.id === "braavos" || connector.id === "argentX"
+                    ? `Connect ${connector.id}`
+                    : connector.id === "argentWebWallet"
+                    ? "Login With Email"
+                    : "Login with Cartridge Controller"}
                 </Button>
               ))}
             </div>
@@ -364,27 +370,6 @@ const SectionContent = ({
                 <Lords className="fill-current w-2" />
                 {formatCurrency(lordsGameCost * prefundGames)} LORDS Required
               </span>
-              <span className="w-3/4 h-10">
-                <Button
-                  size={"fill"}
-                  onClick={async () => {
-                    try {
-                      setFullDeployment(true);
-                      await create(connector!, prefundGames * lordsGameCost);
-                      disconnect();
-                      connect({ connector: listConnectors()[0] });
-                      updateConnectors();
-                      setFullDeployment(false);
-                      handleOnboarded();
-                      setScreen("start");
-                    } catch (e) {
-                      console.log("Arcade deployment cancelled");
-                    }
-                  }}
-                >
-                  Deploy
-                </Button>
-              </span>
             </div>
           </div>
         </div>
@@ -543,7 +528,6 @@ interface OnboardingProps {
   gameContract: Contract;
   lordsContract: Contract;
   ethContract: Contract;
-  updateConnectors: () => void;
 }
 
 const Onboarding = ({
@@ -554,7 +538,6 @@ const Onboarding = ({
   gameContract,
   lordsContract,
   ethContract,
-  updateConnectors,
 }: OnboardingProps) => {
   const { account, address, connector } = useAccount();
   const { connect, connectors } = useConnect();
@@ -684,7 +667,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -713,7 +695,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -742,7 +723,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -771,7 +751,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -815,7 +794,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -843,7 +821,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -871,7 +848,6 @@ const Onboarding = ({
               connector={connector}
               create={create}
               listConnectors={listConnectors}
-              updateConnectors={updateConnectors}
               handleOnboarded={handleOnboarded}
               setScreen={setScreen}
             />
@@ -899,7 +875,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
@@ -66,7 +66,6 @@ interface SectionContentProps {
     lordsAmount: number
   ) => Promise<Account | undefined>;
   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,
@@ -194,7 +192,7 @@ const SectionContent = ({
                     ? `Connect ${connector.id}`
                     : connector.id === "argentWebWallet"
                     ? "Login With Email"
-                    : "Login with Argent Mobile"}
+                    : "Login with Cartridge Controller"}
                 </Button>
               ))}
             </div>
@@ -212,7 +210,7 @@ const SectionContent = ({
                     ? `Connect ${connector.id}`
                     : connector.id === "argentWebWallet"
                     ? "Login With Email"
-                    : "Login with Argent Mobile"}
+                    : "Login with Cartridge Controller"}
                 </Button>
               ))}
             </div>
@@ -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}