@latticexyz/entrykit 2.2.22-daa34f06d070200c1aaf0bba78ba9f2dd8662a76 → 2.2.22-f4bb5b5d7d9abbbea0fc57591b58dbd94c85d3aa

package/dist/tsup/exports/internal.js

@@ -188,21 +188,168 @@ function userOpExecutor({ executor }) {
   };
 }
 
+// src/quarry/transports/methods/getUserOperationReceipt.ts
+import {
+  decodeEventLog,
+  encodeEventTopics,
+  numberToHex as numberToHex2,
+  parseEventLogs as parseEventLogs2,
+  zeroAddress
+} from "viem";
+import { entryPoint07Abi as entryPoint07Abi2 } from "viem/account-abstraction";
+var userOperationRevertReasonAbi = [
+  entryPoint07Abi2.find(
+    (item) => item.type === "event" && item.name === "UserOperationRevertReason"
+  )
+];
+var userOperationEventTopic = encodeEventTopics({
+  abi: entryPoint07Abi2,
+  eventName: "UserOperationEvent"
+});
+function getUserOperationReceipt(userOpHash, receipt) {
+  const userOperationRevertReasonTopicEvent = encodeEventTopics({
+    abi: userOperationRevertReasonAbi
+  })[0];
+  let entryPoint = zeroAddress;
+  let revertReason = void 0;
+  let startIndex = -1;
+  let endIndex = -1;
+  receipt.logs.forEach((log, index) => {
+    if (log?.topics[0] === userOperationEventTopic[0]) {
+      if (log.topics[1] === userOpHash) {
+        endIndex = index;
+        entryPoint = log.address;
+      } else if (endIndex === -1) {
+        startIndex = index;
+      }
+    }
+    if (log?.topics[0] === userOperationRevertReasonTopicEvent) {
+      if (log.topics[1] === userOpHash) {
+        const decodedLog = decodeEventLog({
+          abi: userOperationRevertReasonAbi,
+          data: log.data,
+          topics: log.topics
+        });
+        revertReason = decodedLog.args.revertReason;
+      }
+    }
+  });
+  if (endIndex === -1) {
+    throw new Error("fatal: no UserOperationEvent in logs");
+  }
+  const logs = receipt.logs.slice(startIndex + 1, endIndex);
+  const userOperationEvent = parseEventLogs2({
+    abi: entryPoint07Abi2,
+    eventName: "UserOperationEvent",
+    args: {
+      userOpHash
+    },
+    logs: receipt.logs
+  })[0];
+  let paymaster = userOperationEvent.args.paymaster;
+  paymaster = paymaster === zeroAddress ? void 0 : paymaster;
+  return {
+    userOpHash,
+    entryPoint,
+    sender: userOperationEvent.args.sender,
+    nonce: numberToHex2(userOperationEvent.args.nonce),
+    paymaster,
+    actualGasUsed: numberToHex2(userOperationEvent.args.actualGasUsed),
+    actualGasCost: numberToHex2(userOperationEvent.args.actualGasCost),
+    success: userOperationEvent.args.success,
+    reason: revertReason,
+    logs,
+    receipt
+  };
+}
+
+// src/quarry/transports/wiresaw.ts
+function wiresaw(transport) {
+  return (opts) => {
+    const { request: originalRequest, ...rest } = transport.wiresaw(opts);
+    let chainId = null;
+    const transactionHashes = {};
+    const transactionReceipts = {};
+    return {
+      ...rest,
+      async request(req) {
+        if (req.method === "eth_chainId") {
+          if (chainId != null) return chainId;
+          return chainId = await originalRequest(req);
+        }
+        if (req.method === "eth_estimateGas") {
+          return originalRequest({ ...req, method: "wiresaw_estimateGas" });
+        }
+        if (req.method === "eth_call") {
+          return originalRequest({ ...req, method: "wiresaw_call" });
+        }
+        if (req.method === "eth_getTransactionCount") {
+          return originalRequest({ ...req, method: "wiresaw_getTransactionCount" });
+        }
+        if (req.method === "eth_getTransactionReceipt") {
+          const transactionHash = req.params[0];
+          const receipt = transactionReceipts[transactionHash] ?? await originalRequest(req);
+          transactionReceipts[transactionHash] ??= receipt;
+          return receipt;
+        }
+        if (req.method === "eth_sendUserOperation") {
+          const { userOpHash, txHash } = await originalRequest({
+            ...req,
+            method: "wiresaw_sendUserOperation"
+          });
+          transactionHashes[userOpHash] = txHash;
+          return userOpHash;
+        }
+        if (req.method === "eth_getUserOperationReceipt") {
+          const userOpHash = req.params[0];
+          const knownTransactionHash = transactionHashes[userOpHash];
+          if (knownTransactionHash) {
+            const transactionReceipt = transactionReceipts[knownTransactionHash] ?? await originalRequest({
+              ...req,
+              params: [knownTransactionHash],
+              method: "wiresaw_getTransactionReceipt"
+            });
+            transactionReceipts[knownTransactionHash] ??= transactionReceipt;
+            return transactionReceipt && getUserOperationReceipt(userOpHash, transactionReceipt);
+          }
+          const { request: fallbackRequest } = transport.fallbackBundler(opts);
+          return fallbackRequest(req);
+        }
+        if (req.method === "eth_estimateUserOperationGas") {
+          const { request: fallbackRequest } = transport.fallbackBundler(opts);
+          return fallbackRequest(req);
+        }
+        return originalRequest(req);
+      }
+    };
+  };
+}
+
 // src/getBundlerTransport.ts
 function getBundlerTransport(chain) {
   const bundlerHttpUrl = chain.rpcUrls.bundler?.http[0];
-  const bundlerTransport = bundlerHttpUrl ? http(bundlerHttpUrl) : chain.id === 31337 ? userOpExecutor({
-    executor: createClient({
-      chain,
-      transport: fallback([webSocket(), http()]),
-      account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
-      pollingInterval: 10
-    }).extend(transactionQueue())
-  }) : null;
-  if (!bundlerTransport) {
-    throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
+  const wiresawWebSocketUrl = chain.rpcUrls.wiresaw?.webSocket?.[0];
+  if (wiresawWebSocketUrl) {
+    return wiresaw({ wiresaw: webSocket(wiresawWebSocketUrl), fallbackBundler: http(bundlerHttpUrl) });
+  }
+  const wiresawHttpUrl = chain.rpcUrls.wiresaw?.http[0];
+  if (wiresawHttpUrl) {
+    return wiresaw({ wiresaw: http(wiresawHttpUrl), fallbackBundler: http(bundlerHttpUrl) });
+  }
+  if (bundlerHttpUrl) {
+    return http(bundlerHttpUrl);
+  }
+  if (chain.id === 31337) {
+    return userOpExecutor({
+      executor: createClient({
+        chain,
+        transport: fallback([webSocket(), http()]),
+        account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
+        pollingInterval: 10
+      }).extend(transactionQueue())
+    });
   }
-  return bundlerTransport;
+  throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
 }
 
 // src/EntryKitConfigProvider.tsx
@@ -550,7 +697,7 @@ function ConnectWallet() {
 }
 
 // src/onboarding/ConnectedSteps.tsx
-import { useEffect as useEffect13, useMemo as useMemo4, useRef as useRef4, useState as useState6 } from "react";
+import { useEffect as useEffect15, useMemo as useMemo4, useRef as useRef4, useState as useState6 } from "react";
 import { twMerge as twMerge17 } from "tailwind-merge";
 
 // src/onboarding/usePrerequisites.ts
@@ -585,7 +732,7 @@ import { useClient } from "wagmi";
 import { queryOptions, skipToken, useQuery as useQuery2 } from "@tanstack/react-query";
 
 // src/quarry/getAllowance.ts
-import { numberToHex as numberToHex2 } from "viem";
+import { numberToHex as numberToHex3 } from "viem";
 
 // src/quarry/common.ts
 import { defineStore } from "@latticexyz/store";
@@ -689,7 +836,7 @@ async function setAllowanceSlot({ client, userAddress, allowance }) {
     {
       address: paymaster.address,
       index: slot,
-      value: numberToHex2(allowance, { size: 32 })
+      value: numberToHex3(allowance, { size: 32 })
     }
   );
 }
