@b3dotfun/sdk 0.0.87 → 0.0.88-alpha.0

package/src/global-account/react/components/ManageAccount/SettingsProfileCard.tsx

@@ -1,6 +1,6 @@
 import { ens_normalize } from "@adraffy/ens-normalize";
 import app from "@b3dotfun/sdk/global-account/app";
-import { toast, useB3, useModalStore, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { toast, useAuthentication, useB3Config, useModalStore, useProfile } from "@b3dotfun/sdk/global-account/react";
 import { formatUsername } from "@b3dotfun/sdk/shared/utils";
 import { Check, Loader2, Pencil, X } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
@@ -17,7 +17,8 @@ const SettingsProfileCard = () => {
     address: eoaAddress || account?.address,
     fresh: true,
   });
-  const { user, setUser } = useB3();
+  const { partnerId } = useB3Config();
+  const { user, setUser } = useAuthentication(partnerId);
   const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
   const navigateBack = useModalStore(state => state.navigateBack);

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

@@ -3,11 +3,11 @@ import {
   SignInWithB3ModalProps,
   StyleRoot,
   useAuthStore,
-  useB3,
   useIsMobile,
   useModalStore,
 } from "@b3dotfun/sdk/global-account/react";
 import { ReactNode, useEffect } from "react";
+import { useB3Account } from "../B3Provider/useB3Account";
 import { ManageAccountButton } from "../custom/ManageAccountButton";
 import { Loading } from "../ui/Loading";
 
