@b3dotfun/sdk 0.0.83-test.0 → 0.0.84-alpha.0

package/dist/esm/anyspend/utils/chain.js

@@ -3,10 +3,17 @@ import invariant from "invariant";
 import { createPublicClient, createWalletClient, defineChain, http, parseEther, } from "viem";
 import { abstract, arbitrum, avalanche, b3, base, bsc, mainnet, optimism, polygon } from "viem/chains";
 import { ChainType } from "../types/chain.js";
-import { getAvaxToken, getBnbToken, getEthToken, getPolToken, getSolanaToken } from "./token.js";
+import { getAvaxToken, getBnbToken, getEthToken, getHyperEVMNativeToken, getHyperliquidUSDCToken, getPolToken, getSolanaToken, HYPEREVM_CHAIN_ID, HYPERLIQUID_CHAIN_ID, } from "./token.js";
 function getCustomEvmChain(chain, rpcUrl) {
     return defineChain({ ...chain, rpcUrls: { default: { http: [rpcUrl] } } });
 }
+export const hyperEVM = defineChain({
+    id: HYPEREVM_CHAIN_ID,
+    name: "HyperEVM",
+    nativeCurrency: { name: "HyperEVM", symbol: "HYPE", decimals: 18 },
+    rpcUrls: { default: { http: ["https://rpc.hyperliquid.xyz/evm"] } },
+    blockExplorers: { default: { name: "HyperEVM Explorer", url: "https://hyperevmscan.io/" } },
+});
 // export const b4testnet = defineChain({
 //   id: 19934,
 //   name: "B4 Testnet",
@@ -150,6 +157,20 @@ export const EVM_MAINNET = {
         coingeckoName: "abstract",
         wethAddress: "0x3439153eb7af838ad19d56e1571fbd09333c2809",
     },
