@b3dotfun/sdk 0.1.69 → 0.1.70-alpha.10

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

@@ -3,22 +3,29 @@ import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspen
 import { RelayKitProviderWrapper, TooltipProvider } from "@b3dotfun/sdk/global-account/react";
 import { createWagmiConfig } from "@b3dotfun/sdk/global-account/react/utils/createWagmiConfig";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
+import type { AuthStrategy } from "./B3ConfigProvider";
 import { loadGA4Script } from "@b3dotfun/sdk/global-account/utils/analytics";
+import { WalletProvider } from "@b3dotfun/sdk/wallet/react";
 import "@relayprotocol/relay-kit-ui/styles.css";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient } from "@tanstack/react-query";
 import { useEffect, useMemo } from "react";
-import { ThirdwebProvider } from "thirdweb/react";
-import { Account, Wallet } from "thirdweb/wallets";
-import { CreateConnectorFn, WagmiProvider } from "wagmi";
-import { ClientType, setClientType } from "../../../client-manager";
+import { Account, EIP1193, Wallet } from "thirdweb/wallets";
+import { CreateConnectorFn } from "wagmi";
+import { ClientType, resetClients, setClientType } from "../../../client-manager";
+import { setB3ApiUrl } from "../../../../app.shared";
+import { setApiUrl as setNotificationsApiUrl } from "../../../../notifications/services/api";
+import { resetBetterAuthClient } from "../../../better-auth-client";
 import { StyleRoot } from "../StyleRoot";
 import { setToastContext, ToastProvider, useToastContext } from "../Toast/index";
 import AuthenticationProvider from "./AuthenticationProvider";
 import { B3ConfigProvider } from "./B3ConfigProvider";
+import BetterAuthProvider from "./BetterAuthProvider";
 import { LocalSDKProvider } from "./LocalSDKProvider";
 
