@b3dotfun/sdk 0.0.19 → 0.0.20-alpha.1

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

@@ -18,9 +18,9 @@ const lucide_react_1 = require("lucide-react");
 const react_3 = require("motion/react");
 const react_4 = require("react");
 const sonner_1 = require("sonner");
+const react_5 = require("thirdweb/react");
 const viem_1 = require("viem");
 const chains_1 = require("viem/chains");
-const wagmi_1 = require("wagmi");
 const AnySpendFingerprintWrapper_1 = require("./AnySpendFingerprintWrapper");
 const CryptoPaymentMethod_1 = require("./common/CryptoPaymentMethod");
 const FiatPaymentMethod_1 = require("./common/FiatPaymentMethod");
@@ -51,7 +51,7 @@ function AnySpendInner({ destinationTokenAddress, destinationTokenChainId, isMai
     const searchParams = (0, react_2.useSearchParamsSSR)();
     const router = (0, react_2.useRouter)();
     // Get wagmi account state for wallet connection
-    const wagmiAccount = (0, wagmi_1.useAccount)();
+    const connectedWallets = (0, react_5.useConnectedWallets)();
     // Determine if we're in "buy mode" based on whether destination token props are provided
     const isBuyMode = !!(destinationTokenAddress && destinationTokenChainId);
     // Add refs to track URL state
@@ -343,6 +343,9 @@ function AnySpendInner({ destinationTokenAddress, destinationTokenChainId, isMai
             amount: srcAmountOnrampInWei,
             onrampVendor: getOnrampVendor(selectedFiatPaymentMethod),
         });
+    const connectedAddress = globalAddress || connectedWallets?.[0]?.getAccount()?.address;
+    const connectedProfile = (0, react_2.useProfile)({ address: connectedAddress });
+    const connectedName = connectedProfile.data?.name?.replace(/\.b3\.fun/g, "");
     const recipientProfile = (0, react_2.useProfile)({ address: recipientAddress });
     const recipientName = recipientProfile.data?.name?.replace(/\.b3\.fun/g, "");
     // Load custom recipients from local storage on mount
@@ -725,7 +728,6 @@ function AnySpendInner({ destinationTokenAddress, destinationTokenChainId, isMai
                     vendor: vendor,
                     paymentMethod: paymentMethodString,
                     country: geoData?.country || "US",
-                    ipAddress: geoData?.ip,
                     redirectUrl: window.location.origin === "https://basement.fun" ? "https://basement.fun/deposit" : window.location.origin,
                 },
                 expectedDstAmount: anyspendQuote?.data?.currencyOut?.amount?.toString() || "0",
@@ -808,7 +810,7 @@ function AnySpendInner({ destinationTokenAddress, destinationTokenChainId, isMai
                                 setActiveTab("fiat");
                                 setSelectedPaymentMethod(CryptoPaymentMethod_1.PaymentMethod.NONE); // Reset crypto payment method when switching to fiat
                                 setSelectedFiatPaymentMethod(FiatPaymentMethod_1.FiatPaymentMethod.NONE); // Reset fiat payment method when switching to fiat
-                            }, children: "Pay with Fiat" })] }) }), (0, jsx_runtime_1.jsxs)("div", { className: "relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2", children: [activeTab === "crypto" ? ((0, jsx_runtime_1.jsxs)(react_3.motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0, ease: "easeInOut" }, className: "bg-as-surface-secondary border-as-border-secondary relative flex w-full flex-col gap-2 rounded-2xl border p-4 sm:p-6", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/50 flex h-7 items-center text-sm", children: "Pay" }), (0, jsx_runtime_1.jsx)("button", { className: "text-as-primary/50 hover:text-as-primary/70 flex h-7 items-center gap-1 text-sm transition-colors", onClick: () => setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD), children: selectedPaymentMethod === CryptoPaymentMethod_1.PaymentMethod.CONNECT_WALLET ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [globalAddress || wagmiAccount.address ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [globalWallet?.meta?.icon && ((0, jsx_runtime_1.jsx)("img", { src: globalWallet.meta.icon, alt: "Connected Wallet", className: "h-4 w-4 rounded-full" })), (0, jsx_runtime_1.jsx)("span", { children: (0, formatAddress_1.shortenAddress)(globalAddress || wagmiAccount.address || "") })] })) : ("Connect wallet"), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "h-4 w-4" })] })) : selectedPaymentMethod === CryptoPaymentMethod_1.PaymentMethod.TRANSFER_CRYPTO ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Transfer crypto", (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "h-4 w-4" })] })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Select payment method", (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "h-4 w-4" })] })) })] }), (0, jsx_runtime_1.jsx)(OrderTokenAmount_1.OrderTokenAmount, { address: globalAddress, context: "from", inputValue: srcAmount, onChangeInput: value => {
+                            }, children: "Pay with Fiat" })] }) }), (0, jsx_runtime_1.jsxs)("div", { className: "relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2", children: [activeTab === "crypto" ? ((0, jsx_runtime_1.jsxs)(react_3.motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0, ease: "easeInOut" }, className: "bg-as-surface-secondary border-as-border-secondary relative flex w-full flex-col gap-2 rounded-2xl border p-4 sm:p-6", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/50 flex h-7 items-center text-sm", children: "Pay" }), (0, jsx_runtime_1.jsx)("button", { className: "text-as-tertiarry flex h-7 items-center gap-2 text-sm transition-colors", onClick: () => setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD), children: selectedPaymentMethod === CryptoPaymentMethod_1.PaymentMethod.CONNECT_WALLET ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [connectedAddress ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [globalWallet?.meta?.icon && ((0, jsx_runtime_1.jsx)("img", { src: globalWallet.meta.icon, alt: "Connected Wallet", className: "bg-as-primary h-6 w-6 rounded-full" })), (0, jsx_runtime_1.jsx)("span", { className: "text-as-tertiarry", children: connectedName || (0, formatAddress_1.shortenAddress)(connectedAddress || "") })] })) : ("Connect wallet"), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: "h-4 w-4" })] })) : selectedPaymentMethod === CryptoPaymentMethod_1.PaymentMethod.TRANSFER_CRYPTO ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Transfer crypto", (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: "h-4 w-4" })] })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Select payment method", (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: "h-4 w-4" })] })) })] }), (0, jsx_runtime_1.jsx)(OrderTokenAmount_1.OrderTokenAmount, { address: globalAddress, context: "from", inputValue: srcAmount, onChangeInput: value => {
                                     setIsSrcInputDirty(true);
                                     setSrcAmount(value);
                                 }, chainId: selectedSrcChainId, setChainId: setSelectedSrcChainId, token: selectedSrcToken, setToken: setSelectedSrcToken }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/50 flex h-5 items-center text-sm", children: (0, number_1.formatDisplayNumber)(anyspendQuote?.data?.currencyIn?.amountUsd, { style: "currency", fallback: "" }) }), (0, jsx_runtime_1.jsx)(TokenBalance_1.TokenBalance, { token: selectedSrcToken, walletAddress: globalAddress, onChangeInput: value => {
