Add back deployment required ui on execute (#281)

* Add back deployment required ui on execute * hardcode url
cartridge-gg · May 15, 2024 · b912a0f · b912a0f
1 parent 964df54
commit b912a0f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/examples/starknet-react-next/src/components/StarknetProvider.tsx b/examples/starknet-react-next/src/components/StarknetProvider.tsx
@@ -30,6 +30,7 @@ const url =
         "keychain",
       )
     : process.env.XFRAME_URL;
+
 const connectors = [
   new CartridgeConnector(
     [

diff --git a/packages/keychain/src/components/DeploymentRequired.tsx b/packages/keychain/src/components/DeploymentRequired.tsx
@@ -42,23 +42,18 @@ export function DeploymentRequired({
     const id = setInterval(async () => {
       if (account.status !== Status.DEPLOYING) clearInterval(id);
       setStatus(account.status);
-      console.log("deployment/registration required");
       await account.sync();
     }, 2000);
 
     return () => clearInterval(id);
   }, [account, setStatus]);
 
   if (status === Status.DEPLOYING) {
-    const title =
-      status === Status.DEPLOYING
-        ? "Deploying your account"
-        : "Creating a session";
     return (
       <Container chainId={chainId} onLogout={onLogout}>
         <PortalBanner
           Icon={Loading}
-          title={title}
+          title={"Deploying your account"}
           description="This may take a second"
         />
 

diff --git a/packages/keychain/src/pages/index.tsx b/packages/keychain/src/pages/index.tsx
@@ -28,13 +28,15 @@ import { revoke, session, sessions } from "../methods/sessions";
 import { normalize, validate } from "../methods";
 import {
   Connect,
+  DeploymentRequired,
   Execute,
   Login,
   Logout,
   SignMessage,
   Signup,
 } from "components";
 import { useController } from "hooks/controller";
+import { Status } from "utils/account";
 
 type Context = Connect | Logout | Execute | SignMessage;
 
@@ -148,8 +150,14 @@ const Index: NextPage = () => {
                     } as Execute);
                   });
                 }
-
                 const account = controller.account(cId);
+                if (account.status === Status.DEPLOYING) {
+                  return Promise.resolve({
+                    code: ResponseCodes.NOT_ALLOWED,
+                    message: "Account is deploying.",
+                  });
+                }
+
                 const calls = Array.isArray(transactions)
                   ? transactions
                   : [transactions];
@@ -384,19 +392,31 @@ const Index: NextPage = () => {
     const ctx = context as Execute;
 
     return (
-      <Execute
-        {...ctx}
-        chainId={ctx.transactionsDetail?.chainId ?? chainId}
+      <DeploymentRequired
+        chainId={chainId}
         controller={controller}
-        onExecute={(res: ExecuteReply) => ctx.resolve(res)}
-        onCancel={() =>
+        onClose={() =>
           ctx.resolve({
             code: ResponseCodes.CANCELED,
             message: "Canceled",
           })
         }
         onLogout={() => onLogout(ctx)}
-      />
+      >
+        <Execute
+          {...ctx}
+          chainId={chainId}
+          controller={controller}
+          onExecute={(res: ExecuteReply) => ctx.resolve(res)}
+          onCancel={() =>
+            ctx.resolve({
+              code: ResponseCodes.CANCELED,
+              message: "Canceled",
+            })
+          }
+          onLogout={() => onLogout(ctx)}
+        />
+      </DeploymentRequired>
     );
   }
 

diff --git a/packages/keychain/src/utils/account.ts b/packages/keychain/src/utils/account.ts
@@ -168,10 +168,11 @@ class Account extends BaseAccount {
     //transactionsDetail.maxFee = num.toHex(transactionsDetail.maxFee);
     transactionsDetail.maxFee = "0x38D7EA4C68000"; // 0.001 eth
 
-    const res = await this.cartridge.execute(
-      calls as Array<Call>,
-      transactionsDetail,
-    );
+    const res = await this.cartridge
+      .execute(calls as Array<Call>, transactionsDetail)
+      .catch((e) => {
+        throw new Error("Execute error: " + e.message);
+      });
 
     Storage.update(this.selector, {
       nonce: (BigInt(transactionsDetail.nonce) + 1n).toString(),