@b3dotfun/sdk 0.0.88-alpha.10 → 0.0.88-alpha.3

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

@@ -1,21 +1,36 @@
 import { CreateOnrampOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOrder";
-import { RelayKitProviderWrapper, TooltipProvider } from "@b3dotfun/sdk/global-account/react";
+import {
+  RelayKitProviderWrapper,
+  TooltipProvider,
+  useAuthentication,
+  useAuthStore,
+} from "@b3dotfun/sdk/global-account/react";
+import { useAutoSelectWallet } from "@b3dotfun/sdk/global-account/react/hooks/useAutoSelectWallet";
 import { createWagmiConfig } from "@b3dotfun/sdk/global-account/react/utils/createWagmiConfig";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { loadGA4Script } from "@b3dotfun/sdk/global-account/utils/analytics";
 import "@relayprotocol/relay-kit-ui/styles.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useEffect, useMemo } from "react";
-import { ThirdwebProvider } from "thirdweb/react";
+import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 import { CreateConnectorFn, WagmiProvider } from "wagmi";
 import { ClientType, setClientType } from "../../../client-manager";
-import { useB3ConfigStore } from "../../stores/configStore";
 import { StyleRoot } from "../StyleRoot";
 import { setToastContext, ToastProvider, useToastContext } from "../Toast/index";
-import AuthenticationProvider from "./AuthenticationProvider";
 import { LocalSDKProvider } from "./LocalSDKProvider";
+import { B3Context, B3ContextType } from "./types";
+
+/**
+ * Default permissions configuration for B3 provider
+ */
+const DEFAULT_PERMISSIONS = {
+  approvedTargets: ["0xa8e42121e318e3D3BeD7f5969AF6D360045317DD"], // Example contract
+  nativeTokenLimitPerTransaction: 0.1, // in ETH
+  startDate: new Date(),
+  endDate: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365), // 1 year from now
+};
 
 // Create queryClient instance
 const queryClient = new QueryClient();
