@b3dotfun/sdk 0.0.29-alpha.4 → 0.0.29-alpha.6

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

@@ -27,6 +27,7 @@ const RecipientSelection_1 = require("./common/RecipientSelection");
 const escrow_1 = require("../../../anyspend/abis/escrow");
 const lucide_react_1 = require("lucide-react");
 const PanelOnramp_1 = require("./common/PanelOnramp");
+const SLIPPAGE_PERCENT = 3;
 function generateEncodedDataForDepositHype(amount, beneficiary) {
     (0, invariant_1.default)(BigInt(amount) > 0, "Amount must be greater than zero");
     const encodedData = (0, viem_1.encodeFunctionData)({
@@ -50,6 +51,7 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
         onTransactionSuccess: onSuccess,
         sourceTokenAddress,
         sourceTokenChainId,
+        slippage: SLIPPAGE_PERCENT,
     });
     // Button state logic
     const btnInfo = (0, react_3.useMemo)(() => {
@@ -133,7 +135,10 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             (0, invariant_1.default)(selectedRecipientAddress, "Recipient address is not found");
             (0, invariant_1.default)(depositContractAddress, "Deposit contract address is not found");
             const srcAmountBigInt = BigInt(activeInputAmountInWei);
-            const depositAmountWei = anyspendQuote.data?.currencyOut?.amount || "0";
+            // TODO: temp subtract 3% for slippage
+            const originalDepositAmountWei = anyspendQuote.data?.currencyOut?.amount || "0";
+            const depositAmountWei = ((BigInt(originalDepositAmountWei) * BigInt(100 - SLIPPAGE_PERCENT)) /
+                BigInt(100)).toString();
             const encodedData = generateEncodedDataForDepositHype(depositAmountWei, selectedRecipientAddress);
             createOrder({
                 recipientAddress: selectedRecipientAddress,
@@ -240,7 +245,6 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             setSelectedFiatPaymentMethod(method);
             setActivePanel(useAnyspendFlow_1.PanelView.MAIN);
         }, srcAmountOnRamp: srcAmount }));
-    console.log("activePanel", activePanel, orderId, oat);
     // If showing token selection, render with panel transitions
     return ((0, jsx_runtime_1.jsx)(react_1.StyleRoot, { children: (0, jsx_runtime_1.jsx)("div", { className: (0, cn_1.cn)("anyspend-container font-inter 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_1.TransitionPanel, { activeIndex: orderId

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

@@ -49,6 +49,9 @@ function getOrderSuccessText({ order, tournament, formattedActualDstAmount, dstT
             actionText = `funded ${tournament?.name}`;
             return `Successfully ${actionText}`;
         case "custom":
+            if (order.metadata.action === anyspend_1.DEPOSIT_HYPE_ACTION) {
+                return `Successfully deposited ${(0, number_1.formatTokenAmount)(BigInt(order.payload?.amount || "0"), 18)} HYPE to ${recipient}`;
+            }
             actionText = order.metadata.action || `executed contract`;
             return `Successfully ${actionText}`;
         default:

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

@@ -18,8 +18,9 @@ interface UseAnyspendFlowProps {
     onTransactionSuccess?: () => void;
     sourceTokenAddress?: string;
     sourceTokenChainId?: number;
+    slippage?: number;
 }
-export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrder, isDepositMode, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, }: UseAnyspendFlowProps): {
+export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrder, isDepositMode, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, slippage, }: UseAnyspendFlowProps): {
     activePanel: PanelView;
     setActivePanel: import("react").Dispatch<import("react").SetStateAction<PanelView>>;
     orderId: string | undefined;

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

@@ -22,7 +22,7 @@ var PanelView;
     PanelView[PanelView["ORDER_DETAILS"] = 4] = "ORDER_DETAILS";
     PanelView[PanelView["LOADING"] = 5] = "LOADING";
 })(PanelView || (exports.PanelView = PanelView = {}));
-function useAnyspendFlow({ paymentType = "crypto", recipientAddress, loadOrder, isDepositMode = false, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, }) {
+function useAnyspendFlow({ paymentType = "crypto", recipientAddress, loadOrder, isDepositMode = false, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, slippage = 0, }) {
     const searchParams = (0, react_2.useSearchParamsSSR)();
     const router = (0, react_2.useRouter)();
     // Panel and order state
@@ -103,13 +103,15 @@ function useAnyspendFlow({ paymentType = "crypto", recipientAddress, loadOrder,
         if (anyspendQuote?.data?.currencyOut?.amount && anyspendQuote.data.currencyOut.currency?.decimals) {
             const amount = anyspendQuote.data.currencyOut.amount;
             const decimals = anyspendQuote.data.currencyOut.currency.decimals;
-            const formattedAmount = (0, number_1.formatTokenAmount)(BigInt(amount), decimals, 6, false);
+            // Apply slippage (0-100) - reduce amount by slippage percentageFixed slippage value
+            const amountWithSlippage = (BigInt(amount) * BigInt(100 - slippage)) / BigInt(100);
+            const formattedAmount = (0, number_1.formatTokenAmount)(amountWithSlippage, decimals, 6, false);
             setDstAmount(formattedAmount);
         }
         else {
             setDstAmount("");
         }
-    }, [anyspendQuote]);
+    }, [anyspendQuote, slippage]);
     // Update useEffect for URL parameter to not override loadOrder
     (0, react_3.useEffect)(() => {
         if (loadOrder)

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkAccount = LinkAccount;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const constants_1 = require("../../../../shared/constants");
 const thirdweb_1 = require("../../../../shared/utils/thirdweb");
 const lucide_react_1 = require("lucide-react");
 const react_1 = require("react");
@@ -97,6 +98,10 @@ function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, pa
                     client: thirdweb_1.client,
                     strategy: "email",
                     email,
+                    ecosystem: {
+                        id: constants_1.ecosystemWalletId,
+                        partnerId: partnerId,
+                    },
                 });
             }
             else if (selectedMethod === "phone") {
@@ -104,6 +109,10 @@ function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, pa
                     client: thirdweb_1.client,
                     strategy: "phone",
                     phoneNumber: phone,
+                    ecosystem: {
+                        id: constants_1.ecosystemWalletId,
+                        partnerId: partnerId,
+                    },
                 });
             }
             setOtpSent(true);
@@ -117,10 +126,12 @@ function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, pa
     };
     const handleLinkAccount = async () => {
         if (!otp) {
+            console.error("No OTP entered");
             setError("Please enter the verification code");
             return;
         }
         try {
+            setOtpSent(false);
             setLinkingState(true, selectedMethod);
             setError(null);
             if (selectedMethod === "email") {
@@ -139,17 +150,12 @@ function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, pa
                     verificationCode: otp,
                 }, mutationOptions);
             }
-            onSuccess?.();
-            onClose?.();
         }
         catch (error) {
             console.error("Error linking account:", error);
             setError(error instanceof Error ? error.message : "Failed to link account");
             onError?.(error);
         }
