@b3dotfun/sdk 0.0.47-alpha.2 → 0.0.47-alpha.3

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

@@ -1,17 +1,14 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { RelayKitProviderWrapper, TooltipProvider, useAuthStore } from "../../../../global-account/react/index.js";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { RelayKitProviderWrapper, TooltipProvider, useAuthentication, useAuthStore, } from "../../../../global-account/react/index.js";
+import { useWagmiConfig } from "../../../../global-account/react/hooks/useWagmiConfig.js";
 import { loadGA4Script } from "../../../../global-account/utils/analytics.js";
-import { ecosystemWalletId } from "../../../../shared/constants/index.js";
-import { supportedChains } from "../../../../shared/constants/chains/supported.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
-import { client } from "../../../../shared/utils/thirdweb.js";
 import "@reservoir0x/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { inAppWalletConnector } from "@thirdweb-dev/wagmi-adapter";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { Toaster } from "sonner";
 import { getLastAuthProvider, ThirdwebProvider, useActiveAccount, useConnectedWallets, useSetActiveWallet, } from "thirdweb/react";
-import { createConfig, http, WagmiProvider } from "wagmi";
+import { WagmiProvider } from "wagmi";
 import { setClientType } from "../../../client-manager.js";
 import { StyleRoot } from "../StyleRoot.js";
 import { B3Context } from "./types.js";
@@ -39,76 +36,25 @@ export function B3Provider({ theme = "light", children, accountOverride, environ
     useEffect(() => {
         setClientType(clientType);
     }, [clientType]);
-    const ecocystemConfig = useMemo(() => {
-        if (!partnerId)
-            return undefined;
-        return {
-            ecosystemId: ecosystemWalletId,
-            partnerId: partnerId,
-            client,
-        };
-    }, [partnerId]);
-    // Stringify rpcUrls for stable comparison to prevent wagmiConfig recreation
-    // when parent component passes new object references with same content
-    const rpcUrlsString = useMemo(() => (rpcUrls ? JSON.stringify(rpcUrls) : undefined), [rpcUrls]);
-    /**
-     * Creates wagmi config with optional custom RPC URLs
-     * @param rpcUrls - Optional mapping of chain IDs to RPC URLs
-     */
-    const wagmiConfig = useMemo(() => {
-        const parsedRpcUrls = rpcUrlsString ? JSON.parse(rpcUrlsString) : undefined;
-        return createConfig({
-            chains: [supportedChains[0], ...supportedChains.slice(1)],
-            transports: Object.fromEntries(supportedChains.map(chain => [chain.id, http(parsedRpcUrls?.[chain.id])])),
-            connectors: [
-                inAppWalletConnector({
-                    ...(ecocystemConfig || {}),
-                    client,
-                }),
-                // injected(),
-                // coinbaseWallet({ appName: "HypeDuel" }),
-            ],
-        });
-    }, [ecocystemConfig, rpcUrlsString]);
-    return (_jsx(ThirdwebProvider, { children: _jsx(WagmiProvider, { config: wagmiConfig, children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(TooltipProvider, { children: _jsx(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, automaticallySetFirstEoa: !!automaticallySetFirstEoa, clientType: clientType, children: _jsxs(RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, _jsx(StyleRoot, { id: "b3-root" }), _jsx(Toaster, { theme: theme, position: toaster?.position, style: toaster?.style })] }) }) }) }) }) }));
+    const wagmiConfig = useWagmiConfig(partnerId, rpcUrls);
+    return (_jsx(ThirdwebProvider, { children: _jsx(WagmiProvider, { config: wagmiConfig, reconnectOnMount: false, children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(TooltipProvider, { children: _jsx(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, automaticallySetFirstEoa: !!automaticallySetFirstEoa, clientType: clientType, partnerId: partnerId, children: _jsxs(RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, _jsx(StyleRoot, { id: "b3-root" }), _jsx(Toaster, { theme: theme, position: toaster?.position, style: toaster?.style })] }) }) }) }) }) }));
 }
 /**
  * Inner provider component that provides the actual B3Context
  */
