@b3dotfun/sdk 0.0.87 → 0.0.88

package/src/anyspend/react/components/icons/qr-code.svg

@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0.5H32C36.1421 0.5 39.5 3.85786 39.5 8V32C39.5 36.1421 36.1421 39.5 32 39.5H8C3.85786 39.5 0.5 36.1421 0.5 32V8C0.5 3.85786 3.85786 0.5 8 0.5Z" fill="#F4F4F5"/>
+<path d="M8 0.5H32C36.1421 0.5 39.5 3.85786 39.5 8V32C39.5 36.1421 36.1421 39.5 32 39.5H8C3.85786 39.5 0.5 36.1421 0.5 32V8C0.5 3.85786 3.85786 0.5 8 0.5Z" stroke="#E4E4E7"/>
+<path d="M15 20H20V25M11.01 20H11M16.01 25H16M20.01 29H20M29.01 20H29M11 25H12.5M23.5 20H25.5M11 29H16M20 10V16M25.6 29H27.4C27.9601 29 28.2401 29 28.454 28.891C28.6422 28.7951 28.7951 28.6422 28.891 28.454C29 28.2401 29 27.9601 29 27.4V25.6C29 25.0399 29 24.7599 28.891 24.546C28.7951 24.3578 28.6422 24.2049 28.454 24.109C28.2401 24 27.9601 24 27.4 24H25.6C25.0399 24 24.7599 24 24.546 24.109C24.3578 24.2049 24.2049 24.3578 24.109 24.546C24 24.7599 24 25.0399 24 25.6V27.4C24 27.9601 24 28.2401 24.109 28.454C24.2049 28.6422 24.3578 28.7951 24.546 28.891C24.7599 29 25.0399 29 25.6 29ZM25.6 16H27.4C27.9601 16 28.2401 16 28.454 15.891C28.6422 15.7951 28.7951 15.6422 28.891 15.454C29 15.2401 29 14.9601 29 14.4V12.6C29 12.0399 29 11.7599 28.891 11.546C28.7951 11.3578 28.6422 11.2049 28.454 11.109C28.2401 11 27.9601 11 27.4 11H25.6C25.0399 11 24.7599 11 24.546 11.109C24.3578 11.2049 24.2049 11.3578 24.109 11.546C24 11.7599 24 12.0399 24 12.6V14.4C24 14.9601 24 15.2401 24.109 15.454C24.2049 15.6422 24.3578 15.7951 24.546 15.891C24.7599 16 25.0399 16 25.6 16ZM12.6 16H14.4C14.9601 16 15.2401 16 15.454 15.891C15.6422 15.7951 15.7951 15.6422 15.891 15.454C16 15.2401 16 14.9601 16 14.4V12.6C16 12.0399 16 11.7599 15.891 11.546C15.7951 11.3578 15.6422 11.2049 15.454 11.109C15.2401 11 14.9601 11 14.4 11H12.6C12.0399 11 11.7599 11 11.546 11.109C11.3578 11.2049 11.2049 11.3578 11.109 11.546C11 11.7599 11 12.0399 11 12.6V14.4C11 14.9601 11 15.2401 11.109 15.454C11.2049 15.6422 11.3578 15.7951 11.546 15.891C11.7599 16 12.0399 16 12.6 16Z" stroke="#51525C" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

package/src/anyspend/react/components/index.ts

@@ -5,6 +5,8 @@ export { AnySpendBuySpin } from "./AnySpendBuySpin";
 export { AnySpendCollectorClubPurchase } from "./AnySpendCollectorClubPurchase";
 export { AnySpendCustom } from "./AnySpendCustom";
 export { AnySpendCustomExactIn } from "./AnySpendCustomExactIn";
+export { AnySpendDeposit } from "./AnySpendDeposit";
+export type { AnySpendDepositProps, ChainConfig, DepositContractConfig } from "./AnySpendDeposit";
 export { AnySpendDepositHype, HYPE_TOKEN_DETAILS } from "./AnyspendDepositHype";
 export * from "./AnySpendFingerprintWrapper";
 export { AnySpendNFT } from "./AnySpendNFT";

