@b3dotfun/sdk 0.1.70-alpha.1 → 0.1.70-alpha.10

package/src/global-account/better-auth-client.ts

@@ -1,17 +1,43 @@
 import { createAuthClient } from "better-auth/client";
-import { B3_API_URL } from "../app.shared";
+import { twoFactorClient } from "better-auth/client/plugins";
+import { getB3ApiUrl } from "../app.shared";
 
 export type B3BetterAuthClient = ReturnType<typeof createB3BetterAuthClient>;
 
-export function createB3BetterAuthClient(baseURL: string = B3_API_URL) {
+export function createB3BetterAuthClient(baseURL?: string) {
   return createAuthClient({
-    baseURL,
+    baseURL: baseURL ?? getB3ApiUrl(),
     basePath: "/auth",
     fetchOptions: {
       credentials: "include",
     },
+    plugins: [twoFactorClient()],
   });
 }
 
-// Default singleton for standard usage
+// Lazily-initialized singleton. Recreated when the API URL changes via
+// `resetBetterAuthClient()` (called by B3Provider when `apiUrl` changes).
+let _client: B3BetterAuthClient | null = null;
+let _clientUrl: string | null = null;
+
+/** Get the shared BetterAuth client, creating it if needed. */
+export function getBetterAuthClient(): B3BetterAuthClient {
+  const url = getB3ApiUrl();
+  if (!_client || _clientUrl !== url) {
+    _client = createB3BetterAuthClient(url);
+    _clientUrl = url;
+  }
+  return _client;
+}
+
+/** Force-recreate the client on next access (e.g. after API URL change). */
+export function resetBetterAuthClient(): void {
+  _client = null;
+  _clientUrl = null;
+}
+
+/**
+ * @deprecated Use `getBetterAuthClient()` instead. This static singleton
+ * does not reflect runtime API URL changes via `B3Provider apiUrl` prop.
+ */
 export const betterAuthClient = createB3BetterAuthClient();

package/src/global-account/bsmnt.native.ts

@@ -80,7 +80,11 @@ const app = createClient(socketio(socket), {
   storageKey: BSMNT_AUTH_COOKIE_NAME,
 });
 
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   const fullToken = `${accessToken}+${identityToken}`;
 
   // Do not authenticate if there is no token

package/src/global-account/bsmnt.ts

@@ -42,7 +42,11 @@ const app = createClient(socketio(socket), {
   storageKey: BSMNT_AUTH_COOKIE_NAME,
 });
 
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   const fullToken = `${accessToken}+${identityToken}`;
 
   // Do not authenticate if there is no token
@@ -73,7 +77,10 @@ export const resetSocket = () => {
   // reset the socket connection
 };
 
-export const authenticateWithB3JWT = async (fullToken: string, params?: Record<string, any>) => {
+export const authenticateWithB3JWT = async (
+  fullToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   // Do not authenticate if there is no token
   if (!fullToken) {
     console.log("No token found, not authenticating");

package/src/global-account/client-manager.ts

@@ -2,7 +2,7 @@ import { ClientApplication, createClient } from "@b3dotfun/b3-api";
 import rest from "@feathersjs/rest-client";
 import socketio from "@feathersjs/socketio-client";
 import io from "socket.io-client";
-import { authenticate as authenticateB3, B3_API_URL, clientOptions } from "../app.shared";
+import { authenticate as authenticateB3, getB3ApiUrl, clientOptions } from "../app.shared";
 
 export type ClientType = "socket" | "rest";
 
@@ -13,17 +13,21 @@ let currentClient: ClientApplication | null = null;
 // Socket client instance
 let socketClient: ClientApplication | null = null;
 let socketInstance: any = null;
+let socketClientUrl: string | null = null;
 
 // REST client instance
 let restClient: ClientApplication | null = null;
+let restClientUrl: string | null = null;
 
 /**
  * Creates a socket client
  */
 function createSocketClient(): ClientApplication {
-  if (!socketClient) {
-    socketInstance = io(B3_API_URL, { transports: ["websocket"] });
+  const url = getB3ApiUrl();
+  if (!socketClient || socketClientUrl !== url) {
+    socketInstance = io(url, { transports: ["websocket"] });
     socketClient = createClient(socketio(socketInstance), clientOptions);
+    socketClientUrl = url;
   }
   return socketClient;
 }
@@ -40,13 +44,24 @@ function resolveFetch(): typeof fetch {
 }
 
 function createRestClient(): ClientApplication {
-  if (!restClient) {
-    const connection = rest(B3_API_URL).fetch(resolveFetch());
+  const url = getB3ApiUrl();
+  if (!restClient || restClientUrl !== url) {
+    const connection = rest(url).fetch(resolveFetch());
     restClient = createClient(connection, clientOptions);
+    restClientUrl = url;
   }
   return restClient;
 }
 
+/** Reset all cached clients (called when API URL changes). */
+export function resetClients(): void {
+  socketClient = null;
+  socketClientUrl = null;
+  restClient = null;
+  restClientUrl = null;
+  currentClient = null;
+}
+
 /**
  * Sets the active client type and creates the appropriate client
  *
@@ -99,7 +114,11 @@ export function resetSocket(): void {
 /**
  * Authenticates with the current active client
  */
-export const authenticate = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticate = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<Record<string, any> | null> => {
   return authenticateB3(getClient(), accessToken, identityToken, params);
 };
 
@@ -111,7 +130,7 @@ export const authenticateWithClient = async (
   accessToken: string,
   identityToken: string,
   params?: Record<string, any>,
-) => {
+): Promise<Record<string, any> | null> => {
   const client = getClientByType(clientType);
   return authenticateB3(client, accessToken, identityToken, params);
 };
@@ -119,7 +138,15 @@ export const authenticateWithClient = async (
 /**
  * Authenticates with both clients in parallel (useful for migration scenarios)
  */
-export const authenticateBoth = async (accessToken: string, identityToken: string, params?: Record<string, any>) => {
+export const authenticateBoth = async (
+  accessToken: string,
+  identityToken: string,
+  params?: Record<string, any>,
+): Promise<{
+  socket: Record<string, any> | null;
+  rest: Record<string, any> | null;
+  success: boolean;
+}> => {
   const [socketResult, restResult] = await Promise.allSettled([
     authenticateWithClient("socket", accessToken, identityToken, params),
     authenticateWithClient("rest", accessToken, identityToken, params),
@@ -135,7 +162,12 @@ export const authenticateBoth = async (accessToken: string, identityToken: strin
 /**
  * Switches the client type and authenticates
  */
-export async function switchClientAndAuth(type: ClientType, access: string, id: string, params?: any) {
+export async function switchClientAndAuth(
+  type: ClientType,
+  access: string,
+  id: string,
+  params?: any,
+): Promise<Record<string, any> | null> {
   setClientType(type);
   return authenticateWithClient(type, access, id, params);
 }

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

@@ -13,7 +13,7 @@ import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profi
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { getIpfsUrl } from "@b3dotfun/sdk/shared/utils/ipfs";
-import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
+import { uploadFile as uploadToB3 } from "@b3dotfun/sdk/shared/utils/upload";
 import { Loader2, Upload, X } from "lucide-react";
 import { useCallback, useRef, useState } from "react";
 import type { Area } from "react-easy-crop";
@@ -21,7 +21,6 @@ import Cropper from "react-easy-crop";
 import "react-easy-crop/react-easy-crop.css";
 
 import { useActiveAccount } from "thirdweb/react";
-import { upload } from "thirdweb/storage";
 import { useModalStore } from "../../stores";
 import ModalHeader from "../ModalHeader/ModalHeader";
 
@@ -243,22 +242,18 @@ export function AvatarEditor({ onSetAvatar, className }: AvatarEditorProps) {
         }
       }
 
-      // Upload to IPFS if we have a file
+      // Upload file if we have one
       if (fileToUpload) {
-        debug("Starting upload to IPFS", fileToUpload);
+        debug("Starting upload", fileToUpload);
 
-        // Upload to IPFS using Thirdweb
-        const ipfsUrl = await upload({
-          client,
-          files: [fileToUpload],
-        });
+        const avatarUrl = await uploadToB3(fileToUpload);
 
-        debug("Upload successful", ipfsUrl);
+        debug("Upload successful", avatarUrl);
 
         // Save avatar URL using profiles service
         const user = await app.service("users").setAvatar(
           {
-            avatar: ipfsUrl,
+            avatar: avatarUrl,
           },
           // @ts-expect-error - our typed client is expecting context even though it's set elsewhere
           {},

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

@@ -28,8 +28,6 @@ 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;
 }
 
 const B3ConfigContext = createContext<B3ConfigContextType | null>(null);
@@ -46,7 +44,6 @@ export function B3ConfigProvider({
   stripePublishableKey,
   createClientReferenceId,
   authStrategy = "thirdweb",
-  apiUrl,
 }: {
   children: React.ReactNode;
   accountOverride?: Account;
@@ -59,8 +56,6 @@ export function B3ConfigProvider({
   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;
 }) {
   return (
     <B3ConfigContext.Provider
@@ -75,7 +70,6 @@ export function B3ConfigProvider({
         stripePublishableKey,
         createClientReferenceId,
         authStrategy,
-        apiUrl,
       }}
     >
       {children}

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

@@ -11,15 +11,22 @@ import { QueryClient } from "@tanstack/react-query";
 import { useEffect, useMemo } from "react";
 import { Account, EIP1193, Wallet } from "thirdweb/wallets";
 import { CreateConnectorFn } from "wagmi";
-import { ClientType, setClientType } from "../../../client-manager";
+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 { BetterAuthClientProvider } from "./BetterAuthClientProvider";
 import BetterAuthProvider from "./BetterAuthProvider";
 import { LocalSDKProvider } from "./LocalSDKProvider";
 
+const NOTIFICATIONS_URL_BY_ENV = {
+  development: "https://dev-notifications.b3.fun",
+  production: "https://notifications.b3.fun",
+} as const;
+
 /**
  * Main B3Provider component
  */
@@ -47,6 +54,7 @@ export function B3Provider({
   queryClient,
   authStrategy = "thirdweb",
   apiUrl,
+  notificationsApiUrl,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
@@ -77,22 +85,34 @@ export function B3Provider({
   /** 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`.
+   * 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 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" ... />
-   * ```
+   * 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();
@@ -128,25 +148,22 @@ export function B3Provider({
               createClientReferenceId={createClientReferenceId}
               defaultPermissions={defaultPermissions}
               authStrategy={authStrategy}
-              apiUrl={apiUrl}
             >
-              <BetterAuthClientProvider apiUrl={apiUrl}>
-                <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}
-                    automaticallySetFirstEoa={!!automaticallySetFirstEoa}
-                    defaultEoaProvider={defaultEoaProvider}
-                  />
-                )}
-              </BetterAuthClientProvider>
+              <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}
+                  automaticallySetFirstEoa={!!automaticallySetFirstEoa}
+                  defaultEoaProvider={defaultEoaProvider}
+                />
+              )}
             </B3ConfigProvider>
           </LocalSDKProvider>
         </ToastProvider>

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

@@ -4,8 +4,8 @@ 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";
-import { useBetterAuthClient } from "./BetterAuthClientProvider";
 
 const debug = debugB3React("BetterAuthProvider");
 
@@ -22,7 +22,6 @@ const debug = debugB3React("BetterAuthProvider");
  * useAuth, SignIn component, etc.) automatically clears the Better Auth session.
  */
 const BetterAuthProvider = ({ partnerId }: { partnerId: string }) => {
-  const betterAuthClient = useBetterAuthClient();
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsConnected = useAuthStore(state => state.setIsConnected);
@@ -44,7 +43,7 @@ const BetterAuthProvider = ({ partnerId }: { partnerId: string }) => {
     (app as any).logout = async () => {
       debug("Patched logout: clearing Better Auth session");
       try {
-        await betterAuthClient.signOut();
+        await getBetterAuthClient().signOut();
       } catch {
         debug("Better Auth signOut failed (non-critical)");
       }
@@ -55,7 +54,7 @@ const BetterAuthProvider = ({ partnerId }: { partnerId: string }) => {
       (app as any).logout = originalLogout;
       hasPatched.current = false;
     };
-  }, [betterAuthClient]);
+  }, []);
 
   // Session restore on mount
   useEffect(() => {
@@ -80,9 +79,55 @@ const BetterAuthProvider = ({ partnerId }: { partnerId: string }) => {
         debug("No existing Feathers JWT");
       }
 
-      // 2. Check for a Better Auth session (e.g. after OAuth redirect sets a cookie)
+      // 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 betterAuthClient.getSession();
+        const session = await getBetterAuthClient().getSession();
         if (session.data?.session?.token) {
           debug("Better Auth session found, exchanging for Feathers JWT", {
             betterAuthUserId: session.data.user?.id,
@@ -115,12 +160,12 @@ const BetterAuthProvider = ({ partnerId }: { partnerId: string }) => {
         debug("No Better Auth session to restore");
       }
 
-      // 3. Nothing found — show login UI
+      // 4. Nothing found — show login UI
       setIsAuthenticating(false);
     };
 
     restoreSession();
-  }, [setIsAuthenticated, setIsAuthenticating, setIsConnected, setUser, partnerId, betterAuthClient]);
+  }, [setIsAuthenticated, setIsAuthenticating, setIsConnected, setUser, partnerId]);
 
   return null;
 };

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

@@ -84,7 +84,7 @@ const SettingsProfileCard = () => {
         // 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
+        // Type assertion needed: API now accepts message/hash as optional for Better Auth users
         updatedUser = (await app
           .service("users")
           .registerUsername({ username: sanitizedUsername } as any, {} as any)) as unknown as Users;

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

@@ -12,7 +12,6 @@ import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import { Account } from "thirdweb/wallets";
-import { SignInWithB3Privy } from "./SignInWithB3Privy";
 import { LoginStep, LoginStepContainer } from "./steps/LoginStep";
 import { LoginStepCustom } from "./steps/LoginStepCustom";
 
@@ -310,9 +309,7 @@ export function SignInWithB3Flow({
       );
     } else {
       // Custom strategy
-      if (strategies?.[0] === "privy") {
-        content = <SignInWithB3Privy onSuccess={handleLoginSuccess} chain={chain} />;
-      } else if (strategies) {
+      if (strategies) {
         // Strategies are explicitly provided
         content = (
           <LoginStepCustom

package/src/global-account/react/components/SignInWithB3/utils/signInUtils.ts

@@ -3,12 +3,11 @@ import { createWallet, SingleStepAuthArgsType, Wallet } from "thirdweb/wallets";
 
 type WalletType = Wallet["id"];
 type StrategyType = SingleStepAuthArgsType["strategy"];
-type CustomStrategyType = "basement" | "privy";
+const customStrategies = ["basement"] as const;
+type CustomStrategyType = (typeof customStrategies)[number];
 
 type AllowedStrategies = StrategyType | WalletType | CustomStrategyType | "email";
 type NonWalletStrategyType = Exclude<AllowedStrategies, WalletType>;
-const customStrategies = ["basement", "privy"] as const;
-// type CustomStrategy = (typeof customStrategies)[number];
 
 export const allowedStrategies = [
   // Auth strategies
@@ -26,7 +25,6 @@ export const allowedStrategies = [
   "com.coinbase.wallet",
 
   // Custom strategies
-  // TODO: Audit we don't use "privy" directly anymore
   ...customStrategies,
 ] as const;
 

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

@@ -7,7 +7,6 @@ export { RelayKitProviderWrapper } from "./B3Provider/RelayKitProviderWrapper";
 export { useB3 } from "./B3Provider/useB3";
 export { useB3Account } from "./B3Provider/useB3Account";
 export { useB3Config } from "./B3Provider/useB3Config";
-export { useBetterAuthClient } from "./B3Provider/BetterAuthClientProvider";
 export { StyleRoot } from "./StyleRoot";
 
 // SignInWithB3 Components
@@ -23,7 +22,6 @@ export { PermissionItem } from "./SignInWithB3/components/PermissionItem";
 export { WalletRow } from "./SignInWithB3/components/WalletRow";
 export { SignInWithB3 } from "./SignInWithB3/SignInWithB3";
 export { SignInWithB3Flow } from "./SignInWithB3/SignInWithB3Flow";
-export { SignInWithB3Privy } from "./SignInWithB3/SignInWithB3Privy";
 export { LoginStepContainer } from "./SignInWithB3/steps/LoginStep";
 export { getConnectOptionsFromStrategy, isWalletType, type AllowedStrategy } from "./SignInWithB3/utils/signInUtils";
 

package/src/global-account/react/components/ui/button.tsx

@@ -32,8 +32,7 @@ const buttonVariants = cva(
 );
 
 export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>, VariantProps<typeof buttonVariants> {
   asChild?: boolean;
 }
 

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

@@ -17,7 +17,6 @@ export { useFirstEOA } from "./useFirstEOA";
 export { useGetAllTWSigners, type TWSignerWithMetadata } from "./useGetAllTWSigners";
 export { useGetGeo } from "./useGetGeo";
 export { useGlobalAccount } from "./useGlobalAccount";
-export { useHandleConnectWithPrivy } from "./useHandleConnectWithPrivy";
 export { useHasMounted } from "./useHasMounted";
 export { useIsMobile } from "./useIsMobile";
 export { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";

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

@@ -62,7 +62,7 @@ export function useAuth() {
    * Re-authenticate using existing session
    * Also updates user state and authenticates with BSMNT
    */
-  const reAuthenticate = useCallback(async () => {
+  const reAuthenticate = useCallback(async (): Promise<Record<string, any>> => {
     debug("Re-authenticating...");
     try {
       const response = await app.reAuthenticate();
@@ -191,7 +191,7 @@ export function useAuth() {
    * 3. Authenticates with BSMNT for basement integration
    */
   const authenticate = useCallback(
-    async (accessToken: string, partnerId: string, strategy = "thirdweb-jwt") => {
+    async (accessToken: string, partnerId: string, strategy = "thirdweb-jwt"): Promise<Record<string, any>> => {
       if (!accessToken) {
         throw new Error("Access token is required");
       }

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

@@ -120,7 +120,7 @@ export function useAuthentication(partnerId: string, { skipAutoConnect = false }
   }, [wallets, syncWagmi]);
 
   const authenticateUser = useCallback(
-    async (wallet?: Wallet) => {
+    async (wallet?: Wallet): Promise<Record<string, any>> => {
       setHasStartedConnecting(true);
 
       if (!wallet) {
@@ -216,7 +216,7 @@ export function useAuthentication(partnerId: string, { skipAutoConnect = false }
         localStorage.removeItem("b3-user");
       }
 
-      app.logout();
+      await app.logout();
       debug("@@logout:loggedOut");
 
       setIsAuthenticated(false);