-        finally {
-            setLinkingState(false);
-        }
     };
     const handleSocialLink = async (strategy) => {
         try {
@@ -200,17 +206,24 @@ function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, pa
         setError(null);
         setLinkingState(false);
     }, [isLinking, setSelectedMethod, setEmail, setPhone, setOtp, setOtpSent, setError, setLinkingState]);
+    const handleFinishedLinking = (0, react_1.useCallback)((success) => {
+        if (success) {
+            onSuccess?.();
+            onClose?.();
+        }
+        setLinkingState(false);
+        navigateBack();
+        setB3ModalContentType({
+            type: "manageAccount",
+            activeTab: "settings",
+            setActiveTab: () => { },
+            chain,
+            partnerId,
+        });
+    }, [chain, navigateBack, partnerId, setB3ModalContentType, setLinkingState, onSuccess, onClose]);
     (0, react_1.useEffect)(() => {
         if (isLinking) {
-            setLinkingState(false);
-            navigateBack();
-            setB3ModalContentType({
-                type: "manageAccount",
-                activeTab: "settings",
-                setActiveTab: () => { },
-                chain,
-                partnerId,
-            });
+            handleFinishedLinking(true);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [profiles.length]);
@@ -224,5 +237,5 @@ function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, chain, pa
                             else {
                                 handleSocialLink(method.id);
                             }
-                        }, disabled: linkingMethod === method.id, children: isLinking && linkingMethod === method.id ? (0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "animate-spin" }) : method.label }, method.id))), availableAuthMethods.length === 0 && ((0, jsx_runtime_1.jsx)("div", { className: "text-b3-foreground-muted py-8 text-center", children: "All available authentication methods have been connected" }))] })) : ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-4", children: [selectedMethod === "email" && ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [(0, jsx_runtime_1.jsx)("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Email Address" }), (0, jsx_runtime_1.jsx)("input", { type: "email", placeholder: "Enter your email", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: email, onChange: e => setEmail(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "email") })] })), selectedMethod === "phone" && ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [(0, jsx_runtime_1.jsx)("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Phone Number" }), (0, jsx_runtime_1.jsx)("input", { type: "tel", placeholder: "Enter your phone number", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: phone, onChange: e => setPhone(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "phone") }), (0, jsx_runtime_1.jsx)("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Include country code (e.g., +1 for US)" })] })), error && (0, jsx_runtime_1.jsx)("div", { className: "text-b3-negative font-neue-montreal-medium py-2 text-sm", children: error }), otpSent ? ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [(0, jsx_runtime_1.jsx)("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Verification Code" }), (0, jsx_runtime_1.jsx)("input", { type: "text", placeholder: "Enter verification code", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: otp, onChange: e => setOtp(e.target.value), disabled: isLinking && linkingMethod === selectedMethod })] }), (0, jsx_runtime_1.jsx)(button_1.Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleLinkAccount, disabled: !otp || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? (0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "animate-spin" }) : "Link Account" })] })) : ((0, jsx_runtime_1.jsx)(button_1.Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleSendOTP, disabled: (!email && !phone) || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "animate-spin" })) : ("Send Verification Code") }))] }))] }));
+                        }, disabled: linkingMethod === method.id, children: isLinking && linkingMethod === method.id ? (0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "animate-spin" }) : method.label }, method.id))), availableAuthMethods.length === 0 && ((0, jsx_runtime_1.jsx)("div", { className: "text-b3-foreground-muted py-8 text-center", children: "All available authentication methods have been connected" }))] })) : ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-4", children: [selectedMethod === "email" && ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [(0, jsx_runtime_1.jsx)("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Email Address" }), (0, jsx_runtime_1.jsx)("input", { type: "email", placeholder: "Enter your email", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: email, onChange: e => setEmail(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "email") })] })), selectedMethod === "phone" && ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [(0, jsx_runtime_1.jsx)("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Phone Number" }), (0, jsx_runtime_1.jsx)("input", { type: "tel", placeholder: "Enter your phone number", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: phone, onChange: e => setPhone(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "phone") }), (0, jsx_runtime_1.jsx)("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Include country code (e.g., +1 for US)" })] })), error && (0, jsx_runtime_1.jsx)("div", { className: "text-b3-negative font-neue-montreal-medium py-2 text-sm", children: error }), otpSent ? ((0, jsx_runtime_1.jsxs)("div", { className: "space-y-4", children: [(0, jsx_runtime_1.jsxs)("div", { className: "space-y-2", children: [(0, jsx_runtime_1.jsx)("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Verification Code" }), (0, jsx_runtime_1.jsx)("input", { type: "text", placeholder: "Enter verification code", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: otp, onChange: e => setOtp(e.target.value) })] }), (0, jsx_runtime_1.jsx)(button_1.Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleLinkAccount, children: "Link Account" })] })) : ((0, jsx_runtime_1.jsx)(button_1.Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleSendOTP, disabled: (!email && !phone) || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? ((0, jsx_runtime_1.jsx)(lucide_react_1.Loader2, { className: "animate-spin" })) : ("Send Verification Code") }))] }))] }));
 }

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

