@b3dotfun/sdk 0.0.35 → 0.0.36

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

@@ -1,6 +1,7 @@
 import { useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { getIpfsUrl } from "@b3dotfun/sdk/shared/utils/ipfs";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
@@ -43,7 +44,7 @@ export function useAccountWallet(): {
   eoaWalletIcon?: string;
   smartWalletIcon?: string;
 } {
-  const { account } = useB3();
+  const { account, user } = useB3();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();
@@ -72,7 +73,7 @@ export function useAccountWallet(): {
 
   const { data: profileData } = useProfile({ address: account?.address });
   const ensName = profileData?.displayName?.replace(/\.b3\.fun/g, "");
-  const avatarUrl = profileData?.avatar;
+  const avatarUrl = user?.avatar ? getIpfsUrl(user?.avatar) : profileData?.avatar;
 
   const res = useMemo(
     () => ({

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

@@ -1,4 +1,5 @@
 import app from "@b3dotfun/sdk/global-account/app";
+import { authenticateWithB3JWT } from "@b3dotfun/sdk/global-account/bsmnt";
 import { useAuthStore, useB3 } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { b3MainnetThirdWeb } from "@b3dotfun/sdk/shared/constants/chains/supported";
@@ -19,17 +20,15 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
   const activeWallet = useActiveWallet();
   const { authenticate } = useSiwe();
   const { setUser } = useB3();
-  const isAuthenticating = useAuthStore(state => state.isAuthenticating);
   const isAuthenticated = useAuthStore(state => state.isAuthenticated);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-  const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsConnecting = useAuthStore(state => state.setIsConnecting);
   const setIsConnected = useAuthStore(state => state.setIsConnected);
   const isConnecting = useAuthStore(state => state.isConnecting);
   const isConnected = useAuthStore(state => state.isConnected);
   const useAutoConnectLoadingPrevious = useRef(false);
-  const setIsAuthenticatingV2 = useAuthStore(state => state.setIsAuthenticatingV2);
-  const isAuthenticatingV2 = useAuthStore(state => state.isAuthenticatingV2);
+  const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+  const isAuthenticating = useAuthStore(state => state.isAuthenticating);
   const hasStartedConnecting = useAuthStore(state => state.hasStartedConnecting);
   const setHasStartedConnecting = useAuthStore(state => state.setHasStartedConnecting);
   const { connect } = useConnect(partnerId, b3MainnetThirdWeb);
@@ -50,11 +49,10 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
           debug("Skipping SIWE login", { loginWithSiwe });
           setIsAuthenticated(true);
 
-          setIsAuthenticatingV2(false);
+          setIsAuthenticating(false);
           return;
         }
         debug("setIsAuthenticating:true:4");
-        setIsAuthenticating(true);
         const account = await wallet.getAccount();
         if (!account) {
           throw new Error("No account found during auto-connect");
@@ -65,16 +63,24 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
           const userAuth = await app.reAuthenticate();
           setUser(userAuth.user);
           setIsAuthenticated(true);
-          setIsAuthenticatingV2(false);
+          setIsAuthenticating(false);
           debug("Re-authenticated successfully", { userAuth });
+
+          // Authenticate on BSMNT with B3 JWT
+          const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+          console.log("@@b3Jwt", b3Jwt);
         } catch (error) {
           // If re-authentication fails, try fresh authentication
           debug("Re-authentication failed, attempting fresh authentication");
           const userAuth = await authenticate(account, partnerId);
           setUser(userAuth.user);
           setIsAuthenticated(true);
-          setIsAuthenticatingV2(false);
+          setIsAuthenticating(false);
           debug("Fresh authentication successful", { userAuth });
+
+          // Authenticate on BSMNT with B3 JWT
+          const b3Jwt = await authenticateWithB3JWT(userAuth.accessToken);
+          console.log("@@b3Jwt", b3Jwt);
         }
       } catch (error) {
         debug("Auto-connect authentication failed", { error });
@@ -82,7 +88,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
         debug("setIsAuthenticating:false:4");
         setUser();
       }
-      setIsAuthenticatingV2(false);
+      setIsAuthenticating(false);
     },
   });
 
@@ -91,7 +97,7 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
    */
   useEffect(() => {
     if (!useAutoConnectLoading && useAutoConnectLoadingPrevious.current && !hasStartedConnecting) {
-      setIsAuthenticatingV2(false);
+      setIsAuthenticating(false);
     }
     useAutoConnectLoadingPrevious.current = useAutoConnectLoading;
   }, [useAutoConnectLoading]);
@@ -105,16 +111,14 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
       // This prevents the flicker state where both isAuthenticating and isAuthenticated are false
       const timeout = setTimeout(() => {
         debug("setIsAuthenticating:false:5a");
-        setIsAuthenticating(false);
         setIsConnecting(false);
       }, 100); // Add a small delay to prevent quick flickers
       return () => clearTimeout(timeout);
     } else {
       debug("setIsAuthenticating:false:5b");
-      setIsAuthenticating(false);
       setIsConnecting(false);
     }
