@b3dotfun/sdk 0.0.64-alpha.1 → 0.0.64-alpha.2

package/dist/cjs/anyspend/react/components/AnySpendCustomExactIn.js

@@ -14,7 +14,6 @@ const react_2 = require("motion/react");
 const react_3 = require("react");
 const sonner_1 = require("sonner");
 const react_4 = require("thirdweb/react");
-const utils_2 = require("../../utils");
 const useAnyspendFlow_1 = require("../hooks/useAnyspendFlow");
 const AnySpendFingerprintWrapper_1 = require("./AnySpendFingerprintWrapper");
 const CryptoPaySection_1 = require("./common/CryptoPaySection");
@@ -53,18 +52,15 @@ function AnySpendCustomExactInInner({ loadOrder, mode = "modal", recipientAddres
     });
     const { connectedEOAWallet } = (0, react_1.useAccountWallet)();
     const setActiveWallet = (0, react_4.useSetActiveWallet)();
-    const activeWallet = (0, react_4.useActiveWallet)();
-    const setGlobalAccountWallet = (0, utils_2.useGlobalWalletState)(state => state.setGlobalAccountWallet);
     const appliedPreferEoa = (0, react_3.useRef)(false);
     (0, react_3.useEffect)(() => {
         if (preferEoa && !appliedPreferEoa.current) {
             if (connectedEOAWallet) {
                 appliedPreferEoa.current = true;
-                setGlobalAccountWallet(activeWallet);
                 setActiveWallet(connectedEOAWallet);
             }
         }
-    }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+    }, [preferEoa, connectedEOAWallet, setActiveWallet]);
     const selectedRecipientOrDefault = selectedRecipientAddress ?? recipientAddress;
     const expectedDstAmountRaw = anyspendQuote?.data?.currencyOut?.amount ?? "0";
     const buildCustomPayload = (_recipient) => {

package/dist/cjs/anyspend/react/components/AnyspendDepositHype.js

@@ -26,7 +26,6 @@ const OrderDetails_1 = require("./common/OrderDetails");
 const PointsDetailPanel_1 = require("./common/PointsDetailPanel");
 const RecipientSelection_1 = require("./common/RecipientSelection");
 const lucide_react_1 = require("lucide-react");
-const utils_1 = require("../../utils");
 const PanelOnramp_1 = require("./common/PanelOnramp");
 const SLIPPAGE_PERCENT = 3;
 exports.HYPE_TOKEN_DETAILS = {
@@ -52,18 +51,15 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
     });
     const { connectedEOAWallet: connectedEOAWallet } = (0, react_1.useAccountWallet)();
     const setActiveWallet = (0, react_4.useSetActiveWallet)();
