@b3dotfun/sdk 0.1.70-alpha.2 → 0.1.70-alpha.21

package/dist/esm/global-account/better-auth-client.js

@@ -1,13 +1,36 @@
 import { createAuthClient } from "better-auth/client";
-import { B3_API_URL } from "../app.shared.js";
-export function createB3BetterAuthClient(baseURL = B3_API_URL) {
+import { twoFactorClient } from "better-auth/client/plugins";
+import { getB3ApiUrl } from "../app.shared.js";
+export function createB3BetterAuthClient(baseURL) {
     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 = null;
+let _clientUrl = null;
+/** Get the shared BetterAuth client, creating it if needed. */
+export function getBetterAuthClient() {
+    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() {
+    _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/dist/esm/global-account/bsmnt.d.ts

@@ -1,5 +1,5 @@
 declare const app: import("@b3dotfun/basement-api").ClientApplication;
-export declare const authenticate: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<import("@feathersjs/authentication").AuthenticationResult | null>;
+export declare const authenticate: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<Record<string, any> | null>;
 export declare const resetSocket: () => void;
-export declare const authenticateWithB3JWT: (fullToken: string, params?: Record<string, any>) => Promise<import("@feathersjs/authentication").AuthenticationResult | null>;
+export declare const authenticateWithB3JWT: (fullToken: string, params?: Record<string, any>) => Promise<Record<string, any> | null>;
 export default app;

package/dist/esm/global-account/bsmnt.native.d.ts

@@ -1,5 +1,5 @@
 import { MMKV } from "react-native-mmkv";
 export declare const localStoreInstance: MMKV;
 declare const app: import("@b3dotfun/basement-api").ClientApplication;
-export declare const authenticate: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<import("@feathersjs/authentication").AuthenticationResult | null>;
+export declare const authenticate: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<Record<string, any> | null>;
 export default app;

package/dist/esm/global-account/client-manager.d.ts

@@ -1,5 +1,7 @@
 import { ClientApplication } from "@b3dotfun/b3-api";
 export type ClientType = "socket" | "rest";
+/** Reset all cached clients (called when API URL changes). */
+export declare function resetClients(): void;
 /**
  * Sets the active client type and creates the appropriate client
  *
@@ -25,20 +27,20 @@ export declare function resetSocket(): void;
 /**
  * Authenticates with the current active client
  */
-export declare const authenticate: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<import("@feathersjs/authentication").AuthenticationResult | null>;
+export declare const authenticate: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<Record<string, any> | null>;
 /**
  * Authenticates with a specific client type
  */
-export declare const authenticateWithClient: (clientType: ClientType, accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<import("@feathersjs/authentication").AuthenticationResult | null>;
+export declare const authenticateWithClient: (clientType: ClientType, accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<Record<string, any> | null>;
 /**
  * Authenticates with both clients in parallel (useful for migration scenarios)
  */
 export declare const authenticateBoth: (accessToken: string, identityToken: string, params?: Record<string, any>) => Promise<{
-    socket: import("@feathersjs/authentication").AuthenticationResult | null;
-    rest: import("@feathersjs/authentication").AuthenticationResult | null;
+    socket: Record<string, any> | null;
+    rest: Record<string, any> | null;
     success: boolean;
 }>;
 /**
  * Switches the client type and authenticates
  */
-export declare function switchClientAndAuth(type: ClientType, access: string, id: string, params?: any): Promise<import("@feathersjs/authentication").AuthenticationResult | null>;
+export declare function switchClientAndAuth(type: ClientType, access: string, id: string, params?: any): Promise<Record<string, any> | null>;

package/dist/esm/global-account/client-manager.js

@@ -2,22 +2,57 @@ import { 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.js";
+import { authenticate as authenticateB3, getB3ApiUrl, clientOptions } from "../app.shared.js";
 // Global state to track which client type is active
 let currentClientType = "rest";
 let currentClient = null;
 // Socket client instance
 let socketClient = null;
 let socketInstance = null;
+let socketClientUrl = null;
 // REST client instance
 let restClient = null;
+let restClientUrl = null;
+// The pinned @b3dotfun/b3-api client's generated usersMethods predates `setBio`,
+// so `users.setBio(...)` throws "setBio is not a function". Re-register the users
+// service with the full list (mirrors users.shared.ts). Remove once the
+// @b3dotfun/b3-api pin includes setBio.
+const USERS_METHODS = [
+    "find",
+    "get",
+    "create",
+    "patch",
+    "remove",
+    "setReferralCode",
+    "syncTwProfiles",
+    "setAvatar",
+    "setBio",
+    "registerUsername",
+    "getMe",
+];
+// Re-register on every client the manager builds — the active transport
+// (REST/socket) switches at runtime.
+function ensureUsersCustomMethods(client) {
+    try {
+        const connection = client.get("connection");
+        if (connection?.service) {
+            client.use("users", connection.service("users"), { methods: USERS_METHODS });
+        }
+    }
+    catch {
+        // Non-fatal: keep whatever methods the generated client already exposes.
+    }
+}
 /**
  * Creates a socket client
  */
 function createSocketClient() {
-    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);
+        ensureUsersCustomMethods(socketClient);
+        socketClientUrl = url;
     }
     return socketClient;
 }
@@ -33,12 +68,23 @@ function resolveFetch() {
     return require("cross-fetch").fetch;
 }
 function createRestClient() {
-    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);
+        ensureUsersCustomMethods(restClient);
+        restClientUrl = url;
     }
     return restClient;
 }
+/** Reset all cached clients (called when API URL changes). */
+export function resetClients() {
+    socketClient = null;
+    socketClientUrl = null;
+    restClient = null;
+    restClientUrl = null;
+    currentClient = null;
+}
 /**
  * Sets the active client type and creates the appropriate client
  *

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

@@ -6,13 +6,12 @@ import { validateImageUrl } from "../../../../global-account/react/utils/profile
 import { cn } from "../../../../shared/utils/cn.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { getIpfsUrl } from "../../../../shared/utils/ipfs.js";
-import { client } from "../../../../shared/utils/thirdweb.js";
+import { uploadFile as uploadToB3 } from "../../../../shared/utils/upload.js";
 import { Loader2, Upload, X } from "lucide-react";
 import { useCallback, useRef, useState } from "react";
 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/index.js";
 import ModalHeader from "../ModalHeader/ModalHeader.js";
 const debug = debugB3React("AvatarEditor");
@@ -195,18 +194,14 @@ export function AvatarEditor({ onSetAvatar, className }) {
                     return;
                 }
             }
-            // Upload to IPFS if we have a file
+            // Upload file if we have one
             if (fileToUpload) {
-                debug("Starting upload to IPFS", fileToUpload);
-                // Upload to IPFS using Thirdweb
-                const ipfsUrl = await upload({
-                    client,
-                    files: [fileToUpload],
-                });
-                debug("Upload successful", ipfsUrl);
+                debug("Starting upload", fileToUpload);
+                const avatarUrl = await uploadToB3(fileToUpload);
+                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/dist/esm/global-account/react/components/B3Provider/B3ConfigProvider.d.ts

@@ -30,3 +30,14 @@ export declare function B3ConfigProvider({ children, accountOverride, environmen
     authStrategy?: AuthStrategy;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useB3Config(): B3ConfigContextType;
+/**
+ * Overrides ONLY `partnerId` for a subtree, inheriting every other config value from the parent
+ * B3ConfigProvider. Lets a single route attribute its AnySpend orders/quotes to a different partner
+ * (e.g. `/b3os-deposit` → the b3os partner) without standing up a second B3Provider — the config
+ * context is separate from the wallet/modal machinery, so nothing re-initializes. Must be rendered
+ * inside an existing B3ConfigProvider.
+ */
+export declare function B3ConfigPartnerOverride({ partnerId, children }: {
+    partnerId: string;
+    children: React.ReactNode;
+}): import("react/jsx-runtime").JSX.Element;

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

@@ -31,3 +31,14 @@ export function useB3Config() {
     }
     return context;
 }
+/**
+ * Overrides ONLY `partnerId` for a subtree, inheriting every other config value from the parent
+ * B3ConfigProvider. Lets a single route attribute its AnySpend orders/quotes to a different partner
+ * (e.g. `/b3os-deposit` → the b3os partner) without standing up a second B3Provider — the config
+ * context is separate from the wallet/modal machinery, so nothing re-initializes. Must be rendered
+ * inside an existing B3ConfigProvider.
+ */
+export function B3ConfigPartnerOverride({ partnerId, children }) {
+    const parent = useB3Config();
+    return _jsx(B3ConfigContext.Provider, { value: { ...parent, partnerId }, children: children });
+}

package/dist/esm/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, toaster: _toaster, clientType, rpcUrls, partnerId, stripePublishableKey, onConnect, onLogout, connectors, overrideDefaultConnectors, createClientReferenceId, defaultPermissions, disableBSMNTAuthentication, queryClient, authStrategy, apiUrl, notificationsApiUrl, }: {
     theme: "light" | "dark";
     children: React.ReactNode;
     accountOverride?: Account;
@@ -18,7 +18,6 @@ export declare function B3Provider({ theme, children, accountOverride, environme
     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";
         style?: React.CSSProperties;
@@ -39,4 +38,15 @@ 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 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;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -5,19 +5,41 @@ import { loadGA4Script } from "../../../../global-account/utils/analytics.js";
 import { WalletProvider } from "../../../../wallet/react/index.js";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { useEffect, useMemo } from "react";
-import { setClientType } from "../../../client-manager.js";
+import { resetClients, setClientType } from "../../../client-manager.js";
+import { setB3ApiUrl } from "../../../../app.shared.js";
+import { setApiUrl as setNotificationsApiUrl } from "../../../../notifications/services/api.js";
+import { resetBetterAuthClient } from "../../../better-auth-client.js";
 import { StyleRoot } from "../StyleRoot.js";
 import { setToastContext, ToastProvider, useToastContext } from "../Toast/index.js";
 import AuthenticationProvider from "./AuthenticationProvider.js";
 import { B3ConfigProvider } from "./B3ConfigProvider.js";
 import BetterAuthProvider from "./BetterAuthProvider.js";
 import { LocalSDKProvider } from "./LocalSDKProvider.js";
+const NOTIFICATIONS_URL_BY_ENV = {
+    development: "https://dev-notifications.b3.fun",
+    production: "https://notifications.b3.fun",
+};
 /**
  * Main B3Provider component
  */
-export function B3Provider({ theme = "light", children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, simDuneApiKey, 
+export function B3Provider({ theme = "light", children, accountOverride, environment, automaticallySetFirstEoa, defaultEoaProvider, 
 // 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, notificationsApiUrl, }) {
+    // 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();
@@ -27,7 +49,7 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, stripePublishableKey
         setClientType(clientType);
     }, [clientType]);
     const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors }), [partnerId, rpcUrls, connectors, overrideDefaultConnectors]);
-    return (_jsx(WalletProvider, { wagmiConfig: wagmiConfig, queryClient: queryClient, children: _jsx(TooltipProvider, { children: _jsx(ToastProvider, { children: _jsx(LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, disableBSMNTAuthentication: disableBSMNTAuthentication, children: _jsxs(B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, authStrategy: authStrategy, children: [_jsx(ToastContextConnector, {}), _jsxs(RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, _jsx(StyleRoot, { id: "b3-root" })] }), authStrategy === "better-auth" ? (_jsx(BetterAuthProvider, { partnerId: partnerId })) : (_jsx(AuthenticationProvider, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa, defaultEoaProvider: defaultEoaProvider }))] }) }) }) }) }));
+    return (_jsx(WalletProvider, { wagmiConfig: wagmiConfig, queryClient: queryClient, children: _jsx(TooltipProvider, { children: _jsx(ToastProvider, { children: _jsx(LocalSDKProvider, { onConnectCallback: onConnect, onLogoutCallback: onLogout, disableBSMNTAuthentication: disableBSMNTAuthentication, children: _jsxs(B3ConfigProvider, { accountOverride: accountOverride, environment: environment, automaticallySetFirstEoa: !!automaticallySetFirstEoa, theme: theme, clientType: clientType, partnerId: partnerId, stripePublishableKey: stripePublishableKey, createClientReferenceId: createClientReferenceId, defaultPermissions: defaultPermissions, authStrategy: authStrategy, children: [_jsx(ToastContextConnector, {}), _jsxs(RelayKitProviderWrapper, { children: [children, _jsx(StyleRoot, { id: "b3-root" })] }), authStrategy === "better-auth" ? (_jsx(BetterAuthProvider, { partnerId: partnerId })) : (_jsx(AuthenticationProvider, { partnerId: partnerId, automaticallySetFirstEoa: !!automaticallySetFirstEoa, defaultEoaProvider: defaultEoaProvider }))] }) }) }) }) }));
 }
 /**
  * Component to connect the toast context to the global toast API

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

@@ -4,7 +4,7 @@ import { B3_AUTH_COOKIE_NAME } from "../../../../shared/constants/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import Cookies from "js-cookie";
 import { useEffect, useRef } from "react";
-import { betterAuthClient } from "../../../better-auth-client.js";
+import { getBetterAuthClient } from "../../../better-auth-client.js";
 import { useUserQuery } from "../../hooks/useUserQuery.js";
 const debug = debugB3React("BetterAuthProvider");
 /**
@@ -40,7 +40,7 @@ const BetterAuthProvider = ({ partnerId }) => {
         app.logout = async () => {
             debug("Patched logout: clearing Better Auth session");
             try {
-                await betterAuthClient.signOut();
+                await getBetterAuthClient().signOut();
             }
             catch {
                 debug("Better Auth signOut failed (non-critical)");
@@ -74,9 +74,50 @@ const BetterAuthProvider = ({ partnerId }) => {
             catch {
                 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,
+                    });
+                    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,
@@ -105,7 +146,7 @@ const BetterAuthProvider = ({ partnerId }) => {
             catch {
                 debug("No Better Auth session to restore");
             }
-            // 3. Nothing found — show login UI
+            // 4. Nothing found — show login UI
             setIsAuthenticating(false);
         };
         restoreSession();

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

@@ -1,4 +1,3 @@
-export declare function RelayKitProviderWrapper({ children, simDuneApiKey, }: {
+export declare function RelayKitProviderWrapper({ children }: {
     children: React.ReactNode;
-    simDuneApiKey?: string;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/esm/global-account/react/components/B3Provider/RelayKitProviderWrapper.js

@@ -2,7 +2,7 @@ import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { RelayKitProvider } from "@relayprotocol/relay-kit-ui";
 import { fetchChainConfigs, MAINNET_RELAY_API } from "@relayprotocol/relay-sdk";
 import { useEffect, useState } from "react";
-export function RelayKitProviderWrapper({ children, simDuneApiKey, }) {
+export function RelayKitProviderWrapper({ children }) {
     const [relayChains, setRelayChains] = useState([]);
     useEffect(() => {
         const fetchChains = async () => {
@@ -11,16 +11,22 @@ export function RelayKitProviderWrapper({ children, simDuneApiKey, }) {
         };
         fetchChains();
     }, []);
+    // Balances for Relay's token selector come from the b3-zerion-api Zerion proxy, not Relay's own Dune
+    // integration. Relay only fires the balance query when duneConfig.apiKey is set, so apiBaseUrl points
+    // it at our proxy; the proxy ignores the client-sent key and holds the real Zerion credential itself.
     return (_jsx(RelayKitProvider, { options: {
             baseApiUrl: MAINNET_RELAY_API,
             source: "anyspend",
-            duneConfig: {
-                apiKey: simDuneApiKey,
-                apiBaseUrl: "https://api.sim.dune.com",
-            },
             chains: relayChains,
             privateChainIds: undefined,
             appName: "AnySpend",
             useGasFeeEstimations: true,
+            duneConfig: {
+                // Non-secret placeholder. Relay only fires its balance query when apiKey is defined; the value is sent
+                // as X-Sim-Api-Key to our proxy, which ignores it. The real Zerion key stays server-side in b3-zerion-api.
+                apiKey: "proxied-via-portfolio-api",
+                // Relay appends /v1/evm/balances/{address}. Our b3-zerion-api worker serves that route, backed by Zerion.
+                apiBaseUrl: "https://portfolio-api.b3.fun",
+            },
         }, children: _jsx(_Fragment, { children: children }) }));
 }

package/dist/esm/global-account/react/components/ManageAccount/ContentTokens.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { ALL_CHAINS, getExplorerTxUrl } from "../../../../anyspend/index.js";
 import { ChainTokenIcon } from "../../../../anyspend/react/components/common/ChainTokenIcon.js";
-import { Button, toast, TransitionPanel, useAnalytics, useSimBalance, useUnifiedChainSwitchAndExecute, } from "../../../../global-account/react/index.js";
+import { Button, toast, TransitionPanel, useAnalytics, usePortfolioBalance, useUnifiedChainSwitchAndExecute, } from "../../../../global-account/react/index.js";
 import { formatDisplayNumber, formatTokenAmount } from "../../../../shared/utils/number.js";
 import invariant from "invariant";
 import { ArrowLeft, CircleHelp, Copy, Loader2, Send } from "lucide-react";
@@ -41,7 +41,7 @@ export function ContentTokens({ activeTab }) {
     const animationDirection = useRef(null);
     // === DATA FETCHING ===
     const account = useActiveAccount();
-    const { data: simBalance, refetch: refetchSimBalance, isLoading: isLoadingBalance } = useSimBalance(account?.address);
+    const { data: balances, refetch: refetchBalances, isLoading: isLoadingBalance, isError: isBalanceError, } = usePortfolioBalance(account?.address);
     // === BLOCKCHAIN INTERACTION ===
     const { switchChainAndExecute } = useUnifiedChainSwitchAndExecute();
     // === ANALYTICS ===
@@ -75,13 +75,13 @@ export function ContentTokens({ activeTab }) {
     // === HELPER FUNCTION ===
     // Get current version of selected token from fresh balance data
     // 🔧 FIX: Prevents auto-navigation back to token list when balance refreshes
-    // The useSimBalance hook refreshes data, creating new token object references
+    // The balance hook refreshes data, creating new token object references
     // This helper ensures we always get the fresh token data instead of stale references
     const getCurrentSelectedToken = () => {
-        if (!selectedToken || !simBalance?.balances) {
+        if (!selectedToken || !balances) {
             return null;
         }
-        const found = simBalance.balances.find(token => token.chain_id === selectedToken.chain_id && token.address === selectedToken.address);
+        const found = balances.find(token => token.chain_id === selectedToken.chain_id && token.address === selectedToken.address);
         return found || null;
     };
     // ==================================================================================
@@ -147,11 +147,13 @@ export function ContentTokens({ activeTab }) {
                     functionName: "transfer",
                     args: [recipientAddress, amountInWei],
                 });
-                const tx = await switchChainAndExecute(displayToken.chain_id, {
-                    to: displayToken.address === "native" ? recipientAddress : displayToken.address,
-                    data: sendTokenData,
-                    value: displayToken.address === "native" ? amountInWei : BigInt(0),
-                });
+                // A native send carries value and no calldata; an ERC-20 send carries calldata and no
+                // value. Branch on the explicit flag, never on the address: the native sentinel is a
+                // display detail, and taking the ERC-20 path for a native coin spends gas without moving
+                // anything.
+                const tx = await switchChainAndExecute(displayToken.chain_id, displayToken.is_native
+                    ? { to: recipientAddress, value: amountInWei }
+                    : { to: displayToken.address, data: sendTokenData, value: BigInt(0) });
                 if (tx) {
                     // Track successful send
                     sendAnalyticsEvent("send_token_button_click", {
@@ -177,7 +179,7 @@ export function ContentTokens({ activeTab }) {
                 // Wait 1 second to make sure the tx is indexed on sim api.
                 setTimeout(async () => {
                     // Force refetch to bypass cache and get fresh balance data
-                    await refetchSimBalance();
+                    await refetchBalances();
                 }, 1000);
                 setIsSending(false);
             }
@@ -211,21 +213,27 @@ export function ContentTokens({ activeTab }) {
         if (isLoadingBalance) {
             return _jsx(LoadingIndicator, {});
         }
-        // Show empty state when no account or no balance data
-        if (!account?.address || !simBalance) {
+        // A wallet IS connected here — only the read failed. Prompting the user to connect would send
+        // them to fix something that is not broken.
+        // `isBalanceError` as well as the absent list: after a first success a later refetch failure
+        // keeps `data` populated, so `!balances` alone would show stale numbers as if they were fresh.
+        if (account?.address && (isBalanceError || !balances)) {
+            return (_jsxs("div", { className: "flex flex-col items-center justify-center py-12 text-center", children: [_jsx("div", { className: "bg-b3-line/50 mb-4 rounded-full p-4", children: _jsx(Loader2, { className: "text-b3-foreground-muted h-8 w-8" }) }), _jsx("h3", { className: "text-b3-grey font-neue-montreal-semibold mb-2", children: "Couldn't load your tokens" }), _jsx("button", { onClick: () => refetchBalances(), className: "text-b3-foreground-muted font-neue-montreal-medium text-sm underline", children: "Try again" })] }));
+        }
+        if (!account?.address) {
             return (_jsxs("div", { className: "flex flex-col items-center justify-center py-12 text-center", children: [_jsx("div", { className: "bg-b3-line/50 mb-4 rounded-full p-4", children: _jsx(Loader2, { className: "text-b3-foreground-muted h-8 w-8" }) }), _jsx("h3", { className: "text-b3-grey font-neue-montreal-semibold mb-2", children: "No wallet connected" }), _jsx("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Connect your wallet to view token balances" })] }));
         }
         // === SMART FILTERING LOGIC ===
         // Filter tokens with value >= $1 to reduce noise from dust tokens
-        const filteredTokens = simBalance?.balances.filter(token => token.value_usd !== undefined && token.value_usd >= 1) || [];
+        const filteredTokens = balances?.filter(token => token.value_usd !== undefined && token.value_usd >= 1) || [];
         // 🧠 INTELLIGENT DISPLAY LOGIC:
         // Show all tokens automatically when filtering would be unhelpful:
         // 1. User explicitly requested to show all, OR
         // 2. No tokens with value >= $1 (user has only dust), OR
         // 3. 5 or fewer tokens with value >= $1 (not enough to warrant filtering)
         const shouldShowAllTokens = showAllTokens || filteredTokens.length === 0 || filteredTokens.length <= 5;
-        const tokensToShow = shouldShowAllTokens ? simBalance?.balances || [] : filteredTokens;
-        const hasHiddenTokens = !shouldShowAllTokens && (simBalance?.balances.length || 0) > filteredTokens.length;
+        const tokensToShow = shouldShowAllTokens ? balances || [] : filteredTokens;
+        const hasHiddenTokens = !shouldShowAllTokens && (balances?.length || 0) > filteredTokens.length;
         // Handle token selection and navigate to send form
         const handleTokenClick = (token) => {
             setSelectedToken(token);

package/dist/esm/global-account/react/components/ManageAccount/NFTContent.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useActiveWallet } from "thirdweb/react";
 import { AccountAssets } from "..";
-import { useSimCollectibles } from "../../hooks/index.js";
+import { usePortfolioCollectibles } from "../../hooks/index.js";
 const NFTContent = () => {
     // Get active wallet state
     const activeWallet = useActiveWallet();
     const activeAccount = activeWallet?.getAccount();
     const activeAddress = activeAccount?.address;
-    const { data: nfts, isLoading } = useSimCollectibles(activeAddress, [1, 8453], { filterSpam: true });
-    return (_jsx("div", { style: { minHeight: "100px" }, children: nfts ? (_jsx(AccountAssets, { nfts: nfts, isLoading: isLoading })) : (_jsx("div", { className: "py-12 text-center text-gray-500", children: "No NFTs found" })) }));
+    const { data: nfts, isLoading, isError } = usePortfolioCollectibles(activeAddress, [1, 8453], { filterSpam: true });
+    return (_jsx("div", { style: { minHeight: "100px" }, children: isError ? (_jsx("div", { className: "py-12 text-center text-gray-500", children: "Couldn't load your NFTs" })) : nfts ? (_jsx(AccountAssets, { nfts: nfts, isLoading: isLoading })) : (_jsx("div", { className: "py-12 text-center text-gray-500", children: "No NFTs found" })) }));
 };
 export default NFTContent;

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAccountWallet, useB3Config, useModalStore, useProfile, useSimBalance, useUser, } from "../../../../global-account/react/index.js";
+import { useAccountWallet, useB3Config, useModalStore, useProfile, usePortfolioBalance, useUser, } from "../../../../global-account/react/index.js";
 import { validateImageUrl } from "../../../../global-account/react/utils/profileDisplay.js";
 import { AVATAR_COLORS } from "../../../../shared/constants/index.js";
 import { formatUsername } from "../../../../shared/utils/index.js";
@@ -24,14 +24,16 @@ const ProfileSection = () => {
     const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
     const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
     const navigateBack = useModalStore(state => state.navigateBack);
-    const { data: simBalance } = useSimBalance(smartWalletAddress);
+    const { data: balances, isError: isBalanceError } = usePortfolioBalance(smartWalletAddress);
     const [imgError, setImgError] = useState(false);
     const handleImgError = useCallback(() => setImgError(true), []);
+    // Null while the holdings are unknown. Summing an absent list to $0.00 would report an empty
+    // portfolio to someone whose balances merely failed to load.
     const totalBalanceUsd = useMemo(() => {
-        if (!simBalance?.balances)
-            return 0;
-        return simBalance.balances.reduce((sum, token) => sum + (token.value_usd || 0), 0);
-    }, [simBalance]);
+        if (isBalanceError || !balances)
+            return null;
+        return balances.reduce((sum, token) => sum + (token.value_usd || 0), 0);
+    }, [balances, isBalanceError]);
     const handleEditAvatar = () => {
         setB3ModalOpen(true);
         setB3ModalContentType({
@@ -48,6 +50,6 @@ const ProfileSection = () => {
     }, [avatarSrc]);
     const currentUsername = user?.username || profile?.displayName || formatUsername(profile?.name || "");
     const avatarSeed = eoaAddress || account?.address || smartWalletAddress || currentUsername || user?.email || "user";
-    return (_jsx("div", { className: "flex items-center justify-between px-5 py-6", children: _jsxs("div", { className: "global-account-profile flex items-center gap-4", children: [_jsxs("div", { className: "global-account-profile-avatar relative", children: [_jsx("div", { className: "border-b3-line border-1 bg-b3-primary-wash size-14 overflow-hidden rounded-full border", children: avatarSrc && !imgError ? (_jsx(IPFSMediaRenderer, { src: avatarSrc, alt: "Profile Avatar", className: "h-full w-full object-cover", onError: handleImgError })) : (_jsx(Avatar, { name: avatarSeed, variant: "beam", size: 56, colors: AVATAR_COLORS })) }), _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: _jsx(Pencil, { size: 10, className: "text-b3-background" }) })] }), _jsxs("div", { className: "global-account-profile-info flex flex-col gap-1", children: [!isBetterAuth && (_jsxs("h2", { className: "text-b3-grey font-neue-montreal-semibold flex h-[38px] items-center gap-1 text-xl", children: [_jsx("div", { className: "text-b3-foreground-muted", children: " $" }), _jsx("div", { className: "text-[30px]", children: formatDisplayNumber(totalBalanceUsd, { fractionDigits: 2 }) })] })), _jsx("div", { className: "b3-modal-username font-neue-montreal-semibold text-base leading-none text-[#0B57C2]", children: currentUsername }), isBetterAuth && user?.email && (_jsx("div", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: user.email }))] })] }) }));
+    return (_jsx("div", { className: "flex items-center justify-between px-5 py-6", children: _jsxs("div", { className: "global-account-profile flex items-center gap-4", children: [_jsxs("div", { className: "global-account-profile-avatar relative", children: [_jsx("div", { className: "border-b3-line border-1 bg-b3-primary-wash size-14 overflow-hidden rounded-full border", children: avatarSrc && !imgError ? (_jsx(IPFSMediaRenderer, { src: avatarSrc, alt: "Profile Avatar", className: "h-full w-full object-cover", onError: handleImgError })) : (_jsx(Avatar, { name: avatarSeed, variant: "beam", size: 56, colors: AVATAR_COLORS })) }), _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: _jsx(Pencil, { size: 10, className: "text-b3-background" }) })] }), _jsxs("div", { className: "global-account-profile-info flex flex-col gap-1", children: [!isBetterAuth && (_jsxs("h2", { className: "text-b3-grey font-neue-montreal-semibold flex h-[38px] items-center gap-1 text-xl", children: [_jsx("div", { className: "text-b3-foreground-muted", children: " $" }), _jsx("div", { className: "text-[30px]", children: totalBalanceUsd === null ? "—" : formatDisplayNumber(totalBalanceUsd, { fractionDigits: 2 }) })] })), _jsx("div", { className: "b3-modal-username font-neue-montreal-semibold text-base leading-none text-[#0B57C2]", children: currentUsername }), isBetterAuth && user?.email && (_jsx("div", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: user.email }))] })] }) }));
 };
 export default ProfileSection;