@b3dotfun/sdk 0.0.47-alpha.0 → 0.0.47-test.4

package/README.md

@@ -196,7 +196,7 @@ import { B3Provider, SignInWithB3 } from "@b3dotfun/sdk/global-account/react";
 
 function App() {
   return (
-    <B3Provider environment="production">
+    <B3Provider environment="production" partnerId="your-awesome-partner-id">
       <SignInWithB3
         provider={{ strategy: "google" }}
         partnerId="your-partner-id"
@@ -223,7 +223,7 @@ const b3Chain = {
 
 function SessionKeyAuth() {
   return (
-    <B3Provider environment="production">
+    <B3Provider environment="production" partnerId="your-awesome-partner-id">
       <SignInWithB3
         provider={{ strategy: "google" }}
         chain={b3Chain}
@@ -368,7 +368,7 @@ import B3DynamicModal from "@b3dotfun/sdk/global-account/react/components/B3Dyna
 
 function App() {
   return (
-    <B3Provider environment="production">
+    <B3Provider environment="production" partnerId="your-awesome-partner-id">
       <YourApp />
       <B3DynamicModal />
     </B3Provider>

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

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

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

@@ -4,14 +4,11 @@ exports.B3Provider = B3Provider;
 exports.InnerProvider = InnerProvider;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
+const useWagmiConfig_1 = require("../../../../global-account/react/hooks/useWagmiConfig");
 const analytics_1 = require("../../../../global-account/utils/analytics");
-const constants_1 = require("../../../../shared/constants");
-const supported_1 = require("../../../../shared/constants/chains/supported");
 const debug_1 = require("../../../../shared/utils/debug");
-const thirdweb_1 = require("../../../../shared/utils/thirdweb");
 require("@reservoir0x/relay-kit-ui/styles.css");
 const react_query_1 = require("@tanstack/react-query");
-const wagmi_adapter_1 = require("@thirdweb-dev/wagmi-adapter");
 const react_2 = require("react");
 const sonner_1 = require("sonner");
 const react_3 = require("thirdweb/react");
@@ -43,76 +40,25 @@ function B3Provider({ theme = "light", children, accountOverride, environment, a
     (0, react_2.useEffect)(() => {
         (0, client_manager_1.setClientType)(clientType);
     }, [clientType]);
-    const ecocystemConfig = (0, react_2.useMemo)(() => {
-        if (!partnerId)
-            return undefined;
-        return {
-            ecosystemId: constants_1.ecosystemWalletId,
-            partnerId: partnerId,
-            client: thirdweb_1.client,
-        };
-    }, [partnerId]);
-    // Stringify rpcUrls for stable comparison to prevent wagmiConfig recreation
-    // when parent component passes new object references with same content
-    const rpcUrlsString = (0, react_2.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 = (0, react_2.useMemo)(() => {
-        const parsedRpcUrls = rpcUrlsString ? JSON.parse(rpcUrlsString) : undefined;
-        return (0, wagmi_1.createConfig)({
-            chains: [supported_1.supportedChains[0], ...supported_1.supportedChains.slice(1)],
-            transports: Object.fromEntries(supported_1.supportedChains.map(chain => [chain.id, (0, wagmi_1.http)(parsedRpcUrls?.[chain.id])])),
-            connectors: [
-                (0, wagmi_adapter_1.inAppWalletConnector)({
-                    ...(ecocystemConfig || {}),
-                    client: thirdweb_1.client,
-                }),
-                // injected(),
-                // coinbaseWallet({ appName: "HypeDuel" }),
-            ],
-        });
-    }, [ecocystemConfig, rpcUrlsString]);
-    return ((0, jsx_runtime_1.jsx)(react_3.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(wagmi_1.WagmiProvider, { config: wagmiConfig, children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(react_1.TooltipProvider, { children: (0, jsx_runtime_1.jsx)(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, automaticallySetFirstEoa: !!automaticallySetFirstEoa, clientType: clientType, children: (0, jsx_runtime_1.jsxs)(react_1.RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, (0, jsx_runtime_1.jsx)(StyleRoot_1.StyleRoot, { id: "b3-root" }), (0, jsx_runtime_1.jsx)(sonner_1.Toaster, { theme: theme, position: toaster?.position, style: toaster?.style })] }) }) }) }) }) }));
+    const wagmiConfig = (0, useWagmiConfig_1.useWagmiConfig)(partnerId, rpcUrls);
+    return ((0, jsx_runtime_1.jsx)(react_3.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(wagmi_1.WagmiProvider, { config: wagmiConfig, reconnectOnMount: false, children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(react_1.TooltipProvider, { children: (0, jsx_runtime_1.jsx)(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, automaticallySetFirstEoa: !!automaticallySetFirstEoa, clientType: clientType, partnerId: partnerId, children: (0, jsx_runtime_1.jsxs)(react_1.RelayKitProviderWrapper, { simDuneApiKey: simDuneApiKey, children: [children, (0, jsx_runtime_1.jsx)(StyleRoot_1.StyleRoot, { id: "b3-root" }), (0, jsx_runtime_1.jsx)(sonner_1.Toaster, { theme: theme, position: toaster?.position, style: toaster?.style })] }) }) }) }) }) }));
 }
 /**
  * Inner provider component that provides the actual B3Context
  */