package/src/anyspend/react/hooks/index.ts

@@ -1,5 +1,6 @@
 export * from "./useAnyspendCreateOnrampOrder";
 export * from "./useAnyspendCreateOrder";
+export * from "./useCreateDepositFirstOrder";
 export * from "./useAnyspendOrderAndTransactions";
 export * from "./useAnyspendOrderHistory";
 export * from "./useAnyspendQuote";

package/src/anyspend/react/hooks/useAnyspendFlow.ts

@@ -21,6 +21,7 @@ import { useEffect, useMemo, useState } from "react";
 import { parseUnits } from "viem";
 import { base, mainnet } from "viem/chains";
 import { components } from "../../types/api";
+import { GetQuoteRequest } from "../../types/api_req_res";
 import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
 import { FiatPaymentMethod } from "../components/common/FiatPaymentMethod";
 import { useAutoSelectCryptoPaymentMethod } from "./useAutoSelectCryptoPaymentMethod";
@@ -52,7 +53,7 @@ interface UseAnyspendFlowProps {
   destinationTokenChainId?: number;
   slippage?: number;
   disableUrlParamManagement?: boolean;
-  orderType?: "hype_duel" | "custom_exact_in";
+  orderType?: "hype_duel" | "custom_exact_in" | "swap";
 }
 
 // This hook serves for order hype_duel and custom_exact_in
