@b3dotfun/sdk 0.1.69-test.0 → 0.1.70-alpha.1

package/dist/cjs/global-account/react/components/AvatarEditor/AvatarEditor.js

@@ -47,6 +47,8 @@ function AvatarEditor({ onSetAvatar, className }) {
     const { user, setUser } = (0, react_1.useAuthentication)(partnerId);
     const setB3ModalContentType = (0, stores_1.useModalStore)(state => state.setB3ModalContentType);
     const contentType = (0, stores_1.useModalStore)(state => state.contentType);
+    const { authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
     const account = (0, react_3.useActiveAccount)();
     const { data: profile, refetch: refreshProfile } = (0, react_1.useProfile)({
         address: account?.address,
@@ -124,7 +126,7 @@ function AvatarEditor({ onSetAvatar, className }) {
         setCroppedAreaPixels(null);
     };
     const handleSaveChanges = async () => {
-        if (!account?.address) {
+        if (!isBetterAuth && !account?.address) {
             react_1.toast.error("No account connected");
             return;
         }

package/dist/cjs/global-account/react/components/B3Provider/B3ConfigProvider.d.ts

@@ -15,8 +15,10 @@ export interface B3ConfigContextType {
     stripePublishableKey?: string;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
     authStrategy: AuthStrategy;
+    /** Override the API base URL for all auth operations (Better Auth client, Feathers JWT exchange). */
+    apiUrl?: string;
 }
-export declare function B3ConfigProvider({ children, accountOverride, environment, defaultPermissions, automaticallySetFirstEoa, theme, clientType, partnerId, stripePublishableKey, createClientReferenceId, authStrategy, }: {
+export declare function B3ConfigProvider({ children, accountOverride, environment, defaultPermissions, automaticallySetFirstEoa, theme, clientType, partnerId, stripePublishableKey, createClientReferenceId, authStrategy, apiUrl, }: {
     children: React.ReactNode;
     accountOverride?: Account;
     environment?: "development" | "production";
@@ -28,5 +30,7 @@ export declare function B3ConfigProvider({ children, accountOverride, environmen
     stripePublishableKey?: string;
     createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
     authStrategy?: AuthStrategy;
+    /** Override the API base URL for all auth operations (Better Auth client, Feathers JWT exchange). */
+    apiUrl?: string;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useB3Config(): B3ConfigContextType;

package/dist/cjs/global-account/react/components/B3Provider/B3ConfigProvider.js

@@ -14,7 +14,7 @@ const DEFAULT_PERMISSIONS = {
     endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
 };
 const B3ConfigContext = (0, react_1.createContext)(null);
-function B3ConfigProvider({ children, accountOverride, environment = "development", defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa = false, theme = "light", clientType = "rest", partnerId, stripePublishableKey, createClientReferenceId, authStrategy = "thirdweb", }) {
+function B3ConfigProvider({ children, accountOverride, environment = "development", defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa = false, theme = "light", clientType = "rest", partnerId, stripePublishableKey, createClientReferenceId, authStrategy = "thirdweb", apiUrl, }) {
     return ((0, jsx_runtime_1.jsx)(B3ConfigContext.Provider, { value: {
             accountOverride,
             environment,
@@ -26,6 +26,7 @@ function B3ConfigProvider({ children, accountOverride, environment = "developmen
             stripePublishableKey,
             createClientReferenceId,
             authStrategy,
+            apiUrl,
         }, children: children }));
 }
 function useB3Config() {

package/dist/cjs/global-account/react/components/B3Provider/B3Provider.d.ts

@@ -10,7 +10,7 @@ import { ClientType } from "../../../client-manager";
 /**
  * Main B3Provider component
  */
-export declare function B3Provider({ theme, children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication, queryClient, authStrategy, }: {
+export declare function B3Provider({ theme, children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication, queryClient, authStrategy, apiUrl, }: {
     theme: "light" | "dark";
     children: React.ReactNode;
     accountOverride?: Account;
@@ -39,4 +39,20 @@ export declare function B3Provider({ theme, children, accountOverride, environme
     queryClient?: QueryClient;
     /** Auth strategy: "thirdweb" (default, ecosystem wallet) or "better-auth" (email/password via Better Auth) */
     authStrategy?: AuthStrategy;
+    /**
+     * Override the API base URL for Better Auth operations.
+     *
+     * When set, the Better Auth client (signIn, signUp, signOut, getSession) will
+     * target this URL instead of the default `B3_API_URL` / `NEXT_PUBLIC_B3_API`.
+     *
+     * Useful for local development where the frontend runs on localhost:3003 and
+     * the b3-api runs on localhost:3031 — keeps the entire OAuth flow local so
+     * sessions, cookies, and token exchange all hit the same server.
+     *
+     * @example
+     * ```tsx
+     * <B3Provider apiUrl="http://localhost:3031" ... />
+     * ```
+     */
+    apiUrl?: string;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/cjs/global-account/react/components/B3Provider/B3Provider.js

@@ -16,6 +16,7 @@ const StyleRoot_1 = require("../StyleRoot");
 const index_1 = require("../Toast/index");
 const AuthenticationProvider_1 = __importDefault(require("./AuthenticationProvider"));
 const B3ConfigProvider_1 = require("./B3ConfigProvider");
+const BetterAuthClientProvider_1 = require("./BetterAuthClientProvider");
 const BetterAuthProvider_1 = __importDefault(require("./BetterAuthProvider"));
 const LocalSDKProvider_1 = require("./LocalSDKProvider");
 /**
@@ -23,7 +24,7 @@ const LocalSDKProvider_1 = require("./LocalSDKProvider");
  */
 function B3Provider({ theme = "light", children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, 
 // deprecated since v0.0.87
-toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors = false, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication = false, queryClient, authStrategy = "thirdweb", }) {
+toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors = false, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication = false, queryClient, authStrategy = "thirdweb", apiUrl, }) {
     // Initialize Google Analytics on mount
     (0, react_3.useEffect)(() => {
         (0, analytics_1.loadGA4Script)();
@@ -33,7 +34,7 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey
         (0, client_manager_1.setClientType)(clientType);
     }, [clientType]);
     const wagmiConfig = (0, react_3.useMemo)(() => (0, createWagmiConfig_1.createWagmiConfig)({ partnerId, rpcUrls, connectors, overrideDefaultConnectors }), [partnerId, rpcUrls, connectors, overrideDefaultConnectors]);
-    return ((0, jsx_runtime_1.jsx)(react_2.WalletProvider, { wagmiConfig: wagmiConfig, queryClient: queryClient, children: (0, jsx_runtime_1.jsx)(react_1.TooltipProvider, { children: (0, jsx_runtime_1.jsx)(index_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(LocalSDKProvider_1.LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, disableBSMNTAuthentication: disableBSMNTAuthentication, children: (0, jsx_runtime_1.jsxs)(B3ConfigProvider_1.B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, authStrategy: authStrategy, children: [(0, jsx_runtime_1.jsx)(ToastContextConnector, {}), (0, jsx_runtime_1.jsxs)(react_1.RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, (0, jsx_runtime_1.jsx)(StyleRoot_1.StyleRoot, { id: "b3-root" })] }), authStrategy === "better-auth" ? ((0, jsx_runtime_1.jsx)(BetterAuthProvider_1.default, { partnerId: partnerId })) : ((0, jsx_runtime_1.jsx)(AuthenticationProvider_1.default, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa, defaultEoaProvider: defaultEoaProvider }))] }) }) }) }) }));
+    return ((0, jsx_runtime_1.jsx)(react_2.WalletProvider, { wagmiConfig: wagmiConfig, queryClient: queryClient, children: (0, jsx_runtime_1.jsx)(react_1.TooltipProvider, { children: (0, jsx_runtime_1.jsx)(index_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(LocalSDKProvider_1.LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, disableBSMNTAuthentication: disableBSMNTAuthentication, children: (0, jsx_runtime_1.jsx)(B3ConfigProvider_1.B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, authStrategy: authStrategy, apiUrl: apiUrl, children: (0, jsx_runtime_1.jsxs)(BetterAuthClientProvider_1.BetterAuthClientProvider, { apiUrl: apiUrl, children: [(0, jsx_runtime_1.jsx)(ToastContextConnector, {}), (0, jsx_runtime_1.jsxs)(react_1.RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, (0, jsx_runtime_1.jsx)(StyleRoot_1.StyleRoot, { id: "b3-root" })] }), authStrategy === "better-auth" ? ((0, jsx_runtime_1.jsx)(BetterAuthProvider_1.default, { partnerId: partnerId })) : ((0, jsx_runtime_1.jsx)(AuthenticationProvider_1.default, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa, defaultEoaProvider: defaultEoaProvider }))] }) }) }) }) }) }));
 }
 /**
  * Component to connect the toast context to the global toast API

package/dist/cjs/global-account/react/components/B3Provider/BetterAuthClientProvider.d.ts

@@ -0,0 +1,17 @@
+import { type B3BetterAuthClient } from "../../../better-auth-client";
+/**
+ * Provides a Better Auth client instance to the subtree.
+ *
+ * When `apiUrl` is supplied, a custom client targeting that URL is created
+ * (e.g. `http://localhost:3031` for local development). Otherwise, the
+ * default singleton (which uses `B3_API_URL` / `NEXT_PUBLIC_B3_API`) is used.
+ */
+export declare function BetterAuthClientProvider({ children, apiUrl, }: {
+    children: React.ReactNode;
+    apiUrl?: string;
+}): import("react/jsx-runtime").JSX.Element;
+/**
+ * Returns the Better Auth client from the nearest `BetterAuthClientProvider`.
+ * Falls back to the default singleton if no provider is present.
+ */
+export declare function useBetterAuthClient(): B3BetterAuthClient;

package/dist/cjs/global-account/react/components/B3Provider/BetterAuthClientProvider.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BetterAuthClientProvider = BetterAuthClientProvider;
+exports.useBetterAuthClient = useBetterAuthClient;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const better_auth_client_1 = require("../../../better-auth-client");
+const BetterAuthClientContext = (0, react_1.createContext)(better_auth_client_1.betterAuthClient);
+/**
+ * Provides a Better Auth client instance to the subtree.
+ *
+ * When `apiUrl` is supplied, a custom client targeting that URL is created
+ * (e.g. `http://localhost:3031` for local development). Otherwise, the
+ * default singleton (which uses `B3_API_URL` / `NEXT_PUBLIC_B3_API`) is used.
+ */
+function BetterAuthClientProvider({ children, apiUrl, }) {
+    const client = (0, react_1.useMemo)(() => {
+        if (apiUrl) {
+            return (0, better_auth_client_1.createB3BetterAuthClient)(apiUrl);
+        }
+        return better_auth_client_1.betterAuthClient;
+    }, [apiUrl]);
+    return (0, jsx_runtime_1.jsx)(BetterAuthClientContext.Provider, { value: client, children: children });
+}
+/**
+ * Returns the Better Auth client from the nearest `BetterAuthClientProvider`.
+ * Falls back to the default singleton if no provider is present.
+ */
+function useBetterAuthClient() {
+    return (0, react_1.useContext)(BetterAuthClientContext);
+}

package/dist/cjs/global-account/react/components/B3Provider/BetterAuthProvider.js

@@ -9,8 +9,8 @@ const constants_1 = require("../../../../shared/constants");
 const debug_1 = require("../../../../shared/utils/debug");
 const js_cookie_1 = __importDefault(require("js-cookie"));
 const react_2 = require("react");
-const better_auth_client_1 = require("../../../better-auth-client");
 const useUserQuery_1 = require("../../hooks/useUserQuery");
+const BetterAuthClientProvider_1 = require("./BetterAuthClientProvider");
 const debug = (0, debug_1.debugB3React)("BetterAuthProvider");
 /**
  * Parallel to AuthenticationProvider for Better Auth strategy.
@@ -25,6 +25,7 @@ const debug = (0, debug_1.debugB3React)("BetterAuthProvider");
  * useAuth, SignIn component, etc.) automatically clears the Better Auth session.
  */
 const BetterAuthProvider = ({ partnerId }) => {
+    const betterAuthClient = (0, BetterAuthClientProvider_1.useBetterAuthClient)();
     const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
     const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const setIsConnected = (0, react_1.useAuthStore)(state => state.setIsConnected);
@@ -45,7 +46,7 @@ const BetterAuthProvider = ({ partnerId }) => {
         app_1.default.logout = async () => {
             debug("Patched logout: clearing Better Auth session");
             try {
-                await better_auth_client_1.betterAuthClient.signOut();
+                await betterAuthClient.signOut();
             }
             catch {
                 debug("Better Auth signOut failed (non-critical)");
@@ -56,7 +57,7 @@ const BetterAuthProvider = ({ partnerId }) => {
             app_1.default.logout = originalLogout;
             hasPatched.current = false;
         };
-    }, []);
+    }, [betterAuthClient]);
     // Session restore on mount
     (0, react_2.useEffect)(() => {
         if (hasAttemptedRestore.current)
@@ -81,7 +82,7 @@ const BetterAuthProvider = ({ partnerId }) => {
             }
             // 2. Check for a Better Auth session (e.g. after OAuth redirect sets a cookie)
             try {
-                const session = await better_auth_client_1.betterAuthClient.getSession();
+                const session = await betterAuthClient.getSession();
                 if (session.data?.session?.token) {
                     debug("Better Auth session found, exchanging for Feathers JWT", {
                         betterAuthUserId: session.data.user?.id,
@@ -114,7 +115,7 @@ const BetterAuthProvider = ({ partnerId }) => {
             setIsAuthenticating(false);
         };
         restoreSession();
-    }, [setIsAuthenticated, setIsAuthenticating, setIsConnected, setUser, partnerId]);
+    }, [setIsAuthenticated, setIsAuthenticating, setIsConnected, setUser, partnerId, betterAuthClient]);
     return null;
 };
 exports.default = BetterAuthProvider;

package/dist/cjs/global-account/react/components/ManageAccount/BottomNavigation.js

@@ -13,11 +13,13 @@ const SettingsIcon = () => {
 };
 const BottomNavigation = () => {
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
-    return ((0, jsx_runtime_1.jsx)("div", { className: "b3-modal-bottom-navigation sticky bottom-0 left-0 w-full rounded-b-xl border-t border-gray-200 bg-[#FAFAFA]", children: (0, jsx_runtime_1.jsxs)(react_1.TabsListPrimitive, { className: "flex h-[68px] w-full items-center justify-center gap-4 border-none bg-transparent", children: [(0, jsx_runtime_1.jsxs)(react_1.TabTriggerPrimitive, { value: "home", className: "data-[state=active]:border-b3-primary-blue group flex flex-initial flex-col items-center gap-1 border-r-0 border-t-0 px-6 pb-2 pt-2.5 text-[#a0a0ab] data-[state=active]:border-t-4 data-[state=active]:text-[#18181B] dark:data-[state=active]:text-white", children: [(0, jsx_runtime_1.jsx)(HomeIcon, {}), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-xs", children: "Home" })] }), (0, jsx_runtime_1.jsxs)(react_1.TabTriggerPrimitive, { value: "swap", className: "data-[state=active]:border-b3-primary-blue group flex flex-initial flex-col items-center gap-1 border-r-0 border-t-0 px-6 pb-2 pt-2.5 text-[#a0a0ab] data-[state=active]:border-t-4 data-[state=active]:text-[#18181B] dark:data-[state=active]:text-white", onClick: () => {
+    const { authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
+    return ((0, jsx_runtime_1.jsx)("div", { className: "b3-modal-bottom-navigation sticky bottom-0 left-0 w-full rounded-b-xl border-t border-gray-200 bg-[#FAFAFA]", children: (0, jsx_runtime_1.jsxs)(react_1.TabsListPrimitive, { className: "flex h-[68px] w-full items-center justify-center gap-4 border-none bg-transparent", children: [(0, jsx_runtime_1.jsxs)(react_1.TabTriggerPrimitive, { value: "home", className: "data-[state=active]:border-b3-primary-blue group flex flex-initial flex-col items-center gap-1 border-r-0 border-t-0 px-6 pb-2 pt-2.5 text-[#a0a0ab] data-[state=active]:border-t-4 data-[state=active]:text-[#18181B] dark:data-[state=active]:text-white", children: [(0, jsx_runtime_1.jsx)(HomeIcon, {}), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-xs", children: "Home" })] }), !isBetterAuth && ((0, jsx_runtime_1.jsxs)(react_1.TabTriggerPrimitive, { value: "swap", className: "data-[state=active]:border-b3-primary-blue group flex flex-initial flex-col items-center gap-1 border-r-0 border-t-0 px-6 pb-2 pt-2.5 text-[#a0a0ab] data-[state=active]:border-t-4 data-[state=active]:text-[#18181B] dark:data-[state=active]:text-white", onClick: () => {
                         setB3ModalContentType({
                             type: "anySpend",
                             showBackButton: true,
                         });
-                    }, children: [(0, jsx_runtime_1.jsx)(SwapIcon, {}), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-xs", children: "Swap" })] }), (0, jsx_runtime_1.jsxs)(react_1.TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:border-b3-primary-blue group flex flex-initial flex-col items-center gap-1 border-r-0 border-t-0 px-6 pb-2 pt-2.5 text-[#a0a0ab] data-[state=active]:border-t-4 data-[state=active]:text-[#18181B] dark:data-[state=active]:text-white", children: [(0, jsx_runtime_1.jsx)(SettingsIcon, {}), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-xs", children: "Settings" })] })] }) }));
+                    }, children: [(0, jsx_runtime_1.jsx)(SwapIcon, {}), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-xs", children: "Swap" })] })), (0, jsx_runtime_1.jsxs)(react_1.TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:border-b3-primary-blue group flex flex-initial flex-col items-center gap-1 border-r-0 border-t-0 px-6 pb-2 pt-2.5 text-[#a0a0ab] data-[state=active]:border-t-4 data-[state=active]:text-[#18181B] dark:data-[state=active]:text-white", children: [(0, jsx_runtime_1.jsx)(SettingsIcon, {}), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-xs", children: "Settings" })] })] }) }));
 };
 exports.default = BottomNavigation;

package/dist/cjs/global-account/react/components/ManageAccount/Header.js

@@ -44,6 +44,7 @@ const framer_motion_1 = require("framer-motion");
 const lucide_react_1 = require("lucide-react");
 const react_2 = require("react");
 const react_3 = require("thirdweb/react");
+const UserAvatar_1 = require("../UserAvatar/UserAvatar");
 const ChevronDownIcon_1 = require("../icons/ChevronDownIcon");
 const LinkIcon_1 = __importDefault(require("../icons/LinkIcon"));
 const SignOutIcon_1 = __importDefault(require("../icons/SignOutIcon"));
@@ -78,7 +79,34 @@ function WalletItem({ wallet, isActive, onClick }) {
                         : "Wallet";
     return ((0, jsx_runtime_1.jsxs)("div", { className: `b3-modal-wallet-item ${isActive ? "b3-modal-wallet-item-active dark:bg-b3-line bg-[#F4F4F5]" : "hover:bg-b3-line/50"} box-border flex cursor-pointer items-center gap-2 rounded-xl px-3 py-2 transition-colors`, onClick: onClick, children: [(0, jsx_runtime_1.jsx)("div", { className: "relative size-10 shrink-0 text-clip rounded-full", children: isGlobalAccount ? ((0, jsx_runtime_1.jsx)("div", { className: "flex size-full items-center justify-center p-1", children: (0, jsx_runtime_1.jsx)("img", { src: "https://cdn.b3.fun/b3_logo.svg", alt: "B3", className: "size-full object-contain" }) })) : walletImage ? ((0, jsx_runtime_1.jsx)("img", { src: walletImage, alt: walletName, className: "size-full object-contain p-1" })) : ((0, jsx_runtime_1.jsx)("div", { className: "flex size-full items-center justify-center", children: (0, jsx_runtime_1.jsx)(WalletIcon_1.WalletIcon, {}) })) }), (0, jsx_runtime_1.jsxs)("div", { className: "flex min-w-0 flex-1 flex-col gap-1", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-b3-grey font-neue-montreal-semibold truncate text-sm", children: walletName }), (0, jsx_runtime_1.jsx)("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: centerTruncate(address, 4) })] }), isActive && ((0, jsx_runtime_1.jsx)("div", { className: "shrink-0", children: (0, jsx_runtime_1.jsx)(CheckIcon, {}) }))] }));
 }
+function BetterAuthHeader({ onLogout }) {
+    const contentType = (0, react_1.useModalStore)(state => state.contentType);
+    const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
+    const partnerId = contentType?.partnerId;
+    const { logout, user } = (0, react_1.useAuthentication)(partnerId);
+    const [logoutLoading, setLogoutLoading] = (0, react_2.useState)(false);
+    const displayName = user?.username || user?.email || "Account";
+    const onLogoutEnhanced = async () => {
+        setLogoutLoading(true);
+        try {
+            await logout();
+            onLogout?.();
+        }
+        finally {
+            setB3ModalOpen(false);
+            setLogoutLoading(false);
+        }
+    };
+    return ((0, jsx_runtime_1.jsxs)("div", { className: "bg-b3-background border-b3-line flex items-center justify-between border-b px-5 py-3", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)(UserAvatar_1.UserAvatar, { avatarUrl: user?.avatar, name: displayName, size: 40, className: "shrink-0" }), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col gap-0.5", children: [user?.username && ((0, jsx_runtime_1.jsx)("p", { className: "text-b3-grey font-neue-montreal-semibold text-left text-sm", children: user.username })), user?.email && ((0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-1", children: [(0, jsx_runtime_1.jsx)("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: user.email }), (0, jsx_runtime_1.jsx)(react_1.CopyToClipboard, { text: user.email })] }))] })] }), (0, jsx_runtime_1.jsxs)("button", { className: "border-b3-line hover:bg-b3-line flex items-center justify-center gap-1.5 rounded-xl border border-solid px-3 py-2 transition-colors", onClick: onLogoutEnhanced, disabled: logoutLoading, children: [logoutLoading ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "animate-spin", size: 16 })) : ((0, jsx_runtime_1.jsx)(SignOutIcon_1.default, { size: 16, className: "text-b3-grey" })), (0, jsx_runtime_1.jsx)("p", { className: "text-b3-grey font-neue-montreal-semibold text-sm", children: "Sign out" })] })] }));
+}
 function Header({ onLogout }) {
+    const { authStrategy } = (0, react_1.useB3Config)();
+    if (authStrategy === "better-auth") {
+        return (0, jsx_runtime_1.jsx)(BetterAuthHeader, { onLogout: onLogout });
+    }
+    return (0, jsx_runtime_1.jsx)(WalletHeader, { onLogout: onLogout });
+}
+function WalletHeader({ onLogout }) {
     const activeWallet = (0, react_3.useActiveWallet)();
     const connectedWallets = (0, react_3.useConnectedWallets)();
     const setActiveWallet = (0, react_3.useSetActiveWallet)();
@@ -95,10 +123,14 @@ function Header({ onLogout }) {
     const isActiveGlobalAccount = activeWallet?.id.includes("ecosystem");
     const onLogoutEnhanced = async () => {
         setLogoutLoading(true);
-        await logout();
-        onLogout?.();
-        setB3ModalOpen(false);
-        setLogoutLoading(false);
+        try {
+            await logout();
+            onLogout?.();
+        }
+        finally {
+            setB3ModalOpen(false);
+            setLogoutLoading(false);
+        }
     };
     const handleWalletSwitch = (wallet) => {
         setActiveWallet(wallet);

package/dist/cjs/global-account/react/components/ManageAccount/HomeContent.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HomeContent = HomeContent;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("../../../../global-account/react");
 const Tabs_1 = require("../ui/Tabs");
 const Header_1 = require("./Header");
 const HomeActions_1 = __importDefault(require("./HomeActions"));
@@ -12,5 +13,7 @@ const NFTContent_1 = __importDefault(require("./NFTContent"));
 const ProfileSection_1 = __importDefault(require("./ProfileSection"));
 const TokenContent_1 = __importDefault(require("./TokenContent"));
 function HomeContent({ showDeposit = false, showSwap = true }) {
-    return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col", children: [(0, jsx_runtime_1.jsx)(Header_1.Header, {}), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col", children: [(0, jsx_runtime_1.jsx)(ProfileSection_1.default, {}), (0, jsx_runtime_1.jsx)(HomeActions_1.default, { showDeposit: showDeposit, showSwap: showSwap }), (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-balance-content space-y-2 p-5", children: (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { defaultValue: "balance", children: [(0, jsx_runtime_1.jsxs)(Tabs_1.TabsList, { className: "b3-modal-balance-tabs-list", children: [(0, jsx_runtime_1.jsx)(Tabs_1.TabTrigger, { value: "balance", className: "font-neue-montreal-semibold p-0 pr-3", children: "Balance" }), (0, jsx_runtime_1.jsx)(Tabs_1.TabTrigger, { value: "nfts", className: "font-neue-montreal-semibold p-0 pr-3", children: "NFTs" })] }), (0, jsx_runtime_1.jsx)(Tabs_1.TabsContent, { value: "balance", className: "px-0 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(TokenContent_1.default, {}) }), (0, jsx_runtime_1.jsx)(Tabs_1.TabsContent, { value: "nfts", className: "px-0 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(NFTContent_1.default, {}) })] }) })] })] }));
+    const { authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
+    return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col", children: [(0, jsx_runtime_1.jsx)(Header_1.Header, {}), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col", children: [(0, jsx_runtime_1.jsx)(ProfileSection_1.default, {}), !isBetterAuth && (0, jsx_runtime_1.jsx)(HomeActions_1.default, { showDeposit: showDeposit, showSwap: showSwap }), !isBetterAuth && ((0, jsx_runtime_1.jsx)("div", { className: "b3-modal-balance-content space-y-2 p-5", children: (0, jsx_runtime_1.jsxs)(Tabs_1.Tabs, { defaultValue: "balance", children: [(0, jsx_runtime_1.jsxs)(Tabs_1.TabsList, { className: "b3-modal-balance-tabs-list", children: [(0, jsx_runtime_1.jsx)(Tabs_1.TabTrigger, { value: "balance", className: "font-neue-montreal-semibold p-0 pr-3", children: "Balance" }), (0, jsx_runtime_1.jsx)(Tabs_1.TabTrigger, { value: "nfts", className: "font-neue-montreal-semibold p-0 pr-3", children: "NFTs" })] }), (0, jsx_runtime_1.jsx)(Tabs_1.TabsContent, { value: "balance", className: "px-0 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(TokenContent_1.default, {}) }), (0, jsx_runtime_1.jsx)(Tabs_1.TabsContent, { value: "nfts", className: "px-0 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(NFTContent_1.default, {}) })] }) }))] })] }));
 }

package/dist/cjs/global-account/react/components/ManageAccount/ManageAccount.js

@@ -10,9 +10,15 @@ const BottomNavigation_1 = __importDefault(require("./BottomNavigation"));
 const HomeContent_1 = require("./HomeContent");
 const SettingsContent_1 = __importDefault(require("./SettingsContent"));
 function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit, chain, partnerId, showSwap, showDeposit, }) {
+    const { authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
     const contentType = (0, react_1.useModalStore)(state => state.contentType);
     const { activeTab = "home", setActiveTab } = contentType;
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
+    // Better Auth: single-view layout — no Home/Swap tabs, just settings content
+    if (isBetterAuth) {
+        return ((0, jsx_runtime_1.jsx)("div", { className: "b3-manage-account flex-1", children: (0, jsx_runtime_1.jsx)(SettingsContent_1.default, { partnerId: partnerId, onLogout: onLogout, chain: chain }) }));
+    }
     return ((0, jsx_runtime_1.jsx)("div", { className: "b3-manage-account flex-1", children: (0, jsx_runtime_1.jsxs)(react_1.TabsPrimitive, { defaultValue: activeTab, onValueChange: value => {
                 const tab = value;
                 if (tab === "swap") {

package/dist/cjs/global-account/react/components/ManageAccount/ProfileSection.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
 const profileDisplay_1 = require("../../../../global-account/react/utils/profileDisplay");
+const constants_1 = require("../../../../shared/constants");
 const utils_1 = require("../../../../shared/utils");
 const number_1 = require("../../../../shared/utils/number");
 const boring_avatars_1 = __importDefault(require("boring-avatars"));
@@ -14,8 +15,9 @@ const react_2 = require("react");
 const react_3 = require("thirdweb/react");
 const useFirstEOA_1 = require("../../hooks/useFirstEOA");
 const IPFSMediaRenderer_1 = require("../IPFSMediaRenderer/IPFSMediaRenderer");
-const AVATAR_COLORS = ["#3368ef", "#272727", "#6366f1", "#06b6d4", "#eeb0d9", "#ba3fbf", "#ff777b", "#dfbb53"];
 const ProfileSection = () => {
+    const { authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
     const account = (0, react_3.useActiveAccount)();
     const { address: eoaAddress } = (0, useFirstEOA_1.useFirstEOA)();
     const { address: smartWalletAddress } = (0, react_1.useAccountWallet)();
@@ -50,7 +52,7 @@ const ProfileSection = () => {
         setImgError(false);
     }, [avatarSrc]);
     const currentUsername = user?.username || profile?.displayName || (0, utils_1.formatUsername)(profile?.name || "");
-    const avatarSeed = eoaAddress || account?.address || smartWalletAddress || currentUsername || "user";
-    return ((0, jsx_runtime_1.jsx)("div", { className: "flex items-center justify-between px-5 py-6", children: (0, jsx_runtime_1.jsxs)("div", { className: "global-account-profile flex items-center gap-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: "global-account-profile-avatar relative", children: [(0, jsx_runtime_1.jsx)("div", { className: "border-b3-line border-1 bg-b3-primary-wash size-14 overflow-hidden rounded-full border", children: avatarSrc && !imgError ? ((0, jsx_runtime_1.jsx)(IPFSMediaRenderer_1.IPFSMediaRenderer, { src: avatarSrc, alt: "Profile Avatar", className: "h-full w-full object-cover", onError: handleImgError })) : ((0, jsx_runtime_1.jsx)(boring_avatars_1.default, { name: avatarSeed, variant: "beam", size: 56, colors: AVATAR_COLORS })) }), (0, jsx_runtime_1.jsx)("button", { onClick: handleEditAvatar, className: "border-b3-background hover:bg-b3-grey/80 absolute -bottom-1 -right-1 flex size-6 items-center justify-center rounded-full border-4 bg-[#a0a0ab] transition-colors", children: (0, jsx_runtime_1.jsx)(lucide_react_1.Pencil, { size: 10, className: "text-b3-background" }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: "global-account-profile-info flex flex-col gap-1", children: [(0, jsx_runtime_1.jsxs)("h2", { className: "text-b3-grey font-neue-montreal-semibold flex h-[38px] items-center gap-1 text-xl", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-b3-foreground-muted", children: " $" }), (0, jsx_runtime_1.jsx)("div", { className: "text-[30px]", children: (0, number_1.formatDisplayNumber)(totalBalanceUsd, { fractionDigits: 2 }) })] }), (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-username font-neue-montreal-semibold text-base leading-none text-[#0B57C2]", children: currentUsername })] })] }) }));
+    const avatarSeed = eoaAddress || account?.address || smartWalletAddress || currentUsername || user?.email || "user";
+    return ((0, jsx_runtime_1.jsx)("div", { className: "flex items-center justify-between px-5 py-6", children: (0, jsx_runtime_1.jsxs)("div", { className: "global-account-profile flex items-center gap-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: "global-account-profile-avatar relative", children: [(0, jsx_runtime_1.jsx)("div", { className: "border-b3-line border-1 bg-b3-primary-wash size-14 overflow-hidden rounded-full border", children: avatarSrc && !imgError ? ((0, jsx_runtime_1.jsx)(IPFSMediaRenderer_1.IPFSMediaRenderer, { src: avatarSrc, alt: "Profile Avatar", className: "h-full w-full object-cover", onError: handleImgError })) : ((0, jsx_runtime_1.jsx)(boring_avatars_1.default, { name: avatarSeed, variant: "beam", size: 56, colors: constants_1.AVATAR_COLORS })) }), (0, jsx_runtime_1.jsx)("button", { onClick: handleEditAvatar, className: "border-b3-background hover:bg-b3-grey/80 absolute -bottom-1 -right-1 flex size-6 items-center justify-center rounded-full border-4 bg-[#a0a0ab] transition-colors", children: (0, jsx_runtime_1.jsx)(lucide_react_1.Pencil, { size: 10, className: "text-b3-background" }) })] }), (0, jsx_runtime_1.jsxs)("div", { className: "global-account-profile-info flex flex-col gap-1", children: [!isBetterAuth && ((0, jsx_runtime_1.jsxs)("h2", { className: "text-b3-grey font-neue-montreal-semibold flex h-[38px] items-center gap-1 text-xl", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-b3-foreground-muted", children: " $" }), (0, jsx_runtime_1.jsx)("div", { className: "text-[30px]", children: (0, number_1.formatDisplayNumber)(totalBalanceUsd, { fractionDigits: 2 }) })] })), (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-username font-neue-montreal-semibold text-base leading-none text-[#0B57C2]", children: currentUsername }), isBetterAuth && user?.email && ((0, jsx_runtime_1.jsx)("div", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: user.email }))] })] }) }));
 };
 exports.default = ProfileSection;

package/dist/cjs/global-account/react/components/ManageAccount/SettingsContent.js

@@ -15,6 +15,8 @@ const ModalHeader_1 = __importDefault(require("../ModalHeader/ModalHeader"));
 const SettingsMenuItem_1 = __importDefault(require("./SettingsMenuItem"));
 const SettingsProfileCard_1 = __importDefault(require("./SettingsProfileCard"));
 const SettingsContent = ({ partnerId, onLogout, chain, }) => {
+    const { authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
     const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
     const { logout, user } = (0, react_1.useAuthentication)(partnerId);
@@ -50,7 +52,7 @@ const SettingsContent = ({ partnerId, onLogout, chain, }) => {
         setB3ModalOpen(false);
         setLogoutLoading(false);
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { className: "flex h-[470px] flex-col", children: [(0, jsx_runtime_1.jsx)(ModalHeader_1.default, { showBackButton: false, showCloseButton: false, title: "Settings" }), (0, jsx_runtime_1.jsx)("div", { className: "p-5", children: (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-settings-profile-card dark:border-b3-line dark:bg-b3-background flex items-center rounded-xl border border-[#e4e4e7] bg-[#f4f4f5] p-4", children: (0, jsx_runtime_1.jsx)(SettingsProfileCard_1.default, {}) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "space-y-3 px-5", children: [(0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Linked Accounts", subtitle: `${profiles.length} connected account${profiles.length > 1 ? "s" : ""}`, onClick: () => handleNavigate("linkAccount") }), (0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Notifications", subtitle: "Manage your notifications", onClick: () => handleNavigate("notifications") }), (0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)("svg", { width: "40", height: "40", viewBox: "0 0 40 40", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: (0, jsx_runtime_1.jsx)("path", { d: "M0 12C0 5.37258 5.37258 0 12 0H28C34.6274 0 40 5.37258 40 12V28C40 34.6274 34.6274 40 28 40H12C5.37258 40 0 34.6274 0 28V12Z", fill: "#F4F4F5" }) }), title: "Stay signed in", subtitle: session_duration_1.SESSION_DURATION_LABELS[sessionDays] ?? `${sessionDays} days`, onClick: () => handleNavigate("sessionDuration") })] }), (0, jsx_runtime_1.jsx)("div", { className: "mt-auto px-5 pb-5", children: (0, jsx_runtime_1.jsxs)("button", { type: "button", className: "b3-modal-sign-out-button border-b3-line hover:bg-b3-line bg-b3-background dark:bg-b3-background dark:border-b3-line dark:hover:bg-b3-line/80 flex w-full items-center justify-center gap-1.5 rounded-xl border border-solid p-3 transition-colors", onClick: onLogoutEnhanced, disabled: logoutLoading, style: {
+    return ((0, jsx_runtime_1.jsxs)("div", { className: "flex h-[470px] flex-col", children: [!isBetterAuth && (0, jsx_runtime_1.jsx)(ModalHeader_1.default, { showBackButton: false, showCloseButton: false, title: "Settings" }), (0, jsx_runtime_1.jsx)("div", { className: "p-5", children: (0, jsx_runtime_1.jsx)("div", { className: "b3-modal-settings-profile-card dark:border-b3-line dark:bg-b3-background flex items-center rounded-xl border border-[#e4e4e7] bg-[#f4f4f5] p-4", children: (0, jsx_runtime_1.jsx)(SettingsProfileCard_1.default, {}) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "space-y-3 px-5", children: [!isBetterAuth && ((0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.Link, { size: 18, className: "text-[#51525c]" }), title: "Linked Accounts", subtitle: `${profiles.length} connected account${profiles.length > 1 ? "s" : ""}`, onClick: () => handleNavigate("linkAccount") })), (0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.Bell, { size: 18, className: "text-[#51525c]" }), title: "Notifications", subtitle: "Manage your notifications", onClick: () => handleNavigate("notifications") }), (0, jsx_runtime_1.jsx)(SettingsMenuItem_1.default, { icon: (0, jsx_runtime_1.jsx)(lucide_react_1.Clock, { size: 18, className: "text-[#51525c]" }), title: "Stay signed in", subtitle: session_duration_1.SESSION_DURATION_LABELS[sessionDays] ?? `${sessionDays} days`, onClick: () => handleNavigate("sessionDuration") })] }), (0, jsx_runtime_1.jsx)("div", { className: "mt-auto px-5 pb-5", children: (0, jsx_runtime_1.jsxs)("button", { type: "button", className: "b3-modal-sign-out-button border-b3-line hover:bg-b3-line bg-b3-background dark:bg-b3-background dark:border-b3-line dark:hover:bg-b3-line/80 flex w-full items-center justify-center gap-1.5 rounded-xl border border-solid p-3 transition-colors", onClick: onLogoutEnhanced, disabled: logoutLoading, style: {
                         boxShadow: "inset 0px 0px 0px 1px rgba(10,13,18,0.18), inset 0px -2px 0px 0px rgba(10,13,18,0.05)",
                     }, children: [logoutLoading ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "text-b3-grey animate-spin", size: 20 })) : ((0, jsx_runtime_1.jsx)(SignOutIcon_1.default, { size: 20, className: "text-b3-grey", color: "currentColor" })), (0, jsx_runtime_1.jsx)("p", { className: "text-b3-grey dark:text-b3-foreground-muted font-neue-montreal-semibold text-base", children: "Sign out" })] }) })] }));
 };

package/dist/cjs/global-account/react/components/ManageAccount/SettingsProfileCard.js

@@ -21,7 +21,8 @@ const SettingsProfileCard = () => {
         address: eoaAddress || account?.address,
         fresh: true,
     });
-    const { partnerId } = (0, react_1.useB3Config)();
+    const { partnerId, authStrategy } = (0, react_1.useB3Config)();
+    const isBetterAuth = authStrategy === "better-auth";
     const { user, setUser } = (0, react_1.useAuthentication)(partnerId);
     const setB3ModalOpen = (0, react_1.useModalStore)(state => state.setB3ModalOpen);
     const setB3ModalContentType = (0, react_1.useModalStore)(state => state.setB3ModalContentType);
@@ -71,19 +72,29 @@ const SettingsProfileCard = () => {
         }
         setIsSaving(true);
         try {
-            const sanitizedUsername = (0, ens_normalize_1.ens_normalize)(editedUsername.trim());
-            const b3Username = `${sanitizedUsername}.b3.fun`;
-            const usernameSignMessage = `Register "${b3Username}"`;
-            const usernameSignature = await account?.signMessage({ message: usernameSignMessage });
-            if (!usernameSignature) {
-                throw new Error("Failed to sign username registration message");
+            let updatedUser;
+            if (isBetterAuth) {
+                // Better Auth: register username without wallet signing (DB-only, no ENS)
+                // Skip ens_normalize — it rejects underscores/mixed-case that are valid non-ENS usernames
+                const sanitizedUsername = editedUsername.trim().toLowerCase();
+                // Type assertion needed: b3-mono now accepts message/hash as optional for Better Auth users
+                updatedUser = (await app_1.default
+                    .service("users")
+                    .registerUsername({ username: sanitizedUsername }, {}));
+            }
+            else {
+                // Thirdweb: register username with wallet signature + on-chain ENS
+                const sanitizedUsername = (0, ens_normalize_1.ens_normalize)(editedUsername.trim());
+                const b3Username = `${sanitizedUsername}.b3.fun`;
+                const usernameSignMessage = `Register "${b3Username}"`;
+                const usernameSignature = await account?.signMessage({ message: usernameSignMessage });
+                if (!usernameSignature) {
+                    throw new Error("Failed to sign username registration message");
+                }
+                updatedUser = (await app_1.default
+                    .service("users")
+                    .registerUsername({ username: sanitizedUsername, message: usernameSignMessage, hash: usernameSignature }, {}));
             }
-            console.log("@@usernameSignature", usernameSignature);
-            // Register username with ENS
-            // Note: Type assertion needed until @b3dotfun/b3-api package is updated with RegisterUsername type
-            const updatedUser = (await app_1.default
-                .service("users")
-                .registerUsername({ username: sanitizedUsername, message: usernameSignMessage, hash: usernameSignature }, {}));
             // Update user state - registerUsername returns an array with single user
             setUser(Array.isArray(updatedUser) ? updatedUser[0] : updatedUser);
             // Refresh profile to get updated data
@@ -112,6 +123,6 @@ const SettingsProfileCard = () => {
                 /* Edit mode - inline input */
                 (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)("input", { ref: inputRef, type: "text", value: editedUsername, onChange: e => setEditedUsername(e.target.value), onKeyDown: handleKeyDown, disabled: isSaving, className: "border-b3-line bg-b3-background text-b3-grey placeholder:text-b3-foreground-muted font-neue-montreal-medium focus:border-b3-primary-blue text-md w-full rounded-md border px-2 py-1 leading-none transition-colors focus:outline-none disabled:opacity-50", placeholder: "Enter username" }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-1", children: [(0, jsx_runtime_1.jsx)("button", { onClick: handleSaveUsername, disabled: isSaving, className: "text-b3-primary-blue hover:text-b3-primary-blue/80 flex items-center justify-center rounded-md p-1 transition-colors disabled:opacity-50", "aria-label": "Save username", children: isSaving ? (0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { size: 18, className: "animate-spin" }) : (0, jsx_runtime_1.jsx)(lucide_react_1.Check, { size: 18, strokeWidth: 2.5 }) }), (0, jsx_runtime_1.jsx)("button", { onClick: handleCancelEdit, disabled: isSaving, className: "text-b3-foreground-muted hover:text-b3-grey flex items-center justify-center rounded-md p-1 transition-colors disabled:opacity-50", "aria-label": "Cancel editing", children: (0, jsx_runtime_1.jsx)(lucide_react_1.X, { size: 18, strokeWidth: 2.5 }) })] })] })) : (
                 /* Display mode */
-                (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { className: "flex items-center gap-1", children: (0, jsx_runtime_1.jsx)("p", { className: "b3-modal-username font-neue-montreal-semibold text-lg leading-none text-[#0B57C2]", children: currentUsername }) }), (0, jsx_runtime_1.jsx)("button", { onClick: handleEditUsername, className: "flex items-center justify-center gap-1 text-left transition-opacity hover:opacity-80", children: (0, jsx_runtime_1.jsx)("p", { className: "font-inter text-sm font-semibold leading-5 text-[#51525C] dark:text-white", children: "Edit Username" }) })] })) })] }));
+                (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { className: "flex items-center gap-1", children: (0, jsx_runtime_1.jsx)("p", { className: "b3-modal-username font-neue-montreal-semibold text-lg leading-none text-[#0B57C2]", children: currentUsername || user?.email }) }), (0, jsx_runtime_1.jsx)("button", { onClick: handleEditUsername, className: "flex items-center justify-center gap-1 text-left transition-opacity hover:opacity-80", children: (0, jsx_runtime_1.jsx)("p", { className: "font-inter text-sm font-semibold leading-5 text-[#51525C] dark:text-white", children: "Edit Username" }) })] })) })] }));
 };
 exports.default = SettingsProfileCard;

package/dist/cjs/global-account/react/components/SignInWithB3/BetterAuthResetPassword.js

@@ -6,6 +6,7 @@ const react_1 = require("../../../../global-account/react");
 const debug_1 = require("../../../../shared/utils/debug");
 const react_2 = require("react");
 const useBetterAuth_1 = require("../../hooks/useBetterAuth");
+const PasswordInput_1 = require("./components/PasswordInput");
 const debug = (0, debug_1.debugB3React)("BetterAuthResetPassword");
 /**
  * Standalone reset password form. Render this on your reset password page.
@@ -60,8 +61,8 @@ function BetterAuthResetPassword({ token, onSuccess, onError, className }) {
     if (!token) {
         return ((0, jsx_runtime_1.jsx)("div", { className: `w-full max-w-[400px] px-6 text-center ${className || ""}`, children: (0, jsx_runtime_1.jsx)("p", { className: "text-sm text-red-500", children: "Invalid or missing reset token." }) }));
     }
-    return ((0, jsx_runtime_1.jsxs)("div", { className: `w-full max-w-[400px] px-6 ${className || ""}`, children: [(0, jsx_runtime_1.jsxs)("div", { className: "mb-10 text-center", children: [(0, jsx_runtime_1.jsx)("h1", { className: "text-[28px] font-semibold tracking-tight text-gray-900 dark:text-gray-100", children: success ? "Password reset" : "Set new password" }), (0, jsx_runtime_1.jsx)("p", { className: "mt-3 text-[15px] text-gray-500 dark:text-gray-400", children: success ? "Your password has been updated." : "Enter your new password below." })] }), success ? ((0, jsx_runtime_1.jsx)("div", { className: "space-y-4 text-center", children: (0, jsx_runtime_1.jsx)("div", { className: "mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100", children: (0, jsx_runtime_1.jsx)("svg", { className: "h-6 w-6 text-green-600", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: (0, jsx_runtime_1.jsx)("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }) })) : ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-5", children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "New password" }), (0, jsx_runtime_1.jsx)(react_1.Input, { type: "password", placeholder: "At least 8 characters", value: password, onChange: e => setPassword(e.target.value), disabled: isLoading, className: "h-11 px-4 text-[15px]" })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Confirm password" }), (0, jsx_runtime_1.jsx)(react_1.Input, { type: "password", placeholder: "Repeat your password", value: confirmPassword, onChange: e => setConfirmPassword(e.target.value), disabled: isLoading, onKeyDown: e => {
+    return ((0, jsx_runtime_1.jsxs)("div", { className: `w-full max-w-[400px] px-6 ${className || ""}`, children: [(0, jsx_runtime_1.jsxs)("div", { className: "mb-10 text-center", children: [(0, jsx_runtime_1.jsx)("h1", { className: "text-[28px] font-semibold tracking-tight text-gray-900 dark:text-gray-100", children: success ? "Password reset" : "Set new password" }), (0, jsx_runtime_1.jsx)("p", { className: "mt-3 text-[15px] text-gray-500 dark:text-gray-400", children: success ? "Your password has been updated." : "Enter your new password below." })] }), success ? ((0, jsx_runtime_1.jsx)("div", { className: "space-y-4 text-center", children: (0, jsx_runtime_1.jsx)("div", { className: "mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100", children: (0, jsx_runtime_1.jsx)("svg", { className: "h-6 w-6 text-green-600", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", children: (0, jsx_runtime_1.jsx)("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M5 13l4 4L19 7" }) }) }) })) : ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-5", children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "New password" }), (0, jsx_runtime_1.jsx)(PasswordInput_1.PasswordInput, { placeholder: "At least 8 characters", value: password, onChange: e => setPassword(e.target.value), disabled: isLoading, className: "h-11 px-4 pr-11 text-[15px]" })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Confirm password" }), (0, jsx_runtime_1.jsx)(PasswordInput_1.PasswordInput, { placeholder: "Repeat your password", value: confirmPassword, onChange: e => setConfirmPassword(e.target.value), disabled: isLoading, onKeyDown: e => {
                                     if (e.key === "Enter")
                                         handleSubmit();
-                                }, className: "h-11 px-4 text-[15px]" })] }), error && (0, jsx_runtime_1.jsx)("p", { className: "text-sm text-red-500", children: error }), (0, jsx_runtime_1.jsx)(react_1.Button, { onClick: handleSubmit, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Resetting..." : "Reset password" })] }))] }));
+                                }, className: "h-11 px-4 pr-11 text-[15px]" })] }), error && (0, jsx_runtime_1.jsx)("p", { className: "text-sm text-red-500", children: error }), (0, jsx_runtime_1.jsx)(react_1.Button, { onClick: handleSubmit, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Resetting..." : "Reset password" })] }))] }));
 }

package/dist/cjs/global-account/react/components/SignInWithB3/BetterAuthSignIn.d.ts

@@ -10,6 +10,11 @@ export interface BetterAuthSignInProps {
     showEmail?: boolean;
     /** URL to redirect to after password reset link is clicked. Token is appended as ?token=... */
     passwordResetRedirectTo?: string;
+    /**
+     * URL Better Auth redirects to after server-side email verification. Render
+     * `BetterAuthVerifyEmail` at this route so the user gets a confirmation page.
+     */
+    verifyEmailRedirectTo?: string;
     /** Called after successful authentication */
     onSuccess?: () => void;
     /** Called on authentication error */
@@ -31,4 +36,4 @@ export interface BetterAuthSignInProps {
  * />
  * ```
  */
-export declare function BetterAuthSignIn({ title, subtitle, socialProviders, showEmail, passwordResetRedirectTo, onSuccess, onError, className, }: BetterAuthSignInProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function BetterAuthSignIn({ title, subtitle, socialProviders, showEmail, passwordResetRedirectTo, verifyEmailRedirectTo, onSuccess, onError, className, }: BetterAuthSignInProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/cjs/global-account/react/components/SignInWithB3/BetterAuthSignIn.js

@@ -6,6 +6,7 @@ const react_1 = require("../../../../global-account/react");
 const debug_1 = require("../../../../shared/utils/debug");
 const react_2 = require("react");
 const useBetterAuth_1 = require("../../hooks/useBetterAuth");
+const PasswordInput_1 = require("./components/PasswordInput");
 const signInUtils_1 = require("./utils/signInUtils");
 const debug = (0, debug_1.debugB3React)("BetterAuthSignIn");
 const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@@ -30,9 +31,11 @@ const DEFAULT_SOCIAL_PROVIDERS = [
  * />
  * ```
  */
-function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access your account", socialProviders = DEFAULT_SOCIAL_PROVIDERS.map(p => p.id), showEmail = true, passwordResetRedirectTo, onSuccess, onError, className, }) {
+function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access your account", socialProviders = DEFAULT_SOCIAL_PROVIDERS.map(p => p.id), showEmail = true, passwordResetRedirectTo, verifyEmailRedirectTo, onSuccess, onError, className, }) {
     const { signInWithEmail, signUpWithEmail, signInWithSocial, requestPasswordReset } = (0, useBetterAuth_1.useBetterAuth)();
     const isAuthenticated = (0, react_1.useAuthStore)(state => state.isAuthenticated);
+    const isAuthenticating = (0, react_1.useAuthStore)(state => state.isAuthenticating);
+    const hasStartedConnecting = (0, react_1.useAuthStore)(state => state.hasStartedConnecting);
     const [mode, setMode] = (0, react_2.useState)("sign-in");
     const [email, setEmail] = (0, react_2.useState)("");
     const [password, setPassword] = (0, react_2.useState)("");
@@ -45,7 +48,9 @@ function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access
     const resolvedTitle = title ||
         (mode === "forgot-password" ? "Reset password" : mode === "sign-in" ? "Welcome back" : "Create an account");
     const resolvedSubtitle = mode === "forgot-password"
-        ? "Enter your email and we'll send you a reset link"
+        ? resetEmailSent
+            ? "We've sent a password reset link to your email"
+            : "Enter your email and we'll send you a reset link"
         : subtitle || "Enter your credentials to access your account";
     const handleForgotPassword = async () => {
         const normalizedEmail = email.trim().toLowerCase();
@@ -70,6 +75,11 @@ function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access
     const providers = socialProviders
         .map(id => DEFAULT_SOCIAL_PROVIDERS.find(p => p.id === id))
         .filter((p) => !!p);
+    // Show loading during session restore (before any user interaction) to prevent
+    // the login form from flashing briefly after OAuth redirect.
+    if (isAuthenticating && !hasStartedConnecting) {
+        return ((0, jsx_runtime_1.jsx)("div", { className: `flex w-full max-w-[400px] items-center justify-center px-6 py-20 ${className || ""}`, children: (0, jsx_runtime_1.jsx)(react_1.Loading, { variant: "primary", size: "lg" }) }));
+    }
     if (isAuthenticated) {
         return null;
     }
@@ -91,7 +101,7 @@ function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access
             setIsLoading(true);
             setError(null);
             if (mode === "sign-up") {
-                await signUpWithEmail(normalizedEmail, password, name.trim());
+                await signUpWithEmail(normalizedEmail, password, name.trim(), verifyEmailRedirectTo);
             }
             else {
                 await signInWithEmail(normalizedEmail, password);
@@ -148,10 +158,10 @@ function BetterAuthSignIn({ title, subtitle = "Enter your credentials to access
                             }, className: "font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400", children: "Back to sign in" }) })] })), showEmail && mode !== "forgot-password" && ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-5", children: [mode === "sign-up" && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Name" }), (0, jsx_runtime_1.jsx)(react_1.Input, { type: "text", placeholder: "Your name", value: name, onChange: e => setName(e.target.value), disabled: isLoading, className: "h-11 px-4 text-[15px]" })] })), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("label", { className: "mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Email" }), (0, jsx_runtime_1.jsx)(react_1.Input, { type: "email", placeholder: "name@company.com", value: email, onChange: e => setEmail(e.target.value), disabled: isLoading, className: "h-11 px-4 text-[15px]" })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsxs)("div", { className: "mb-2 flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("label", { className: "block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300", children: "Password" }), mode === "sign-in" && ((0, jsx_runtime_1.jsx)("button", { type: "button", onClick: () => {
                                             setMode("forgot-password");
                                             setError(null);
-                                        }, className: "text-xs font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400", children: "Forgot password?" }))] }), (0, jsx_runtime_1.jsx)(react_1.Input, { type: "password", placeholder: "Password", value: password, onChange: e => setPassword(e.target.value), disabled: isLoading, onKeyDown: e => {
+                                        }, className: "text-xs font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400", children: "Forgot password?" }))] }), (0, jsx_runtime_1.jsx)(PasswordInput_1.PasswordInput, { value: password, onChange: e => setPassword(e.target.value), disabled: isLoading, onKeyDown: e => {
                                     if (e.key === "Enter")
                                         handleEmailSubmit();
-                                }, className: "h-11 px-4 text-[15px]" })] }), error && (0, jsx_runtime_1.jsx)("p", { className: "text-sm text-red-500", children: error }), (0, jsx_runtime_1.jsx)(react_1.Button, { onClick: handleEmailSubmit, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Loading..." : mode === "sign-in" ? "Sign in" : "Sign up" })] })), providers.length > 0 && mode !== "forgot-password" && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [showEmail && ((0, jsx_runtime_1.jsxs)("div", { className: "my-8 flex items-center gap-4", children: [(0, jsx_runtime_1.jsx)("div", { className: "h-px flex-1 bg-gray-200 dark:bg-gray-700" }), (0, jsx_runtime_1.jsx)("span", { className: "text-xs text-gray-400", children: "Or continue with" }), (0, jsx_runtime_1.jsx)("div", { className: "h-px flex-1 bg-gray-200 dark:bg-gray-700" })] })), (0, jsx_runtime_1.jsx)("div", { className: "space-y-4", children: providers.map(provider => {
+                                }, className: "h-11 px-4 pr-11 text-[15px]" }, mode)] }), error && (0, jsx_runtime_1.jsx)("p", { className: "text-sm text-red-500", children: error }), (0, jsx_runtime_1.jsx)(react_1.Button, { onClick: handleEmailSubmit, disabled: isLoading, className: "h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100", children: isLoading ? "Loading..." : mode === "sign-in" ? "Sign in" : "Sign up" })] })), providers.length > 0 && mode !== "forgot-password" && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [showEmail && ((0, jsx_runtime_1.jsxs)("div", { className: "my-8 flex items-center gap-4", children: [(0, jsx_runtime_1.jsx)("div", { className: "h-px flex-1 bg-gray-200 dark:bg-gray-700" }), (0, jsx_runtime_1.jsx)("span", { className: "text-xs text-gray-400", children: "Or continue with" }), (0, jsx_runtime_1.jsx)("div", { className: "h-px flex-1 bg-gray-200 dark:bg-gray-700" })] })), (0, jsx_runtime_1.jsx)("div", { className: "space-y-4", children: providers.map(provider => {
                             const icon = signInUtils_1.strategyIcons[provider.id];
                             const label = signInUtils_1.strategyLabels[provider.id] || provider.label;
                             const isProviderLoading = loadingProvider === provider.id;