@b3dotfun/sdk 0.0.65-alpha.0 → 0.0.65-test.3

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

@@ -1,15 +1,19 @@
 "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 { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
-import { Check, Loader2, Upload, X } from "lucide-react";
+import { 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";
+import { useProfileSettings } from "../../hooks/useProfile";
+import { useModalStore } from "../../stores";
+import ModalHeader from "../ModalHeader/ModalHeader";
 
 const debug = debugB3React("AvatarEditor");
 
@@ -18,13 +22,22 @@ interface AvatarEditorProps {
   className?: string;
 }
 
+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 fileInputRef = useRef<HTMLInputElement>(null);
-  const { setUser } = useB3();
+  const { setUser, user, partnerId } = useB3();
+  const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
+  const contentType = useModalStore(state => state.contentType);
+  const { setPreference } = useProfileSettings();
 
   const account = useActiveAccount();
   const { data: profile, refetch: refreshProfile } = useProfile({
@@ -32,9 +45,10 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
     fresh: true,
   });
 
-  // Thirdweb upload function
-
-  const hasAvatar = profile?.avatar;
+  // 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 handleFileSelect = (event: React.ChangeEvent<HTMLInputElement>) => {
     const file = event.target.files?.[0];
@@ -52,14 +66,19 @@ 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);
       setPreviewUrl(url);
+      setSelectedAvatar(url);
     }
   };
 
-  const handleRemoveFile = () => {
+  const handleRemovePreview = () => {
+    setSelectedAvatar(currentAvatar || null);
+    setSelectedProfileType(null);
     setSelectedFile(null);
     if (previewUrl) {
       URL.revokeObjectURL(previewUrl);
@@ -70,163 +89,376 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
     }
   };
 
-  const handleUpload = async () => {
-    if (!selectedFile) {
-      toast.error("Please select an image first");
+  const handleSaveChanges = async () => {
+    if (!account?.address) {
+      toast.error("No account connected");
       return;
     }
 
-    setIsUploading(true);
+    setIsSaving(true);
     try {
-      debug("Starting upload to IPFS", selectedFile);
+      let fileToUpload: File | null = null;
 
-      // Upload to IPFS using Thirdweb
-      const ipfsUrl = await upload({
-        client,
-        files: [selectedFile],
-      });
+      // If user uploaded a new file
+      if (selectedFile) {
+        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: [fileToUpload],
+        });
 
-      debug("Upload successful", ipfsUrl);
-
-      // Save avatar URL using profiles service
-      setIsSaving(true);
-      const user = await app.service("users").setAvatar(
-        {
-          avatar: ipfsUrl,
-        },
-        // @ts-expect-error - our typed client is expecting context even though it's set elsewhere
-        {},
-      );
-      // update user
-      // @ts-expect-error this resolved fine, look into why expect-error needed
-      setUser(user);
+        debug("Upload successful", ipfsUrl);
+
+        // Save avatar URL using profiles service
+        const user = await app.service("users").setAvatar(
+          {
+            avatar: ipfsUrl,
+          },
+          // @ts-expect-error - our typed client is expecting context even though it's set elsewhere
+          {},
+        );
+        // update user
+        // @ts-expect-error this resolved fine, look into why expect-error needed
+        setUser(user);
+
+        toast.success("Looks great! Your avatar has been saved!");
+      }
 
       // Refresh profile to get updated avatar
       await refreshProfile();
 
-      toast.success(
-        hasAvatar ? "Nice look! Your avatar has been updated!" : "Looks great! Your avatar has been saved!",
-      );
-
       onSetAvatar?.();
-
-      // Clean up
-      handleRemoveFile();
     } catch (error) {
-      debug("Error uploading avatar:", error);
-      toast.error("Failed to upload avatar. Please try again.");
+      debug("Error saving avatar:", error);
+      toast.error("Failed to save avatar. Please try again.");
     } finally {
-      setIsUploading(false);
       setIsSaving(false);
     }
   };
 
-  const handleFileInputClick = () => {
+  const handleCancel = () => {
+    if (viewStep === "upload") {
+      setViewStep("select");
+      handleRemovePreview();
+    } else {
+      setB3ModalContentType({
+        type: "manageAccount",
+        chain: (contentType as any)?.chain,
+        partnerId: partnerId,
+      });
+    }
+  };
+
+  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 = () => {
+    setViewStep("upload");
+  };
+
+  const handleOpenFilePicker = () => {
     fileInputRef.current?.click();
   };
 
-  const isLoading = isUploading || isSaving;
+  const handleDragEnter = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsDragging(true);
+  };
+
+  const handleDragLeave = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsDragging(false);
+  };
+
+  const handleDragOver = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+  };
+
+  const handleDrop = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsDragging(false);
+
+    const file = e.dataTransfer.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);
+      // Clear profile type selection when uploading a new file
+      setSelectedProfileType(null);
+
+      // Create preview URL
+      const url = URL.createObjectURL(file);
+      setPreviewUrl(url);
+      setSelectedAvatar(url);
+    }
+  };
+
+  const handleLinkMoreAccount = () => {
+    setB3ModalContentType({
+      type: "linkAccount",
+      chain: (contentType as any)?.chain,
+      partnerId: partnerId,
+    });
+  };
+
+  const isLoading = isSaving;
+
+  // Get profile avatars with validated URLs
+  const profileAvatars =
+    profile?.profiles
+      ?.filter(p => p.avatar)
+      .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 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">
-          {hasAvatar ? "Update Your Avatar" : "Set Your Avatar"}
-        </h2>
-        <p className="text-b3-foreground-muted font-neue-montreal-medium">
-          Upload an image to personalize your profile
-        </p>
-      </div>
+    <div className={cn("flex w-full max-w-md flex-col bg-white", className)}>
+      {/* Header */}
+      {viewStep === "upload" && <ModalHeader title="Upload Image" />}
 
