@b3dotfun/sdk 0.0.40-alpha.2 → 0.0.40-alpha.21

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

@@ -1,12 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import app from "../../../../global-account/app.js";
 import { ecosystemWalletId } from "../../../../shared/constants/index.js";
+import { thirdwebB3Mainnet } from "../../../../shared/constants/chains/b3Chain.js";
 import { client } from "../../../../shared/utils/thirdweb.js";
-import { Loader2, Mail, Phone } from "lucide-react";
+import { Loader2, Mail, Phone, WalletIcon } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { useLinkProfile, useProfiles } from "thirdweb/react";
-import { preAuthenticate } from "thirdweb/wallets";
+import { createWallet, preAuthenticate } from "thirdweb/wallets";
+import { WalletRow } from "../../index.js";
 import { useModalStore } from "../../stores/useModalStore.js";
 import { getProfileDisplayInfo } from "../../utils/profileDisplay.js";
 import { useB3 } from "../B3Provider/useB3.js";
@@ -30,6 +32,38 @@ const AUTH_METHODS = [
         icon: _jsx(FarcasterIcon, { className: "size-6" }),
     },
 ];
+const WALLET_METHODS = [
+    {
+        id: "wallet",
+        label: "Wallet",
+        enabled: true,
+        icon: _jsx(WalletIcon, { className: "size-6" }),
+        walletType: "com.coinbase.wallet",
+    },
+    { id: "wallet", label: "Wallet", enabled: true, icon: _jsx(WalletIcon, { className: "size-6" }), walletType: "io.metamask" },
+    {
+        id: "wallet",
+        label: "Wallet",
+        enabled: true,
+        icon: _jsx(WalletIcon, { className: "size-6" }),
+        walletType: "me.rainbow",
+    },
+    {
+        id: "wallet",
+        label: "Wallet",
+        enabled: true,
+        icon: _jsx(WalletIcon, { className: "size-6" }),
+        walletType: "app.phantom",
+    },
+    { id: "wallet", label: "Wallet", enabled: true, icon: _jsx(WalletIcon, { className: "size-6" }), walletType: "io.rabby" },
+    {
+        id: "wallet",
+        label: "Wallet",
+        enabled: true,
+        icon: _jsx(WalletIcon, { className: "size-6" }),
+        walletType: "walletConnect",
+    },
+];
 export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, partnerId, className, }) {
     const { isLinking, linkingMethod, setLinkingState, navigateBack, setB3ModalContentType } = useModalStore();
     const [selectedMethod, setSelectedMethod] = useState(null);
@@ -41,12 +75,12 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
     const { data: profilesRaw = [] } = useProfiles({ client });
     // Get connected auth methods
     const connectedAuthMethods = profilesRaw
-        .filter((profile) => !["custom_auth_endpoint", "siwe"].includes(profile.type))
+        .filter((profile) => !["custom_auth_endpoint"].includes(profile.type))
         .map((profile) => profile.type);
     // Filter available auth methods
     const availableAuthMethods = AUTH_METHODS.filter(method => !connectedAuthMethods.includes(method.id) && method.enabled);
     const profiles = profilesRaw
-        .filter((profile) => !["custom_auth_endpoint", "siwe"].includes(profile.type))
+        .filter((profile) => !["custom_auth_endpoint"].includes(profile.type))
         .map((profile) => ({
         ...getProfileDisplayInfo(profile),
         originalProfile: profile,
@@ -176,6 +210,26 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
             onError?.(error);
         }
     };
+    const handleLinkWallet = async (walletType) => {
+        setLinkingState(true, "wallet");
+        console.log("selectedMethod", walletType);
+        try {
+            if (!walletType) {
+                throw new Error("Wallet type not found");
+            }
+            await linkProfile({
+                client,
+                strategy: "wallet",
+                wallet: createWallet(walletType),
+                chain: thirdwebB3Mainnet,
+            }, mutationOptions);
+        }
+        catch (error) {
+            console.error("Error linking account:", error);
+            setError(error instanceof Error ? error.message : "Failed to link account");
+            onError?.(error);
+        }
+    };
     const handleSocialLink = async (strategy) => {
         try {
             console.log("handleSocialLink", strategy);
@@ -256,5 +310,11 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
                             else {
                                 handleSocialLink(method.id);
                             }
-                        }, disabled: linkingMethod === method.id, children: isLinking && linkingMethod === method.id ? (_jsx(Loader2, { className: "h-5 w-5 animate-spin" })) : (_jsxs("div", { className: "b3-link-account-method-content flex items-center gap-4", children: [_jsx("div", { className: "b3-link-account-method-icon flex items-center justify-center rounded-full", children: method.icon }), _jsx("span", { className: "b3-link-account-method-label font-medium", children: method.label })] })) }, method.id))), availableAuthMethods.length === 0 && (_jsx("div", { className: "text-b3-foreground-muted py-8 text-center", children: "All available authentication methods have been connected" }))] })) : (_jsxs("div", { className: "b3-link-account-form space-y-4", children: [selectedMethod === "email" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Email Address" }), _jsx("input", { type: "email", placeholder: "Enter your email", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: email, onChange: e => setEmail(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "email") })] })), selectedMethod === "phone" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Phone Number" }), _jsx("input", { type: "tel", placeholder: "Enter your phone number", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: phone, onChange: e => setPhone(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "phone") }), _jsx("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Include country code (e.g., +1 for US)" })] })), error && _jsx("div", { className: "text-b3-negative font-neue-montreal-medium py-2 text-sm", children: error }), otpSent ? (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Verification Code" }), _jsx("input", { type: "text", placeholder: "Enter verification code", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: otp, onChange: e => setOtp(e.target.value) })] }), _jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleLinkAccount, children: "Link Account" })] })) : (_jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleSendOTP, disabled: (!email && !phone) || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? (_jsx(Loader2, { className: "animate-spin" })) : ("Send Verification Code") }))] }))] }));
+                        }, disabled: linkingMethod === method.id, children: isLinking && linkingMethod === method.id ? (_jsx(Loader2, { className: "h-5 w-5 animate-spin" })) : (_jsxs("div", { className: "b3-link-account-method-content flex items-center gap-4", children: [_jsx("div", { className: "b3-link-account-method-icon flex items-center justify-center rounded-full", children: method.icon }), _jsx("span", { className: "b3-link-account-method-label font-medium", children: method.label })] })) }, method.id))), WALLET_METHODS.map(method => {
+                        if (!method.walletType) {
+                            return null;
+                        }
+                        return (_jsx(WalletRow, { walletId: method.walletType, onClick: () => handleLinkWallet(method.walletType), isLoading: isLinking }, method.walletType));
+                    }), availableAuthMethods.length === 0 && (_jsx("div", { className: "text-b3-foreground-muted py-8 text-center", children: "All available authentication methods have been connected" }))] })) : (_jsxs("div", { className: "b3-link-account-form space-y-4", children: [selectedMethod === "email" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Email Address" }), _jsx("input", { type: "email", placeholder: "Enter your email", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: email, onChange: e => setEmail(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "email") })] })), selectedMethod === "phone" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Phone Number" }), _jsx("input", { type: "tel", placeholder: "Enter your phone number", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: phone, onChange: e => setPhone(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "phone") }), _jsx("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Include country code (e.g., +1 for US)" })] })), error && _jsx("div", { className: "text-b3-negative font-neue-montreal-medium py-2 text-sm", children: error }), (selectedMethod === "email" || selectedMethod === "phone") &&
+                        (otpSent ? (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Verification Code" }), _jsx("input", { type: "text", placeholder: "Enter verification code", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: otp, onChange: e => setOtp(e.target.value) })] }), _jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleLinkAccount, children: "Link Account" })] })) : (_jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleSendOTP, disabled: (!email && !phone) || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? (_jsx(Loader2, { className: "animate-spin" })) : ("Send Verification Code") })))] }))] }));
 }

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

@@ -4,6 +4,7 @@ import { Button, TabsContentPrimitive, TabsListPrimitive, TabsPrimitive, TabTrig
 import { SignOutIcon } from "../../../../global-account/react/components/icons/SignOutIcon.js";
 import { formatNumber } from "../../../../shared/utils/formatNumber.js";
 import { client } from "../../../../shared/utils/thirdweb.js";
+import { truncateAddress } from "../../../../shared/utils/truncateAddress.js";
 import { BarChart3, Coins, Copy, Image, LinkIcon, Loader2, Pencil, Settings, UnlinkIcon } from "lucide-react";
 import { useRef, useState } from "react";
 import { toast } from "sonner";
@@ -12,6 +13,21 @@ import { formatUnits } from "viem";
 import { getProfileDisplayInfo } from "../../utils/profileDisplay.js";
 import { AccountAssets } from "../AccountAssets/AccountAssets.js";
 import { ContentTokens } from "./ContentTokens.js";
+// Helper function to check if a string is a wallet address and format it
+const formatProfileTitle = (title) => {
+    // Check if title looks like an Ethereum address (0x followed by 40 hex characters)
+    const isEthereumAddress = /^0x[a-fA-F0-9]{40}$/.test(title);
+    if (isEthereumAddress) {
+        return {
+            displayTitle: truncateAddress(title),
+            isAddress: true,
+        };
+    }
+    return {
+        displayTitle: title,
+        isAddress: false,
+    };
+};
 import { BalanceContent } from "./BalanceContent.js";
 export function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit, chain, partnerId, showSwap, showDeposit, }) {
     const [revokingSignerId, setRevokingSignerId] = useState(null);
@@ -111,7 +127,7 @@ export function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit
             }
         };
         const profiles = profilesRaw
