@b3dotfun/sdk 0.0.65-test.5 → 0.0.66-alpha.0

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

@@ -0,0 +1,265 @@
+"use client";
+
+import { Users } from "@b3dotfun/b3-api";
+import app from "@b3dotfun/sdk/global-account/app";
+import { Button, useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profileDisplay";
+import { cn } from "@b3dotfun/sdk/shared/utils/cn";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { getIpfsUrl } from "@b3dotfun/sdk/shared/utils/ipfs";
+import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
+import { Check, Loader2, Upload, X } from "lucide-react";
+import { useRef, useState } from "react";
+import { toast } from "sonner";
+import { useActiveAccount } from "thirdweb/react";
+import { upload } from "thirdweb/storage";
+
+const debug = debugB3React("ProfileEditor");
+
+interface ProfileEditorProps {
+  onSuccess?: () => void;
+  className?: string;
+}
+
+export function ProfileEditor({ onSuccess, className }: ProfileEditorProps) {
+  const [selectedFile, setSelectedFile] = useState<File | null>(null);
+  const [previewUrl, setPreviewUrl] = useState<string | null>(null);
+  const [username, setUsername] = useState<string>("");
+  const [isUploading, setIsUploading] = useState(false);
+  const [isSaving, setIsSaving] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const { user, setUser } = useB3();
+
+  const account = useActiveAccount();
+  const { data: profile, refetch: refreshProfile } = useProfile({
+    address: account?.address,
+    fresh: true,
+  });
+
+  const rawAvatarUrl = user?.avatar ? getIpfsUrl(user?.avatar) : profile?.avatar;
+  const avatarUrl = validateImageUrl(rawAvatarUrl);
+  const safePreviewUrl = validateImageUrl(previewUrl);
+  const hasAvatar = !!avatarUrl;
+  const currentUsername = user?.username || "";
+
+  const handleFileSelect = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      // Validate file type
+      if (!file.type.startsWith("image/")) {
+        toast.error("Please select an image file");
+        return;
+      }
+
+      // Validate file size (max 5MB)
+      if (file.size > 5 * 1024 * 1024) {
+        toast.error("File size must be less than 5MB");
+        return;
+      }
+
+      setSelectedFile(file);
+
+      // Create preview URL
+      const url = URL.createObjectURL(file);
+      setPreviewUrl(url);
+    }
+  };
+
+  const handleRemoveFile = () => {
+    setSelectedFile(null);
+    if (previewUrl) {
+      URL.revokeObjectURL(previewUrl);
+      setPreviewUrl(null);
+    }
+    if (fileInputRef.current) {
+      fileInputRef.current.value = "";
+    }
+  };
+
+  const handleSave = async () => {
+    // Check if there are any changes
+    const hasAvatarChange = selectedFile !== null;
+    const hasUsernameChange = username.trim() !== "" && username !== currentUsername;
+
+    if (!hasAvatarChange && !hasUsernameChange) {
+      toast.error("Please make at least one change");
+      return;
+    }
+
+    setIsSaving(true);
+    try {
+      let ipfsUrl: string | undefined;
+
+      // Upload avatar if selected
+      if (hasAvatarChange && selectedFile) {
+        debug("Starting upload to IPFS", selectedFile);
+        setIsUploading(true);
+
+        ipfsUrl = await upload({
+          client,
+          files: [selectedFile],
+        });
+
+        debug("Upload successful", ipfsUrl);
+        setIsUploading(false);
+      }
+
+      // Update user profile
+      let updatedUser = user as Users | undefined;
+
+      // If both avatar and username need updating, do them sequentially
+      // Update avatar first if uploaded
+      if (ipfsUrl) {
+        // @ts-expect-error this resolved fine, look into why expect-error needed
+        updatedUser = await app.service("users").setAvatar(
+          {
+            avatar: ipfsUrl,
+          },
+          // @ts-expect-error - our typed client is expecting context even though it's set elsewhere
+          {},
+        );
+      }
+
+      // Update username if changed (this will use the updated user from avatar change if both were updated)
+      if (hasUsernameChange && user?._id) {
+        // @ts-expect-error this resolved fine, look into why expect-error needed
+        updatedUser = await app.service("users").registerUsername(
+          { username: username },
+          // @ts-expect-error - our typed client is expecting context even though it's set elsewhere
+          {},
+        );
+      }
+
+      // Update user state
+      setUser(updatedUser);
+
+      // Refresh profile to get updated data
+      await refreshProfile();
+
+      // Show success message
+      const changes = [];
+      if (hasAvatarChange) changes.push("avatar");
+      if (hasUsernameChange) changes.push("username");
+      toast.success(`Successfully updated ${changes.join(" and ")}!`);
+
+      onSuccess?.();
+
+      // Clean up
+      handleRemoveFile();
+      setUsername("");
+    } catch (error) {
+      debug("Error updating profile:", error);
+      toast.error("Failed to update profile. Please try again.");
+    } finally {
+      setIsUploading(false);
+      setIsSaving(false);
+    }
+  };
+
+  const handleFileInputClick = () => {
+    fileInputRef.current?.click();
+  };
+
+  const isLoading = isUploading || isSaving;
+  const hasChanges = selectedFile !== null || (username.trim() !== "" && username !== currentUsername);
+
+  return (
+    <div className={cn("flex flex-col items-center justify-center space-y-6 p-8", className)}>
+      <div className="space-y-2 text-center">
+        <h2 className="font-neue-montreal-semibold text-b3-grey text-2xl">Edit Your Profile</h2>
+        <p className="text-b3-foreground-muted font-neue-montreal-medium">Update your avatar and username</p>
+      </div>
+
+      {/* Avatar Section */}
+      <div className="w-full max-w-md space-y-4">
+        <div className="space-y-2">
+          <label className="text-b3-grey font-neue-montreal-semibold text-sm">Avatar</label>
+
+          {/* Current/Preview Avatar */}
+          <div className="flex justify-center">
+            {safePreviewUrl || avatarUrl ? (
+              <div className="relative">
+                <div className="border-b3-primary-blue h-32 w-32 overflow-hidden rounded-full border-4">
+                  <img
+                    src={safePreviewUrl || avatarUrl || ""}
+                    alt={safePreviewUrl ? "Preview" : "Current avatar"}
+                    className="h-full w-full object-cover"
+                  />
+                </div>
+                {safePreviewUrl && (
+                  <button
+                    onClick={handleRemoveFile}
+                    className="bg-b3-negative absolute -right-2 -top-2 flex h-8 w-8 items-center justify-center rounded-full text-white transition-colors hover:bg-red-600"
+                    disabled={isLoading}
+                  >
+                    <X size={16} />
+                  </button>
+                )}
+              </div>
+            ) : (
+              <div className="bg-b3-primary-wash h-32 w-32 rounded-full" />
+            )}
+          </div>
+
+          {/* Upload Button */}
+          {!selectedFile && (
+            <Button variant="outline" onClick={handleFileInputClick} disabled={isLoading} className="w-full">
+              <Upload className="mr-2 h-4 w-4" />
+              {hasAvatar ? "Change Avatar" : "Upload Avatar"}
+            </Button>
+          )}
+
+          {/* Hidden file input */}
+          <input ref={fileInputRef} type="file" accept="image/*" onChange={handleFileSelect} className="hidden" />
+        </div>
+
+        {/* Username Section */}
+        <div className="space-y-2">
+          <label htmlFor="username" className="text-b3-grey font-neue-montreal-semibold text-sm">
+            Username
+          </label>
+          <input
+            id="username"
+            type="text"
+            value={username}
+            onChange={e => setUsername(e.target.value)}
+            placeholder={currentUsername || "Enter username"}
+            className="border-b3-line bg-b3-background text-b3-grey placeholder:text-b3-foreground-muted font-neue-montreal-medium focus:border-b3-primary-blue w-full rounded-lg border px-4 py-3 transition-colors focus:outline-none"
+            disabled={isLoading}
+          />
+          {currentUsername && (
+            <p className="text-b3-foreground-muted font-neue-montreal-medium text-xs">Current: {currentUsername}</p>
+          )}
+        </div>
+      </div>
+
+      {/* Action Buttons */}
+      <div className="flex w-full max-w-md gap-3">
+        <Button
+          onClick={handleSave}
+          disabled={isLoading || !hasChanges}
+          className="bg-b3-primary-blue hover:bg-b3-primary-blue/90 flex-1 text-white disabled:opacity-50"
+        >
+          {isLoading ? (
+            <>
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              {isUploading ? "Uploading..." : "Saving..."}
+            </>
+          ) : (
+            <>
+              <Check className="mr-2 h-4 w-4" />
+              Save Changes
+            </>
+          )}
+        </Button>
+      </div>
+
+      {/* Help Text */}
+      <div className="text-b3-foreground-muted font-neue-montreal-medium max-w-md text-center text-xs">
+        <p>
+          Your avatar will be uploaded to IPFS and stored securely. Make sure you have the rights to use this image.
+        </p>
+      </div>
+    </div>
+  );
+}

