@b3dotfun/sdk 0.0.23 → 0.0.24

package/dist/esm/global-account/react/components/SendETHButton/SendETHButton.js

@@ -0,0 +1,20 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Button, useUnifiedChainSwitchAndExecute } from "../../../../global-account/react/index.js";
+import { useCallback } from "react";
+export function SendETHButton({ chainId, to, value, className, children, onSuccess, onError }) {
+    const { switchChainAndExecute, isSwitchingOrExecuting } = useUnifiedChainSwitchAndExecute();
+    const handleSendETH = useCallback(async () => {
+        try {
+            const tx = await switchChainAndExecute(chainId, { to: to, value });
+            if (tx) {
+                onSuccess?.(tx);
+            }
+        }
+        catch (error) {
+            onError?.(error);
+            throw error;
+        }
+    }, [switchChainAndExecute, chainId, to, value, onSuccess, onError]);
+    const buttonText = isSwitchingOrExecuting ? "Sending..." : String(children);
+    return (_jsx(Button, { onClick: handleSendETH, disabled: isSwitchingOrExecuting, className: className, children: buttonText }));
+}

package/dist/esm/global-account/react/components/SignInWithB3/SignIn.js

@@ -35,9 +35,11 @@ export function SignIn(props) {
         }
     }, [connectedEOAWallet, isActiveEOAWallet, setActiveWallet, automaticallySetFirstEoa]);
     // Desktop version - original dropdown menu