-function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa, theme = "light", clientType = "socket", }) {
+function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, automaticallySetFirstEoa, theme = "light", clientType = "socket", partnerId, }) {
     const activeAccount = (0, react_3.useActiveAccount)();
     const [manuallySelectedWallet, setManuallySelectedWallet] = (0, react_2.useState)(undefined);
     const wallets = (0, react_3.useConnectedWallets)();
-    const setActiveWallet = (0, react_3.useSetActiveWallet)();
     const isAuthenticated = (0, react_1.useAuthStore)(state => state.isAuthenticated);
+    const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
+    const setActiveWallet = (0, react_3.useSetActiveWallet)();
+    const { user, setUser, refetchUser } = (0, react_1.useAuthentication)(partnerId);
+    debug("@@B3Provider:isConnected", isConnected);
     debug("@@wallets", wallets);
-    const [user, setUser] = (0, react_2.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
-    (0, react_2.useEffect)(() => {
-        if (typeof window !== "undefined") {
-            if (user) {
-                localStorage.setItem("b3-user", JSON.stringify(user));
-            }
-            else {
-                localStorage.removeItem("b3-user");
-            }
-        }
-    }, [user]);
     const setWallet = (0, react_2.useCallback)((wallet) => {
         setManuallySelectedWallet(wallet);
         const account = wallet.getAccount();
@@ -145,6 +91,7 @@ function InnerProvider({ children, accountOverride, environment, defaultPermissi
             wallet: manuallySelectedWallet,
             user,
             setUser,
+            refetchUser,
             initialized: true,
             ready: !!effectiveAccount,
             automaticallySetFirstEoa,
@@ -152,5 +99,9 @@ function InnerProvider({ children, accountOverride, environment, defaultPermissi
             defaultPermissions,
             theme,
             clientType,
-        }, children: children }));
+            partnerId: partnerId,
+        }, children: (0, jsx_runtime_1.jsx)(InnerProvider2, { children: children }) }));
 }
+const InnerProvider2 = ({ children }) => {
+    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
+};

package/dist/cjs/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/cjs/global-account/react/components/B3Provider/B3Provider.native.js

@@ -4,8 +4,10 @@ exports.B3Provider = B3Provider;
 exports.InnerProvider = InnerProvider;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_query_1 = require("@tanstack/react-query");
-const react_1 = require("react");
-const react_2 = require("thirdweb/react");
+const react_1 = require("thirdweb/react");
+const wagmi_1 = require("wagmi");
+const useAuthentication_1 = require("../../hooks/useAuthentication");
+const useWagmiConfig_1 = require("../../hooks/useWagmiConfig");
 const types_1 = require("./types");
 /**
  * Default permissions configuration for B3 provider
@@ -21,29 +23,32 @@ const queryClient = new react_query_1.QueryClient();
 /**
  * Main B3Provider component
  */