package/src/global-account/react/components/SignInWithB3/SignIn.tsx

@@ -1,5 +1,4 @@
 import {
-  IPFSMediaRenderer,
   SignInWithB3,
   SignInWithB3ModalProps,
   StyleRoot,
@@ -14,7 +13,6 @@ import { cn, truncateAddress } from "@b3dotfun/sdk/shared/utils";
 import { Menu, MenuButton, MenuItems, Transition } from "@headlessui/react";
 import { ReactNode, useEffect } from "react";
 import { useConnectedWallets, useSetActiveWallet, useWalletInfo } from "thirdweb/react";
-import { useAccountWalletImage } from "../../hooks/useAccountWallet";
 import { ManageAccountButton } from "../custom/ManageAccountButton";
 
 type SignInProps = {
@@ -46,7 +44,7 @@ export function SignIn(props: SignInWithB3Props) {
 
   const isMobile = useIsMobile();
   const { logout } = useAuthentication(partnerId);
-  const onDisconnect = async (): Promise<void> => {
+  const onDisconnect = async () => {
     await logout();
   };
 
@@ -75,19 +73,17 @@ export function SignIn(props: SignInWithB3Props) {
     }
   }, [connectedEOAWallet, isActiveEOAWallet, setActiveWallet, automaticallySetFirstEoa]);
 
-  const walletImage = useAccountWalletImage();
-
   // Desktop version - original dropdown menu
   return (
     <StyleRoot>
       <Menu className={`relative flex items-center ${className || ""}`} as="div">
         {globalAddress ? (
           <>
-            <MenuButton className="bg-b3-react-background group flex h-10 items-center gap-1 rounded-xl px-3 focus:outline-none">
-              {!!walletImage && (
-                <IPFSMediaRenderer
-                  src={walletImage}
-                  alt="Wallet Image"
+            <MenuButton className="bg-b3-react-background group flex h-10 items-center gap-1 rounded-xl px-3">
+              {!!wallet.meta?.icon && (
+                <img
+                  src={wallet.meta.icon}
+                  alt={wallet.meta.icon}
                   className="bg-b3-react-primary h-6 w-6 rounded-full object-cover opacity-100"
                 />
               )}
@@ -102,7 +98,7 @@ export function SignIn(props: SignInWithB3Props) {
               leaveTo="scale-95 opacity-0"
             >
               <MenuItems
-                className="b3-root absolute -right-4 top-full min-w-64 rounded-2xl border focus:outline-none lg:right-0"
+                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}

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

@@ -1,4 +1,3 @@
-// TODO woj: Barrel file for all components, this might be reason of bundle size issues
 // Core Components
 export { B3DynamicModal } from "./B3DynamicModal";
 export { B3Provider, InnerProvider } from "./B3Provider/B3Provider";
@@ -20,14 +19,9 @@ export { getConnectOptionsFromStrategy, isWalletType, type AllowedStrategy } fro
 // ManageAccount Components
 export { ManageAccount } from "./ManageAccount/ManageAccount";
 
-// Deposit Components
-export { Deposit } from "./Deposit/Deposit";
-
-// Send Components
-export { Send } from "./Send/Send";
-
-// Media Components
-export { IPFSMediaRenderer } from "./IPFSMediaRenderer/IPFSMediaRenderer";
+// Profile Components
+export { AvatarEditor } from "./AvatarEditor/AvatarEditor";
+export { ProfileEditor } from "./ProfileEditor/ProfileEditor";
 
 // RequestPermissions Components
 export { RequestPermissions } from "./RequestPermissions/RequestPermissions";
@@ -106,12 +100,12 @@ export { ScrollArea, ScrollBar } from "./ui/scroll-area";
 export { ShinyButton } from "./ui/ShinyButton";
 export { Skeleton } from "./ui/skeleton";
 export {
+  TabTrigger as TabTriggerPrimitive,
   TabsContent as TabsContentPrimitive,
   TabsList as TabsListPrimitive,
   Tabs as TabsPrimitive,
-  TabTrigger as TabTriggerPrimitive,
 } from "./ui/Tabs";
-export { Tabs, TabsContent, TabsList, TabsTransitionWrapper, TabTrigger } from "./ui/TabSystem";
+export { TabTrigger, Tabs, TabsContent, TabsList, TabsTransitionWrapper } from "./ui/TabSystem";
 export { TextLoop } from "./ui/text-loop";
 export { TextShimmer } from "./ui/text-shimmer";
 export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./ui/tooltip";

package/src/global-account/react/components/ui/Tabs.tsx

@@ -16,18 +16,26 @@ export const Tabs = ({
 );
 
 export function TabsList({ className, ...props }: React.ComponentProps<typeof TabsPrimitive.List>) {
-  return <TabsPrimitive.List className={cn("", className)} {...props} />;
+  return (
+    <TabsPrimitive.List
+      className={cn(
+        "border-b3-react-border bg-b3-react-background inline-flex h-12 w-full items-center justify-center rounded-lg border",
+        className,
+      )}
+      {...props}
+    />
+  );
 }
 
 export function TabTrigger({ className, ...props }: React.ComponentProps<typeof TabsPrimitive.Trigger>) {
   return (
     <TabsPrimitive.Trigger
       className={cn(
-        "text-md inline-flex h-full items-center justify-center whitespace-nowrap px-3 font-semibold transition-all",
+        "inline-flex h-full items-center justify-center whitespace-nowrap px-3 text-sm font-medium transition-all",
         "focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50",
-        "data-[state=active]:text-b3-react-primary data-[state=active]:font-bold",
-        "hover:text-b3-react-foreground data-[state=inactive]:text-b3-react-muted-foreground",
-        "flex-1",
+        "data-[state=active]:bg-b3-react-subtle data-[state=active]:text-b3-react-primary data-[state=active]:font-bold",
+        "border-b3-react-border hover:text-b3-react-foreground data-[state=inactive]:border-b3-react-border data-[state=inactive]:text-b3-react-muted-foreground",
+        "flex-1 border-r",
         className,
       )}
       {...props}

package/src/global-account/react/components/ui/dialog.tsx

@@ -42,7 +42,7 @@ type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.
 
 const DialogContent: React.ForwardRefExoticComponent<DialogContentProps & React.RefAttributes<DialogContentElement>> =
   React.forwardRef<DialogContentElement, DialogContentProps>(
-    ({ className, children, hideCloseButton = true, closeBtnClassName, ...props }, ref) => {
+    ({ className, children, hideCloseButton = false, closeBtnClassName, ...props }, ref) => {
       const container = typeof window !== "undefined" ? document.getElementById("b3-root") : null;
       return (
         <DialogPortal container={container}>
@@ -50,7 +50,7 @@ const DialogContent: React.ForwardRefExoticComponent<DialogContentProps & React.
           <DialogPrimitive.Content
             ref={ref}
             className={cn(
-              "fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 border shadow-lg !outline-none",
+              "bg-b3-react-background fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border p-6 shadow-lg !outline-none",
               "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 duration-500",
               "data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
               "data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]",
@@ -60,36 +60,18 @@ const DialogContent: React.ForwardRefExoticComponent<DialogContentProps & React.
             )}
             {...props}
           >
-            <div className="modal-inner-content flex flex-1 flex-col overflow-hidden rounded-xl border border-[#D1D1D6] bg-white shadow-[0_20px_24px_-4px_rgba(10,13,18,0.08),0_8px_8px_-4px_rgba(10,13,18,0.03),0_3px_3px_-1.5px_rgba(10,13,18,0.04)]">
-              {children}
-              {!hideCloseButton && (
-                <DialogPrimitive.Close
-                  className={cn(
-                    "modal-close-button data-[state=open]:bg-b3-react-background data-[state=open]:text-b3-react-muted-foreground absolute right-2 top-2 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none dark:data-[state=open]:bg-gray-800 dark:data-[state=open]:text-gray-400",
-                    closeBtnClassName,
-                  )}
-                >
-                  <X className="h-5 w-5" />
-                  <span className="sr-only">Close</span>
-                </DialogPrimitive.Close>
-              )}
-            </div>
-            {/* Global Account Footer */}
-            <div className="b3-modal-ga-branding flex items-center justify-center gap-1.5 pt-[10px]">
-              <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path
-                  d="M2 4.66667C2 3.19391 3.19391 2 4.66667 2H11.3333C12.8061 2 14 3.19391 14 4.66667V11.3333C14 12.8061 12.8061 14 11.3333 14H4.66667C3.19391 14 2 12.8061 2 11.3333V4.66667Z"
-                  fill="#0B57C2"
-                />
-                <path
-                  d="M5.33333 6C5.33333 5.63181 5.63181 5.33333 6 5.33333H10C10.3682 5.33333 10.6667 5.63181 10.6667 6V10C10.6667 10.3682 10.3682 10.6667 10 10.6667H6C5.63181 10.6667 5.33333 10.3682 5.33333 10V6Z"
-                  fill="white"
-                />
-              </svg>
-              <span className="font-neue-montreal-semibold text-xs uppercase leading-none tracking-[0.72px] text-[#0B57C2]">
-                Global Account
-              </span>
-            </div>
+            {children}
+            {!hideCloseButton && (
+              <DialogPrimitive.Close
+                className={cn(
+                  "modal-close-button data-[state=open]:bg-b3-react-background data-[state=open]:text-b3-react-muted-foreground absolute right-2 top-2 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none dark:data-[state=open]:bg-gray-800 dark:data-[state=open]:text-gray-400",
+                  closeBtnClassName,
+                )}
+              >
+                <X className="h-5 w-5" />
+                <span className="sr-only">Close</span>
+              </DialogPrimitive.Close>
+            )}
           </DialogPrimitive.Content>
         </DialogPortal>
       );

package/src/global-account/react/components/ui/drawer.tsx

@@ -35,7 +35,7 @@ const DrawerContent = React.forwardRef<
       <DrawerPrimitive.Content
         ref={ref}
         className={cn(
-          "bg-b3-react-background fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border py-6 pt-5",
+          "bg-b3-react-background fixed inset-x-0 bottom-0 z-50 mt-24 flex h-auto flex-col rounded-t-[10px] border py-6",
           className,
         )}
         {...props}

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

@@ -26,12 +26,9 @@ export { useOneBalance } from "./useOneBalance";
 export {
   useProfile,
   useProfilePreference,
-  useProfileSettings,
-  useDisplayName,
   type CombinedProfile,
   type PreferenceRequestBody,
   type Profile,
-  type DisplayNameRequestBody,
 } from "./useProfile";
 export { useQueryB3 } from "./useQueryB3";
 export { useQueryBSMNT } from "./useQueryBSMNT";

package/src/global-account/react/hooks/useAccountWallet.tsx

@@ -112,29 +112,3 @@ export function useAccountWallet(): {
 
   return res;
 }
-
-export function useAccountWalletImage(): string {
-  const { account, user } = useB3();
-
-  const activeWallet = useActiveWallet();
-  const connectedWallets = useConnectedWallets();
-
-  const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);
-  const connectedEOAWallet = connectedWallets.find(wallet => wallet.id !== ecosystemWalletId);
-  const isActiveSmartWallet = activeWallet?.id === connectedSmartWallet?.id;
-
-  const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
-
-  // If not EOA sign in, then we need to show the smart wallet icon
-  const lastAuthProvider = useLastAuthProvider();
-
-  const smartWalletIcon =
-    lastAuthProvider && !connectedEOAWallet
-      ? socialIcons[lastAuthProvider as keyof typeof socialIcons]
-      : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
-
-  const { data: profileData } = useProfile({ address: account?.address });
-  const avatarUrl = user?.avatar || profileData?.avatar;
-
-  return avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "";
-}

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

@@ -104,7 +104,6 @@ export function useB3BalanceFromAddresses(
     enabled: (options?.enabled ?? true) && normalizedAddresses.length > 0,
     refetchInterval: options?.refetchInterval ?? 30000, // Default 30s refresh
     staleTime: 10000, // Consider data stale after 10s
-    structuralSharing: false, // Disable structural sharing because data contains BigInt values
   });
 }
 

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

@@ -6,7 +6,6 @@ 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 } from "wagmi";
 import { useB3 } from "../components";
@@ -29,7 +28,6 @@ invariant(partnerId, "Partner ID is required");
 export function useUnifiedChainSwitchAndExecute() {
   const { switchChainAsync } = useSwitchChain();
   const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
-  const activeWallet = useActiveWallet();
 
   const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
   const { account: aaAccount } = useB3();
@@ -49,12 +47,12 @@ export function useUnifiedChainSwitchAndExecute() {
         return;
       }
 
-      const currentChainId = activeWallet?.getChain()?.id;
+      const currentChainId = connectedEOAWallet?.getChain()?.id;
       const onCorrectChain = currentChainId === targetChainId;
 
       // Helper function to execute the transaction
       const executeTransaction = async (): Promise<string> => {
-        const signer = activeWallet?.getAccount();
+        const signer = connectedEOAWallet?.getAccount();
         if (!signer) {
           throw new Error("No account connected");
         }
@@ -62,7 +60,7 @@ export function useUnifiedChainSwitchAndExecute() {
         // Coinbase Smart Wallet specific chain switching (different behavior from other wallets)
         const walletChain = connectedEOAWallet.getChain();
         if (walletChain?.id !== targetChainId) {
-          activeWallet?.switchChain(getThirdwebChain(targetChainId));
+          connectedEOAWallet?.switchChain(getThirdwebChain(targetChainId));
         }
 
         invariant(isAddress(params.to), "params.to is not a valid address");
@@ -121,7 +119,7 @@ export function useUnifiedChainSwitchAndExecute() {
         setIsSwitchingOrExecuting(false);
       }
     },
-    [connectedEOAWallet, activeWallet, switchChainAsync],
+    [connectedEOAWallet, switchChainAsync],
   );
 
   // Handle AA wallet transaction (no chain switch needed for AA)
@@ -186,14 +184,10 @@ export function useUnifiedChainSwitchAndExecute() {
       // 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;
       }
+      return handleEOASwitchChainAndSendTransaction(targetChainId, params);
     },
-    [isActiveSmartWallet, isActiveEOAWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction],
+    [isActiveSmartWallet, handleAASendTransaction, handleEOASwitchChainAndSendTransaction],
   );
 
   return {

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

@@ -1,6 +1,5 @@
 export { useAuthStore } from "./useAuthStore";
 export { useModalStore } from "./useModalStore";
-export { useRecentAddressesStore } from "./useRecentAddressesStore";
 
 export type {
   AnySpendBuySpinProps,