+    [hyperEVM.id]: {
+        id: hyperEVM.id,
+        name: hyperEVM.name,
+        logoUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/32196.png",
+        type: ChainType.EVM,
+        nativeRequired: parseEther("0.01"),
+        canDepositNative: true,
+        defaultToken: getHyperEVMNativeToken(),
+        nativeToken: getHyperEVMNativeToken(),
+        viem: hyperEVM,
+        pollingInterval: 1000, // 1 second for Hyperliquid
+        coingeckoName: "hyperevm",
+        wethAddress: "0x5555555555555555555555555555555555555555",
+    },
 };
 export const EVM_TESTNET = {
 // [sepolia.id]: {
@@ -211,9 +232,27 @@ export const SOLANA_MAINNET = {
     nativeToken: getSolanaToken(),
     coingeckoName: "solana",
 };
+export const HYPERLIQUID_MAINNET = {
+    id: HYPERLIQUID_CHAIN_ID,
+    name: "Hyperliquid",
+    type: ChainType.HYPERLIQUID,
+    logoUrl: "https://s2.coinmarketcap.com/static/img/coins/64x64/32196.png",
+    nativeRequired: BigInt(0), // No native transfer needed - using Relay's useDepositAddress flow (USDC is native)
+    canDepositNative: true, // Can deposit USDC (native token)
+    defaultToken: getHyperliquidUSDCToken(),
+    nativeToken: getHyperliquidUSDCToken(),
+    coingeckoName: null,
+    apiUrl: "https://api.hyperliquid.xyz",
+    blockExplorer: {
+        url: "https://app.hyperliquid.xyz/explorer",
+    },
+};
 export const EVM_CHAINS = { ...EVM_MAINNET, ...EVM_TESTNET };
 export const SOLANA_CHAINS = { [RELAY_SOLANA_MAINNET_CHAIN_ID]: SOLANA_MAINNET };
-export const ALL_CHAINS = { ...EVM_CHAINS, ...SOLANA_CHAINS };
+export const HYPERLIQUID_CHAINS = {
+    [HYPERLIQUID_CHAIN_ID]: HYPERLIQUID_MAINNET,
+};
+export const ALL_CHAINS = { ...EVM_CHAINS, ...SOLANA_CHAINS, ...HYPERLIQUID_CHAINS };
 export function getSolanaChains(network) {
     invariant(network === "mainnet", "Solana chain is only supported on mainnet");
     return SOLANA_MAINNET;
@@ -251,7 +290,7 @@ export function canDepositNative(chainId) {
     return ALL_CHAINS[chainId].canDepositNative;
 }
 export function isMainnet(chainId) {
-    return EVM_MAINNET[chainId] !== undefined || RELAY_SOLANA_MAINNET_CHAIN_ID === chainId;
+    return (EVM_MAINNET[chainId] !== undefined || RELAY_SOLANA_MAINNET_CHAIN_ID === chainId || HYPERLIQUID_CHAIN_ID === chainId);
 }
 export function isTestnet(chainId) {
     return EVM_TESTNET[chainId] !== undefined;
@@ -262,7 +301,11 @@ export function getDefaultToken(chainId) {
 }
 export function getChainName(chainId) {
     invariant(ALL_CHAINS[chainId], `Chain ${chainId} is not supported`);
-    return EVM_CHAINS[chainId] ? EVM_CHAINS[chainId].viem.name : "Solana";
+    const chain = ALL_CHAINS[chainId];
+    if (isEvmChain(chainId)) {
+        return chain.viem.name;
+    }
+    return chain.name;
 }
 export function getCoingeckoName(chainId) {
     invariant(ALL_CHAINS[chainId], `Chain ${chainId} is not supported`);
@@ -411,6 +454,12 @@ export function getPaymentUrl(address, amount, currency, chainId, decimals) {
             console.log("Solana URL (isNativeSOL:", isNativeSOL, "):", url);
             return url;
         }
+        case ChainType.HYPERLIQUID: {
+            // NOTE: Hyperliquid is only supported as destination chain (not source chain).
+            // Payment URLs are not needed since users cannot send FROM Hyperliquid in our flow.
+            // Return address as placeholder (this code path should not be reached).
+            return address;
+        }
         default:
             // Fallback to just the address if chain type is unknown
             return address;
@@ -423,12 +472,20 @@ export function getExplorerTxUrl(chainId, txHash) {
     if (EVM_CHAINS[chainId]) {
         return EVM_CHAINS[chainId].viem.blockExplorers?.default.url + "/tx/" + txHash;
     }
+    if (HYPERLIQUID_CHAINS[chainId]) {
+        return HYPERLIQUID_CHAINS[chainId].blockExplorer.url + "/tx/" + txHash;
+    }
+    // Default to Solscan for Solana transactions
     return "https://solscan.io/tx/" + txHash;
 }
 export function getExplorerAddressUrl(chainId, address) {
     if (EVM_CHAINS[chainId]) {
         return EVM_CHAINS[chainId].viem.blockExplorers?.default.url + "/address/" + address;
     }
+    if (HYPERLIQUID_CHAINS[chainId]) {
+        return HYPERLIQUID_CHAINS[chainId].blockExplorer.url + "/address/" + address;
+    }
+    // Default to Solscan for Solana addresses
     return "https://solscan.io/account/" + address;
 }
 export function getMulticall3Address(chainId) {
@@ -445,3 +502,33 @@ export function getNativeToken(chainId) {
 export function isEvmChain(chainId) {
     return Boolean(EVM_CHAINS[chainId]);
 }
+export function isHyperliquidChain(chainId) {
+    return HYPERLIQUID_CHAINS[chainId] !== undefined;
+}
+export function getHyperliquidChain(chainId) {
+    invariant(HYPERLIQUID_CHAINS[chainId], `Chain ${chainId} is not a Hyperliquid chain`);
+    return HYPERLIQUID_CHAINS[chainId];
+}
+/**
+ * Get available chain IDs for AnySpend based on context (source or destination).
+ * Filters out chains that shouldn't be available for the given context.
+ *
+ * @param context - "from" for source chains, "to" for destination chains
+ * @returns Array of available chain IDs
+ *
+ * @example
+ * // Get source chains (excludes Hyperliquid)
+ * const sourceChains = getAvailableChainIds("from") // [1, 8453, 137, ...]
+ *
+ * // Get destination chains (includes Hyperliquid)
+ * const destChains = getAvailableChainIds("to") // [1, 8453, 137, ..., 1337]
+ */
+export function getAvailableChainIds(context) {
+    const allChainIds = Object.values(ALL_CHAINS).map(chain => chain.id);
+    if (context === "from") {
+        // Hyperliquid is only supported as destination chain, not source chain
+        return allChainIds.filter(chainId => chainId !== HYPERLIQUID_CHAIN_ID);
+    }
+    // For destination ("to"), all chains are available including Hyperliquid
+    return allChainIds;
+}

package/dist/esm/anyspend/utils/token.d.ts

@@ -1,7 +1,11 @@
 import { components } from "../../anyspend/types/api";
+export declare const HYPERLIQUID_CHAIN_ID = 1337;
+export declare const HYPEREVM_CHAIN_ID = 999;
 export declare function isNativeToken(address: string): boolean;
 export declare function getSolanaToken(): components["schemas"]["Token"];
 export declare function getEthToken(chainId: number): components["schemas"]["Token"];
 export declare function getPolToken(): components["schemas"]["Token"];
 export declare function getBnbToken(): components["schemas"]["Token"];
 export declare function getAvaxToken(): components["schemas"]["Token"];
+export declare function getHyperEVMNativeToken(): components["schemas"]["Token"];
+export declare function getHyperliquidUSDCToken(): components["schemas"]["Token"];

package/dist/esm/anyspend/utils/token.js

@@ -1,7 +1,9 @@
+import { RELAY_SOL_ADDRESS, RELAY_SOLANA_MAINNET_CHAIN_ID, ZERO_ADDRESS } from "../../anyspend/constants/index.js";
 import { avalanche, bsc, polygon } from "viem/chains";
-import { RELAY_ETH_ADDRESS, RELAY_SOL_ADDRESS, RELAY_SOLANA_MAINNET_CHAIN_ID } from "../../anyspend/constants/index.js";
+export const HYPERLIQUID_CHAIN_ID = 1337;
+export const HYPEREVM_CHAIN_ID = 999;
 export function isNativeToken(address) {
-    return address.toLowerCase() === RELAY_ETH_ADDRESS || address.toLowerCase() === RELAY_SOL_ADDRESS;
+    return address.toLowerCase() === ZERO_ADDRESS || address.toLowerCase() === RELAY_SOL_ADDRESS;
 }
 export function getSolanaToken() {
     return {
@@ -18,7 +20,7 @@ export function getSolanaToken() {
 export function getEthToken(chainId) {
     return {
         chainId: chainId,
-        address: RELAY_ETH_ADDRESS,
+        address: ZERO_ADDRESS,
         symbol: "ETH",
         name: "Ethereum",
         decimals: 18,
@@ -30,7 +32,7 @@ export function getEthToken(chainId) {
 export function getPolToken() {
     return {
         chainId: polygon.id,
-        address: RELAY_ETH_ADDRESS,
+        address: ZERO_ADDRESS,
         symbol: "POL",
         name: "Polygon",
         decimals: 18,
@@ -42,7 +44,7 @@ export function getPolToken() {
 export function getBnbToken() {
     return {
         chainId: bsc.id,
-        address: RELAY_ETH_ADDRESS,
+        address: ZERO_ADDRESS,
         symbol: "BNB",
         name: "BNB",
         decimals: 18,
@@ -54,7 +56,7 @@ export function getBnbToken() {
 export function getAvaxToken() {
     return {
         chainId: avalanche.id,
-        address: RELAY_ETH_ADDRESS,
+        address: ZERO_ADDRESS,
         symbol: "AVAX",
         name: "AVAX",
         decimals: 18,
@@ -63,3 +65,27 @@ export function getAvaxToken() {
         },
     };
 }
+export function getHyperEVMNativeToken() {
+    return {
+        chainId: HYPEREVM_CHAIN_ID,
+        address: ZERO_ADDRESS,
+        symbol: "HYPE",
+        name: "HYPE",
+        decimals: 18,
+        metadata: {
+            logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/32196.png",
+        },
+    };
+}
+export function getHyperliquidUSDCToken() {
+    return {
+        chainId: HYPERLIQUID_CHAIN_ID,
+        address: ZERO_ADDRESS,
+        symbol: "USDC",
+        name: "USD Coin",
+        decimals: 6,
+        metadata: {
+            logoURI: "https://ethereum-optimism.github.io/data/USDC/logo.png",
+        },
+    };
+}

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

@@ -5,7 +5,7 @@ import { loadGA4Script } from "../../../../global-account/utils/analytics.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, ThirdwebProvider, useActiveAccount, useConnectedWallets, useSetActiveWallet, } from "thirdweb/react";
 import { WagmiProvider } from "wagmi";
 import { setClientType } from "../../../client-manager.js";
@@ -39,7 +39,7 @@ toaster: _toaster, clientType = "rest", rpcUrls, partnerId, onConnect, connector
     useEffect(() => {
         setClientType(clientType);
     }, [clientType]);
-    const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors });
+    const wagmiConfig = useMemo(() => createWagmiConfig({ partnerId, rpcUrls, connectors, overrideDefaultConnectors }), [partnerId, rpcUrls, connectors, overrideDefaultConnectors]);
     return (_jsx(ThirdwebProvider, { children: _jsx(WagmiProvider, { config: wagmiConfig, reconnectOnMount: false, children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(TooltipProvider, { children: _jsx(ToastProvider, { children: _jsx(LocalSDKProvider, { onConnectCallback: onConnect, children: _jsxs(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, automaticallySetFirstEoa: !!automaticallySetFirstEoa, clientType: clientType, partnerId: partnerId, createClientReferenceId: createClientReferenceId, enableTurnkey: enableTurnkey, children: [_jsx(ToastContextConnector, {}), _jsxs(RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, _jsx(StyleRoot, { id: "b3-root" })] })] }) }) }) }) }) }) }));
 }
 /**

package/dist/esm/global-account/react/components/SignInWithB3/SignIn.js

@@ -5,13 +5,13 @@ import { ecosystemWalletId } from "../../../../shared/constants/index.js";
 import { cn, truncateAddress } from "../../../../shared/utils/index.js";
 import { Menu, MenuButton, MenuItems, Transition } from "@headlessui/react";
 import { useEffect } from "react";
-import { useConnectedWallets, useSetActiveWallet } from "thirdweb/react";
-import { useAccountWalletImage } from "../../hooks/useAccountWallet.js";
+import { useConnectedWallets, useSetActiveWallet, useWalletImage } from "thirdweb/react";
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 export function SignIn(props) {
     const { className } = props;
     const { automaticallySetFirstEoa, partnerId } = useB3();
-    const { address: globalAddress, ensName, connectedSmartWallet, connectedEOAWallet, isActiveSmartWallet, isActiveEOAWallet, smartWalletIcon, eoaWalletIcon, } = useAccountWallet();
+    const { address: globalAddress, ensName, connectedSmartWallet, connectedEOAWallet, isActiveSmartWallet, isActiveEOAWallet, smartWalletIcon, } = useAccountWallet();
+    const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
     const isMobile = useIsMobile();
     const { logout } = useAuthentication(partnerId);
     const onDisconnect = async () => {
@@ -34,11 +34,10 @@ export function SignIn(props) {
             setActiveWallet(connectedEOAWallet);
         }
     }, [connectedEOAWallet, isActiveEOAWallet, setActiveWallet, automaticallySetFirstEoa]);
-    const walletImage = useAccountWalletImage();
     // Desktop version - original dropdown menu
     return (_jsx(StyleRoot, { children: _jsx(Menu, { className: `relative flex items-center ${className || ""}`, as: "div", children: globalAddress ? (_jsxs(_Fragment, { children: [_jsxs(MenuButton, { className: "bg-b3-react-background group flex h-10 items-center gap-1 rounded-xl px-3 focus:outline-none", children: [!!walletImage && (_jsx(IPFSMediaRenderer, { src: walletImage, alt: "Wallet Image", className: "bg-b3-react-primary h-6 w-6 rounded-full object-cover opacity-100" })), _jsx("div", { className: "text-as-primary", children: ensName ? ensName : truncateAddress(globalAddress) })] }), _jsx(Transition, { enter: "duration-200 ease-out", enterFrom: "scale-95 opacity-0", enterTo: "scale-100 opacity-100", leave: "duration-300 ease-out", leaveFrom: "scale-100 opacity-100", leaveTo: "scale-95 opacity-0", children: _jsx(MenuItems, { className: "b3-root absolute -right-4 top-full min-w-64 rounded-2xl border focus:outline-none lg:right-0", modal: false, 
                             // TODO: Figure out why setting anchor on mobile causes z-index issues where it appears under elements
-                            anchor: isMobile ? "top end" : undefined, children: _jsxs("div", { className: "bg-b3-react-background", children: [connectedEOAWallet ? (_jsxs("div", { className: cn("border-b3-react-subtle bg-b3-react-background flex cursor-pointer items-center justify-between rounded-xl p-3"), onClick: () => handleSetActiveAccount(connectedEOAWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-b3-react-primary h-16 w-16 rounded-full opacity-100", src: eoaWalletIcon, alt: connectedEOAWallet?.id }), _jsxs("div", { className: "ml-4 grow", children: [ensName && _jsx("div", { children: ensName }), _jsx("div", { children: truncateAddress(globalAddress) })] })] }), isActiveEOAWallet && _jsx(Icon, { className: "fill-b3-react-primary", name: "check" })] })) : (connectedSmartWallet && (_jsxs("div", { className: cn("mb-2 flex cursor-pointer items-center justify-between rounded-xl p-3", isActiveSmartWallet
+                            anchor: isMobile ? "top end" : undefined, children: _jsxs("div", { className: "bg-b3-react-background", children: [connectedEOAWallet ? (_jsxs("div", { className: cn("border-b3-react-subtle bg-b3-react-background flex cursor-pointer items-center justify-between rounded-xl p-3"), onClick: () => handleSetActiveAccount(connectedEOAWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-b3-react-primary h-16 w-16 rounded-full opacity-100", src: walletImage, alt: connectedEOAWallet?.id }), _jsxs("div", { className: "ml-4 grow", children: [ensName && _jsx("div", { children: ensName }), _jsx("div", { children: truncateAddress(globalAddress) })] })] }), isActiveEOAWallet && _jsx(Icon, { className: "fill-b3-react-primary", name: "check" })] })) : (connectedSmartWallet && (_jsxs("div", { className: cn("mb-2 flex cursor-pointer items-center justify-between rounded-xl p-3", isActiveSmartWallet
                                             ? "bg-b3-react-background"
                                             : "bg-b3-react-background hover:bg-b3-react-background"), onClick: () => handleSetActiveAccount(connectedSmartWallet?.id), children: [_jsxs("div", { className: "flex items-center", children: [_jsx("img", { className: "bg-b3-react-primary h-16 w-16 rounded-full opacity-100", src: smartWalletIcon, alt: connectedSmartWallet?.id }), _jsxs("div", { className: "grow pl-4", children: [ensName && _jsx("div", { children: ensName }), _jsx("div", { children: truncateAddress(globalAddress) }), _jsx("div", { children: "Smart wallet" })] })] }), isActiveSmartWallet && _jsx(Icon, { className: "fill-b3-react-primary", name: "check" })] }))), _jsx("div", { className: "ml-3", children: _jsx(ManageAccountButton, { ...props, className: "w-[calc(100%-12px)]" }) }), _jsx("button", { className: "mb-2 w-full space-y-1", onClick: onDisconnect, children: _jsxs("div", { className: "hover:bg-b3-react-background group flex h-12 items-center rounded-xl px-4 transition-colors", children: [_jsx(Icon, { className: "fill-b3-react-primary mr-4 shrink-0 transition-colors", name: "logout" }), _jsx("div", { className: "text-b3-react-primary mr-auto transition-colors", children: "Disconnect" })] }) })] }) }) })] })) : (_jsx(SignInWithB3, { closeAfterLogin: true, onLoginSuccess: async (globalAccount) => {
                     console.log("User authenticated with Global Account!", globalAccount);

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Flow.js

@@ -3,7 +3,6 @@ import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, } from
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
-import { TurnkeyAuthModal } from "../TurnkeyAuthModal.js";
 import { SignInWithB3Privy } from "./SignInWithB3Privy.js";
 import { LoginStep, LoginStepContainer } from "./steps/LoginStep.js";
 import { LoginStepCustom } from "./steps/LoginStepCustom.js";
@@ -21,9 +20,7 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     const account = useActiveAccount();
     const isAuthenticating = useAuthStore(state => state.isAuthenticating);
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const isConnected = useAuthStore(state => state.isConnected);
-    const setIsConnected = useAuthStore(state => state.setIsConnected);
     const setJustCompletedLogin = useAuthStore(state => state.setJustCompletedLogin);
     const [refetchCount, setRefetchCount] = useState(0);
     const [refetchError, setRefetchError] = useState(null);
@@ -125,10 +122,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         debug("Refetching user after Turnkey success...");
         await refetchUser();
         debug("User refetched successfully");
-        // Set authentication and connection state so UI updates properly
-        setIsAuthenticated(true);
-        setIsConnected(true);
-        setJustCompletedLogin(true);
         // After user data is refreshed, close Turnkey modal and go back to sign-in flow
         debug("Switching back to signInWithB3 modal");
         setB3ModalContentType({
@@ -158,9 +151,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         closeAfterLogin,
         source,
         signersEnabled,
-        setIsAuthenticated,
-        setIsConnected,
-        setJustCompletedLogin,
     ]);
     // Handle post-login flow after signers are loaded
     useEffect(() => {
@@ -296,56 +286,21 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     if (refetchError) {
         content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "p-4 text-center text-red-500", children: refetchError }) }));
     }
+    else if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+        content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
+    }
     else if (step === "login") {
-        // PRIORITY: If Turnkey is enabled, show Turnkey modal FIRST as the primary authentication option
-        // Show Turnkey when enabled and not already completed in this session
-        const shouldShowTurnkeyFirst = enableTurnkey && !turnkeyAuthCompleted;
-        if (shouldShowTurnkeyFirst) {
-            // Don't show loading spinner for Turnkey - let the modal handle its own loading state
-            // This prevents the infinite loop where isAuthenticating causes the modal to be replaced
-            debug("Showing Turnkey as primary authentication option", {
-                enableTurnkey,
-                turnkeyAuthCompleted,
-                isAuthenticated,
-            });
-            // Show Turnkey authentication as primary option
-            content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx(TurnkeyAuthModal, { onSuccess: async (authenticatedUser) => {
-                        debug("Turnkey authentication successful in primary flow", { authenticatedUser });
-                        setTurnkeyAuthCompleted(true);
-                        // After Turnkey auth, refetch user to get the full user object
-                        await refetchUser();
-                        // User is now authenticated via Turnkey
-                        // Set both isAuthenticated and isConnected to true so UI updates properly
-                        // Wallet connection is optional and can happen later for signing transactions
-                        setIsAuthenticated(true);
-                        setIsConnected(true);
-                        setJustCompletedLogin(true);
-                        // Call the login success callback
-                        onLoginSuccess?.({});
-                    }, onClose: () => {
-                        // If user closes Turnkey modal, they can still use wallet connection as fallback
-                        setTurnkeyAuthCompleted(true);
-                    }, initialEmail: "", skipToOtp: false }) }));
+        // Custom strategy
+        if (strategies?.[0] === "privy") {
+            content = _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
+        }
+        else if (strategies) {
+            // Strategies are explicitly provided
+            content = (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
         }
         else {
-            // Show loading spinner only if not in Turnkey flow
-            if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
-                content = (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx("div", { className: "my-8 flex min-h-[350px] items-center justify-center", children: _jsx(Loading, { variant: "white", size: "lg" }) }) }));
-            }
-            else {
-                // Custom strategy
-                if (strategies?.[0] === "privy") {
-                    content = _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
-                }
-                else if (strategies) {
-                    // Strategies are explicitly provided
-                    content = (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
-                }
-                else {
-                    // Default to handle all strategies we support
-                    content = _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
-                }
-            }
+            // Default to handle all strategies we support
+            content = _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
         }
     }
     return content;

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStep.js

@@ -12,7 +12,7 @@ export function LoginStepContainer({ children, partnerId }) {
         },
     }, !!partnerId);
     const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
-    return (_jsxs("div", { className: "flex flex-col items-center justify-center pt-6", children: [partnerLogo && (_jsx("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children] }));
+    return (_jsxs("div", { className: "bg-b3-react-background flex flex-col items-center justify-center pt-6", children: [partnerLogo && (_jsx("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children] }));
 }
 export function LoginStep({ onSuccess, chain }) {
     const { partnerId, theme } = useB3();

package/dist/esm/global-account/react/hooks/index.d.ts

@@ -3,11 +3,9 @@ export { useAccountAssets } from "./useAccountAssets";
 export { useAccountWallet } from "./useAccountWallet";
 export { useAddTWSessionKey } from "./useAddTWSessionKey";
 export { useAnalytics } from "./useAnalytics";
-export { useAuth } from "./useAuth";
 export { useAuthentication } from "./useAuthentication";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses";
 export { useB3EnsName } from "./useB3EnsName";
-export { useBestTransactionPath } from "./useBestTransactionPath";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction";
 export * from "./useClaim";
 export { useClient } from "./useClient";

package/dist/esm/global-account/react/hooks/index.js

@@ -3,11 +3,9 @@ export { useAccountAssets } from "./useAccountAssets.js";
 export { useAccountWallet } from "./useAccountWallet.js";
 export { useAddTWSessionKey } from "./useAddTWSessionKey.js";
 export { useAnalytics } from "./useAnalytics.js";
-export { useAuth } from "./useAuth.js";
 export { useAuthentication } from "./useAuthentication.js";
 export { useB3BalanceFromAddresses } from "./useB3BalanceFromAddresses.js";
 export { useB3EnsName } from "./useB3EnsName.js";
-export { useBestTransactionPath } from "./useBestTransactionPath.js";
 export { useChainSwitchWithAction } from "./useChainSwitchWithAction.js";
 export * from "./useClaim.js";
 export { useClient } from "./useClient.js";

package/dist/esm/global-account/react/hooks/useAccountWallet.js

@@ -1,7 +1,6 @@
 import { useB3, useProfile } from "../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../shared/constants/index.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
-import { getIpfsUrl } from "../../../shared/utils/ipfs.js";
 import { useEffect, useMemo, useState } from "react";
 import { getLastAuthProvider, useActiveWallet, useConnectedWallets, useWalletImage } from "thirdweb/react";
 import { socialIcons } from "thirdweb/wallets/in-app";
@@ -18,7 +17,13 @@ function useLastAuthProvider() {
     return lastAuthProvider;
 }
 export function useAccountWallet() {
-    const { account, user } = useB3();
+    // WOJ: --------------------
+    //  values from in useB3:
+    //  const activeAccount = useActiveAccount();
+    // const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
+    // can we possibly just use useActiveAccount here?
+    // --------------------
+    const { account } = useB3();
     const activeWallet = useActiveWallet();
     const connectedWallets = useConnectedWallets();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);
@@ -31,7 +36,6 @@ export function useAccountWallet() {
     debug("connectedEOAWallet", connectedEOAWallet);
     debug("isActiveSmartWallet", isActiveSmartWallet);
     debug("isActiveEOAWallet", isActiveEOAWallet);
-    const { data: walletImage } = useWalletImage(connectedEOAWallet?.id);
     // If not EOA sign in, then we need to show the smart wallet icon
     const lastAuthProvider = useLastAuthProvider();
     const smartWalletIcon = lastAuthProvider && !connectedEOAWallet
@@ -39,13 +43,12 @@ export function useAccountWallet() {
         : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
     const { data: profileData } = useProfile({ address: account?.address });
     const ensName = profileData?.displayName?.replace(/\.b3\.fun/g, "");
-    const avatarUrl = user?.avatar ? getIpfsUrl(user?.avatar) : profileData?.avatar;
     const res = useMemo(() => ({
         wallet: {
             ...account,
             ensName,
             meta: {
-                icon: avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "",
+                icon: "", // deprecated
             },
         },
         address: account?.address,
@@ -55,22 +58,20 @@ export function useAccountWallet() {
         isActiveSmartWallet: isActiveSmartWallet,
         isActiveEOAWallet: isActiveEOAWallet,
         smartWalletIcon: smartWalletIcon,
-        eoaWalletIcon: walletImage,
+        eoaWalletIcon: "", // deprecated
     }), [
         account,
-        avatarUrl,
         connectedEOAWallet,
         connectedSmartWallet,
         ensName,
         isActiveEOAWallet,
         isActiveSmartWallet,
         smartWalletIcon,
-        walletImage,
     ]);
     return res;
 }
 export function useAccountWalletImage() {
-    const { account, user } = useB3();
+    const { account } = useB3();
     const activeWallet = useActiveWallet();
     const connectedWallets = useConnectedWallets();
     const connectedSmartWallet = connectedWallets.find(wallet => wallet.id === ecosystemWalletId);
@@ -83,6 +84,6 @@ export function useAccountWalletImage() {
         ? socialIcons[lastAuthProvider]
         : "https://gradvatar.com/0x0000000000000000000000000000000000000000"; // show smart wallet of eoa wallet is gradvatar
     const { data: profileData } = useProfile({ address: account?.address });
-    const avatarUrl = user?.avatar || profileData?.avatar;
+    const avatarUrl = profileData?.avatar;
     return avatarUrl || (isActiveSmartWallet ? smartWalletIcon : walletImage) || "";
 }

package/dist/esm/global-account/react/hooks/useAuthentication.d.ts

@@ -41,8 +41,8 @@ export declare function useAuthentication(partnerId: string): {
                 name?: string | undefined;
                 address?: string | undefined;
                 email?: string | undefined;
-                phone?: string | undefined;
                 username?: string | undefined;
+                phone?: string | undefined;
                 fid?: string | undefined;
             };
         }[] | undefined;
@@ -63,6 +63,6 @@ export declare function useAuthentication(partnerId: string): {
             turnkeyOtpId?: string | undefined;
         };
     } | undefined;
-    refetchUser: () => Promise<import("@feathersjs/authentication").AuthenticationResult>;
+    refetchUser: (wallet?: Wallet) => Promise<import("@feathersjs/authentication").AuthenticationResult>;
     setUser: (newUser?: import("@b3dotfun/b3-api").Users) => void;
 };