@b3dotfun/sdk 0.0.88 → 0.0.89-alpha.0

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

@@ -0,0 +1,379 @@
+import app from "@b3dotfun/sdk/global-account/app";
+import { authenticateWithB3JWT } from "@b3dotfun/sdk/global-account/bsmnt";
+import { useAuthStore, useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
+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, useContext, useEffect, useRef } from "react";
+import {
+  useActiveWallet,
+  useAutoConnect,
+  useConnectedWallets,
+  useDisconnect,
+  useSetActiveWallet,
+} from "thirdweb/react";
+import { Wallet, ecosystemWallet } from "thirdweb/wallets";
+import { preAuthenticate } from "thirdweb/wallets/in-app";
+import { useAccount, useConnect, useSwitchAccount } from "wagmi";
+import { LocalSDKContext } from "../components/B3Provider/LocalSDKProvider";
+import { createWagmiConfig } from "../utils/createWagmiConfig";
+import { useSearchParam } from "./useSearchParamsSSR";
+import { useUserQuery } from "./useUserQuery";
+
+const debug = debugB3React("useAuth");
+
+/**
+ * Unified authentication hook that uses Turnkey for authentication
+ * This replaces the previous Thirdweb-based authentication
+ *
+ * This hook provides 1:1 feature parity with useAuthentication.ts
+ */
+export function useAuth() {
+  const { onConnectCallback } = useContext(LocalSDKContext);
+  const { disconnect } = useDisconnect();
+  const wallets = useConnectedWallets();
+  const activeWallet = useActiveWallet();
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
+  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 setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+  const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
+  const setActiveWallet = useSetActiveWallet();
+  const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
+  const useAutoConnectLoadingPrevious = useRef(false);
+  const referralCode = useSearchParam("referralCode");
+  const { partnerId } = useB3Config();
+  const wagmiConfig = createWagmiConfig({ partnerId });
+  const { connect } = useConnect();
+  const activeWagmiAccount = useAccount();
+  const { switchAccount } = useSwitchAccount();
+  const { user, setUser } = useUserQuery();
+  debug("@@activeWagmiAccount", activeWagmiAccount);
+
+  const wallet = ecosystemWallet(ecosystemWalletId, {
+    partnerId: partnerId,
+  });
+
+  /**
+   * Re-authenticate using existing session
+   * Also updates user state and authenticates with BSMNT
+   */
+  const reAuthenticate = useCallback(async () => {
+    debug("Re-authenticating...");
+    try {
+      const response = await app.reAuthenticate();
+      debug("Re-authentication successful", response);
+
+      // Update user state if user data exists
+      if (response.user) {
+        setUser(response.user);
+        debug("User state updated", response.user);
+      }
+
+      // Authenticate with BSMNT
+      try {
+        const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+        debug("BSMNT re-authentication successful", b3Jwt);
+      } catch (bsmntError) {
+        // BSMNT authentication failure shouldn't block the main auth flow
+        debug("BSMNT re-authentication failed (non-critical)", bsmntError);
+      }
+
+      return response;
+    } catch (err: any) {
+      debug("Re-authentication failed", err);
+      throw err;
+    }
+  }, [setUser]);
+
+  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 no TW wallet, do not prompt the user to connect
+        if (!twWallet) {
+          return;
+        }
+
+        // Metamask will prompt to connect, we can just switch accounts here.
+        if (connector.id === "io.metamask") {
+          return switchAccount({ connector });
+        }
+
+        if (
+          // 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]);
+
+  /**
+   * Authenticate user using Turnkey
+   * Note: This no longer requires a wallet for authentication.
+   * Wallets are still used for signing transactions, but authentication is done via Turnkey email OTP.
+   *
+   * For backward compatibility, this function still accepts a wallet parameter,
+   * but it's not used for authentication anymore.
+   */
+  const authenticateUser = useCallback(async () => {
+    setHasStartedConnecting(true);
+
+    // Try to re-authenticate first
+    try {
+      const userAuth = await 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);
+
+      return userAuth;
+    } catch (error) {
+      // If re-authentication fails, user needs to authenticate via Turnkey
+      // This should be handled by the Turnkey auth modal/flow
+      debug("Re-authentication failed. User needs to authenticate via Turnkey.", error);
+      setIsAuthenticated(false);
+      setIsAuthenticating(false);
+      throw new Error("Authentication required. Please authenticate via Turnkey.");
+    }
+  }, [reAuthenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting]);
+
+  /**
+   * Authenticate with Turnkey using email OTP
+   * This is the primary authentication method, replacing Thirdweb wallet-based auth
+   *
+   * This function:
+   * 1. Authenticates with FeathersJS (persists session via cookies)
+   * 2. Sets user state in the user store (persists to localStorage)
+   * 3. Authenticates with BSMNT for basement integration
+   */
+  const authenticate = useCallback(
+    async (turnkeySessionJwt: string, partnerId: string) => {
+      if (!turnkeySessionJwt) {
+        throw new Error("Turnkey session JWT is required");
+      }
+
+      debug("Authenticating with Turnkey JWT", { referralCode, partnerId });
+
+      try {
+        // Step 1: Authenticate with FeathersJS (session persisted via cookies)
+        const response = await app.authenticate({
+          strategy: "turnkey-jwt",
+          accessToken: turnkeySessionJwt,
+          referralCode,
+          partnerId: partnerId,
+        } as any);
+
+        debug("Authentication successful", response);
+
+        // Step 2: Set user state (persists to localStorage via Zustand)
+        if (response.user) {
+          setUser(response.user);
+          debug("User state updated", response.user);
+        }
+
+        // Step 3: Authenticate with BSMNT for basement integration
+        try {
+          const b3Jwt = await authenticateWithB3JWT(response.accessToken);
+          debug("BSMNT authentication successful", b3Jwt);
+        } catch (bsmntError) {
+          // BSMNT authentication failure shouldn't block the main auth flow
+          debug("BSMNT authentication failed (non-critical)", bsmntError);
+        }
+
+        return response;
+      } catch (err: any) {
+        debug("Authentication failed", err);
+        throw err;
+      }
+    },
+    [referralCode, setUser],
+  );
+
+  /**
+   * Handle wallet connection
+   * Note: With Turnkey migration, wallet connection is primarily for signing transactions,
+   * not for authentication. Authentication should be done separately via Turnkey email OTP.
+   */
+  /**
+   * Handle wallet connection
+   * Note: With Turnkey migration, wallet connection is primarily for signing transactions,
+   * not for authentication. Authentication should be done separately via Turnkey email OTP.
+   */
+  const onConnect = useCallback(
+    async (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => {
+      debug("@@useAuth:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
+
+      const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
+
+      if (!wallet) {
+        throw new Error("No smart wallet found during auto-connect");
+      }
+
+      debug("@@useAuth:onConnect", { wallet });
+
+      try {
+        setHasStartedConnecting(true);
+        setIsConnected(true);
+        setIsAuthenticating(true);
+        await setActiveWallet(wallet);
+
+        // Try to authenticate user (will use re-authenticate if session exists)
+        // If no session exists, authentication will need to happen via Turnkey flow
+        try {
+          const userAuth = await authenticateUser();
+
+          if (userAuth && onConnectCallback) {
+            await onConnectCallback(wallet, userAuth.accessToken);
+          }
+        } catch (authError) {
+          // Authentication failed - this is expected if user hasn't authenticated via Turnkey yet
+          // The Turnkey auth modal should handle this
+          debug("@@useAuth:onConnect:authFailed", { authError });
+          // Don't set isAuthenticated to false here - let the Turnkey flow handle it
+        }
+      } catch (error) {
+        debug("@@useAuth:onConnect:failed", { error });
+        setIsAuthenticated(false);
+        setUser(undefined);
+      } finally {
+        setIsAuthenticating(false);
+      }
+
+      debug({
+        isAuthenticated,
+        isAuthenticating,
+        isConnected,
+      });
+    },
+    [
+      onConnectCallback,
+      authenticateUser,
+      isAuthenticated,
+      isAuthenticating,
+      isConnected,
+      setActiveWallet,
+      setHasStartedConnecting,
+      setIsAuthenticated,
+      setIsAuthenticating,
+      setIsConnected,
+      setUser,
+    ],
+  );
+
+  const logout = useCallback(
+    async (callback?: () => void) => {
+      if (activeWallet) {
+        debug("@@logout:activeWallet", activeWallet);
+        disconnect(activeWallet);
+        debug("@@logout:activeWallet", activeWallet);
+      }
+
+      // Log out of each wallet
+      wallets.forEach(wallet => {
+        console.log("@@logging out", wallet);
+        disconnect(wallet);
+      });
+
+      // Delete localStorage thirdweb:connected-wallet-ids
+      // https://npc-labs.slack.com/archives/C070E6HNG85/p1750185115273099
+      if (typeof localStorage !== "undefined") {
+        localStorage.removeItem("thirdweb:connected-wallet-ids");
+        localStorage.removeItem("wagmi.store");
+        localStorage.removeItem("lastAuthProvider");
+        localStorage.removeItem("b3-user");
+      }
+
+      app.logout();
+      debug("@@logout:loggedOut");
+
+      setIsAuthenticated(false);
+      setIsConnected(false);
+      setUser();
+      callback?.();
+    },
+    [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected],
+  );
+
+  const { isLoading: useAutoConnectLoading } = useAutoConnect({
+    client,
+    wallets: [wallet],
+    onConnect,
+    onTimeout: () => {
+      logout().catch(error => {
+        debug("@@useAuth:logout on timeout failed", { error });
+      });
+    },
+  });
+
+  /**
+   * useAutoConnectLoading starts as false
+   */
+  useEffect(() => {
+    if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
+      setIsAuthenticating(false);
+    }
+    useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
+  }, [useAutoConnectLoading, hasStartedConnecting, setIsAuthenticating]);
+
+  const isReady = isAuthenticated && !isAuthenticating;
+
+  return {
+    authenticate,
+    reAuthenticate,
+    logout,
+    isAuthenticated,
+    isReady,
+    isConnecting,
+    isConnected,
+    wallet,
+    preAuthenticate,
+    connect: onConnect,
+    isAuthenticating,
+    onConnect,
+    user,
+    refetchUser: authenticateUser,
+    setUser,
+  };
+}

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

@@ -1,4 +1,4 @@
-import { useB3 } from "@b3dotfun/sdk/global-account/react";
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { useCallback } from "react";
 import {
   ClientType,
@@ -13,7 +13,7 @@ import {
  * Hook to access the current FeathersJS client and client management utilities
  */
 export function useClient() {
-  const { clientType } = useB3();
+  const { clientType } = useB3Config();
 
   const getCurrentClient = useCallback(() => {
     return getClient();

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

@@ -1,4 +1,4 @@
-import { useB3, useConnect } from "@b3dotfun/sdk/global-account/react";
+import { useB3Config, 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";
@@ -11,7 +11,7 @@ const debug = debugB3React("@@b3:useHandleConnectWithPrivy");
  * Currently, this is for the basement-privy strategy
  */
 export function useHandleConnectWithPrivy(chain?: Chain, onSuccess?: (account: Account) => void) {
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
   if (!chain) {
     throw new Error("Chain is required");
   }

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

@@ -1,7 +1,7 @@
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { getAuthToken } from "@b3dotfun/sdk/shared/utils/auth-token";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useCallback, useEffect, useState } from "react";
-import { useB3 } from "../components";
 import { notificationsAPI, UserData } from "../utils/notificationsAPI";
 import { useUserQuery } from "./useUserQuery";
 
@@ -56,7 +56,7 @@ export interface UseNotificationsReturn {
  */
 export function useNotifications(): UseNotificationsReturn {
   const { user } = useUserQuery();
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
   const [userData, setUserData] = useState<UserData | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);

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

@@ -1,10 +1,20 @@
+/**
+ * @deprecated This hook is deprecated. Use useAuth() with Turnkey authentication instead.
+ * This file is kept for backward compatibility but should not be used in new code.
+ */
 import app from "@b3dotfun/sdk/global-account/app";
 import debug from "@b3dotfun/sdk/shared/utils/debug";
 import { useCallback } from "react";
 import { Wallet } from "thirdweb/wallets";
 import { useSearchParam } from "./useSearchParamsSSR";
 
+/**
+ * @deprecated Use useAuth() with Turnkey authentication instead
+ */
 export function useTWAuth() {
+  console.warn(
+    "useTWAuth is deprecated. Please migrate to useAuth() with Turnkey authentication. See useTurnkeyAuth.ts for the new implementation.",
+  );
   const referralCode = useSearchParam("referralCode");
 
   const authenticate = useCallback(

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

@@ -1,12 +1,12 @@
 "use client";
 
 import { isNativeToken } from "@b3dotfun/sdk/anyspend";
-import { useB3, useAccountWallet } from "@b3dotfun/sdk/global-account/react";
+import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { useAccountWallet, useAuthStore } from "@b3dotfun/sdk/global-account/react";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import { getERC20Balances, getNativeTokenBalance } from "@b3dotfun/sdk/shared/utils/thirdweb-insights";
 import { useQuery } from "@tanstack/react-query";
 import { useEffect } from "react";
-import { components } from "@b3dotfun/sdk/anyspend/types/api";
 
 interface UseTokenBalanceProps {
   token: components["schemas"]["Token"];
@@ -20,7 +20,8 @@ export interface TokenBalanceResult {
 }
 
 export function useTokenBalance({ token, address }: UseTokenBalanceProps): TokenBalanceResult {
-  const { ready } = useB3();
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+
   const account = useAccountWallet();
 
   const effectiveAddress = address || account?.address;
@@ -60,7 +61,7 @@ export function useTokenBalance({ token, address }: UseTokenBalanceProps): Token
       }
       return { formatted: "0", raw: null };
     },
-    enabled: ready && !!effectiveAddress,
+    enabled: isAuthenticated && !!effectiveAddress,
     staleTime: 30000,
     gcTime: 5 * 60 * 1000,
     retry: 2,
@@ -69,13 +70,13 @@ export function useTokenBalance({ token, address }: UseTokenBalanceProps): Token
 
   // Force a refetch when the wallet or token changes
   useEffect(() => {
-    if (ready && effectiveAddress) {
+    if (isAuthenticated && effectiveAddress) {
       refetch();
     }
-  }, [ready, effectiveAddress, token.address, token.chainId, token.symbol, refetch]);
+  }, [isAuthenticated, effectiveAddress, token.address, token.chainId, token.symbol, refetch]);
 
   // Determine if we're actually loading
-  const isActuallyLoading = !ready || !effectiveAddress || isLoading || (isFetching && !tokenBalance);
+  const isActuallyLoading = !isAuthenticated || !effectiveAddress || isLoading || (isFetching && !tokenBalance);
 
   return {
     rawBalance: tokenBalance?.raw || BigInt(0),

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

@@ -6,8 +6,8 @@ import { useQuery } from "@tanstack/react-query";
 import { viemToThirdwebChain } from "@b3dotfun/sdk/shared/constants/chains/b3Chain";
 import { getChainById } from "@b3dotfun/sdk/shared/utils/chains";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
-import { getWalletBalance } from "thirdweb/wallets";
 import invariant from "invariant";
+import { getWalletBalance } from "thirdweb/wallets";
 
 type GetWalletBalanceResult = {
   value: bigint;
@@ -83,7 +83,9 @@ export function useTokenBalancesByChain({
     staleTime: 30000, // Consider data fresh for 30 seconds
     gcTime: 5 * 60 * 1000, // Keep in cache for 5 minutes
     retry: 2, // Limit retries on failure
-    structuralSharing: false,
+    // Enable structural sharing to prevent infinite loops
+    // This ensures we only get new references when data actually changes
+    structuralSharing: true,
   });
 
   return {

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

@@ -4,7 +4,7 @@ import { useCallback, useState } from "react";
 import app from "../../app";
 import { useB3Config } from "../components";
 import { useAuthStore } from "../stores";
-import { useAuthentication } from "./useAuthentication";
+import { useAuth } from "./useAuth";
 
 const debug = debugB3React("useTurnkeyAuth");
 
@@ -34,12 +34,15 @@ export function useTurnkeyAuth(): UseTurnkeyAuthReturn {
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
   const { partnerId } = useB3Config();
-  const { user } = useAuthentication(partnerId);
+  const { authenticate } = useAuth();
 
   /**
    * Step 1: Initiate login with email
-   * - Calls backend to create sub-org (if needed) and send OTP
+   * - Calls backend turnkey-jwt strategy (init action) to create sub-org (if needed) and send OTP
    * - Returns otpId to use in verification step
+   *
+   * Note: Uses the turnkey-jwt authentication strategy, not the service directly.
+   * The turnkey-jwt strategy handles both OTP flow (init/verify) and final authentication.
    */
   const initiateLogin = useCallback(
     async (email: string): Promise<TurnkeyAuthInitResponse> => {
@@ -48,20 +51,44 @@ export function useTurnkeyAuth(): UseTurnkeyAuthReturn {
       setIsAuthenticating(true);
 
       try {
-        if (!user?.userId) {
-          throw new Error("User ID is required to initiate Turnkey login.");
-        }
         debug(`Initiating login for: ${email}`);
 
-        // Call FeathersJS service to initialize OTP
-        const data: TurnkeyAuthInitResponse = await app.service("turnkey-auth").init({ email, userId: user.userId });
+        // Use authentication service with turnkey-jwt strategy (init action)
+        // userId is resolved from authentication context on the backend (params.user.userId)
+        // Backend will get userId from _params.user?.userId if authenticated, or handle unauthenticated case
+        // So we only need to send email
+        debug(`Calling app.authenticate with turnkey-jwt strategy (init action)`, { email });
+
+        const response = await app.authenticate({
+          strategy: "turnkey-jwt",
+          action: "init",
+          email,
+        } as any);
+
+        // The strategy returns the TurnkeyAuthInitResponse directly
+        const data = response as unknown as TurnkeyAuthInitResponse;
 
         debug(`OTP initialized successfully. OtpId: ${data.otpId}`);
 
         return data;
       } catch (err: any) {
         debug("Error initiating login:", err);
-        const errorMessage = err.message || "Failed to send OTP email. Please try again.";
+
+        // Provide more detailed error information
+        let errorMessage = "Failed to send OTP email. Please try again.";
+
+        if (err.message) {
+          errorMessage = err.message;
+        } else if (err.name === "TypeError" && err.message?.includes("fetch")) {
+          errorMessage = "Network error: Unable to reach the server. Please check your connection and try again.";
+        } else if (err.code === "ECONNREFUSED" || err.code === "ENOTFOUND") {
+          errorMessage = "Connection error: Unable to reach the server. Please check your internet connection.";
+        } else if (err.response) {
+          // FeathersJS error response
+          errorMessage = err.response.message || err.message || errorMessage;
+          debug("FeathersJS error response:", err.response);
+        }
+
         setError(errorMessage);
         throw err;
       } finally {
@@ -69,13 +96,13 @@ export function useTurnkeyAuth(): UseTurnkeyAuthReturn {
         setIsAuthenticating(false);
       }
     },
-    [user, setIsAuthenticating],
+    [setIsAuthenticating],
   );
 
   /**
    * Step 2: Verify OTP and authenticate
-   * - Verifies OTP with backend
-   * - Gets Turnkey session JWT
+   * - Verifies OTP with backend via turnkey-jwt strategy (verify action)
+   * - Gets Turnkey session JWT from the verify response
    * - Authenticates with b3-api using "turnkey-jwt" strategy
    * - JWT automatically stored in cookies by SDK
    */
@@ -86,22 +113,26 @@ export function useTurnkeyAuth(): UseTurnkeyAuthReturn {
       setIsAuthenticating(true);
 
       try {
-        debug(`Verifying OTP...`, { userId: user?.userId });
+        debug(`Verifying OTP...`, { otpId });
 
-        // Step 1: Verify OTP and get Turnkey session JWT
-        const { turnkeySessionJwt }: TurnkeyVerifyResponse = await app.service("turnkey-auth").verify({
+        // Step 1: Verify OTP with backend using turnkey-jwt strategy (verify action)
+        // This returns the Turnkey session JWT
+        const response = await app.authenticate({
+          strategy: "turnkey-jwt",
+          action: "verify",
           otpId,
           otpCode,
-        });
+        } as any);
 
-        debug(`OTP verified! Authenticating with b3-api...`);
+        // The strategy returns the TurnkeyAuthVerifyResponse directly
+        const verifyResult = response as unknown as TurnkeyVerifyResponse;
+        const { turnkeySessionJwt } = verifyResult;
+
+        debug(`OTP verified! Got Turnkey session JWT. Authenticating with b3-api...`);
 
         // Step 2: Authenticate with b3-api using Turnkey JWT
-        // The SDK will automatically store the b3-api JWT in cookies
-        const authResult = await app.authenticate({
-          strategy: "turnkey-jwt",
-          accessToken: turnkeySessionJwt,
-        } as any);
+        // Use the unified useAuth hook for authentication with "turnkey-jwt" strategy
+        const authResult = await authenticate(turnkeySessionJwt, partnerId || "");
 
         debug(`Successfully authenticated with b3-api!`, authResult);
 
@@ -123,7 +154,7 @@ export function useTurnkeyAuth(): UseTurnkeyAuthReturn {
         setIsAuthenticating(false);
       }
     },
-    [user, setIsAuthenticating, setIsAuthenticated],
+    [partnerId, setIsAuthenticating, setIsAuthenticated, authenticate],
   );
 
   const clearError = useCallback(() => {

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

@@ -0,0 +1,20 @@
+import { useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import { useUserStore } from "../stores/userStore";
+
+/**
+ * Preferred Hook to get the user data
+ */
+export function useUser() {
+  const user = useUserStore(state => state.user);
+
+  const isConnecting = useAuthStore(state => state.isConnecting);
+  const isConnected = useAuthStore(state => state.isConnected);
+  const isAuthenticating = useAuthStore(state => state.isAuthenticating);
+
+  return {
+    user,
+    isConnecting,
+    isConnected,
+    isAuthenticating,
+  };
+}