-export function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa, theme = "light", clientType = "socket", }) {
+export function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa, theme = "light", clientType = "socket", partnerId, }) {
     const activeAccount = useActiveAccount();
     const [manuallySelectedWallet, setManuallySelectedWallet] = useState(undefined);
     const wallets = useConnectedWallets();
-    const setActiveWallet = useSetActiveWallet();
     const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+    const isConnected = useAuthStore(state => state.isConnected);
+    const setActiveWallet = useSetActiveWallet();
+    const { user, setUser, refetchUser } = useAuthentication(partnerId);
+    debug("@@B3Provider:isConnected", isConnected);
     debug("@@wallets", wallets);
-    const [user, setUser] = useState(() => {
-        // Try to restore user from localStorage on initialization
-        if (typeof window !== "undefined") {
-            try {
-                const storedUser = localStorage.getItem("b3-user");
-                return storedUser ? JSON.parse(storedUser) : undefined;
-            }
-            catch (error) {
-                console.warn("Failed to restore user from localStorage:", error);
-                return undefined;
-            }
-        }
-        return undefined;
-    });
+    debug("@@B3Provider:user", user);
     // Use given accountOverride or activeAccount from thirdweb
     const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
-    // Persist user to localStorage when it changes
-    useEffect(() => {
-        if (typeof window !== "undefined") {
-            if (user) {
-                localStorage.setItem("b3-user", JSON.stringify(user));
-            }
-            else {
-                localStorage.removeItem("b3-user");
-            }
-        }
-    }, [user]);
     const setWallet = useCallback((wallet) => {
         setManuallySelectedWallet(wallet);
         const account = wallet.getAccount();
@@ -141,6 +87,7 @@ export function InnerProvider({ children, accountOverride, environment, defaultP
             wallet: manuallySelectedWallet,
             user,
             setUser,
+            refetchUser,
             initialized: true,
             ready: !!effectiveAccount,
             automaticallySetFirstEoa,
@@ -148,5 +95,9 @@ export function InnerProvider({ children, accountOverride, environment, defaultP
             defaultPermissions,
             theme,
             clientType,
-        }, children: children }));
+            partnerId: partnerId,
+        }, children: _jsx(InnerProvider2, { children: children }) }));
 }
+const InnerProvider2 = ({ children }) => {
+    return _jsx(_Fragment, { children: children });
+};

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

@@ -5,21 +5,25 @@ import { B3ContextType } from "./types";
 /**
  * Main B3Provider component
  */
