@b3dotfun/sdk 0.1.1-test.0 → 0.1.2-test.0

package/src/anyspend/react/components/AnySpendDeposit.tsx

@@ -1,7 +1,6 @@
-import { HYPERLIQUID_CHAIN_ID } from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { GetQuoteResponse } from "@b3dotfun/sdk/anyspend/types/api_req_res";
-import { Skeleton, useAccountWallet, useSimBalance } from "@b3dotfun/sdk/global-account/react";
+import { Skeleton, useAccountWallet, useSimBalance, useTokenData } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import {
   NetworkArbitrumOne,
@@ -57,10 +56,10 @@ export interface AnySpendDepositProps {
   sourceTokenAddress?: string;
   /** Source chain ID to pre-select. If not provided, shows chain selection */
   sourceTokenChainId?: number;
-  /** The destination token to receive */
-  destinationToken: components["schemas"]["Token"];
+  /** The destination token address */
+  destinationTokenAddress: string;
   /** The destination chain ID */
-  destinationChainId: number;
+  destinationTokenChainId: number;
   /** Callback when deposit succeeds */
   onSuccess?: (amount: string) => void;
   /** Callback for opening a custom modal (e.g., for special token handling) */
@@ -112,6 +111,11 @@ export interface AnySpendDepositProps {
   customRecipientLabel?: string;
   /** Custom label for the return home button (overrides "Return to Home" / "Close") */
   returnHomeLabel?: string;
+  /** Whether the deposit requires a custom function (uses AnySpendCustomExactIn).
+   * When false, uses simple swap flow (AnySpend).
+   * Defaults to false.
+   */
+  isCustomDeposit?: boolean;
 }
 
 // Default supported chains
@@ -178,8 +182,8 @@ function ChainIcon({ chainId, className }: { chainId: number; className?: string
  * // Simple deposit with chain selection
  * <AnySpendDeposit
  *   recipientAddress={userAddress}
- *   destinationToken={myToken}
- *   destinationChainId={base.id}
+ *   destinationTokenAddress="0x..."
+ *   destinationTokenChainId={base.id}
  *   onSuccess={(amount) => console.log(`Deposited ${amount}`)}
  * />
  *
@@ -187,8 +191,8 @@ function ChainIcon({ chainId, className }: { chainId: number; className?: string
  * // Skip chain selection by providing sourceTokenChainId
  * <AnySpendDeposit
  *   recipientAddress={userAddress}
- *   destinationToken={myToken}
- *   destinationChainId={base.id}
+ *   destinationTokenAddress="0x..."
+ *   destinationTokenChainId={base.id}
  *   sourceTokenChainId={base.id}
  *   onSuccess={(amount) => console.log(`Deposited ${amount}`)}
  * />
@@ -197,8 +201,8 @@ function ChainIcon({ chainId, className }: { chainId: number; className?: string
  * // Deposit with custom contract
  * <AnySpendDeposit
  *   recipientAddress={userAddress}
- *   destinationToken={myToken}
- *   destinationChainId={base.id}
+ *   destinationTokenAddress="0x..."
+ *   destinationTokenChainId={base.id}
  *   depositContractConfig={{
  *     contractAddress: "0x...",
  *     functionName: "depositFor",
@@ -213,8 +217,8 @@ export function AnySpendDeposit({
   paymentType: initialPaymentType,
   sourceTokenAddress,
   sourceTokenChainId: initialSourceChainId,
-  destinationToken,
-  destinationChainId,
+  destinationTokenAddress,
+  destinationTokenChainId,
   onSuccess,
   onOpenCustomModal,
   mainFooter,
@@ -233,6 +237,7 @@ export function AnySpendDeposit({
   returnToHomeUrl,
   customRecipientLabel,
   returnHomeLabel,
+  isCustomDeposit = false,
 }: AnySpendDepositProps) {
   const { connectedEOAWallet } = useAccountWallet();
   const eoaAddress = connectedEOAWallet?.getAccount()?.address;
@@ -244,6 +249,22 @@ export function AnySpendDeposit({
   const [selectedChainId, setSelectedChainId] = useState<number | undefined>(initialSourceChainId);
   const [paymentType, setPaymentType] = useState<"crypto" | "fiat">(initialPaymentType ?? "crypto");
 
+  // Fetch destination token data
+  const { data: destinationTokenData } = useTokenData(destinationTokenChainId, destinationTokenAddress);
+
+  // Construct full destination token object
+  const destinationToken: components["schemas"]["Token"] = useMemo(
+    () => ({
+      address: destinationTokenAddress,
+      chainId: destinationTokenChainId,
+      symbol: destinationTokenData?.symbol ?? "",
+      name: destinationTokenData?.name ?? "",
+      decimals: destinationTokenData?.decimals ?? 18,
+      metadata: { logoURI: destinationTokenData?.logoURI },
+    }),
+    [destinationTokenAddress, destinationTokenChainId, destinationTokenData],
+  );
+
   // Fetch balances for EOA wallet
   const { data: balanceData, isLoading: isBalanceLoading } = useSimBalance(
     shouldShowChainSelection ? eoaAddress : undefined,
@@ -300,7 +321,7 @@ export function AnySpendDeposit({
 
   if (!recipientAddress) return null;
 
-  const tokenSymbol = destinationToken.symbol ?? "TOKEN";
+  const tokenSymbol = destinationToken.symbol || "TOKEN";
 
   // Determine order type based on config
   const effectiveOrderType = orderType ?? (depositContractConfig ? "custom_exact_in" : "swap");
@@ -479,7 +500,7 @@ export function AnySpendDeposit({
           </div>
 
           {/* Chain-specific warning */}
-          <ChainWarningText chainId={destinationChainId} className="mt-2" />
+          <ChainWarningText chainId={destinationTokenChainId} className="mt-2" />
         </div>
       </div>
     );
@@ -492,7 +513,7 @@ export function AnySpendDeposit({
         mode={mode}
         recipientAddress={recipientAddress}
         destinationToken={destinationToken}
-        destinationChainId={destinationChainId}
+        destinationChainId={destinationTokenChainId}
         depositContractConfig={depositContractConfig}
         onBack={handleBack}
         onClose={onClose ?? handleBack}
@@ -500,9 +521,6 @@ export function AnySpendDeposit({
     );
   }
 
-  // Check if destination is Hyperliquid
-  const isHyperliquidDeposit = destinationChainId === HYPERLIQUID_CHAIN_ID;
-
   // Deposit view
   return (
     <div className="anyspend-deposit anyspend-deposit-form relative">
@@ -532,27 +550,7 @@ export function AnySpendDeposit({
       )}
 
       <div className={cn("anyspend-deposit-form-content", shouldShowChainSelection && "pt-8")}>
-        {isHyperliquidDeposit ? (
-          <AnySpend
-            key={selectedChainId}
-            loadOrder={loadOrder}
-            mode={mode}
-            defaultActiveTab={paymentType}
-            recipientAddress={recipientAddress}
-            sourceChainId={selectedChainId}
-            destinationTokenAddress={destinationToken.address}
-            destinationTokenChainId={destinationChainId}
-            onSuccess={txHash => onSuccess?.(txHash ?? "")}
-            onTokenSelect={onTokenSelect}
-            customUsdInputValues={customUsdInputValues}
-            hideHeader
-            hideBottomNavigation
-            disableUrlParamManagement
-            returnToHomeUrl={returnToHomeUrl}
-            customRecipientLabel={customRecipientLabel}
-            returnHomeLabel={returnHomeLabel}
-          />
-        ) : (
+        {isCustomDeposit ? (
           <AnySpendCustomExactIn
             key={selectedChainId}
             loadOrder={loadOrder}
@@ -562,7 +560,7 @@ export function AnySpendDeposit({
             sourceTokenAddress={sourceTokenAddress}
             sourceTokenChainId={selectedChainId}
             destinationToken={destinationToken}
-            destinationChainId={destinationChainId}
+            destinationChainId={destinationTokenChainId}
             orderType={effectiveOrderType}
             minDestinationAmount={minDestinationAmount}
             header={header ?? defaultHeader}
@@ -577,11 +575,31 @@ export function AnySpendDeposit({
             customRecipientLabel={customRecipientLabel}
             returnHomeLabel={returnHomeLabel}
           />
+        ) : (
+          <AnySpend
+            key={selectedChainId}
+            loadOrder={loadOrder}
+            mode={mode}
+            defaultActiveTab={paymentType}
+            recipientAddress={recipientAddress}
+            sourceChainId={selectedChainId}
+            destinationTokenAddress={destinationTokenAddress}
+            destinationTokenChainId={destinationTokenChainId}
+            onSuccess={txHash => onSuccess?.(txHash ?? "")}
+            onTokenSelect={onTokenSelect}
+            customUsdInputValues={customUsdInputValues}
+            hideHeader
+            hideBottomNavigation
+            disableUrlParamManagement
+            returnToHomeUrl={returnToHomeUrl}
+            customRecipientLabel={customRecipientLabel}
+            returnHomeLabel={returnHomeLabel}
+          />
         )}
       </div>
 
       {/* Chain-specific warning */}
-      <ChainWarningText chainId={destinationChainId} className="px-4 pb-4" />
+      <ChainWarningText chainId={destinationTokenChainId} className="px-4 pb-4" />
     </div>
   );
 }

package/src/anyspend/react/components/QRDeposit.tsx

@@ -1,4 +1,4 @@
-import { ALL_CHAINS, getAvailableChainIds } from "@b3dotfun/sdk/anyspend";
+import { ALL_CHAINS, getAvailableChainIds, isSameChainAndToken } from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { Button, toast } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
@@ -8,9 +8,11 @@ import { QRCodeSVG } from "qrcode.react";
 import { useEffect, useRef, useState } from "react";
 import { useAnyspendOrderAndTransactions } from "../hooks/useAnyspendOrderAndTransactions";
 import { useCreateDepositFirstOrder } from "../hooks/useCreateDepositFirstOrder";
+import { TransferResult, useWatchTransfer } from "../hooks/useWatchTransfer";
 import { DepositContractConfig } from "./AnySpendDeposit";
 import { ChainTokenIcon } from "./common/ChainTokenIcon";
 import { OrderDetails } from "./common/OrderDetails";
+import { TransferResultScreen } from "./common/TransferResultScreen";
 import { ChainWarningText, WarningText } from "./common/WarningText";
 
 export interface QRDepositProps {
@@ -85,6 +87,7 @@ export function QRDeposit({
   const [globalAddress, setGlobalAddress] = useState<string | undefined>();
   const orderCreatedRef = useRef(false);
   const onSuccessCalled = useRef(false);
+  const [transferResult, setTransferResult] = useState<TransferResult | null>(null);
 
   // Source token/chain as state (can be changed by user)
   const [sourceChainId, setSourceChainId] = useState(sourceChainIdProp ?? 8453);
@@ -92,6 +95,27 @@ export function QRDeposit({
     sourceTokenProp ?? DEFAULT_ETH_ON_BASE,
   );
 
+  // Check if this is a pure transfer (same chain and token)
+  const isPureTransfer = isSameChainAndToken(
+    sourceChainId,
+    sourceToken.address,
+    destinationChainId,
+    destinationToken.address,
+  );
+
+  // Watch for pure transfers (same chain and token)
+  const { isWatching: isWatchingTransfer } = useWatchTransfer({
+    address: recipientAddress,
+    chainId: sourceChainId,
+    tokenAddress: sourceToken.address,
+    tokenDecimals: sourceToken.decimals,
+    enabled: isPureTransfer && !transferResult,
+    onTransferDetected: result => {
+      setTransferResult(result);
+      onSuccess?.();
+    },
+  });
+
   // Handle token selection from TokenSelector
   const handleTokenSelect = (newToken: any) => {
     const token: components["schemas"]["Token"] = {
@@ -107,6 +131,7 @@ export function QRDeposit({
     setOrderId(undefined);
     setGlobalAddress(undefined);
     orderCreatedRef.current = false;
+    setTransferResult(null);
 
     // Update token and chain
     setSourceChainId(newToken.chainId);
@@ -131,9 +156,11 @@ export function QRDeposit({
   // Fetch order status
   const { orderAndTransactions: oat } = useAnyspendOrderAndTransactions(orderId);
 
-  // Create order on mount
+  // Create order on mount (skip for pure transfers)
   useEffect(() => {
     if (orderCreatedRef.current) return;
+    if (isPureTransfer) return; // Skip order creation for pure transfers
+
     orderCreatedRef.current = true;
 
     createOrder({
@@ -154,6 +181,7 @@ export function QRDeposit({
     creatorAddress,
     depositContractConfig,
     createOrder,
+    isPureTransfer,
   ]);
 
   // Call onSuccess when order is executed
@@ -170,7 +198,8 @@ export function QRDeposit({
     onSuccessCalled.current = false;
   }, [orderId]);
 
-  const displayAddress = globalAddress || recipientAddress;
+  // For pure transfers, always use recipient address; for orders, use global address
+  const displayAddress = isPureTransfer ? recipientAddress : globalAddress || recipientAddress;
 
   const handleCopyAddress = async () => {
     if (displayAddress) {
@@ -190,6 +219,21 @@ export function QRDeposit({
     onClose?.();
   };
 
+  // Show transfer result screen for completed pure transfers
+  if (isPureTransfer && transferResult) {
+    return (
+      <TransferResultScreen
+        mode={mode}
+        transferResult={transferResult}
+        token={sourceToken}
+        chainId={sourceChainId}
+        recipientAddress={recipientAddress}
+        onBack={onBack}
+        onClose={onClose}
+      />
+    );
+  }
+
   // Show order details if order has deposits or is being processed
   if (oat?.data && oat.data.depositTxs && oat.data.depositTxs.length > 0) {
     return (
@@ -214,8 +258,8 @@ export function QRDeposit({
     );
   }
 
-  // Show loading state while creating order (but not if we already have an orderId)
-  if (isCreatingOrder && !orderId) {
+  // Show loading state while creating order (but not if we already have an orderId or for pure transfers)
+  if (isCreatingOrder && !orderId && !isPureTransfer) {
     return (
       <div
         className={cn(
@@ -335,6 +379,14 @@ export function QRDeposit({
           will not be converted.
         </WarningText>
 
+        {/* Watching indicator for pure transfers */}
+        {isPureTransfer && isWatchingTransfer && (
+          <div className="anyspend-qr-watching flex items-center justify-center gap-2 rounded-lg bg-blue-500/10 p-3">
+            <Loader2 className="h-4 w-4 animate-spin text-blue-500" />
+            <span className="text-sm text-blue-500">Watching for incoming transfer...</span>
+          </div>
+        )}
+
         {/* Copy button */}
         <button
           onClick={handleCopyAddress}

package/src/anyspend/react/components/common/CryptoPaymentMethod.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { toast, useAccountWallet, WalletImage } from "@b3dotfun/sdk/global-account/react";
+import { toast, useAccountWallet, useModalStore, WalletImage } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
@@ -48,13 +48,20 @@ export function CryptoPaymentMethod({
   // Use custom hook to determine wallet display logic
   const { shouldShowConnectedEOA } = useConnectedWalletDisplay(selectedPaymentMethod);
 
+  // Get modal store to block parent modal closing while connect modal is open
+  const setClosable = useModalStore(state => state.setClosable);
+
   // Handle wallet connection using thirdweb modal
   const handleConnectWallet = async () => {
+    // Block parent B3 modal from closing while thirdweb connect modal is open
+    setClosable(false);
+
     try {
       // Disconnect current wallet before connecting a new one
       if (connectedEOAWallet) {
-        await disconnect(connectedEOAWallet);
+        disconnect(connectedEOAWallet);
       }
+
       const wallet = await openConnectModal({
         client,
         setActive: false,
@@ -62,8 +69,8 @@ export function CryptoPaymentMethod({
         showThirdwebBranding: false,
         wallets: recommendWallets,
       });
+
       if (wallet) {
-        // setActiveWallet(wallet);
         setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
         onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
         toast.success("Wallet connected");
@@ -82,6 +89,9 @@ export function CryptoPaymentMethod({
           toast.error("Failed to connect wallet");
         }
       }
+    } finally {
+      // Always re-enable parent modal closing when connect modal closes
+      setClosable(true);
     }
   };
 

package/src/anyspend/react/components/common/OrderDetails.tsx

@@ -21,7 +21,7 @@ import {
   TextLoop,
   TextShimmer,
   useAccountWallet,
-  useB3,
+  useB3Config,
   useModalStore,
   useProfile,
   useUnifiedChainSwitchAndExecute,
@@ -228,7 +228,7 @@ export const OrderDetails = memo(function OrderDetails({
   const searchParams = useSearchParams();
 
   // Get theme from B3Provider context
-  const { theme } = useB3();
+  const { theme } = useB3Config();
   const colorMode = theme || "light";
 
   // Read crypto payment method from URL parameters

package/src/anyspend/react/components/common/PaymentStripeWeb2.tsx

@@ -1,6 +1,6 @@
 import { OrderDetailsCollapsible, useStripeClientSecret } from "@b3dotfun/sdk/anyspend/react";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { ShinyButton, useB3, useModalStore, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { ShinyButton, useB3Config, useModalStore, useProfile } from "@b3dotfun/sdk/global-account/react";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import { formatStripeAmount, getStripePromise } from "@b3dotfun/sdk/shared/utils/payment.utils";
 import { AddressElement, Elements, PaymentElement, useElements, useStripe } from "@stripe/react-stripe-js";
@@ -18,7 +18,7 @@ interface PaymentStripeWeb2Props {
 }
 
 export default function PaymentStripeWeb2({ order, stripePaymentIntentId, onPaymentSuccess }: PaymentStripeWeb2Props) {
-  const { theme, stripePublishableKey } = useB3();
+  const { theme, stripePublishableKey } = useB3Config();
   const fingerprintConfig = getFingerprintConfig();
 
   const { clientSecret, isLoadingStripeClientSecret, stripeClientSecretError } =

package/src/anyspend/react/components/common/TransferResultScreen.tsx

@@ -0,0 +1,107 @@
+"use client";
+
+import { ALL_CHAINS } from "@b3dotfun/sdk/anyspend";
+import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { cn } from "@b3dotfun/sdk/shared/utils/cn";
+import { CheckCircle2, Home } from "lucide-react";
+import { TransferResult } from "../../hooks/useWatchTransfer";
+import { ChainTokenIcon } from "./ChainTokenIcon";
+
+export interface TransferResultScreenProps {
+  mode?: "modal" | "page";
+  /** The transfer result containing amount info */
+  transferResult: TransferResult;
+  /** The token that was transferred */
+  token: components["schemas"]["Token"];
+  /** The chain ID where the transfer happened */
+  chainId: number;
+  /** The recipient address */
+  recipientAddress: string;
+  /** Callback when back/close button is clicked */
+  onBack?: () => void;
+  /** Callback when close button is clicked */
+  onClose?: () => void;
+}
+
+/**
+ * A component for displaying the result of a pure transfer (same chain, same token).
+ * Shows the transferred amount with success styling.
+ */
+export function TransferResultScreen({
+  mode = "modal",
+  transferResult,
+  token,
+  chainId,
+  recipientAddress,
+  onBack,
+  onClose,
+}: TransferResultScreenProps) {
+  const chain = ALL_CHAINS[chainId];
+
+  const handleClose = () => {
+    if (onClose) {
+      onClose();
+    } else if (onBack) {
+      onBack();
+    }
+  };
+
+  return (
+    <div
+      className={cn(
+        "anyspend-container anyspend-transfer-result font-inter bg-as-surface-primary mx-auto w-full max-w-[460px] p-6",
+        mode === "page" && "border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl",
+      )}
+    >
+      <div className="anyspend-transfer-result-content flex flex-col items-center gap-6">
+        {/* Success icon */}
+        <div className="anyspend-transfer-success-icon bg-as-success-secondary flex h-16 w-16 items-center justify-center rounded-full">
+          <CheckCircle2 className="text-as-content-icon-success h-10 w-10" />
+        </div>
+
+        {/* Success message */}
+        <div className="anyspend-transfer-success-message flex flex-col items-center gap-2">
+          <h2 className="text-as-primary text-xl font-semibold">Transfer Received!</h2>
+          <p className="text-as-secondary text-center text-sm">Your transfer has been successfully received.</p>
+        </div>
+
+        {/* Amount display */}
+        <div className="anyspend-transfer-amount border-as-border-secondary bg-as-surface-secondary flex w-full flex-col items-center gap-3 rounded-xl border p-4">
+          <div className="flex items-center gap-3">
+            <ChainTokenIcon
+              chainUrl={chain?.logoUrl}
+              tokenUrl={token.metadata?.logoURI}
+              className="h-10 min-h-10 w-10 min-w-10"
+            />
+            <div className="flex flex-col">
+              <span className="text-as-primary text-2xl font-bold">
+                {transferResult.formattedAmount} {token.symbol}
+              </span>
+              <span className="text-as-secondary text-sm">on {chain?.name ?? "Unknown Chain"}</span>
+            </div>
+          </div>
+        </div>
+
+        {/* Recipient info */}
+        <div className="anyspend-transfer-recipient flex w-full flex-col gap-1">
+          <span className="text-as-secondary text-xs">Received at</span>
+          <span className="text-as-primary break-all font-mono text-sm">{recipientAddress}</span>
+        </div>
+
+        {/* Close button */}
+        <button
+          onClick={handleClose}
+          className="anyspend-transfer-close-button bg-as-brand flex w-full items-center justify-center gap-2 rounded-xl py-3.5 font-medium text-white transition-all hover:opacity-90"
+        >
+          {mode === "page" ? (
+            <>
+              Return to Home <Home className="ml-2 h-4 w-4" />
+            </>
+          ) : (
+            "Close"
+          )}
+        </button>
+      </div>
+    </div>
+  );
+}

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

@@ -15,3 +15,4 @@ export * from "./useRecipientAddressState";
 export * from "./useSigMint";
 export * from "./useStripeClientSecret";
 export * from "./useStripeSupport";
+export * from "./useWatchTransfer";

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

@@ -3,7 +3,7 @@ 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 { buildMetadata, buildPayload, normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
-import { useB3 } from "@b3dotfun/sdk/global-account/react";
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -36,7 +36,7 @@ export type UseAnyspendCreateOnrampOrderProps = {
  */
 export function useAnyspendCreateOnrampOrder({ onSuccess, onError }: UseAnyspendCreateOnrampOrderProps = {}) {
   // Get B3 context values
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
 
   // Get validated client reference ID from B3 context
   const createValidatedClientReferenceId = useValidatedClientReferenceId();

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

@@ -2,7 +2,7 @@ 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 { buildMetadata, buildPayload, normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
-import { useB3 } from "@b3dotfun/sdk/global-account/react";
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -36,7 +36,7 @@ export type UseAnyspendCreateOrderProps = {
  */
 export function useAnyspendCreateOrder({ onSuccess, onError }: UseAnyspendCreateOrderProps = {}) {
   // Get B3 context values
-  const { partnerId } = useB3();
+  const { partnerId } = useB3Config();
 
   // Get validated client reference ID from B3 context
   const createValidatedClientReferenceId = useValidatedClientReferenceId();

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

@@ -2,7 +2,7 @@ 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 { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -29,7 +29,7 @@ export type UseCreateDepositFirstOrderProps = {
  * 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 { partnerId } = useB3Config();
 
   const { data: fpData } = useVisitorData({ extendedResult: true }, { immediate: true });
   const visitorData: VisitorData | undefined = fpData && {

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

@@ -1,5 +1,5 @@
 import { Validators } from "@b3dotfun/sdk/anyspend/utils/validation";
-import { useB3 } from "@b3dotfun/sdk/global-account/react";
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { useCallback } from "react";
 import { CreateOnrampOrderParams } from "./useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "./useAnyspendCreateOrder";
@@ -9,7 +9,7 @@ import { CreateOrderParams } from "./useAnyspendCreateOrder";
  * Gets the createClientReferenceId function from B3 context and validates the result
  */
 export function useValidatedClientReferenceId() {
-  const { createClientReferenceId } = useB3();
+  const { createClientReferenceId } = useB3Config();
 
   const createValidatedClientReferenceId = useCallback(
     async (params: CreateOrderParams | CreateOnrampOrderParams) => {