-            .filter((profile) => !["custom_auth_endpoint", "siwe"].includes(profile.type))
+            .filter((profile) => !["custom_auth_endpoint"].includes(profile.type))
             .map((profile) => ({
             ...getProfileDisplayInfo(profile),
             originalProfile: profile,
@@ -146,7 +162,24 @@ export function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit
                 },
             });
         };
-        return (_jsxs("div", { className: "linked-accounts-settings space-y-8", children: [_jsxs("div", { className: "linked-accounts-section space-y-4", children: [_jsxs("div", { className: "linked-accounts-header flex items-center justify-between", children: [_jsx("h3", { className: "text-b3-grey font-neue-montreal-semibold linked-accounts-settings-title text-xl", children: "Linked Accounts" }), _jsxs(Button, { className: "linked-accounts-settings-button linked-accounts-link-button bg-b3-primary-wash hover:bg-b3-primary-wash/70 flex items-center gap-2 rounded-full px-4 py-2", onClick: handleOpenLinkModal, disabled: isLinking, children: [isLinking ? (_jsx(Loader2, { className: "linked-accounts-link-loading text-b3-primary-blue animate-spin", size: 16 })) : (_jsx(LinkIcon, { size: 16, className: "linked-accounts-link-icon text-b3-primary-blue" })), _jsx("span", { className: "linked-accounts-link-text text-b3-grey font-neue-montreal-semibold", children: isLinking ? "Linking..." : "Link New Account" })] })] }), isLoadingProfiles ? (_jsx("div", { className: "linked-accounts-loading flex justify-center py-8", children: _jsx(Loader2, { className: "text-b3-grey animate-spin" }) })) : profiles.length > 0 ? (_jsx("div", { className: "linked-accounts-list space-y-4", children: profiles.map(profile => (_jsxs("div", { className: "linked-account-item bg-b3-line flex items-center justify-between rounded-xl p-4", children: [_jsxs("div", { className: "linked-account-info flex items-center gap-3", children: [profile.imageUrl ? (_jsx("img", { src: profile.imageUrl, alt: profile.title, className: "linked-account-avatar linked-account-avatar-image size-10 rounded-full" })) : (_jsx("div", { className: "linked-account-avatar linked-account-avatar-placeholder bg-b3-primary-wash flex h-10 w-10 items-center justify-center rounded-full", children: _jsx("span", { className: "linked-account-initial text-b3-grey font-neue-montreal-semibold text-sm uppercase", children: profile.initial }) })), _jsxs("div", { className: "linked-account-details", children: [_jsxs("div", { className: "linked-account-title-row flex items-center gap-2", children: [_jsx("span", { className: "linked-account-title text-b3-grey font-neue-montreal-semibold", children: profile.title }), _jsx("span", { className: "linked-account-type text-b3-foreground-muted font-neue-montreal-medium bg-b3-primary-wash rounded px-2 py-0.5 text-xs", children: profile.type.toUpperCase() })] }), _jsx("div", { className: "linked-account-subtitle text-b3-foreground-muted font-neue-montreal-medium text-sm", children: profile.subtitle })] })] }), _jsx(Button, { variant: "ghost", size: "icon", className: "linked-account-unlink-button text-b3-grey hover:text-b3-negative", onClick: () => handleUnlink(profile), disabled: unlinkingAccountId === profile.title || isUnlinking, children: unlinkingAccountId === profile.title || isUnlinking ? (_jsx(Loader2, { className: "linked-account-unlink-loading animate-spin" })) : (_jsx(UnlinkIcon, { size: 16, className: "linked-account-unlink-icon" })) })] }, profile.title))) })) : (_jsx("div", { className: "linked-accounts-empty text-b3-foreground-muted py-8 text-center", children: "No linked accounts found" }))] }), showReferralInfo && (
+        console.log("@@profiles", profiles);
+        return (_jsxs("div", { className: "linked-accounts-settings space-y-8", children: [_jsxs("div", { className: "linked-accounts-section space-y-4", children: [_jsxs("div", { className: "linked-accounts-header flex items-center justify-between", children: [_jsx("h3", { className: "text-b3-grey font-neue-montreal-semibold linked-accounts-settings-title text-xl", children: "Linked Accounts" }), _jsxs(Button, { className: "linked-accounts-settings-button linked-accounts-link-button bg-b3-primary-wash hover:bg-b3-primary-wash/70 flex items-center gap-2 rounded-full px-4 py-2", onClick: handleOpenLinkModal, disabled: isLinking, children: [isLinking ? (_jsx(Loader2, { className: "linked-accounts-link-loading text-b3-primary-blue animate-spin", size: 16 })) : (_jsx(LinkIcon, { size: 16, className: "linked-accounts-link-icon text-b3-primary-blue" })), _jsx("span", { className: "linked-accounts-link-text text-b3-grey font-neue-montreal-semibold", children: isLinking ? "Linking..." : "Link New Account" })] })] }), isLoadingProfiles ? (_jsx("div", { className: "linked-accounts-loading flex justify-center py-8", children: _jsx(Loader2, { className: "text-b3-grey animate-spin" }) })) : profiles.length > 0 ? (_jsx("div", { className: "linked-accounts-list space-y-4", children: profiles.map(profile => (_jsxs("div", { className: "linked-account-item bg-b3-line group flex items-center justify-between rounded-xl p-4", children: [_jsxs("div", { className: "linked-account-info flex items-center gap-3", children: [profile.imageUrl ? (_jsx("img", { src: profile.imageUrl, alt: profile.title, className: "linked-account-avatar linked-account-avatar-image size-10 rounded-full" })) : (_jsx("div", { className: "linked-account-avatar linked-account-avatar-placeholder bg-b3-primary-wash flex h-10 w-10 items-center justify-center rounded-full", children: _jsx("span", { className: "linked-account-initial text-b3-grey font-neue-montreal-semibold text-sm uppercase", children: profile.initial }) })), _jsxs("div", { className: "linked-account-details", children: [_jsxs("div", { className: "linked-account-title-row flex items-center gap-2", children: [(() => {
+                                                                const { displayTitle, isAddress } = formatProfileTitle(profile.title);
+                                                                const handleCopyAddress = async (e) => {
+                                                                    e.stopPropagation();
+                                                                    try {
+                                                                        await navigator.clipboard.writeText(profile.title);
+                                                                        toast.success("Address copied to clipboard!");
+                                                                    }
+                                                                    catch (error) {
+                                                                        toast.error("Failed to copy address");
+                                                                    }
+                                                                };
+                                                                return (_jsxs("div", { className: "flex items-center gap-1", children: [_jsx("span", { className: `linked-account-title text-b3-grey font-neue-montreal-semibold ${isAddress
+                                                                                ? "font-mono text-sm" // Use monospace font for addresses
+                                                                                : "break-words" // Use break-words for emails/names (better than break-all)
+                                                                            }`, title: isAddress ? profile.title : undefined, children: displayTitle }), isAddress && (_jsx("button", { onClick: handleCopyAddress, className: "linked-account-copy-button ml-1 rounded p-1 opacity-0 transition-opacity hover:bg-gray-100 group-hover:opacity-100", title: "Copy full address", children: _jsx(Copy, { size: 12, className: "text-gray-500 hover:text-gray-700" }) }))] }));
+                                                            })(), _jsx("span", { className: "linked-account-type text-b3-foreground-muted font-neue-montreal-medium bg-b3-primary-wash rounded px-2 py-0.5 text-xs", children: profile.type.toUpperCase() })] }), _jsx("div", { className: "linked-account-subtitle text-b3-foreground-muted font-neue-montreal-medium text-sm", children: profile.subtitle })] })] }), _jsx(Button, { variant: "ghost", size: "icon", className: "linked-account-unlink-button text-b3-grey hover:text-b3-negative", onClick: () => handleUnlink(profile), disabled: unlinkingAccountId === profile.title || isUnlinking, children: unlinkingAccountId === profile.title || isUnlinking ? (_jsx(Loader2, { className: "linked-account-unlink-loading animate-spin" })) : (_jsx(UnlinkIcon, { size: 16, className: "linked-account-unlink-icon" })) })] }, profile.title))) })) : (_jsx("div", { className: "linked-accounts-empty text-b3-foreground-muted py-8 text-center", children: "No linked accounts found" }))] }), showReferralInfo && (
                 /* Referral Section */
                 _jsxs("div", { className: "referrals-section space-y-4", children: [_jsx("h3", { className: "referrals-title text-b3-grey font-neue-montreal-semibold text-xl", children: "Referrals" }), _jsxs("div", { className: "referral-code-container bg-b3-line rounded-xl p-4", children: [isEditingCode && (_jsxs("div", { className: "referral-code-header-editing", children: [_jsx("div", { className: "referral-code-title text-b3-grey font-neue-montreal-semibold", children: "Your Referral Code" }), _jsx("div", { className: "referral-code-description text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Share this code with friends to earn rewards" })] })), _jsxs("div", { className: "referral-code-content flex items-center justify-between", children: [!isEditingCode && (_jsxs("div", { className: "referral-code-header", children: [_jsx("div", { className: "referral-code-title text-b3-grey font-neue-montreal-semibold", children: "Your Referral Code" }), _jsx("div", { className: "referral-code-description text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Share this code with friends to earn rewards" })] })), _jsx("div", { className: "referral-code-actions flex items-center gap-2", children: isEditingCode ? (_jsxs("div", { className: "referral-code-edit-form flex items-center gap-2", children: [_jsx("input", { type: "text", value: newReferralCode, onChange: e => setNewReferralCode(e.target.value), className: "referral-code-input rounded-lg border border-gray-200 bg-white px-3 py-1.5 text-sm", placeholder: "Enter new code", ref: referallCodeRef }), _jsx(Button, { size: "sm", className: "referral-code-save-button", onClick: handleUpdateReferralCode, disabled: isUpdatingCode || !newReferralCode, children: isUpdatingCode ? (_jsx(Loader2, { className: "referral-code-save-loading h-4 w-4 animate-spin" })) : ("Save") }), _jsx(Button, { size: "sm", variant: "ghost", className: "referral-code-cancel-button", onClick: () => {
                                                             setIsEditingCode(false);

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

@@ -1,10 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
-import { debug } from "../../../../../shared/utils/debug.js";
+import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { useState } from "react";
 import { useConnect as useConnectTW } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
+const debug = debugB3React("LoginStepCustom");
 export function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
     const [isLoading, setIsLoading] = useState(false);
     const [showAllWallets, setShowAllWallets] = useState(false);
@@ -42,7 +43,7 @@ export function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategi
                 connectResult = await connect(options);
             }
             const account = connectResult?.getAccount();
-            console.log("@@gio:connectResult", { connectResult, account, options });
+            debug("@@connectResult", { connectResult, account, options });
             if (!account)
                 throw new Error("Failed to connect");
             await onSuccess(account);

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

@@ -116,8 +116,7 @@ export function useAuthentication(partnerId, loginWithSiwe) {
         if (activeWallet) {
             debug("@@logout:activeWallet", activeWallet);
             disconnect(activeWallet);
-            debug("@@logout:disconnected");
-            console.log("@@gio:logout:activeWallet", activeWallet);
+            debug("@@logout:activeWallet", activeWallet);
         }
         // Log out of each wallet
         wallets.forEach(wallet => {

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

@@ -3,8 +3,8 @@ async function fetchSimBalance(address) {
     if (!address)
         throw new Error("Address is required");
     let url = `https://simdune-api.sean-430.workers.dev/?url=https://api.sim.dune.com/v1/evm/balances/${address}?metadata=logo&chain_ids=mainnet`;
-    if (process.env.PUBLIC_LOCAL_KEY) {
-        url += `&localkey=${process.env.PUBLIC_LOCAL_KEY}`;
+    if (process.env.NEXT_PUBLIC_LOCAL_KEY) {
+        url += `&localkey=${process.env.NEXT_PUBLIC_LOCAL_KEY}`;
     }
     const response = await fetch(url);
     if (!response.ok) {

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

@@ -6,10 +6,11 @@ import invariant from "invariant";
 import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
+import { useActiveWallet } from "thirdweb/react";
+import { isAddress } from "viem";
 import { useSwitchChain, useWalletClient } from "wagmi";
 import { useB3 } from "../components/index.js";
 import { useAccountWallet } from "./useAccountWallet.js";
-import { isAddress } from "viem";
 const partnerId = String(process.env.PUBLIC_THIRDWEB_PARTNER_ID ||
     process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID ||
     process.env.PUBLIC_GLOBAL_ACCOUNTS_PARTNER_ID ||
@@ -19,37 +20,43 @@ export function useUnifiedChainSwitchAndExecute() {
     const { data: walletClient } = useWalletClient();
     const { switchChainAsync } = useSwitchChain();
     const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
-    const { isActiveSmartWallet, isActiveEOAWallet } = useAccountWallet();
+    const activeWallet = useActiveWallet();
+    const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
     const { account: aaAccount } = useB3();
     // Handle EOA wallet chain switch and execute transaction
     const handleEOASwitchChainAndSendTransaction = useCallback(async (targetChainId, params) => {
-        if (!walletClient) {
+        if (!connectedEOAWallet) {
             toast.error("Please connect your wallet");
             return;
         }
-        const providerId = walletClient.chain.id;
-        const onCorrectChain = providerId === targetChainId;
+        // Get target chain configuration once
+        const targetChain = supportedChains.find(chain => chain.id === targetChainId);
+        if (!targetChain) {
+            toast.error(`Chain ${targetChainId} is not supported`);
+            return;
+        }
+        const currentChainId = activeWallet?.getChain()?.id;
+        const onCorrectChain = currentChainId === targetChainId;
         // Helper function to execute the transaction
         const executeTransaction = async () => {
-            const signer = walletClient.account;
+            const signer = activeWallet?.getAccount();
             if (!signer) {
                 throw new Error("No account connected");
             }
-            // Get the target chain configuration instead of using potentially stale walletClient.chain
-            const targetChain = supportedChains.find(chain => chain.id === targetChainId);
-            if (!targetChain) {
-                throw new Error(`Chain ${targetChainId} is not supported`);
+            // Coinbase Smart Wallet specific chain switching (different behavior from other wallets)
+            const walletChain = connectedEOAWallet.getChain();
+            if (walletChain?.id !== targetChainId) {
+                activeWallet?.switchChain(getThirdwebChain(targetChainId));
             }
             invariant(isAddress(params.to), "params.to is not a valid address");
-            const hash = await walletClient.sendTransaction({
-                account: signer,
-                chain: targetChain,
+            const result = await signer.sendTransaction({
+                chainId: targetChainId,
                 to: params.to,
                 data: params.data,
                 value: params.value,
             });
-            toast.success(`Transaction sent: ${hash.slice(0, 10)}...`);
-            return hash;
+            toast.success(`Transaction sent: ${result.transactionHash.slice(0, 10)}...`);
+            return result.transactionHash;
         };
         try {
             setIsSwitchingOrExecuting(true);
@@ -57,11 +64,6 @@ export function useUnifiedChainSwitchAndExecute() {
                 return await executeTransaction();
             }
             const switchingToastId = 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);