@@ -20,7 +20,7 @@ export type SignInWithB3Props = Omit<SignInWithB3ModalProps, "type" | "showBackB
 
 export function SignInWithB3(props: SignInWithB3Props) {
   const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = useModalStore();
-  const { account } = useB3();
+  const account = useB3Account();
   const { isAuthenticating, isAuthenticated } = useAuthStore();
   const isMobile = useIsMobile();
 

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

@@ -1,8 +1,9 @@
 import {
   Loading,
   SignInWithB3ModalProps,
+  useAuthentication,
   useAuthStore,
-  useB3,
+  useB3Config,
   useGetAllTWSigners,
   useModalStore,
 } from "@b3dotfun/sdk/global-account/react";
@@ -33,7 +34,9 @@ export function SignInWithB3Flow({
   source = "signInWithB3Button",
   signersEnabled = false,
 }: SignInWithB3ModalProps) {
-  const { automaticallySetFirstEoa, user, refetchUser, enableTurnkey } = useB3();
+  const { automaticallySetFirstEoa, enableTurnkey } = useB3Config();
+  const { user, refetchUser } = useAuthentication(partnerId);
+
   const [step, setStep] = useState<"login" | "permissions" | null>(source === "requestPermissions" ? null : "login");
   const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
   const { setB3ModalContentType, setB3ModalOpen, isOpen, contentType } = useModalStore();

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

@@ -5,6 +5,8 @@ export { B3Provider, InnerProvider } from "./B3Provider/B3Provider";
 export { RelayKitProviderWrapper } from "./B3Provider/RelayKitProviderWrapper";
 export { B3Context, type B3ContextType } from "./B3Provider/types";
 export { useB3 } from "./B3Provider/useB3";
+export { useB3Account } from "./B3Provider/useB3Account";
+export { useB3Config } from "./B3Provider/useB3Config";
 export { StyleRoot } from "./StyleRoot";
 
 // SignInWithB3 Components

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

@@ -1,10 +1,11 @@
-import { useB3, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { useProfile } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 import { socialIcons } from "thirdweb/wallets/in-app";
+import { useB3Account } from "../components/B3Provider/useB3Account";
 
 const debug = debugB3React("useAccountWallet");
 
@@ -49,7 +50,7 @@ export function useAccountWallet(): {
   // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
   // can we possibly just use useActiveAccount here?
   // --------------------
-  const { account } = useB3();
+  const account = useB3Account();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();
@@ -114,7 +115,7 @@ export function useAccountWallet(): {
 }
 
 export function useAccountWalletImage(): string {
-  const { account } = useB3();
+  const account = useB3Account();
 
   const activeWallet = useActiveWallet();
   const connectedWallets = useConnectedWallets();

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

@@ -0,0 +1,51 @@
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useCallback, useEffect } from "react";
+import { getLastAuthProvider, useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
+import { Wallet } from "thirdweb/wallets";
+import { useAuthStore } from "../stores";
+
+const debug = debugB3React("useAutoSelectWallet");
+
+/**
+ * Hook to automatically select the first EOA wallet when user is authenticated
+ * Only auto-selects if the last auth was via wallet or no previous auth provider
+ */
+export function useAutoSelectWallet({ enabled }: { enabled: boolean }) {
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  const wallets = useConnectedWallets();
+  const setActiveWallet = useSetActiveWallet();
+
+  const setWallet = useCallback(
+    (wallet: Wallet) => {
+      debug("@@setWallet", wallet.id, wallet.getAccount()?.address);
+      setActiveWallet(wallet);
+    },
+    [setActiveWallet],
+  );
+
+  useEffect(() => {
+    const autoSelectFirstEOAWallet = async () => {
+      // Only proceed if auto-selection is enabled and user is authenticated
+      if (!enabled || !isAuthenticated) {
+        return;
+      }
+
+      // Find the first EOA wallet (excluding ecosystem wallets)
+      const isEOAWallet = (wallet: Wallet) => !wallet.id.startsWith("ecosystem.");
+      const firstEOAWallet = wallets.find(isEOAWallet);
+
+      if (firstEOAWallet) {
+        // Only auto-select if the last auth was via wallet or no previous auth provider
+        const lastAuthProvider = await getLastAuthProvider();
+        const shouldAutoSelect = lastAuthProvider === null || lastAuthProvider === "wallet";
+
+        if (shouldAutoSelect) {
+          debug("Auto-selecting first EOA wallet", firstEOAWallet.id);
+          setWallet(firstEOAWallet);
+        }
+      }
+    };
+
+    autoSelectFirstEOAWallet();
+  }, [enabled, isAuthenticated, setWallet, wallets]);
+}

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

@@ -1,9 +1,10 @@
-import app from "../../app";
-import { useAuthStore } from "../stores";
-import { useCallback, useState } from "react";
-import { useB3 } from "../components/B3Provider/useB3";
 import { TurnkeyAuthInitResponse } from "@b3dotfun/b3-api";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useCallback, useState } from "react";
+import app from "../../app";
+import { useB3Config } from "../components";
+import { useAuthStore } from "../stores";
+import { useAuthentication } from "./useAuthentication";
 
 const debug = debugB3React("useTurnkeyAuth");
 
@@ -32,7 +33,8 @@ export function useTurnkeyAuth(): UseTurnkeyAuthReturn {
   const [error, setError] = useState<string | null>(null);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-  const { user } = useB3();
+  const { partnerId } = useB3Config();
+  const { user } = useAuthentication(partnerId);
 
   /**
    * Step 1: Initiate login with email

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

@@ -9,7 +9,7 @@ import { useCallback, useState } from "react";
 import { prepareTransaction, sendTransaction as twSendTransaction } from "thirdweb";
 import { isAddress } from "viem";
 import { useSwitchChain } from "wagmi";
-import { useB3 } from "../components";
+import { useB3Account } from "../components/B3Provider/useB3Account";
 import { useAccountWallet } from "./useAccountWallet";
 
 export interface UnifiedTransactionParams {
@@ -31,7 +31,7 @@ export function useUnifiedChainSwitchAndExecute() {
   const [isSwitchingOrExecuting, setIsSwitchingOrExecuting] = useState(false);
 
   const { isActiveSmartWallet, isActiveEOAWallet, connectedEOAWallet } = useAccountWallet();
-  const { account: aaAccount } = useB3();
+  const aaAccount = useB3Account();
 
   // Handle EOA wallet chain switch and execute transaction
   const handleEOASwitchChainAndSendTransaction = useCallback(

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

@@ -151,6 +151,10 @@ export interface AnySpendModalProps extends BaseModalProps {
   customUsdInputValues?: string[];
   /** Client-provided reference ID for tracking orders */
   clientReferenceId?: string;
+  /** Whether to hide the header */
+  hideHeader?: boolean;
+  /** When true, disables URL parameter management for swap configuration */
+  disableUrlParamManagement?: boolean;
 }
 
 /**

package/src/styles/index.css

@@ -152,6 +152,7 @@
   --red-100: #fde6d7;
   --green-100: #dff9e8;
   --border-brand: #2a9fff;
+  --border-primary: #d1d1d6;
   --yellow-100: #fee6c7;
   --purple-100: #f5edfa;
   --purple-300: #ddc3ef;
@@ -249,6 +250,7 @@ html[data-theme="dark"] .b3-root,
   --red-100: #6a5550;
   --green-100: rgba(68, 90, 76, 0.57);
   --border-brand: #2a9fff;
+  --border-primary: #d1d1d6;
   --yellow-100: #957a6c;
   --purple-100: rgba(113, 88, 126, 0.38);
   --purple-300: #a375c3;