@b3dotfun/sdk 0.0.83-test.0 → 0.0.84-alpha.0

package/src/anyspend/utils/token.ts

@@ -1,9 +1,12 @@
-import { avalanche, bsc, polygon } from "viem/chains";
-import { RELAY_ETH_ADDRESS, RELAY_SOL_ADDRESS, RELAY_SOLANA_MAINNET_CHAIN_ID } from "@b3dotfun/sdk/anyspend/constants";
+import { RELAY_SOL_ADDRESS, RELAY_SOLANA_MAINNET_CHAIN_ID, ZERO_ADDRESS } from "@b3dotfun/sdk/anyspend/constants";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { avalanche, bsc, polygon } from "viem/chains";
+
+export const HYPERLIQUID_CHAIN_ID = 1337;
+export const HYPEREVM_CHAIN_ID = 999;
 
 export function isNativeToken(address: string): boolean {
-  return address.toLowerCase() === RELAY_ETH_ADDRESS || address.toLowerCase() === RELAY_SOL_ADDRESS;
+  return address.toLowerCase() === ZERO_ADDRESS || address.toLowerCase() === RELAY_SOL_ADDRESS;
 }
 
 export function getSolanaToken(): components["schemas"]["Token"] {
@@ -22,7 +25,7 @@ export function getSolanaToken(): components["schemas"]["Token"] {
 export function getEthToken(chainId: number): components["schemas"]["Token"] {
   return {
     chainId: chainId,
-    address: RELAY_ETH_ADDRESS,
+    address: ZERO_ADDRESS,
     symbol: "ETH",
     name: "Ethereum",
     decimals: 18,
@@ -35,7 +38,7 @@ export function getEthToken(chainId: number): components["schemas"]["Token"] {
 export function getPolToken(): components["schemas"]["Token"] {
   return {
     chainId: polygon.id,
-    address: RELAY_ETH_ADDRESS,
+    address: ZERO_ADDRESS,
     symbol: "POL",
     name: "Polygon",
     decimals: 18,
@@ -48,7 +51,7 @@ export function getPolToken(): components["schemas"]["Token"] {
 export function getBnbToken(): components["schemas"]["Token"] {
   return {
     chainId: bsc.id,
-    address: RELAY_ETH_ADDRESS,
+    address: ZERO_ADDRESS,
     symbol: "BNB",
     name: "BNB",
     decimals: 18,
@@ -61,7 +64,7 @@ export function getBnbToken(): components["schemas"]["Token"] {
 export function getAvaxToken(): components["schemas"]["Token"] {
   return {
     chainId: avalanche.id,
-    address: RELAY_ETH_ADDRESS,
+    address: ZERO_ADDRESS,
     symbol: "AVAX",
     name: "AVAX",
     decimals: 18,
@@ -70,3 +73,29 @@ export function getAvaxToken(): components["schemas"]["Token"] {
     },
   };
 }
+
+export function getHyperEVMNativeToken(): components["schemas"]["Token"] {
+  return {
+    chainId: HYPEREVM_CHAIN_ID,
+    address: ZERO_ADDRESS,
+    symbol: "HYPE",
+    name: "HYPE",
+    decimals: 18,
+    metadata: {
+      logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/32196.png",
+    },
+  };
+}
+
+export function getHyperliquidUSDCToken(): components["schemas"]["Token"] {
+  return {
+    chainId: HYPERLIQUID_CHAIN_ID,
+    address: ZERO_ADDRESS,
+    symbol: "USDC",
+    name: "USD Coin",
+    decimals: 6,
+    metadata: {
+      logoURI: "https://ethereum-optimism.github.io/data/USDC/logo.png",
+    },
+  };
+}

package/src/global-account/react/components/B3Provider/B3Provider.tsx

@@ -12,7 +12,7 @@ import { loadGA4Script } from "@b3dotfun/sdk/global-account/utils/analytics";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import {
   getLastAuthProvider,
   ThirdwebProvider,
@@ -92,7 +92,11 @@ export function B3Provider({
   useEffect(() => {
     setClientType(clientType);
   }, [clientType]);
-  const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors });
+
+  const wagmiConfig = useMemo(
+    () => createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors }),
+    [partnerId, rpcUrls, connectors, overrideDefaultConnectors],
+  );
 
   return (
     <ThirdwebProvider>

package/src/global-account/react/components/SignInWithB3/SignIn.tsx

@@ -13,8 +13,7 @@ import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { cn, truncateAddress } from "@b3dotfun/sdk/shared/utils";
 import { Menu, MenuButton, MenuItems, Transition } from "@headlessui/react";
 import { ReactNode, useEffect } from "react";
-import { useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
-import { useAccountWalletImage } from "../../hooks/useAccountWallet";
+import { useConnectedWallets, useSetActiveWallet, useWalletImage } from "thirdweb/react";
 import { ManageAccountButton } from "../custom/ManageAccountButton";
 
 type SignInProps = {
@@ -40,9 +39,10 @@ export function SignIn(props: SignInWithB3Props) {
     isActiveSmartWallet,
     isActiveEOAWallet,
     smartWalletIcon,
-    eoaWalletIcon,
   } = useAccountWallet();
 
+  const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
+
   const isMobile = useIsMobile();
   const { logout } = useAuthentication(partnerId);
   const onDisconnect = async (): Promise<void> => {
@@ -72,8 +72,6 @@ export function SignIn(props: SignInWithB3Props) {
     }
   }, [connectedEOAWallet, isActiveEOAWallet, setActiveWallet, automaticallySetFirstEoa]);
 
-  const walletImage = useAccountWalletImage();
-
   // Desktop version - original dropdown menu
   return (
     <StyleRoot>
@@ -115,7 +113,7 @@ export function SignIn(props: SignInWithB3Props) {
                       <div className="flex items-center">
                         <img
                           className="bg-b3-react-primary h-16 w-16 rounded-full opacity-100"
-                          src={eoaWalletIcon}
+                          src={walletImage}
                           alt={connectedEOAWallet?.id}
                         />
                         <div className="ml-4 grow">

package/src/global-account/react/components/SignInWithB3/SignInWithB3Flow.tsx

@@ -10,7 +10,6 @@ import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import { Account } from "thirdweb/wallets";
-import { TurnkeyAuthModal } from "../TurnkeyAuthModal";
 import { SignInWithB3Privy } from "./SignInWithB3Privy";
 import { LoginStep, LoginStepContainer } from "./steps/LoginStep";
 import { LoginStepCustom } from "./steps/LoginStepCustom";
@@ -41,9 +40,7 @@ export function SignInWithB3Flow({
   const account = useActiveAccount();
   const isAuthenticating = useAuthStore(state => state.isAuthenticating);
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-  const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
   const isConnected = useAuthStore(state => state.isConnected);
-  const setIsConnected = useAuthStore(state => state.setIsConnected);
   const setJustCompletedLogin = useAuthStore(state => state.setJustCompletedLogin);
   const [refetchCount, setRefetchCount] = useState(0);
   const [refetchError, setRefetchError] = useState<string | null>(null);
@@ -157,11 +154,6 @@ export function SignInWithB3Flow({
       await refetchUser();
       debug("User refetched successfully");
 
-      // Set authentication and connection state so UI updates properly
-      setIsAuthenticated(true);
-      setIsConnected(true);
-      setJustCompletedLogin(true);
-
       // After user data is refreshed, close Turnkey modal and go back to sign-in flow
       debug("Switching back to signInWithB3 modal");
       setB3ModalContentType({
@@ -192,9 +184,6 @@ export function SignInWithB3Flow({
       closeAfterLogin,
       source,
       signersEnabled,
-      setIsAuthenticated,
-      setIsConnected,
-      setJustCompletedLogin,
     ],
   );
 
@@ -351,76 +340,32 @@ export function SignInWithB3Flow({
         <div className="p-4 text-center text-red-500">{refetchError}</div>
       </LoginStepContainer>
     );
+  } else if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+    content = (
+      <LoginStepContainer partnerId={partnerId}>
+        <div className="my-8 flex min-h-[350px] items-center justify-center">
+          <Loading variant="white" size="lg" />
+        </div>
+      </LoginStepContainer>
+    );
   } else if (step === "login") {
-    // PRIORITY: If Turnkey is enabled, show Turnkey modal FIRST as the primary authentication option
-    // Show Turnkey when enabled and not already completed in this session
-    const shouldShowTurnkeyFirst = enableTurnkey && !turnkeyAuthCompleted;
-
-    if (shouldShowTurnkeyFirst) {
-      // Don't show loading spinner for Turnkey - let the modal handle its own loading state
-      // This prevents the infinite loop where isAuthenticating causes the modal to be replaced
-      debug("Showing Turnkey as primary authentication option", {
-        enableTurnkey,
-        turnkeyAuthCompleted,
-        isAuthenticated,
-      });
-      // Show Turnkey authentication as primary option
+    // Custom strategy
+    if (strategies?.[0] === "privy") {
+      content = <SignInWithB3Privy onSuccess={handleLoginSuccess} chain={chain} />;
+    } else if (strategies) {
+      // Strategies are explicitly provided
       content = (
-        <LoginStepContainer partnerId={partnerId}>
-          <TurnkeyAuthModal
-            onSuccess={async (authenticatedUser: any) => {
-              debug("Turnkey authentication successful in primary flow", { authenticatedUser });
-              setTurnkeyAuthCompleted(true);
-              // After Turnkey auth, refetch user to get the full user object
-              await refetchUser();
-              // User is now authenticated via Turnkey
-              // Set both isAuthenticated and isConnected to true so UI updates properly
-              // Wallet connection is optional and can happen later for signing transactions
-              setIsAuthenticated(true);
-              setIsConnected(true);
-              setJustCompletedLogin(true);
-              // Call the login success callback
-              onLoginSuccess?.({} as Account);
-            }}
-            onClose={() => {
-              // If user closes Turnkey modal, they can still use wallet connection as fallback
-              setTurnkeyAuthCompleted(true);
-            }}
-            initialEmail=""
-            skipToOtp={false}
-          />
-        </LoginStepContainer>
+        <LoginStepCustom
+          strategies={strategies}
+          chain={chain}
+          onSuccess={handleLoginSuccess}
+          onError={onError}
+          automaticallySetFirstEoa={!!automaticallySetFirstEoa}
+        />
       );
     } else {
-      // Show loading spinner only if not in Turnkey flow
-      if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
-        content = (
-          <LoginStepContainer partnerId={partnerId}>
-            <div className="my-8 flex min-h-[350px] items-center justify-center">
-              <Loading variant="white" size="lg" />
-            </div>
-          </LoginStepContainer>
-        );
-      } else {
-        // Custom strategy
-        if (strategies?.[0] === "privy") {
-          content = <SignInWithB3Privy onSuccess={handleLoginSuccess} chain={chain} />;
-        } else if (strategies) {
-          // Strategies are explicitly provided
-          content = (
-            <LoginStepCustom
-              strategies={strategies}
-              chain={chain}
-              onSuccess={handleLoginSuccess}
-              onError={onError}
-              automaticallySetFirstEoa={!!automaticallySetFirstEoa}
-            />
-          );
-        } else {
-          // Default to handle all strategies we support
-          content = <LoginStep chain={chain} onSuccess={handleLoginSuccess} onError={onError} />;
-        }
-      }
+      // Default to handle all strategies we support
+      content = <LoginStep chain={chain} onSuccess={handleLoginSuccess} onError={onError} />;
     }
   }
 

package/src/global-account/react/components/SignInWithB3/steps/LoginStep.tsx

@@ -40,7 +40,7 @@ export function LoginStepContainer({ children, partnerId }: LoginStepContainerPr
   const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
 
   return (
-    <div className="flex flex-col items-center justify-center pt-6">
+    <div className="bg-b3-react-background flex flex-col items-center justify-center pt-6">
       {partnerLogo && (
         <img src={partnerLogo} alt="Partner Logo" className="partner-logo mb-6 h-12 w-auto object-contain" />
       )}

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

@@ -3,11 +3,9 @@ export { useAccountAssets } from "./useAccountAssets";
 export { useAccountWallet } from "./useAccountWallet";
 export { useAddTWSessionKey } from "./useAddTWSessionKey";
 export { useAnalytics } from "./useAnalytics";
-export { useAuth } from "./useAuth";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
-export { useBestTransactionPath } from "./useBestTransactionPath";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction";
 export * from "./useClaim";
 export { useClient } from "./useClient";

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

@@ -1,7 +1,6 @@
 import { useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { getIpfsUrl } from "@b3dotfun/sdk/shared/utils/ipfs";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
@@ -44,7 +43,13 @@ export function useAccountWallet(): {
   eoaWalletIcon?: string;
   smartWalletIcon?: string;
 } {
-  const { account, user } = useB3();
+  // WOJ: --------------------
+  //  values from in useB3:
+  //  const activeAccount = useActiveAccount();
+  // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
+  // can we possibly just use useActiveAccount here?
+  // --------------------
+  const { account } = useB3();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();
@@ -61,8 +66,6 @@ export function useAccountWallet(): {
   debug("isActiveSmartWallet", isActiveSmartWallet);
   debug("isActiveEOAWallet", isActiveEOAWallet);
 
-  const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
-
   // If not EOA sign in, then we need to show the smart wallet icon
   const lastAuthProvider = useLastAuthProvider();
 
@@ -73,7 +76,6 @@ export function useAccountWallet(): {
 
   const { data: profileData } = useProfile({ address: account?.address });
   const ensName = profileData?.displayName?.replace(/\.b3\.fun/g, "");
-  const avatarUrl = user?.avatar ? getIpfsUrl(user?.avatar) : profileData?.avatar;
 
   const res = useMemo(
     () => ({
@@ -81,7 +83,7 @@ export function useAccountWallet(): {
         ...account,
         ensName,
         meta: {
-          icon: avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "",
+          icon: "", // deprecated
         },
       },
 
@@ -95,18 +97,16 @@ export function useAccountWallet(): {
       isActiveEOAWallet: isActiveEOAWallet,
 
       smartWalletIcon: smartWalletIcon,
-      eoaWalletIcon: walletImage,
+      eoaWalletIcon: "", // deprecated
     }),
     [
       account,
-      avatarUrl,
       connectedEOAWallet,
       connectedSmartWallet,
       ensName,
       isActiveEOAWallet,
       isActiveSmartWallet,
       smartWalletIcon,
-      walletImage,
     ],
   );
 
@@ -114,7 +114,7 @@ export function useAccountWallet(): {
 }
 
 export function useAccountWalletImage(): string {
-  const { account, user } = useB3();
+  const { account } = useB3();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();
@@ -134,7 +134,8 @@ export function useAccountWalletImage(): string {
       : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
 
   const { data: profileData } = useProfile({ address: account?.address });
-  const avatarUrl = user?.avatar || profileData?.avatar;
+
+  const avatarUrl = profileData?.avatar;
 
   return avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "";
 }

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

@@ -19,7 +19,7 @@ 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 { useAuth } from "./useAuth";
+import { useTWAuth } from "./useTWAuth";
 import { useUserQuery } from "./useUserQuery";
 
 const debug = debugB3React("useAuthentication");
@@ -39,7 +39,7 @@ export function useAuthentication(partnerId: string) {
   const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
   const setActiveWallet = useSetActiveWallet();
   const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
-  const { reAuthenticate } = useAuth();
+  const { authenticate } = useTWAuth();
   const { user, setUser } = useUserQuery();
   const useAutoConnectLoadingPrevious = useRef(false);
   const wagmiConfig = createWagmiConfig({ partnerId });
@@ -106,104 +106,49 @@ export function useAuthentication(partnerId: string) {
     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]);
-
-  /**
-   * 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("@@useAuthentication:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
-
-      const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
+  const authenticateUser = useCallback(
+    async (wallet?: Wallet) => {
+      setHasStartedConnecting(true);
 
       if (!wallet) {
-        throw new Error("No smart wallet found during auto-connect");
+        throw new Error("No wallet found during auto-connect");
       }
 
-      debug("@@useAuthentication:onConnect", { wallet });
+      const account = wallet ? wallet.getAccount() : activeWallet?.getAccount();
+      if (!account) {
+        throw new Error("No account found during auto-connect");
+      }
 
+      // Try to re-authenticate first
       try {
-        setHasStartedConnecting(true);
-        setIsConnected(true);
-        setIsAuthenticating(true);
-        await setActiveWallet(wallet);
+        const userAuth = await app.reAuthenticate();
+        setUser(userAuth.user);
+        setIsAuthenticated(true);
+        setIsAuthenticating(false);
+        debug("Re-authenticated successfully", { userAuth });
 
-        // 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();
+        // Authenticate on BSMNT with B3 JWT
+        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+        debug("@@b3Jwt", b3Jwt);
 
-          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("@@useAuthentication:onConnect:authFailed", { authError });
-          // Don't set isAuthenticated to false here - let the Turnkey flow handle it
-        }
+        return userAuth;
       } catch (error) {
-        debug("@@useAuthentication:onConnect:failed", { error });
-        setIsAuthenticated(false);
-        setUser(undefined);
-      } finally {
+        // If re-authentication fails, try fresh authentication
+        debug("Re-authentication failed, attempting fresh authentication");
+        const userAuth = await authenticate(wallet, partnerId);
+        setUser(userAuth.user);
+        setIsAuthenticated(true);
         setIsAuthenticating(false);
-      }
+        debug("Fresh authentication successful", { userAuth });
 
-      debug({
-        isAuthenticated,
-        isAuthenticating,
-        isConnected,
-      });
+        // Authenticate on BSMNT with B3 JWT
+        const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+        debug("@@b3Jwt", b3Jwt);
+
+        return userAuth;
+      }
     },
-    [
-      onConnectCallback,
-      authenticateUser,
-      isAuthenticated,
-      isAuthenticating,
-      isConnected,
-      setActiveWallet,
-      setHasStartedConnecting,
-      setIsAuthenticated,
-      setIsAuthenticating,
-      setIsConnected,
-      setUser,
-    ],
+    [activeWallet, partnerId, authenticate, setIsAuthenticated, setIsAuthenticating, setUser, setHasStartedConnecting],
   );
 
   const logout = useCallback(
@@ -240,6 +185,58 @@ export function useAuthentication(partnerId: string) {
     [activeWallet, disconnect, wallets, setIsAuthenticated, setUser, setIsConnected],
   );
 
+  const onConnect = useCallback(
+    async (_walleAutoConnectedWith: Wallet, allConnectedWallets: Wallet[]) => {
+      debug("@@useAuthentication:onConnect", { _walleAutoConnectedWith, allConnectedWallets });
+      try {
+        const wallet = allConnectedWallets.find(wallet => wallet.id.startsWith("ecosystem."));
+
+        if (!wallet) {
+          throw new Error("No smart wallet found during auto-connect");
+        }
+
+        debug("@@useAuthentication:onConnect", { wallet });
+        setHasStartedConnecting(true);
+        setIsConnected(true);
+        setIsAuthenticating(true);
+        await setActiveWallet(wallet);
+        const userAuth = await authenticateUser(wallet);
+
+        if (userAuth && onConnectCallback) {
+          await onConnectCallback(wallet, userAuth.accessToken);
+        }
+      } catch (error) {
+        debug("@@useAuthentication:onConnect:failed", { error });
+        setIsAuthenticated(false);
+        setUser(undefined);
+
+        await logout();
+      } finally {
+        setIsAuthenticating(false);
+      }
+
+      debug({
+        isAuthenticated,
+        isAuthenticating,
+        isConnected,
+      });
+    },
+    [
+      isAuthenticated,
+      isAuthenticating,
+      isConnected,
+      setHasStartedConnecting,
+      setIsConnected,
+      setIsAuthenticating,
+      setActiveWallet,
+      authenticateUser,
+      onConnectCallback,
+      setIsAuthenticated,
+      setUser,
+      logout,
+    ],
+  );
+
   const { isLoading: useAutoConnectLoading } = useAutoConnect({
     client,
     wallets: [wallet],

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

@@ -1,20 +1,10 @@
-/**
- * @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(