@b3dotfun/sdk 0.0.61-test.1 → 0.0.62-alpha.0

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

@@ -207,13 +207,26 @@ export function AnySpendStakeB3({
           args: [ERC20Staking as `0x${string}`, BigInt(userStakeAmount)],
         });
 
-        await switchChainAndExecute(base.id, {
+        const approvalHash = await switchChainAndExecute(base.id, {
           to: B3_TOKEN.address as `0x${string}`,
           data: approvalData,
           value: BigInt(0),
         });
 
-        toast.info("Approval confirmed. Proceeding with stake...");
+        if (!approvalHash) {
+          toast.error("Approval failed. Please try again.");
+          return;
+        }
+
+        const approvalReceipt = await basePublicClient.waitForTransactionReceipt({
+          hash: approvalHash as `0x${string}`,
+          confirmations: 1,
+        });
+
+        if (approvalReceipt?.status !== "success") {
+          toast.error("Approval failed. Please try again.");
+          return;
+        }
       }
 
       // Execute the stake

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

@@ -1,10 +1,10 @@
 import { B3_TOKEN } from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { Button, ShinyButton, StyleRoot, TransitionPanel } from "@b3dotfun/sdk/global-account/react";
+import { Button, ShinyButton, StyleRoot, TransitionPanel, useAccountWallet } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import invariant from "invariant";
 import { motion } from "motion/react";
-import { useMemo } from "react";
+import { useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
 import { base } from "viem/chains";
 import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow";
@@ -17,9 +17,11 @@ import { FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaym
 import { OrderDetails } from "./common/OrderDetails";
 import { PointsDetailPanel } from "./common/PointsDetailPanel";
 import { RecipientSelection } from "./common/RecipientSelection";
+import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
 
 import { ArrowDown, Loader2 } from "lucide-react";
 import { PanelOnramp } from "./common/PanelOnramp";
+import { useGlobalWalletState } from "../../utils";
 
 const SLIPPAGE_PERCENT = 3;
 
@@ -43,6 +45,7 @@ export interface AnySpendDepositHypeProps {
    */
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
   customUsdInputValues?: string[];
+  preferEoa?: boolean;
 }
 
 export function AnySpendDepositHype(props: AnySpendDepositHypeProps) {
@@ -66,6 +69,7 @@ function AnySpendDepositHypeInner({
   mainFooter,
   onTokenSelect,
   customUsdInputValues,
+  preferEoa,
 }: AnySpendDepositHypeProps) {
   // Use shared flow hook
   const {
@@ -113,6 +117,22 @@ function AnySpendDepositHypeInner({
     disableUrlParamManagement: true,
   });
 
+  const { connectedEOAWallet: connectedEOAWallet } = useAccountWallet();
+  const setActiveWallet = useSetActiveWallet();
+  const activeWallet = useActiveWallet();
+  const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
+  const appliedPreferEoa = useRef(false);
+
+  useEffect(() => {
+    if (preferEoa && !appliedPreferEoa.current) {
+      if (connectedEOAWallet) {
+        appliedPreferEoa.current = true;
+        setGlobalAccountWallet(activeWallet);
+        setActiveWallet(connectedEOAWallet);
+      }
+    }
+  }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+
   // Button state logic
   const btnInfo: { text: string; disable: boolean; error: boolean; loading: boolean } = useMemo(() => {
     if (activeInputAmountInWei === "0") return { text: "Enter an amount", disable: true, error: false, loading: false };

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

@@ -7,7 +7,7 @@ import { ClientType } from "../../../client-manager";
 
 import { WagmiProvider } from "wagmi";
 import { useAuthentication } from "../../hooks/useAuthentication";
-import { useWagmiConfig } from "../../hooks/useWagmiConfig";
+import { createWagmiConfig } from "../../utils/createWagmiConfig";
 import { LocalSDKProvider } from "./LocalSDKProvider";
 import { B3Context, B3ContextType } from "./types";
 
@@ -90,7 +90,7 @@ export function InnerProvider({
 }) {
   const activeAccount = useActiveAccount();
   const { user, setUser, refetchUser } = useAuthentication(partnerId);
-  const wagmiConfig = useWagmiConfig(partnerId, rpcUrls);
+  const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls });
 
   // Use given accountOverride or activeAccount from thirdweb
   const effectiveAccount = accountOverride || activeAccount;

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

@@ -4,7 +4,7 @@ import {
   useAuthentication,
   useAuthStore,
 } from "@b3dotfun/sdk/global-account/react";
-import { useWagmiConfig } from "@b3dotfun/sdk/global-account/react/hooks/useWagmiConfig";
+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";
@@ -20,7 +20,7 @@ import {
   useSetActiveWallet,
 } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
-import { WagmiProvider } from "wagmi";
+import { CreateConnectorFn, WagmiProvider } from "wagmi";
 import { ClientType, setClientType } from "../../../client-manager";
 import { StyleRoot } from "../StyleRoot";
 import { LocalSDKProvider } from "./LocalSDKProvider";
@@ -56,6 +56,8 @@ export function B3Provider({
   rpcUrls,
   partnerId,
   onConnect,
+  connectors,
+  overrideDefaultConnectors = false,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
@@ -71,6 +73,8 @@ export function B3Provider({
   rpcUrls?: Record<number, string>;
   partnerId: string;
   onConnect?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
+  connectors?: CreateConnectorFn[];
+  overrideDefaultConnectors?: boolean;
 }) {
   // Initialize Google Analytics on mount
   useEffect(() => {
@@ -81,7 +85,7 @@ export function B3Provider({
   useEffect(() => {
     setClientType(clientType);
   }, [clientType]);
-  const wagmiConfig = useWagmiConfig(partnerId, rpcUrls);
+  const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors });
 
   return (
     <ThirdwebProvider>

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

@@ -1,3 +1,4 @@
+export { createWagmiConfig, type CreateWagmiConfigOptions } from "../utils/createWagmiConfig";
 export { useAccountAssets } from "./useAccountAssets";
 export { useAccountWallet } from "./useAccountWallet";
 export { useAddTWSessionKey } from "./useAddTWSessionKey";

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

@@ -18,9 +18,9 @@ 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 { useTWAuth } from "./useTWAuth";
 import { useUserQuery } from "./useUserQuery";
-import { useWagmiConfig } from "./useWagmiConfig";
 
 const debug = debugB3React("useAuthentication");
 
@@ -42,7 +42,7 @@ export function useAuthentication(partnerId: string) {
   const { authenticate } = useTWAuth();
   const { user, setUser } = useUserQuery();
   const useAutoConnectLoadingPrevious = useRef(false);
-  const wagmiConfig = useWagmiConfig(partnerId);
+  const wagmiConfig = createWagmiConfig({ partnerId });
   const { connect } = useConnect();
   const activeWagmiAccount = useAccount();
   const { switchAccount } = useSwitchAccount();

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

@@ -330,6 +330,8 @@ export interface AnySpendDepositHypeProps extends BaseModalProps {
   onSuccess?: (amount?: string) => void;
   /** Custom USD input values for quick amount buttons in fiat onramp */
   customUsdInputValues?: string[];
+  /** prefer eoa wallet */
+  preferEoa?: boolean;
 }
 
 export interface AvatarEditorModalProps extends BaseModalProps {

package/src/global-account/react/utils/createWagmiConfig.tsx

@@ -0,0 +1,40 @@
+import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
+import { supportedChains } from "@b3dotfun/sdk/shared/constants/chains/supported";
+import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
+import { inAppWalletConnector } from "@thirdweb-dev/wagmi-adapter";
+import { http } from "viem";
+import { createConfig, type CreateConnectorFn } from "wagmi";
+
+export interface CreateWagmiConfigOptions {
+  partnerId: string;
+  rpcUrls?: Record<number, string>;
+  connectors?: CreateConnectorFn[];
+  overrideDefaultConnectors?: boolean;
+}
+
+/**
+ * Creates a wagmi config with optional custom RPC URLs and connectors
+ * @param options.partnerId - Partner ID for the ecosystem wallet
+ * @param options.rpcUrls - Optional mapping of chain IDs to RPC URLs
+ * @param options.connectors - Additional connectors to include
+ * @param options.overrideDefaultConnectors - If true, only use provided connectors (ignores defaults)
+ */
+export function createWagmiConfig(options: CreateWagmiConfigOptions) {
+  const { partnerId, rpcUrls, connectors = [], overrideDefaultConnectors = false } = options;
+
+  const defaultConnectors = [
+    inAppWalletConnector({
+      ecosystemId: ecosystemWalletId,
+      partnerId,
+      client,
+    }),
+  ];
+
+  const finalConnectors = overrideDefaultConnectors ? connectors : [...defaultConnectors, ...connectors];
+
+  return createConfig({
+    chains: [supportedChains[0], ...supportedChains.slice(1)],
+    transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(rpcUrls?.[chain.id])])),
+    connectors: finalConnectors,
+  });
+}