@b3dotfun/sdk 0.0.47-test.4 → 0.0.47

package/src/global-account/react/hooks/useAuthentication.ts

@@ -1,173 +1,124 @@
 import app from "@b3dotfun/sdk/global-account/app";
 import { authenticateWithB3JWT } from "@b3dotfun/sdk/global-account/bsmnt";
-import { useAuthStore, useSiwe } from "@b3dotfun/sdk/global-account/react";
+import { useAuthStore, useB3 } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
+import { b3MainnetThirdWeb } from "@b3dotfun/sdk/shared/constants/chains/supported";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
-import { ConnectionOptions } from "@thirdweb-dev/wagmi-adapter";
-import { getConnectors } from "@wagmi/core";
-import { useCallback, useEffect, useRef } from "react";
-import {
-  useActiveWallet,
-  useAutoConnect,
-  useConnectedWallets,
-  useDisconnect,
-  useSetActiveWallet,
-} from "thirdweb/react";
-import { ecosystemWallet, Wallet } from "thirdweb/wallets";
+import { useEffect, useRef } from "react";
+import { useActiveWallet, useAutoConnect, useConnectedWallets, useDisconnect } from "thirdweb/react";
+import { ecosystemWallet } from "thirdweb/wallets";
 import { preAuthenticate } from "thirdweb/wallets/in-app";
-import { useAccount, useConnect } from "wagmi";
-import { useUserQuery } from "./useUserQuery";
-import { useWagmiConfig } from "./useWagmiConfig";
+import { useConnect } from "./useConnect";
+import { useSiwe } from "./useSiwe";
 
 const debug = debugB3React("useAuthentication");
 