@@ -140,5 +140,5 @@ function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit, chain
                     if (["balance", "assets", "apps", "settings"].includes(tab)) {
                         setActiveTab?.(tab);
                     }
-                }, children: [(0, jsx_runtime_1.jsxs)(react_1.TabsListPrimitive, { className: "font-neue-montreal-semibold text-b3-grey flex h-8 w-full items-start justify-start gap-8 border-0 text-xl md:p-4", children: [(0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "balance", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Overview" }), (0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "assets", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Mints" }), (0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "apps", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Apps" }), (0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Settings" })] }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "balance", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(BalanceContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "assets", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(AssetsContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "apps", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(AppsContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "settings", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(SettingsContent, {}) })] }) }) }));
+                }, children: [(0, jsx_runtime_1.jsxs)(react_1.TabsListPrimitive, { className: "font-neue-montreal-semibold text-b3-grey flex h-8 w-full items-start justify-start gap-8 border-0 text-xl md:p-4", children: [(0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "balance", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Overview" }), (0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "assets", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Mints" }), (0, jsx_runtime_1.jsx)(react_1.TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Settings" })] }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "balance", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(BalanceContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "assets", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(AssetsContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "apps", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(AppsContent, {}) }), (0, jsx_runtime_1.jsx)(react_1.TabsContentPrimitive, { value: "settings", className: "pt-4 md:p-4", children: (0, jsx_runtime_1.jsx)(SettingsContent, {}) })] }) }) }));
 }

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

@@ -21,6 +21,7 @@ import { RecipientSelection } from "./common/RecipientSelection.js";
 import { ESCROW_ABI } from "../../../anyspend/abis/escrow.js";
 import { ArrowDown } from "lucide-react";
 import { PanelOnramp } from "./common/PanelOnramp.js";
+const SLIPPAGE_PERCENT = 3;
 function generateEncodedDataForDepositHype(amount, beneficiary) {
     invariant(BigInt(amount) > 0, "Amount must be greater than zero");
     const encodedData = encodeFunctionData({
@@ -44,6 +45,7 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
         onTransactionSuccess: onSuccess,
         sourceTokenAddress,
         sourceTokenChainId,
+        slippage: SLIPPAGE_PERCENT,
     });
     // Button state logic
     const btnInfo = useMemo(() => {
@@ -127,7 +129,10 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             invariant(selectedRecipientAddress, "Recipient address is not found");
             invariant(depositContractAddress, "Deposit contract address is not found");
             const srcAmountBigInt = BigInt(activeInputAmountInWei);
-            const depositAmountWei = anyspendQuote.data?.currencyOut?.amount || "0";
+            // TODO: temp subtract 3% for slippage
+            const originalDepositAmountWei = anyspendQuote.data?.currencyOut?.amount || "0";
+            const depositAmountWei = ((BigInt(originalDepositAmountWei) * BigInt(100 - SLIPPAGE_PERCENT)) /
+                BigInt(100)).toString();
             const encodedData = generateEncodedDataForDepositHype(depositAmountWei, selectedRecipientAddress);
             createOrder({
                 recipientAddress: selectedRecipientAddress,
@@ -234,7 +239,6 @@ function AnySpendDepositHypeInner({ loadOrder, mode = "modal", recipientAddress,
             setSelectedFiatPaymentMethod(method);
             setActivePanel(PanelView.MAIN);
         }, srcAmountOnRamp: srcAmount }));
-    console.log("activePanel", activePanel, orderId, oat);
     // If showing token selection, render with panel transitions
     return (_jsx(StyleRoot, { children: _jsx("div", { className: cn("anyspend-container font-inter 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: _jsx(TransitionPanel, { activeIndex: orderId

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

@@ -1,6 +1,6 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { ALL_CHAINS, getChainName, getErrorDisplay, getExplorerTxUrl, getPaymentUrl, getStatusDisplay, isNativeToken, RELAY_ETH_ADDRESS, RELAY_SOLANA_MAINNET_CHAIN_ID, } from "../../../../anyspend/index.js";
+import { ALL_CHAINS, DEPOSIT_HYPE_ACTION, getChainName, getErrorDisplay, getExplorerTxUrl, getPaymentUrl, getStatusDisplay, isNativeToken, RELAY_ETH_ADDRESS, RELAY_SOLANA_MAINNET_CHAIN_ID, } from "../../../../anyspend/index.js";
 import { Badge, Button, CopyToClipboard, ShinyButton, Skeleton, TextLoop, TextShimmer, useAccountWallet, useModalStore, useProfile, useUnifiedChainSwitchAndExecute, } from "../../../../global-account/react/index.js";
 import { useRouter, useSearchParams } from "../../../../shared/react/hooks/index.js";
 import { cn } from "../../../../shared/utils/index.js";
@@ -43,6 +43,9 @@ function getOrderSuccessText({ order, tournament, formattedActualDstAmount, dstT
             actionText = `funded ${tournament?.name}`;
             return `Successfully ${actionText}`;
         case "custom":
+            if (order.metadata.action === DEPOSIT_HYPE_ACTION) {
+                return `Successfully deposited ${formatTokenAmount(BigInt(order.payload?.amount || "0"), 18)} HYPE to ${recipient}`;
+            }
             actionText = order.metadata.action || `executed contract`;
             return `Successfully ${actionText}`;
         default:

package/dist/esm/anyspend/react/hooks/useAnyspendFlow.d.ts

@@ -18,8 +18,9 @@ interface UseAnyspendFlowProps {
     onTransactionSuccess?: () => void;
     sourceTokenAddress?: string;
     sourceTokenChainId?: number;
+    slippage?: number;
 }
-export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrder, isDepositMode, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, }: UseAnyspendFlowProps): {
+export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrder, isDepositMode, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, slippage, }: UseAnyspendFlowProps): {
     activePanel: PanelView;
     setActivePanel: import("react").Dispatch<import("react").SetStateAction<PanelView>>;
     orderId: string | undefined;

package/dist/esm/anyspend/react/hooks/useAnyspendFlow.js

@@ -18,7 +18,7 @@ export var PanelView;
     PanelView[PanelView["ORDER_DETAILS"] = 4] = "ORDER_DETAILS";
     PanelView[PanelView["LOADING"] = 5] = "LOADING";
 })(PanelView || (PanelView = {}));
-export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, loadOrder, isDepositMode = false, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, }) {
+export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, loadOrder, isDepositMode = false, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, slippage = 0, }) {
     const searchParams = useSearchParamsSSR();
     const router = useRouter();
     // Panel and order state
@@ -99,13 +99,15 @@ export function useAnyspendFlow({ paymentType = "crypto", recipientAddress, load
         if (anyspendQuote?.data?.currencyOut?.amount && anyspendQuote.data.currencyOut.currency?.decimals) {
             const amount = anyspendQuote.data.currencyOut.amount;
             const decimals = anyspendQuote.data.currencyOut.currency.decimals;
-            const formattedAmount = formatTokenAmount(BigInt(amount), decimals, 6, false);
+            // Apply slippage (0-100) - reduce amount by slippage percentageFixed slippage value
+            const amountWithSlippage = (BigInt(amount) * BigInt(100 - slippage)) / BigInt(100);
+            const formattedAmount = formatTokenAmount(amountWithSlippage, decimals, 6, false);
             setDstAmount(formattedAmount);
         }
         else {
             setDstAmount("");
         }
-    }, [anyspendQuote]);
+    }, [anyspendQuote, slippage]);
     // Update useEffect for URL parameter to not override loadOrder
     useEffect(() => {
         if (loadOrder)

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

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ecosystemWalletId } from "../../../../shared/constants/index.js";
 import { client } from "../../../../shared/utils/thirdweb.js";
 import { Loader2 } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
@@ -94,6 +95,10 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
                     client,
                     strategy: "email",
                     email,
+                    ecosystem: {
+                        id: ecosystemWalletId,
+                        partnerId: partnerId,
+                    },
                 });
             }
             else if (selectedMethod === "phone") {
@@ -101,6 +106,10 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
                     client,
                     strategy: "phone",
                     phoneNumber: phone,
+                    ecosystem: {
+                        id: ecosystemWalletId,
+                        partnerId: partnerId,
+                    },
                 });
             }
             setOtpSent(true);
@@ -114,10 +123,12 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
     };
     const handleLinkAccount = async () => {
         if (!otp) {
+            console.error("No OTP entered");
             setError("Please enter the verification code");
             return;
         }
         try {
+            setOtpSent(false);
             setLinkingState(true, selectedMethod);
             setError(null);
             if (selectedMethod === "email") {
@@ -136,17 +147,12 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
                     verificationCode: otp,
                 }, mutationOptions);
             }
-            onSuccess?.();
-            onClose?.();
         }
         catch (error) {
             console.error("Error linking account:", error);
             setError(error instanceof Error ? error.message : "Failed to link account");
             onError?.(error);
         }