-  }, [useAutoConnectLoading, isAuthenticated, setIsAuthenticating, setIsConnecting, setIsConnected]);
+  }, [useAutoConnectLoading, isAuthenticated, setIsConnecting, setIsConnected]);
 
   const logout = async (callback?: () => void) => {
     if (activeWallet) {
@@ -151,7 +155,6 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
 
   return {
     logout,
-    isAuthenticating: useAutoConnectLoading || isAuthenticating,
     isAuthenticated,
     isReady,
     isConnecting,
@@ -159,6 +162,6 @@ export function useAuthentication(partnerId: string, loginWithSiwe?: boolean) {
     wallet,
     preAuthenticate,
     connect,
-    isAuthenticatingV2,
+    isAuthenticating,
   };
 }

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

@@ -13,7 +13,7 @@ export interface Profile {
 export interface CombinedProfile {
   name: string | null;
   address: string | null;
-  avatar: string | null;
+  avatar: string | undefined;
   bio: string | null;
   displayName: string | null;
   profiles: Profile[];

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

@@ -0,0 +1,17 @@
+"use client";
+
+import { useQueryBSMNT } from "@b3dotfun/sdk/global-account/react/hooks/useQueryBSMNT";
+
+export function useRPMToken() {
+  const {
+    data,
+    runQuery: refetch,
+    isLoading,
+    error: isError,
+  } = useQueryBSMNT("profiles", "getReadyPlayerMeToken", undefined, true);
+
+  const token = data?.token || "";
+  const accountId = data?.accountId || "";
+
+  return { token, accountId, refetch, isLoading, isError };
+}

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

@@ -7,7 +7,6 @@ interface AuthState {
   provider?: string;
   accessToken?: string;
   chain?: Chain;
-  isAuthenticating: boolean;
   isAuthenticated: boolean;
   isConnecting: boolean;
   isConnected: boolean;
@@ -17,7 +16,6 @@ interface AuthState {
   setStep: (step: "login" | "permissions") => void;
   setIsConnecting: (isConnecting: boolean) => void;
   setIsConnected: (isConnected: boolean) => void;
-  setIsAuthenticating: (isAuthenticating: boolean) => void;
   setIsAuthenticated: (isAuthenticated: boolean) => void;
   startAuth: (params: {
     provider: string;
@@ -27,8 +25,8 @@ interface AuthState {
     onError?: (error: Error) => void;
   }) => void;
   reset: () => void;
-  isAuthenticatingV2: boolean;
-  setIsAuthenticatingV2: (isAuthenticating: boolean) => void;
+  isAuthenticating: boolean;
+  setIsAuthenticating: (isAuthenticating: boolean) => void;
   hasStartedConnecting: boolean;
   setHasStartedConnecting: (hasStartedConnecting: boolean) => void;
 }
@@ -39,7 +37,6 @@ export const useAuthStore = create<AuthState>(set => ({
   provider: undefined,
   accessToken: undefined,
   chain: undefined,
-  isAuthenticating: false,
   isAuthenticated: false,
   isConnecting: false,
   isConnected: false,
@@ -49,7 +46,6 @@ export const useAuthStore = create<AuthState>(set => ({
   setStep: step => set({ step }),
   setIsConnecting: isConnecting => set({ isConnecting }),
   setIsConnected: isConnected => set({ isConnected }),
-  setIsAuthenticating: isAuthenticating => set({ isAuthenticating }),
   setIsAuthenticated: isAuthenticated => set({ isAuthenticated }),
   startAuth: params =>
     set({
@@ -73,8 +69,8 @@ export const useAuthStore = create<AuthState>(set => ({
       onSuccess: undefined,
       onError: undefined,
     }),
-  isAuthenticatingV2: true,
-  setIsAuthenticatingV2: isAuthenticating => set({ isAuthenticatingV2: isAuthenticating }),
+  isAuthenticating: true,
+  setIsAuthenticating: isAuthenticating => set({ isAuthenticating: isAuthenticating }),
   hasStartedConnecting: false,
   setHasStartedConnecting: hasStartedConnecting => set({ hasStartedConnecting }),
 }));

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

@@ -89,6 +89,10 @@ export interface ManageAccountModalProps extends BaseModalProps {
   setActiveTab?: (tab: "overview" | "tokens" | "nfts" | "apps" | "settings") => void;
   /** Whether to show the referral information */
   showReferralInfo?: boolean;
+  /** Whether to show the swap button */
+  showSwap?: boolean;
+  /** Whether to show the deposit button */
+  showDeposit?: boolean;
 }
 
 /**
@@ -305,6 +309,13 @@ export interface AnySpendDepositHypeProps extends BaseModalProps {
   onSuccess?: (amount?: string) => void;
 }
 
+export interface AvatarEditorModalProps extends BaseModalProps {
+  /** Modal type identifier */
+  type: "avatarEditor";
+  /** Callback function called when avatar is successfully set */
+  onSuccess?: () => void;
+}
+
 /**
  * Union type of all possible modal content types
  */
@@ -323,7 +334,8 @@ export type ModalContentType =
   | AnySpendSignatureMintProps
   | AnySpendBondKitProps
   | LinkAccountModalProps
-  | AnySpendDepositHypeProps;
+  | AnySpendDepositHypeProps
+  | AvatarEditorModalProps;
 // Add other modal types here like: | OtherModalProps | AnotherModalProps
 
 /**

package/src/global-account/react/utils/updateAvatar.ts

@@ -0,0 +1,21 @@
+import app, { extractAvatarIdFromUrl } from "@b3dotfun/sdk/global-account/bsmnt";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+
+const debug = debugB3React("updateAvatar");
+
+export async function updateAvatar(avatar: string) {
+  try {
+    // Extract avatar ID from URL
+    const avatarID = extractAvatarIdFromUrl(avatar);
+
+    if (!avatarID) {
+      throw new Error("Invalid avatar URL");
+    }
+
+    // Set the avatar in the profiles service
+    return await app.service("profiles").setAvatar({ avatarUrl: String(avatar), avatarID: String(avatarID) }, {});
+  } catch (error) {
+    debug("Failed to update avatar:", error);
+    throw error; // Re-throw to handle in component
+  }
+}