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

package/src/anyspend/react/components/AnySpendDeposit.tsx

@@ -106,12 +106,6 @@ export interface AnySpendDepositProps {
   topChainsCount?: number;
   /** Callback when close button is clicked */
   onClose?: () => void;
-  /** Custom URL to redirect to when clicking "Return to Home" on complete order screen */
-  returnToHomeUrl?: string;
-  /** Custom label for recipient display (e.g., "OBSN Telegram Bot") */
-  customRecipientLabel?: string;
-  /** Custom label for the return home button (overrides "Return to Home" / "Close") */
-  returnHomeLabel?: string;
 }
 
 // Default supported chains
@@ -230,9 +224,6 @@ export function AnySpendDeposit({
   minPoolSize = DEFAULT_MIN_POOL_SIZE,
   topChainsCount = 3,
   onClose,
-  returnToHomeUrl,
-  customRecipientLabel,
-  returnHomeLabel,
 }: AnySpendDepositProps) {
   const { connectedEOAWallet } = useAccountWallet();
   const eoaAddress = connectedEOAWallet?.getAccount()?.address;
@@ -365,7 +356,7 @@ export function AnySpendDeposit({
         )}
         {/* Balance header */}
         {!isBalanceLoading && totalBalance > 0 && (
-          <div className="anyspend-deposit-balance border-theme-border-secondary border-b p-5">
+          <div className="anyspend-deposit-balance border-secondary border-b p-5">
             <p className="anyspend-deposit-balance-label text-as-secondary text-sm">Your Balance</p>
             <p className="anyspend-deposit-balance-value text-as-primary text-3xl font-semibold">
               {formatDecimal(totalBalance)} <span className="text-sm">USD</span>
@@ -534,7 +525,6 @@ export function AnySpendDeposit({
       <div className={cn("anyspend-deposit-form-content", shouldShowChainSelection && "pt-8")}>
         {isHyperliquidDeposit ? (
           <AnySpend
-            key={selectedChainId}
             loadOrder={loadOrder}
             mode={mode}
             defaultActiveTab={paymentType}
@@ -548,13 +538,9 @@ export function AnySpendDeposit({
             hideHeader
             hideBottomNavigation
             disableUrlParamManagement
-            returnToHomeUrl={returnToHomeUrl}
-            customRecipientLabel={customRecipientLabel}
-            returnHomeLabel={returnHomeLabel}
           />
         ) : (
           <AnySpendCustomExactIn
-            key={selectedChainId}
             loadOrder={loadOrder}
             mode={mode}
             recipientAddress={recipientAddress}
@@ -573,9 +559,6 @@ export function AnySpendDeposit({
             customUsdInputValues={customUsdInputValues}
             preferEoa={preferEoa}
             customExactInConfig={depositContractConfig}
-            returnToHomeUrl={returnToHomeUrl}
-            customRecipientLabel={customRecipientLabel}
-            returnHomeLabel={returnHomeLabel}
           />
         )}
       </div>

package/src/anyspend/react/components/AnyspendDepositHype.tsx

@@ -25,10 +25,6 @@ export interface AnySpendDepositHypeProps {
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
   customUsdInputValues?: string[];
   preferEoa?: boolean;
-  /** Custom URL to redirect to when clicking "Return to Home" on complete order screen */
-  returnToHomeUrl?: string;
-  /** Custom label for recipient display (e.g., "OBSN Telegram Bot") */
-  customRecipientLabel?: string;
 }
 
 export function AnySpendDepositHype({

package/src/anyspend/react/components/common/CryptoPaymentMethod.tsx

@@ -6,7 +6,6 @@ import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { ChevronLeft, ChevronRightCircle, Wallet, X, ZapIcon } from "lucide-react";
 import { useConnectModal, useDisconnect, useWalletInfo } from "thirdweb/react";
-import { createWallet } from "thirdweb/wallets";
 import { useConnectedWalletDisplay } from "../../hooks/useConnectedWalletDisplay";
 
 export enum CryptoPaymentMethodType {
@@ -16,13 +15,6 @@ export enum CryptoPaymentMethodType {
   TRANSFER_CRYPTO = "transfer_crypto",
 }
 
-const recommendWallets = [
-  createWallet("io.metamask"),
-  createWallet("com.coinbase.wallet"),
-  createWallet("me.rainbow"),
-  createWallet("io.rabby"),
-];
-
 interface CryptoPaymentMethodProps {
   selectedPaymentMethod: CryptoPaymentMethodType;
   setSelectedPaymentMethod: (method: CryptoPaymentMethodType) => void;
@@ -55,13 +47,7 @@ export function CryptoPaymentMethod({
       if (connectedEOAWallet) {
         await disconnect(connectedEOAWallet);
       }
-      const wallet = await openConnectModal({
-        client,
-        setActive: false,
-        size: "compact",
-        showThirdwebBranding: false,
-        wallets: recommendWallets,
-      });
+      const wallet = await openConnectModal({ client, setActive: false });
       if (wallet) {
         // setActiveWallet(wallet);
         setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);

package/src/anyspend/react/components/common/CryptoReceiveSection.tsx

@@ -15,8 +15,6 @@ interface CryptoReceiveSectionProps {
   // Recipient data
   effectiveRecipientAddress?: string;
   recipientName?: string;
-  /** Custom label for recipient display (overrides recipientName) */
-  customRecipientLabel?: string;
   onSelectRecipient: () => void;
   // Token data
   dstAmount: string;
@@ -43,7 +41,6 @@ export function CryptoReceiveSection({
   isBuyMode = false,
   effectiveRecipientAddress,
   recipientName,
-  customRecipientLabel,
   onSelectRecipient,
   dstAmount,
   dstToken,
@@ -81,8 +78,7 @@ export function CryptoReceiveSection({
           >
             <>
               <span className="text-as-tertiarry flex items-center gap-1 text-sm">
-                {customRecipientLabel ||
-                  (recipientName ? formatUsername(recipientName) : shortenAddress(effectiveRecipientAddress || ""))}
+                {recipientName ? formatUsername(recipientName) : shortenAddress(effectiveRecipientAddress || "")}
               </span>
               <ChevronRight className="h-4 w-4" />
             </>

package/src/anyspend/react/components/common/OrderDetails.tsx

@@ -21,7 +21,7 @@ import {
   TextLoop,
   TextShimmer,
   useAccountWallet,
-  useB3Config,
+  useB3,
   useModalStore,
   useProfile,
   useUnifiedChainSwitchAndExecute,
@@ -65,10 +65,6 @@ interface OrderDetailsProps {
   onBack?: () => void;
   disableUrlParamManagement?: boolean; // When true, will not modify URL parameters
   points?: number | undefined; // Points earned from the transaction
-  /** Custom URL to redirect to when clicking "Return to Home" on complete order screen */
-  returnToHomeUrl?: string;
-  /** Custom label for the return home button (overrides "Return to Home" / "Close") */
-  returnHomeLabel?: string;
 }
 
 // Add this helper function near the top or just above the component
@@ -221,14 +217,12 @@ export const OrderDetails = memo(function OrderDetails({
   onBack,
   disableUrlParamManagement = false,
   points,
-  returnToHomeUrl,
-  returnHomeLabel,
 }: OrderDetailsProps) {
   const router = useRouter();
   const searchParams = useSearchParams();
 
   // Get theme from B3Provider context
-  const { theme } = useB3Config();
+  const { theme } = useB3();
   const colorMode = theme || "light";
 
   // Read crypto payment method from URL parameters
@@ -383,49 +377,6 @@ export const OrderDetails = memo(function OrderDetails({
     onBack?.();
   }, [cleanupUrlParams, onBack]);
 
-  // Handle "Return to Home" click - redirects to custom URL if provided
-  const handleReturnToHome = useCallback(() => {
-    if (returnToHomeUrl) {
-      // Validate URL to prevent Open Redirect / XSS attacks
-      try {
-        const url = new URL(returnToHomeUrl, window.location.origin);
-        // Only allow http/https protocols
-        if (url.protocol === "http:" || url.protocol === "https:") {
-          window.location.href = url.href;
-          return;
-        }
-      } catch {
-        // If URL parsing fails, check if it's a safe relative URL
-        if (returnToHomeUrl.startsWith("/") && !returnToHomeUrl.startsWith("//")) {
-          window.location.href = returnToHomeUrl;
-          return;
-        }
-      }
-      // Fallback to handleBack if URL is not safe
-      handleBack();
-    } else {
-      handleBack();
-    }
-  }, [returnToHomeUrl, handleBack]);
-
-  // Reusable "Return to Home" / "Close" button
-  const returnHomeOrCloseButton = (
-    <button
-      className="order-close-button order-details-close-btn bg-as-brand flex w-full items-center justify-center gap-2 rounded-lg p-2 font-semibold text-white"
-      onClick={returnToHomeUrl ? handleReturnToHome : mode === "page" ? handleBack : handleCloseModal}
-    >
-      {returnHomeLabel ? (
-        returnHomeLabel
-      ) : mode === "page" ? (
-        <>
-          Return to Home <Home className="ml-2 h-4 w-4" />
-        </>
-      ) : (
-        "Close"
-      )}
-    </button>
-  );
-
   useEffect(() => {
     if (txSuccess) {
       toast.success("Transaction successful! We are processing your order.", { duration: 10000 });
@@ -570,7 +521,18 @@ export const OrderDetails = memo(function OrderDetails({
             </span>
           </div>
         )}
-        {returnHomeOrCloseButton}
+        <button
+          className="order-close-button order-details-close-btn bg-as-brand flex w-full items-center justify-center gap-2 rounded-lg p-2 font-semibold text-white"
+          onClick={mode === "page" ? handleBack : handleCloseModal}
+        >
+          {mode === "page" ? (
+            <>
+              Return to Home <Home className="ml-2 h-4 w-4" />
+            </>
+          ) : (
+            "Close"
+          )}
+        </button>
       </>
     );
   }
@@ -687,7 +649,20 @@ export const OrderDetails = memo(function OrderDetails({
           </ShinyButton>
         )}
 
-        {order.status === "executed" && returnHomeOrCloseButton}
+        {order.status === "executed" && (
+          <button
+            className="order-close-button order-details-close-btn bg-as-brand flex w-full items-center justify-center gap-2 rounded-lg p-2 font-semibold text-white"
+            onClick={mode === "page" ? handleBack : handleCloseModal}
+          >
+            {mode === "page" ? (
+              <>
+                Return to Home <Home className="ml-2 h-4 w-4" />
+              </>
+            ) : (
+              "Close"
+            )}
+          </button>
+        )}
       </>
     );
   }
@@ -811,7 +786,20 @@ export const OrderDetails = memo(function OrderDetails({
           </ShinyButton>
         )}
 
-        {order.status === "executed" && returnHomeOrCloseButton}
+        {order.status === "executed" && (
+          <button
+            className="order-close-button order-details-close-btn bg-as-brand flex w-full items-center justify-center gap-2 rounded-lg p-2 font-semibold text-white"
+            onClick={mode === "page" ? handleBack : handleCloseModal}
+          >
+            {mode === "page" ? (
+              <>
+                Return to Home <Home className="ml-2 h-4 w-4" />
+              </>
+            ) : (
+              "Close"
+            )}
+          </button>
+        )}
       </>
     );
   }
@@ -917,12 +905,6 @@ export const OrderDetails = memo(function OrderDetails({
         )}
 
         {/* <DelayedSupportMessage /> */}
-        <button
-          className="text-b3-primary-blue hover:text-b3-primary-blue/50 order-details-cancel-btn flex w-full items-center justify-center gap-2 underline"
-          onClick={handleBack}
-        >
-          <RefreshCcw className="ml-2 h-4 w-4" /> Cancel and start over
-        </button>
       </>
     );
   }

package/src/anyspend/react/components/common/PanelOnramp.tsx

@@ -33,7 +33,6 @@ export function PanelOnramp({
   onShowPointsDetail,
   onShowFeeDetail,
   customUsdInputValues = ["5", "10", "20", "25"],
-  customRecipientLabel,
 }: {
   srcAmountOnRamp: string;
   setSrcAmountOnRamp: (amount: string) => void;
@@ -53,8 +52,6 @@ export function PanelOnramp({
   onShowPointsDetail?: () => void;
   onShowFeeDetail?: () => void;
   customUsdInputValues?: string[];
-  /** Custom label for recipient display (overrides recipientName) */
-  customRecipientLabel?: string;
 }) {
   // Helper function to get fees from anyspend quote
   const getFeeFromApi = (paymentMethod: FiatPaymentMethod): number | null => {
@@ -231,8 +228,7 @@ export function PanelOnramp({
               onClick={() => setActivePanel(recipientSelectionPanelIndex)} // Recipient selection panel
             >
               <span className="text-sm">
-                {customRecipientLabel ||
-                  (recipientName ? formatUsername(recipientName) : formatAddress(_recipientAddress))}
+                {recipientName ? formatUsername(recipientName) : formatAddress(_recipientAddress)}
               </span>
               <ChevronRight size={16} />
             </button>

package/src/anyspend/react/components/common/PaymentStripeWeb2.tsx

@@ -1,8 +1,9 @@
+import { getStripePromise } from "@b3dotfun/sdk/shared/utils/payment.utils";
 import { OrderDetailsCollapsible, useStripeClientSecret } from "@b3dotfun/sdk/anyspend/react";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { ShinyButton, useB3Config, useModalStore, useProfile } from "@b3dotfun/sdk/global-account/react";
+import { ShinyButton, useB3, useModalStore, useProfile } from "@b3dotfun/sdk/global-account/react";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
-import { formatStripeAmount, getStripePromise } from "@b3dotfun/sdk/shared/utils/payment.utils";
+import { formatStripeAmount } from "@b3dotfun/sdk/shared/utils/payment.utils";
 import { AddressElement, Elements, PaymentElement, useElements, useStripe } from "@stripe/react-stripe-js";
 import { PaymentIntentResult, StripePaymentElementOptions } from "@stripe/stripe-js";
 import { X } from "lucide-react";
@@ -18,7 +19,7 @@ interface PaymentStripeWeb2Props {
 }
 
 export default function PaymentStripeWeb2({ order, stripePaymentIntentId, onPaymentSuccess }: PaymentStripeWeb2Props) {
-  const { theme, stripePublishableKey } = useB3Config();
+  const { theme, stripePublishableKey } = useB3();
   const fingerprintConfig = getFingerprintConfig();
 
   const { clientSecret, isLoadingStripeClientSecret, stripeClientSecretError } =

package/src/anyspend/react/hooks/index.ts

@@ -7,7 +7,6 @@ export * from "./useAnyspendQuote";
 export * from "./useAnyspendTokens";
 export * from "./useCoinbaseOnrampOptions";
 export * from "./useConnectedUserProfile";
-export * from "./useGasPrice";
 export * from "./useGeoOnrampOptions";
 export * from "./useGetGeo";
 export * from "./useHyperliquidTransfer";

package/src/anyspend/react/hooks/useAnyspendCreateOnrampOrder.ts

@@ -3,7 +3,7 @@ import { anyspendService } from "@b3dotfun/sdk/anyspend/services/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
 import { buildMetadata, buildPayload, normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { useB3 } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -36,7 +36,7 @@ export type UseAnyspendCreateOnrampOrderProps = {
  */
 export function useAnyspendCreateOnrampOrder({ onSuccess, onError }: UseAnyspendCreateOnrampOrderProps = {}) {
   // Get B3 context values
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   // Get validated client reference ID from B3 context
   const createValidatedClientReferenceId = useValidatedClientReferenceId();

package/src/anyspend/react/hooks/useAnyspendCreateOrder.ts

@@ -2,7 +2,7 @@ import { anyspendService } from "@b3dotfun/sdk/anyspend/services/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
 import { buildMetadata, buildPayload, normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { useB3 } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -36,7 +36,7 @@ export type UseAnyspendCreateOrderProps = {
  */
 export function useAnyspendCreateOrder({ onSuccess, onError }: UseAnyspendCreateOrderProps = {}) {
   // Get B3 context values
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   // Get validated client reference ID from B3 context
   const createValidatedClientReferenceId = useValidatedClientReferenceId();

package/src/anyspend/react/hooks/useCreateDepositFirstOrder.ts

@@ -2,7 +2,7 @@ import { anyspendService } from "@b3dotfun/sdk/anyspend/services/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { VisitorData } from "@b3dotfun/sdk/anyspend/types/fingerprint";
 import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { useB3 } from "@b3dotfun/sdk/global-account/react";
 import { useVisitorData } from "@fingerprintjs/fingerprintjs-pro-react";
 import { useMutation } from "@tanstack/react-query";
 import { useMemo } from "react";
@@ -29,7 +29,7 @@ export type UseCreateDepositFirstOrderProps = {
  * This order type doesn't require srcAmount - the user deposits tokens after the order is created.
  */
 export function useCreateDepositFirstOrder({ onSuccess, onError }: UseCreateDepositFirstOrderProps = {}) {
-  const { partnerId } = useB3Config();
+  const { partnerId } = useB3();
 
   const { data: fpData } = useVisitorData({ extendedResult: true }, { immediate: true });
   const visitorData: VisitorData | undefined = fpData && {

package/src/anyspend/react/hooks/useValidatedClientReferenceId.ts

@@ -1,5 +1,5 @@
 import { Validators } from "@b3dotfun/sdk/anyspend/utils/validation";
-import { useB3Config } from "@b3dotfun/sdk/global-account/react";
+import { useB3 } from "@b3dotfun/sdk/global-account/react";
 import { useCallback } from "react";
 import { CreateOnrampOrderParams } from "./useAnyspendCreateOnrampOrder";
 import { CreateOrderParams } from "./useAnyspendCreateOrder";
@@ -9,7 +9,7 @@ import { CreateOrderParams } from "./useAnyspendCreateOrder";
  * Gets the createClientReferenceId function from B3 context and validates the result
  */
 export function useValidatedClientReferenceId() {
-  const { createClientReferenceId } = useB3Config();
+  const { createClientReferenceId } = useB3();
 
   const createValidatedClientReferenceId = useCallback(
     async (params: CreateOrderParams | CreateOnrampOrderParams) => {

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

@@ -14,13 +14,14 @@ import { AnySpendDepositHype } from "@b3dotfun/sdk/anyspend/react/components/Any
 import { AnySpendDepositUpside } from "@b3dotfun/sdk/anyspend/react/components/AnySpendDepositUpside";
 import { AnySpendStakeUpside } from "@b3dotfun/sdk/anyspend/react/components/AnySpendStakeUpside";
 import { AnySpendStakeUpsideExactIn } from "@b3dotfun/sdk/anyspend/react/components/AnySpendStakeUpsideExactIn";
-import { useB3Config, useGlobalAccount, useIsMobile, useModalStore } from "@b3dotfun/sdk/global-account/react";
+import { useGlobalAccount, useIsMobile, useModalStore } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { AnimatePresence, motion } from "framer-motion";
 import { useEffect, useRef } from "react";
 import { useSetActiveWallet } from "thirdweb/react";
 import { AvatarEditor } from "./AvatarEditor/AvatarEditor";
+import { useB3 } from "./B3Provider/useB3";
 import { Deposit } from "./Deposit/Deposit";
 import { LinkAccount } from "./LinkAccount/LinkAccount";
 import { LinkNewAccount } from "./LinkAccount/LinkNewAccount";
@@ -29,8 +30,8 @@ import NotificationsContent from "./ManageAccount/NotificationsContent";
 import { RequestPermissions } from "./RequestPermissions/RequestPermissions";
 import { Send } from "./Send/Send";
 import { SignInWithB3Flow } from "./SignInWithB3/SignInWithB3Flow";
-import { ToastContainer, useToastContext } from "./Toast/index";
 import { TurnkeyAuthModal } from "./TurnkeyAuthModal";
+import { ToastContainer, useToastContext } from "./Toast/index";
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from "./ui/dialog";
 import { Drawer, DrawerContent, DrawerDescription, DrawerTitle } from "./ui/drawer";
 
@@ -41,7 +42,7 @@ export function B3DynamicModal() {
   const setB3ModalOpen = useModalStore(state => state.setB3ModalOpen);
   const contentType = useModalStore(state => state.contentType);
   const navigateBack = useModalStore(state => state.navigateBack);
-  const { theme } = useB3Config();
+  const { theme } = useB3();
   const isMobile = useIsMobile();
   const prevIsOpenRef = useRef(isOpen);
   const { wallet } = useGlobalAccount();

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

@@ -1,16 +1,24 @@
 import { PermissionsConfig } from "@b3dotfun/sdk/global-account/types/permissions";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useEffect } from "react";
-import { ThirdwebProvider } from "thirdweb/react";
+import { ThirdwebProvider, useActiveAccount } from "thirdweb/react";
 import { Account, Wallet } from "thirdweb/wallets";
 
 import { ClientType } from "../../../client-manager";
 
 import { WagmiProvider } from "wagmi";
-import { useB3ConfigStore } from "../../stores/configStore";
 import { createWagmiConfig } from "../../utils/createWagmiConfig";
-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();
@@ -27,53 +35,44 @@ export function B3Provider({
   partnerId,
   rpcUrls,
   onConnect,
-  defaultPermissions,
 }: {
   theme: "light" | "dark";
   children: React.ReactNode;
   accountOverride?: Account;
-  environment?: "development" | "production";
+  environment: B3ContextType["environment"];
   clientType?: ClientType;
   partnerId: string;
   rpcUrls?: Record<number, string>;
   onConnect?: (wallet: Wallet, b3Jwt: string) => void | Promise<void>;
-  defaultPermissions?: PermissionsConfig;
 }) {
-  const setConfig = useB3ConfigStore(state => state.setConfig);
-
-  // Initialize config store on mount - props are static and never change
-  useEffect(() => {
-    setConfig({
-      accountOverride,
-      environment: environment ?? "development",
-      automaticallySetFirstEoa: false,
-      theme,
-      clientType,
-      partnerId,
-      defaultPermissions,
-    });
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
   return (
     <ThirdwebProvider>
       <LocalSDKProvider onConnectCallback={onConnect}>
-        {/* <RelayKitProviderWrapper> */}
-        {children}
-        <AuthenticationProvider partnerId={partnerId} automaticallySetFirstEoa={false} />
-        {/* </RelayKitProviderWrapper> */}
+        <InnerProvider
+          accountOverride={accountOverride}
+          environment={environment}
+          theme={theme}
+          clientType={clientType}
+          partnerId={partnerId}
+          rpcUrls={rpcUrls}
+        >
+          {/* <RelayKitProviderWrapper> */}
+          {children}
+          {/* </RelayKitProviderWrapper> */}
+        </InnerProvider>
       </LocalSDKProvider>
     </ThirdwebProvider>
   );
 }
 
 /**
- * Inner provider component for native
+ * Inner provider component that provides the actual B3Context
  */
 export function InnerProvider({
   children,
   accountOverride,
   environment,
-  defaultPermissions,
+  defaultPermissions = DEFAULT_PERMISSIONS,
   theme = "light",
   clientType = "socket",
   partnerId,
@@ -81,32 +80,44 @@ export function InnerProvider({
 }: {
   children: React.ReactNode;
   accountOverride?: Account;
-  environment?: "development" | "production";
+  environment: B3ContextType["environment"];
   defaultPermissions?: PermissionsConfig;
   theme: "light" | "dark";
   clientType?: ClientType;
   partnerId: string;
   rpcUrls?: Record<number, string>;
 }) {
-  const setConfig = useB3ConfigStore(state => state.setConfig);
+  const activeAccount = useActiveAccount();
+  //const { user, setUser, refetchUser } = useAuthentication(partnerId);
   const wagmiConfig = createWagmiConfig({ partnerId, rpcUrls });
 
-  // Initialize config store on mount - props are static and never change
-  useEffect(() => {
-    setConfig({
-      accountOverride,
-      environment: environment ?? "development",
-      automaticallySetFirstEoa: false,
-      theme,
-      clientType,
-      partnerId,
-      defaultPermissions,
-    });
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+  // Use given accountOverride or activeAccount from thirdweb
+  const effectiveAccount = accountOverride || activeAccount;
 
   return (
     <WagmiProvider config={wagmiConfig}>
-      <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+      <QueryClientProvider client={queryClient}>
+        <B3Context.Provider
+          value={{
+            //account: effectiveAccount,
+            automaticallySetFirstEoa: false,
+            //setWallet: () => {},
+            wallet: undefined,
+            //user,
+            //setUser,
+            initialized: true,
+            ready: !!effectiveAccount,
+            environment,
+            defaultPermissions,
+            theme,
+            clientType,
+            partnerId,
+            //refetchUser,
+          }}
+        >
+          {children}
+        </B3Context.Provider>
+      </QueryClientProvider>
     </WagmiProvider>
   );
 }