-    return (_jsx(StyleRoot, { children: _jsx(Menu, { className: `relative flex items-center ${className || ""}`, as: "div", children: globalAddress ? (_jsxs(_Fragment, { children: [_jsxs(MenuButton, { className: "bg-theme-on-surface-2 group flex h-10 items-center gap-1 rounded-xl px-3", children: [!!wallet.meta?.icon && (_jsx("img", { src: wallet.meta.icon, alt: wallet.meta.icon, className: "bg-theme-primary h-6 w-6 rounded-full object-cover opacity-100" })), _jsx("div", { className: "text-body-1m text-theme-secondary", children: ensName ? ensName : truncateAddress(globalAddress) })] }), _jsx(Transition, { enter: "duration-200 ease-out", enterFrom: "scale-95 opacity-0", enterTo: "scale-100 opacity-100", leave: "duration-300 ease-out", leaveFrom: "scale-100 opacity-100", leaveTo: "scale-95 opacity-0", children: _jsx(MenuItems, { className: "b3-root shadow-depth-1 absolute -right-4 top-full min-w-64 rounded-2xl border lg:right-0", modal: false, 
+    return (_jsx(StyleRoot, { children: _jsx(Menu, { className: `relative flex items-center ${className || ""}`, as: "div", children: globalAddress ? (_jsxs(_Fragment, { children: [_jsxs(MenuButton, { className: "bg-b3-react-background group flex h-10 items-center gap-1 rounded-xl px-3", children: [!!wallet.meta?.icon && (_jsx("img", { src: wallet.meta.icon, alt: wallet.meta.icon, className: "bg-b3-react-primary h-6 w-6 rounded-full object-cover opacity-100" })), _jsx("div", { className: "text-as-primary", children: ensName ? ensName : truncateAddress(globalAddress) })] }), _jsx(Transition, { enter: "duration-200 ease-out", enterFrom: "scale-95 opacity-0", enterTo: "scale-100 opacity-100", leave: "duration-300 ease-out", leaveFrom: "scale-100 opacity-100", leaveTo: "scale-95 opacity-0", children: _jsx(MenuItems, { className: "b3-root absolute -right-4 top-full min-w-64 rounded-2xl border lg:right-0", modal: false, 
                             // TODO: Figure out why setting anchor on mobile causes z-index issues where it appears under elements
-                            anchor: isMobile ? "top end" : undefined, children: _jsxs("div", { className: "bg-b3-react-background", children: [connectedEOAWallet ? (_jsxs("div", { className: cn("border-b3-react-subtle bg-b3-react-background flex cursor-pointer items-center justify-between rounded-xl p-3", "hover:bg-theme-on-surface-2"), onClick: () => handleSetActiveAccount(connectedEOAWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-theme-primary h-16 w-16 rounded-full opacity-100", src: eoaWalletIcon, alt: connectedEOAWallet?.id }), _jsxs("div", { className: "ml-4 grow", children: [ensName && _jsx("div", { className: "text-title-1s", children: ensName }), _jsx("div", { className: "text-title-1s", children: truncateAddress(globalAddress) }), _jsx("div", { className: "text-body-1m text-theme-secondary", children: walletInfo?.name })] })] }), isActiveEOAWallet && _jsx(Icon, { className: "fill-theme-primary", name: "check" })] })) : (connectedSmartWallet && (_jsxs("div", { className: cn("mb-2 flex cursor-pointer items-center justify-between rounded-xl p-3", isActiveSmartWallet ? "bg-theme-n-8" : "bg-b3-react-background hover:bg-theme-on-surface-2"), onClick: () => handleSetActiveAccount(connectedSmartWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-theme-primary h-16 w-16 rounded-full opacity-100", src: smartWalletIcon, alt: connectedSmartWallet?.id }), _jsxs("div", { className: "pl-4.5 grow", children: [ensName && _jsx("div", { className: "text-title-1s", children: ensName }), _jsx("div", { className: "text-title-1s", children: truncateAddress(globalAddress) }), _jsx("div", { className: "text-body-1m text-theme-secondary", children: "Smart wallet" })] })] }), isActiveSmartWallet && _jsx(Icon, { className: "fill-theme-primary", name: "check" })] }))), _jsx("div", { className: "ml-3", children: _jsx(ManageAccountButton, { ...props, className: "w-[calc(100%-12px)]" }) }), _jsx("button", { className: "mb-2 w-full space-y-1", onClick: onDisconnect, children: _jsxs("div", { className: "hover:bg-theme-on-surface-2 group flex h-12 items-center rounded-xl px-4 transition-colors", children: [_jsx(Icon, { className: "fill-theme-secondary group-hover:fill-theme-primary mr-4 shrink-0 transition-colors", name: "logout" }), _jsx("div", { className: "text-base-1s text-theme-secondary group-hover:text-theme-primary mr-auto transition-colors", children: "Disconnect" })] }) })] }) }) })] })) : (_jsx(SignInWithB3, { closeAfterLogin: true, onLoginSuccess: async (globalAccount) => {
+                            anchor: isMobile ? "top end" : undefined, children: _jsxs("div", { className: "bg-b3-react-background", children: [connectedEOAWallet ? (_jsxs("div", { className: cn("border-b3-react-subtle bg-b3-react-background flex cursor-pointer items-center justify-between rounded-xl p-3"), onClick: () => handleSetActiveAccount(connectedEOAWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-b3-react-primary h-16 w-16 rounded-full opacity-100", src: eoaWalletIcon, alt: connectedEOAWallet?.id }), _jsxs("div", { className: "ml-4 grow", children: [ensName && _jsx("div", { children: ensName }), _jsx("div", { children: truncateAddress(globalAddress) }), _jsx("div", { children: walletInfo?.name })] })] }), isActiveEOAWallet && _jsx(Icon, { className: "fill-b3-react-primary", name: "check" })] })) : (connectedSmartWallet && (_jsxs("div", { className: cn("mb-2 flex cursor-pointer items-center justify-between rounded-xl p-3", isActiveSmartWallet
+                                            ? "bg-b3-react-background"
+                                            : "bg-b3-react-background hover:bg-b3-react-background"), onClick: () => handleSetActiveAccount(connectedSmartWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-b3-react-primary h-16 w-16 rounded-full opacity-100", src: smartWalletIcon, alt: connectedSmartWallet?.id }), _jsxs("div", { className: "grow pl-4", children: [ensName && _jsx("div", { children: ensName }), _jsx("div", { children: truncateAddress(globalAddress) }), _jsx("div", { children: "Smart wallet" })] })] }), isActiveSmartWallet && _jsx(Icon, { className: "fill-b3-react-primary", name: "check" })] }))), _jsx("div", { className: "ml-3", children: _jsx(ManageAccountButton, { ...props, className: "w-[calc(100%-12px)]" }) }), _jsx("button", { className: "mb-2 w-full space-y-1", onClick: onDisconnect, children: _jsxs("div", { className: "hover:bg-b3-react-background group flex h-12 items-center rounded-xl px-4 transition-colors", children: [_jsx(Icon, { className: "fill-b3-react-background group-hover:fill-b3-react-primary mr-4 shrink-0 transition-colors", name: "logout" }), _jsx("div", { className: "text-b3-react-background group-hover:text-b3-react-primary mr-auto transition-colors", children: "Disconnect" })] }) })] }) }) })] })) : (_jsx(SignInWithB3, { closeAfterLogin: true, onLoginSuccess: async (globalAccount) => {
                     console.log("User authenticated with Global Account!", globalAccount);
                 }, ...props })) }) }));
 }

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Flow.js

@@ -161,14 +161,14 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         debug("Authenticating with B3 via SIWE");
         setIsConnected(true);
         if (loginWithSiwe) {
-            debug("@@setIsAuthenticating:true:1");
+            debug("setIsAuthenticating:true:1");
             setIsAuthenticating(true);
             const userAuth = await authenticate(account, partnerId);
             setUser(userAuth.user);
         }
         debug("handleLoginSuccess:account", account);
         onLoginSuccess?.(account);
-        debug("@@setIsAuthenticating:false:1");
+        debug("setIsAuthenticating:false:1");
         setIsAuthenticating(false);
     }, [loginWithSiwe, onLoginSuccess, setIsAuthenticating, authenticate, partnerId, setUser, setIsConnected]);
     useEffect(() => {

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Privy.js

@@ -31,7 +31,7 @@ export function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }) {
                 setIsAuthenticated(false);
             }
             finally {
-                debug("@@setIsAuthenticating:false:7");
+                debug("setIsAuthenticating:false:7");
                 setIsAuthenticating(false);
             }
         }

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStep.js

@@ -61,7 +61,7 @@ export function LoginStep({ onSuccess, onError, partnerId, chain }) {
             }, onConnect: async (wallet) => {
                 try {
                     setIsAuthenticating(true);
-                    debug("@@setIsAuthenticating:true:6");
+                    debug("setIsAuthenticating:true:6");
                     const account = wallet.getAccount();
                     if (!account)
                         throw new Error("No account found");
@@ -75,7 +75,7 @@ export function LoginStep({ onSuccess, onError, partnerId, chain }) {
                     setIsAuthenticated(false);
                 }
                 finally {
-                    debug("@@setIsAuthenticating:false:6");
+                    debug("setIsAuthenticating:false:6");
                     setIsAuthenticating(false);
                 }
             } }) }));

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStepCustom.js

@@ -21,7 +21,7 @@ export function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategi
     const handleConnect = async (strategy) => {
         try {
             setIsLoading(true);
-            debug("@@setIsAuthenticating:true:3");
+            debug("setIsAuthenticating:true:3");
             setIsAuthenticating(true);
             const options = getConnectOptionsFromStrategy(strategy);
             let connectResult;
@@ -55,7 +55,7 @@ export function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategi
         }
         finally {
             setIsLoading(false);
-            debug("@@setIsAuthenticating:false:3");
+            debug("setIsAuthenticating:false:3");
             setIsAuthenticating(false);
         }
     };

package/dist/esm/global-account/react/components/index.d.ts

@@ -17,6 +17,8 @@ export { RequestPermissions } from "./RequestPermissions/RequestPermissions";
 export { RequestPermissionsButton } from "./RequestPermissions/RequestPermissionsButton";
 export { AccountAssets } from "./AccountAssets/AccountAssets";
 export { MintButton } from "./MintButton/MintButton";
+export { SendETHButton } from "./SendETHButton/SendETHButton";
+export { SendERC20Button } from "./SendERC20Button/SendERC20Button";
 export { TransakModal } from "./Transak/TransakModal";
 export { Button as CustomButton, buttonVariants as customButtonVariants } from "./custom/Button";
 export { ClientOnly } from "./custom/ClientOnly";

package/dist/esm/global-account/react/components/index.js

@@ -23,6 +23,10 @@ export { RequestPermissionsButton } from "./RequestPermissions/RequestPermission
 export { AccountAssets } from "./AccountAssets/AccountAssets.js";
 // MintButton Components
 export { MintButton } from "./MintButton/MintButton.js";
+// SendETHButton Components
+export { SendETHButton } from "./SendETHButton/SendETHButton.js";
+// SendERC20Button Components
+export { SendERC20Button } from "./SendERC20Button/SendERC20Button.js";
 // Transak Components
 export { TransakModal } from "./Transak/TransakModal.js";
 // Custom Components

package/dist/esm/global-account/react/components/ui/scroll-area.js

@@ -5,6 +5,6 @@ import * as React from "react";
 import { cn } from "../../../../shared/utils/index.js";
 const ScrollArea = React.forwardRef(({ className, children, ...props }, ref) => (_jsxs(ScrollAreaPrimitive.Root, { ref: ref, className: cn("relative overflow-hidden", className), ...props, children: [_jsx(ScrollAreaPrimitive.Viewport, { className: "h-full w-full rounded-[inherit]", children: children }), _jsx(ScrollBar, {}), _jsx(ScrollAreaPrimitive.Corner, {})] })));
 ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
-const ScrollBar = React.forwardRef(({ className, orientation = "vertical", ...props }, ref) => (_jsx(ScrollAreaPrimitive.ScrollAreaScrollbar, { ref: ref, orientation: orientation, className: cn("flex touch-none select-none transition-colors", orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent p-[1px]", orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent p-[1px]", className), ...props, children: _jsx(ScrollAreaPrimitive.ScrollAreaThumb, { className: "bg-border relative flex-1 rounded-full" }) })));
+const ScrollBar = React.forwardRef(({ className, orientation = "vertical", ...props }, ref) => (_jsx(ScrollAreaPrimitive.ScrollAreaScrollbar, { ref: ref, orientation: orientation, className: cn("flex touch-none select-none transition-colors", orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent p-px", orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent p-px", className), ...props, children: _jsx(ScrollAreaPrimitive.ScrollAreaThumb, { className: "bg-border relative flex-1 rounded-full" }) })));
 ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName;
 export { ScrollArea, ScrollBar };

package/dist/esm/global-account/react/components/ui/tooltip.d.ts

@@ -3,5 +3,5 @@ import * as React from "react";
 declare const TooltipProvider: React.FC<TooltipPrimitive.TooltipProviderProps>;
 declare const Tooltip: React.FC<TooltipPrimitive.TooltipProps>;
 declare const TooltipTrigger: React.ForwardRefExoticComponent<TooltipPrimitive.TooltipTriggerProps & React.RefAttributes<HTMLButtonElement>>;
-declare const TooltipContent: React.ForwardRefExoticComponent<Omit<TooltipPrimitive.TooltipContentProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<never>>;
+declare const TooltipContent: React.ForwardRefExoticComponent<TooltipPrimitive.TooltipContentProps & React.RefAttributes<HTMLDivElement>>;
 export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };

package/dist/esm/global-account/react/hooks/index.d.ts

@@ -6,7 +6,7 @@ export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
 export { useBestTransactionPath } from "./useBestTransactionPath";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction";
-export { useClaim } from "./useClaim";
+export * from "./useClaim";
 export { useConnect } from "./useConnect";
 export { useExchangeRate } from "./useExchangeRate";
 export { useGetAllTWSigners, type TWSignerWithMetadata } from "./useGetAllTWSigners";
@@ -32,4 +32,5 @@ export { useTokenFromUrl } from "./useTokenFromUrl";
 export { useTokenPrice } from "./useTokenPrice";
 export { useTokenPriceWithFallback } from "./useTokenPriceWithFallback";
 export { useTokensFromAddress } from "./useTokensFromAddress";
+export { useUnifiedChainSwitchAndExecute } from "./useUnifiedChainSwitchAndExecute";
 export { useURLParams } from "./useURLParams";

package/dist/esm/global-account/react/hooks/index.js

@@ -6,7 +6,7 @@ export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses.js";
 export { useB3EnsName } from "./useB3EnsName.js";
 export { useBestTransactionPath } from "./useBestTransactionPath.js";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction.js";
-export { useClaim } from "./useClaim.js";
+export * from "./useClaim.js";
 export { useConnect } from "./useConnect.js";
 export { useExchangeRate } from "./useExchangeRate.js";
 export { useGetAllTWSigners } from "./useGetAllTWSigners.js";
@@ -32,4 +32,5 @@ export { useTokenFromUrl } from "./useTokenFromUrl.js";
 export { useTokenPrice } from "./useTokenPrice.js";
 export { useTokenPriceWithFallback } from "./useTokenPriceWithFallback.js";
 export { useTokensFromAddress } from "./useTokensFromAddress.js";
+export { useUnifiedChainSwitchAndExecute } from "./useUnifiedChainSwitchAndExecute.js";
 export { useURLParams } from "./useURLParams.js";

package/dist/esm/global-account/react/hooks/useAccountWallet.js

@@ -1,8 +1,10 @@
 import { useB3, useProfile } from "../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../shared/constants/index.js";
+import { debugB3React } from "../../../shared/utils/debug.js";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { socialIcons } from "thirdweb/wallets/in-app";
+const debug = debugB3React("useAccountWallet");
 function useLastAuthProvider() {
     const [lastAuthProvider, setLastAuthProvider] = useState(null);
     useEffect(() => {
@@ -22,6 +24,12 @@ export function useAccountWallet() {
     const connectedEOAWallet = connectedWallets.find(wallet => wallet.id !== ecosystemWalletId);
     const isActiveSmartWallet = activeWallet?.id === connectedSmartWallet?.id;
     const isActiveEOAWallet = activeWallet?.id === connectedEOAWallet?.id;
+    debug("activeWallet", activeWallet);
+    debug("connectedWallets", connectedWallets);
+    debug("connectedSmartWallet", connectedSmartWallet);
+    debug("connectedEOAWallet", connectedEOAWallet);
+    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();

package/dist/esm/global-account/react/hooks/useAuthentication.js

@@ -40,7 +40,7 @@ export function useAuthentication(partnerId, loginWithSiwe) {
                     setIsAuthenticated(true);
                     return;
                 }
-                debug("@@setIsAuthenticating:true:4");
+                debug("setIsAuthenticating:true:4");
                 setIsAuthenticating(true);
                 const account = await wallet.getAccount();
                 if (!account) {
@@ -65,7 +65,7 @@ export function useAuthentication(partnerId, loginWithSiwe) {
             catch (error) {
                 debug("Auto-connect authentication failed", { error });
                 setIsAuthenticated(false);
-                debug("@@setIsAuthenticating:false:4");
+                debug("setIsAuthenticating:false:4");
                 setUser();
             }
         },
@@ -79,14 +79,14 @@ export function useAuthentication(partnerId, loginWithSiwe) {
             // Only set isAuthenticating to false if we're not authenticated
             // This prevents the flicker state where both isAuthenticating and isAuthenticated are false
             const timeout = setTimeout(() => {
-                debug("@@setIsAuthenticating:false:5a");
+                debug("setIsAuthenticating:false:5a");
                 setIsAuthenticating(false);
                 setIsConnecting(false);
             }, 100); // Add a small delay to prevent quick flickers
             return () => clearTimeout(timeout);
         }
         else {
-            debug("@@setIsAuthenticating:false:5b");
+            debug("setIsAuthenticating:false:5b");
             setIsAuthenticating(false);
             setIsConnecting(false);
         }

package/dist/esm/global-account/react/hooks/useChainSwitchWithAction.d.ts

@@ -1,5 +1,4 @@
-import { WalletClient } from "viem";
 export declare function useChainSwitchWithAction(): {
-    switchChainAndExecute: (targetChainId: number, action: (client: WalletClient) => Promise<void>) => Promise<void>;
+    switchChainAndExecute: (targetChainId: number, action: () => Promise<void>) => Promise<void>;
     isSwitchingOrExecuting: boolean;
 };

package/dist/esm/global-account/react/hooks/useChainSwitchWithAction.js

@@ -29,7 +29,7 @@ export function useChainSwitchWithAction() {
         const providerId = walletClient.chain.id;
         const onCorrectChain = providerId === targetChainId;
         if (onCorrectChain) {
-            return run(() => action(walletClient));
+            return run(() => action());
         }
         toast.info(`Switching to ${getChainName(targetChainId)}…`);
         const targetChain = supportedChains.find(chain => chain.id === targetChainId);
@@ -54,7 +54,7 @@ export function useChainSwitchWithAction() {
                     },
                 },
             });
-            await run(() => action(walletClient));
+            await run(() => action());
         }
         catch (e) {
             if (e?.code === -32603 || e?.message?.includes("f is not a function")) {

package/dist/esm/global-account/react/hooks/useFirstEOA.js

@@ -1,29 +1,31 @@
 import { useAuthStore } from "../../../global-account/react/index.js";
+import { debugB3React } from "../../../shared/utils/debug.js";
 import { useEffect, useState } from "react";
 import { useConnectedWallets, useWalletInfo } from "thirdweb/react";
+const debug = debugB3React("useFirstEOA");
 export default function useFirstEOA() {
     const wallets = useConnectedWallets();
     const isConnected = useAuthStore(state => state.isConnected);
     const [firstEOA, setFirstEOA] = useState(undefined);
     const [address, setAddress] = useState(undefined);
     const walletInfo = useWalletInfo(firstEOA?.id);
-    console.log("@@wallets", wallets);
-    console.log("@@wallets:isConnected", isConnected);
+    debug("Wallets", wallets);
+    debug("Is connected", isConnected);
     useEffect(() => {
         const autoSelectFirstEOAWallet = async () => {
             // Only proceed if auto-selection is enabled and user is authenticated
             if (!isConnected) {
-                console.log("@@wallets:not connected");
+                debug("Not connected");
                 return;
             }
             // Find the first EOA wallet (excluding ecosystem wallets)
             const isEOAWallet = (wallet) => !wallet.id.startsWith("ecosystem.");
             const firstEOAWallet = wallets.find(isEOAWallet);
-            console.log("@@wallets:firstEOAWallet", firstEOAWallet);
-            const account = await firstEOAWallet?.getAccount();
-            console.log("@@wallets:account", account);
+            debug("First EOA wallet", firstEOAWallet);
+            const account = firstEOAWallet?.getAccount();
+            debug("Account", account);
             setFirstEOA(firstEOAWallet);
-            console.log("@@wallets:address", account?.address);
+            debug("Address", account?.address);
             setAddress(account?.address);
         };
         autoSelectFirstEOAWallet();

package/dist/esm/global-account/react/hooks/useUnifiedChainSwitchAndExecute.d.ts

@@ -0,0 +1,11 @@
+export interface UnifiedTransactionParams {
+    to: string;
+    data?: string;
+    value: bigint;
+}
+export declare function useUnifiedChainSwitchAndExecute(): {
+    switchChainAndExecute: (targetChainId: number, params: UnifiedTransactionParams) => Promise<string | undefined>;
+    isSwitchingOrExecuting: boolean;
+    isActiveSmartWallet: boolean | undefined;
+    isActiveEOAWallet: boolean | undefined;
+};

package/dist/esm/global-account/react/hooks/useUnifiedChainSwitchAndExecute.js

@@ -0,0 +1,154 @@
+import { getChainName, getNativeToken } from "../../../anyspend/index.js";
+import app from "../../../global-account/app.js";
+import { getThirdwebChain, supportedChains } from "../../../shared/constants/chains/supported.js";
+import { client } from "../../../shared/utils/thirdweb.js";
+import invariant from "invariant";
+import { useCallback, useState } from "react";
+import { toast } from "sonner";
+import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
+import { useSwitchChain, useWalletClient } from "wagmi";
+import { useB3 } from "../components/index.js";
+import { useAccountWallet } from "./useAccountWallet.js";
+export function useUnifiedChainSwitchAndExecute() {
+    const { data: walletClient } = useWalletClient();
+    const { switchChainAsync } = useSwitchChain();
+    const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
+    const { isActiveSmartWallet, isActiveEOAWallet } = useAccountWallet();
+    const { account: aaAccount } = useB3();
+    // Handle EOA wallet chain switch and execute transaction
+    const handleEOASwitchChainAndSendTransaction = useCallback(async (targetChainId, params) => {
+        if (!walletClient) {
+            toast.error("Please connect your wallet");
+            return;
+        }
+        const providerId = walletClient.chain.id;
+        const onCorrectChain = providerId === targetChainId;
+        // Helper function to execute the transaction
+        const executeTransaction = async () => {
+            const signer = walletClient.account;
+            if (!signer) {
+                throw new Error("No account connected");
+            }
+            const hash = await walletClient.sendTransaction({
+                account: signer,
+                chain: walletClient.chain,
+                to: params.to,
+                data: params.data,
+                value: params.value,
+            });
+            toast.success(`Transaction sent: ${hash.slice(0, 10)}...`);
+            return hash;
+        };
+        try {
+            setIsSwitchingOrExecuting(true);
+            if (onCorrectChain) {
+                return await executeTransaction();
+            }
+            toast.info(`Switching to ${getChainName(targetChainId)}…`);
+            const targetChain = supportedChains.find(chain => chain.id === targetChainId);
+            if (!targetChain) {
+                toast.error(`Chain ${targetChainId} is not supported`);
+                return;
+            }
+            const blockExplorerUrl = targetChain.blockExplorers?.default.url;
+            invariant(blockExplorerUrl, "Block explorer URL is required");
+            const nativeCurrency = getNativeToken(targetChainId);
+            await switchChainAsync({
+                chainId: targetChainId,
+                addEthereumChainParameter: {
+                    chainName: targetChain.name,
+                    rpcUrls: [targetChain.rpcUrls.default.http[0]],
+                    blockExplorerUrls: [blockExplorerUrl],
+                    nativeCurrency: {
+                        name: nativeCurrency.name,
+                        symbol: nativeCurrency.symbol,
+                        decimals: nativeCurrency.decimals,
+                    },
+                },
+            });
+            return await executeTransaction();
+        }
+        catch (e) {
+            if (e?.code === -32603 || e?.message?.includes("f is not a function")) {
+                // This is a workaround for a bug in the wallet provider.
+                toast(`Switched to ${getChainName(targetChainId)}. Executing…`);
+                return await handleEOASwitchChainAndSendTransaction(targetChainId, params);
+            }
+            else {
+                console.error(e);
+                toast.error(e?.message ?? "Unexpected error");
+                return undefined;
+            }
+        }
+        finally {
+            setIsSwitchingOrExecuting(false);
+        }
+    }, [walletClient, switchChainAsync]);
+    // Handle AA wallet transaction (no chain switch needed for AA)
+    const handleAASendTransaction = useCallback(async (targetChainId, params) => {
+        if (!aaAccount) {
+            toast.error("Smart wallet not connected");
+            return;
+        }
+        try {
+            setIsSwitchingOrExecuting(true);
+            const chain = getThirdwebChain(targetChainId);
+            toast.info("Preparing transaction…");
+            const transaction = prepareTransaction({
+                client,
+                chain,
+                to: params.to,
+                data: params.data,
+                value: params.value,
+            });
+            // Check if we can use global-accounts-intents, if yes, create an intent.
+            try {
+                await app.service("global-accounts-intents").create({
+                    partnerId: String(process.env.PUBLIC_GLOBAL_ACCOUNTS_PARTNER_ID || process.env.NEXT_PUBLIC_GLOBAL_ACCOUNTS_PARTNER_ID),
+                    chainId: targetChainId,
+                    to: params.to,
+                    data: params.data || "0x",
+                    value: params.value.toString(),
+                });
+            }
+            catch (err) {
+                console.error(err);
+            }
+            toast.info("Sending transaction…");
+            const sendTxResponse = await twSendTransaction({
+                account: aaAccount,
+                transaction,
+            });
+            toast.success("Transaction sent successfully");
+            return sendTxResponse.transactionHash;
+        }
+        catch (err) {
+            console.error(err);
+            toast.error(err?.message ?? "Transaction failed");
+            return undefined;
+        }
+        finally {
+            setIsSwitchingOrExecuting(false);
+        }
+    }, [aaAccount]);
+    // Unified switch chain and execute function
+    const switchChainAndExecute = useCallback(async (targetChainId, params) => {
+        // Check which wallet type is active
+        if (isActiveSmartWallet) {
+            return handleAASendTransaction(targetChainId, params);
+        }
+        else if (isActiveEOAWallet) {
+            return handleEOASwitchChainAndSendTransaction(targetChainId, params);
+        }
+        else {
+            toast.error("No wallet connected");
+            return undefined;
+        }
+    }, [isActiveSmartWallet, isActiveEOAWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction]);
+    return {
+        switchChainAndExecute,
+        isSwitchingOrExecuting,
+        isActiveSmartWallet,
+        isActiveEOAWallet,
+    };
+}

package/dist/esm/shared/constants/chains/supported.d.ts

@@ -62,3 +62,7 @@ export declare const b3TestnetThirdWeb: Readonly<import("thirdweb/dist/types/cha
 export declare const b3Mainnet: import("viem").Chain;
 export declare const b3Testnet: import("viem").Chain;
 export declare const baseMainnet: import("viem").Chain;
+/**
+ * Get a Thirdweb chain by chain ID from supportedChainsTW
+ */
+export declare function getThirdwebChain(chainId: number): ThirdwebChain;

package/dist/esm/shared/constants/chains/supported.js

@@ -45,3 +45,13 @@ export const b3Testnet = _b3Testnet;
 const _baseMainnet = supportedChains.find(chain => chain.id === 8453);
 invariant(_baseMainnet, "Base mainnet chain not found in supported chains");
 export const baseMainnet = _baseMainnet;
+/**
+ * Get a Thirdweb chain by chain ID from supportedChainsTW
+ */
+export function getThirdwebChain(chainId) {
+    const chain = supportedChainsTW.find(c => c.id === chainId);
+    if (!chain) {
+        throw new Error(`Chain ${chainId} is not supported`);
+    }
+    return chain;
+}

package/dist/esm/shared/generated/chain-networks.json

@@ -127,7 +127,7 @@
     "name": "Ethereum",
     "rpcUrls": {
       "default": {
-        "http": "https://cloudflare-eth.com",
+        "http": "https://eth.llamarpc.com",
         "ws": "wss://late-dimensional-yard.b3-mainnet.quiknode.pro/461dbdbd44158cd7a7a764a58ffb01a67eef77f2"
       },
       "backups": []