-export declare function B3Provider({ theme, children, accountOverride, environment, clientType, }: {
+export declare function B3Provider({ theme, children, accountOverride, environment, clientType, partnerId, rpcUrls, }: {
     theme: "light" | "dark";
     children: React.ReactNode;
     accountOverride?: Account;
     environment: B3ContextType["environment"];
     clientType?: ClientType;
+    partnerId: string;
+    rpcUrls?: Record<number, string>;
 }): import("react/jsx-runtime").JSX.Element;
 /**
  * Inner provider component that provides the actual B3Context
  */
-export declare function InnerProvider({ children, accountOverride, environment, defaultPermissions, theme, clientType, }: {
+export declare function InnerProvider({ children, accountOverride, environment, defaultPermissions, theme, clientType, partnerId, rpcUrls, }: {
     children: React.ReactNode;
     accountOverride?: Account;
     environment: B3ContextType["environment"];
     defaultPermissions?: PermissionsConfig;
     theme: "light" | "dark";
     clientType?: ClientType;
+    partnerId: string;
+    rpcUrls?: Record<number, string>;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -1,7 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useState } from "react";
 import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
+import { WagmiProvider } from "wagmi";
+import { useAuthentication } from "../../hooks/useAuthentication.js";
+import { useWagmiConfig } from "../../hooks/useWagmiConfig.js";
 import { B3Context } from "./types.js";
 /**
  * Default permissions configuration for B3 provider
@@ -17,29 +19,32 @@ const queryClient = new QueryClient();
 /**
  * Main B3Provider component
  */
-export function B3Provider({ theme = "light", children, accountOverride, environment, clientType = "socket", }) {
-    return (_jsx(QueryClientProvider, { client: queryClient, children: _jsx(ThirdwebProvider, { children: _jsx(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, clientType: clientType, children: children }) }) }));
+export function B3Provider({ theme = "light", children, accountOverride, environment, clientType = "socket", partnerId, rpcUrls, }) {
+    return (_jsx(ThirdwebProvider, { children: _jsx(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, clientType: clientType, partnerId: partnerId, rpcUrls: rpcUrls, children: children }) }));
 }
 /**
  * Inner provider component that provides the actual B3Context
  */
-export function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, theme = "light", clientType = "socket", }) {
+export function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, theme = "light", clientType = "socket", partnerId, rpcUrls, }) {
     const activeAccount = useActiveAccount();
-    const [user, setUser] = useState(undefined);
+    const { user, setUser, refetchUser } = useAuthentication(partnerId);
+    const wagmiConfig = useWagmiConfig(partnerId, rpcUrls);
     // Use given accountOverride or activeAccount from thirdweb
     const effectiveAccount = accountOverride || activeAccount;
-    return (_jsx(B3Context.Provider, { value: {
-            account: effectiveAccount,
-            automaticallySetFirstEoa: false,
-            setWallet: () => { },
-            wallet: undefined,
-            user,
-            setUser,
-            initialized: true,
-            ready: !!effectiveAccount,
-            environment,
-            defaultPermissions,
-            theme,
-            clientType,
-        }, children: children }));
+    return (_jsx(WagmiProvider, { config: wagmiConfig, children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(B3Context.Provider, { value: {
+                    account: effectiveAccount,
+                    automaticallySetFirstEoa: false,
+                    setWallet: () => { },
+                    wallet: undefined,
+                    user,
+                    setUser,
+                    initialized: true,
+                    ready: !!effectiveAccount,
+                    environment,
+                    defaultPermissions,
+                    theme,
+                    clientType,
+                    partnerId,
+                    refetchUser,
+                }, children: children }) }) }));
 }

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