-function B3Provider({ theme = "light", children, accountOverride, environment, clientType = "socket", }) {
-    return ((0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(react_2.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, clientType: clientType, children: children }) }) }));
+function B3Provider({ theme = "light", children, accountOverride, environment, clientType = "socket", partnerId, rpcUrls, }) {
+    return ((0, jsx_runtime_1.jsx)(react_1.ThirdwebProvider, { children: (0, jsx_runtime_1.jsx)(InnerProvider, { accountOverride: accountOverride, environment: environment, theme: theme, clientType: clientType, partnerId: partnerId, rpcUrls: rpcUrls, children: children }) }));
 }
 /**
  * Inner provider component that provides the actual B3Context
  */
-function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, theme = "light", clientType = "socket", }) {
-    const activeAccount = (0, react_2.useActiveAccount)();
-    const [user, setUser] = (0, react_1.useState)(undefined);
+function InnerProvider({ children, accountOverride, environment, defaultPermissions = DEFAULT_PERMISSIONS, theme = "light", clientType = "socket", partnerId, rpcUrls, }) {
+    const activeAccount = (0, react_1.useActiveAccount)();
+    const { user, setUser, refetchUser } = (0, useAuthentication_1.useAuthentication)(partnerId);
+    const wagmiConfig = (0, useWagmiConfig_1.useWagmiConfig)(partnerId, rpcUrls);
     // Use given accountOverride or activeAccount from thirdweb
     const effectiveAccount = accountOverride || activeAccount;
-    return ((0, jsx_runtime_1.jsx)(types_1.B3Context.Provider, { value: {
-            account: effectiveAccount,
-            automaticallySetFirstEoa: false,
-            setWallet: () => { },
-            wallet: undefined,
-            user,
-            setUser,
-            initialized: true,
-            ready: !!effectiveAccount,
-            environment,
-            defaultPermissions,
-            theme,
-            clientType,
-        }, children: children }));
+    return ((0, jsx_runtime_1.jsx)(wagmi_1.WagmiProvider, { config: wagmiConfig, children: (0, jsx_runtime_1.jsx)(react_query_1.QueryClientProvider, { client: queryClient, children: (0, jsx_runtime_1.jsx)(types_1.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/cjs/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/cjs/global-account/react/components/B3Provider/types.js

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

package/dist/cjs/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/cjs/global-account/react/components/ManageAccount/BalanceContent.js

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

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

@@ -202,5 +202,5 @@ function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit, chain
                     if (["overview", "tokens", "nfts", "apps", "settings"].includes(tab)) {
                         setActiveTab?.(tab);
                     }
-                }, children: [(0, jsx_runtime_1.jsx)("div", { className: "px-4", children: (0, jsx_runtime_1.jsxs)(react_1.TabsListPrimitive, { className: "grid h-auto grid-cols-2 grid-rows-2 gap-3 rounded-none border-none bg-transparent", children: [(0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.BarChart3, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Overview" })] }), (0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.Coins, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Tokens" })] }), (0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.Image, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "NFTs" })] }), (0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.Settings, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Settings" })] })] }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "overview", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(BalanceContent_1.BalanceContent, { onLogout: onLogout, partnerId: partnerId, showDeposit: showDeposit, showSwap: showSwap }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "tokens", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(ContentTokens_1.ContentTokens, { activeTab: activeTab }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "nfts", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)("div", { className: "grid grid-cols-3 gap-4", children: nfts?.nftResponse ? ((0, jsx_runtime_1.jsx)(AccountAssets_1.AccountAssets, { nfts: nfts.nftResponse, isLoading: isLoading })) : ((0, jsx_runtime_1.jsx)("div", { className: "col-span-3 py-12 text-center text-gray-500", children: "No NFTs found" })) }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "apps", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(AppsContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "settings", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(SettingsContent, {}) })] }) }) }));
+                }, children: [(0, jsx_runtime_1.jsx)("div", { className: "px-4", children: (0, jsx_runtime_1.jsxs)(react_1.TabsListPrimitive, { className: "grid h-auto grid-cols-2 grid-rows-2 gap-3 rounded-none border-none bg-transparent", children: [(0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.BarChart3, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Overview" })] }), (0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.Coins, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Tokens" })] }), (0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.Image, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "NFTs" })] }), (0, jsx_runtime_1.jsxs)(react_1.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: [(0, jsx_runtime_1.jsx)(lucide_react_1.Settings, { size: 20, className: "text-b3-primary-blue shrink-0 group-data-[state=active]:text-white" }), (0, jsx_runtime_1.jsx)("span", { className: "text-b3-grey font-neue-montreal-semibold text-sm group-data-[state=active]:text-white", children: "Settings" })] })] }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "overview", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(BalanceContent_1.BalanceContent, { onLogout: onLogout, showDeposit: showDeposit, showSwap: showSwap }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "tokens", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(ContentTokens_1.ContentTokens, { activeTab: activeTab }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "nfts", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)("div", { className: "grid grid-cols-3 gap-4", children: nfts?.nftResponse ? ((0, jsx_runtime_1.jsx)(AccountAssets_1.AccountAssets, { nfts: nfts.nftResponse, isLoading: isLoading })) : ((0, jsx_runtime_1.jsx)("div", { className: "col-span-3 py-12 text-center text-gray-500", children: "No NFTs found" })) }) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "apps", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(AppsContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "settings", className: "px-4 pb-4 pt-2", children: (0, jsx_runtime_1.jsx)(SettingsContent, {}) })] }) }) }));
 }

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

