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

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

@@ -4,7 +4,7 @@ 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 { betterAuthClient } from "../../../better-auth-client";
+import { getBetterAuthClient } from "../../../better-auth-client";
 import { useUserQuery } from "../../hooks/useUserQuery";
 
 const debug = debugB3React("BetterAuthProvider");
@@ -43,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)");
       }
@@ -79,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,
@@ -114,7 +160,7 @@ 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);
     };
 

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

@@ -2,13 +2,7 @@ import { RelayKitProvider } from "@relayprotocol/relay-kit-ui";
 import { fetchChainConfigs, MAINNET_RELAY_API, RelayChain } from "@relayprotocol/relay-sdk";
 import { useEffect, useState } from "react";
 
-export function RelayKitProviderWrapper({
-  children,
-  simDuneApiKey,
-}: {
-  children: React.ReactNode;
-  simDuneApiKey?: string;
-}) {
+export function RelayKitProviderWrapper({ children }: { children: React.ReactNode }) {
   const [relayChains, setRelayChains] = useState<RelayChain[]>([]);
 
   useEffect(() => {
@@ -19,19 +13,25 @@ export function RelayKitProviderWrapper({
     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 (
     <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}</>

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

@@ -5,7 +5,7 @@ import {
   toast,
   TransitionPanel,
   useAnalytics,
-  useSimBalance,
+  usePortfolioBalance,
   useUnifiedChainSwitchAndExecute,
 } from "@b3dotfun/sdk/global-account/react";
 import { formatDisplayNumber, formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
@@ -16,7 +16,7 @@ import { NumericFormat } from "react-number-format";
 
 import { useActiveAccount } from "thirdweb/react";
 import { encodeFunctionData, erc20Abi, isAddress, parseUnits } from "viem";
-import { SimBalanceItem } from "../../hooks/useSimBalance";
+import type { B3TokenBalance } from "@b3dotfun/sdk/shared/utils/zerionPositions";
 
 // Panel view enum for managing navigation between token list and send form
 enum TokenPanelView {
@@ -45,7 +45,7 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
   const [tokenPanelView, setTokenPanelView] = useState<TokenPanelView>(TokenPanelView.LIST);
 
   // === SEND FORM STATE ===
-  const [selectedToken, setSelectedToken] = useState<SimBalanceItem | null>(null);
+  const [selectedToken, setSelectedToken] = useState<B3TokenBalance | null>(null);
   const [recipientAddress, setRecipientAddress] = useState("");
   const [sendAmount, setSendAmount] = useState("");
   const [isSending, setIsSending] = useState(false);
@@ -58,7 +58,12 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
 
   // === 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();
@@ -96,14 +101,14 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
   // === 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 = (): SimBalanceItem | null => {
-    if (!selectedToken || !simBalance?.balances) {
+  const getCurrentSelectedToken = (): B3TokenBalance | null => {
+    if (!selectedToken || !balances) {
       return null;
     }
 
-    const found = simBalance.balances.find(
+    const found = balances.find(
       token => token.chain_id === selectedToken.chain_id && token.address === selectedToken.address,
     );
 
@@ -184,11 +189,16 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
           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
@@ -215,7 +225,7 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
         // 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);
       }
@@ -409,8 +419,28 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
       return <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 (
+        <div className="flex flex-col items-center justify-center py-12 text-center">
+          <div className="bg-b3-line/50 mb-4 rounded-full p-4">
+            <Loader2 className="text-b3-foreground-muted h-8 w-8" />
+          </div>
+          <h3 className="text-b3-grey font-neue-montreal-semibold mb-2">Couldn&apos;t load your tokens</h3>
+          <button
+            onClick={() => refetchBalances()}
+            className="text-b3-foreground-muted font-neue-montreal-medium text-sm underline"
+          >
+            Try again
+          </button>
+        </div>
+      );
+    }
+
+    if (!account?.address) {
       return (
         <div className="flex flex-col items-center justify-center py-12 text-center">
           <div className="bg-b3-line/50 mb-4 rounded-full p-4">
@@ -426,8 +456,7 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
 
     // === 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:
@@ -435,11 +464,11 @@ export function ContentTokens({ activeTab }: ContentTokensProps) {
     // 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: SimBalanceItem) => {
+    const handleTokenClick = (token: B3TokenBalance) => {
       setSelectedToken(token);
       animationDirection.current = "forward"; // Set animation direction BEFORE state change
       setTokenPanelView(TokenPanelView.SEND);

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

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

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

@@ -3,7 +3,7 @@ import {
   useB3Config,
   useModalStore,
   useProfile,
-  useSimBalance,
+  usePortfolioBalance,
   useUser,
 } from "@b3dotfun/sdk/global-account/react";
 import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profileDisplay";
@@ -32,14 +32,16 @@ const ProfileSection = () => {
   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);
@@ -92,7 +94,9 @@ const ProfileSection = () => {
           {!isBetterAuth && (
             <h2 className="text-b3-grey font-neue-montreal-semibold flex h-[38px] items-center gap-1 text-xl">
               <div className="text-b3-foreground-muted"> $</div>
-              <div className="text-[30px]">{formatDisplayNumber(totalBalanceUsd, { fractionDigits: 2 })}</div>
+              <div className="text-[30px]">
+                {totalBalanceUsd === null ? "—" : formatDisplayNumber(totalBalanceUsd, { fractionDigits: 2 })}
+              </div>
             </h2>
           )}
           <div className="b3-modal-username font-neue-montreal-semibold text-base leading-none text-[#0B57C2]">

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/ManageAccount/TokenContent.tsx

@@ -1,10 +1,16 @@
-import { useSimBalance } from "@b3dotfun/sdk/global-account/react";
+import { usePortfolioBalance } from "@b3dotfun/sdk/global-account/react";
 import { getChainLogo } from "@b3dotfun/sdk/shared/constants/chains/supported";
 import { useActiveWallet } from "thirdweb/react";
 import { TokenBalanceRow } from "./TokenBalanceRow";
 
-// Chain logo URLs mapping
-const CHAIN_LOGOS: Record<number, string> = [1, 8453, 8333].map(chainId => getChainLogo(chainId));
+const ETHEREUM_CHAIN_ID = 1;
+
+// Chain logo URLs, keyed by chain id. Built with Object.fromEntries rather than `.map()`: an array
+// satisfies Record<number, string> for the type checker while indexing by 0,1,2 at runtime, so
+// every lookup by a real chain id would miss.
+const CHAIN_LOGOS: Record<number, string> = Object.fromEntries(
+  [ETHEREUM_CHAIN_ID, 8453, 8333].map(chainId => [chainId, getChainLogo(chainId)]),
+);
 
 const TokenContent = () => {
   // Get active wallet state
@@ -12,19 +18,26 @@ const TokenContent = () => {
   const activeAccount = activeWallet?.getAccount();
   const activeAddress = activeAccount?.address;
 
-  const { data: simBalance } = useSimBalance(activeAddress, [8453, 8333, 1]);
-  console.log("simBalance :", simBalance);
+  // Base and Ethereum only. B3 (8333) is deliberately absent: the portfolio provider does not index
+  // it, so asking for it returns nothing and reads as a coverage gap rather than a choice. Restoring
+  // B3 needs a non-provider source, the way HyperEVM and Plume are served on-chain in b3os-web.
+  const { data: balances, isError: isBalanceError } = usePortfolioBalance(activeAddress, [8453, ETHEREUM_CHAIN_ID]);
 
   if (!activeAddress) {
     return <div className="col-span-3 py-12 text-center text-gray-500">No tokens found</div>;
   }
 
-  if (!simBalance?.balances || simBalance.balances.length === 0) {
+  // "Couldn't load" and "holds nothing" are different answers and must not share a message.
+  if (isBalanceError) {
+    return <div className="col-span-3 py-12 text-center text-gray-500">Couldn&apos;t load your tokens</div>;
+  }
+
+  if (!balances || balances.length === 0) {
     return <div className="col-span-3 py-12 text-center text-gray-500">No tokens found</div>;
   }
 
   // Sort by USD value descending
-  const sortedBalances = [...simBalance.balances].sort((a, b) => {
+  const sortedBalances = [...balances].sort((a, b) => {
     const valueA = a.value_usd || 0;
     const valueB = b.value_usd || 0;
     return valueB - valueA;
@@ -43,8 +56,8 @@ const TokenContent = () => {
         // Determine token logo
         // For native tokens, use ETH logo instead of chain logo
         let tokenLogo = token.token_metadata?.logo || "";
-        if (token.address === "native" && token.symbol === "ETH") {
-          tokenLogo = CHAIN_LOGOS[0];
+        if (token.is_native && token.symbol === "ETH") {
+          tokenLogo = CHAIN_LOGOS[ETHEREUM_CHAIN_ID];
         }
 
         return (

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

@@ -6,7 +6,7 @@ import {
   useAnalytics,
   useModalStore,
   useProfile,
-  useSimBalance,
+  usePortfolioBalance,
   useUnifiedChainSwitchAndExecute,
 } from "@b3dotfun/sdk/global-account/react";
 import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profileDisplay";
@@ -18,7 +18,7 @@ import { NumericFormat } from "react-number-format";
 
 import { encodeFunctionData, erc20Abi, isAddress, parseUnits } from "viem";
 
-import type { SimBalanceItem } from "../../hooks/useSimBalance";
+import type { B3TokenBalance } from "@b3dotfun/sdk/shared/utils/zerionPositions";
 import { useRecentAddressesStore } from "../../stores/useRecentAddressesStore";
 import ModalHeader from "../ModalHeader/ModalHeader";
 import { Button } from "../ui/button";
@@ -66,7 +66,7 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
 
   // Wizard state
   const [step, setStep] = useState<SendStep>("recipient");
-  const [selectedToken, setSelectedToken] = useState<SimBalanceItem | null>(null);
+  const [selectedToken, setSelectedToken] = useState<B3TokenBalance | null>(null);
   const [recipientAddress, setRecipientAddress] = useState(initialRecipient || "");
   const [sendAmount, setSendAmount] = useState("");
   const [isSending, setIsSending] = useState(false);
@@ -74,7 +74,12 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
   const [showValidatedResult, setShowValidatedResult] = useState(false);
 
   // Hooks
-  const { data: simBalance, refetch: refetchSimBalance, isLoading: isLoadingBalance } = useSimBalance(address);
+  const {
+    data: balances,
+    refetch: refetchBalances,
+    isLoading: isLoadingBalance,
+    isError: isBalanceError,
+  } = usePortfolioBalance(address);
   const { switchChainAndExecute } = useUnifiedChainSwitchAndExecute();
   const { sendAnalyticsEvent } = useAnalytics();
 
@@ -138,11 +143,11 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
   };
 
   // Get current selected token from fresh balance
-  const getCurrentSelectedToken = (): SimBalanceItem | null => {
-    if (!selectedToken || !simBalance?.balances) {
+  const getCurrentSelectedToken = (): B3TokenBalance | null => {
+    if (!selectedToken || !balances) {
       return null;
     }
-    const found = simBalance.balances.find(
+    const found = balances.find(
       token => token.chain_id === selectedToken.chain_id && token.address === selectedToken.address,
     );
     return found || null;
@@ -187,11 +192,15 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
         args: [recipientAddress, amountInWei],
       });
 
-      const tx = await switchChainAndExecute(currentToken.chain_id, {
-        to: currentToken.address === "native" ? recipientAddress : currentToken.address,
-        data: sendTokenData,
-        value: currentToken.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(
+        currentToken.chain_id,
+        currentToken.is_native
+          ? { to: recipientAddress, value: amountInWei }
+          : { to: currentToken.address, data: sendTokenData, value: BigInt(0) },
+      );
 
       if (tx) {
         sendAnalyticsEvent("send_token_button_click", {
@@ -208,7 +217,7 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
         }
 
         setTimeout(async () => {
-          await refetchSimBalance();
+          await refetchBalances();
         }, 1000);
       }
     } catch (error: any) {
@@ -364,10 +373,10 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
                   ))}
                 </div>
               </div>
-            ) : simBalance?.balances && simBalance.balances.length > 0 ? (
+            ) : balances && balances.length > 0 ? (
               <div className="space-y-4">
                 <div className="space-y-1">
-                  {simBalance.balances.map(token => (
+                  {balances.map(token => (
                     <div
                       key={token.chain_id + "_" + token.address}
                       className="hover:bg-b3-line/60 dark:hover:bg-b3-primary-wash/40 group flex cursor-pointer items-center justify-between rounded-xl p-3 transition-all duration-200"
@@ -411,6 +420,21 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
                   ))}
                 </div>
               </div>
+            ) : isBalanceError ? (
+              // Telling someone they hold nothing, when the read simply failed, invites them to go
+              // looking for missing funds.
+              <div className="flex flex-col items-center justify-center py-12 text-center">
+                <CircleHelp className="text-b3-foreground-muted mb-4 h-8 w-8" />
+                <p className="text-b3-foreground-muted font-neue-montreal-medium text-sm">
+                  Couldn&apos;t load your tokens
+                </p>
+                <button
+                  onClick={() => refetchBalances()}
+                  className="text-b3-foreground-muted font-neue-montreal-medium mt-2 text-sm underline"
+                >
+                  Try again
+                </button>
+              </div>
             ) : (
               <div className="flex flex-col items-center justify-center py-12 text-center">
                 <CircleHelp className="text-b3-foreground-muted mb-4 h-8 w-8" />

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

@@ -1,4 +1,5 @@
 import { Button, Input, Loading, useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import { cn } from "@b3dotfun/sdk/shared/utils";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import {
@@ -20,6 +21,7 @@ const DEFAULT_SOCIAL_PROVIDERS: SocialProviderConfig[] = [
   { id: "discord", label: "Discord" },
   { id: "microsoft", label: "Microsoft" },
   { id: "slack", label: "Slack" },
+  { id: "twitter", label: "X" },
 ];
 
 export interface BetterAuthSignInProps {
@@ -415,7 +417,16 @@ export function BetterAuthSignIn({
                       />
                     </svg>
                   ) : (
-                    icon && <img src={icon} alt="" className="h-5 w-5" />
+                    icon && (
+                      <img
+                        src={icon}
+                        alt=""
+                        className={cn(
+                          "h-5 w-5",
+                          (provider.id === "github" || provider.id === "twitter") && "dark:invert",
+                        )}
+                      />
+                    )
                   )}
                   <span>{isProviderLoading ? "Redirecting..." : label}</span>
                 </button>

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/components/AuthButton.tsx

@@ -1,4 +1,5 @@
 import { Button } from "../../custom/Button";
+import { cn } from "@b3dotfun/sdk/shared/utils";
 import { Github, Mail } from "lucide-react";
 import { strategyIcons, strategyLabels } from "../utils/signInUtils";
 
@@ -31,7 +32,14 @@ export function AuthButton({
       className="flex w-full items-center justify-center bg-gray-100 px-2 py-3 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-700"
     >
       {strategyIcon ? (
-        <img src={strategyIcon} alt={`${strategyLabel} icon`} className="h-9 w-9" />
+        <img
+          src={strategyIcon}
+          alt={`${strategyLabel} icon`}
+          className={cn(
+            "h-9 w-9",
+            (strategy === "github" || strategy === "twitter" || strategy === "x") && "dark:invert",
+          )}
+        />
       ) : FallbackIcon ? (
         <FallbackIcon className="h-9 w-9 text-gray-900 dark:text-gray-100" />
       ) : (

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

@@ -18,6 +18,7 @@ const SOCIAL_PROVIDERS: { id: BetterAuthSocialProvider; label: string }[] = [
   { id: "discord", label: "Discord" },
   { id: "microsoft", label: "Microsoft" },
   { id: "slack", label: "Slack" },
+  { id: "twitter", label: "X" },
 ];
 
 interface LoginStepBetterAuthProps {

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;
 
@@ -67,6 +65,7 @@ export const strategyIcons: Record<string, string> = {
   google: "https://cdn.b3.fun/google.svg",
   github: "https://cdn.jsdelivr.net/gh/devicons/devicon/icons/github/github-original.svg",
   x: "https://cdn.b3.fun/x.svg?1",
+  twitter: "https://cdn.b3.fun/x.svg?1",
   discord: "https://cdn.b3.fun/discord.svg",
   apple: "https://cdn.b3.fun/apple.svg",
   guest: "https://cdn.b3.fun/incognito.svg",
@@ -77,6 +76,7 @@ export const strategyIcons: Record<string, string> = {
 export const strategyLabels: Record<string, string> = {
   google: "Google",
   x: "X",
+  twitter: "X",
   discord: "Discord",
   apple: "Apple",
   guest: "Guest",