@@ -833,7 +835,7 @@ function AnySpendInner({ destinationTokenAddress, destinationTokenChainId, isMai
                             const tempDstAmount = dstAmount;
                             setSrcAmount(tempDstAmount);
                             setDstAmount(tempSrcAmount);
-                        }, children: (0, jsx_runtime_1.jsx)("div", { className: "relative flex items-center justify-center transition-opacity", children: (0, jsx_runtime_1.jsx)(lucide_react_1.ArrowDown, { className: "text-as-primary/50 h-5 w-5" }) }) }), activeTab !== "fiat" && ((0, jsx_runtime_1.jsxs)(react_3.motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0.1, ease: "easeInOut" }, className: "bg-as-surface-secondary border-as-border-secondary relative flex w-full flex-col gap-2 rounded-2xl border p-4 sm:p-6", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex w-full items-center justify-between", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/50 flex h-7 items-center text-sm", children: "Receive" }), recipientAddress ? ((0, jsx_runtime_1.jsxs)("button", { className: (0, cn_1.cn)("text-as-primary/70 flex h-7 items-center gap-2 rounded-lg px-2"), onClick: () => setActivePanel(PanelView.RECIPIENT_SELECTION), children: [globalAddress && recipientAddress === globalAddress && globalWallet?.meta?.icon ? ((0, jsx_runtime_1.jsx)("img", { src: globalWallet?.meta?.icon, alt: "Current wallet", className: "bg-as-primary h-6 w-6 rounded-full" })) : ((0, jsx_runtime_1.jsx)("div", { className: "flex h-6 w-6 items-center justify-center rounded-full bg-orange-500 text-xs text-white", children: "\uD83E\uDD8A" })), (0, jsx_runtime_1.jsx)("div", { className: "text-sm", children: recipientName ? recipientName : (0, formatAddress_1.shortenAddress)(recipientAddress) }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "h-4 w-4" })] })) : ((0, jsx_runtime_1.jsxs)("button", { className: "text-as-primary/70 flex items-center gap-1 rounded-lg", onClick: () => setActivePanel(PanelView.RECIPIENT_SELECTION), children: [(0, jsx_runtime_1.jsx)("div", { className: "text-sm font-medium", children: "Select recipient" }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronsUpDown, { className: "h-3 w-3" })] }))] }), isBuyMode ? (
+                        }, children: (0, jsx_runtime_1.jsx)("div", { className: "relative flex items-center justify-center transition-opacity", children: (0, jsx_runtime_1.jsx)(lucide_react_1.ArrowDown, { className: "text-as-primary/50 h-5 w-5" }) }) }), activeTab !== "fiat" && ((0, jsx_runtime_1.jsxs)(react_3.motion.div, { initial: { opacity: 0, y: 20, filter: "blur(10px)" }, animate: { opacity: 1, y: 0, filter: "blur(0px)" }, transition: { duration: 0.3, delay: 0.1, ease: "easeInOut" }, className: "bg-as-surface-secondary border-as-border-secondary relative flex w-full flex-col gap-2 rounded-2xl border p-4 sm:p-6", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex w-full items-center justify-between", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary/50 flex h-7 items-center text-sm", children: "Receive" }), recipientAddress ? ((0, jsx_runtime_1.jsxs)("button", { className: (0, cn_1.cn)("text-as-tertiarry flex h-7 items-center gap-2 rounded-lg"), onClick: () => setActivePanel(PanelView.RECIPIENT_SELECTION), children: [globalAddress && recipientAddress === globalAddress && globalWallet?.meta?.icon ? ((0, jsx_runtime_1.jsx)("img", { src: globalWallet?.meta?.icon, alt: "Current wallet", className: "bg-as-primary h-6 w-6 rounded-full" })) : ((0, jsx_runtime_1.jsx)("div", { className: "flex h-6 w-6 items-center justify-center rounded-full bg-orange-500 text-xs text-white", children: "\uD83E\uDD8A" })), (0, jsx_runtime_1.jsx)("div", { className: "text-sm", children: recipientName ? recipientName : (0, formatAddress_1.shortenAddress)(recipientAddress) }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRight, { className: "h-4 w-4" })] })) : ((0, jsx_runtime_1.jsxs)("button", { className: "text-as-primary/70 flex items-center gap-1 rounded-lg", onClick: () => setActivePanel(PanelView.RECIPIENT_SELECTION), children: [(0, jsx_runtime_1.jsx)("div", { className: "text-sm font-medium", children: "Select recipient" }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronsUpDown, { className: "h-3 w-3" })] }))] }), isBuyMode ? (
                             // Fixed destination token display in buy mode
                             (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("div", { className: "text-as-primary text-2xl font-bold", children: dstAmount || "0" }), (0, jsx_runtime_1.jsxs)("div", { className: "bg-as-brand/10 border-as-brand/30 flex items-center gap-3 rounded-xl border px-4 py-3", children: [selectedDstToken.metadata?.logoURI && ((0, jsx_runtime_1.jsx)("img", { src: selectedDstToken.metadata.logoURI, alt: selectedDstToken.symbol, className: "h-8 w-8 rounded-full" })), (0, jsx_runtime_1.jsx)("span", { className: "text-as-brand text-lg font-bold", children: selectedDstToken.symbol })] })] })) : ((0, jsx_runtime_1.jsx)(OrderTokenAmount_1.OrderTokenAmount, { address: recipientAddress, context: "to", inputValue: dstAmount, onChangeInput: value => {
                                     setIsSrcInputDirty(false);
@@ -892,26 +894,27 @@ function AnySpendInner({ destinationTokenAddress, destinationTokenChainId, isMai
             setActivePanel(PanelView.MAIN); // Go back to main panel to show updated pricing
         }, srcAmountOnRamp: srcAmountOnRamp, isMainnet: isMainnet }));
     // Add tabs to the main component when no order is loaded
-    return ((0, jsx_runtime_1.jsx)(react_2.StyleRoot, { children: (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)("mx-auto w-full max-w-[460px]", mode === "page" && "bg-as-surface-primary border-as-border-secondary rounded-2xl border p-6 shadow-xl"), children: (0, jsx_runtime_1.jsx)(react_2.TransitionPanel, { activeIndex: orderId
+    return ((0, jsx_runtime_1.jsx)(react_2.StyleRoot, { children: (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)("mx-auto w-full max-w-[460px]", mode === "page" &&
+                "bg-as-surface-primary border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl"), children: (0, jsx_runtime_1.jsx)(react_2.TransitionPanel, { activeIndex: orderId
                     ? oat
                         ? PanelView.ORDER_DETAILS
                         : PanelView.LOADING
                     : activePanel === PanelView.ORDER_DETAILS
                         ? PanelView.MAIN
-                        : activePanel, className: (0, cn_1.cn)("overflow-hidden", {
+                        : activePanel, className: (0, cn_1.cn)("rounded-2xl", {
                     "mt-0": mode === "modal",
                 }), variants: {
                     enter: { x: 300, opacity: 0 },
                     center: { x: 0, opacity: 1 },
                     exit: { x: -300, opacity: 0 },
                 }, transition: { type: "spring", stiffness: 300, damping: 30 }, children: [
-                    (0, jsx_runtime_1.jsx)("div", { children: mainView }, "main-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: historyView }, "history-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: orderDetailsView }, "order-details-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: OrderDetails_1.OrderDetailsLoadingView }, "loading-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: onrampPaymentView }, "fiat-payment-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: recipientSelectionView }, "recipient-selection-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: cryptoPaymentMethodView }, "crypto-payment-method-view"),
-                    (0, jsx_runtime_1.jsx)("div", { children: fiatPaymentMethodView }, "fiat-payment-method-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: mainView }, "main-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: historyView }, "history-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: orderDetailsView }, "order-details-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: OrderDetails_1.OrderDetailsLoadingView }, "loading-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: onrampPaymentView }, "fiat-payment-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: recipientSelectionView }, "recipient-selection-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: cryptoPaymentMethodView }, "crypto-payment-method-view"),
+                    (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)(mode === "page" && "p-6"), children: fiatPaymentMethodView }, "fiat-payment-method-view"),
                 ] }) }) }));
 }

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