-// Create queryClient instance
-const queryClient = new QueryClient();
+const NOTIFICATIONS_URL_BY_ENV = {
+  development: "https://dev-notifications.b3.fun",
+  production: "https://notifications.b3.fun",
+} as const;
 
 /**
  * Main B3Provider component
@@ -29,6 +36,7 @@ export function B3Provider({
   accountOverride,
   environment,
   automaticallySetFirstEoa,
+  defaultEoaProvider,
   simDuneApiKey,
   // deprecated since v0.0.87
   toaster: _toaster,
@@ -42,12 +50,19 @@ export function B3Provider({
   overrideDefaultConnectors = false,
   createClientReferenceId,
   defaultPermissions,
+  disableBSMNTAuthentication = false,
+  queryClient,
+  authStrategy = "thirdweb",
+  apiUrl,
+  notificationsApiUrl,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
   accountOverride?: Account;
   environment?: "development" | "production";
   automaticallySetFirstEoa?: boolean;
+  /** EIP-1193 provider to auto-connect as the default EOA wallet (e.g., Farcaster frame wallet) */
+  defaultEoaProvider?: EIP1193.EIP1193Provider;
   simDuneApiKey?: string;
   toaster?: {
     position?: "top-center" | "top-right" | "bottom-center" | "bottom-right";
@@ -64,7 +79,40 @@ export function B3Provider({
   overrideDefaultConnectors?: boolean;
   createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
   defaultPermissions?: PermissionsConfig;
+  disableBSMNTAuthentication?: boolean;
+  /** Provide your own QueryClient for React Query. If omitted, WalletProvider creates one internally. */
+  queryClient?: QueryClient;
+  /** Auth strategy: "thirdweb" (default, ecosystem wallet) or "better-auth" (email/password via Better Auth) */
+  authStrategy?: AuthStrategy;
+  /**
+   * Override the B3 API URL. When provided, all SDK requests (auth, Feathers,
+   * BetterAuth) will use this URL instead of the `NEXT_PUBLIC_B3_API` env var.
+   *
+   * Useful for local development: pass `http://localhost:3031` to route
+   * OAuth callbacks and session checks through your local B3 API.
+   * If omitted, defaults to `NEXT_PUBLIC_B3_API` or `https://api.b3.fun`.
+   */
+  apiUrl?: string;
+  /** Override the notifications worker URL. Defaults to `https://notifications.b3.fun`. */
+  notificationsApiUrl?: string;
 }) {
+  // Override the B3 API URL when the `apiUrl` prop is provided.
+  // Must run before client initialization and auth providers mount.
+  useEffect(() => {
+    setB3ApiUrl(apiUrl ?? null);
+    if (apiUrl) {
+      resetBetterAuthClient();
+      resetClients();
+    }
+    return () => {
+      setB3ApiUrl(null);
+    };
+  }, [apiUrl]);
+
+  useEffect(() => {
+    setNotificationsApiUrl(notificationsApiUrl ?? NOTIFICATIONS_URL_BY_ENV[environment ?? "production"]);
+  }, [notificationsApiUrl, environment]);
+
   // Initialize Google Analytics on mount
   useEffect(() => {
     loadGA4Script();
@@ -81,37 +129,46 @@ export function B3Provider({
   );
 
   return (
-    <ThirdwebProvider>
-      <WagmiProvider config={wagmiConfig} reconnectOnMount={false}>
-        <QueryClientProvider client={queryClient}>
-          <TooltipProvider>
-            <ToastProvider>
-              <LocalSDKProvider onConnectCallback={onConnect} onLogoutCallback={onLogout}>
-                <B3ConfigProvider
-                  accountOverride={accountOverride}
-                  environment={environment}
-                  automaticallySetFirstEoa={!!automaticallySetFirstEoa}
-                  theme={theme}
-                  clientType={clientType}
+    <WalletProvider wagmiConfig={wagmiConfig} queryClient={queryClient}>
+      <TooltipProvider>
+        <ToastProvider>
+          <LocalSDKProvider
+            onConnectCallback={onConnect}
+            onLogoutCallback={onLogout}
+            disableBSMNTAuthentication={disableBSMNTAuthentication}
+          >
+            <B3ConfigProvider
+              accountOverride={accountOverride}
+              environment={environment}
+              automaticallySetFirstEoa={!!automaticallySetFirstEoa}
+              theme={theme}
+              clientType={clientType}
+              partnerId={partnerId}
+              stripePublishableKey={stripePublishableKey}
+              createClientReferenceId={createClientReferenceId}
+              defaultPermissions={defaultPermissions}
+              authStrategy={authStrategy}
+            >
+              <ToastContextConnector />
+              <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
+                {children}
+                {/* For the modal https://github.com/b3-fun/b3/blob/main/packages/sdk/src/global-account/react/components/ui/dialog.tsx#L46 */}
+                <StyleRoot id="b3-root" />
+              </RelayKitProviderWrapper>
+              {authStrategy === "better-auth" ? (
+                <BetterAuthProvider partnerId={partnerId} />
+              ) : (
+                <AuthenticationProvider
                   partnerId={partnerId}
-                  stripePublishableKey={stripePublishableKey}
-                  createClientReferenceId={createClientReferenceId}
-                  defaultPermissions={defaultPermissions}
-                >
-                  <ToastContextConnector />
-                  <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
-                    {children}
-                    {/* For the modal https://github.com/b3-fun/b3/blob/main/packages/sdk/src/global-account/react/components/ui/dialog.tsx#L46 */}
-                    <StyleRoot id="b3-root" />
-                  </RelayKitProviderWrapper>
-                  <AuthenticationProvider partnerId={partnerId} automaticallySetFirstEoa={!!automaticallySetFirstEoa} />
-                </B3ConfigProvider>
-              </LocalSDKProvider>
-            </ToastProvider>
-          </TooltipProvider>
-        </QueryClientProvider>
-      </WagmiProvider>
-    </ThirdwebProvider>
+                  automaticallySetFirstEoa={!!automaticallySetFirstEoa}
+                  defaultEoaProvider={defaultEoaProvider}
+                />
+              )}
+            </B3ConfigProvider>
+          </LocalSDKProvider>
+        </ToastProvider>
+      </TooltipProvider>
+    </WalletProvider>
   );
 }
 

package/src/global-account/react/components/B3Provider/BetterAuthProvider.tsx

@@ -0,0 +1,173 @@
+import app from "@b3dotfun/sdk/global-account/app";
+import { useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import { B3_AUTH_COOKIE_NAME } from "@b3dotfun/sdk/shared/constants";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import Cookies from "js-cookie";
+import { useEffect, useRef } from "react";
+import { getBetterAuthClient } from "../../../better-auth-client";
+import { useUserQuery } from "../../hooks/useUserQuery";
+
+const debug = debugB3React("BetterAuthProvider");
+
+/**
+ * Parallel to AuthenticationProvider for Better Auth strategy.
+ *
+ * Manages the isAuthenticating lifecycle for Better Auth:
+ * 1. On mount, try to restore an existing Feathers JWT (from a previous login)
+ * 2. If no Feathers JWT, check for a Better Auth session (e.g. after OAuth redirect)
+ *    and exchange it for a Feathers JWT
+ * 3. If neither exists, set isAuthenticating: false so the login UI renders
+ *
+ * Also patches app.logout() so any code path that calls it (useAuthentication,
+ * useAuth, SignIn component, etc.) automatically clears the Better Auth session.
+ */
+const BetterAuthProvider = ({ partnerId }: { partnerId: string }) => {
+  const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
+  const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
+  const setIsConnected = useAuthStore(state => state.setIsConnected);
+  const { setUser } = useUserQuery();
+  const hasAttemptedRestore = useRef(false);
+  const hasPatched = useRef(false);
+
+  // Patch app.logout() to also clear the Better Auth session.
+  // This ensures any existing logout path (useAuthentication, useAuth, SignIn
+  // dropdown, etc.) clears both the Feathers JWT and the Better Auth session.
+  // Patch app.logout() to also clear the Better Auth session.
+  // Only handles Better Auth signOut — state cleanup (isAuthenticated, isConnected,
+  // setUser, localStorage) is handled by useAuthentication/useAuth's own logout.
+  useEffect(() => {
+    if (hasPatched.current) return;
+    hasPatched.current = true;
+
+    const originalLogout = app.logout.bind(app);
+    (app as any).logout = async () => {
+      debug("Patched logout: clearing Better Auth session");
+      try {
+        await getBetterAuthClient().signOut();
+      } catch {
+        debug("Better Auth signOut failed (non-critical)");
+      }
+      return originalLogout();
+    };
+
+    return () => {
+      (app as any).logout = originalLogout;
+      hasPatched.current = false;
+    };
+  }, []);
+
+  // Session restore on mount
+  useEffect(() => {
+    if (hasAttemptedRestore.current) return;
+    hasAttemptedRestore.current = true;
+
+    const restoreSession = async () => {
+      debug("Attempting session restore");
+
+      // 1. Try existing Feathers JWT first (fastest — no network call to Better Auth)
+      try {
+        const response = await app.reAuthenticate();
+        if (response?.user) {
+          debug("Feathers JWT restored", { userId: response.user.userId });
+          setUser(response.user);
+          setIsAuthenticated(true);
+          setIsConnected(true);
+          setIsAuthenticating(false);
+          return;
+        }
+      } catch {
+        debug("No existing Feathers JWT");
+      }
+
+      // 2. Check for _ba_token in URL (OAuth callback with third-party cookie bypass).
+      //    When the API and frontend are on different domains, browsers with third-party
+      //    cookie blocking (Firefox TCP, Safari ITP, Chrome Privacy Sandbox) prevent the
+      //    better-auth.session_token cookie from being sent on cross-origin requests.
+      //    The B3 API injects the session token into the redirect URL as _ba_token,
+      //    allowing direct exchange without relying on cookies.
+      const params = new URLSearchParams(window.location.search);
+      const baToken = params.get("_ba_token");
+      if (baToken) {
+        debug("Found _ba_token in URL, exchanging for Feathers JWT");
+
+        // Clean the token from the URL immediately (security)
+        params.delete("_ba_token");
+        const cleanSearch = params.toString();
+        const cleanUrl = window.location.pathname + (cleanSearch ? `?${cleanSearch}` : "") + window.location.hash;
+        window.history.replaceState({}, "", cleanUrl);
+
+        try {
+          const response = await app.authenticate({
+            strategy: "better-auth",
+            accessToken: baToken,
+            partnerId,
+          } as any);
+
+          if (response.accessToken) {
+            Cookies.set(B3_AUTH_COOKIE_NAME, response.accessToken, {
+              secure: true,
+              sameSite: "Lax",
+            });
+          }
+
+          if (response.user) {
+            setUser(response.user);
+            setIsAuthenticated(true);
+            setIsConnected(true);
+          }
+
+          debug("_ba_token exchanged for Feathers JWT", { userId: response.user?.userId });
+          setIsAuthenticating(false);
+          return;
+        } catch (err) {
+          debug("_ba_token exchange failed", err);
+        }
+      }
+
+      // 3. Check for a Better Auth session via cookie (works when API and frontend
+      //    share a domain or when cookies aren't partitioned)
+      try {
+        const session = await getBetterAuthClient().getSession();
+        if (session.data?.session?.token) {
+          debug("Better Auth session found, exchanging for Feathers JWT", {
+            betterAuthUserId: session.data.user?.id,
+          });
+
+          const response = await app.authenticate({
+            strategy: "better-auth",
+            accessToken: session.data.session.token,
+            partnerId,
+          } as any);
+
+          if (response.accessToken) {
+            Cookies.set(B3_AUTH_COOKIE_NAME, response.accessToken, {
+              secure: true,
+              sameSite: "Lax",
+            });
+          }
+
+          if (response.user) {
+            setUser(response.user);
+            setIsAuthenticated(true);
+            setIsConnected(true);
+          }
+
+          debug("OAuth session exchanged for Feathers JWT", { userId: response.user?.userId });
+          setIsAuthenticating(false);
+          return;
+        }
+      } catch {
+        debug("No Better Auth session to restore");
+      }
+
+      // 4. Nothing found — show login UI
+      setIsAuthenticating(false);
+    };
+
+    restoreSession();
+  }, [setIsAuthenticated, setIsAuthenticating, setIsConnected, setUser, partnerId]);
+
+  return null;
+};
+
+export default BetterAuthProvider;

package/src/global-account/react/components/B3Provider/LocalSDKProvider.tsx

@@ -8,11 +8,13 @@ import { Wallet } from "thirdweb/wallets";
 export interface LocalSDKContextType {
   onConnectCallback?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
   onLogoutCallback?: () => void | Promise<void>;
+  disableBSMNTAuthentication?: boolean;
 }
 
 export const LocalSDKContext = createContext<LocalSDKContextType>({
   onConnectCallback: undefined,
   onLogoutCallback: undefined,
+  disableBSMNTAuthentication: false,
 });
 
 /**
@@ -22,16 +24,19 @@ export function LocalSDKProvider({
   children,
   onConnectCallback,
   onLogoutCallback,
+  disableBSMNTAuthentication,
 }: {
   children: React.ReactNode;
   onConnectCallback?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
   onLogoutCallback?: () => void | Promise<void>;
+  disableBSMNTAuthentication?: boolean;
 }) {
   return (
     <LocalSDKContext.Provider
       value={{
         onConnectCallback,
         onLogoutCallback,
+        disableBSMNTAuthentication,
       }}
     >
       {children}

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

@@ -22,6 +22,8 @@ interface IPFSMediaRendererProps {
   controls?: boolean;
   /** Style object */
   style?: React.CSSProperties;
+  /** Callback when media fails to load */
+  onError?: () => void;
 }
 
 /**
@@ -51,6 +53,7 @@ export function IPFSMediaRenderer({
   height,
   controls,
   style,
+  onError,
 }: IPFSMediaRendererProps) {
   // If no source, render fallback
   if (!src) {
@@ -67,16 +70,20 @@ export function IPFSMediaRenderer({
   // This avoids Thirdweb's default cloudflare-ipfs.com which can be unreliable
   const resolvedSrc = src.startsWith("ipfs://") ? getIpfsUrl(src) : src;
 
+  // Wrap in a span with onErrorCapture to catch img/video load errors from
+  // MediaRenderer, which doesn't expose an onError prop itself.
   return (
-    <MediaRenderer
-      src={resolvedSrc}
-      client={client}
-      alt={alt}
-      className={className}
-      width={width ? width.toString() : undefined}
-      height={height ? height.toString() : undefined}
-      controls={controls}
-      style={style}
-    />
+    <span onErrorCapture={onError} className="contents">
+      <MediaRenderer
+        src={resolvedSrc}
+        client={client}
+        alt={alt}
+        className={className}
+        width={width ? width.toString() : undefined}
+        height={height ? height.toString() : undefined}
+        controls={controls}
+        style={style}
+      />
+    </span>
   );
 }

package/src/global-account/react/components/LinkAccount/LinkedAccountItem.tsx

@@ -1,4 +1,5 @@
 import { Button, toast, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profileDisplay";
 import { truncateAddress } from "@b3dotfun/sdk/shared/utils/truncateAddress";
 import { Copy, Loader2, UnlinkIcon } from "lucide-react";
 
@@ -55,7 +56,7 @@ const LinkedAccountItem = ({
     }
   };
 
-  const displayImageUrl = profileData?.avatar || profile.imageUrl;
+  const displayImageUrl = validateImageUrl(profileData?.avatar) || validateImageUrl(profile.imageUrl);
   const displayName = profileData?.name || displayTitle;
 
   return (

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

@@ -1,4 +1,4 @@
-import { TabsListPrimitive, TabTriggerPrimitive, useModalStore } from "@b3dotfun/sdk/global-account/react";
+import { TabsListPrimitive, TabTriggerPrimitive, useB3Config, useModalStore } from "@b3dotfun/sdk/global-account/react";
 
 const HomeIcon = () => {
   return (
@@ -42,6 +42,8 @@ const SettingsIcon = () => {
 
 const BottomNavigation = () => {
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
+  const { authStrategy } = useB3Config();
+  const isBetterAuth = authStrategy === "better-auth";
 
   return (
     <div className="b3-modal-bottom-navigation sticky bottom-0 left-0 w-full rounded-b-xl border-t border-gray-200 bg-[#FAFAFA]">
@@ -54,19 +56,21 @@ const BottomNavigation = () => {
           <span className="text-b3-grey font-neue-montreal-semibold text-xs">Home</span>
         </TabTriggerPrimitive>
 
-        <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,
-            });
-          }}
-        >
-          <SwapIcon />
-          <span className="text-b3-grey font-neue-montreal-semibold text-xs">Swap</span>
-        </TabTriggerPrimitive>
+        {!isBetterAuth && (
+          <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,
+              });
+            }}
+          >
+            <SwapIcon />
+            <span className="text-b3-grey font-neue-montreal-semibold text-xs">Swap</span>
+          </TabTriggerPrimitive>
+        )}
 
         <TabTriggerPrimitive
           value="settings"

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

@@ -2,6 +2,7 @@ import {
   CopyToClipboard,
   ManageAccountModalProps,
   useAuthentication,
+  useB3Config,
   useModalStore,
 } from "@b3dotfun/sdk/global-account/react";
 import * as AccordionPrimitive from "@radix-ui/react-accordion";
@@ -10,6 +11,7 @@ import { Loader2 } from "lucide-react";
 import { useState } from "react";
 import { useActiveWallet, useConnectedWallets, useSetActiveWallet, useWalletImage } from "thirdweb/react";
 import { Wallet } from "thirdweb/wallets";
+import { UserAvatar } from "../UserAvatar/UserAvatar";
 import { ChevronDownIcon } from "../icons/ChevronDownIcon";
 import LinkIcon from "../icons/LinkIcon";
 import SignOutIcon from "../icons/SignOutIcon";
@@ -89,7 +91,69 @@ function WalletItem({ wallet, isActive, onClick }: { wallet: Wallet; isActive: b
   );
 }
 
+function BetterAuthHeader({ onLogout }: { onLogout?: () => void }) {
+  const contentType = useModalStore(state => state.contentType) as ManageAccountModalProps;
+  const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
+  const partnerId = contentType?.partnerId;
+  const { logout, user } = useAuthentication(partnerId);
+  const [logoutLoading, setLogoutLoading] = useState(false);
+
+  const displayName = user?.username || user?.email || "Account";
+
+  const onLogoutEnhanced = async () => {
+    setLogoutLoading(true);
+    try {
+      await logout();
+      onLogout?.();
+    } finally {
+      setB3ModalOpen(false);
+      setLogoutLoading(false);
+    }
+  };
+
+  return (
+    <div className="bg-b3-background border-b3-line flex items-center justify-between border-b px-5 py-3">
+      <div className="flex items-center gap-2">
+        <UserAvatar avatarUrl={user?.avatar} name={displayName} size={40} className="shrink-0" />
+        <div className="flex flex-col gap-0.5">
+          {user?.username && (
+            <p className="text-b3-grey font-neue-montreal-semibold text-left text-sm">{user.username}</p>
+          )}
+          {user?.email && (
+            <div className="flex items-center gap-1">
+              <p className="text-b3-foreground-muted font-neue-montreal-medium text-sm">{user.email}</p>
+              <CopyToClipboard text={user.email} />
+            </div>
+          )}
+        </div>
+      </div>
+      <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}
+      >
+        {logoutLoading ? (
+          <Loader2 className="animate-spin" size={16} />
+        ) : (
+          <SignOutIcon size={16} className="text-b3-grey" />
+        )}
+        <p className="text-b3-grey font-neue-montreal-semibold text-sm">Sign out</p>
+      </button>
+    </div>
+  );
+}
+
 export function Header({ onLogout }: { onLogout?: () => void }) {
+  const { authStrategy } = useB3Config();
+
+  if (authStrategy === "better-auth") {
+    return <BetterAuthHeader onLogout={onLogout} />;
+  }
+
+  return <WalletHeader onLogout={onLogout} />;
+}
+
+function WalletHeader({ onLogout }: { onLogout?: () => void }) {
   const activeWallet = useActiveWallet();
 
   const connectedWallets = useConnectedWallets();
@@ -110,10 +174,13 @@ export function Header({ onLogout }: { onLogout?: () => void }) {
 
   const onLogoutEnhanced = async () => {
     setLogoutLoading(true);
-    await logout();
-    onLogout?.();
-    setB3ModalOpen(false);
-    setLogoutLoading(false);
+    try {
+      await logout();
+      onLogout?.();
+    } finally {
+      setB3ModalOpen(false);
+      setLogoutLoading(false);
+    }
   };
 
   const handleWalletSwitch = (wallet: Wallet) => {

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

@@ -1,3 +1,4 @@
+import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { Tabs, TabsContent, TabsList, TabTrigger } from "../ui/Tabs";
 import { Header } from "./Header";
 import HomeActions from "./HomeActions";
@@ -11,31 +12,36 @@ interface HomeContentProps {
 }
 
 export function HomeContent({ showDeposit = false, showSwap = true }: HomeContentProps) {
+  const { authStrategy } = useB3Config();
+  const isBetterAuth = authStrategy === "better-auth";
+
   return (
     <div className="flex flex-col">
       <Header />
       <div className="flex flex-col">
         <ProfileSection />
 
-        <HomeActions showDeposit={showDeposit} showSwap={showSwap} />
-        <div className="b3-modal-balance-content space-y-2 p-5">
-          <Tabs defaultValue={"balance"}>
-            <TabsList className="b3-modal-balance-tabs-list">
-              <TabTrigger value="balance" className="font-neue-montreal-semibold p-0 pr-3">
-                Balance
-              </TabTrigger>
-              <TabTrigger value="nfts" className="font-neue-montreal-semibold p-0 pr-3">
-                NFTs
-              </TabTrigger>
-            </TabsList>
-            <TabsContent value="balance" className="px-0 pb-4 pt-2">
-              <TokenContent />
-            </TabsContent>
-            <TabsContent value="nfts" className="px-0 pb-4 pt-2">
-              <NFTContent />
-            </TabsContent>
-          </Tabs>
-        </div>
+        {!isBetterAuth && <HomeActions showDeposit={showDeposit} showSwap={showSwap} />}
+        {!isBetterAuth && (
+          <div className="b3-modal-balance-content space-y-2 p-5">
+            <Tabs defaultValue={"balance"}>
+              <TabsList className="b3-modal-balance-tabs-list">
+                <TabTrigger value="balance" className="font-neue-montreal-semibold p-0 pr-3">
+                  Balance
+                </TabTrigger>
+                <TabTrigger value="nfts" className="font-neue-montreal-semibold p-0 pr-3">
+                  NFTs
+                </TabTrigger>
+              </TabsList>
+              <TabsContent value="balance" className="px-0 pb-4 pt-2">
+                <TokenContent />
+              </TabsContent>
+              <TabsContent value="nfts" className="px-0 pb-4 pt-2">
+                <NFTContent />
+              </TabsContent>
+            </Tabs>
+          </div>
+        )}
       </div>
     </div>
   );