@@ -12,12 +12,14 @@ export interface B3ContextType {
     setWallet: (wallet: Wallet) => void;
     wallet?: Wallet;
     setUser: (user?: Users) => void;
+    refetchUser: () => Promise<any>;
     initialized: boolean;
     ready: boolean;
     environment?: "development" | "production";
     defaultPermissions?: PermissionsConfig;
     theme: "light" | "dark";
     clientType: ClientType;
+    partnerId: string;
 }
 /**
  * Context for B3 provider

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

@@ -9,9 +9,11 @@ export const B3Context = createContext({
     setWallet: () => { },
     wallet: undefined,
     setUser: () => { },
+    refetchUser: async () => { },
     initialized: false,
     ready: false,
     environment: "development",
     theme: "light",
     clientType: "rest",
+    partnerId: "",
 });

package/dist/esm/global-account/react/components/ManageAccount/BalanceContent.d.ts

@@ -1,8 +1,7 @@
 interface BalanceContentProps {
     onLogout?: () => void;
-    partnerId: string;
     showDeposit?: boolean;
     showSwap?: boolean;
 }
-export declare function BalanceContent({ onLogout, partnerId, showDeposit, showSwap }: BalanceContentProps): import("react/jsx-runtime").JSX.Element;
+export declare function BalanceContent({ onLogout, showDeposit, showSwap }: BalanceContentProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -17,14 +17,14 @@ function centerTruncate(str, length = 4) {
         return str;
     return `${str.slice(0, length)}...${str.slice(-length)}`;
 }
-export function BalanceContent({ onLogout, partnerId, showDeposit = true, showSwap = true }) {
+export function BalanceContent({ onLogout, showDeposit = true, showSwap = true }) {
     const account = useActiveAccount();
     const { address: eoaAddress, info: eoaInfo } = useFirstEOA();
     const { data: profile } = useProfile({
         address: eoaAddress || account?.address,
         fresh: true,
     });
-    const { user } = useB3();
+    const { user, partnerId } = useB3();
     const { setB3ModalOpen, setB3ModalContentType, navigateBack } = useModalStore();
     const { logout } = useAuthentication(partnerId);
     const [logoutLoading, setLogoutLoading] = useState(false);

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

@@ -196,5 +196,5 @@ export function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit
                     if (["overview", "tokens", "nfts", "apps", "settings"].includes(tab)) {
                         setActiveTab?.(tab);
                     }
-                }, children: [_jsx("div", { className: "px-4", children: _jsxs(TabsListPrimitive, { className: "grid h-auto grid-cols-2 grid-rows-2 gap-3 rounded-none border-none bg-transparent", children: [_jsxs(TabTriggerPrimitive, { value: "overview", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(BarChart3, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Overview" })] }), _jsxs(TabTriggerPrimitive, { value: "tokens", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(Coins, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Tokens" })] }), _jsxs(TabTriggerPrimitive, { value: "nfts", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(Image, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "NFTs" })] }), _jsxs(TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(Settings, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Settings" })] })] }) }), _jsx(TabsContentPrimitive, { value: "overview", className: "px-4 pb-4 pt-2", children: _jsx(BalanceContent, { onLogout: onLogout, partnerId: partnerId, showDeposit: showDeposit, showSwap: showSwap }) }), _jsx(TabsContentPrimitive, { value: "tokens", className: "px-4 pb-4 pt-2", children: _jsx(ContentTokens, { activeTab: activeTab }) }), _jsx(TabsContentPrimitive, { value: "nfts", className: "px-4 pb-4 pt-2", children: _jsx("div", { className: "grid grid-cols-3 gap-4", children: nfts?.nftResponse ? (_jsx(AccountAssets, { nfts: nfts.nftResponse, isLoading: isLoading })) : (_jsx("div", { className: "col-span-3 py-12 text-center text-gray-500", children: "No NFTs found" })) }) }), _jsx(TabsContentPrimitive, { value: "apps", className: "px-4 pb-4 pt-2", children: _jsx(AppsContent, {}) }), _jsx(TabsContentPrimitive, { value: "settings", className: "px-4 pb-4 pt-2", children: _jsx(SettingsContent, {}) })] }) }) }));
+                }, children: [_jsx("div", { className: "px-4", children: _jsxs(TabsListPrimitive, { className: "grid h-auto grid-cols-2 grid-rows-2 gap-3 rounded-none border-none bg-transparent", children: [_jsxs(TabTriggerPrimitive, { value: "overview", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(BarChart3, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Overview" })] }), _jsxs(TabTriggerPrimitive, { value: "tokens", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(Coins, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Tokens" })] }), _jsxs(TabTriggerPrimitive, { value: "nfts", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(Image, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "NFTs" })] }), _jsxs(TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:bg-b3-primary-blue data-[state=active]:hover:bg-b3-primary-blue data-[state=active]:border-b3-primary-blue group flex h-12 w-full items-center justify-center gap-2 rounded-xl border border-gray-200 bg-white p-2 text-center shadow-sm transition-all duration-200 hover:bg-gray-50 hover:shadow-md data-[state=active]:shadow-lg", children: [_jsx(Settings, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), _jsx("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Settings" })] })] }) }), _jsx(TabsContentPrimitive, { value: "overview", className: "px-4 pb-4 pt-2", children: _jsx(BalanceContent, { onLogout: onLogout, showDeposit: showDeposit, showSwap: showSwap }) }), _jsx(TabsContentPrimitive, { value: "tokens", className: "px-4 pb-4 pt-2", children: _jsx(ContentTokens, { activeTab: activeTab }) }), _jsx(TabsContentPrimitive, { value: "nfts", className: "px-4 pb-4 pt-2", children: _jsx("div", { className: "grid grid-cols-3 gap-4", children: nfts?.nftResponse ? (_jsx(AccountAssets, { nfts: nfts.nftResponse, isLoading: isLoading })) : (_jsx("div", { className: "col-span-3 py-12 text-center text-gray-500", children: "No NFTs found" })) }) }), _jsx(TabsContentPrimitive, { value: "apps", className: "px-4 pb-4 pt-2", children: _jsx(AppsContent, {}) }), _jsx(TabsContentPrimitive, { value: "settings", className: "px-4 pb-4 pt-2", children: _jsx(SettingsContent, {}) })] }) }) }));
 }

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

@@ -9,10 +9,10 @@ import { useConnectedWallets, useSetActiveWallet, useWalletInfo } from "thirdweb
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 export function SignIn(props) {
     const { className } = props;
-    const { automaticallySetFirstEoa } = useB3();
+    const { automaticallySetFirstEoa, partnerId } = useB3();
     const { wallet, address: globalAddress, ensName, connectedSmartWallet, connectedEOAWallet, isActiveSmartWallet, isActiveEOAWallet, smartWalletIcon, eoaWalletIcon, } = useAccountWallet();
     const isMobile = useIsMobile();
-    const { logout } = useAuthentication(String(process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID));
+    const { logout } = useAuthentication(partnerId);
     const onDisconnect = async () => {
         await logout();
     };

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

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { Button, StyleRoot, useAuthentication, useB3, useIsMobile, useModalStore, } from "../../../../global-account/react/index.js";
+import { Button, StyleRoot, useAuthStore, useB3, useIsMobile, useModalStore, } from "../../../../global-account/react/index.js";
 import { useEffect } from "react";
 import { ManageAccountButton } from "../custom/ManageAccountButton.js";
 import { Loading } from "../ui/Loading.js";
 export function SignInWithB3(props) {
     const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = useModalStore();
     const { account } = useB3();
-    const { isAuthenticating, isAuthenticated } = useAuthentication(props.partnerId, props.loginWithSiwe);
+    const { isAuthenticating, isAuthenticated } = useAuthStore();
     const isMobile = useIsMobile();
     useEffect(() => {
         if (account) {

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

@@ -3,4 +3,4 @@ import { SignInWithB3ModalProps } from "../../../../global-account/react";
  * Component that manages the authentication flow for Sign In With B3
  * Handles different login providers, authentication steps, and session key management
  */