@@ -306,7 +306,6 @@ function AnySpendCustom({ isMainnet = true, loadOrder, mode = "modal", recipient
                         vendor: onramp.vendor,
                         paymentMethod: onramp.paymentMethod,
                         country: geoData?.country || "US",
-                        ipAddress: geoData?.ip,
                         redirectUrl: window.location.origin === "https://basement.fun"
                             ? "https://basement.fun/deposit"
                             : window.location.origin,

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

@@ -5,12 +5,16 @@ exports.PaymentMethod = void 0;
 exports.CryptoPaymentMethod = CryptoPaymentMethod;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("../../../../global-account/react");
+const b3Chain_1 = require("../../../../shared/constants/chains/b3Chain");
 const cn_1 = require("../../../../shared/utils/cn");
 const formatAddress_1 = require("../../../../shared/utils/formatAddress");
+const thirdweb_1 = require("../../../../shared/utils/thirdweb");
 const lucide_react_1 = require("lucide-react");
 const react_2 = require("react");
+const react_dom_1 = require("react-dom");
 const sonner_1 = require("sonner");
 const react_3 = require("thirdweb/react");
+const wallets_1 = require("thirdweb/wallets");
 const wagmi_1 = require("wagmi");
 var PaymentMethod;
 (function (PaymentMethod) {
@@ -19,100 +23,43 @@ var PaymentMethod;
     PaymentMethod["TRANSFER_CRYPTO"] = "transfer_crypto";
 })(PaymentMethod || (exports.PaymentMethod = PaymentMethod = {}));
 function CryptoPaymentMethod({ selectedPaymentMethod, setSelectedPaymentMethod, isCreatingOrder, onBack, onSelectPaymentMethod, }) {
-    const { connect, connectors, isPending: isConnecting, error: connectError } = (0, wagmi_1.useConnect)();
-    const wagmiAccount = (0, wagmi_1.useAccount)();
-    const { address: globalAddress, connectedEOAWallet, isActiveEOAWallet, wallet: globalWallet } = (0, react_1.useAccountWallet)();
+    const { address: globalAddress, wallet: globalWallet } = (0, react_1.useAccountWallet)();
     const { disconnect } = (0, wagmi_1.useDisconnect)();
-    const previousAddress = (0, react_2.useRef)(globalAddress);
-    const setActiveWallet = (0, react_3.useSetActiveWallet)();
-    // Automatically set EOA wallet as active when available
-    (0, react_2.useEffect)(() => {
-        if (connectedEOAWallet) {
-            console.log("Setting active wallet", connectedEOAWallet);
-            setActiveWallet(connectedEOAWallet);
-        }
-    }, [connectedEOAWallet, isActiveEOAWallet, setActiveWallet]);
-    // Handle wallet connection success
-    (0, react_2.useEffect)(() => {
-        if (globalAddress && previousAddress.current !== globalAddress) {
-            previousAddress.current = globalAddress;
-            sonner_1.toast.success("Wallet connected successfully");
-            // Automatically select connect wallet method and go back to main view
-            setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
-            onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
-        }
-    }, [globalAddress, setSelectedPaymentMethod, onSelectPaymentMethod]);
-    // Handle connection errors
-    (0, react_2.useEffect)(() => {
-        if (connectError) {
-            // Handle specific error cases
-            if (connectError.message.includes("Connector already connected")) {
-                // If connector is already connected, just proceed with the flow
-                console.log("Connector already connected, proceeding with selection");
-                // Use wagmi account address or global address
-                if (wagmiAccount.address || globalAddress) {
-                    setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                    onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                }
-                else {
-                    // Fallback: proceed anyway as the connector reports it's connected
-                    setTimeout(() => {
-                        setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                        onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                    }, 100);
-                }
-            }
-            else {
-                sonner_1.toast.error(`Failed to connect wallet: ${connectError.message}`);
-            }
-        }
-    }, [connectError, globalAddress, wagmiAccount.address, setSelectedPaymentMethod, onSelectPaymentMethod]);
-    return ((0, jsx_runtime_1.jsx)("div", { className: "mx-auto 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: "Choose payment method" }) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col gap-3", children: [!globalAddress ? (
-                        // Not connected - show single connect button
-                        (0, jsx_runtime_1.jsxs)("button", { onClick: () => {
-                                // Prevent connecting if already connecting or if there's already a connection
-                                if (isConnecting)
-                                    return;
-                                try {
-                                    // Check if wagmi already has a connection
-                                    if (wagmiAccount.isConnected && wagmiAccount.address) {
-                                        // Already connected via wagmi, just proceed with selection
-                                        console.log("Wagmi already connected, proceeding with selection");
-                                        setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                                        onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                                        return;
-                                    }
-                                    // Check if global address exists (b3 account system)
-                                    if (globalAddress) {
-                                        // Already connected via global account, just proceed with selection
-                                        console.log("Global address already exists, proceeding with selection");
-                                        setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                                        onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                                        return;
-                                    }
-                                    // Use the first available connector or a preferred one
-                                    const preferredConnector = connectors.find(c => c.name.toLowerCase().includes("metamask")) || connectors[0];
-                                    if (preferredConnector) {
-                                        connect({ connector: preferredConnector });
-                                    }
-                                }
-                                catch (error) {
-                                    console.error("Connection error:", error);
-                                    sonner_1.toast.error("Failed to connect wallet. Please try again.");
-                                }
-                            }, disabled: isConnecting, className: "bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md disabled:cursor-not-allowed disabled:opacity-50", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-3", children: [(0, jsx_runtime_1.jsx)("div", { className: "flex h-8 w-8 items-center justify-center rounded-full bg-blue-100", children: (0, jsx_runtime_1.jsx)(lucide_react_1.Wallet, { className: "h-4 w-4 text-blue-600" }) }), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-start text-left", children: [(0, jsx_runtime_1.jsx)("h4", { className: "text-as-primary font-semibold", children: "Connect wallet" }), (0, jsx_runtime_1.jsx)("p", { className: "text-as-primary/60 text-sm", children: "Connect your wallet to continue" })] })] }), isConnecting ? ((0, jsx_runtime_1.jsx)("div", { className: "border-as-primary/20 border-t-as-primary h-5 w-5 animate-spin rounded-full border-2" })) : ((0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" }))] })) : (
-                        // Connected - show wallet info
-                        (0, jsx_runtime_1.jsx)("div", { className: "bg-as-surface-primary border-as-border-secondary rounded-xl border", children: (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-between p-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-3", children: [globalWallet?.meta?.icon ? ((0, jsx_runtime_1.jsx)("img", { src: globalWallet.meta.icon, alt: "Connected Wallet", className: "h-8 w-8 rounded-full" })) : ((0, jsx_runtime_1.jsx)("div", { className: "flex h-8 w-8 items-center justify-center rounded-full bg-green-100", children: (0, jsx_runtime_1.jsx)(lucide_react_1.Wallet, { className: "h-4 w-4 text-green-600" }) })), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col", children: [(0, jsx_runtime_1.jsx)("span", { className: "text-as-primary font-semibold", children: "Connected Wallet" }), (0, jsx_runtime_1.jsx)("span", { className: "text-as-primary/60 text-sm", children: (0, formatAddress_1.shortenAddress)(globalAddress) })] })] }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)("button", { onClick: () => {
-                                                    setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                                                    onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
-                                                }, className: "bg-as-brand hover:bg-as-brand/90 rounded-lg px-3 py-1.5 text-sm font-medium text-white transition-colors", children: "Use Wallet" }), (0, jsx_runtime_1.jsx)("button", { onClick: () => {
-                                                    disconnect();
-                                                    sonner_1.toast.success("Wallet disconnected");
-                                                    if (selectedPaymentMethod === PaymentMethod.CONNECT_WALLET) {
-                                                        setSelectedPaymentMethod(PaymentMethod.NONE);
-                                                    }
-                                                }, className: "text-as-primary/60 hover:text-as-primary/80 rounded-lg p-1.5 transition-colors", children: (0, jsx_runtime_1.jsx)(lucide_react_1.X, { className: "h-4 w-4" }) })] })] }) })), (0, jsx_runtime_1.jsxs)("button", { onClick: () => {
-                                setSelectedPaymentMethod(PaymentMethod.TRANSFER_CRYPTO);
-                                onSelectPaymentMethod(PaymentMethod.TRANSFER_CRYPTO);
-                            }, disabled: isCreatingOrder, className: "bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [(0, jsx_runtime_1.jsx)("div", { className: "flex flex-col items-start text-left", children: (0, jsx_runtime_1.jsx)("h4", { className: "text-as-primary font-semibold", children: "Transfer crypto" }) }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] })] })] }) }));
+    const [showWalletModal, setShowWalletModal] = (0, react_2.useState)(false);
+    // Define available wallets for the modal
+    const availableWallets = [
+        (0, wallets_1.createWallet)("io.metamask"),
+        // createWallet("com.coinbase.wallet"),
+        (0, wallets_1.createWallet)("me.rainbow"),
+        (0, wallets_1.createWallet)("walletConnect"),
+        (0, wallets_1.createWallet)("io.rabby"),
+        (0, wallets_1.createWallet)("app.phantom"),
+    ];
+    return ((0, jsx_runtime_1.jsxs)("div", { className: "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: "Choose payment method" }) }) }), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col gap-3", children: [!globalAddress ? (
+                            // Not connected - show single connect button
+                            (0, jsx_runtime_1.jsxs)("button", { onClick: () => setShowWalletModal(true), className: "bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-3", children: [(0, jsx_runtime_1.jsx)("div", { className: "flex h-8 w-8 items-center justify-center rounded-full bg-blue-100", children: (0, jsx_runtime_1.jsx)(lucide_react_1.Wallet, { className: "h-4 w-4 text-blue-600" }) }), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col items-start text-left", children: [(0, jsx_runtime_1.jsx)("h4", { className: "text-as-primary font-semibold", children: "Connect wallet" }), (0, jsx_runtime_1.jsx)("p", { className: "text-as-primary/60 text-sm", children: "Choose from multiple wallet options" })] })] }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] })) : (
+                            // Connected - show wallet info
+                            (0, jsx_runtime_1.jsx)("div", { className: "bg-as-surface-primary border-as-border-secondary rounded-xl border", children: (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center justify-between p-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-3", children: [globalWallet?.meta?.icon ? ((0, jsx_runtime_1.jsx)("img", { src: globalWallet.meta.icon, alt: "Connected Wallet", className: "h-8 w-8 rounded-full" })) : ((0, jsx_runtime_1.jsx)("div", { className: "flex h-8 w-8 items-center justify-center rounded-full bg-green-100", children: (0, jsx_runtime_1.jsx)(lucide_react_1.Wallet, { className: "h-4 w-4 text-green-600" }) })), (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col", children: [(0, jsx_runtime_1.jsx)("span", { className: "text-as-primary font-semibold", children: "Connected Wallet" }), (0, jsx_runtime_1.jsx)("span", { className: "text-as-primary/60 text-sm", children: (0, formatAddress_1.shortenAddress)(globalAddress) })] })] }), (0, jsx_runtime_1.jsxs)("div", { className: "flex items-center gap-2", children: [(0, jsx_runtime_1.jsx)("button", { onClick: () => {
+                                                        setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
+                                                        onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
+                                                    }, className: "bg-as-brand hover:bg-as-brand/90 rounded-lg px-3 py-1.5 text-sm font-medium text-white transition-colors", children: "Use Wallet" }), (0, jsx_runtime_1.jsx)("button", { onClick: async () => {
+                                                        disconnect();
+                                                        sonner_1.toast.success("Wallet disconnected");
+                                                        if (selectedPaymentMethod === PaymentMethod.CONNECT_WALLET) {
+                                                            setSelectedPaymentMethod(PaymentMethod.NONE);
+                                                        }
+                                                    }, className: "text-as-primary/60 hover:text-as-primary/80 rounded-lg p-1.5 transition-colors", children: (0, jsx_runtime_1.jsx)(lucide_react_1.X, { className: "h-4 w-4" }) })] })] }) })), (0, jsx_runtime_1.jsxs)("button", { onClick: () => {
+                                    setSelectedPaymentMethod(PaymentMethod.TRANSFER_CRYPTO);
+                                    onSelectPaymentMethod(PaymentMethod.TRANSFER_CRYPTO);
+                                }, disabled: isCreatingOrder, className: "bg-as-surface-primary border-as-border-secondary hover:border-as-secondary/80 group flex w-full items-center justify-between gap-4 rounded-xl border px-4 py-3.5 transition-all duration-200 hover:shadow-md", children: [(0, jsx_runtime_1.jsx)("div", { className: "flex flex-col items-start text-left", children: (0, jsx_runtime_1.jsx)("h4", { className: "text-as-primary font-semibold", children: "Transfer crypto" }) }), (0, jsx_runtime_1.jsx)(lucide_react_1.ChevronRightCircle, { className: "text-as-primary/40 group-hover:text-as-primary/60 h-5 w-5 transition-colors" })] })] })] }), showWalletModal &&
+                (0, react_dom_1.createPortal)((0, jsx_runtime_1.jsx)("div", { className: "pointer-events-auto fixed inset-0 z-[9999] flex items-center justify-center bg-black/50", children: (0, jsx_runtime_1.jsxs)("div", { className: "max-h-[80vh] w-[400px] max-w-[90vw] overflow-auto rounded-xl bg-white p-6 dark:bg-gray-900", children: [(0, jsx_runtime_1.jsxs)("div", { className: "mb-4 flex items-center justify-between", children: [(0, jsx_runtime_1.jsx)("h3", { className: "text-lg font-semibold text-gray-900 dark:text-white", children: "Connect Wallet" }), (0, jsx_runtime_1.jsx)("button", { onClick: () => setShowWalletModal(false), className: "text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200", children: (0, jsx_runtime_1.jsx)(lucide_react_1.X, { className: "h-5 w-5" }) })] }), (0, jsx_runtime_1.jsx)(react_3.ConnectEmbed, { client: thirdweb_1.client, chain: b3Chain_1.thirdwebB3Mainnet, wallets: availableWallets, showThirdwebBranding: false, theme: (0, react_3.lightTheme)(), onConnect: async (wallet) => {
+                                    console.log("Wallet connected:", wallet);
+                                    // setShowWalletModal(false);
+                                    setSelectedPaymentMethod(PaymentMethod.CONNECT_WALLET);
+                                    onSelectPaymentMethod(PaymentMethod.CONNECT_WALLET);
+                                    setShowWalletModal(false);
+                                }, style: {
+                                    width: "100%",
+                                    minHeight: "300px",
+                                } })] }) }), typeof window !== "undefined" ? document.getElementById("b3-root") || document.body : document.body)] }));
 }

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