@@ -41,12 +56,11 @@ export function B3Provider({
   overrideDefaultConnectors = false,
   createClientReferenceId,
   enableTurnkey = false,
-  defaultPermissions,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
   accountOverride?: Account;
-  environment?: "development" | "production";
+  environment: B3ContextType["environment"];
   automaticallySetFirstEoa?: boolean;
   simDuneApiKey?: string;
   toaster?: {
@@ -63,38 +77,7 @@ export function B3Provider({
   overrideDefaultConnectors?: boolean;
   createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
   enableTurnkey?: boolean;
-  defaultPermissions?: PermissionsConfig;
 }) {
-  const setConfig = useB3ConfigStore(state => state.setConfig);
-
-  // Initialize config store on mount
-  useEffect(() => {
-    setConfig({
-      accountOverride,
-      environment: environment ?? "development",
-      automaticallySetFirstEoa: !!automaticallySetFirstEoa,
-      theme,
-      clientType,
-      partnerId,
-      stripePublishableKey,
-      createClientReferenceId,
-      enableTurnkey,
-      defaultPermissions,
-    });
-  }, [
-    accountOverride,
-    environment,
-    automaticallySetFirstEoa,
-    theme,
-    clientType,
-    partnerId,
-    stripePublishableKey,
-    createClientReferenceId,
-    enableTurnkey,
-    defaultPermissions,
-    setConfig,
-  ]); // eslint-disable-line react-hooks/exhaustive-deps
-
   // Initialize Google Analytics on mount
   useEffect(() => {
     loadGA4Script();
@@ -117,13 +100,24 @@ export function B3Provider({
           <TooltipProvider>
             <ToastProvider>
               <LocalSDKProvider onConnectCallback={onConnect}>
-                <ToastContextConnector />
-                <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
-                  {children}
-                  {/* For the modal https://github.com/b3-fun/b3/blob/main/packages/sdk/src/global-account/react/components/ui/dialog.tsx#L46 */}
-                  <StyleRoot id="b3-root" />
-                </RelayKitProviderWrapper>
-                <AuthenticationProvider partnerId={partnerId} automaticallySetFirstEoa={!!automaticallySetFirstEoa} />
+                <InnerProvider
+                  accountOverride={accountOverride}
+                  environment={environment}
+                  theme={theme}
+                  automaticallySetFirstEoa={!!automaticallySetFirstEoa}
+                  clientType={clientType}
+                  partnerId={partnerId}
+                  stripePublishableKey={stripePublishableKey}
+                  createClientReferenceId={createClientReferenceId}
+                  enableTurnkey={enableTurnkey}
+                >
+                  <ToastContextConnector />
+                  <RelayKitProviderWrapper simDuneApiKey={simDuneApiKey}>
+                    {children}
+                    {/* For the modal https://github.com/b3-fun/b3/blob/main/packages/sdk/src/global-account/react/components/ui/dialog.tsx#L46 */}
+                    <StyleRoot id="b3-root" />
+                  </RelayKitProviderWrapper>
+                </InnerProvider>
               </LocalSDKProvider>
             </ToastProvider>
           </TooltipProvider>
@@ -133,6 +127,85 @@ export function B3Provider({
   );
 }
 
+/**
+ * Inner provider component that provides the actual B3Context
+ */
+export function InnerProvider({
+  children,
+  accountOverride,
+  environment,
+  defaultPermissions = DEFAULT_PERMISSIONS,
+  automaticallySetFirstEoa,
+  theme = "light",
+  clientType = "socket",
+  partnerId,
+  stripePublishableKey,
+  createClientReferenceId,
+  enableTurnkey,
+}: {
+  children: React.ReactNode;
+  accountOverride?: Account;
+  environment: B3ContextType["environment"];
+  defaultPermissions?: PermissionsConfig;
+  automaticallySetFirstEoa: boolean;
+  theme: "light" | "dark";
+  clientType?: ClientType;
+  partnerId: string;
+  stripePublishableKey?: string;
+  createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
+  enableTurnkey?: boolean;
+}) {
+  const activeAccount = useActiveAccount();
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  //const isConnected = useAuthStore(state => state.isConnected);
+  //const justCompletedLogin = useAuthStore(state => state.justCompletedLogin);
+
+  // Note: This fixes a bug where useAuthentication is no longer rendered on every page, as of this PR https://github.com/b3-fun/b3/pull/385/files#diff-3ef996931b8fc8e49021ba1b42ddaa97535214681610dc5fdacf63542e261af7
+  // The above PR removes useAuthentication from the overall B3Provider. useAuthentication should be everywhere the provider is, since it sets the overall auth state
+  // By just calling it manually, we fix that issue
+  // As a follow up, we should fix the SDK directly
+  useAuthentication(partnerId);
+
+  // Use given accountOverride or activeAccount from thirdweb
+  // WOJ: why if isAuthenticated is false, we don't use activeAccount, which should be undefined?
+  // skip isAuthenticated check ?
+  const effectiveAccount = isAuthenticated ? accountOverride || activeAccount : undefined;
+
+  // Wrapper to set active wallet via thirdweb
+  // Note: `wallet` in context is deprecated - use useActiveWallet() from thirdweb/react instead
+
+  // Auto-select first EOA wallet when enabled
+  useAutoSelectWallet({
+    enabled: automaticallySetFirstEoa,
+  });
+
+  return (
+    <B3Context.Provider
+      value={{
+        account: effectiveAccount,
+        // setWallet,
+        //wallet: undefined, // Deprecated: use useActiveWallet() from thirdweb/react instead
+        //user,
+        //setUser,
+        //refetchUser,
+        initialized: true,
+        ready: !!effectiveAccount,
+        automaticallySetFirstEoa,
+        environment,
+        defaultPermissions,
+        theme,
+        clientType,
+        partnerId: partnerId,
+        stripePublishableKey,
+        createClientReferenceId,
+        enableTurnkey,
+      }}
+    >
+      {children}
+    </B3Context.Provider>
+  );
+}
+
 /**
  * Component to connect the toast context to the global toast API
  */

package/src/global-account/react/components/B3Provider/types.ts

@@ -0,0 +1,50 @@
+import { CreateOnrampOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOnrampOrder";
+import { CreateOrderParams } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendCreateOrder";
+import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
+import { createContext } from "react";
+import { Account, Wallet } from "thirdweb/wallets";
+import { ClientType } from "../../../client-manager";
+
+/**
+ * Context type for B3Provider
+ */
+export interface B3ContextType {
+  account?: Account;
+  automaticallySetFirstEoa: boolean;
+  //user?: Users;
+  //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;
+  stripePublishableKey?: string;
+  createClientReferenceId?: (params: CreateOrderParams | CreateOnrampOrderParams) => Promise<string>;
+  enableTurnkey?: boolean;
+}
+
+/**
+ * Context for B3 provider
+ */
+export const B3Context = createContext<B3ContextType>({
+  account: undefined,
+  automaticallySetFirstEoa: false,
+  //user: undefined,
+  //setWallet: () => {},
+  wallet: undefined,
+  //setUser: () => {},
+  //refetchUser: async () => {},
+  initialized: false,
+  ready: false,
+  environment: "development",
+  theme: "light",
+  clientType: "rest",
+  partnerId: "",
+  createClientReferenceId: undefined,
+  enableTurnkey: false,
+});

package/src/global-account/react/components/B3Provider/useB3.ts

@@ -1,9 +1,18 @@
-import { useB3Config } from "./useB3Config";
+import { useContext, useMemo } from "react";
+import { B3Context } from "./types";
 
 /**
- * Hook to access the B3 configuration
- * @deprecated This is just an alias for useB3Config. Use useB3Config directly instead.
+ * Hook to access the B3 context
+ * @throws Error if used outside a B3Provider
+ * @deprecated Use useB3Config or useB3Account instead
  */
 export function useB3() {
-  return useB3Config();
+  const context = useContext(B3Context);
+
+  if (!context.initialized) {
+    throw new Error("useB3 must be used within a B3Provider");
+  }
+
+  // Return a stable reference
+  return useMemo(() => context, [context]);
 }

package/src/global-account/react/components/B3Provider/useB3Account.ts

@@ -1,11 +1,7 @@
 import { useActiveAccount } from "thirdweb/react";
-import { useAuthStore } from "../../stores/useAuthStore";
 
 // Wrapper around useActiveAccount
 export const useB3Account = () => {
-  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
-  const activeAccount = useActiveAccount();
-  const effectiveAccount = isAuthenticated ? activeAccount : undefined;
-
-  return effectiveAccount;
+  const account = useActiveAccount();
+  return account;
 };

package/src/global-account/react/components/B3Provider/useB3Config.ts

@@ -1,21 +1,34 @@
-import { useB3ConfigStore } from "../../stores/configStore";
+import { useContext, useMemo } from "react";
+import { B3Context } from "./types";
 
-/**
- * Hook to access B3 configuration
- * Returns all config values from the Zustand store
- * Since config is static (set once at initialization), destructuring is fine here
- */
 export const useB3Config = () => {
-  return useB3ConfigStore(state => ({
-    automaticallySetFirstEoa: state.automaticallySetFirstEoa,
-    environment: state.environment,
-    theme: state.theme,
-    clientType: state.clientType,
-    partnerId: state.partnerId,
-    createClientReferenceId: state.createClientReferenceId,
-    enableTurnkey: state.enableTurnkey,
-    stripePublishableKey: state.stripePublishableKey,
-    defaultPermissions: state.defaultPermissions,
-    accountOverride: state.accountOverride,
-  }));
+  const context = useContext(B3Context);
+
+  if (!context) {
+    throw new Error("useB3 must be used within a B3Provider");
+  }
+
+  const {
+    automaticallySetFirstEoa,
+    environment,
+    theme,
+    clientType,
+    partnerId,
+    createClientReferenceId,
+    enableTurnkey,
+  } = context;
+
+  // Return a stable reference
+  return useMemo(
+    () => ({
+      automaticallySetFirstEoa,
+      environment,
+      theme,
+      clientType,
+      partnerId,
+      createClientReferenceId,
+      enableTurnkey,
+    }),
+    [automaticallySetFirstEoa, environment, theme, clientType, partnerId, createClientReferenceId, enableTurnkey],
+  );
 };

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

@@ -1,9 +1,10 @@
 import {
   useAccountWallet,
+  useAuthentication,
+  useB3Config,
   useModalStore,
   useProfile,
   useSimBalance,
-  useUser,
 } from "@b3dotfun/sdk/global-account/react";
 import { formatUsername } from "@b3dotfun/sdk/shared/utils";
 import { formatDisplayNumber } from "@b3dotfun/sdk/shared/utils/number";
@@ -21,7 +22,8 @@ const ProfileSection = () => {
     address: eoaAddress || account?.address,
     fresh: true,
   });
-  const { user } = useUser();
+  const { partnerId } = useB3Config();
+  const { user } = useAuthentication(partnerId);
   const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const setB3ModalContentType = useModalStore(state => state.setB3ModalContentType);
   const navigateBack = useModalStore(state => state.navigateBack);

package/src/global-account/react/components/ManageAccount/channels/DiscordChannel.tsx

@@ -1,7 +1,7 @@
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
+import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -26,7 +26,7 @@ export const DiscordChannel = ({
   onConnectionChange,
   onToggle,
 }: DiscordChannelProps) => {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   const [discordId, setDiscordId] = useState("");
   const [isConnecting, setIsConnecting] = useState(false);

package/src/global-account/react/components/ManageAccount/channels/EmailChannel.tsx

@@ -1,7 +1,7 @@
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
+import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -31,7 +31,7 @@ export const EmailChannel = ({
   onConnectionChange,
   onToggle,
 }: EmailChannelProps) => {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   const [email, setEmail] = useState("");
   const [emailError, setEmailError] = useState<string | null>(null);

package/src/global-account/react/components/ManageAccount/channels/PhoneChannel.tsx

@@ -1,7 +1,7 @@
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
+import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -32,7 +32,7 @@ export const PhoneChannel = ({
   onConnectionChange,
   onToggle,
 }: PhoneChannelProps) => {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   const [phoneNumber, setPhoneNumber] = useState("");
   const [isConnectingSMS, setIsConnectingSMS] = useState(false);

package/src/global-account/react/components/ManageAccount/channels/TelegramChannel.tsx

@@ -1,7 +1,7 @@
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useState } from "react";
 import { notificationsAPI } from "../../../utils/notificationsAPI";
+import { useB3 } from "../../B3Provider/useB3";
 import { toast } from "../../Toast/toastApi";
 import { NotificationChannel } from "../NotificationChannel";
 
@@ -26,7 +26,7 @@ export const TelegramChannel = ({
   onConnectionChange,
   onToggle,
 }: TelegramChannelProps) => {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   const [isConnecting, setIsConnecting] = useState(false);
   const [status, setStatus] = useState<"idle" | "pending" | "connected">("idle");

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

@@ -1,11 +1,11 @@
 import {
   Button,
-  PermissionItem,
-  RequestPermissionsModalProps,
+  useB3,
   useAddTWSessionKey,
-  useB3Config,
   useGetAllTWSigners,
+  RequestPermissionsModalProps,
 } from "@b3dotfun/sdk/global-account/react";
+import { PermissionItem } from "@b3dotfun/sdk/global-account/react";
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { formatAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
@@ -30,7 +30,7 @@ export function RequestPermissions({
 }: RequestPermissionsModalProps) {
   const [isApproving, setIsApproving] = useState(false);
   const account = useActiveAccount();
-  const { defaultPermissions } = useB3Config();
+  const { defaultPermissions } = useB3();
   const DEFAULT_PERMISSIONS = useMemo(
     () => permissions ?? (defaultPermissions as PermissionsConfig),
     [defaultPermissions, permissions],

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

@@ -5,7 +5,7 @@ import {
   StyleRoot,
   useAccountWallet,
   useAuthentication,
-  useB3Config,
+  useB3,
   useIsMobile,
 } from "@b3dotfun/sdk/global-account/react";
 import Icon from "@b3dotfun/sdk/global-account/react/components/custom/Icon";
@@ -30,7 +30,7 @@ type SignInWithB3Props = Omit<SignInWithB3ModalProps, "type" | "showBackButton">
 
 export function SignIn(props: SignInWithB3Props) {
   const { className } = props;
-  const { automaticallySetFirstEoa, partnerId } = useB3Config();
+  const { automaticallySetFirstEoa, partnerId } = useB3();
   const {
     address: globalAddress,
     ensName,

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

@@ -8,7 +8,7 @@ import {
   useModalStore,
 } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import { Account } from "thirdweb/wallets";
 import { TurnkeyAuthModal } from "../TurnkeyAuthModal";
@@ -51,6 +51,7 @@ export function SignInWithB3Flow({
   const [refetchCount, setRefetchCount] = useState(0);
   const [refetchError, setRefetchError] = useState<string | null>(null);
   const [turnkeyAuthCompleted, setTurnkeyAuthCompleted] = useState(false);
+  const justCompletedLoginRef = useRef(false);
   const {
     data: signers,
     refetch: refetchSigners,
@@ -184,8 +185,11 @@ export function SignInWithB3Flow({
       });
       // The useEffect will re-run with updated user data to complete the sign-in process
     },
+    // Zustand setters are stable and don't need to be in dependencies:
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       refetchUser,
+      setB3ModalContentType,
       strategies,
       onLoginSuccess,
       onSessionKeySuccess,
@@ -196,10 +200,8 @@ export function SignInWithB3Flow({
       closeAfterLogin,
       source,
       signersEnabled,
-      setB3ModalContentType,
-      setIsAuthenticated,
-      setIsConnected,
-      setJustCompletedLogin,
+      // Zustand setters are stable and don't need to be in dependencies:
+      // setIsAuthenticated, setIsConnected, setJustCompletedLogin
     ],
   );
 
@@ -218,7 +220,9 @@ export function SignInWithB3Flow({
       if (isConnected && isAuthenticated && user) {
         // Mark that login just completed BEFORE opening manage account or closing modal
         // This allows Turnkey modal to show (if enableTurnkey is true)
-        if (closeAfterLogin) {
+        // Use ref to prevent setting this multiple times and causing infinite loops
+        if (closeAfterLogin && !justCompletedLoginRef.current) {
+          justCompletedLoginRef.current = true;
           setJustCompletedLogin(true);
         }
 
@@ -267,6 +271,7 @@ export function SignInWithB3Flow({
         handlePostTurnkeyFlow();
       }
     },
+    // handlePostTurnkeyFlow changes when its dependencies change, causing infinite loops
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       signers,
@@ -287,9 +292,9 @@ export function SignInWithB3Flow({
       user,
       enableTurnkey,
       turnkeyAuthCompleted,
-      // handleTurnkeySuccess, // This is causing infinite loops
+      handleTurnkeySuccess,
       contentType,
-      handlePostTurnkeyFlow,
+      // handlePostTurnkeyFlow - removed because it changes when signers/partnerId/etc change, triggering infinite loops
     ],
   );
 
@@ -307,9 +312,7 @@ export function SignInWithB3Flow({
     if (closeAfterLogin && sessionKeyAdded) {
       setB3ModalOpen(false);
     }
-    // setB3ModalOpen is stable
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [closeAfterLogin, sessionKeyAdded]);
+  }, [closeAfterLogin, sessionKeyAdded, setB3ModalOpen]);
 
   const onSessionKeySuccessEnhanced = useCallback(() => {
     onSessionKeySuccess?.();

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

@@ -2,7 +2,7 @@ import {
   Loading,
   useAuthentication,
   useAuthStore,
-  useB3Config,
+  useB3,
   useHandleConnectWithPrivy,
 } from "@b3dotfun/sdk/global-account/react";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
@@ -19,7 +19,7 @@ interface SignInWithB3PrivyProps {
 }
 
 export function SignInWithB3Privy({ onSuccess, onError, chain }: SignInWithB3PrivyProps) {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
   const { isLoading, connectTw, fullToken } = useHandleConnectWithPrivy(chain, onSuccess);
   const setIsAuthenticating = useAuthStore(state => state.setIsAuthenticating);
   const setIsAuthenticated = useAuthStore(state => state.setIsAuthenticated);

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

@@ -1,4 +1,4 @@
-import { useAuthentication, useB3Config, useQueryB3 } from "@b3dotfun/sdk/global-account/react";
+import { useAuthentication, useB3, useQueryB3 } from "@b3dotfun/sdk/global-account/react";
 import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { Chain } from "thirdweb";
@@ -50,7 +50,7 @@ export function LoginStepContainer({ children, partnerId }: LoginStepContainerPr
 }
 
 export function LoginStep({ onSuccess, chain }: LoginStepProps) {
-  const { partnerId, theme } = useB3Config();
+  const { partnerId, theme } = useB3();
   const wallet = ecosystemWallet(ecosystemWalletId, {
     partnerId: partnerId,
   });

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

@@ -7,7 +7,7 @@ import {
   LoginStepContainer,
   useAuthentication,
   useAuthStore,
-  useB3Config,
+  useB3,
   useConnect,
   WalletRow,
 } from "@b3dotfun/sdk/global-account/react";
@@ -37,7 +37,7 @@ export function LoginStepCustom({
   maxInitialWallets = 2,
   automaticallySetFirstEoa,
 }: LoginStepCustomProps) {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
   const [isLoading, setIsLoading] = useState(false);
   const [showAllWallets, setShowAllWallets] = useState(false);
   const { connect } = useConnect(partnerId, chain);

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

@@ -1,11 +1,11 @@
 import { PropsWithChildren } from "react";
-import { useB3Config } from "./B3Provider/useB3Config";
+import { useB3 } from "./B3Provider/useB3";
 
 export function StyleRoot({ children, id }: PropsWithChildren<{ id?: string }>) {
-  const { theme } = useB3Config();
+  const { theme: b3Theme } = useB3();
 
   return (
-    <div className="b3-root" id={id} data-theme={theme}>
+    <div className="b3-root" id={id} data-theme={b3Theme}>
       {children}
     </div>
   );

package/src/global-account/react/components/custom/ManageAccountButton.tsx

@@ -1,10 +1,11 @@
-import { Button, StyleRoot, useModalStore, useUser } from "@b3dotfun/sdk/global-account/react";
+import { Button, StyleRoot, useAuthentication, useB3, useModalStore } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils";
 import { SignInWithB3Props } from "../SignInWithB3/SignInWithB3";
 
 export function ManageAccountButton(props: SignInWithB3Props & { className?: string }) {
+  const { partnerId } = useB3();
   const { setB3ModalOpen, setB3ModalContentType } = useModalStore();
-  const { isConnected } = useUser();
+  const { isConnected } = useAuthentication(partnerId);
 
   const handleClickManageAccount = () => {
     setB3ModalContentType({