-        finally {
-            setLinkingState(false);
-        }
     };
     const handleSocialLink = async (strategy) => {
         try {
@@ -197,17 +203,24 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
         setError(null);
         setLinkingState(false);
     }, [isLinking, setSelectedMethod, setEmail, setPhone, setOtp, setOtpSent, setError, setLinkingState]);
+    const handleFinishedLinking = useCallback((success) => {
+        if (success) {
+            onSuccess?.();
+            onClose?.();
+        }
+        setLinkingState(false);
+        navigateBack();
+        setB3ModalContentType({
+            type: "manageAccount",
+            activeTab: "settings",
+            setActiveTab: () => { },
+            chain,
+            partnerId,
+        });
+    }, [chain, navigateBack, partnerId, setB3ModalContentType, setLinkingState, onSuccess, onClose]);
     useEffect(() => {
         if (isLinking) {
-            setLinkingState(false);
-            navigateBack();
-            setB3ModalContentType({
-                type: "manageAccount",
-                activeTab: "settings",
-                setActiveTab: () => { },
-                chain,
-                partnerId,
-            });
+            handleFinishedLinking(true);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [profiles.length]);
@@ -221,5 +234,5 @@ export function LinkAccount({ onSuccess: onSuccessCallback, onError, onClose, ch
                             else {
                                 handleSocialLink(method.id);
                             }
-                        }, disabled: linkingMethod === method.id, children: isLinking && linkingMethod === method.id ? _jsx(Loader2, { className: "animate-spin" }) : method.label }, method.id))), availableAuthMethods.length === 0 && (_jsx("div", { className: "text-b3-foreground-muted py-8 text-center", children: "All available authentication methods have been connected" }))] })) : (_jsxs("div", { className: "space-y-4", children: [selectedMethod === "email" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Email Address" }), _jsx("input", { type: "email", placeholder: "Enter your email", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: email, onChange: e => setEmail(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "email") })] })), selectedMethod === "phone" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Phone Number" }), _jsx("input", { type: "tel", placeholder: "Enter your phone number", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: phone, onChange: e => setPhone(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "phone") }), _jsx("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Include country code (e.g., +1 for US)" })] })), error && _jsx("div", { className: "text-b3-negative font-neue-montreal-medium py-2 text-sm", children: error }), otpSent ? (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Verification Code" }), _jsx("input", { type: "text", placeholder: "Enter verification code", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: otp, onChange: e => setOtp(e.target.value), disabled: isLinking && linkingMethod === selectedMethod })] }), _jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleLinkAccount, disabled: !otp || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? _jsx(Loader2, { className: "animate-spin" }) : "Link Account" })] })) : (_jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleSendOTP, disabled: (!email && !phone) || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? (_jsx(Loader2, { className: "animate-spin" })) : ("Send Verification Code") }))] }))] }));
+                        }, disabled: linkingMethod === method.id, children: isLinking && linkingMethod === method.id ? _jsx(Loader2, { className: "animate-spin" }) : method.label }, method.id))), availableAuthMethods.length === 0 && (_jsx("div", { className: "text-b3-foreground-muted py-8 text-center", children: "All available authentication methods have been connected" }))] })) : (_jsxs("div", { className: "space-y-4", children: [selectedMethod === "email" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Email Address" }), _jsx("input", { type: "email", placeholder: "Enter your email", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: email, onChange: e => setEmail(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "email") })] })), selectedMethod === "phone" && (_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Phone Number" }), _jsx("input", { type: "tel", placeholder: "Enter your phone number", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: phone, onChange: e => setPhone(e.target.value), disabled: otpSent || (isLinking && linkingMethod === "phone") }), _jsx("p", { className: "text-b3-foreground-muted font-neue-montreal-medium text-sm", children: "Include country code (e.g., +1 for US)" })] })), error && _jsx("div", { className: "text-b3-negative font-neue-montreal-medium py-2 text-sm", children: error }), otpSent ? (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "space-y-2", children: [_jsx("label", { className: "text-b3-grey font-neue-montreal-medium text-sm", children: "Verification Code" }), _jsx("input", { type: "text", placeholder: "Enter verification code", className: "bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2", value: otp, onChange: e => setOtp(e.target.value) })] }), _jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleLinkAccount, children: "Link Account" })] })) : (_jsx(Button, { className: "bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white", onClick: handleSendOTP, disabled: (!email && !phone) || (isLinking && linkingMethod === selectedMethod), children: isLinking && linkingMethod === selectedMethod ? (_jsx(Loader2, { className: "animate-spin" })) : ("Send Verification Code") }))] }))] }));
 }

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