@@ -927,13 +1074,13 @@ function getPrequisitesQueryOptions({
       const hasAllowance = allowance == null || allowance > 0n;
       const isSpender = spender == null ? true : spender;
       const hasGasBalance = sessionBalance == null || sessionBalance.value > 0n;
-      const hasQuarryBalance = quarryBalance == null || quarryBalance > 0n;
+      const hasQuarryGasBalance = quarryBalance == null || quarryBalance > 0n;
       return {
         sessionAddress,
         hasAllowance,
         isSpender,
         hasGasBalance,
-        hasQuarryBalance,
+        hasQuarryGasBalance,
         hasDelegation,
         // we intentionally don't enforce an allowance/gas balance here
         complete: isSpender && hasDelegation
@@ -1235,6 +1382,9 @@ function Allowance({ isActive, isExpanded, userAddress }) {
   ] });
 }
 
+// src/onboarding/Session.tsx
+import { useEffect as useEffect7 } from "react";
+
 // src/onboarding/useSetupSession.ts
 import { encodeFunctionData } from "viem";
 import { useMutation as useMutation2, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
@@ -1431,9 +1581,6 @@ function useSetupSession({ userClient }) {
   });
 }
 
-// src/onboarding/Session.tsx
-import { useEffect as useEffect7 } from "react";
-
 // src/useSessionClient.ts
 import { useClient as useClient9 } from "wagmi";
 import {
@@ -1562,9 +1709,11 @@ function Session({ isActive, isExpanded, userClient, registerSpender, registerDe
   const sessionClient = useShowQueryError(useSessionClient(userClient.account.address));
   const setup = useShowMutationError(useSetupSession({ userClient }));
   const hasSession = !registerDelegation && !registerDelegation;
+  const { data: prerequisites } = usePrerequisites(userClient.account.address);
+  const { hasAllowance, hasGasBalance, hasQuarryGasBalance } = prerequisites ?? {};
   useEffect7(() => {
     const timer = setTimeout(() => {
-      if (isActive && setup.status === "idle" && sessionClient.data && !hasSession) {
+      if (isActive && setup.status === "idle" && sessionClient.data && !hasSession && (hasAllowance || hasGasBalance || hasQuarryGasBalance)) {
         setup.mutate({
           sessionClient: sessionClient.data,
           registerSpender,
@@ -1573,7 +1722,17 @@ function Session({ isActive, isExpanded, userClient, registerSpender, registerDe
       }
     });
     return () => clearTimeout(timer);
-  }, [hasSession, isActive, registerDelegation, registerSpender, sessionClient, setup]);
+  }, [
+    hasSession,
+    isActive,
+    registerDelegation,
+    registerSpender,
+    sessionClient,
+    setup,
+    hasAllowance,
+    hasGasBalance,
+    hasQuarryGasBalance
+  ]);
   return /* @__PURE__ */ jsxs13("div", { className: "flex flex-col gap-4", children: [
     /* @__PURE__ */ jsxs13("div", { className: "flex justify-between gap-4", children: [
       /* @__PURE__ */ jsxs13("div", { children: [
@@ -1601,8 +1760,9 @@ function Session({ isActive, isExpanded, userClient, registerSpender, registerDe
 }
 
 // src/onboarding/GasBalance.tsx
-import { useState as useState3 } from "react";
+import { useEffect as useEffect9, useState as useState3 } from "react";
 import { parseEther as parseEther4 } from "viem";
+import { useQueryClient as useQueryClient6 } from "@tanstack/react-query";
 import { useBalance as useBalance2, useWatchBlockNumber } from "wagmi";
 
 // src/data/relayChains.json
@@ -1908,6 +2068,16 @@ function useSetBalance() {
   });
 }
 
+// src/errors/usePrevious.ts
+import { useEffect as useEffect8, useRef as useRef2 } from "react";
+function usePrevious(value, initialValue) {
+  const ref = useRef2();
+  useEffect8(() => {
+    ref.current = { value };
+  }, [value]);
+  return ref.current ? ref.current.value : initialValue;
+}
+
 // src/icons/IconSVG.tsx
 import { twMerge as twMerge7 } from "tailwind-merge";
 import { jsx as jsx16 } from "react/jsx-runtime";
@@ -1960,9 +2130,11 @@ function CheckIcon(props) {
 // src/onboarding/GasBalance.tsx
 import { Fragment, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
 function GasBalance({ isActive, isExpanded, sessionAddress }) {
+  const queryClient = useQueryClient6();
   const { chain } = useEntryKitConfig();
   const [copied, setCopied] = useState3(false);
   const balance = useShowQueryError(useBalance2({ chainId: chain.id, address: sessionAddress }));
+  const prevBalance = usePrevious(balance.data);
   useWatchBlockNumber({ onBlockNumber: () => balance.refetch() });
   const setBalance3 = useShowMutationError(useSetBalance());
   const relayChain = relayChains_default[chain.id];
@@ -1971,6 +2143,11 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
     setCopied(true);
     setTimeout(() => setCopied(false), 2e3);
   };
+  useEffect9(() => {
+    if (balance.data != null && prevBalance?.value === 0n && balance.data.value > 0n) {
+      queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] });
+    }
+  }, [balance.data, prevBalance, setBalance3, sessionAddress, queryClient]);
   return /* @__PURE__ */ jsxs14("div", { className: "flex flex-col gap-4", children: [
     /* @__PURE__ */ jsxs14("div", { className: "flex justify-between gap-4", children: [
       /* @__PURE__ */ jsxs14("div", { children: [
@@ -2041,7 +2218,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
 
 // src/onboarding/deposit/DepositFormContainer.tsx
 import { useState as useState5 } from "react";
-import { useChains as useChains5, useChainId } from "wagmi";
+import { useChains as useChains4, useChainId } from "wagmi";
 
 // src/onboarding/deposit/DepositViaTransferForm.tsx
 import { useAccount as useAccount5, useWriteContract, usePrepareTransactionRequest, usePublicClient } from "wagmi";
@@ -2049,16 +2226,16 @@ import { encodeFunctionData as encodeFunctionData2 } from "viem";
 import { useMutation as useMutation4, useQuery as useQuery11 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/DepositForm.tsx
-import { useEffect as useEffect8, useRef as useRef2 } from "react";
+import { useEffect as useEffect11, useRef as useRef3 } from "react";
 import { useAccount as useAccount4, useBalance as useBalance5, useWatchBlockNumber as useWatchBlockNumber2 } from "wagmi";
 import { useIsMounted } from "usehooks-ts";
 import { twMerge as twMerge15 } from "tailwind-merge";
 
 // src/onboarding/deposit/ChainSelect.tsx
-import { useMemo as useMemo2 } from "react";
+import { useEffect as useEffect10, useMemo as useMemo2 } from "react";
+import { useAccount as useAccount2, useSwitchChain } from "wagmi";
 import { twMerge as twMerge12 } from "tailwind-merge";
 import * as Select from "@radix-ui/react-select";
-import { useAccount as useAccount2, useChains as useChains2 } from "wagmi";
 
 // src/icons/ChevronUpIcon.tsx
 import { jsx as jsx20 } from "react/jsx-runtime";
@@ -2215,7 +2392,7 @@ function ChainSelect({ value, onChange }) {
   const theme = useTheme();
   const { frame } = useFrame();
   const userAccount = useAccount2();
-  const chains = useChains2();
+  const { chains, switchChain } = useSwitchChain();
   const relay = useRelay();
   const relayChains = relay.data?.chains;
   const sourceChains = useMemo2(() => {
@@ -2228,6 +2405,13 @@ function ChainSelect({ value, onChange }) {
     }).filter((c) => c.relayChain);
   }, [chains, relayChains]);
   const selectedChain = sourceChains.find((c) => c.id === value);
+  useEffect10(() => {
+    if (sourceChains.length > 0 && !selectedChain) {
+      const defaultChain = sourceChains[0];
+      onChange(defaultChain.id);
+      switchChain({ chainId: defaultChain.id });
+    }
+  }, [value, selectedChain, sourceChains, onChange, switchChain]);
   return /* @__PURE__ */ jsxs15(
     Select.Root,
     {
@@ -2342,7 +2526,7 @@ var AmountInput = forwardRef3(function AmountInput2({ initialAmount, onChange },
 });
 
 // src/onboarding/deposit/SubmitButton.tsx
-import { useAccount as useAccount3, useBalance as useBalance4, useSwitchChain } from "wagmi";
+import { useAccount as useAccount3, useBalance as useBalance4, useSwitchChain as useSwitchChain2 } from "wagmi";
 import { twMerge as twMerge14 } from "tailwind-merge";
 import { parseEther as parseEther6 } from "viem";
 import { jsx as jsx28, jsxs as jsxs17 } from "react/jsx-runtime";
@@ -2351,12 +2535,13 @@ function SubmitButton({ amount, chainId, className, ...buttonProps }) {
   const { chainId: userChainId, address: userAddress } = useAccount3();
   const { data: userBalance } = useBalance4({ address: userAddress });
   const shouldSwitchChain = chainId != null && chainId !== userChainId;
-  const switchChain = useSwitchChain();
+  const switchChain = useSwitchChain2();
   if (shouldSwitchChain) {
     return /* @__PURE__ */ jsx28(
       Button,
       {
         type: "button",
+        variant: "primary",
         className: twMerge14("w-full", className),
         pending: switchChain.isPending,
         onClick: () => switchChain.switchChain({ chainId }),
@@ -2412,7 +2597,7 @@ function DepositForm({
   onSubmit,
   submitButton
 }) {
-  const amountInputRef = useRef2(null);
+  const amountInputRef = useRef3(null);
   const isMounted = useIsMounted();
   const { address: userAddress, chainId: userChainId } = useAccount4();
   const balance = useShowQueryError(useBalance5({ chainId: sourceChain.id, address: userAddress }));
@@ -2425,7 +2610,7 @@ function DepositForm({
   });
   const minimumBalance = amount != null ? amount + (estimatedFee?.fee ?? 0n) : void 0;
   const hasMinimumBalance = balance.data != null ? balance.data.value > (minimumBalance ?? 0n) : void 0;
-  useEffect8(() => {
+  useEffect11(() => {
     amountInputRef.current?.focus();
   }, [userChainId]);
   return /* @__PURE__ */ jsxs18(
@@ -2752,14 +2937,14 @@ function DepositViaRelayForm({ amount, setAmount, sourceChain, setSourceChainId
 }
 
 // src/onboarding/deposit/Deposits.tsx
-import { useEffect as useEffect10 } from "react";
-import { useQuery as useQuery15, useQueryClient as useQueryClient6 } from "@tanstack/react-query";
+import { useEffect as useEffect13 } from "react";
+import { useQuery as useQuery15, useQueryClient as useQueryClient7 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/TransferDepositStatus.tsx
 import { useQuery as useQuery13 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/DepositStatus.tsx
-import { useEffect as useEffect9, useState as useState4 } from "react";
+import { useEffect as useEffect12, useState as useState4 } from "react";
 import { twMerge as twMerge16 } from "tailwind-merge";
 
 // src/icons/CloseIcon.tsx
@@ -2782,7 +2967,7 @@ function CloseIcon(props) {
 import { jsx as jsx34, jsxs as jsxs19 } from "react/jsx-runtime";
 function DepositStatus({ status, progress, children, onDismiss }) {
   const [appear, setAppear] = useState4(false);
-  useEffect9(() => {
+  useEffect12(() => {
     setAppear(true);
   }, []);
   return /* @__PURE__ */ jsxs19("div", { className: "group bg-white dark:bg-neutral-900 flex flex-col animate-in fade-in slide-in-from-bottom-2 animate-out fade-out", children: [
@@ -2827,7 +3012,7 @@ function DepositStatus({ status, progress, children, onDismiss }) {
 }
 
 // src/onboarding/deposit/TransferDepositStatus.tsx
-import { useChains as useChains3 } from "wagmi";
+import { useChains as useChains2 } from "wagmi";
 import { Fragment as Fragment5, jsx as jsx35, jsxs as jsxs20 } from "react/jsx-runtime";
 function TransferDepositStatus({
   amount,
@@ -2838,7 +3023,7 @@ function TransferDepositStatus({
   estimatedTime,
   onDismiss
 }) {
-  const chains = useChains3();
+  const chains = useChains2();
   const chain = chains.find((chain2) => chain2.id === chainL1Id);
   const receipt = useQuery13({
     queryKey: ["transferDepositStatus", hash],
@@ -2900,8 +3085,7 @@ function TransferDepositStatus({
             }
           ),
           " ",
-          /* @__PURE__ */ jsx35(Balance, { wei: amount }),
-          " !"
+          /* @__PURE__ */ jsx35(Balance, { wei: amount })
         ] });
       })()
     }
@@ -2910,7 +3094,7 @@ function TransferDepositStatus({
 
 // src/onboarding/deposit/RelayDepositStatus.tsx
 import { useQuery as useQuery14 } from "@tanstack/react-query";
-import { useChains as useChains4 } from "wagmi";
+import { useChains as useChains3 } from "wagmi";
 import { Fragment as Fragment6, jsx as jsx36, jsxs as jsxs21 } from "react/jsx-runtime";
 function RelayDepositStatus({
   amount,
@@ -2921,7 +3105,7 @@ function RelayDepositStatus({
   depositPromise,
   onDismiss
 }) {
-  const chains = useChains4();
+  const chains = useChains3();
   const chainL1 = chains.find((chain) => chain.id === chainL1Id);
   const chainL2 = chains.find((chain) => chain.id === chainL2Id);
   const deposit = useQuery14({
@@ -2968,7 +3152,7 @@ function RelayDepositStatus({
 import { useAccount as useAccount7, useClient as useClient11 } from "wagmi";
 import { jsx as jsx37 } from "react/jsx-runtime";
 function Deposits() {
-  const queryClient = useQueryClient6();
+  const queryClient = useQueryClient7();
   const { chainId } = useEntryKitConfig();
   const client = useClient11({ chainId });
   const { address: userAddress } = useAccount7();
@@ -2981,7 +3165,7 @@ function Deposits() {
       return true;
     }
   });
-  useEffect10(() => {
+  useEffect13(() => {
     if (isComplete) {
       queryClient.invalidateQueries({ queryKey: ["balance"] });
       queryClient.invalidateQueries({ queryKey: ["getBalance", client?.uid, userAddress] });
@@ -3002,7 +3186,7 @@ import { jsx as jsx38, jsxs as jsxs22 } from "react/jsx-runtime";
 function DepositFormContainer() {
   const { chainId: destinationChainId } = useEntryKitConfig();
   const chainId = useChainId();
-  const chains = useChains5();
+  const chains = useChains4();
   const [amount, setAmount] = useState5(void 0);
   const [sourceChainId, setSourceChainId] = useState5(chainId);
   const sourceChain = chains.find(({ id }) => id === sourceChainId);
@@ -3045,33 +3229,18 @@ function ArrowLeftIcon(props) {
 }
 
 // src/onboarding/quarry/GasBalance.tsx
-import { useEffect as useEffect12 } from "react";
-import { useQueryClient as useQueryClient7 } from "@tanstack/react-query";
-
-// src/errors/usePrevious.ts
-import { useEffect as useEffect11, useRef as useRef3 } from "react";
-function usePrevious(value, initialValue) {
-  const ref = useRef3();
-  useEffect11(() => {
-    ref.current = { value };
-  }, [value]);
-  return ref.current ? ref.current.value : initialValue;
-}
-
-// src/onboarding/quarry/GasBalance.tsx
+import { useEffect as useEffect14 } from "react";
+import { useQueryClient as useQueryClient8 } from "@tanstack/react-query";
 import { Fragment as Fragment7, jsx as jsx40, jsxs as jsxs23 } from "react/jsx-runtime";
 function GasBalance2({ isActive, isExpanded, isFocused, setFocused, userAddress }) {
-  const queryClient = useQueryClient7();
+  const queryClient = useQueryClient8();
   const balance = useShowQueryError(useBalance(userAddress));
   const prevBalance = usePrevious(balance.data || 0n);
-  useEffect12(() => {
-    const checkBalance = async () => {
-      if (balance.data != null && prevBalance === 0n && balance.data > 0n) {
-        await queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] });
-        setFocused(false);
-      }
-    };
-    checkBalance();
+  useEffect14(() => {
+    if (balance.data != null && prevBalance === 0n && balance.data > 0n) {
+      queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] });
+      setFocused(false);
+    }
   }, [balance.data, prevBalance, setFocused, queryClient, userAddress]);
   if (isFocused) {
     return /* @__PURE__ */ jsxs23(Fragment7, { children: [
@@ -3116,7 +3285,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
   const [focusedId, setFocusedId] = useState6(null);
   const userAddress = userClient.account.address;
   const { data: prerequisites, error: prerequisitesError } = usePrerequisites(userAddress);
-  useEffect13(() => {
+  useEffect15(() => {
     if (prerequisitesError) {
       console.error("Could not get prerequisites", prerequisitesError);
     }
@@ -3124,7 +3293,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
   const { closeAccountModal } = useAccountModal();
   const isNewConnection = userAddress !== initialUserAddress;
   const initialPrerequisites = useRef4(prerequisites);
-  useEffect13(() => {
+  useEffect15(() => {
     if (prerequisites == null) return;
     if (initialPrerequisites.current == null) {
       initialPrerequisites.current = prerequisites;
@@ -3135,7 +3304,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
       }
     }
   }, [closeAccountModal, isNewConnection, prerequisites]);
-  const { sessionAddress, hasAllowance, isSpender, hasDelegation, hasGasBalance, hasQuarryBalance } = prerequisites ?? {};
+  const { sessionAddress, hasAllowance, isSpender, hasDelegation, hasGasBalance, hasQuarryGasBalance } = prerequisites ?? {};
   const steps = useMemo4(() => {
     if (!userAddress) {
       return [
@@ -3171,7 +3340,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
       } else {
         steps2.push({
           id: "gasBalanceQuarry",
-          isComplete: !!hasQuarryBalance,
+          isComplete: !!hasQuarryGasBalance,
           content: (props) => /* @__PURE__ */ jsx41(GasBalance2, { ...props, userAddress })
         });
       }
@@ -3186,7 +3355,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
     hasAllowance,
     hasDelegation,
     hasGasBalance,
-    hasQuarryBalance,
+    hasQuarryGasBalance,
     isSpender,
     paymaster,
     sessionAddress,
@@ -3249,11 +3418,11 @@ import { ErrorBoundary } from "react-error-boundary";
 
 // src/errors/ErrorOverlay.tsx
 import { wait } from "@latticexyz/common/utils";
-import { useEffect as useEffect14 } from "react";
+import { useEffect as useEffect16 } from "react";
 import { twMerge as twMerge18 } from "tailwind-merge";
 import { Fragment as Fragment8, jsx as jsx43, jsxs as jsxs24 } from "react/jsx-runtime";
 function ErrorOverlay({ error: error2, retry, dismiss }) {
-  useEffect14(() => {
+  useEffect16(() => {
     if (error2) {
       console.error(error2);
     }