-export declare function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin, loginWithSiwe, source, signersEnabled, }: SignInWithB3ModalProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin, source, signersEnabled, }: SignInWithB3ModalProps): import("react/jsx-runtime").JSX.Element | null;

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, useSiwe, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthStore, useB3, useGetAllTWSigners, useModalStore, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useCallback, useEffect, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
@@ -12,16 +12,14 @@ const MAX_REFETCH_ATTEMPTS = 20;
  * Component that manages the authentication flow for Sign In With B3
  * Handles different login providers, authentication steps, and session key management
  */
-export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, loginWithSiwe = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { setUser, automaticallySetFirstEoa } = useB3();
+export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
+    const { automaticallySetFirstEoa } = useB3();
     const [step, setStep] = useState(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen } = useModalStore();
     const account = useActiveAccount();
-    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const isAuthenticating = useAuthStore(state => state.isAuthenticating);
     const isConnected = useAuthStore(state => state.isConnected);
-    const setIsConnected = useAuthStore(state => state.setIsConnected);
     const [refetchCount, setRefetchCount] = useState(0);
     const [refetchError, setRefetchError] = useState(null);
     const { data: signers, refetch: refetchSigners, isFetching: isFetchingSigners, } = useGetAllTWSigners({
@@ -31,7 +29,6 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             enabled: signersEnabled,
         },
     });