@@ -79,7 +79,6 @@ function PanelOnrampPaymentInner(props) {
                     vendor: vendor,
                     paymentMethod: paymentMethod || "",
                     country: geoData?.country || "US",
-                    ipAddress: geoData?.ip,
                     redirectUrl: window.location.origin === "https://basement.fun" ? "https://basement.fun/deposit" : window.location.origin,
                 },
                 expectedDstAmount: anyspendQuote?.data?.currencyOut?.amount?.toString() || "0",

package/dist/cjs/anyspend/react/components/webview/WebviewOnrampPayment.js

@@ -134,7 +134,6 @@ function WebviewOnrampPaymentInner({ srcAmountOnRamp, recipientAddress, destinat
                             vendor: "stripe-web2",
                             paymentMethod: "",
                             country: geoData.country || "US",
-                            ipAddress: geoData.ip,
                             redirectUrl: `${window.location.origin}${userId ? `?userId=${userId}` : ""}`,
                         },
                         expectedDstAmount: anyspendQuote.data?.currencyOut?.amount?.toString() || "0",

package/dist/cjs/anyspend/react/hooks/useAnyspendCreateOnrampOrder.d.ts

@@ -5,7 +5,6 @@ export type OnrampOptions = {
     paymentMethod: string;
     country: string;
     redirectUrl: string;
-    ipAddress?: string;
 };
 export type CreateOnrampOrderParams = Omit<CreateOrderParams, "srcChain" | "srcToken" | "srcAmount"> & {
     srcFiatAmount: string;

package/dist/cjs/anyspend/react/hooks/useAnyspendCreateOnrampOrder.js

@@ -24,10 +24,6 @@ function useAnyspendCreateOnrampOrder({ onSuccess, onError } = {}) {
         mutationFn: async (params) => {
             const { isMainnet, recipientAddress, orderType, dstChain, dstToken, srcFiatAmount, onramp, creatorAddress, expectedDstAmount, nft, tournament, payload, partnerId, } = params;
             try {
-                // Validate Stripe onramp options
-                if (onramp.vendor === "stripe" && !onramp.ipAddress) {
-                    throw new Error("IP address is required for Stripe onramp");
-                }
                 // Validate required onramp fields
                 if (!onramp.vendor || !onramp.country) {
                     throw new Error("Missing required onramp fields: vendor, country");

package/dist/cjs/anyspend/react/hooks/useGeoOnrampOptions.js

@@ -16,7 +16,7 @@ function useGeoOnrampOptions(isMainnet, srcFiatAmount) {
     // Use existing hooks
     const { geoData, loading: isLoadingGeo, error: geoError } = (0, useGetGeo_1.useGetGeo)();
     const { coinbaseOnrampOptions, isLoadingCoinbaseOnrampOptions, coinbaseOnrampOptionsError } = (0, useCoinbaseOnrampOptions_1.useCoinbaseOnrampOptions)(isMainnet, geoData?.country, visitorData);
-    const { isStripeOnrampSupported, stripeWeb2Support, isLoadingStripeSupport, stripeSupportError } = (0, useStripeSupport_1.useStripeSupport)(isMainnet, geoData?.ip || "", srcFiatAmount, visitorData);
+    const { isStripeOnrampSupported, stripeWeb2Support, isLoadingStripeSupport, stripeSupportError } = (0, useStripeSupport_1.useStripeSupport)(isMainnet, srcFiatAmount, visitorData);
     // Calculate available payment methods based on the amount
     const coinbaseAvailablePaymentMethods = (0, react_1.useMemo)(() => {
         if (!coinbaseOnrampOptions?.paymentCurrencies?.[0]?.limits || !srcFiatAmount)

package/dist/cjs/anyspend/react/hooks/useStripeSupport.d.ts

@@ -1,5 +1,5 @@
 import { VisitorData } from "../../../anyspend/types/fingerprint";
-export declare function useStripeSupport(isMainnet: boolean, ipAddress: string, usdAmount?: string, visitorData?: VisitorData, isLoadingVisitorData?: boolean): {
+export declare function useStripeSupport(isMainnet: boolean, usdAmount?: string, visitorData?: VisitorData, isLoadingVisitorData?: boolean): {
     isStripeOnrampSupported: boolean;
     stripeWeb2Support: {
         isSupport: false;

package/dist/cjs/anyspend/react/hooks/useStripeSupport.js

@@ -4,11 +4,11 @@ exports.useStripeSupport = useStripeSupport;
 const anyspend_1 = require("../../../anyspend/services/anyspend");
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("react");
-function useStripeSupport(isMainnet, ipAddress, usdAmount, visitorData, isLoadingVisitorData) {
+function useStripeSupport(isMainnet, usdAmount, visitorData, isLoadingVisitorData) {
     const { data, isLoading, error, refetch } = (0, react_query_1.useQuery)({
-        queryKey: ["useStripeSupport", isMainnet, ipAddress, usdAmount, visitorData?.requestId, visitorData?.visitorId],
-        queryFn: () => anyspend_1.anyspendService.checkStripeSupport(isMainnet, ipAddress, usdAmount, visitorData),
-        enabled: !!ipAddress && !isLoadingVisitorData,
+        queryKey: ["useStripeSupport", isMainnet, usdAmount, visitorData?.requestId, visitorData?.visitorId],
+        queryFn: () => anyspend_1.anyspendService.checkStripeSupport(isMainnet, usdAmount, visitorData),
+        enabled: !isLoadingVisitorData,
     });
     return (0, react_1.useMemo)(() => ({
         isStripeOnrampSupported: data?.stripeOnramp || false,

package/dist/cjs/anyspend/services/anyspend.d.ts

@@ -30,7 +30,7 @@ export declare const anyspendService: {
     getOrderAndTransactions: (isMainnet: boolean, orderId: string | undefined) => Promise<GetOrderAndTxsResponse>;
     getOrderHistory: (isMainnet: boolean, creatorAddress: string | undefined, limit?: number, offset?: number) => Promise<GetOrderHistoryResponse>;
     getCoinbaseOnrampOptions: (isMainnet: boolean, country: string, visitorData?: VisitorData) => Promise<GetCoinbaseOnrampOptionsResponse>;
-    checkStripeSupport: (isMainnet: boolean, ipAddress: string, usdAmount?: string, visitorData?: VisitorData) => Promise<{
+    checkStripeSupport: (isMainnet: boolean, usdAmount?: string, visitorData?: VisitorData) => Promise<{
         stripeOnramp: boolean;
         stripeWeb2: components["schemas"]["StripeWeb2Support"];
     }>;

package/dist/cjs/anyspend/services/anyspend.js

@@ -96,9 +96,8 @@ exports.anyspendService = {
         const data = await response.json();
         return data;
     },
-    checkStripeSupport: async (isMainnet, ipAddress, usdAmount, visitorData) => {
+    checkStripeSupport: async (isMainnet, usdAmount, visitorData) => {
         const params = new URLSearchParams({
-            ipAddress,
             usdAmount: usdAmount || "",
         });
         const response = await fetch(`${isMainnet ? constants_1.ANYSPEND_MAINNET_BASE_URL : constants_1.ANYSPEND_TESTNET_BASE_URL}/onramp/stripe/supported?${params.toString()}`, {

package/dist/cjs/anyspend/types/api.d.ts

@@ -238,12 +238,7 @@ export interface paths {
          */
         get: {
             parameters: {
-                query: {
-                    /**
-                     * @description IP address to check location-based support
-                     * @example 192.168.1.1
-                     */
-                    ipAddress: string;
+                query?: {
                     /**
                      * @description Optional USD amount for transaction limit checks
                      * @example 100.00
@@ -903,11 +898,6 @@ export interface components {
              * @example
              */
             paymentMethod?: string;
-            /**
-             * @description User's IP address
-             * @example 96.225.86.216
-             */
-            ipAddress?: string;
             /**
              * @description Redirect URL after payment
              * @example https://www.anyspend.com
@@ -936,11 +926,6 @@ export interface components {
              * @example SG
              */
             country?: string;
-            /**
-             * @description User's IP address
-             * @example 149.88.23.87
-             */
-            ipAddress?: string;
             /**
              * @description URL to redirect after payment
              * @example https://www.anyspend.com

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, isConnected } = (0, react_1.useAuthentication)(props.partnerId, props.loginWithSiwe);
     const isMobile = (0, react_1.useIsMobile)();
     (0, react_2.useEffect)(() => {
         if (account) {
@@ -24,7 +24,7 @@ function SignInWithB3(props) {
         });
         setB3ModalOpen(true);
     };
-    if (isAuthenticated) {
+    if (isConnected) {
         return (0, jsx_runtime_1.jsx)(ManageAccountButton_1.ManageAccountButton, { ...props });
     }
     if (isAuthenticating) {

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

@@ -19,9 +19,12 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     const { setUser, 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 } = (0, react_1.useModalStore)();
+    const { setB3ModalContentType, setB3ModalOpen, isOpen } = (0, react_1.useModalStore)();
     const account = (0, react_3.useActiveAccount)();
-    const [loginComplete, setLoginComplete] = (0, react_2.useState)(source === "requestPermissions" ? true : false);
+    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)({
@@ -32,7 +35,6 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         },
     });
     const { authenticate } = (0, react_1.useSiwe)();
-    const [authenticatingWithB3, setAuthenticatingWithB3] = (0, react_2.useState)(false);
     const [refetchQueued, setRefetchQueued] = (0, react_2.useState)(false);
     // Enhanced refetchSigners function that tracks number of attempts
     const handleRefetchSigners = (0, react_2.useCallback)(() => {
@@ -58,11 +60,14 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     // Handle post-login flow after signers are loaded
     (0, react_2.useEffect)(() => {
         debug("@@SignInWithB3Flow:useEffect", {
-            loginComplete,
+            isConnected,
+            isAuthenticating,
             isFetchingSigners,
+            closeAfterLogin,
+            isOpen,
             source,
         });
-        if (loginComplete && !isFetchingSigners) {
+        if (isConnected) {
             // Check if we already have a signer for this partner
             const hasExistingSigner = signers?.some(signer => signer.partner.id === partnerId);
             if (hasExistingSigner) {
@@ -102,7 +107,6 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         signers,
         isFetchingSigners,
         partnerId,
-        loginComplete,
         handleRefetchSigners,
         source,
         closeAfterLogin,
@@ -111,6 +115,9 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
         onSessionKeySuccess,
         setB3ModalOpen,
         signersEnabled,
+        isConnected,
+        isAuthenticating,
+        isOpen,
     ]);
     debug("render", {
         step,
@@ -155,16 +162,16 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     ]);
     const handleLoginSuccess = (0, react_2.useCallback)(async (account) => {
         debug("Authenticating with B3 via SIWE");
+        setIsConnected(true);
         if (loginWithSiwe) {
-            setAuthenticatingWithB3(true);
+            setIsAuthenticating(true);
             const userAuth = await authenticate(account, partnerId);
             setUser(userAuth.user);
         }
         debug("handleLoginSuccess:account", account);
         onLoginSuccess?.(account);
-        setLoginComplete(true);
-        setAuthenticatingWithB3(false);
-    }, [authenticate, loginWithSiwe, onLoginSuccess, setUser, partnerId]);
+        setIsAuthenticating(false);
+    }, [loginWithSiwe, onLoginSuccess, setIsAuthenticating, authenticate, partnerId, setUser, setIsConnected]);
     (0, react_2.useEffect)(() => {
         if (step === "permissions") {
             setB3ModalContentType({
@@ -180,7 +187,7 @@ function SignInWithB3Flow({ strategies, onLoginSuccess, onSessionKeySuccess, onE
     if (refetchError) {
         return ((0, jsx_runtime_1.jsx)(LoginStep_1.LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)("div", { className: "p-4 text-center text-red-500", children: refetchError }) }));
     }
-    if (authenticatingWithB3 || (isFetchingSigners && step === "login") || source === "requestPermissions") {
+    if (isAuthenticating || (isFetchingSigners && step === "login") || source === "requestPermissions") {
         return ((0, jsx_runtime_1.jsx)(LoginStep_1.LoginStepContainer, { partnerId: partnerId, children: (0, jsx_runtime_1.jsx)("div", { className: "mt-8 flex items-center justify-center", children: (0, jsx_runtime_1.jsx)(react_1.Loading, { variant: "white", size: "lg" }) }) }));
     }
     if (step === "login") {

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

@@ -6,7 +6,7 @@ const react_1 = require("../../../../global-account/react");
 const utils_1 = require("../../../../shared/utils");
 function ManageAccountButton(props) {
     const { setB3ModalOpen, setB3ModalContentType } = (0, react_1.useModalStore)();
-    const { isAuthenticated } = (0, react_1.useAuthentication)(props.partnerId, props.loginWithSiwe);
+    const { isConnected } = (0, react_1.useAuthentication)(props.partnerId, props.loginWithSiwe);
     const handleClickManageAccount = () => {
         setB3ModalContentType({
             ...props,
@@ -14,7 +14,7 @@ function ManageAccountButton(props) {
         });
         setB3ModalOpen(true);
     };
-    if (!isAuthenticated)
+    if (!isConnected)
         return null;
     return ((0, jsx_runtime_1.jsx)(react_1.StyleRoot, { children: (0, jsx_runtime_1.jsxs)(react_1.Button, { onClick: handleClickManageAccount, style: { backgroundColor: "#3368ef" }, className: (0, utils_1.cn)("b3-manage-account-button flex items-center gap-2 text-white", props.className), children: [props.withLogo !== false && ((0, jsx_runtime_1.jsx)("img", { src: "https://cdn.b3.fun/b3_logo_white.svg", alt: "B3 Logo", className: "h-5 w-5" })), props.loggedInButtonText || "Manage Account"] }) }));
 }

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

@@ -18,7 +18,7 @@ export { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";
 export { useMediaQuery } from "./useMediaQuery";
 export { useNativeBalance, useNativeBalanceFromRPC } from "./useNativeBalance";
 export { useOneBalance } from "./useOneBalance";
-export { useProfile, useProfilePreference, type Profile, type CombinedProfile, type PreferenceRequestBody, } from "./useProfile";
+export { useProfile, useProfilePreference, type CombinedProfile, type PreferenceRequestBody, type Profile, } from "./useProfile";
 export { useQueryB3 } from "./useQueryB3";
 export { useQueryBSMNT } from "./useQueryBSMNT";
 export { useRemoveSessionKey } from "./useRemoveSessionKey";

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

@@ -4,6 +4,8 @@ export declare function useAuthentication(partnerId: string, loginWithSiwe?: boo
     isAuthenticating: boolean;
     isAuthenticated: boolean;
     isReady: boolean;
+    isConnecting: boolean;
+    isConnected: boolean;
     wallet: import("thirdweb/dist/types/wallets/in-app/core/wallet/types").EcosystemWallet;
     preAuthenticate: typeof preAuthenticate;
     connect: (strategyOptions?: import("thirdweb/wallets").SingleStepAuthArgsType) => Promise<import("thirdweb/wallets").Wallet | null>;