-      {/* Current Avatar Display */}
-      {hasAvatar && !previewUrl && (
-        <div className="relative">
-          <div className="border-b3-primary-blue h-32 w-32 overflow-hidden rounded-full border-4">
-            <img src={profile.avatar} alt="Current avatar" className="h-full w-full object-cover" />
-          </div>
-        </div>
-      )}
-
-      {/* File Upload Area */}
-      <div className="w-full max-w-md">
-        {!selectedFile ? (
-          <div
-            onClick={handleFileInputClick}
-            className="border-b3-line hover:border-b3-primary-blue hover:bg-b3-primary-wash/20 cursor-pointer rounded-xl border-2 border-dashed p-8 text-center transition-colors"
-          >
-            <Upload className="text-b3-grey mx-auto mb-4 h-12 w-12" />
-            <p className="text-b3-grey font-neue-montreal-semibold mb-2">Click to select an image</p>
-            <p className="text-b3-foreground-muted font-neue-montreal-medium text-sm">PNG, JPG, or GIF up to 5MB</p>
-          </div>
-        ) : (
-          <div className="space-y-4">
-            {/* Preview */}
-            <div className="relative">
-              <div className="border-b3-primary-blue mx-auto h-32 w-32 overflow-hidden rounded-full border-4">
-                {previewUrl ? (
-                  <img src={previewUrl} alt="Preview" className="h-full w-full object-cover" />
+      {/* Content */}
+      <div className="flex flex-col items-center p-6">
+        {viewStep === "select" ? (
+          <>
+            {/* Avatar Preview */}
+            <div className="relative mb-6">
+              <div className="h-32 w-32 overflow-hidden rounded-full">
+                {safePreviewUrl || selectedAvatar || currentAvatar ? (
+                  <IPFSMediaRenderer
+                    src={safePreviewUrl || selectedAvatar || currentAvatar || ""}
+                    alt="Avatar preview"
+                    className="h-full w-full object-cover"
+                  />
                 ) : (
-                  <div className="bg-b3-primary-wash flex h-full w-full items-center justify-center rounded-full">
-                    <p className="text-b3-grey font-neue-montreal-semibold text-sm">No file selected</p>
-                  </div>
+                  <div className="bg-b3-primary-wash h-full w-full" />
                 )}
               </div>
-              <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>
+              {(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]"
+                >
+                  <X className="h-4 w-4" />
+                </button>
+              )}
             </div>
 
-            {/* File Info */}
-            <div className="space-y-1 text-center">
-              <p className="text-b3-grey font-neue-montreal-semibold text-sm">{selectedFile.name}</p>
-              <p className="text-b3-foreground-muted font-neue-montreal-medium text-xs">
-                {(selectedFile.size / 1024 / 1024).toFixed(2)} MB
+            {/* 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]"
+            >
+              <Upload className="h-4 w-4" />
+              Upload image
+            </button>
+
+            {/* Select Profile Image Section */}
+            <div className="w-full">
+              <h3 className="mb-2 text-base font-semibold text-[#18181b]">Select your profile image</h3>
+              <p className="mb-4 text-sm font-semibold text-[#475467]">
+                Pick an avatar from your linked profiles, ENS or upload a new one.
               </p>
-            </div>
-          </div>
-        )}
 
-        {/* Hidden file input */}
-        <input ref={fileInputRef} type="file" accept="image/*" onChange={handleFileSelect} className="hidden" />
-      </div>
+              {/* Profile Avatars */}
+              <div className="mb-4 flex gap-3">
+                {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)}
+                    >
+                      <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>
 
-      {/* Action Buttons */}
-      <div className="flex w-full max-w-md gap-3">
-        {selectedFile && (
-          <Button
-            onClick={handleUpload}
-            disabled={isLoading}
-            className="bg-b3-primary-blue hover:bg-b3-primary-blue/90 flex-1 text-white"
-          >
-            {isLoading ? (
-              <>
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-                {isUploading ? "Uploading..." : "Saving..."}
-              </>
+                      {/* 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 */}
+              <button
+                onClick={handleLinkMoreAccount}
+                className="font-inter flex items-center gap-2 text-sm font-semibold text-[#3368ef] hover:underline"
+              >
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 16 16"
+                  fill="none"
+                  xmlns="http://www.w3.org/2000/svg"
+                  className="h-4 w-4"
+                >
+                  <path
+                    d="M8.75 2.75C8.75 2.33579 8.41421 2 8 2C7.58579 2 7.25 2.33579 7.25 2.75V7.25H2.75C2.33579 7.25 2 7.58579 2 8C2 8.41421 2.33579 8.75 2.75 8.75H7.25V13.25C7.25 13.6642 7.58579 14 8 14C8.41421 14 8.75 13.6642 8.75 13.25V8.75H13.25C13.6642 8.75 14 8.41421 14 8C14 7.58579 13.6642 7.25 13.25 7.25H8.75V2.75Z"
+                    fill="currentColor"
+                  />
+                </svg>
+                Link more account
+              </button>
+            </div>
+          </>
+        ) : (
+          <>
+            {/* Upload View */}
+            {!selectedFile ? (
+              <div
+                onClick={handleOpenFilePicker}
+                onDragEnter={handleDragEnter}
+                onDragLeave={handleDragLeave}
+                onDragOver={handleDragOver}
+                onDrop={handleDrop}
+                className={cn(
+                  "mb-6 flex w-full cursor-pointer flex-col items-center justify-center rounded-xl border-2 border-dashed p-16 transition-colors",
+                  isDragging
+                    ? "border-[#3368ef] bg-[#f0f5ff]"
+                    : "border-[#e4e4e7] hover:border-[#3368ef] hover:bg-[#f0f5ff]",
+                )}
+              >
+                <p className="font-inter mb-1 text-sm">
+                  <span className="font-semibold text-[#3368ef]">Click to upload</span>
+                  <span className="text-[#71717a]"> or drag and drop</span>
+                </p>
+                <p className="text-xs text-[#71717a]">PNG, JPG or GIF (up to 5MB)</p>
+              </div>
             ) : (
-              <>
-                <Check className="mr-2 h-4 w-4" />
-                {hasAvatar ? "Update Avatar" : "Set Avatar"}
-              </>
+              <div className="mb-6 w-full">
+                <div className="aspect-square w-full overflow-hidden rounded-xl bg-[#f4f4f5]">
+                  {safePreviewUrl ? (
+                    <img src={safePreviewUrl} alt="Preview" className="h-full w-full object-cover" />
+                  ) : (
+                    <div className="bg-b3-primary-wash h-full w-full" />
+                  )}
+                </div>
+              </div>
             )}
-          </Button>
+          </>
         )}
 
-        <Button variant="outline" onClick={handleFileInputClick} disabled={isLoading} className="flex-1">
-          <Upload className="mr-2 h-4 w-4" />
-          {selectedFile ? "Change Image" : "Select Image"}
-        </Button>
+        {/* Hidden file input */}
+        <input ref={fileInputRef} type="file" accept="image/*" onChange={handleFileSelect} className="hidden" />
       </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>
+      {/* Footer Buttons */}
+      <div className="font-inter flex gap-3 border-t border-[#e4e4e7] p-6 font-semibold">
+        <Button
+          onClick={handleCancel}
+          variant="outline"
+          disabled={isLoading}
+          className="flex-1 rounded-xl border-[#e4e4e7] text-[#18181b] hover:bg-[#f4f4f5]"
+        >
+          Cancel
+        </Button>
+        <Button
+          onClick={handleSaveChanges}
+          disabled={isLoading || (!selectedFile && !selectedProfileType)}
+          className="flex-1 rounded-xl bg-[#3368ef] text-white hover:bg-[#2952cc]"
+        >
+          {isLoading ? (
+            <>
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              Saving...
+            </>
+          ) : (
+            "Save changes"
+          )}
+        </Button>
       </div>
     </div>
   );