-export function useAuthentication(partnerId: string) {
+export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
   const { disconnect } = useDisconnect();
   const wallets = useConnectedWallets();
   const activeWallet = useActiveWallet();
+  const { authenticate } = useSiwe();
+  const { setUser } = useB3();
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
+  const setIsConnecting = useAuthStore(state => state.setIsConnecting);
   const setIsConnected = useAuthStore(state => state.setIsConnected);
   const isConnecting = useAuthStore(state => state.isConnecting);
   const isConnected = useAuthStore(state => state.isConnected);
-  const isAuthenticating = useAuthStore(state => state.isAuthenticating);
+  const useAutoConnectLoadingPrevious = useRef(false);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
-  const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
-  const setActiveWallet = useSetActiveWallet();
+  const isAuthenticating = useAuthStore(state => state.isAuthenticating);
   const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
-  const { authenticate } = useSiwe();
-  const { user, setUser } = useUserQuery();
-  const useAutoConnectLoadingPrevious = useRef(false);
-  const wagmiConfig = useWagmiConfig(partnerId);
-  const { connect } = useConnect();
-  const activeWagmiAccount = useAccount();
-  debug("@@activeWagmiAccount", activeWagmiAccount);
+  const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
+  const { connect } = useConnect(partnerId, b3MainnetThirdWeb);
 
   const wallet = ecosystemWallet(ecosystemWalletId, {
     partnerId: partnerId,
   });
 
-  const syncWagmi = useCallback(async () => {
-    function syncWagmiFunc() {
-      const connectors = getConnectors(wagmiConfig);
-      debug("@@syncWagmi", {
-        connectors,
-        wallets,
-      });
-
-      // For each that matchs a TW wallet on wallets, connect to the wagmi connector
-      // or, since ecosystem wallets is separate, connect those via in-app-wallet from wagmi
-      connectors.forEach(async connector => {
-        const twWallet = wallets.find(wallet => wallet.id === connector.id || connector.id === "in-app-wallet");
-        if (
-          twWallet &&
-          // If it's not an in-app wallet or it is the ecosystem wallet, connect
-          (connector.id !== "in-app-wallet" || (connector.id === "in-app-wallet" && twWallet.id === ecosystemWalletId))
-        ) {
-          try {
-            const options = {
-              wallet: twWallet, // the connected wallet
-            } satisfies ConnectionOptions;
-            debug("@@syncWagmi:connecting", { twWallet, connector });
-            connect({
-              connector,
-              ...options,
-            });
-          } catch (error) {
-            console.error("@@syncWagmi:error", error);
-          }
-        } else {
-          debug("@@syncWagmi:not-connecting", connector);
-        }
-      });
-    }
-    syncWagmiFunc();
-    // wagmi config shouldn't change
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [partnerId, wallets]);
-
-  useEffect(() => {
-    syncWagmi();
-  }, [wallets, syncWagmi]);
-
-  const authenticateUser = useCallback(
-    async (wallet?: Wallet) => {
+  const { isLoading: useAutoConnectLoading } = useAutoConnect({
+    client,
+    wallets: [wallet],
+    onConnect: async wallet => {
       setHasStartedConnecting(true);
 
-      const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
-      if (!account) {
-        throw new Error("No account found during auto-connect");
-      }
-      if (!account) {
-        throw new Error("No account found during auto-connect");
-      }
-
-      // Try to re-authenticate first
       try {
-        const userAuth = await app.reAuthenticate();
-        setUser(userAuth.user);
-        setIsAuthenticated(true);
-        setIsAuthenticating(false);
-        debug("Re-authenticated successfully", { userAuth });
-
-        // Authenticate on BSMNT with B3 JWT
-        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-        debug("@@b3Jwt", b3Jwt);
-      } catch (error) {
-        // If re-authentication fails, try fresh authentication
-        debug("Re-authentication failed, attempting fresh authentication");
-        const userAuth = await authenticate(account, partnerId);
-        setUser(userAuth.user);
-        setIsAuthenticated(true);
-        setIsAuthenticating(false);
-        debug("Fresh authentication successful", { userAuth });
-
-        // Authenticate on BSMNT with B3 JWT
-        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
-        debug("@@b3Jwt", b3Jwt);
-      }
-    },
-    [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting],
-  );
+        setIsConnected(true);
+        if (!loginWithSiwe) {
+          debug("Skipping SIWE login", { loginWithSiwe });
+          setIsAuthenticated(true);
 
-  const onConnect = useCallback(
-    async (wallet: Wallet) => {
-      debug("@@useAuthentication:onConnect", { wallet });
+          setIsAuthenticating(false);
+          return;
+        }
+        debug("setIsAuthenticating:true:4");
+        const account = await wallet.getAccount();
+        if (!account) {
+          throw new Error("No account found during auto-connect");
+        }
 
-      try {
-        setHasStartedConnecting(true);
-        setIsConnected(true);
-        setIsAuthenticating(true);
-        await setActiveWallet(wallet);
-        await authenticateUser(wallet);
+        // Try to re-authenticate first
+        try {
+          const userAuth = await app.reAuthenticate();
+          setUser(userAuth.user);
+          setIsAuthenticated(true);
+          setIsAuthenticating(false);
+          debug("Re-authenticated successfully", { userAuth });
+
+          // Authenticate on BSMNT with B3 JWT
+          const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+          console.log("@@b3Jwt", b3Jwt);
+        } catch (error) {
+          // If re-authentication fails, try fresh authentication
+          debug("Re-authentication failed, attempting fresh authentication");
+          const userAuth = await authenticate(account, partnerId);
+          setUser(userAuth.user);
+          setIsAuthenticated(true);
+          setIsAuthenticating(false);
+          debug("Fresh authentication successful", { userAuth });
+
+          // Authenticate on BSMNT with B3 JWT
+          const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+          console.log("@@b3Jwt", b3Jwt);
+        }
       } catch (error) {
-        debug("@@useAuthentication:onConnect:failed", { error });
+        debug("Auto-connect authentication failed", { error });
         setIsAuthenticated(false);
-        setUser(undefined);
-      } finally {
-        setIsAuthenticating(false);
+        debug("setIsAuthenticating:false:4");
+        setUser();
       }
-
-      debug({
-        isAuthenticated,
-        isAuthenticating,
-        isConnected,
-      });
+      setIsAuthenticating(false);
     },
-    [
-      authenticateUser,
-      isAuthenticated,
-      isAuthenticating,
-      isConnected,
-      setActiveWallet,
-      setHasStartedConnecting,
-      setIsAuthenticated,
-      setIsAuthenticating,
-      setIsConnected,
-      setUser,
-    ],
-  );
+  });
+
+  /**
+   * useAutoConnectLoading starts as false
+   */
+  useEffect(() => {
+    if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+      setIsAuthenticating(false);
+    }
+    useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
+  }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
+
+  // Ensure isAuthenticating stays true until we're fully ready
+  useEffect(() => {
+    if (useAutoConnectLoading) {
+      setIsConnecting(true);
+    } else if (!isAuthenticated) {
+      // Only set isAuthenticating to false if we're not authenticated
+      // This prevents the flicker state where both isAuthenticating and isAuthenticated are false
+      const timeout = setTimeout(() => {
+        debug("setIsAuthenticating:false:5a");
+        setIsConnecting(false);
+      }, 100); // Add a small delay to prevent quick flickers
+      return () => clearTimeout(timeout);
+    } else {
+      debug("setIsAuthenticating:false:5b");
+      setIsConnecting(false);
+    }
+  }, [useAutoConnectLoading, isAuthenticated, setIsConnecting, setIsConnected]);
 
   const logout = async (callback?: () => void) => {
     if (activeWallet) {
@@ -199,23 +150,7 @@ export function useAuthentication(partnerId: string) {
     callback?.();
   };
 
-  const { isLoading: useAutoConnectLoading } = useAutoConnect({
-    client,
-    wallets: [wallet],
-    onConnect: onConnect,
-  });
-
-  /**
-   * useAutoConnectLoading starts as false
-   */
-  useEffect(() => {
-    if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
-      setIsAuthenticating(false);
-    }
-    useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
-  }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
-
-  const isReady = isAuthenticated && !isAuthenticating;
+  const isReady = isAuthenticated && !useAutoConnectLoading && !isAuthenticating;
 
   return {
     logout,
@@ -225,11 +160,7 @@ export function useAuthentication(partnerId: string) {
     isConnected,
     wallet,
     preAuthenticate,
-    connect: onConnect,
+    connect,
     isAuthenticating,
-    onConnect,
-    user,
-    refetchUser: authenticateUser,
-    setUser,
   };
 }

package/src/global-account/react/hooks/useHandleConnectWithPrivy.tsx

@@ -1,4 +1,4 @@
-import { useB3, useConnect } from "@b3dotfun/sdk/global-account/react";
+import { useConnect } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useIdentityToken, usePrivy } from "@privy-io/react-auth";
 import { useCallback, useRef, useState } from "react";
@@ -10,8 +10,7 @@ const debug = debugB3React("@@b3:useHandleConnectWithPrivy");
  * This essentially wraps our useConnect hook to handle the Privy auth flow.
  * Currently, this is for the basement-privy strategy
  */
-export function useHandleConnectWithPrivy(chain?: Chain, onSuccess?: (account: Account) => void) {
-  const { partnerId } = useB3();
+export function useHandleConnectWithPrivy(partnerId: string, chain?: Chain, onSuccess?: (account: Account) => void) {
   if (!chain) {
     throw new Error("Chain is required");
   }

package/src/global-account/react/stores/useModalStore.ts

@@ -35,6 +35,8 @@ export interface SignInWithB3ModalProps extends BaseModalProps {
   sessionKeyAddress?: Address;
   /** Unique identifier for the partner application */
   partnerId: string;
+  /** Whether to authenticate with Sign In With Ethereum */
+  loginWithSiwe?: boolean;
   /** Whether to close the modal after successful login */
   closeAfterLogin?: boolean;
   /** Source of the sign-in request */

package/dist/cjs/global-account/react/hooks/useUserQuery.d.ts

@@ -1,58 +0,0 @@
-import { Users } from "@b3dotfun/b3-api";
-/**
- * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
- *
- * Custom hook to manage user state with react-query
- * This allows for invalidation and refetching of user data
- */
-export declare function useUserQuery(): {
-    user: {
-        email?: string | undefined;
-        username?: string | undefined;
-        telNumber?: string | undefined;
-        ens?: string | undefined;
-        avatar?: string | undefined;
-        preferences?: {} | undefined;
-        referredBy?: string | {} | undefined;
-        sourceApp?: string | undefined;
-        referralCode?: string | undefined;
-        userGroups?: number[] | undefined;
-        isMigratedFromBSMNT?: boolean | undefined;
-        privyLinkedAccounts?: {
-            name?: string | undefined;
-            address?: string | undefined;
-            email?: string | undefined;
-            chain_type?: string | undefined;
-            lv?: number | undefined;
-            wallet_client_type?: string | undefined;
-            smart_wallet_type?: string | undefined;
-            subject?: string | undefined;
-            type: string;
-        }[] | undefined;
-        twProfiles?: {
-            type: string;
-            details: {
-                id?: string | undefined;
-                name?: string | undefined;
-                address?: string | undefined;
-                email?: string | undefined;
-                phone?: string | undefined;
-                username?: string | undefined;
-                fid?: string | undefined;
-            };
-        }[] | undefined;
-        _id: string | {};
-        userId: string;
-        smartAccountAddress: string;
-        createdAt: number;
-        updatedAt: number;
-        partnerIds: {
-            privyId?: string | undefined;
-            thirdwebId?: string | undefined;
-        };
-    } | undefined;
-    setUser: (newUser?: Users) => void;
-    refetchUser: () => Promise<void>;
-    clearUser: () => void;
-    queryKey: string[];
-};

package/dist/cjs/global-account/react/hooks/useUserQuery.js

@@ -1,86 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useUserQuery = useUserQuery;
-const debug_1 = require("../../../shared/utils/debug");
-const react_query_1 = require("@tanstack/react-query");
-const debug = (0, debug_1.debugB3React)("useUserQuery");
-const USER_QUERY_KEY = ["b3-user"];
-/**
- * Retrieves the user from localStorage
- */
-function getUserFromStorage() {
-    if (typeof window === "undefined") {
-        return null;
-    }
-    try {
-        const storedUser = localStorage.getItem("b3-user");
-        return storedUser ? JSON.parse(storedUser) : null;
-    }
-    catch (error) {
-        console.warn("Failed to restore user from localStorage:", error);
-        return null;
-    }
-}
-/**
- * Saves user to localStorage
- */
-function saveUserToStorage(user) {
-    if (typeof window === "undefined") {
-        return;
-    }
-    if (user) {
-        localStorage.setItem("b3-user", JSON.stringify(user));
-    }
-    else {
-        localStorage.removeItem("b3-user");
-    }
-}
-/**
- * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
- *
- * Custom hook to manage user state with react-query
- * This allows for invalidation and refetching of user data
- */
-function useUserQuery() {
-    const queryClient = (0, react_query_1.useQueryClient)();
-    // Query to get user data (primarily from cache/localStorage)
-    const { data: user } = (0, react_query_1.useQuery)({
-        queryKey: USER_QUERY_KEY,
-        queryFn: getUserFromStorage,
-        staleTime: Infinity, // User data doesn't go stale automatically
-        gcTime: Infinity, // Keep in cache indefinitely
-        initialData: getUserFromStorage,
-    });
-    // Mutation to update user
-    const setUserMutation = (0, react_query_1.useMutation)({
-        mutationFn: async (newUser) => {
-            const userToSave = newUser ?? null;
-            saveUserToStorage(userToSave);
-            return userToSave;
-        },
-        onSuccess: data => {
-            queryClient.setQueryData(USER_QUERY_KEY, data);
-            debug("User updated", data);
-        },
-    });
-    // Helper function to set user (maintains backward compatibility)
-    const setUser = (newUser) => {
-        setUserMutation.mutate(newUser);
-    };
-    // Helper function to invalidate and refetch user
-    const refetchUser = async () => {
-        await queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-        return queryClient.refetchQueries({ queryKey: USER_QUERY_KEY });
-    };
-    // Helper function to clear user
-    const clearUser = () => {
-        setUser(undefined);
-    };
-    return {
-        user: user ?? undefined,
-        setUser,
-        refetchUser,
-        clearUser,
-        queryKey: USER_QUERY_KEY,
-    };
-}

package/dist/cjs/global-account/react/hooks/useWagmiConfig.d.ts

@@ -1,13 +0,0 @@
-export declare function useWagmiConfig(partnerId: string, rpcUrls?: Record<number, string>): import("wagmi").Config<readonly [import("viem").Chain, ...import("viem").Chain[]], {
-    [k: string]: import("viem").HttpTransport<undefined, false>;
-}, readonly [import("wagmi").CreateConnectorFn<import("thirdweb/dist/types/adapters/eip1193").EIP1193Provider | undefined, {
-    connect<withCapabilities extends boolean = false>(parameters?: import("@thirdweb-dev/wagmi-adapter").ConnectionOptions<withCapabilities> | undefined): Promise<{
-        accounts: withCapabilities extends true ? readonly {
-            address: `0x${string}`;
-            capabilities: Record<string, unknown>;
-        }[] : readonly `0x${string}`[];
-        chainId: number;
-    }>;
-}, {
-    "thirdweb:lastChainId": number;
-}>]>;

package/dist/cjs/global-account/react/hooks/useWagmiConfig.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useWagmiConfig = useWagmiConfig;
-const constants_1 = require("../../../shared/constants");
-const supported_1 = require("../../../shared/constants/chains/supported");
-const thirdweb_1 = require("../../../shared/utils/thirdweb");
-const wagmi_adapter_1 = require("@thirdweb-dev/wagmi-adapter");
-const react_1 = require("react");
-const viem_1 = require("viem");
-const wagmi_1 = require("wagmi");
-function useWagmiConfig(partnerId, rpcUrls) {
-    // Stringify rpcUrls for stable comparison to prevent wagmiConfig recreation
-    // when parent component passes new object references with same content
-    const rpcUrlsString = (0, react_1.useMemo)(() => (rpcUrls ? JSON.stringify(rpcUrls) : undefined), [rpcUrls]);
-    const ecocystemConfig = (0, react_1.useMemo)(() => {
-        return {
-            ecosystemId: constants_1.ecosystemWalletId,
-            partnerId: partnerId,
-            client: thirdweb_1.client,
-        };
-    }, [partnerId]);
-    /**
-     * Creates wagmi config with optional custom RPC URLs
-     * @param rpcUrls - Optional mapping of chain IDs to RPC URLs
-     */
-    const wagmiConfig = (0, react_1.useMemo)(() => {
-        const parsedRpcUrls = rpcUrlsString ? JSON.parse(rpcUrlsString) : undefined;
-        return (0, wagmi_1.createConfig)({
-            chains: [supported_1.supportedChains[0], ...supported_1.supportedChains.slice(1)],
-            transports: Object.fromEntries(supported_1.supportedChains.map(chain => [chain.id, (0, viem_1.http)(parsedRpcUrls?.[chain.id])])),
-            connectors: [
-                (0, wagmi_adapter_1.inAppWalletConnector)({
-                    ...ecocystemConfig,
-                    client: thirdweb_1.client,
-                }),
-                // injected(),
-                // coinbaseWallet({ appName: "HypeDuel" }),
-            ],
-        });
-    }, [rpcUrlsString, ecocystemConfig]);
-    return wagmiConfig;
-}

package/dist/esm/global-account/react/hooks/useUserQuery.d.ts

@@ -1,58 +0,0 @@
-import { Users } from "@b3dotfun/b3-api";
-/**
- * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
- *
- * Custom hook to manage user state with react-query
- * This allows for invalidation and refetching of user data
- */
-export declare function useUserQuery(): {
-    user: {
-        email?: string | undefined;
-        username?: string | undefined;
-        telNumber?: string | undefined;
-        ens?: string | undefined;
-        avatar?: string | undefined;
-        preferences?: {} | undefined;
-        referredBy?: string | {} | undefined;
-        sourceApp?: string | undefined;
-        referralCode?: string | undefined;
-        userGroups?: number[] | undefined;
-        isMigratedFromBSMNT?: boolean | undefined;
-        privyLinkedAccounts?: {
-            name?: string | undefined;
-            address?: string | undefined;
-            email?: string | undefined;
-            chain_type?: string | undefined;
-            lv?: number | undefined;
-            wallet_client_type?: string | undefined;
-            smart_wallet_type?: string | undefined;
-            subject?: string | undefined;
-            type: string;
-        }[] | undefined;
-        twProfiles?: {
-            type: string;
-            details: {
-                id?: string | undefined;
-                name?: string | undefined;
-                address?: string | undefined;
-                email?: string | undefined;
-                phone?: string | undefined;
-                username?: string | undefined;
-                fid?: string | undefined;
-            };
-        }[] | undefined;
-        _id: string | {};
-        userId: string;
-        smartAccountAddress: string;
-        createdAt: number;
-        updatedAt: number;
-        partnerIds: {
-            privyId?: string | undefined;
-            thirdwebId?: string | undefined;
-        };
-    } | undefined;
-    setUser: (newUser?: Users) => void;
-    refetchUser: () => Promise<void>;
-    clearUser: () => void;
-    queryKey: string[];
-};

package/dist/esm/global-account/react/hooks/useUserQuery.js

@@ -1,83 +0,0 @@
-import { debugB3React } from "../../../shared/utils/debug.js";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-const debug = debugB3React("useUserQuery");
-const USER_QUERY_KEY = ["b3-user"];
-/**
- * Retrieves the user from localStorage
- */
-function getUserFromStorage() {
-    if (typeof window === "undefined") {
-        return null;
-    }
-    try {
-        const storedUser = localStorage.getItem("b3-user");
-        return storedUser ? JSON.parse(storedUser) : null;
-    }
-    catch (error) {
-        console.warn("Failed to restore user from localStorage:", error);
-        return null;
-    }
-}
-/**
- * Saves user to localStorage
- */
-function saveUserToStorage(user) {
-    if (typeof window === "undefined") {
-        return;
-    }
-    if (user) {
-        localStorage.setItem("b3-user", JSON.stringify(user));
-    }
-    else {
-        localStorage.removeItem("b3-user");
-    }
-}
-/**
- * NOTE: THIS IS ONLY MEANT FOR INTERNAL USE, from useOnConnect
- *
- * Custom hook to manage user state with react-query
- * This allows for invalidation and refetching of user data
- */
-export function useUserQuery() {
-    const queryClient = useQueryClient();
-    // Query to get user data (primarily from cache/localStorage)
-    const { data: user } = useQuery({
-        queryKey: USER_QUERY_KEY,
-        queryFn: getUserFromStorage,
-        staleTime: Infinity, // User data doesn't go stale automatically
-        gcTime: Infinity, // Keep in cache indefinitely
-        initialData: getUserFromStorage,
-    });
-    // Mutation to update user
-    const setUserMutation = useMutation({
-        mutationFn: async (newUser) => {
-            const userToSave = newUser ?? null;
-            saveUserToStorage(userToSave);
-            return userToSave;
-        },
-        onSuccess: data => {
-            queryClient.setQueryData(USER_QUERY_KEY, data);
-            debug("User updated", data);
-        },
-    });
-    // Helper function to set user (maintains backward compatibility)
-    const setUser = (newUser) => {
-        setUserMutation.mutate(newUser);
-    };
-    // Helper function to invalidate and refetch user
-    const refetchUser = async () => {
-        await queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-        return queryClient.refetchQueries({ queryKey: USER_QUERY_KEY });
-    };
-    // Helper function to clear user
-    const clearUser = () => {
-        setUser(undefined);
-    };
-    return {
-        user: user ?? undefined,
-        setUser,
-        refetchUser,
-        clearUser,
-        queryKey: USER_QUERY_KEY,
-    };
-}