@@ -15,10 +15,10 @@ const react_4 = require("thirdweb/react");
 const ManageAccountButton_1 = require("../custom/ManageAccountButton");
 function SignIn(props) {
     const { className } = props;
-    const { automaticallySetFirstEoa } = (0, react_1.useB3)();
+    const { automaticallySetFirstEoa, partnerId } = (0, react_1.useB3)();
     const { wallet, address: globalAddress, ensName, connectedSmartWallet, connectedEOAWallet, isActiveSmartWallet, isActiveEOAWallet, smartWalletIcon, eoaWalletIcon, } = (0, react_1.useAccountWallet)();
     const isMobile = (0, react_1.useIsMobile)();
-    const { logout } = (0, react_1.useAuthentication)(String(process.env.NEXT_PUBLIC_THIRDWEB_PARTNER_ID));
+    const { logout } = (0, react_1.useAuthentication)(partnerId);
     const onDisconnect = async () => {
         await logout();
     };

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

@@ -9,7 +9,7 @@ const Loading_1 = require("../ui/Loading");
 function SignInWithB3(props) {
     const { setB3ModalOpen, setB3ModalContentType, setEcoSystemAccountAddress } = (0, react_1.useModalStore)();
     const { account } = (0, react_1.useB3)();
-    const { isAuthenticating, isAuthenticated } = (0, react_1.useAuthentication)(props.partnerId, props.loginWithSiwe);
+    const { isAuthenticating, isAuthenticated } = (0, react_1.useAuthStore)();
     const isMobile = (0, react_1.useIsMobile)();
     (0, react_2.useEffect)(() => {
         if (account) {

package/dist/cjs/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/cjs/global-account/react/components/SignInWithB3/SignInWithB3Flow.js

@@ -15,16 +15,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
  */
-function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, loginWithSiwe = false, source = "signInWithB3Button", signersEnabled = false, }) {
-    const { setUser, automaticallySetFirstEoa } = (0, react_1.useB3)();
+function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onError, chain, sessionKeyAddress, partnerId, closeAfterLogin = false, source = "signInWithB3Button", signersEnabled = false, }) {
+    const { automaticallySetFirstEoa } = (0, react_1.useB3)();
     const [step, setStep] = (0, react_2.useState)(source === "requestPermissions" ? null : "login");
     const [sessionKeyAdded, setSessionKeyAdded] = (0, react_2.useState)(source === "requestPermissions" ? true : false);
     const { setB3ModalContentType, setB3ModalOpen, isOpen } = (0, react_1.useModalStore)();
     const account = (0, react_3.useActiveAccount)();
-    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const isAuthenticating = (0, react_1.useAuthStore)(state => state.isAuthenticating);
     const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
-    const setIsConnected = (0, react_1.useAuthStore)(state => state.setIsConnected);
     const [refetchCount, setRefetchCount] = (0, react_2.useState)(0);
     const [refetchError, setRefetchError] = (0, react_2.useState)(null);
     const { data: signers, refetch: refetchSigners, isFetching: isFetchingSigners, } = (0, react_1.useGetAllTWSigners)({
@@ -34,7 +32,6 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
             enabled: signersEnabled,
         },
     });
-    const { authenticate } = (0, react_1.useSiwe)();
     const [refetchQueued, setRefetchQueued] = (0, react_2.useState)(false);
     // Enhanced refetchSigners function that tracks number of attempts
     const handleRefetchSigners = (0, react_2.useCallback)(() => {
@@ -145,13 +142,11 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
             sessionKeyAddress,
             partnerId,
             closeAfterLogin,
-            loginWithSiwe,
             source: "requestPermissions",
         });
     }, [
         chain,
         closeAfterLogin,
-        loginWithSiwe,
         onError,
         onLoginSuccess,
         onSessionKeySuccess,
@@ -161,19 +156,8 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         strategies,
     ]);
     const handleLoginSuccess = (0, react_2.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]);
     (0, react_2.useEffect)(() => {
         if (step === "permissions") {
             setB3ModalContentType({
@@ -195,14 +179,14 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     if (step === "login") {
         // Custom strategy
         if (strategies?.[0] === "privy") {
-            return (0, jsx_runtime_1.jsx)(SignInWithB3Privy_1.SignInWithB3Privy, { onSuccess: handleLoginSuccess, partnerId: partnerId, chain: chain });
+            return (0, jsx_runtime_1.jsx)(SignInWithB3Privy_1.SignInWithB3Privy, { onSuccess: handleLoginSuccess, chain: chain });
         }
         // Strategies are explicitly provided
         if (strategies) {
-            return ((0, jsx_runtime_1.jsx)(LoginStepCustom_1.LoginStepCustom, { strategies: strategies, partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
+            return ((0, jsx_runtime_1.jsx)(LoginStepCustom_1.LoginStepCustom, { strategies: strategies, chain: chain, onSuccess: handleLoginSuccess, onError: onError, automaticallySetFirstEoa: !!automaticallySetFirstEoa }));
         }
         // Default to handle all strategies we support
-        return (0, jsx_runtime_1.jsx)(LoginStep_1.LoginStep, { partnerId: partnerId, chain: chain, onSuccess: handleLoginSuccess, onError: onError });
+        return (0, jsx_runtime_1.jsx)(LoginStep_1.LoginStep, { chain: chain, onSuccess: handleLoginSuccess, onError: onError });
     }
     return null;
 }

package/dist/cjs/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/cjs/global-account/react/components/SignInWithB3/SignInWithB3Privy.js

@@ -6,8 +6,9 @@ const react_1 = require("../../../../global-account/react");
 const debug_1 = require("../../../../shared/utils/debug");
 const react_2 = require("react");
 const debug = (0, debug_1.debugB3React)("SignInWithB3Privy");
-function SignInWithB3Privy({ onSuccess, onError, partnerId, chain }) {
-    const { isLoading, connectTw, fullToken } = (0, react_1.useHandleConnectWithPrivy)(partnerId, chain, onSuccess);
+function SignInWithB3Privy({ onSuccess, onError, chain }) {
+    const { partnerId } = (0, react_1.useB3)();
+    const { isLoading, connectTw, fullToken } = (0, react_1.useHandleConnectWithPrivy)(chain, onSuccess);
     const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
     const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
     const { logout } = (0, react_1.useAuthentication)(partnerId);

package/dist/cjs/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/cjs/global-account/react/components/SignInWithB3/steps/LoginStep.js

@@ -5,7 +5,6 @@ exports.LoginStep = LoginStep;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../../global-account/react");
 const constants_1 = require("../../../../../shared/constants");
-const debug_1 = require("../../../../../shared/utils/debug");
 const thirdweb_1 = require("../../../../../shared/utils/thirdweb");
 const react_2 = require("thirdweb/react");
 const wallets_1 = require("thirdweb/wallets");
@@ -19,14 +18,12 @@ function LoginStepContainer({ children, partnerId }) {
     const partnerLogo = partner?.data?.[0]?.loginCustomization?.logoUrl;
     return ((0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-center justify-center pt-6", children: [partnerLogo && ((0, jsx_runtime_1.jsx)("img", { src: partnerLogo, alt: "Partner Logo", className: "partner-logo mb-6 h-12 w-auto object-contain" })), children, (0, jsx_runtime_1.jsxs)("h2", { className: "mt-6 flex items-center gap-2 text-lg font-bold", children: ["Powered by", (0, jsx_runtime_1.jsx)("img", { alt: "B3 Logo", className: "h-5", src: "https://cdn.b3.fun/b3_logo.svg" }), "Connect"] })] }));
 }
-function LoginStep({ onSuccess, onError, partnerId, chain }) {
+function LoginStep({ onSuccess, chain }) {
+    const { partnerId, theme } = (0, react_1.useB3)();
     const wallet = (0, wallets_1.ecosystemWallet)(constants_1.ecosystemWalletId, {
         partnerId: partnerId,
     });
-    const { theme } = (0, react_1.useB3)();
-    const setIsAuthenticating = (0, react_1.useAuthStore)(state => state.setIsAuthenticating);
-    const setIsAuthenticated = (0, react_1.useAuthStore)(state => state.setIsAuthenticated);
-    const { logout } = (0, react_1.useAuthentication)(partnerId);
+    const { onConnect } = (0, react_1.useAuthentication)(partnerId);
     return ((0, jsx_runtime_1.jsx)(LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)(react_2.ConnectEmbed, { showThirdwebBranding: false, client: thirdweb_1.client, chain: chain, wallets: [wallet], theme: theme === "light"
                 ? (0, react_2.lightTheme)({
                     colors: {
@@ -37,50 +34,18 @@ 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);
-                    (0, debug_1.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 {
-                    (0, debug_1.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/cjs/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/cjs/global-account/react/components/SignInWithB3/steps/LoginStepCustom.js

@@ -9,7 +9,8 @@ const react_2 = require("react");
 const react_3 = require("thirdweb/react");
 const wallets_1 = require("thirdweb/wallets");
 const debug = (0, debug_1.debugB3React)("LoginStepCustom");
-function LoginStepCustom({ onSuccess, onError, partnerId, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+function LoginStepCustom({ onSuccess, onError, chain, strategies, maxInitialWallets = 2, automaticallySetFirstEoa, }) {
+    const { partnerId } = (0, react_1.useB3)();
     const [isLoading, setIsLoading] = (0, react_2.useState)(false);
     const [showAllWallets, setShowAllWallets] = (0, react_2.useState)(false);
     const { connect } = (0, react_1.useConnect)(partnerId, chain);

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

@@ -5,8 +5,9 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
 const utils_1 = require("../../../../shared/utils");
 function ManageAccountButton(props) {
+    const { partnerId } = (0, react_1.useB3)();
     const { setB3ModalOpen, setB3ModalContentType } = (0, react_1.useModalStore)();
-    const { isConnected } = (0, react_1.useAuthentication)(props.partnerId, props.loginWithSiwe);
+    const { isConnected } = (0, react_1.useAuthentication)(partnerId);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,