@@ -60,7 +61,6 @@ export function useAnyspendFlow({
   paymentType = "crypto",
   recipientAddress,
   loadOrder,
-  isDepositMode = false,
   onOrderSuccess,
   onTransactionSuccess,
   sourceTokenAddress,
@@ -199,16 +199,41 @@ export function useAnyspendFlow({
   // For fiat payments, always use USDC decimals (6) regardless of selectedSrcToken
   const effectiveDecimals = paymentType === "fiat" ? USDC_BASE.decimals : selectedSrcToken.decimals;
   const activeInputAmountInWei = parseUnits(srcAmount.replace(/,/g, ""), effectiveDecimals).toString();
-  const { anyspendQuote, isLoadingAnyspendQuote, getAnyspendQuoteError } = useAnyspendQuote({
-    srcChain: paymentType === "fiat" ? base.id : selectedSrcChainId,
-    dstChain: isDepositMode ? base.id : selectedDstChainId, // For deposits, always Base; for swaps, use selected destination
-    srcTokenAddress: paymentType === "fiat" ? USDC_BASE.address : selectedSrcToken.address,
-    dstTokenAddress: selectedDstToken.address,
-    type: orderType,
-    amount: activeInputAmountInWei,
-    recipientAddress: effectiveRecipientAddress,
-    onrampVendor: paymentType === "fiat" ? getOnrampVendor(selectedFiatPaymentMethod) : undefined,
-  });
+
+  // Build quote request based on order type
+  const quoteRequest: GetQuoteRequest = (() => {
+    const baseParams = {
+      srcChain: paymentType === "fiat" ? base.id : selectedSrcChainId,
+      dstChain: selectedDstChainId ?? base.id,
+      srcTokenAddress: paymentType === "fiat" ? USDC_BASE.address : selectedSrcToken.address,
+      dstTokenAddress: selectedDstToken.address,
+      recipientAddress: effectiveRecipientAddress,
+      onrampVendor: paymentType === "fiat" ? getOnrampVendor(selectedFiatPaymentMethod) : undefined,
+    };
+
+    if (orderType === "swap") {
+      return {
+        ...baseParams,
+        type: "swap" as const,
+        tradeType: "EXACT_INPUT" as const,
+        amount: activeInputAmountInWei,
+      };
+    } else if (orderType === "hype_duel") {
+      return {
+        ...baseParams,
+        type: "hype_duel" as const,
+        amount: activeInputAmountInWei,
+      };
+    } else {
+      return {
+        ...baseParams,
+        type: "custom_exact_in" as const,
+        amount: activeInputAmountInWei,
+      };
+    }
+  })();
+
+  const { anyspendQuote, isLoadingAnyspendQuote, getAnyspendQuoteError } = useAnyspendQuote(quoteRequest);
 
   // Get geo options for fiat
   const { geoData, coinbaseAvailablePaymentMethods, stripeWeb2Support } = useGeoOnrampOptions(

package/src/anyspend/react/hooks/useCreateDepositFirstOrder.ts

@@ -0,0 +1,110 @@
+import { anyspendService } from "@b3dotfun/sdk/anyspend/services/anyspend";
+import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
+import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
+import { useB3 } from "@b3dotfun/sdk/global-account/react";
+import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
+import { useMutation } from "@tanstack/react-query";
+import { useMemo } from "react";
+import { DepositContractConfig } from "../components/AnySpendDeposit";
+
+export type CreateDepositFirstOrderParams = {
+  recipientAddress: string;
+  srcChain: number;
+  dstChain: number;
+  srcToken: components["schemas"]["Token"];
+  dstToken: components["schemas"]["Token"];
+  creatorAddress?: string;
+  /** Optional contract config for custom execution after deposit */
+  contractConfig?: DepositContractConfig;
+};
+
+export type UseCreateDepositFirstOrderProps = {
+  onSuccess?: (data: any) => void;
+  onError?: (error: Error) => void;
+};
+
+/**
+ * Hook for creating deposit_first orders in the Anyspend protocol.
+ * This order type doesn't require srcAmount - the user deposits tokens after the order is created.
+ */
+export function useCreateDepositFirstOrder({ onSuccess, onError }: UseCreateDepositFirstOrderProps = {}) {
+  const { partnerId } = useB3();
+
+  const { data: fpData } = useVisitorData({ extendedResult: true }, { immediate: true });
+  const visitorData: VisitorData | undefined = fpData && {
+    requestId: fpData.requestId,
+    visitorId: fpData.visitorId,
+  };
+
+  const { mutate: createOrder, isPending } = useMutation({
+    mutationFn: async (params: CreateDepositFirstOrderParams) => {
+      const { recipientAddress, srcChain, dstChain, srcToken, dstToken, creatorAddress, contractConfig } = params;
+
+      // Build payload based on whether we have a contract config
+      const payload = contractConfig
+        ? {
+            functionAbi: contractConfig.functionAbi,
+            functionName: contractConfig.functionName,
+            functionArgs: contractConfig.functionArgs,
+            to: normalizeAddress(contractConfig.to),
+            spenderAddress: contractConfig.spenderAddress ? normalizeAddress(contractConfig.spenderAddress) : undefined,
+            action: contractConfig.action,
+          }
+        : {};
+
+      try {
+        return await anyspendService.createOrder({
+          recipientAddress: normalizeAddress(recipientAddress),
+          type: "deposit_first",
+          srcChain,
+          dstChain,
+          srcTokenAddress: normalizeAddress(srcToken.address),
+          dstTokenAddress: normalizeAddress(dstToken.address),
+          srcAmount: "", // Not required for deposit_first
+          payload,
+          metadata: {
+            srcToken: {
+              chainId: srcToken.chainId,
+              address: srcToken.address,
+              symbol: srcToken.symbol,
+              name: srcToken.name,
+              decimals: srcToken.decimals,
+              metadata: srcToken.metadata || {},
+            },
+            dstToken: {
+              chainId: dstToken.chainId,
+              address: dstToken.address,
+              symbol: dstToken.symbol,
+              name: dstToken.name,
+              decimals: dstToken.decimals,
+              metadata: dstToken.metadata || {},
+            },
+          },
+          creatorAddress: creatorAddress ? normalizeAddress(creatorAddress) : undefined,
+          partnerId,
+          visitorData,
+        });
+      } catch (error: any) {
+        if (error?.data) {
+          throw error.data;
+        }
+        throw error;
+      }
+    },
+    onSuccess: (data: any) => {
+      onSuccess?.(data);
+    },
+    onError: (error: Error) => {
+      onError?.(error);
+    },
+  });
+
+  return useMemo(
+    () => ({
+      createOrder,
+      isCreatingOrder: isPending,
+    }),
+    [createOrder, isPending],
+  );
+}

package/src/anyspend/utils/format.ts

@@ -1,14 +1,29 @@
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 
 export const getStatusDisplay = (
   order: components["schemas"]["Order"],
 ): { text: string; status: "processing" | "success" | "failure"; description?: string } => {
+  const srcToken = order.metadata?.srcToken;
+  const dstToken = order.metadata?.dstToken;
+  const formattedSrcAmount = srcToken ? formatTokenAmount(BigInt(order.srcAmount), srcToken.decimals) : undefined;
+  const actualDstAmount = order.settlement?.actualDstAmount;
+  const formattedActualDstAmount =
+    actualDstAmount && dstToken ? formatTokenAmount(BigInt(actualDstAmount), dstToken.decimals) : undefined;
+
   switch (order.status) {
-    case "scanning_deposit_transaction":
+    case "scanning_deposit_transaction": {
+      const depositText =
+        formattedSrcAmount && srcToken
+          ? `Awaiting ${formattedSrcAmount} ${srcToken.symbol}`
+          : order.onrampMetadata
+            ? "Awaiting Payment"
+            : "Awaiting Deposit";
       return {
-        text: order.onrampMetadata ? "Awaiting Payment" : "Awaiting Deposit",
+        text: depositText,
         status: "processing",
       };
+    }
     case "waiting_stripe_payment":
       return {
         text: "Awaiting Payment",
@@ -34,16 +49,18 @@ export const getStatusDisplay = (
         description: "It will take approximately one minute to complete.",
       };
     case "executed": {
+      const receivedText =
+        formattedActualDstAmount && dstToken ? `Received ${formattedActualDstAmount} ${dstToken.symbol}` : undefined;
       const { text, description } =
         order.type === "swap"
-          ? { text: "Swap Complete", description: "Your swap has been completed successfully." }
+          ? { text: receivedText || "Swap Complete", description: "Your swap has been completed successfully." }
           : order.type === "mint_nft"
             ? { text: "NFT Minted", description: "Your NFT has been minted" }
             : order.type === "join_tournament"
               ? { text: "Tournament Joined", description: "You have joined the tournament" }
               : order.type === "fund_tournament"
                 ? { text: "Tournament Funded", description: "You have funded the tournament" }
-                : { text: "Order Complete", description: "Your order has been completed" };
+                : { text: receivedText || "Order Complete", description: "Your order has been completed" };
       return { text, status: "success", description };
     }
 
@@ -59,8 +76,19 @@ export const getStatusDisplay = (
         description: "This order has failed. Please try again or contact support.",
       };
 
+    case "quoting_after_deposit": {
+      return {
+        text: "Quoting After Deposit",
+        status: "processing",
+        description: "Getting quote for the order",
+      };
+    }
+
     default:
-      throw new Error("Invalid order status");
+      return {
+        text: order.status,
+        status: "processing",
+      };
   }
 };
 

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

@@ -1,7 +1,14 @@
 "use client";
 
 import app from "@b3dotfun/sdk/global-account/app";
-import { Button, IPFSMediaRenderer, toast, useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
+import {
+  Button,
+  IPFSMediaRenderer,
+  toast,
+  useAuthentication,
+  useB3Config,
+  useProfile,
+} from "@b3dotfun/sdk/global-account/react";
 import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profileDisplay";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
@@ -50,7 +57,8 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
   const [zoom, setZoom] = useState(1);
   const [croppedAreaPixels, setCroppedAreaPixels] = useState<Area | null>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
-  const { setUser, user, partnerId } = useB3();
+  const { partnerId } = useB3Config();
+  const { user, setUser } = useAuthentication(partnerId);
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
   const contentType = useModalStore(state => state.contentType);
 

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

@@ -6,7 +6,6 @@ import { Account, Wallet } from "thirdweb/wallets";
 import { ClientType } from "../../../client-manager";
 
 import { WagmiProvider } from "wagmi";
-import { useAuthentication } from "../../hooks/useAuthentication";
 import { createWagmiConfig } from "../../utils/createWagmiConfig";
 import { LocalSDKProvider } from "./LocalSDKProvider";
 import { B3Context, B3ContextType } from "./types";
@@ -89,7 +88,7 @@ export function InnerProvider({
   rpcUrls?: Record<number, string>;
 }) {
   const activeAccount = useActiveAccount();
-  const { user, setUser, refetchUser } = useAuthentication(partnerId);
+  //const { user, setUser, refetchUser } = useAuthentication(partnerId);
   const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls });
 
   // Use given accountOverride or activeAccount from thirdweb
@@ -100,12 +99,12 @@ export function InnerProvider({
       <QueryClientProvider client={queryClient}>
         <B3Context.Provider
           value={{
-            account: effectiveAccount,
+            //account: effectiveAccount,
             automaticallySetFirstEoa: false,
-            setWallet: () => {},
+            //setWallet: () => {},
             wallet: undefined,
-            user,
-            setUser,
+            //user,
+            //setUser,
             initialized: true,
             ready: !!effectiveAccount,
             environment,
@@ -113,7 +112,7 @@ export function InnerProvider({
             theme,
             clientType,
             partnerId,
-            refetchUser,
+            //refetchUser,
           }}
         >
           {children}

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

@@ -1,25 +1,14 @@
 import { CreateOnrampOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOrder";
-import {
-  RelayKitProviderWrapper,
-  TooltipProvider,
-  useAuthentication,
-  useAuthStore,
-} from "@b3dotfun/sdk/global-account/react";
+import { RelayKitProviderWrapper, TooltipProvider, useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import { useAutoSelectWallet } from "@b3dotfun/sdk/global-account/react/hooks/useAutoSelectWallet";
 import { createWagmiConfig } from "@b3dotfun/sdk/global-account/react/utils/createWagmiConfig";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 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, useMemo, useState } from "react";
-import {
-  getLastAuthProvider,
-  ThirdwebProvider,
-  useActiveAccount,
-  useConnectedWallets,
-  useSetActiveWallet,
-} from "thirdweb/react";
+import { useEffect, useMemo } from "react";
+import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 import { CreateConnectorFn, WagmiProvider } from "wagmi";
 import { ClientType, setClientType } from "../../../client-manager";
@@ -28,8 +17,6 @@ import { setToastContext, ToastProvider, useToastContext } from "../Toast/index"
 import { LocalSDKProvider } from "./LocalSDKProvider";
 import { B3Context, B3ContextType } from "./types";
 
-const debug = debugB3React("B3Provider");
-
 /**
  * Default permissions configuration for B3 provider
  */
@@ -164,66 +151,32 @@ export function InnerProvider({
   enableTurnkey?: boolean;
 }) {
   const activeAccount = useActiveAccount();
-  const [manuallySelectedWallet, setManuallySelectedWallet] = useState<Wallet | undefined>(undefined);
-  const wallets = useConnectedWallets();
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-  const isConnected = useAuthStore(state => state.isConnected);
-  const justCompletedLogin = useAuthStore(state => state.justCompletedLogin);
-  const setActiveWallet = useSetActiveWallet();
-  const { user, setUser, refetchUser } = useAuthentication(partnerId);
-
-  debug("@@B3Provider:isConnected", isConnected);
-  debug("@@wallets", wallets);
-  debug("@@B3Provider:user", user);
-  debug("@@B3Provider:justCompletedLogin", justCompletedLogin);
+  //const isConnected = useAuthStore(state => state.isConnected);
+  //const justCompletedLogin = useAuthStore(state => state.justCompletedLogin);
 
   // Use given accountOverride or activeAccount from thirdweb
+  // WOJ: why if isAuthenticated is false, we don't use activeAccount, which should be undefined?
+  // skip isAuthenticated check ?
   const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
 
-  const setWallet = useCallback(
-    (wallet: Wallet) => {
-      setManuallySelectedWallet(wallet);
-      const account = wallet.getAccount();
-      debug("@@setWallet", wallet.id, account?.address);
-      setActiveWallet(wallet);
-    },
-    [setManuallySelectedWallet, setActiveWallet],
-  );
-
-  useEffect(() => {
-    const autoSelectFirstEOAWallet = async () => {
-      // Only proceed if auto-selection is enabled and user is authenticated
-      if (!automaticallySetFirstEoa || !isAuthenticated) {
-        return;
-      }
-
-      // Find the first EOA wallet (excluding ecosystem wallets)
-      const isEOAWallet = (wallet: Wallet) => !wallet.id.startsWith("ecosystem.");
-      const firstEOAWallet = wallets.find(isEOAWallet);
-
-      if (firstEOAWallet) {
-        // Only auto-select if the last auth was via wallet or no previous auth provider
-        const lastAuthProvider = await getLastAuthProvider();
-        const shouldAutoSelect = lastAuthProvider === null || lastAuthProvider === "wallet";
-
-        if (shouldAutoSelect) {
-          setWallet(firstEOAWallet);
-        }
-      }
-    };
+  // Wrapper to set active wallet via thirdweb
+  // Note: `wallet` in context is deprecated - use useActiveWallet() from thirdweb/react instead
 
-    autoSelectFirstEOAWallet();
-  }, [automaticallySetFirstEoa, isAuthenticated, setWallet, wallets]);
+  // Auto-select first EOA wallet when enabled
+  useAutoSelectWallet({
+    enabled: automaticallySetFirstEoa,
+  });
 
   return (
     <B3Context.Provider
       value={{
         account: effectiveAccount,
-        setWallet,
-        wallet: manuallySelectedWallet,
-        user,
-        setUser,
-        refetchUser,
+        // setWallet,
+        //wallet: undefined, // Deprecated: use useActiveWallet() from thirdweb/react instead
+        //user,
+        //setUser,
+        //refetchUser,
         initialized: true,
         ready: !!effectiveAccount,
         automaticallySetFirstEoa,
@@ -237,15 +190,11 @@ export function InnerProvider({
         enableTurnkey,
       }}
     >
-      <InnerProvider2>{children}</InnerProvider2>
+      {children}
     </B3Context.Provider>
   );
 }
 
-const InnerProvider2 = ({ children }: { children: React.ReactNode }) => {
-  return <>{children}</>;
-};
-
 /**
  * Component to connect the toast context to the global toast API
  */

package/src/global-account/react/components/B3Provider/types.ts

@@ -1,4 +1,3 @@
-import { Users } from "@b3dotfun/b3-api";
 import { CreateOnrampOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOrder";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
@@ -12,11 +11,11 @@ import { ClientType } from "../../../client-manager";
 export interface B3ContextType {
   account?: Account;
   automaticallySetFirstEoa: boolean;
-  user?: Users;
-  setWallet: (wallet: Wallet) => void;
+  //user?: Users;
+  //setWallet: (wallet: Wallet) => void;
   wallet?: Wallet;
-  setUser: (user?: Users) => void;
-  refetchUser: () => Promise<any>;
+  //setUser: (user?: Users) => void;
+  //refetchUser: () => Promise<any>;
   initialized: boolean;
   ready: boolean;
   environment?: "development" | "production";
@@ -35,11 +34,11 @@ export interface B3ContextType {
 export const B3Context = createContext<B3ContextType>({
   account: undefined,
   automaticallySetFirstEoa: false,
-  user: undefined,
-  setWallet: () => {},
+  //user: undefined,
+  //setWallet: () => {},
   wallet: undefined,
-  setUser: () => {},
-  refetchUser: async () => {},
+  //setUser: () => {},
+  //refetchUser: async () => {},
   initialized: false,
   ready: false,
   environment: "development",

package/src/global-account/react/components/B3Provider/useB3.ts

@@ -4,6 +4,7 @@ import { B3Context } from "./types";
 /**
  * Hook to access the B3 context
  * @throws Error if used outside a B3Provider
+ * @deprecated Use useB3Config or useB3Account instead
  */
 export function useB3() {
   const context = useContext(B3Context);

package/src/global-account/react/components/B3Provider/useB3Account.ts

@@ -0,0 +1,7 @@
+import { useActiveAccount } from "thirdweb/react";
+
+// Wrapper around useActiveAccount
+export const useB3Account = () => {
+  const account = useActiveAccount();
+  return account;
+};

package/src/global-account/react/components/B3Provider/useB3Config.ts

@@ -0,0 +1,34 @@
+import { useContext, useMemo } from "react";
+import { B3Context } from "./types";
+
+export const useB3Config = () => {
+  const context = useContext(B3Context);
+
+  if (!context) {
+    throw new Error("useB3 must be used within a B3Provider");
+  }
+
+  const {
+    automaticallySetFirstEoa,
+    environment,
+    theme,
+    clientType,
+    partnerId,
+    createClientReferenceId,
+    enableTurnkey,
+  } = context;
+
+  // Return a stable reference
+  return useMemo(
+    () => ({
+      automaticallySetFirstEoa,
+      environment,
+      theme,
+      clientType,
+      partnerId,
+      createClientReferenceId,
+      enableTurnkey,
+    }),
+    [automaticallySetFirstEoa, environment, theme, clientType, partnerId, createClientReferenceId, enableTurnkey],
+  );
+};

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

@@ -3,7 +3,7 @@ import {
   Button,
   ManageAccountModalProps,
   toast,
-  useB3,
+  useAuthentication,
   useModalStore,
   useQueryB3,
 } from "@b3dotfun/sdk/global-account/react";
@@ -37,7 +37,7 @@ export const LinkAccount = ({
   const isLinking = useModalStore(state => state.isLinking);
   const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const contentType = useModalStore(state => state.contentType);
-  const { user, setUser } = useB3();
+  const { user, setUser } = useAuthentication(partnerId);
   const [isUpdatingCode, setIsUpdatingCode] = useState(false);
   const [newReferralCode, setNewReferralCode] = useState("");
   const [isEditingCode, setIsEditingCode] = useState(false);

package/src/global-account/react/components/LinkAccount/LinkNewAccount.tsx

@@ -1,5 +1,5 @@
 import app from "@b3dotfun/sdk/global-account/app";
-import { toast } from "@b3dotfun/sdk/global-account/react";
+import { toast, useB3Account } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { thirdwebB3Mainnet } from "@b3dotfun/sdk/shared/constants/chains/b3Chain";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
@@ -11,7 +11,6 @@ import { createWallet, preAuthenticate, WalletId } from "thirdweb/wallets";
 import { WalletRow } from "../..";
 import { LinkNewAccountModalProps, useModalStore } from "../../stores/useModalStore";
 import { getProfileDisplayInfo } from "../../utils/profileDisplay";
-import { useB3 } from "../B3Provider/useB3";
 import { AppleIcon } from "../icons/AppleIcon";
 import { DiscordIcon } from "../icons/DiscordIcon";
 import { FarcasterIcon } from "../icons/FarcasterIcon";
@@ -117,7 +116,7 @@ export function LinkNewAccount({
       originalProfile: profile,
     }));
 
-  const { account } = useB3();
+  const account = useB3Account();
   const { mutate: linkProfile } = useLinkProfile();
 
   const onSuccess = useCallback(async () => {

package/src/global-account/react/components/ManageAccount/ProfileSection.tsx

@@ -1,4 +1,11 @@
-import { useAccountWallet, useB3, useModalStore, useProfile, useSimBalance } from "@b3dotfun/sdk/global-account/react";
+import {
+  useAccountWallet,
+  useAuthentication,
+  useB3Config,
+  useModalStore,
+  useProfile,
+  useSimBalance,
+} from "@b3dotfun/sdk/global-account/react";
 import { formatUsername } from "@b3dotfun/sdk/shared/utils";
 import { formatDisplayNumber } from "@b3dotfun/sdk/shared/utils/number";
 import { Pencil } from "lucide-react";
@@ -15,7 +22,8 @@ const ProfileSection = () => {
     address: eoaAddress || account?.address,
     fresh: true,
   });
-  const { user } = useB3();
+  const { partnerId } = useB3Config();
+  const { user } = useAuthentication(partnerId);
   const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
   const navigateBack = useModalStore(state => state.navigateBack);