@@ -134,5 +134,5 @@ export function ManageAccount({ onLogout, onSwap: _onSwap, onDeposit: _onDeposit
                     if (["balance", "assets", "apps", "settings"].includes(tab)) {
                         setActiveTab?.(tab);
                     }
-                }, children: [_jsxs(TabsListPrimitive, { className: "font-neue-montreal-semibold text-b3-grey flex h-8 w-full items-start justify-start gap-8 border-0 text-xl md:p-4", children: [_jsx(TabTriggerPrimitive, { value: "balance", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Overview" }), _jsx(TabTriggerPrimitive, { value: "assets", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Mints" }), _jsx(TabTriggerPrimitive, { value: "apps", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Apps" }), _jsx(TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Settings" })] }), _jsx(TabsContentPrimitive, { value: "balance", className: "pt-4 md:p-4", children: _jsx(BalanceContent, {}) }), _jsx(TabsContentPrimitive, { value: "assets", className: "pt-4 md:p-4", children: _jsx(AssetsContent, {}) }), _jsx(TabsContentPrimitive, { value: "apps", className: "pt-4 md:p-4", children: _jsx(AppsContent, {}) }), _jsx(TabsContentPrimitive, { value: "settings", className: "pt-4 md:p-4", children: _jsx(SettingsContent, {}) })] }) }) }));
+                }, children: [_jsxs(TabsListPrimitive, { className: "font-neue-montreal-semibold text-b3-grey flex h-8 w-full items-start justify-start gap-8 border-0 text-xl md:p-4", children: [_jsx(TabTriggerPrimitive, { value: "balance", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Overview" }), _jsx(TabTriggerPrimitive, { value: "assets", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Mints" }), _jsx(TabTriggerPrimitive, { value: "settings", className: "data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4", children: "Settings" })] }), _jsx(TabsContentPrimitive, { value: "balance", className: "pt-4 md:p-4", children: _jsx(BalanceContent, {}) }), _jsx(TabsContentPrimitive, { value: "assets", className: "pt-4 md:p-4", children: _jsx(AssetsContent, {}) }), _jsx(TabsContentPrimitive, { value: "apps", className: "pt-4 md:p-4", children: _jsx(AppsContent, {}) }), _jsx(TabsContentPrimitive, { value: "settings", className: "pt-4 md:p-4", children: _jsx(SettingsContent, {}) })] }) }) }));
 }

