Catch execute errors then popup

packages/keychain/src/components/Auth/Login.tsx

@@ -81,7 +81,7 @@ export function Login({
 
       setIsLoading(false);
     },
-    [log, onSuccess],
+    [chainId, context, expiresAt, isSlot, log, onSuccess],
   );
 
   return (

packages/keychain/src/components/Execute/index.tsx

@@ -7,7 +7,6 @@ import {
   constants,
   Call as StarknetCall,
   InvocationsDetails,
-  uint256,
 } from "starknet";
 import { Fees } from "./Fees";
 import { formatEther } from "viem";
@@ -54,7 +53,6 @@ export function Execute({
   const [error, setError] = useState<Error>();
   const [isLoading, setLoading] = useState<boolean>(false);
   const [ethBalance, setEthBalance] = useState<bigint>();
-  const [ethApproved, setEthApproved] = useState<bigint>();
   const [lowEth, setLowEth] = useState<boolean>(false);
 
   const account = controller.account(chainId);
@@ -104,20 +102,6 @@ export function Execute({
       return;
     }
 
-    const approve: StarknetCall[] = calls.filter(
-      (call) =>
-        call.contractAddress === CONTRACT_ETH && call.entrypoint === "approve",
-    );
-
-    if (approve.length > 0) {
-      setEthApproved(
-        uint256.uint256ToBN({
-          low: approve[0].calldata[1],
-          high: approve[0].calldata[2],
-        }),
-      );
-    }
-
     account
       .estimateInvokeFee(calls, transactionsDetail)
       .then((fees) => {
@@ -130,7 +114,6 @@ export function Execute({
   }, [
     account,
     controller,
-    setEthApproved,
     setError,
     setFees,
     calls,
@@ -139,14 +122,14 @@ export function Execute({
   ]);
 
   useEffect(() => {
-    if (!ethBalance || !ethApproved) {
+    if (!ethBalance || !fees) {
       return;
     }
 
-    if (ethBalance < ethApproved) {
+    if (ethBalance < fees.max) {
       setLowEth(true);
     }
-  }, [ethBalance, ethApproved]);
+  }, [ethBalance, fees]);
 
   const onSubmit = useCallback(async () => {
     setLoading(true);
@@ -202,7 +185,6 @@ export function Execute({
             chainId={chainId}
             fees={fees}
             balance={ethBalance && format(ethBalance)}
-            approved={ethApproved && format(ethApproved)}
           />
 
           <PortalFooter>

packages/keychain/src/pages/index.tsx

@@ -211,15 +211,23 @@ const Index: NextPage = () => {
                   });
                 }
 
-                const res = await account.execute(
-                  calls,
-                  session,
-                  transactionsDetail,
-                );
-                return {
-                  code: ResponseCodes.SUCCESS,
-                  ...res,
-                };
+                try {
+                  const res = await account.execute(
+                    calls,
+                    session,
+                    transactionsDetail,
+                  );
+
+                  return {
+                    code: ResponseCodes.SUCCESS,
+                    ...res,
+                  };
+                } catch (e) {
+                  return {
+                    code: ResponseCodes.NOT_ALLOWED,
+                    message: e.message,
+                  };
+                }
               },
           ),
         ),

packages/keychain/src/utils/account.ts

@@ -16,6 +16,7 @@ import {
   TransactionFinalityStatus,
   InvocationsDetails,
   num,
+  TransactionExecutionStatus,
 } from "starknet";
 import {
   AccountContractDocument,
@@ -197,6 +198,10 @@ class Account extends BaseAccount {
           TransactionFinalityStatus.ACCEPTED_ON_L1,
           TransactionFinalityStatus.ACCEPTED_ON_L2,
         ],
+        errorStates: [
+          TransactionExecutionStatus.REJECTED,
+          TransactionExecutionStatus.REVERTED,
+        ],
       })
       .catch(() => {
         this.resetNonce();