-    const { authenticate } = useSiwe();
     const [refetchQueued, setRefetchQueued] = useState(false);
     // Enhanced refetchSigners function that tracks number of attempts
     const handleRefetchSigners = useCallback(() => {
@@ -142,13 +139,11 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
             sessionKeyAddress,
             partnerId,
             closeAfterLogin,
-            loginWithSiwe,
             source: "requestPermissions",
         });
     }, [
         chain,
         closeAfterLogin,
-        loginWithSiwe,
         onError,
         onLoginSuccess,
         onSessionKeySuccess,
@@ -158,19 +153,8 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
         strategies,
     ]);
     const handleLoginSuccess = useCallback(async (account) => {
-        debug("Authenticating with B3 via SIWE");
-        setIsConnected(true);
-        if (loginWithSiwe) {
-            debug("setIsAuthenticating:true:1");
-            setIsAuthenticating(true);
-            const userAuth = await authenticate(account, partnerId);
-            setUser(userAuth.user);
-        }
-        debug("handleLoginSuccess:account", account);
         onLoginSuccess?.(account);
-        debug("setIsAuthenticating:false:1");
-        setIsAuthenticating(false);
-    }, [loginWithSiwe, onLoginSuccess, authenticate, partnerId, setUser, setIsConnected, setIsAuthenticating]);
+    }, [onLoginSuccess]);
     useEffect(() => {
         if (step === "permissions") {
             setB3ModalContentType({
@@ -192,14 +176,14 @@ export function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySucce
     if (step === "login") {
         // Custom strategy
         if (strategies?.[0] === "privy") {
-            return _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, partnerId: partnerId, chain: chain });
+            return _jsx(SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
         }
         // Strategies are explicitly provided
         if (strategies) {
-            return (_jsx(LoginStepCustom, { strategies: strategies, partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
+            return (_jsx(LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
         }
         // Default to handle all strategies we support
-        return _jsx(LoginStep, { partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError });
+        return _jsx(LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
     }
     return null;
 }

package/dist/esm/global-account/react/components/SignInWithB3/SignInWithB3Privy.d.ts

@@ -4,8 +4,7 @@ interface SignInWithB3PrivyProps {
     onError?: (error: Error) => Promise<void>;
     onSuccess: (account: Account) => Promise<void>;
     accessToken?: string;
-    partnerId: string;
     chain: Chain;
 }
-export declare function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }: SignInWithB3PrivyProps): import("react/jsx-runtime").JSX.Element;
+export declare function SignInWithB3Privy({ onSuccess, onError, chain }: SignInWithB3PrivyProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,10 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Loading, useAuthentication, useAuthStore, useHandleConnectWithPrivy, } from "../../../../global-account/react/index.js";
+import { Loading, useAuthentication, useAuthStore, useB3, useHandleConnectWithPrivy, } from "../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../shared/utils/debug.js";
 import { useEffect } from "react";
 const debug = debugB3React("SignInWithB3Privy");
-export function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }) {
-    const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(partnerId, chain, onSuccess);
+export function SignInWithB3Privy({ onSuccess, onError, chain }) {
+    const { partnerId } = useB3();
+    const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(chain, onSuccess);
     const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
     const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
     const { logout } = useAuthentication(partnerId);

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

@@ -9,7 +9,6 @@ interface LoginStepProps {
     /** Optional callback function called when an error occurs */
     onError?: (error: Error) => Promise<void>;
     /** Partner ID used for authentication */
-    partnerId: string;
     /** Blockchain chain information */
     chain: Chain;
     /** Optional authentication strategy options */
@@ -20,5 +19,5 @@ interface LoginStepContainerProps {
     partnerId?: string;
 }
 export declare function LoginStepContainer({ children, partnerId }: LoginStepContainerProps): import("react/jsx-runtime").JSX.Element;
-export declare function LoginStep({ onSuccess, onError, partnerId, chain }: LoginStepProps): import("react/jsx-runtime").JSX.Element;
+export declare function LoginStep({ onSuccess, chain }: LoginStepProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,7 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAuthentication, useAuthStore, useB3, useQueryB3 } from "../../../../../global-account/react/index.js";
+import { useAuthentication, useB3, useQueryB3 } from "../../../../../global-account/react/index.js";
 import { ecosystemWalletId } from "../../../../../shared/constants/index.js";
-import { debug } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { ConnectEmbed, darkTheme, lightTheme } from "thirdweb/react";
 import { ecosystemWallet } from "thirdweb/wallets";
@@ -15,14 +14,12 @@ export function LoginStepContainer({ children, 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, _jsxs("h2", { className: "mt-6 flex items-center gap-2 text-lg font-bold", children: ["Powered by", _jsx("img", { alt: "B3 Logo", className: "h-5", src: "https://cdn.b3.fun/b3_logo.svg" }), "Connect"] })] }));
 }
-export function LoginStep({ onSuccess, onError, partnerId, chain }) {
+export function LoginStep({ onSuccess, chain }) {
+    const { partnerId, theme } = useB3();
     const wallet = ecosystemWallet(ecosystemWalletId, {
         partnerId: partnerId,
     });
-    const { theme } = useB3();
-    const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
-    const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);
-    const { logout } = useAuthentication(partnerId);
+    const { onConnect } = useAuthentication(partnerId);
     return (_jsx(LoginStepContainer, { partnerId: partnerId, children: _jsx(ConnectEmbed, { showThirdwebBranding: false, client: client, chain: chain, wallets: [wallet], theme: theme === "light"
                 ? lightTheme({
                     colors: {
@@ -33,50 +30,18 @@ export function LoginStep({ onSuccess, onError, partnerId, chain }) {
                     colors: {
                         modalBg: "hsl(var(--b3-react-background))",
                     },
-                }), autoConnect: true, style: {
+                }), style: {
                 width: "100%",
                 height: "100%",
                 border: 0,
-            }, 
-            // TODO: Integrate with SIWE in useSIWE
-            // auth={{
-            //   isLoggedIn: async (address) => {
-            //     console.log("checking if logged in!", { address });
-            //     return await isLoggedIn();
-            //   },
-            //   doLogin: async (params) => {
-            //     console.log("logging in!");
-            //     await login(params);
-            //   },
-            //   getLoginPayload: async ({ address }) =>
-            //     generatePayload({ address }),
-            //   doLogout: async () => {
-            //     console.log("logging out!");
-            //     await logout();
-            //   },
-            // }}
-            header: {
+            }, header: {
                 title: "Sign in with B3",
                 titleIcon: "https://cdn.b3.fun/b3_logo.svg",
             }, className: "b3-login-step", onConnect: async (wallet) => {
-                try {
-                    setIsAuthenticating(true);
-                    debug("setIsAuthenticating:true:6");
-                    const account = wallet.getAccount();
-                    if (!account)
-                        throw new Error("No account found");
-                    await onSuccess(account);
-                    setIsAuthenticated(true);
-                    console.log("connected!", wallet.id);
-                }
-                catch (error) {
-                    await onError?.(error);
-                    await logout();
-                    setIsAuthenticated(false);
-                }
-                finally {
-                    debug("setIsAuthenticating:false:6");
-                    setIsAuthenticating(false);
-                }
+                await onConnect(wallet);
+                const account = wallet.getAccount();
+                if (!account)
+                    throw new Error("No account found");
+                await onSuccess(account);
             } }) }));
 }

package/dist/esm/global-account/react/components/SignInWithB3/steps/LoginStepCustom.d.ts

@@ -5,10 +5,9 @@ interface LoginStepCustomProps {
     automaticallySetFirstEoa: boolean;
     onSuccess: (account: Account) => Promise<void>;
     onError?: (error: Error) => Promise<void>;
-    partnerId: string;
     chain: Chain;
     strategies: AllowedStrategy[];
     maxInitialWallets?: number;
 }
-export declare function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets, automaticallySetFirstEoa, }: LoginStepCustomProps): import("react/jsx-runtime").JSX.Element;
+export declare function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets, automaticallySetFirstEoa, }: LoginStepCustomProps): import("react/jsx-runtime").JSX.Element;
 export {};

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

@@ -1,12 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
+import { AuthButton, Button, getConnectOptionsFromStrategy, isWalletType, LoginStepContainer, useAuthentication, useAuthStore, useB3, useConnect, WalletRow, } from "../../../../../global-account/react/index.js";
 import { debugB3React } from "../../../../../shared/utils/debug.js";
 import { client } from "../../../../../shared/utils/thirdweb.js";
 import { useState } from "react";
 import { useConnect as useConnectTW } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
 const debug = debugB3React("LoginStepCustom");
-export function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+export function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+    const { partnerId } = useB3();
     const [isLoading, setIsLoading] = useState(false);
     const [showAllWallets, setShowAllWallets] = useState(false);
     const { connect } = useConnect(partnerId, chain);

package/dist/esm/global-account/react/components/custom/ManageAccountButton.js

@@ -1,9 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, StyleRoot, useAuthentication, useModalStore } from "../../../../global-account/react/index.js";
+import { Button, StyleRoot, useAuthentication, useB3, useModalStore } from "../../../../global-account/react/index.js";
 import { cn } from "../../../../shared/utils/index.js";
 export function ManageAccountButton(props) {
+    const { partnerId } = useB3();
     const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-    const { isConnected } = useAuthentication(props.partnerId, props.loginWithSiwe);
+    const { isConnected } = useAuthentication(partnerId);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,