package/dist/types/anyspend/react/hooks/useAnyspendFlow.d.ts

@@ -18,8 +18,9 @@ interface UseAnyspendFlowProps {
     onTransactionSuccess?: () => void;
     sourceTokenAddress?: string;
     sourceTokenChainId?: number;
+    slippage?: number;
 }
-export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrder, isDepositMode, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, }: UseAnyspendFlowProps): {
+export declare function useAnyspendFlow({ paymentType, recipientAddress, loadOrder, isDepositMode, onOrderSuccess, onTransactionSuccess, sourceTokenAddress, sourceTokenChainId, slippage, }: UseAnyspendFlowProps): {
     activePanel: PanelView;
     setActivePanel: import("react").Dispatch<import("react").SetStateAction<PanelView>>;
     orderId: string | undefined;

package/package.json

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

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

@@ -22,6 +22,8 @@ import { ESCROW_ABI } from "@b3dotfun/sdk/anyspend/abis/escrow";
 import { ArrowDown } from "lucide-react";
 import { PanelOnramp } from "./common/PanelOnramp";
 
+const SLIPPAGE_PERCENT = 3;
+
 function generateEncodedDataForDepositHype(amount: string, beneficiary: string): string {
   invariant(BigInt(amount) > 0, "Amount must be greater than zero");
   const encodedData = encodeFunctionData({
@@ -107,6 +109,7 @@ function AnySpendDepositHypeInner({
     onTransactionSuccess: onSuccess,
     sourceTokenAddress,
     sourceTokenChainId,
+    slippage: SLIPPAGE_PERCENT,
   });
 
   // Button state logic
@@ -308,7 +311,12 @@ function AnySpendDepositHypeInner({
       invariant(depositContractAddress, "Deposit contract address is not found");
 
       const srcAmountBigInt = BigInt(activeInputAmountInWei);
-      const depositAmountWei = anyspendQuote.data?.currencyOut?.amount || "0";
+      // TODO: temp subtract 3% for slippage
+      const originalDepositAmountWei = anyspendQuote.data?.currencyOut?.amount || "0";
+      const depositAmountWei = (
+        (BigInt(originalDepositAmountWei) * BigInt(100 - SLIPPAGE_PERCENT)) /
+        BigInt(100)
+      ).toString();
       const encodedData = generateEncodedDataForDepositHype(depositAmountWei, selectedRecipientAddress);
 
       createOrder({
@@ -472,8 +480,6 @@ function AnySpendDepositHypeInner({
     />
   );
 
-  console.log("activePanel", activePanel, orderId, oat);
-
   // If showing token selection, render with panel transitions
   return (
     <StyleRoot>

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

@@ -2,6 +2,7 @@
 
 import {
   ALL_CHAINS,
+  DEPOSIT_HYPE_ACTION,
   getChainName,
   getErrorDisplay,
   getExplorerTxUrl,
@@ -97,6 +98,9 @@ function getOrderSuccessText({
       actionText = `funded ${tournament?.name}`;
       return `Successfully ${actionText}`;
     case "custom":
+      if (order.metadata.action === DEPOSIT_HYPE_ACTION) {
+        return `Successfully deposited ${formatTokenAmount(BigInt(order.payload?.amount || "0"), 18)} HYPE to ${recipient}`;
+      }
       actionText = order.metadata.action || `executed contract`;
       return `Successfully ${actionText}`;
     default:

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

@@ -35,6 +35,7 @@ interface UseAnyspendFlowProps {
   onTransactionSuccess?: () => void;
   sourceTokenAddress?: string;
   sourceTokenChainId?: number;
+  slippage?: number;
 }
 
 export function useAnyspendFlow({
@@ -46,6 +47,7 @@ export function useAnyspendFlow({
   onTransactionSuccess,
   sourceTokenAddress,
   sourceTokenChainId,
+  slippage = 0,
 }: UseAnyspendFlowProps) {
   const searchParams = useSearchParamsSSR();
   const router = useRouter();
@@ -144,12 +146,16 @@ export function useAnyspendFlow({
     if (anyspendQuote?.data?.currencyOut?.amount && anyspendQuote.data.currencyOut.currency?.decimals) {
       const amount = anyspendQuote.data.currencyOut.amount;
       const decimals = anyspendQuote.data.currencyOut.currency.decimals;
-      const formattedAmount = formatTokenAmount(BigInt(amount), decimals, 6, false);
+
+      // Apply slippage (0-100) - reduce amount by slippage percentageFixed slippage value
+      const amountWithSlippage = (BigInt(amount) * BigInt(100 - slippage)) / BigInt(100);
+
+      const formattedAmount = formatTokenAmount(amountWithSlippage, decimals, 6, false);
       setDstAmount(formattedAmount);
     } else {
       setDstAmount("");
     }
-  }, [anyspendQuote]);
+  }, [anyspendQuote, slippage]);
 
   // Update useEffect for URL parameter to not override loadOrder
   useEffect(() => {

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

@@ -1,3 +1,4 @@
+import { ecosystemWalletId } from "@b3dotfun/sdk/shared/constants";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
 import { Loader2 } from "lucide-react";
 import { useCallback, useEffect, useState } from "react";
@@ -122,12 +123,20 @@ export function LinkAccount({
           client,
           strategy: "email",
           email,
+          ecosystem: {
+            id: ecosystemWalletId,
+            partnerId: partnerId,
+          },
         });
       } else if (selectedMethod === "phone") {
         await preAuthenticate({
           client,
           strategy: "phone",
           phoneNumber: phone,
+          ecosystem: {
+            id: ecosystemWalletId,
+            partnerId: partnerId,
+          },
         });
       }
 
@@ -142,11 +151,13 @@ export function LinkAccount({
 
   const handleLinkAccount = async () => {
     if (!otp) {
+      console.error("No OTP entered");
       setError("Please enter the verification code");
       return;
     }
 
     try {
+      setOtpSent(false);
       setLinkingState(true, selectedMethod);
       setError(null);
 
@@ -171,15 +182,10 @@ export function LinkAccount({
           mutationOptions,
         );
       }
-
-      onSuccess?.();
-      onClose?.();
     } catch (error) {
       console.error("Error linking account:", error);
       setError(error instanceof Error ? error.message : "Failed to link account");
       onError?.(error as Error);
-    } finally {
-      setLinkingState(false);
     }
   };
 
@@ -239,8 +245,13 @@ export function LinkAccount({
     setLinkingState(false);
   }, [isLinking, setSelectedMethod, setEmail, setPhone, setOtp, setOtpSent, setError, setLinkingState]);
 
-  useEffect(() => {
-    if (isLinking) {
+  const handleFinishedLinking = useCallback(
+    (success: boolean) => {
+      if (success) {
+        onSuccess?.();
+        onClose?.();
+      }
+
       setLinkingState(false);
       navigateBack();
       setB3ModalContentType({
@@ -250,6 +261,13 @@ export function LinkAccount({
         chain,
         partnerId,
       });
+    },
+    [chain, navigateBack, partnerId, setB3ModalContentType, setLinkingState, onSuccess, onClose],
+  );
+
+  useEffect(() => {
+    if (isLinking) {
+      handleFinishedLinking(true);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [profiles.length]);
@@ -338,15 +356,13 @@ export function LinkAccount({
                   className="bg-b3-line text-b3-grey font-neue-montreal-medium focus:ring-b3-primary-blue/20 w-full rounded-xl p-4 focus:outline-none focus:ring-2"
                   value={otp}
                   onChange={e => setOtp(e.target.value)}
-                  disabled={isLinking && linkingMethod === selectedMethod}
                 />
               </div>
               <Button
                 className="bg-b3-primary-blue hover:bg-b3-primary-blue/90 font-neue-montreal-semibold h-12 w-full text-white"
                 onClick={handleLinkAccount}
-                disabled={!otp || (isLinking && linkingMethod === selectedMethod)}
               >
-                {isLinking && linkingMethod === selectedMethod ? <Loader2 className="animate-spin" /> : "Link Account"}
+                Link Account
               </Button>
             </div>
           ) : (

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

@@ -597,12 +597,16 @@ export function ManageAccount({
             >
               Mints
             </TabTriggerPrimitive>
+            {/*
+            // TODO: Apps is a remnant of session key flow. Moving forward, we should find a way to properly associate apps from linked partners that a user has logged in with
+            https://linear.app/npclabs/issue/B3-2318/find-a-way-to-properly-display-which-partner-apps-a-user-has-logged-in
+            
             <TabTriggerPrimitive
               value="apps"
               className="data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4"
             >
               Apps
-            </TabTriggerPrimitive>
+            </TabTriggerPrimitive> */}
             <TabTriggerPrimitive
               value="settings"
               className="data-[state=active]:text-b3-primary-blue data-[state=active]:border-b-b3-primary-blue flex-none rounded-none border-0 p-0 pb-1 text-xl leading-none tracking-wide transition-colors data-[state=active]:border-b data-[state=active]:bg-white md:pb-4"