@latticexyz/entrykit 2.2.22-0e714cf3a76af8d526debc4ca830b53a7fab74d2 → 2.2.22-0f5c75bd8fc963e3697ff1720ec3608d119d4b5e

package/dist/tsup/exports/internal.js

@@ -564,7 +564,7 @@ import { twMerge as twMerge18 } from "tailwind-merge";
 // src/onboarding/usePrerequisites.ts
 import { useClient as useClient6, useConfig } from "wagmi";
 import { getBalanceQueryOptions as getBalanceQueryOptions2 } from "wagmi/query";
-import { queryOptions as queryOptions6, useQuery as useQuery7, useQueryClient } from "@tanstack/react-query";
+import { queryOptions as queryOptions6, skipToken as skipToken6, useQuery as useQuery7, useQueryClient } from "@tanstack/react-query";
 
 // src/getPaymaster.ts
 function getPaymaster(chain) {
@@ -919,9 +919,7 @@ function getPrequisitesQueryOptions({
 }) {
   return queryOptions6({
     queryKey: ["getPrerequisites", client?.uid, userAddress],
-    queryFn: async () => {
-      if (!client) throw new Error("Viem client not ready.");
-      if (!userAddress) throw new Error("User not connected.");
+    queryFn: client && userAddress ? async () => {
       const paymaster = getPaymaster(client.chain);
       const {
         account: { address: sessionAddress }
@@ -949,7 +947,7 @@ function getPrequisitesQueryOptions({
         // we intentionally don't enforce an allowance/gas balance here
         complete: isSpender && hasDelegation
       };
-    },
+    } : skipToken6,
     retry: false
   });
 }
@@ -1460,6 +1458,7 @@ function useSetupSession({ userClient }) {
 import { useClient as useClient9 } from "wagmi";
 import {
   queryOptions as queryOptions7,
+  skipToken as skipToken7,
   useQuery as useQuery9,
   useQueryClient as useQueryClient4
 } from "@tanstack/react-query";
@@ -1547,8 +1546,7 @@ function getSessionClientQueryOptions({
 }) {
   return queryOptions7({
     queryKey: ["getSessionClient", client?.uid, userAddress, worldAddress],
-    queryFn: async () => {
-      if (!userAddress) throw new Error("User not connected.");
+    queryFn: userAddress ? async () => {
       const { account: sessionAccount, signer: sessionSigner } = await queryClient.fetchQuery(
         getSessionAccountQueryOptions({ client, userAddress })
       );
@@ -1558,7 +1556,7 @@ function getSessionClientQueryOptions({
         userAddress,
         worldAddress
       });
-    },
+    } : skipToken7,
     staleTime: Infinity,
     // TODO: replace with function to retry only connection errors
     retry: false
@@ -2259,7 +2257,7 @@ function useRelay() {
 // src/onboarding/deposit/useChainBalances.ts
 import { useAccount, useConfig as useWagmiConfig } from "wagmi";
 import { getBalance as getBalance2 } from "wagmi/actions";
-import { useQuery as useQuery11, skipToken as skipToken6 } from "@tanstack/react-query";
+import { useQuery as useQuery11, skipToken as skipToken8 } from "@tanstack/react-query";
 import { isNotNull } from "@latticexyz/common/utils";
 function useChainBalances({ chains }) {
   const { address: userAddress } = useAccount();
@@ -2275,7 +2273,7 @@ function useChainBalances({ chains }) {
         })
       );
       return chainBalances.map((result) => result.status === "fulfilled" ? result.value : null).filter(isNotNull);
-    } : skipToken6,
+    } : skipToken8,
     refetchInterval: 1e3 * 60,
     retry: 1
   });
@@ -3628,7 +3626,7 @@ function AccountButton() {
         "hover:bg-orange-400",
         "active:bg-orange-600"
       ),
-      "aria-busy": accountModalOpen || prereqs.isPending,
+      "aria-busy": accountModalOpen,
       onClick: openAccountModal,
       children: [
         /* @__PURE__ */ jsxs29("span", { className: "pointer-events-none inline-grid place-items-center -ml-3", children: [
@@ -3664,14 +3662,16 @@ function AccountButton() {
 }
 
 // src/useSessionClientReady.ts
-import { useAccount as useAccount10 } from "wagmi";
+import { useConnectorClient as useConnectorClient2 } from "wagmi";
 function useSessionClientReady() {
-  const { address: userAddress } = useAccount10();
+  const { chainId } = useEntryKitConfig();
+  const userClient = useConnectorClient2({ chainId });
+  if (userClient.error) console.error("Error retrieving user client", userClient.error);
+  const userAddress = userClient.data?.account.address;
   const prerequisites = usePrerequisites(userAddress);
   const sessionClient = useSessionClient(userAddress);
-  if (!prerequisites.isSuccess || !prerequisites.data.complete) {
-    return { ...prerequisites, data: void 0 };
-  }
+  if (!userClient.isSuccess) return { ...userClient, data: void 0 };
+  if (!prerequisites.isSuccess || !prerequisites.data.complete) return { ...prerequisites, data: void 0 };
   return sessionClient;
 }