@b3dotfun/sdk 0.0.65-test.1 → 0.0.65-test.4

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

@@ -35,13 +35,13 @@ export declare const supportedChainNetworks: {
             uri: string;
         }[];
     };
+    _id: string | {};
     icon: {
         format: string;
         height: number;
         width: number;
         url: string;
     };
-    _id: string | {};
 }[];
 export declare const coingeckoChains: Record<number, {
     coingecko_id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.65-test.1",
+  "version": "0.0.65-test.4",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",
@@ -319,6 +319,7 @@
     "lucide-react": "0.424.0",
     "motion": "^12.23.11",
     "qrcode.react": "4.2.0",
+    "react-easy-crop": "^5.5.3",
     "react-intersection-observer": "9.16.0",
     "react-number-format": "5.4.3",
     "react-timeago": "8.2.0",

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

@@ -25,6 +25,7 @@ import {
   useTokenFromUrl,
 } from "@b3dotfun/sdk/global-account/react";
 import BottomNavigation from "@b3dotfun/sdk/global-account/react/components/ManageAccount/BottomNavigation";
+import { useAccountWalletImage } from "@b3dotfun/sdk/global-account/react/hooks/useAccountWallet";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import invariant from "invariant";
@@ -474,6 +475,8 @@ function AnySpendInner({
   const recipientProfile = useProfile({ address: recipientAddress, fresh: true });
   const recipientName = recipientProfile.data?.name;
 
+  const globalWalletImage = useAccountWalletImage();
+
   // Auto-set active wallet from wagmi
   useAutoSetActiveWalletFromWagmi();
 
@@ -1012,7 +1015,7 @@ function AnySpendInner({
   );
 
   const mainView = (
-    <div className={"mx-auto flex w-[460px] max-w-full flex-col items-center gap-2"}>
+    <div className={"mx-auto flex w-[460px] max-w-full flex-col items-center gap-2 pt-5"}>
       <div className={"flex w-full max-w-full flex-col items-center gap-2 px-5"}>
         {/* Token Header - Show when in buy mode */}
         {isBuyMode && (
@@ -1248,7 +1251,7 @@ function AnySpendInner({
       }}
       onBack={navigateBack}
       recipientEnsName={globalWallet?.ensName}
-      recipientImageUrl={globalWallet?.meta?.icon}
+      recipientImageUrl={globalWalletImage}
     />
   );
 
@@ -1265,8 +1268,6 @@ function AnySpendInner({
 
   const cryptoPaymentMethodView = (
     <CryptoPaymentMethod
-      globalAddress={globalAddress}
-      globalWallet={globalWallet}
       selectedPaymentMethod={selectedCryptoPaymentMethod}
       setSelectedPaymentMethod={setSelectedCryptoPaymentMethod}
       isCreatingOrder={isCreatingOrder}

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

@@ -1237,8 +1237,6 @@ function AnySpendCustomInner({
   const cryptoPaymentMethodView = (
     <div className={cn("bg-as-surface-primary mx-auto w-[460px] max-w-full rounded-xl p-4")}>
       <CryptoPaymentMethod
-        globalAddress={currentWallet?.wallet?.address}
-        globalWallet={currentWallet?.wallet}
         selectedPaymentMethod={selectedCryptoPaymentMethod}
         setSelectedPaymentMethod={setSelectedCryptoPaymentMethod}
         isCreatingOrder={isCreatingOrder}

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

@@ -499,8 +499,6 @@ function AnySpendCustomExactInInner({
 
   const cryptoPaymentMethodView = (
     <CryptoPaymentMethod
-      globalAddress={globalAddress}
-      globalWallet={undefined}
       selectedPaymentMethod={selectedCryptoPaymentMethod}
       setSelectedPaymentMethod={setSelectedCryptoPaymentMethod}
       isCreatingOrder={isCreatingOrder}

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

@@ -464,8 +464,6 @@ function AnySpendDepositHypeInner({
 
   const cryptoPaymentMethodView = (
     <CryptoPaymentMethod
-      globalAddress={globalAddress}
-      globalWallet={undefined}
       selectedPaymentMethod={selectedCryptoPaymentMethod}
       setSelectedPaymentMethod={setSelectedCryptoPaymentMethod}
       isCreatingOrder={isCreatingOrder}

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

@@ -1,6 +1,7 @@
 "use client";
 
 import { useAccountWallet } from "@b3dotfun/sdk/global-account/react";
+import { useAccountWalletImage } from "@b3dotfun/sdk/global-account/react/hooks/useAccountWallet";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
@@ -22,12 +23,6 @@ export enum CryptoPaymentMethodType {
 }
 
 interface CryptoPaymentMethodProps {
-  globalAddress?: string;
-  globalWallet?: {
-    meta?: {
-      icon?: string;
-    };
-  };
   selectedPaymentMethod: CryptoPaymentMethodType;
   setSelectedPaymentMethod: (method: CryptoPaymentMethodType) => void;
   isCreatingOrder: boolean;
@@ -42,11 +37,7 @@ export function CryptoPaymentMethod({
   onBack,
   onSelectPaymentMethod,
 }: CryptoPaymentMethodProps) {
-  const {
-    wallet: globalWallet,
-    connectedEOAWallet: connectedEOAWallet,
-    connectedSmartWallet: connectedSmartWallet,
-  } = useAccountWallet();
+  const { connectedEOAWallet: connectedEOAWallet, connectedSmartWallet: connectedSmartWallet } = useAccountWallet();
   const { connector, address } = useAccount();
   const { connect, connectors, isPending } = useConnect();
   const { disconnect } = useDisconnect();
@@ -58,6 +49,8 @@ export function CryptoPaymentMethod({
   const isConnected = !!connectedEOAWallet;
   const globalAddress = connectedSmartWallet?.getAccount()?.address;
 
+  const walletImage = useAccountWalletImage();
+
   // Use custom hook to determine wallet display logic
   const { shouldShowConnectedEOA, shouldShowWagmiWallet } = useConnectedWalletDisplay(selectedPaymentMethod);
 
@@ -192,7 +185,7 @@ export function CryptoPaymentMethod({
   };
 
   return (
-    <div className="crypto-payment-method mx-auto h-fit w-[460px] max-w-full px-5 pb-5">
+    <div className="crypto-payment-method mx-auto h-fit w-[460px] max-w-full px-5 pb-5 pt-5 sm:px-0 sm:pt-5">
       <div className={cn("relative flex flex-col gap-10")}>
         {/* Header */}
         <button
@@ -341,8 +334,8 @@ export function CryptoPaymentMethod({
                   >
                     <div className="flex items-center justify-between">
                       <div className="flex items-center gap-3">
-                        {globalWallet?.meta?.icon ? (
-                          <img src={globalWallet.meta.icon} alt="Global Account" className="h-10 w-10 rounded-full" />
+                        {walletImage ? (
+                          <img src={walletImage} alt="Global Account" className="h-10 w-10 rounded-full" />
                         ) : (
                           <div className="wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-purple-100">
                             <Wallet className="h-5 w-5 text-purple-600" />

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

@@ -150,7 +150,7 @@ function PanelOnrampPaymentInner(props: PanelOnrampPaymentProps) {
   };
 
   return (
-    <div className="mx-auto flex w-full max-w-[460px] flex-col gap-6 px-5">
+    <div className="mx-auto flex w-full max-w-[460px] flex-col gap-6 px-5 pt-5">
       {/* Order Summary Section */}
       <>
         <h2 className="-mb-3 text-lg font-semibold">Order summary</h2>

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

@@ -1,13 +1,16 @@
 "use client";
 
 import app from "@b3dotfun/sdk/global-account/app";
-import { Button, useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { Button, IPFSMediaRenderer, 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 { Loader2, Upload, X } from "lucide-react";
-import { useRef, useState } from "react";
+import { useCallback, useRef, useState } from "react";
+import type { Area } from "react-easy-crop";
+import Cropper from "react-easy-crop";
+import "react-easy-crop/react-easy-crop.css";
 import { toast } from "sonner";
 import { useActiveAccount } from "thirdweb/react";
 import { upload } from "thirdweb/storage";
@@ -17,6 +20,16 @@ import ModalHeader from "../ModalHeader/ModalHeader";
 
 const debug = debugB3React("AvatarEditor");
 
+// Helper function to create an image element from a URL
+const createImage = (url: string): Promise<HTMLImageElement> =>
+  new Promise((resolve, reject) => {
+    const image = new Image();
+    image.addEventListener("load", () => resolve(image));
+    image.addEventListener("error", error => reject(error));
+    image.setAttribute("crossOrigin", "anonymous");
+    image.src = url;
+  });
+
 interface AvatarEditorProps {
   onSetAvatar?: () => void;
   className?: string;
@@ -27,16 +40,18 @@ type ViewStep = "select" | "upload";
 export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
   const [viewStep, setViewStep] = useState<ViewStep>("select");
   const [selectedAvatar, setSelectedAvatar] = useState<string | null>(null);
+  const [selectedProfileType, setSelectedProfileType] = useState<string | null>(null); // Track which profile was selected
   const [hoveredProfile, setHoveredProfile] = useState<string | null>(null);
   const [selectedFile, setSelectedFile] = useState<File | null>(null);
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
-  const [isUploading, setIsUploading] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
   const [isDragging, setIsDragging] = useState(false);
+  const [crop, setCrop] = useState({ x: 0, y: 0 });
+  const [zoom, setZoom] = useState(1);
+  const [croppedAreaPixels, setCroppedAreaPixels] = useState<Area | null>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
   const { setUser, user, partnerId } = useB3();
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
-  const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const contentType = useModalStore(state => state.contentType);
   const { setPreference } = useProfileSettings();
 
@@ -46,11 +61,52 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
     fresh: true,
   });
 
-  const currentAvatar = user?.avatar
-    ? getIpfsUrl(user?.avatar)
-    : profile?.avatar
-      ? getIpfsUrl(profile.avatar)
-      : undefined;
+  // Get raw avatar URLs, convert IPFS URLs, and validate them
+  const rawCurrentAvatar = user?.avatar || profile?.avatar;
+  const currentAvatar = validateImageUrl(rawCurrentAvatar);
+  const safePreviewUrl = validateImageUrl(previewUrl);
+
+  const onCropComplete = useCallback((_croppedArea: Area, croppedAreaPixels: Area) => {
+    setCroppedAreaPixels(croppedAreaPixels);
+  }, []);
+
+  const createCroppedImage = async (imageSrc: string, pixelCrop: Area): Promise<Blob> => {
+    const image = await createImage(imageSrc);
+    const canvas = document.createElement("canvas");
+    const ctx = canvas.getContext("2d");
+
+    if (!ctx) {
+      throw new Error("Failed to get canvas context");
+    }
+
+    // Set canvas size to the crop area
+    canvas.width = pixelCrop.width;
+    canvas.height = pixelCrop.height;
+
+    // Draw the cropped image
+    ctx.drawImage(
+      image,
+      pixelCrop.x,
+      pixelCrop.y,
+      pixelCrop.width,
+      pixelCrop.height,
+      0,
+      0,
+      pixelCrop.width,
+      pixelCrop.height,
+    );
+
+    // Return as blob
+    return new Promise((resolve, reject) => {
+      canvas.toBlob(blob => {
+        if (!blob) {
+          reject(new Error("Canvas is empty"));
+          return;
+        }
+        resolve(blob);
+      }, "image/jpeg");
+    });
+  };
 
   const handleFileSelect = (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0];
@@ -68,6 +124,8 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
       }
 
       setSelectedFile(file);
+      // Clear profile type selection when uploading a new file
+      setSelectedProfileType(null);
 
       // Create preview URL
       const url = URL.createObjectURL(file);
@@ -78,6 +136,7 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
 
   const handleRemovePreview = () => {
     setSelectedAvatar(currentAvatar || null);
+    setSelectedProfileType(null);
     setSelectedFile(null);
     if (previewUrl) {
       URL.revokeObjectURL(previewUrl);
@@ -86,6 +145,10 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
     if (fileInputRef.current) {
       fileInputRef.current.value = "";
     }
+    // Reset crop state
+    setCrop({ x: 0, y: 0 });
+    setZoom(1);
+    setCroppedAreaPixels(null);
   };
 
   const handleSaveChanges = async () => {
@@ -96,14 +159,70 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
 
     setIsSaving(true);
     try {
-      // If user uploaded a new file
-      if (selectedFile) {
-        debug("Starting upload to IPFS", selectedFile);
+      let fileToUpload: File | null = null;
+
+      // If user uploaded a new file and cropped it
+      if (selectedFile && previewUrl && croppedAreaPixels) {
+        try {
+          const croppedBlob = await createCroppedImage(previewUrl, croppedAreaPixels);
+          const extension = selectedFile.name.split(".").pop() || "jpg";
+          fileToUpload = new File([croppedBlob], `avatar-cropped.${extension}`, { type: "image/jpeg" });
+        } catch (error) {
+          debug("Error cropping image:", error);
+          toast.error("Failed to crop image. Please try again.");
+          setIsSaving(false);
+          return;
+        }
+      } else if (selectedFile) {
+        // Fallback if no crop was made
+        fileToUpload = selectedFile;
+      } else if (selectedProfileType && selectedAvatar) {
+        // User selected from existing profile avatars
+        // Fetch the image from the URL and convert to blob
+        debug("Fetching image from social profile:", selectedAvatar);
+
+        try {
+          const response = await fetch(selectedAvatar);
+          if (!response.ok) {
+            throw new Error("Failed to fetch image");
+          }
+
+          const blob = await response.blob();
+          debug("Fetched blob with type:", blob.type);
+
+          // Determine the correct extension from the blob's MIME type
+          // This handles URLs without extensions (like Farcaster images)
+          const mimeToExtension: Record<string, string> = {
+            "image/jpeg": "jpg",
+            "image/jpg": "jpg",
+            "image/png": "png",
+            "image/gif": "gif",
+            "image/webp": "webp",
+            "image/svg+xml": "svg",
+          };
+
+          const extension = blob.type ? mimeToExtension[blob.type.toLowerCase()] || "jpg" : "jpg";
+          const mimeType = blob.type || `image/${extension}`;
+
+          fileToUpload = new File([blob], `avatar-${selectedProfileType}.${extension}`, { type: mimeType });
+
+          debug("Successfully converted social profile image to file with extension:", extension);
+        } catch (fetchError) {
+          debug("Error fetching social profile image:", fetchError);
+          toast.error("Failed to fetch profile image. Please try uploading manually.");
+          setIsSaving(false);
+          return;
+        }
+      }
+
+      // Upload to IPFS if we have a file
+      if (fileToUpload) {
+        debug("Starting upload to IPFS", fileToUpload);
 
         // Upload to IPFS using Thirdweb
         const ipfsUrl = await upload({
           client,
-          files: [selectedFile],
+          files: [fileToUpload],
         });
 
         debug("Upload successful", ipfsUrl);
@@ -121,23 +240,6 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
         setUser(user);
 
         toast.success("Looks great! Your avatar has been saved!");
-      } else if (selectedAvatar && selectedAvatar !== currentAvatar) {
-        // User selected from existing profile avatars
-        // Find the profile that matches the selected avatar
-        const selectedProfile = profile?.profiles?.find(p => p.avatar === selectedAvatar);
-
-        if (selectedProfile && selectedProfile.type) {
-          debug("Setting profile preference to:", selectedProfile.type);
-
-          // Set preference for this profile type
-          await setPreference(account.address, selectedProfile.type, account.address, async (message: string) => {
-            // Sign the message using the active account
-            const signature = await account.signMessage({ message });
-            return signature;
-          });
-
-          toast.success("Avatar updated successfully!");
-        }
       }
 
       // Refresh profile to get updated avatar
@@ -165,8 +267,15 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
     }
   };
 
-  const handleProfileAvatarSelect = (avatarUrl: string) => {
+  const handleProfileAvatarSelect = (avatarUrl: string, profileType: string) => {
     setSelectedAvatar(avatarUrl);
+    setSelectedProfileType(profileType);
+    // Clear any selected file since we're selecting from profile
+    setSelectedFile(null);
+    if (previewUrl) {
+      URL.revokeObjectURL(previewUrl);
+      setPreviewUrl(null);
+    }
   };
 
   const handleUploadImageClick = () => {
@@ -214,6 +323,8 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
       }
 
       setSelectedFile(file);
+      // Clear profile type selection when uploading a new file
+      setSelectedProfileType(null);
 
       // Create preview URL
       const url = URL.createObjectURL(file);
@@ -230,17 +341,22 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
     });
   };
 
-  const isLoading = isUploading || isSaving;
+  const isLoading = isSaving;
 
-  // Get profile avatars
+  // Get profile avatars with validated URLs
   const profileAvatars =
     profile?.profiles
       ?.filter(p => p.avatar)
-      .map(p => ({
-        type: p.type,
-        avatar: getIpfsUrl(p?.avatar || ""),
-        name: p.name || p.type,
-      })) || [];
+      .map(p => {
+        const rawAvatarUrl = p?.avatar || "";
+        const validatedUrl = validateImageUrl(rawAvatarUrl);
+        return {
+          type: p.type,
+          avatar: validatedUrl,
+          name: p.name || p.type,
+        };
+      })
+      .filter(p => p.avatar !== null) || []; // Filter out profiles with invalid avatars
 
   return (
     <div className={cn("flex w-full max-w-md flex-col bg-white", className)}>
@@ -254,13 +370,17 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
             {/* Avatar Preview */}
             <div className="relative mb-6">
               <div className="h-32 w-32 overflow-hidden rounded-full">
-                <img
-                  src={selectedAvatar || currentAvatar || "https://via.placeholder.com/128"}
-                  alt="Avatar preview"
-                  className="h-full w-full object-cover"
-                />
+                {safePreviewUrl || selectedAvatar || currentAvatar ? (
+                  <IPFSMediaRenderer
+                    src={safePreviewUrl || selectedAvatar || currentAvatar || ""}
+                    alt="Avatar preview"
+                    className="h-full w-full object-cover"
+                  />
+                ) : (
+                  <div className="bg-b3-primary-wash h-full w-full" />
+                )}
               </div>
-              {selectedAvatar && (
+              {(selectedAvatar !== currentAvatar || selectedFile) && (
                 <button
                   onClick={handleRemovePreview}
                   className="absolute -right-1 -top-1 flex h-8 w-8 items-center justify-center rounded-full bg-[#51525c] text-white transition-colors hover:bg-[#71717a]"
@@ -273,7 +393,7 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
             {/* Upload Image Button */}
             <button
               onClick={handleUploadImageClick}
-              className="font-inter shadow-xs mb-6 flex w-full items-center justify-center gap-2 rounded-xl border border-[#e4e4e7] bg-white px-4 py-3 text-sm font-semibold text-[#18181b] transition-colors hover:bg-[#f4f4f5]"
+              className="font-inter mb-6 flex w-full items-center justify-center gap-2 rounded-xl border border-[#e4e4e7] bg-white px-4 py-3 text-sm font-semibold text-[#18181b] shadow-sm transition-colors hover:bg-[#f4f4f5]"
             >
               <Upload className="h-4 w-4" />
               Upload image
@@ -288,37 +408,42 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
 
               {/* Profile Avatars */}
               <div className="mb-4 flex gap-3">
-                {profileAvatars.map((profileAvatar, index) => (
-                  <div
-                    key={index}
-                    className="relative"
-                    onMouseEnter={() => setHoveredProfile(profileAvatar.type)}
-                    onMouseLeave={() => setHoveredProfile(null)}
-                  >
-                    <button
-                      onClick={() => handleProfileAvatarSelect(profileAvatar.avatar)}
-                      className={cn(
-                        "h-16 w-16 overflow-hidden rounded-full border-2 transition-all",
-                        selectedAvatar === profileAvatar.avatar
-                          ? "border-[#3368ef] ring-2 ring-[#3368ef]/20"
-                          : "border-transparent hover:border-[#e4e4e7]",
-                      )}
+                {profileAvatars.map((profileAvatar, index) => {
+                  // Skip if avatar is null (should not happen due to filter, but TypeScript doesn't know that)
+                  if (!profileAvatar.avatar) return null;
+
+                  return (
+                    <div
+                      key={index}
+                      className="relative"
+                      onMouseEnter={() => setHoveredProfile(profileAvatar.type)}
+                      onMouseLeave={() => setHoveredProfile(null)}
                     >
-                      <img
-                        src={profileAvatar.avatar}
-                        alt={`${profileAvatar.type} avatar`}
-                        className="h-full w-full object-cover"
-                      />
-                    </button>
-
-                    {/* Tooltip */}
-                    {hoveredProfile === profileAvatar.type && (
-                      <div className="absolute -top-10 left-1/2 -translate-x-1/2 whitespace-nowrap rounded-md bg-[#18181b] px-3 py-1.5 text-xs text-white">
-                        {profileAvatar.name}
-                      </div>
-                    )}
-                  </div>
-                ))}
+                      <button
+                        onClick={() => handleProfileAvatarSelect(profileAvatar.avatar || "", profileAvatar.type || "")}
+                        className={cn(
+                          "h-16 w-16 overflow-hidden rounded-full border-2 transition-all",
+                          selectedProfileType === profileAvatar.type
+                            ? "border-[#3368ef] ring-2 ring-[#3368ef]/20"
+                            : "border-transparent hover:border-[#e4e4e7]",
+                        )}
+                      >
+                        <img
+                          src={profileAvatar.avatar}
+                          alt={`${profileAvatar.type} avatar`}
+                          className="h-full w-full object-cover"
+                        />
+                      </button>
+
+                      {/* Tooltip */}
+                      {hoveredProfile === profileAvatar.type && (
+                        <div className="absolute -top-10 left-1/2 -translate-x-1/2 whitespace-nowrap rounded-md bg-[#18181b] px-3 py-1.5 text-xs text-white">
+                          {profileAvatar.name}
+                        </div>
+                      )}
+                    </div>
+                  );
+                })}
               </div>
 
               {/* Link More Account */}
@@ -368,9 +493,56 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
               </div>
             ) : (
               <div className="mb-6 w-full">
-                <div className="aspect-square w-full overflow-hidden rounded-xl bg-[#f4f4f5]">
-                  <img src={previewUrl || ""} alt="Preview" className="h-full w-full object-cover" />
+                <div className="relative aspect-square w-full overflow-hidden rounded-xl bg-[#f4f4f5]">
+                  {safePreviewUrl ? (
+                    <>
+                      <Cropper
+                        image={safePreviewUrl}
+                        crop={crop}
+                        zoom={zoom}
+                        aspect={1}
+                        onCropChange={setCrop}
+                        onCropComplete={onCropComplete}
+                        onZoomChange={setZoom}
+                        cropShape="rect"
+                        showGrid={false}
+                        style={{
+                          containerStyle: {
+                            width: "100%",
+                            height: "100%",
+                            backgroundColor: "#f4f4f5",
+                          },
+                          cropAreaStyle: {
+                            border: "2px solid #3368ef",
+                            borderRadius: "0px",
+                          },
+                        }}
+                      />
+                      <button
+                        onClick={handleRemovePreview}
+                        className="absolute right-4 top-4 z-10 flex h-8 w-8 items-center justify-center rounded-full bg-[#51525c] text-white transition-colors hover:bg-[#71717a]"
+                      >
+                        <X className="h-4 w-4" />
+                      </button>
+                    </>
+                  ) : (
+                    <div className="bg-b3-primary-wash h-full w-full" />
+                  )}
                 </div>
+                {safePreviewUrl && (
+                  <div className="mt-4 flex items-center gap-3">
+                    <label className="flex-shrink-0 text-sm font-semibold text-[#475467]">Zoom</label>
+                    <input
+                      type="range"
+                      min={1}
+                      max={3}
+                      step={0.1}
+                      value={zoom}
+                      onChange={e => setZoom(Number(e.target.value))}
+                      className="flex-1 accent-[#3368ef]"
+                    />
+                  </div>
+                )}
               </div>
             )}
           </>
@@ -392,7 +564,7 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
         </Button>
         <Button
           onClick={handleSaveChanges}
-          disabled={isLoading || !selectedAvatar}
+          disabled={isLoading || (!selectedFile && !selectedProfileType)}
           className="flex-1 rounded-xl bg-[#3368ef] text-white hover:bg-[#2952cc]"
         >
           {isLoading ? (