-    const activeWallet = (0, react_4.useActiveWallet)();
-    const setGlobalAccountWallet = (0, utils_1.useGlobalWalletState)(state => state.setGlobalAccountWallet);
     const appliedPreferEoa = (0, react_3.useRef)(false);
     (0, react_3.useEffect)(() => {
         if (preferEoa && !appliedPreferEoa.current) {
             if (connectedEOAWallet) {
                 appliedPreferEoa.current = true;
-                setGlobalAccountWallet(activeWallet);
                 setActiveWallet(connectedEOAWallet);
             }
         }
-    }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+    }, [preferEoa, connectedEOAWallet, setActiveWallet]);
     // Button state logic
     const btnInfo = (0, react_3.useMemo)(() => {
         if (activeInputAmountInWei === "0")

package/dist/cjs/anyspend/react/components/common/CryptoPaymentMethod.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptoPaymentMethodType = void 0;
 exports.CryptoPaymentMethod = CryptoPaymentMethod;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const utils_1 = require("../../../../anyspend/utils");
 const react_1 = require("../../../../global-account/react");
 const cn_1 = require("../../../../shared/utils/cn");
 const formatAddress_1 = require("../../../../shared/utils/formatAddress");
@@ -34,8 +33,6 @@ function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentMethod,
     const [showWalletModal, setShowWalletModal] = (0, react_3.useState)(false);
     const setActiveWallet = (0, react_4.useSetActiveWallet)();
     const { data: eoaWalletInfo } = (0, react_4.useWalletInfo)(connectedEOAWallet?.id);
-    const activeWallet = (0, react_4.useActiveWallet)();
-    const setGlobalAccountWallet = (0, utils_1.useGlobalWalletState)(state => state.setGlobalAccountWallet);
     const isConnected = !!connectedEOAWallet;
     const globalAddress = connectedSmartWallet?.getAccount()?.address;
     // Use custom hook to determine wallet display logic
@@ -166,7 +163,6 @@ function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentMethod,
     return ((0, jsx_runtime_1.jsxs)("div", { className: "crypto-payment-method mx-auto h-fit w-[460px] max-w-full", children: [(0, jsx_runtime_1.jsxs)("div", { className: (0, cn_1.cn)("relative flex flex-col gap-10"), children: [(0, jsx_runtime_1.jsx)("button", { onClick: onBack, className: "text-as-quaternary hover:text-as-primary absolute flex h-8 w-8 items-center justify-center rounded-lg transition-colors", children: (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronLeft, { className: "h-6 w-6" }) }), (0, jsx_runtime_1.jsx)("div", { className: "flex items-center justify-around gap-4", children: (0, jsx_runtime_1.jsx)("div", { className: "flex-1 text-center", children: (0, jsx_runtime_1.jsx)("h2", { className: "text-as-primary text-lg font-semibold", children: "Select a payment method" }) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "crypto-payment-methods flex flex-col gap-4", children: [(shouldShowConnectedEOA || shouldShowWagmiWallet || globalAddress) && ((0, jsx_runtime_1.jsxs)("div", { className: "installed-wallets", children: [(0, jsx_runtime_1.jsx)("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Connected wallets" }), (0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [shouldShowConnectedEOA && ((0, jsx_runtime_1.jsx)("button", { onClick: () => {
                                                     setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
                                                     onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    setGlobalAccountWallet(activeWallet);
                                                     if (connectedEOAWallet) {
                                                         setActiveWallet(connectedEOAWallet);
                                                     }

package/dist/cjs/anyspend/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./accountStore";
 export * from "./address";
 export * from "./chain";
 export * from "./format";

package/dist/cjs/anyspend/utils/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./accountStore"), exports);
 __exportStar(require("./address"), exports);
 __exportStar(require("./chain"), exports);
 __exportStar(require("./format"), exports);

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

@@ -6,7 +6,6 @@ const react_1 = require("../../../anyspend/react");
 const AnyspendDepositHype_1 = require("../../../anyspend/react/components/AnyspendDepositHype");
 const AnySpendStakeUpside_1 = require("../../../anyspend/react/components/AnySpendStakeUpside");
 const AnySpendStakeUpsideExactIn_1 = require("../../../anyspend/react/components/AnySpendStakeUpsideExactIn");
-const utils_1 = require("../../../anyspend/utils");
 const react_2 = require("../../../global-account/react");
 const cn_1 = require("../../../shared/utils/cn");
 const debug_1 = require("../../../shared/utils/debug");
@@ -27,19 +26,17 @@ function B3DynamicModal() {
     const { theme } = (0, useB3_1.useB3)();
     const isMobile = (0, react_2.useIsMobile)();
     const prevIsOpenRef = (0, react_3.useRef)(isOpen);
-    const globalAccountWallet = (0, utils_1.useGlobalWalletState)(state => state.globalAccountWallet);
-    const setGlobalAccountWallet = (0, utils_1.useGlobalWalletState)(state => state.setGlobalAccountWallet);
+    const { wallet } = (0, react_2.useGlobalAccount)();
     const setActiveWallet = (0, react_4.useSetActiveWallet)();
     // anyspend cleanup global account chnages by setting account back
     (0, react_3.useEffect)(() => {
         if (prevIsOpenRef.current && !isOpen) {
-            if (globalAccountWallet) {
-                setActiveWallet(globalAccountWallet);
-                setGlobalAccountWallet(undefined);
+            if (wallet) {
+                setActiveWallet(wallet);
             }
         }
         prevIsOpenRef.current = isOpen;
-    }, [isOpen, globalAccountWallet, setActiveWallet, setGlobalAccountWallet]);
+    }, [isOpen, wallet, setActiveWallet]);
     // Define arrays for different modal type groups
     const fullWidthTypes = [
         "anySpend",

package/dist/cjs/global-account/react/hooks/useGlobalAccount.d.ts

@@ -3,4 +3,5 @@ export declare function useGlobalAccount(): {
     account: Wallet | undefined;
     address: string | undefined;
     info: import("@tanstack/react-query").UseQueryResult<import("thirdweb/wallets").WalletInfo, Error>;
+    wallet: Wallet | undefined;
 };

package/dist/cjs/global-account/react/hooks/useGlobalAccount.js

@@ -10,6 +10,7 @@ function useGlobalAccount() {
     const wallets = (0, react_3.useConnectedWallets)();
     const isConnected = (0, react_1.useAuthStore)(state => state.isConnected);
     const [globalAccount, setGlobalAccount] = (0, react_2.useState)(undefined);
+    const [globalAccountWallet, setGlobalAccountWallet] = (0, react_2.useState)(undefined);
     const [address, setAddress] = (0, react_2.useState)(undefined);
     const walletInfo = (0, react_3.useWalletInfo)(globalAccount?.id);
     (0, react_2.useEffect)(() => {
@@ -20,6 +21,7 @@ function useGlobalAccount() {
             return;
         }
         const globalAccountWallet = wallets.find(wallet => wallet.id.startsWith("ecosystem."));
+        setGlobalAccountWallet(globalAccountWallet);
         const account = globalAccountWallet?.getAccount();
         setGlobalAccount(globalAccountWallet);
         setAddress(account?.address);
@@ -28,5 +30,6 @@ function useGlobalAccount() {
         account: globalAccount,
         address,
         info: walletInfo,
+        wallet: globalAccountWallet,
     };
 }

package/dist/esm/anyspend/react/components/AnySpendCustomExactIn.js

@@ -7,8 +7,7 @@ import { ArrowDown, Loader2 } from "lucide-react";
 import { motion } from "motion/react";
 import { useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
-import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
-import { useGlobalWalletState } from "../../utils/index.js";
+import { useSetActiveWallet } from "thirdweb/react";
 import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow.js";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper.js";
 import { CryptoPaySection } from "./common/CryptoPaySection.js";
@@ -47,18 +46,15 @@ function AnySpendCustomExactInInner({ loadOrder, mode = "modal", recipientAddres
     });
     const { connectedEOAWallet } = useAccountWallet();
     const setActiveWallet = useSetActiveWallet();
-    const activeWallet = useActiveWallet();
-    const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
     const appliedPreferEoa = useRef(false);
     useEffect(() => {
         if (preferEoa && !appliedPreferEoa.current) {
             if (connectedEOAWallet) {
                 appliedPreferEoa.current = true;
-                setGlobalAccountWallet(activeWallet);
                 setActiveWallet(connectedEOAWallet);
             }
         }
-    }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+    }, [preferEoa, connectedEOAWallet, setActiveWallet]);
     const selectedRecipientOrDefault = selectedRecipientAddress ?? recipientAddress;
     const expectedDstAmountRaw = anyspendQuote?.data?.currencyOut?.amount ?? "0";
     const buildCustomPayload = (_recipient) => {

package/dist/esm/anyspend/react/components/AnyspendDepositHype.js

@@ -6,7 +6,7 @@ import invariant from "invariant";
 import { motion } from "motion/react";
 import { useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
-import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
+import { useSetActiveWallet } from "thirdweb/react";
 import { base } from "viem/chains";
 import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow.js";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper.js";
@@ -19,7 +19,6 @@ import { OrderDetails } from "./common/OrderDetails.js";
 import { PointsDetailPanel } from "./common/PointsDetailPanel.js";
 import { RecipientSelection } from "./common/RecipientSelection.js";
 import { ArrowDown, Loader2 } from "lucide-react";
-import { useGlobalWalletState } from "../../utils/index.js";
 import { PanelOnramp } from "./common/PanelOnramp.js";
 const SLIPPAGE_PERCENT = 3;
 export const HYPE_TOKEN_DETAILS = {
@@ -45,18 +44,15 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
     });
     const { connectedEOAWallet: connectedEOAWallet } = useAccountWallet();
     const setActiveWallet = useSetActiveWallet();
-    const activeWallet = useActiveWallet();
-    const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
     const appliedPreferEoa = useRef(false);
     useEffect(() => {
         if (preferEoa && !appliedPreferEoa.current) {
             if (connectedEOAWallet) {
                 appliedPreferEoa.current = true;
-                setGlobalAccountWallet(activeWallet);
                 setActiveWallet(connectedEOAWallet);
             }
         }
-    }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+    }, [preferEoa, connectedEOAWallet, setActiveWallet]);
     // Button state logic
     const btnInfo = useMemo(() => {
         if (activeInputAmountInWei === "0")

package/dist/esm/anyspend/react/components/common/CryptoPaymentMethod.js

@@ -1,6 +1,5 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useGlobalWalletState } from "../../../../anyspend/utils/index.js";
 import { useAccountWallet } from "../../../../global-account/react/index.js";
 import { cn } from "../../../../shared/utils/cn.js";
 import { shortenAddress } from "../../../../shared/utils/formatAddress.js";
@@ -10,7 +9,7 @@ import { ChevronLeft, ChevronRightCircle, Wallet, X, ZapIcon } from "lucide-reac
 import { useState } from "react";
 import { createPortal } from "react-dom";
 import { toast } from "sonner";
-import { useActiveWallet, useSetActiveWallet, useWalletInfo } from "thirdweb/react";
+import { useSetActiveWallet, useWalletInfo } from "thirdweb/react";
 import { createWallet } from "thirdweb/wallets";
 import { useAccount, useConnect, useDisconnect, useWalletClient } from "wagmi";
 import { useConnectedWalletDisplay } from "../../hooks/useConnectedWalletDisplay.js";
@@ -30,8 +29,6 @@ export function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentM
     const [showWalletModal, setShowWalletModal] = useState(false);
     const setActiveWallet = useSetActiveWallet();
     const { data: eoaWalletInfo } = useWalletInfo(connectedEOAWallet?.id);
-    const activeWallet = useActiveWallet();
-    const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
     const isConnected = !!connectedEOAWallet;
     const globalAddress = connectedSmartWallet?.getAccount()?.address;
     // Use custom hook to determine wallet display logic
@@ -162,7 +159,6 @@ export function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentM
     return (_jsxs("div", { className: "crypto-payment-method mx-auto h-fit w-[460px] max-w-full", children: [_jsxs("div", { className: cn("relative flex flex-col gap-10"), children: [_jsx("button", { onClick: onBack, className: "text-as-quaternary hover:text-as-primary absolute flex h-8 w-8 items-center justify-center rounded-lg transition-colors", children: _jsx(ChevronLeft, { className: "h-6 w-6" }) }), _jsx("div", { className: "flex items-center justify-around gap-4", children: _jsx("div", { className: "flex-1 text-center", children: _jsx("h2", { className: "text-as-primary text-lg font-semibold", children: "Select a payment method" }) }) }), _jsxs("div", { className: "crypto-payment-methods flex flex-col gap-4", children: [(shouldShowConnectedEOA || shouldShowWagmiWallet || globalAddress) && (_jsxs("div", { className: "installed-wallets", children: [_jsx("h3", { className: "text-as-primary/80 mb-3 text-sm font-medium", children: "Connected wallets" }), _jsxs("div", { className: "space-y-2", children: [shouldShowConnectedEOA && (_jsx("button", { onClick: () => {
                                                     setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
                                                     onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                                                    setGlobalAccountWallet(activeWallet);
                                                     if (connectedEOAWallet) {
                                                         setActiveWallet(connectedEOAWallet);
                                                     }

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

@@ -1,4 +1,3 @@
-export * from "./accountStore";
 export * from "./address";
 export * from "./chain";
 export * from "./format";

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

@@ -1,4 +1,3 @@
-export * from "./accountStore.js";
 export * from "./address.js";
 export * from "./chain.js";
 export * from "./format.js";

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

@@ -3,8 +3,7 @@ import { AnySpend, AnySpendBondKit, AnySpendBuySpin, AnySpendNFT, AnyspendSignat
 import { AnySpendDepositHype } from "../../../anyspend/react/components/AnyspendDepositHype.js";
 import { AnySpendStakeUpside } from "../../../anyspend/react/components/AnySpendStakeUpside.js";
 import { AnySpendStakeUpsideExactIn } from "../../../anyspend/react/components/AnySpendStakeUpsideExactIn.js";
-import { useGlobalWalletState } from "../../../anyspend/utils/index.js";
-import { useIsMobile, useModalStore } from "../../../global-account/react/index.js";
+import { useGlobalAccount, useIsMobile, useModalStore } from "../../../global-account/react/index.js";
 import { cn } from "../../../shared/utils/cn.js";
 import { debugB3React } from "../../../shared/utils/debug.js";
 import { useEffect, useRef } from "react";
@@ -24,19 +23,17 @@ export function B3DynamicModal() {
     const { theme } = useB3();
     const isMobile = useIsMobile();
     const prevIsOpenRef = useRef(isOpen);
-    const globalAccountWallet = useGlobalWalletState(state => state.globalAccountWallet);
-    const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
+    const { wallet } = useGlobalAccount();
     const setActiveWallet = useSetActiveWallet();
     // anyspend cleanup global account chnages by setting account back
     useEffect(() => {
         if (prevIsOpenRef.current && !isOpen) {
-            if (globalAccountWallet) {
-                setActiveWallet(globalAccountWallet);
-                setGlobalAccountWallet(undefined);
+            if (wallet) {
+                setActiveWallet(wallet);
             }
         }
         prevIsOpenRef.current = isOpen;
-    }, [isOpen, globalAccountWallet, setActiveWallet, setGlobalAccountWallet]);
+    }, [isOpen, wallet, setActiveWallet]);
     // Define arrays for different modal type groups
     const fullWidthTypes = [
         "anySpend",

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

@@ -3,4 +3,5 @@ export declare function useGlobalAccount(): {
     account: Wallet | undefined;
     address: string | undefined;
     info: import("@tanstack/react-query").UseQueryResult<import("thirdweb/wallets").WalletInfo, Error>;
+    wallet: Wallet | undefined;
 };

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

@@ -7,6 +7,7 @@ export function useGlobalAccount() {
     const wallets = useConnectedWallets();
     const isConnected = useAuthStore(state => state.isConnected);
     const [globalAccount, setGlobalAccount] = useState(undefined);
+    const [globalAccountWallet, setGlobalAccountWallet] = useState(undefined);
     const [address, setAddress] = useState(undefined);
     const walletInfo = useWalletInfo(globalAccount?.id);
     useEffect(() => {
@@ -17,6 +18,7 @@ export function useGlobalAccount() {
             return;
         }
         const globalAccountWallet = wallets.find(wallet => wallet.id.startsWith("ecosystem."));
+        setGlobalAccountWallet(globalAccountWallet);
         const account = globalAccountWallet?.getAccount();
         setGlobalAccount(globalAccountWallet);
         setAddress(account?.address);
@@ -25,5 +27,6 @@ export function useGlobalAccount() {
         account: globalAccount,
         address,
         info: walletInfo,
+        wallet: globalAccountWallet,
     };
 }

package/dist/types/anyspend/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./accountStore";
 export * from "./address";
 export * from "./chain";
 export * from "./format";

package/dist/types/global-account/react/hooks/useGlobalAccount.d.ts

@@ -3,4 +3,5 @@ export declare function useGlobalAccount(): {
     account: Wallet | undefined;
     address: string | undefined;
     info: import("@tanstack/react-query").UseQueryResult<import("thirdweb/wallets").WalletInfo, Error>;
+    wallet: Wallet | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.64-alpha.1",
+  "version": "0.0.64-alpha.2",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",

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

@@ -8,8 +8,7 @@ import { ArrowDown, Loader2 } from "lucide-react";
 import { motion } from "motion/react";
 import { useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
-import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
-import { useGlobalWalletState } from "../../utils";
+import { useSetActiveWallet } from "thirdweb/react";
 import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
 import { CryptoPaySection } from "./common/CryptoPaySection";
@@ -145,19 +144,16 @@ function AnySpendCustomExactInInner({
 
   const { connectedEOAWallet } = useAccountWallet();
   const setActiveWallet = useSetActiveWallet();
-  const activeWallet = useActiveWallet();
-  const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
   const appliedPreferEoa = useRef(false);
 
   useEffect(() => {
     if (preferEoa && !appliedPreferEoa.current) {
       if (connectedEOAWallet) {
         appliedPreferEoa.current = true;
-        setGlobalAccountWallet(activeWallet);
         setActiveWallet(connectedEOAWallet);
       }
     }
-  }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+  }, [preferEoa, connectedEOAWallet, setActiveWallet]);
 
   const selectedRecipientOrDefault = selectedRecipientAddress ?? recipientAddress;
 

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

@@ -6,7 +6,7 @@ import invariant from "invariant";
 import { motion } from "motion/react";
 import { useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
-import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
+import { useSetActiveWallet } from "thirdweb/react";
 import { base } from "viem/chains";
 import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
@@ -20,7 +20,6 @@ import { PointsDetailPanel } from "./common/PointsDetailPanel";
 import { RecipientSelection } from "./common/RecipientSelection";
 
 import { ArrowDown, Loader2 } from "lucide-react";
-import { useGlobalWalletState } from "../../utils";
 import { PanelOnramp } from "./common/PanelOnramp";
 
 const SLIPPAGE_PERCENT = 3;
@@ -119,19 +118,16 @@ function AnySpendDepositHypeInner({
 
   const { connectedEOAWallet: connectedEOAWallet } = useAccountWallet();
   const setActiveWallet = useSetActiveWallet();
-  const activeWallet = useActiveWallet();
-  const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
   const appliedPreferEoa = useRef(false);
 
   useEffect(() => {
     if (preferEoa && !appliedPreferEoa.current) {
       if (connectedEOAWallet) {
         appliedPreferEoa.current = true;
-        setGlobalAccountWallet(activeWallet);
         setActiveWallet(connectedEOAWallet);
       }
     }
-  }, [preferEoa, connectedEOAWallet, setActiveWallet, activeWallet, setGlobalAccountWallet]);
+  }, [preferEoa, connectedEOAWallet, setActiveWallet]);
 
   // Button state logic
   const btnInfo: { text: string; disable: boolean; error: boolean; loading: boolean } = useMemo(() => {

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

@@ -1,6 +1,5 @@
 "use client";
 
-import { useGlobalWalletState } from "@b3dotfun/sdk/anyspend/utils";
 import { useAccountWallet } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
@@ -10,7 +9,7 @@ import { ChevronLeft, ChevronRightCircle, Wallet, X, ZapIcon } from "lucide-reac
 import { useState } from "react";
 import { createPortal } from "react-dom";
 import { toast } from "sonner";
-import { useActiveWallet, useSetActiveWallet, useWalletInfo } from "thirdweb/react";
+import { useSetActiveWallet, useWalletInfo } from "thirdweb/react";
 import { WalletId, createWallet } from "thirdweb/wallets";
 import { useAccount, useConnect, useDisconnect, useWalletClient } from "wagmi";
 import { useConnectedWalletDisplay } from "../../hooks/useConnectedWalletDisplay";
@@ -56,9 +55,6 @@ export function CryptoPaymentMethod({
   const setActiveWallet = useSetActiveWallet();
   const { data: eoaWalletInfo } = useWalletInfo(connectedEOAWallet?.id);
 
-  const activeWallet = useActiveWallet();
-  const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
-
   const isConnected = !!connectedEOAWallet;
   const globalAddress = connectedSmartWallet?.getAccount()?.address;
 
@@ -225,7 +221,6 @@ export function CryptoPaymentMethod({
                     onClick={() => {
                       setSelectedPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
                       onSelectPaymentMethod(CryptoPaymentMethodType.CONNECT_WALLET);
-                      setGlobalAccountWallet(activeWallet);
                       if (connectedEOAWallet) {
                         setActiveWallet(connectedEOAWallet);
                       }

package/src/anyspend/utils/index.ts

@@ -1,4 +1,3 @@
-export * from "./accountStore";
 export * from "./address";
 export * from "./chain";
 export * from "./format";

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

@@ -12,8 +12,7 @@ import {
 import { AnySpendDepositHype } from "@b3dotfun/sdk/anyspend/react/components/AnyspendDepositHype";
 import { AnySpendStakeUpside } from "@b3dotfun/sdk/anyspend/react/components/AnySpendStakeUpside";
 import { AnySpendStakeUpsideExactIn } from "@b3dotfun/sdk/anyspend/react/components/AnySpendStakeUpsideExactIn";
-import { useGlobalWalletState } from "@b3dotfun/sdk/anyspend/utils";
-import { 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 { useEffect, useRef } from "react";
@@ -35,22 +34,19 @@ export function B3DynamicModal() {
   const { theme } = useB3();
   const isMobile = useIsMobile();
   const prevIsOpenRef = useRef(isOpen);
-
-  const globalAccountWallet = useGlobalWalletState(state => state.globalAccountWallet);
-  const setGlobalAccountWallet = useGlobalWalletState(state => state.setGlobalAccountWallet);
+  const { wallet } = useGlobalAccount();
   const setActiveWallet = useSetActiveWallet();
 
   // anyspend cleanup global account chnages by setting account back
   useEffect(() => {
     if (prevIsOpenRef.current && !isOpen) {
-      if (globalAccountWallet) {
-        setActiveWallet(globalAccountWallet);
-        setGlobalAccountWallet(undefined);
+      if (wallet) {
+        setActiveWallet(wallet);
       }
     }
 
     prevIsOpenRef.current = isOpen;
-  }, [isOpen, globalAccountWallet, setActiveWallet, setGlobalAccountWallet]);
+  }, [isOpen, wallet, setActiveWallet]);
 
   // Define arrays for different modal type groups
   const fullWidthTypes = [

package/src/global-account/react/hooks/useGlobalAccount.tsx

@@ -10,6 +10,7 @@ export function useGlobalAccount() {
   const wallets = useConnectedWallets();
   const isConnected = useAuthStore(state => state.isConnected);
   const [globalAccount, setGlobalAccount] = useState<Wallet | undefined>(undefined);
+  const [globalAccountWallet, setGlobalAccountWallet] = useState<Wallet | undefined>(undefined);
   const [address, setAddress] = useState<string | undefined>(undefined);
   const walletInfo = useWalletInfo(globalAccount?.id);
 
@@ -22,7 +23,7 @@ export function useGlobalAccount() {
     }
 
     const globalAccountWallet = wallets.find(wallet => wallet.id.startsWith("ecosystem."));
-
+    setGlobalAccountWallet(globalAccountWallet);
     const account = globalAccountWallet?.getAccount();
     setGlobalAccount(globalAccountWallet);
     setAddress(account?.address);
@@ -32,5 +33,6 @@ export function useGlobalAccount() {
     account: globalAccount,
     address,
     info: walletInfo,
+    wallet: globalAccountWallet,
   };
 }

package/dist/cjs/anyspend/utils/accountStore.d.ts

@@ -1,7 +0,0 @@
-import type { Wallet } from "thirdweb/wallets";
-interface GlobalWalletState {
-    globalAccountWallet?: Wallet;
-    setGlobalAccountWallet: (account?: Wallet) => void;
-}
-export declare const useGlobalWalletState: import("zustand").UseBoundStore<import("zustand").StoreApi<GlobalWalletState>>;
-export {};

package/dist/cjs/anyspend/utils/accountStore.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useGlobalWalletState = void 0;
-const zustand_1 = require("zustand");
-exports.useGlobalWalletState = (0, zustand_1.create)(set => ({
-    globalAccountWallet: undefined,
-    setGlobalAccountWallet: account => set({ globalAccountWallet: account }),
-}));

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

@@ -1,7 +0,0 @@
-import type { Wallet } from "thirdweb/wallets";
-interface GlobalWalletState {
-    globalAccountWallet?: Wallet;
-    setGlobalAccountWallet: (account?: Wallet) => void;
-}
-export declare const useGlobalWalletState: import("zustand").UseBoundStore<import("zustand").StoreApi<GlobalWalletState>>;
-export {};

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

@@ -1,5 +0,0 @@
-import { create } from "zustand";
-export const useGlobalWalletState = create(set => ({
-    globalAccountWallet: undefined,
-    setGlobalAccountWallet: account => set({ globalAccountWallet: account }),
-}));

package/dist/types/anyspend/utils/accountStore.d.ts

@@ -1,7 +0,0 @@
-import type { Wallet } from "thirdweb/wallets";
-interface GlobalWalletState {
-    globalAccountWallet?: Wallet;
-    setGlobalAccountWallet: (account?: Wallet) => void;
-}
-export declare const useGlobalWalletState: import("zustand").UseBoundStore<import("zustand").StoreApi<GlobalWalletState>>;
-export {};

package/src/anyspend/utils/accountStore.ts

@@ -1,12 +0,0 @@
-import type { Wallet } from "thirdweb/wallets";
-import { create } from "zustand";
-
-interface GlobalWalletState {
-  globalAccountWallet?: Wallet;
-  setGlobalAccountWallet: (account?: Wallet) => void;
-}
-
-export const useGlobalWalletState = create<GlobalWalletState>(set => ({
-  globalAccountWallet: undefined,
-  setGlobalAccountWallet: account => set({ globalAccountWallet: account }),
-}));