@compass-labs/widgets 0.1.39 → 0.1.41

package/dist/index.mjs

@@ -1,9 +1,10 @@
-import { createContext, forwardRef, useState, useCallback, useImperativeHandle, useContext, useEffect, useMemo, useRef } from 'react';
+import { createContext, forwardRef, useState, useCallback, useImperativeHandle, useContext, useRef, useEffect, useMemo } from 'react';
 import { useQueryClient, useQuery, QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { CompassApiSDK } from '@compass-labs/api-sdk';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { arbitrum, base, mainnet } from 'viem/chains';
-import { Wallet, Loader2, ArrowDownLeft, ArrowUpRight, X, Check, Copy, LogOut, ChevronDown, AlertCircle, ArrowRight, ExternalLink, ArrowDownUp, ArrowLeftRight, CheckCircle, TrendingUp, Plus, Minus, Circle, AlertTriangle, XCircle, TrendingDown, ChevronRight, ArrowUpCircle, ArrowDownCircle, RotateCcw, Equal, ChevronUp, Inbox, Percent, Clock, Calendar } from 'lucide-react';
+import { Wallet, Loader2, ArrowDownLeft, ArrowUpRight, Send, ArrowRight, X, CheckCircle, AlertCircle, CreditCard, ExternalLink, XCircle, Check, Copy, LogOut, ChevronDown, ArrowDownUp, ArrowLeftRight, TrendingUp, Plus, Minus, Circle, AlertTriangle, TrendingDown, ChevronRight, ArrowUpCircle, ArrowDownCircle, RotateCcw, Equal, ChevronUp, Inbox, Percent, Clock, Calendar } from 'lucide-react';
+import { isAddress, encodeFunctionData, parseUnits } from 'viem';
 
 // src/provider/CompassProvider.tsx
 var ApiContext = createContext(null);
@@ -90,7 +91,10 @@ var disconnectedWallet = {
   },
   switchChain: null,
   login: null,
-  logout: null
+  logout: null,
+  fundWallet: null,
+  hasExternalWallet: true,
+  sendTransaction: null
 };
 function WalletProvider({ children, wallet }) {
   const value = wallet ? {
@@ -100,7 +104,10 @@ function WalletProvider({ children, wallet }) {
     signTypedData: wallet.signTypedData,
     switchChain: wallet.switchChain ?? null,
     login: wallet.login ?? null,
-    logout: wallet.logout ?? null
+    logout: wallet.logout ?? null,
+    fundWallet: wallet.fundWallet ?? null,
+    hasExternalWallet: wallet.hasExternalWallet ?? true,
+    sendTransaction: wallet.sendTransaction ?? null
   } : disconnectedWallet;
   return /* @__PURE__ */ jsx(WalletContext.Provider, { value, children });
 }
@@ -1269,25 +1276,29 @@ function WalletStatus({
   );
 }
 function ActionModal({ isOpen, onClose, title, children }) {
+  const modalRef = useRef(null);
   useEffect(() => {
     const handleEscape = (e) => {
       if (e.key === "Escape") onClose();
     };
     if (isOpen) {
       document.addEventListener("keydown", handleEscape);
-      document.body.style.overflow = "hidden";
     }
     return () => {
       document.removeEventListener("keydown", handleEscape);
-      document.body.style.overflow = "";
     };
   }, [isOpen, onClose]);
+  const handleOverlayWheel = useCallback((e) => {
+    if (modalRef.current && !modalRef.current.contains(e.target)) {
+      window.scrollBy(0, e.deltaY);
+    }
+  }, []);
   if (!isOpen) return null;
   return /* @__PURE__ */ jsxs(
     "div",
     {
       className: "fixed inset-0 z-50 flex items-center justify-center p-4",
-      style: { overflowY: "auto", scrollbarWidth: "none" },
+      onWheel: handleOverlayWheel,
       children: [
         /* @__PURE__ */ jsx(
           "div",
@@ -1300,21 +1311,27 @@ function ActionModal({ isOpen, onClose, title, children }) {
         /* @__PURE__ */ jsxs(
           "div",
           {
+            ref: modalRef,
             className: "relative w-full max-w-md",
             style: {
               backgroundColor: "var(--compass-color-surface)",
               boxShadow: "var(--compass-shadow-lg)",
               borderRadius: "var(--compass-border-radius-xl)",
-              fontFamily: "var(--compass-font-family)"
+              fontFamily: "var(--compass-font-family)",
+              maxHeight: "85vh",
+              overflowY: "auto",
+              overscrollBehavior: "contain",
+              scrollbarWidth: "none"
             },
             children: [
               /* @__PURE__ */ jsxs(
                 "div",
                 {
-                  className: "flex items-center justify-between border-b",
+                  className: "flex items-center justify-between border-b sticky top-0 z-10",
                   style: {
                     borderColor: "var(--compass-color-border)",
-                    padding: "calc(var(--compass-spacing-card) * 0.75) var(--compass-spacing-card)"
+                    padding: "calc(var(--compass-spacing-card) * 0.75) var(--compass-spacing-card)",
+                    backgroundColor: "var(--compass-color-surface)"
                   },
                   children: [
                     /* @__PURE__ */ jsx(
@@ -2571,114 +2588,731 @@ function CreditAccountGuard({
     }
   );
 }
-function AccountBalancesModal({
-  isOpen,
-  onClose,
-  balances,
-  totalUsdValue,
-  isLoading = false,
-  earnAccountAddress,
-  walletAddress
-}) {
-  return /* @__PURE__ */ jsx(ActionModal, { isOpen, onClose, title: "Balance Breakdown", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-3", children: [
-    (walletAddress || earnAccountAddress) && /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1.5", children: [
-      walletAddress && /* @__PURE__ */ jsx(CopyableAddress, { address: walletAddress, label: "Wallet" }),
-      earnAccountAddress && /* @__PURE__ */ jsx(CopyableAddress, { address: earnAccountAddress, label: "Product Account" })
-    ] }),
-    isLoading ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-4", children: /* @__PURE__ */ jsx(
-      Loader2,
-      {
-        size: 24,
-        className: "animate-spin",
-        style: { color: "var(--compass-color-primary)" }
-      }
-    ) }) : balances.length === 0 ? /* @__PURE__ */ jsx(
-      "div",
+var EVM_CHAIN_IDS = {
+  ethereum: 1,
+  base: 8453,
+  arbitrum: 42161
+};
+function BuyForm({ targetAddress, defaultAsset = "USDC", onComplete }) {
+  const { fundWallet } = useEmbeddableWallet();
+  const { chainId } = useChain();
+  const [amount, setAmount] = useState("");
+  const [state, setState] = useState("idle");
+  const [error, setError] = useState(null);
+  const numericChainId = EVM_CHAIN_IDS[chainId] || 8453;
+  const handleBuy = useCallback(async () => {
+    if (!fundWallet || !amount || parseFloat(amount) <= 0) {
+      return;
+    }
+    setState("buying");
+    setError(null);
+    try {
+      await fundWallet({
+        address: targetAddress,
+        chainId: numericChainId,
+        asset: defaultAsset,
+        amount
+      });
+      setState("success");
+      onComplete?.();
+      setTimeout(() => setState("idle"), 3e3);
+    } catch (err) {
+      setState("error");
+      setError(err instanceof Error ? err.message : "Purchase failed. Please try again.");
+    }
+  }, [fundWallet, amount, targetAddress, numericChainId, defaultAsset, onComplete]);
+  const chainName = chainId.charAt(0).toUpperCase() + chainId.slice(1);
+  return /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
+    /* @__PURE__ */ jsxs(
+      "p",
       {
-        className: "text-center py-4",
-        style: { color: "var(--compass-color-text-tertiary)" },
-        children: "No tokens in account"
+        className: "text-sm font-medium",
+        style: { color: "var(--compass-color-text)", fontFamily: "var(--compass-font-family)" },
+        children: [
+          "Buy ",
+          defaultAsset,
+          " on ",
+          chainName
+        ]
       }
-    ) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
+    ),
+    /* @__PURE__ */ jsxs("div", { children: [
+      /* @__PURE__ */ jsx(
+        "label",
+        {
+          className: "block text-sm mb-1.5",
+          style: { color: "var(--compass-color-text-secondary)", fontFamily: "var(--compass-font-family)" },
+          children: "Amount (USD)"
+        }
+      ),
+      /* @__PURE__ */ jsxs("div", { className: "relative", children: [
         /* @__PURE__ */ jsx(
           "span",
           {
-            className: "text-xs font-medium uppercase tracking-wide",
+            className: "absolute left-3 top-1/2 -translate-y-1/2 text-sm",
             style: { color: "var(--compass-color-text-tertiary)" },
-            children: "Available in Account"
+            children: "$"
           }
         ),
         /* @__PURE__ */ jsx(
-          "div",
+          "input",
           {
-            className: "flex flex-col gap-2",
-            style: {
-              maxHeight: "50vh",
-              overflowY: "auto",
-              scrollbarWidth: "none"
+            type: "number",
+            value: amount,
+            onChange: (e) => {
+              setAmount(e.target.value);
+              if (state === "error") {
+                setState("idle");
+                setError(null);
+              }
             },
-            children: balances.filter((token) => parseFloat(token.balance) >= 5e-3).map((token) => /* @__PURE__ */ jsxs(
-              "div",
+            disabled: state === "buying",
+            placeholder: "0.00",
+            className: "w-full border px-3 py-2.5 pl-7 text-sm focus:outline-none disabled:opacity-50",
+            style: {
+              backgroundColor: "var(--compass-color-surface)",
+              borderColor: "var(--compass-color-border)",
+              borderRadius: "var(--compass-border-radius-lg)",
+              color: "var(--compass-color-text)",
+              fontFamily: "var(--compass-font-family)"
+            }
+          }
+        )
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx(
+      "p",
+      {
+        className: "text-xs",
+        style: { color: "var(--compass-color-text-tertiary)", fontFamily: "var(--compass-font-family)" },
+        children: "Buy crypto with card or bank transfer. Funds are sent directly to your account."
+      }
+    ),
+    state === "success" && /* @__PURE__ */ jsxs(
+      "div",
+      {
+        className: "flex items-center gap-2 p-3 text-sm",
+        style: {
+          backgroundColor: "var(--compass-color-success-muted, rgba(34,197,94,0.1))",
+          color: "var(--compass-color-success)",
+          borderRadius: "var(--compass-border-radius-lg)",
+          fontFamily: "var(--compass-font-family)"
+        },
+        children: [
+          /* @__PURE__ */ jsx(CheckCircle, { size: 16 }),
+          "Purchase initiated. Funds may take a few minutes to arrive."
+        ]
+      }
+    ),
+    state === "error" && error && /* @__PURE__ */ jsxs(
+      "div",
+      {
+        className: "flex items-center gap-2 p-3 text-sm",
+        style: {
+          backgroundColor: "var(--compass-color-error-muted, rgba(239,68,68,0.1))",
+          color: "var(--compass-color-error)",
+          borderRadius: "var(--compass-border-radius-lg)",
+          fontFamily: "var(--compass-font-family)"
+        },
+        children: [
+          /* @__PURE__ */ jsx(AlertCircle, { size: 16 }),
+          error
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      "button",
+      {
+        onClick: handleBuy,
+        disabled: state === "buying" || !amount || parseFloat(amount) <= 0,
+        className: "w-full py-3 px-4 text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
+        style: {
+          backgroundColor: "var(--compass-color-primary)",
+          color: "white",
+          borderRadius: "var(--compass-border-radius-xl)",
+          fontFamily: "var(--compass-font-family)",
+          transition: "var(--compass-transition-normal)"
+        },
+        children: state === "buying" ? /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Loader2, { className: "h-4 w-4 animate-spin" }),
+          "Processing..."
+        ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(CreditCard, { className: "h-4 w-4" }),
+          "Buy with card / bank"
+        ] })
+      }
+    )
+  ] });
+}
+var BLOCK_EXPLORERS = {
+  ethereum: "https://etherscan.io",
+  base: "https://basescan.org",
+  arbitrum: "https://arbiscan.io"
+};
+function TxStatus({ state }) {
+  const { chainId } = useChain();
+  if (state.status === "idle") return null;
+  const explorer = BLOCK_EXPLORERS[chainId] || BLOCK_EXPLORERS.ethereum;
+  return /* @__PURE__ */ jsxs(
+    "div",
+    {
+      className: "mt-4 p-4 border",
+      style: {
+        borderColor: "var(--compass-color-border)",
+        borderRadius: "var(--compass-border-radius-xl)",
+        fontFamily: "var(--compass-font-family)"
+      },
+      children: [
+        state.status === "preparing" && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
+          /* @__PURE__ */ jsx(
+            Loader2,
+            {
+              className: "h-4 w-4 animate-spin",
+              style: { color: "var(--compass-color-primary)" }
+            }
+          ),
+          /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text-secondary)" }, children: "Preparing transaction..." })
+        ] }),
+        state.status === "signing" && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
+          /* @__PURE__ */ jsx(
+            Loader2,
+            {
+              className: "h-4 w-4 animate-spin",
+              style: { color: "var(--compass-color-warning)" }
+            }
+          ),
+          /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text-secondary)" }, children: "Waiting for signature..." })
+        ] }),
+        state.status === "broadcasting" && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
+          /* @__PURE__ */ jsx(
+            Loader2,
+            {
+              className: "h-4 w-4 animate-spin",
+              style: { color: "var(--compass-color-primary)" }
+            }
+          ),
+          /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text-secondary)" }, children: "Broadcasting transaction..." })
+        ] }),
+        state.status === "submitted" && /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
+            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
+              /* @__PURE__ */ jsx(
+                Loader2,
+                {
+                  className: "h-4 w-4 animate-spin",
+                  style: { color: "var(--compass-color-primary)" }
+                }
+              ),
+              /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text)" }, children: "Transaction submitted" })
+            ] }),
+            /* @__PURE__ */ jsxs(
+              "a",
               {
-                className: "flex items-center justify-between p-3 rounded-lg",
-                style: {
-                  backgroundColor: "var(--compass-color-surface)",
-                  border: "1px solid var(--compass-color-border)",
-                  flexShrink: 0
-                },
+                href: `${explorer}/tx/${state.txHash}`,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                className: "flex items-center gap-1.5 text-xs hover:opacity-70 transition-opacity",
+                style: { color: "var(--compass-color-text-secondary)" },
                 children: [
-                  /* @__PURE__ */ jsx("span", { className: "font-medium", style: { color: "var(--compass-color-text)" }, children: token.symbol }),
-                  /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-end", children: [
-                    /* @__PURE__ */ jsx("span", { className: "font-mono font-medium", style: { color: "var(--compass-color-text)" }, children: formatAmount(token.balance) }),
-                    /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: formatUSD(token.usdValue) })
-                  ] })
+                  "View on explorer",
+                  /* @__PURE__ */ jsx(ExternalLink, { className: "h-3 w-3" })
                 ]
-              },
-              token.symbol
-            ))
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxs(
-        "div",
-        {
-          className: "flex items-center justify-between pt-3 mt-2",
-          style: { borderTop: "2px solid var(--compass-color-border)" },
-          children: [
-            /* @__PURE__ */ jsx("span", { className: "font-semibold", style: { color: "var(--compass-color-text)" }, children: "Total" }),
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsx(
+            "p",
+            {
+              className: "text-xs mt-2",
+              style: { color: "var(--compass-color-text-tertiary)" },
+              children: "Waiting for on-chain confirmation. Balances will update automatically."
+            }
+          )
+        ] }),
+        state.status === "confirmed" && /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
             /* @__PURE__ */ jsx(
-              "span",
+              CheckCircle,
               {
-                className: "font-bold text-xl",
-                style: { color: "var(--compass-color-text)" },
-                children: formatUSD(totalUsdValue)
+                className: "h-4 w-4",
+                style: { color: "var(--compass-color-success)" }
               }
-            )
-          ]
-        }
-      )
-    ] })
-  ] }) });
-}
-var TRANSFER_TOKEN = "USDC";
-var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
-  compact = false,
-  hideVisual = false,
+            ),
+            /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-success)" }, children: "Transaction confirmed" })
+          ] }),
+          /* @__PURE__ */ jsxs(
+            "a",
+            {
+              href: `${explorer}/tx/${state.txHash}`,
+              target: "_blank",
+              rel: "noopener noreferrer",
+              className: "flex items-center gap-1.5 text-xs hover:opacity-70 transition-opacity",
+              style: { color: "var(--compass-color-text-secondary)" },
+              children: [
+                "View on explorer",
+                /* @__PURE__ */ jsx(ExternalLink, { className: "h-3 w-3" })
+              ]
+            }
+          )
+        ] }),
+        state.status === "failed" && /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3 text-sm", children: [
+          /* @__PURE__ */ jsx(
+            XCircle,
+            {
+              className: "h-4 w-4 mt-0.5 shrink-0",
+              style: { color: "var(--compass-color-error)" }
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "span",
+            {
+              className: "break-all",
+              style: { color: "var(--compass-color-error)" },
+              children: state.error
+            }
+          )
+        ] })
+      ]
+    }
+  );
+}
+function useTxPolling(options = {}) {
+  const { chainId } = useChain();
+  const queryClient = useQueryClient();
+  const pollIntervalRef = useRef(null);
+  const clearPolling = useCallback(() => {
+    if (pollIntervalRef.current) {
+      clearInterval(pollIntervalRef.current);
+      pollIntervalRef.current = null;
+    }
+  }, []);
+  useEffect(() => {
+    return () => clearPolling();
+  }, [clearPolling]);
+  const startPolling = useCallback(
+    (txHash, setTxState) => {
+      clearPolling();
+      let polls = 0;
+      pollIntervalRef.current = setInterval(async () => {
+        polls++;
+        for (const key of options.queryKeysToInvalidate ?? []) {
+          queryClient.invalidateQueries({ queryKey: key });
+        }
+        try {
+          const res = await fetch(
+            `/api/compass/tx/receipt?hash=${txHash}&chain=${chainId}`
+          );
+          const data = await res.json();
+          if (data.status === "success") {
+            clearPolling();
+            setTxState({ status: "confirmed", txHash });
+            return;
+          } else if (data.status === "reverted") {
+            clearPolling();
+            setTxState({ status: "failed", error: "Transaction reverted" });
+            return;
+          }
+        } catch (err) {
+          if (err instanceof TypeError && err.message.includes("fetch")) ; else {
+            console.warn("[useTxPolling] Unexpected error polling tx receipt:", err);
+          }
+        }
+        if (polls >= 24) {
+          clearPolling();
+          setTxState({ status: "failed", error: "Unable to confirm transaction. Please check a block explorer to verify." });
+        }
+      }, 5e3);
+    },
+    [chainId, clearPolling, queryClient, options.queryKeysToInvalidate]
+  );
+  return { startPolling, clearPolling };
+}
+var USDC_ADDRESSES = {
+  ethereum: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+  base: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+  arbitrum: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
+};
+var ERC20_TRANSFER_ABI = [
+  {
+    type: "function",
+    name: "transfer",
+    inputs: [
+      { name: "to", type: "address" },
+      { name: "amount", type: "uint256" }
+    ],
+    outputs: [{ name: "", type: "bool" }],
+    stateMutability: "nonpayable"
+  }
+];
+async function waitForReceipt(txHash, chainId) {
+  const maxPolls = 60;
+  for (let i = 0; i < maxPolls; i++) {
+    await new Promise((resolve) => setTimeout(resolve, 3e3));
+    try {
+      const res = await fetch(`/api/compass/tx/receipt?hash=${txHash}&chain=${chainId}`);
+      const data = await res.json();
+      if (data.status === "success") return;
+      if (data.status === "reverted") throw new Error("Withdrawal transaction reverted");
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("reverted")) throw err;
+    }
+  }
+  throw new Error("Unable to confirm withdrawal. Please check a block explorer to verify.");
+}
+function SendForm({ onComplete, product = "earn", productAccountAddress }) {
+  const { sendTransaction, signTypedData, address } = useEmbeddableWallet();
+  const { chainId } = useChain();
+  const { earnAccountAddress, isDeployed } = useEarnAccount();
+  const [recipient, setRecipient] = useState("");
+  const [amount, setAmount] = useState("");
+  const [txState, setTxState] = useState({ status: "idle" });
+  const { startPolling } = useTxPolling({
+    queryKeysToInvalidate: product === "credit" ? [["creditBalances"], ["creditPositions"], ["eoaBalances"]] : [["earnAccountBalances"], ["eoaBalances"]]
+  });
+  const { data: earnBalanceData } = useQuery({
+    queryKey: ["earnAccountBalances", chainId, address],
+    queryFn: async () => {
+      if (!address) return null;
+      const response = await fetch(
+        `/api/compass/earn-account/balances?owner=${address}&chain=${chainId}`
+      );
+      if (!response.ok) return null;
+      return response.json();
+    },
+    enabled: !!address && isDeployed && product === "earn",
+    staleTime: 30 * 1e3
+  });
+  const { data: creditBalanceData } = useQuery({
+    queryKey: ["creditBalances", productAccountAddress, chainId],
+    queryFn: async () => {
+      if (!productAccountAddress) return null;
+      const response = await fetch(
+        `/api/compass/credit/balances?owner=${productAccountAddress}&chain=${chainId}`
+      );
+      if (!response.ok) return null;
+      return response.json();
+    },
+    enabled: !!productAccountAddress && product === "credit",
+    staleTime: 30 * 1e3
+  });
+  const availableBalance = product === "credit" ? creditBalanceData?.find((b) => b.tokenSymbol === "USDC")?.amount || "0" : earnBalanceData?.balances?.["USDC"]?.balance || "0";
+  const tokenAddress = USDC_ADDRESSES[chainId];
+  const isValidAddress = recipient.length > 0 && isAddress(recipient);
+  const isValidAmount = amount.length > 0 && parseFloat(amount) > 0;
+  const exceedsBalance = isValidAmount && parseFloat(amount) > parseFloat(availableBalance);
+  const isBusy = txState.status !== "idle" && txState.status !== "confirmed" && txState.status !== "failed";
+  const canSend = isValidAddress && isValidAmount && !exceedsBalance && !!sendTransaction && !!signTypedData && !isBusy;
+  const handleSend = useCallback(async () => {
+    if (!sendTransaction || !signTypedData || !isValidAddress || !isValidAmount || !tokenAddress) return;
+    try {
+      setTxState({ status: "preparing" });
+      const prepareRes = await fetch("/api/compass/transfer/prepare", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          owner: address,
+          chain: chainId,
+          token: "USDC",
+          amount,
+          action: "WITHDRAW",
+          ...product === "credit" ? { product: "credit" } : {}
+        })
+      });
+      if (!prepareRes.ok) {
+        const errData = await prepareRes.json();
+        throw new Error(errData.error || "Failed to prepare withdrawal");
+      }
+      const prepareData = await prepareRes.json();
+      setTxState({ status: "signing" });
+      const withdrawSig = await signTypedData({
+        domain: prepareData.domain,
+        types: prepareData.normalizedTypes,
+        primaryType: prepareData.primaryType,
+        message: prepareData.message
+      });
+      setTxState({ status: "broadcasting" });
+      const executeRes = await fetch("/api/compass/transfer/execute", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          owner: address,
+          chain: chainId,
+          eip712: prepareData.eip712,
+          signature: withdrawSig,
+          ...product === "credit" ? { product: "credit" } : {}
+        })
+      });
+      if (!executeRes.ok) {
+        const errData = await executeRes.json();
+        throw new Error(errData.error || "Withdrawal failed");
+      }
+      const { txHash: withdrawHash } = await executeRes.json();
+      await waitForReceipt(withdrawHash, chainId);
+      setTxState({ status: "signing" });
+      const data = encodeFunctionData({
+        abi: ERC20_TRANSFER_ABI,
+        functionName: "transfer",
+        args: [recipient, parseUnits(amount, 6)]
+      });
+      const sendHash = await sendTransaction({ to: tokenAddress, data });
+      setTxState({ status: "submitted", txHash: sendHash });
+      startPolling(sendHash, setTxState);
+      setAmount("");
+      setRecipient("");
+      onComplete?.();
+    } catch (err) {
+      setTxState({ status: "failed", error: err instanceof Error ? err.message : "Transaction failed" });
+    }
+  }, [sendTransaction, signTypedData, recipient, amount, address, chainId, tokenAddress, isValidAddress, isValidAmount, onComplete, startPolling, product]);
+  const chainName = chainId.charAt(0).toUpperCase() + chainId.slice(1);
+  return /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
+    /* @__PURE__ */ jsxs(
+      "p",
+      {
+        className: "text-sm font-medium",
+        style: { color: "var(--compass-color-text)", fontFamily: "var(--compass-font-family)" },
+        children: [
+          "Send USDC on ",
+          chainName
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsxs("div", { children: [
+      /* @__PURE__ */ jsx(
+        "label",
+        {
+          className: "block text-sm mb-1.5",
+          style: { color: "var(--compass-color-text-secondary)", fontFamily: "var(--compass-font-family)" },
+          children: "Recipient Address"
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        "input",
+        {
+          type: "text",
+          value: recipient,
+          onChange: (e) => {
+            setRecipient(e.target.value);
+            if (txState.status === "failed") setTxState({ status: "idle" });
+          },
+          disabled: isBusy,
+          placeholder: "0x...",
+          className: "w-full border px-3 py-2.5 text-sm focus:outline-none disabled:opacity-50 font-mono",
+          style: {
+            backgroundColor: "var(--compass-color-surface)",
+            borderColor: recipient && !isValidAddress ? "var(--compass-color-error)" : "var(--compass-color-border)",
+            borderRadius: "var(--compass-border-radius-lg)",
+            color: "var(--compass-color-text)",
+            fontFamily: "var(--compass-font-family)"
+          }
+        }
+      ),
+      recipient && !isValidAddress && /* @__PURE__ */ jsx("p", { className: "text-xs mt-1", style: { color: "var(--compass-color-error)" }, children: "Invalid Ethereum address" }),
+      isValidAddress && recipient.toLowerCase() === address?.toLowerCase() && /* @__PURE__ */ jsx("p", { className: "text-xs mt-1", style: { color: "var(--compass-color-warning, #f59e0b)" }, children: "This is your own wallet address" }),
+      isValidAddress && earnAccountAddress && recipient.toLowerCase() === earnAccountAddress.toLowerCase() && /* @__PURE__ */ jsx("p", { className: "text-xs mt-1", style: { color: "var(--compass-color-warning, #f59e0b)" }, children: "This is your savings account address" })
+    ] }),
+    /* @__PURE__ */ jsxs("div", { children: [
+      /* @__PURE__ */ jsx(
+        "label",
+        {
+          className: "block text-sm mb-1.5",
+          style: { color: "var(--compass-color-text-secondary)", fontFamily: "var(--compass-font-family)" },
+          children: "Amount"
+        }
+      ),
+      /* @__PURE__ */ jsxs("div", { className: "relative", children: [
+        /* @__PURE__ */ jsx(
+          "input",
+          {
+            type: "number",
+            value: amount,
+            onChange: (e) => {
+              setAmount(e.target.value);
+              if (txState.status === "failed") setTxState({ status: "idle" });
+            },
+            disabled: isBusy,
+            placeholder: "0.00",
+            className: "w-full border px-3 py-2.5 pr-14 text-sm focus:outline-none disabled:opacity-50",
+            style: {
+              backgroundColor: "var(--compass-color-surface)",
+              borderColor: "var(--compass-color-border)",
+              borderRadius: "var(--compass-border-radius-lg)",
+              color: "var(--compass-color-text)",
+              fontFamily: "var(--compass-font-family)"
+            }
+          }
+        ),
+        /* @__PURE__ */ jsx(
+          "span",
+          {
+            className: "absolute right-3 top-1/2 -translate-y-1/2 text-xs",
+            style: { color: "var(--compass-color-text-tertiary)" },
+            children: "USDC"
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxs(
+        "button",
+        {
+          onClick: () => setAmount(availableBalance),
+          className: "text-xs mt-1",
+          style: { color: "var(--compass-color-primary)", cursor: "pointer", background: "none", border: "none", padding: 0 },
+          children: [
+            "Available: ",
+            parseFloat(availableBalance).toFixed(2),
+            " USDC"
+          ]
+        }
+      ),
+      exceedsBalance && /* @__PURE__ */ jsx("p", { className: "text-xs mt-1", style: { color: "var(--compass-color-error)" }, children: "Amount exceeds available balance" })
+    ] }),
+    /* @__PURE__ */ jsx(
+      "p",
+      {
+        className: "text-xs",
+        style: { color: "var(--compass-color-text-tertiary)", fontFamily: "var(--compass-font-family)" },
+        children: "Send USDC from your account to any address. Requires 2 signatures. Gas fees are sponsored."
+      }
+    ),
+    /* @__PURE__ */ jsx(TxStatus, { state: txState }),
+    /* @__PURE__ */ jsx(
+      "button",
+      {
+        onClick: handleSend,
+        disabled: !canSend,
+        className: "w-full py-3 px-4 text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
+        style: {
+          backgroundColor: "var(--compass-color-primary)",
+          color: "white",
+          borderRadius: "var(--compass-border-radius-xl)",
+          fontFamily: "var(--compass-font-family)",
+          transition: "var(--compass-transition-normal)"
+        },
+        children: isBusy ? /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Loader2, { className: "h-4 w-4 animate-spin" }),
+          "Sending..."
+        ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(Send, { className: "h-4 w-4" }),
+          "Send USDC"
+        ] })
+      }
+    )
+  ] });
+}
+function AccountBalancesModal({
+  isOpen,
+  onClose,
+  balances,
+  totalUsdValue,
+  isLoading = false,
+  earnAccountAddress,
+  walletAddress
+}) {
+  return /* @__PURE__ */ jsx(ActionModal, { isOpen, onClose, title: "Balance Breakdown", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-3", children: [
+    (walletAddress || earnAccountAddress) && /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1.5", children: [
+      walletAddress && /* @__PURE__ */ jsx(CopyableAddress, { address: walletAddress, label: "Wallet" }),
+      earnAccountAddress && /* @__PURE__ */ jsx(CopyableAddress, { address: earnAccountAddress, label: "Product Account" })
+    ] }),
+    isLoading ? /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-4", children: /* @__PURE__ */ jsx(
+      Loader2,
+      {
+        size: 24,
+        className: "animate-spin",
+        style: { color: "var(--compass-color-primary)" }
+      }
+    ) }) : balances.length === 0 ? /* @__PURE__ */ jsx(
+      "div",
+      {
+        className: "text-center py-4",
+        style: { color: "var(--compass-color-text-tertiary)" },
+        children: "No tokens in account"
+      }
+    ) : /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
+        /* @__PURE__ */ jsx(
+          "span",
+          {
+            className: "text-xs font-medium uppercase tracking-wide",
+            style: { color: "var(--compass-color-text-tertiary)" },
+            children: "Available in Account"
+          }
+        ),
+        /* @__PURE__ */ jsx(
+          "div",
+          {
+            className: "flex flex-col gap-2",
+            style: {
+              maxHeight: "50vh",
+              overflowY: "auto",
+              scrollbarWidth: "none"
+            },
+            children: balances.filter((token) => parseFloat(token.balance) >= 5e-3).map((token) => /* @__PURE__ */ jsxs(
+              "div",
+              {
+                className: "flex items-center justify-between p-3 rounded-lg",
+                style: {
+                  backgroundColor: "var(--compass-color-surface)",
+                  border: "1px solid var(--compass-color-border)",
+                  flexShrink: 0
+                },
+                children: [
+                  /* @__PURE__ */ jsx("span", { className: "font-medium", style: { color: "var(--compass-color-text)" }, children: token.symbol }),
+                  /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-end", children: [
+                    /* @__PURE__ */ jsx("span", { className: "font-mono font-medium", style: { color: "var(--compass-color-text)" }, children: formatAmount(token.balance) }),
+                    /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: formatUSD(token.usdValue) })
+                  ] })
+                ]
+              },
+              token.symbol
+            ))
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxs(
+        "div",
+        {
+          className: "flex items-center justify-between pt-3 mt-2",
+          style: { borderTop: "2px solid var(--compass-color-border)" },
+          children: [
+            /* @__PURE__ */ jsx("span", { className: "font-semibold", style: { color: "var(--compass-color-text)" }, children: "Total" }),
+            /* @__PURE__ */ jsx(
+              "span",
+              {
+                className: "font-bold text-xl",
+                style: { color: "var(--compass-color-text)" },
+                children: formatUSD(totalUsdValue)
+              }
+            )
+          ]
+        }
+      )
+    ] })
+  ] }) });
+}
+var TRANSFER_TOKEN = "USDC";
+var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
+  compact = false,
+  hideVisual = false,
   onTransferComplete
 }, ref) {
+  const { address, isConnected, signTypedData, switchChain, walletChainId, fundWallet, hasExternalWallet, sendTransaction } = useEmbeddableWallet();
+  const { chainId, chain } = useChain();
+  const { earnAccountAddress, isDeployed } = useEarnAccount();
+  const queryClient = useQueryClient();
+  const showBuyTab = !!fundWallet;
+  const showSendTab = !!sendTransaction && !hasExternalWallet;
+  const buyOnly = !hasExternalWallet && showBuyTab && !sendTransaction;
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const [activeAction, setActiveAction] = useState("deposit");
+  const [activeAction, setActiveAction] = useState(
+    !hasExternalWallet && fundWallet ? "buy" : "deposit"
+  );
   const selectedToken = TRANSFER_TOKEN;
   const [amount, setAmount] = useState("");
-  const [transferState, setTransferState] = useState("idle");
-  const [statusMessage, setStatusMessage] = useState("");
-  const [error, setError] = useState(null);
+  const [txState, setTxState] = useState({ status: "idle" });
   const [isBalancesModalOpen, setIsBalancesModalOpen] = useState(false);
-  const { address, isConnected, signTypedData, switchChain, walletChainId } = useEmbeddableWallet();
-  const { chainId, chain } = useChain();
-  const { earnAccountAddress, isDeployed } = useEarnAccount();
-  const queryClient = useQueryClient();
+  const { startPolling, clearPolling } = useTxPolling({
+    queryKeysToInvalidate: [["earnAccountBalances"], ["eoaBalances"]]
+  });
   const { data: balanceData, isLoading: balancesLoading } = useQuery({
     queryKey: ["earnAccountBalances", chainId, address],
     queryFn: async () => {
@@ -2710,7 +3344,7 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
       }
       return {};
     },
-    enabled: !!address && activeAction === "deposit",
+    enabled: !!address && hasExternalWallet && activeAction === "deposit",
     staleTime: 30 * 1e3
   });
   const earnBalances = balanceData?.balances || {};
@@ -2729,10 +3363,9 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
   }
   const resetForm = useCallback(() => {
     setAmount("");
-    setTransferState("idle");
-    setStatusMessage("");
-    setError(null);
-  }, []);
+    setTxState({ status: "idle" });
+    clearPolling();
+  }, [clearPolling]);
   const handleOpenModal = () => {
     resetForm();
     setIsModalOpen(true);
@@ -2747,7 +3380,8 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
   const handleActionChange = (action) => {
     setActiveAction(action);
     setAmount("");
-    setError(null);
+    setTxState({ status: "idle" });
+    clearPolling();
   };
   const getMaxBalance = () => {
     if (activeAction === "deposit") {
@@ -2757,30 +3391,26 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
   };
   const handleTransfer = useCallback(async () => {
     if (!address || !amount || !signTypedData) return;
-    setError(null);
+    setTxState({ status: "preparing" });
     try {
       const targetChainId = chain.viemChain.id;
       if (walletChainId !== void 0 && walletChainId !== targetChainId) {
         if (!switchChain) {
           throw new Error(`Please switch your wallet to ${chain.name} (chain ID ${targetChainId}) to continue. Your wallet is currently on chain ID ${walletChainId}.`);
         }
-        setStatusMessage(`Switching network to ${chain.name}...`);
         try {
           await switchChain(targetChainId);
-        } catch (switchError) {
+        } catch {
           throw new Error(`Please switch your wallet to ${chain.name} to continue. Your wallet is on chain ID ${walletChainId}, but ${chain.name} requires chain ID ${targetChainId}.`);
         }
       } else if (switchChain && walletChainId === void 0) {
-        setStatusMessage("Switching network...");
         try {
           await switchChain(targetChainId);
-        } catch (switchError) {
+        } catch {
           throw new Error(`Please switch your wallet to ${chain.name} to continue`);
         }
       }
       if (activeAction === "deposit") {
-        setTransferState("checking_approval");
-        setStatusMessage("Checking token approval...");
         const approveResponse = await fetch("/api/compass/transfer/approve", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -2799,16 +3429,14 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
           if (approvalData.requiresTransaction) {
             throw new Error("This token requires a transaction-based approval. Please approve manually.");
           }
-          setTransferState("awaiting_approval_signature");
-          setStatusMessage("Please sign the approval...");
+          setTxState({ status: "signing" });
           const approvalSignature = await signTypedData({
             domain: approvalData.domain,
             types: approvalData.normalizedTypes,
             primaryType: "Permit",
             message: approvalData.message
           });
-          setTransferState("approving");
-          setStatusMessage("Executing approval...");
+          setTxState({ status: "broadcasting" });
           const executeApprovalResponse = await fetch("/api/compass/transfer/execute", {
             method: "POST",
             headers: { "Content-Type": "application/json" },
@@ -2825,8 +3453,7 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
           }
         }
       }
-      setTransferState("awaiting_transfer_signature");
-      setStatusMessage("Preparing transfer...");
+      setTxState({ status: "signing" });
       const prepareResponse = await fetch("/api/compass/transfer/prepare", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -2843,15 +3470,13 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
         throw new Error(errData.error || "Failed to prepare transfer");
       }
       const prepareData = await prepareResponse.json();
-      setStatusMessage("Please sign the transfer...");
       const transferSignature = await signTypedData({
         domain: prepareData.domain,
         types: prepareData.normalizedTypes,
         primaryType: prepareData.primaryType,
         message: prepareData.message
       });
-      setTransferState("transferring");
-      setStatusMessage("Executing transfer...");
+      setTxState({ status: "broadcasting" });
       const executeResponse = await fetch("/api/compass/transfer/execute", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -2867,17 +3492,12 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
         throw new Error(errData.error || "Transfer failed");
       }
       const { txHash } = await executeResponse.json();
-      setTransferState("success");
-      setStatusMessage("Transfer successful!");
+      setTxState({ status: "submitted", txHash });
+      startPolling(txHash, setTxState);
       onTransferComplete?.(activeAction, selectedToken, amount, txHash);
-      queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
-      queryClient.invalidateQueries({ queryKey: ["eoaBalances"] });
-      setTimeout(() => {
-        resetForm();
-      }, 2e3);
+      setAmount("");
     } catch (err) {
-      setTransferState("error");
-      setError(err instanceof Error ? err.message : "Transfer failed");
+      setTxState({ status: "failed", error: err instanceof Error ? err.message : "Transfer failed" });
     }
   }, [
     address,
@@ -2889,14 +3509,13 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
     walletChainId,
     signTypedData,
     switchChain,
-    queryClient,
     onTransferComplete,
-    resetForm
+    startPolling
   ]);
   if (!isConnected) {
     return null;
   }
-  const isProcessing = transferState !== "idle" && transferState !== "success" && transferState !== "error";
+  const isProcessing = txState.status !== "idle" && txState.status !== "confirmed" && txState.status !== "failed";
   if (!isDeployed && !hideVisual) {
     return /* @__PURE__ */ jsxs(
       "div",
@@ -2980,9 +3599,9 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
       {
         isOpen: isModalOpen,
         onClose: handleCloseModal,
-        title: "Transfer Funds",
+        title: showSendTab ? "Manage Funds" : buyOnly ? "Add Funds" : "Transfer Funds",
         children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4", children: [
-          /* @__PURE__ */ jsx(
+          buyOnly ? null : /* @__PURE__ */ jsx(
             "div",
             {
               className: "flex gap-1 p-1",
@@ -2991,7 +3610,9 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
                 borderRadius: "var(--compass-border-radius-lg)",
                 fontFamily: "var(--compass-font-family)"
               },
-              children: ["deposit", "withdraw"].map((action) => /* @__PURE__ */ jsxs(
+              children: [
+                ...showSendTab ? ["buy", "send"] : ["deposit", "withdraw", ...showBuyTab ? ["buy"] : []]
+              ].map((action) => /* @__PURE__ */ jsxs(
                 "button",
                 {
                   onClick: () => handleActionChange(action),
@@ -3003,7 +3624,7 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
                     borderRadius: "var(--compass-border-radius-md)"
                   },
                   children: [
-                    action === "deposit" ? /* @__PURE__ */ jsx(ArrowDownLeft, { size: 14 }) : /* @__PURE__ */ jsx(ArrowUpRight, { size: 14 }),
+                    action === "deposit" ? /* @__PURE__ */ jsx(ArrowDownLeft, { size: 14 }) : action === "withdraw" ? /* @__PURE__ */ jsx(ArrowUpRight, { size: 14 }) : action === "send" ? /* @__PURE__ */ jsx(Send, { size: 14 }) : /* @__PURE__ */ jsx(ArrowRight, { size: 14 }),
                     action
                   ]
                 },
@@ -3011,120 +3632,116 @@ var EarnAccountBalance = forwardRef(function EarnAccountBalance2({
               ))
             }
           ),
-          /* @__PURE__ */ jsxs("div", { children: [
-            /* @__PURE__ */ jsx(
-              "label",
-              {
-                className: "text-sm font-medium mb-1 block",
-                style: { color: "var(--compass-color-text-secondary)" },
-                children: "Amount"
+          activeAction === "send" ? /* @__PURE__ */ jsx(
+            SendForm,
+            {
+              onComplete: () => {
+                queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
+                queryClient.invalidateQueries({ queryKey: ["eoaBalances"] });
               }
-            ),
-            /* @__PURE__ */ jsxs(
-              "div",
+            }
+          ) : activeAction === "buy" || buyOnly ? /* @__PURE__ */ jsx(
+            BuyForm,
+            {
+              targetAddress: earnAccountAddress || "",
+              onComplete: () => {
+                queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
+                queryClient.invalidateQueries({ queryKey: ["eoaBalances"] });
+              }
+            }
+          ) : /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsxs("div", { children: [
+              /* @__PURE__ */ jsx(
+                "label",
+                {
+                  className: "text-sm font-medium mb-1 block",
+                  style: { color: "var(--compass-color-text-secondary)" },
+                  children: "Amount"
+                }
+              ),
+              /* @__PURE__ */ jsxs(
+                "div",
+                {
+                  className: "flex items-center gap-2 p-3 border",
+                  style: {
+                    backgroundColor: "var(--compass-color-background)",
+                    borderColor: "var(--compass-color-border)",
+                    borderRadius: "var(--compass-border-radius-lg)"
+                  },
+                  children: [
+                    /* @__PURE__ */ jsx(
+                      "input",
+                      {
+                        type: "number",
+                        value: amount,
+                        onChange: (e) => {
+                          setAmount(e.target.value);
+                          if (txState.status === "failed") setTxState({ status: "idle" });
+                        },
+                        placeholder: "0.00",
+                        disabled: isProcessing,
+                        className: "flex-1 bg-transparent outline-none text-lg font-mono",
+                        style: { color: "var(--compass-color-text)" }
+                      }
+                    ),
+                    /* @__PURE__ */ jsx(
+                      "span",
+                      {
+                        className: "text-sm font-medium",
+                        style: { color: "var(--compass-color-text-secondary)" },
+                        children: "USDC"
+                      }
+                    )
+                  ]
+                }
+              ),
+              /* @__PURE__ */ jsxs(
+                "button",
+                {
+                  onClick: () => setAmount(formatAmount(getMaxBalance())),
+                  className: "text-xs mt-1",
+                  style: { color: "var(--compass-color-primary)", cursor: "pointer", background: "none", border: "none", padding: 0 },
+                  children: [
+                    "Available: ",
+                    formatAmount(getMaxBalance()),
+                    " USDC"
+                  ]
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsx("p", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: activeAction === "deposit" ? `Approves the token transfer, then transfers USDC from your ${!hasExternalWallet ? "embedded " : ""}wallet into your savings account. Requires 2 signatures.${!hasExternalWallet ? " Note: deposit and withdraw use your embedded wallet, not your bank account." : ""}` : `Moves USDC from your savings account back to your ${!hasExternalWallet ? "embedded " : ""}wallet. Requires 1 signature.${!hasExternalWallet ? " Gas fees are sponsored." : ""}` }),
+            /* @__PURE__ */ jsx(TxStatus, { state: txState }),
+            /* @__PURE__ */ jsx(
+              "button",
               {
-                className: "flex items-center gap-2 p-3 border",
+                onClick: handleTransfer,
+                disabled: isProcessing || !amount || parseFloat(amount) <= 0,
+                className: "w-full py-3 font-medium transition-colors flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
                 style: {
-                  backgroundColor: "var(--compass-color-background)",
-                  borderColor: "var(--compass-color-border)",
-                  borderRadius: "var(--compass-border-radius-lg)"
+                  backgroundColor: "var(--compass-color-primary)",
+                  color: "var(--compass-color-primary-text)",
+                  borderRadius: "var(--compass-border-radius-lg)",
+                  fontFamily: "var(--compass-font-family)"
                 },
-                children: [
-                  /* @__PURE__ */ jsx(
-                    "input",
-                    {
-                      type: "number",
-                      value: amount,
-                      onChange: (e) => {
-                        setAmount(e.target.value);
-                        setError(null);
-                      },
-                      placeholder: "0.00",
-                      disabled: isProcessing,
-                      className: "flex-1 bg-transparent outline-none text-lg font-mono",
-                      style: { color: "var(--compass-color-text)" }
-                    }
-                  ),
-                  /* @__PURE__ */ jsx(
-                    "span",
-                    {
-                      className: "text-sm font-medium",
-                      style: { color: "var(--compass-color-text-secondary)" },
-                      children: "USDC"
-                    }
-                  )
-                ]
+                children: isProcessing ? /* @__PURE__ */ jsxs(Fragment, { children: [
+                  /* @__PURE__ */ jsx(Loader2, { size: 18, className: "animate-spin" }),
+                  " Processing..."
+                ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+                  /* @__PURE__ */ jsx(ArrowUpRight, { size: 16 }),
+                  " ",
+                  activeAction === "deposit" ? "Transfer to Savings Account" : "Withdraw to Wallet"
+                ] })
               }
-            ),
-            /* @__PURE__ */ jsxs(
-              "button",
+            ),
+            /* @__PURE__ */ jsx(
+              "p",
               {
-                onClick: () => setAmount(formatAmount(getMaxBalance())),
-                className: "text-xs mt-1",
-                style: { color: "var(--compass-color-primary)", cursor: "pointer", background: "none", border: "none", padding: 0 },
-                children: [
-                  "Available: ",
-                  formatAmount(getMaxBalance()),
-                  " USDC"
-                ]
+                className: "text-xs text-center",
+                style: { color: "var(--compass-color-text-tertiary)" },
+                children: "Gas fees are sponsored by Compass"
               }
             )
-          ] }),
-          /* @__PURE__ */ jsx("p", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: activeAction === "deposit" ? "Approves the token transfer, then transfers USDC from your wallet into your savings account. Requires 2 signatures." : "Withdraws USDC from your savings account back to your wallet. Requires 1 signature." }),
-          error && /* @__PURE__ */ jsx(
-            "div",
-            {
-              className: "p-3 text-sm",
-              style: {
-                backgroundColor: "var(--compass-color-error-muted)",
-                color: "var(--compass-color-error)",
-                borderRadius: "var(--compass-border-radius-lg)"
-              },
-              children: error
-            }
-          ),
-          statusMessage && !error && /* @__PURE__ */ jsx(
-            "div",
-            {
-              className: "p-3 text-sm text-center",
-              style: {
-                backgroundColor: transferState === "success" ? "var(--compass-color-success-muted)" : "var(--compass-color-primary-muted)",
-                color: transferState === "success" ? "var(--compass-color-success)" : "var(--compass-color-primary)",
-                borderRadius: "var(--compass-border-radius-lg)"
-              },
-              children: statusMessage
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            "button",
-            {
-              onClick: handleTransfer,
-              disabled: isProcessing || !amount || parseFloat(amount) <= 0,
-              className: "w-full py-3 font-medium transition-colors flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
-              style: {
-                backgroundColor: "var(--compass-color-primary)",
-                color: "var(--compass-color-primary-text)",
-                borderRadius: "var(--compass-border-radius-lg)",
-                fontFamily: "var(--compass-font-family)"
-              },
-              children: isProcessing ? /* @__PURE__ */ jsxs(Fragment, { children: [
-                /* @__PURE__ */ jsx(Loader2, { size: 18, className: "animate-spin" }),
-                " Processing..."
-              ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-                /* @__PURE__ */ jsx(ArrowUpRight, { size: 16 }),
-                " ",
-                activeAction === "deposit" ? "Transfer to Savings Account" : "Withdraw to Wallet"
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            "p",
-            {
-              className: "text-xs text-center",
-              style: { color: "var(--compass-color-text-tertiary)" },
-              children: "Gas fees are sponsored by Compass"
-            }
-          )
+          ] })
         ] })
       }
     )
@@ -3179,7 +3796,7 @@ function truncate(value, decimals) {
   const factor = Math.pow(10, decimals);
   return (Math.floor(value * factor) / factor).toFixed(decimals);
 }
-var BLOCK_EXPLORERS = {
+var BLOCK_EXPLORERS2 = {
   ethereum: "https://etherscan.io",
   base: "https://basescan.org",
   arbitrum: "https://arbiscan.io"
@@ -3650,7 +4267,7 @@ function SwapForm({
           /* @__PURE__ */ jsxs(
             "a",
             {
-              href: `${BLOCK_EXPLORERS[chainId] || BLOCK_EXPLORERS.ethereum}/tx/${lastTxHash}`,
+              href: `${BLOCK_EXPLORERS2[chainId] || BLOCK_EXPLORERS2.ethereum}/tx/${lastTxHash}`,
               target: "_blank",
               rel: "noopener noreferrer",
               style: { display: "flex", alignItems: "center", gap: "4px", color: "var(--compass-color-text-secondary)", fontSize: "0.75rem", textDecoration: "none" },
@@ -3840,8 +4457,7 @@ function MarketSelector({
                 },
                 children: [
                   getTypeLabel(selectedMarket.type),
-                  " \xB7 ",
-                  formatTvl(selectedMarket.tvl)
+                  selectedMarket.type !== "aave" ? ` \xB7 ${formatTvl(selectedMarket.tvl)}` : ""
                 ]
               }
             )
@@ -3947,8 +4563,7 @@ function MarketSelector({
                     },
                     children: [
                       getTypeLabel(market.type),
-                      " \xB7 ",
-                      formatTvl(market.tvl)
+                      market.type !== "aave" ? ` \xB7 ${formatTvl(market.tvl)}` : ""
                     ]
                   }
                 )
@@ -3977,7 +4592,7 @@ function MarketSelector({
     )
   ] });
 }
-var BLOCK_EXPLORERS2 = {
+var BLOCK_EXPLORERS3 = {
   ethereum: "https://etherscan.io",
   base: "https://basescan.org",
   arbitrum: "https://arbiscan.io"
@@ -4139,7 +4754,7 @@ function PositionCard({ position, chainId }) {
                 tx.txHash && /* @__PURE__ */ jsx(
                   "a",
                   {
-                    href: `${BLOCK_EXPLORERS2[chainId || "ethereum"] || BLOCK_EXPLORERS2.ethereum}/tx/${tx.txHash}`,
+                    href: `${BLOCK_EXPLORERS3[chainId || "ethereum"] || BLOCK_EXPLORERS3.ethereum}/tx/${tx.txHash}`,
                     target: "_blank",
                     rel: "noopener noreferrer",
                     style: { color: "var(--compass-color-text-tertiary)", lineHeight: 0 },
@@ -4214,220 +4829,88 @@ function EarningsModal({ isOpen, onClose, positions, totalEarned, isLoading, cha
                     padding: "6px",
                     color: "var(--compass-color-text-secondary)",
                     borderRadius: "8px",
-                    display: "flex",
-                    alignItems: "center",
-                    justifyContent: "center"
-                  },
-                  children: /* @__PURE__ */ jsx(X, { size: 16 })
-                }
-              )
-            ] }),
-            /* @__PURE__ */ jsxs("div", { style: {
-              padding: "16px 20px",
-              margin: "0 16px",
-              backgroundColor: "var(--compass-color-surface)",
-              borderRadius: "14px"
-            }, children: [
-              /* @__PURE__ */ jsxs("div", { style: {
-                display: "flex",
-                alignItems: "center",
-                gap: "8px",
-                marginBottom: "8px"
-              }, children: [
-                /* @__PURE__ */ jsx("div", { style: {
-                  width: "28px",
-                  height: "28px",
-                  borderRadius: "50%",
-                  backgroundColor: totalEarned >= 0 ? "var(--compass-color-success-muted)" : "var(--compass-color-error-muted)",
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "center"
-                }, children: totalEarned >= 0 ? /* @__PURE__ */ jsx(TrendingUp, { size: 14, style: { color: "var(--compass-color-success)" } }) : /* @__PURE__ */ jsx(TrendingDown, { size: 14, style: { color: "var(--compass-color-error)" } }) }),
-                /* @__PURE__ */ jsxs("div", { children: [
-                  /* @__PURE__ */ jsx("div", { style: { fontSize: "0.6875rem", color: "var(--compass-color-text-tertiary)" }, children: "Total P&L" }),
-                  /* @__PURE__ */ jsxs("div", { style: {
-                    fontSize: "1.25rem",
-                    fontWeight: 700,
-                    color: totalEarned >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)",
-                    letterSpacing: "-0.02em"
-                  }, children: [
-                    totalEarned >= 0 ? "+" : "",
-                    formatCurrency(totalEarned)
-                  ] })
-                ] })
-              ] }),
-              /* @__PURE__ */ jsxs("div", { style: { display: "flex", gap: "16px" }, children: [
-                /* @__PURE__ */ jsxs("div", { children: [
-                  /* @__PURE__ */ jsx("span", { style: { fontSize: "0.6875rem", color: "var(--compass-color-text-tertiary)" }, children: "Unrealised " }),
-                  /* @__PURE__ */ jsxs("span", { style: {
-                    fontSize: "0.8125rem",
-                    fontWeight: 600,
-                    color: totalUnrealized >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)"
-                  }, children: [
-                    totalUnrealized >= 0 ? "+" : "",
-                    formatCurrency(totalUnrealized)
-                  ] })
-                ] }),
-                /* @__PURE__ */ jsxs("div", { children: [
-                  /* @__PURE__ */ jsx("span", { style: { fontSize: "0.6875rem", color: "var(--compass-color-text-tertiary)" }, children: "Realised " }),
-                  /* @__PURE__ */ jsxs("span", { style: {
-                    fontSize: "0.8125rem",
-                    fontWeight: 600,
-                    color: totalRealized >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)"
-                  }, children: [
-                    totalRealized >= 0 ? "+" : "",
-                    formatCurrency(totalRealized)
-                  ] })
-                ] })
-              ] })
-            ] }),
-            /* @__PURE__ */ jsx("div", { style: {
-              flex: 1,
-              overflowY: "auto",
-              scrollbarWidth: "none",
-              padding: "16px",
-              display: "flex",
-              flexDirection: "column",
-              gap: "10px"
-            }, children: isLoading ? /* @__PURE__ */ jsx("div", { style: { textAlign: "center", padding: "32px 0", color: "var(--compass-color-text-tertiary)", fontSize: "0.875rem" }, children: "Loading positions..." }) : positions.length === 0 ? /* @__PURE__ */ jsxs("div", { style: { textAlign: "center", padding: "32px 0" }, children: [
-              /* @__PURE__ */ jsx("p", { style: { color: "var(--compass-color-text-secondary)", fontSize: "0.9375rem", margin: "0 0 4px" }, children: "No active positions yet" }),
-              /* @__PURE__ */ jsx("p", { style: { color: "var(--compass-color-text-tertiary)", fontSize: "0.8125rem", margin: 0 }, children: "Deposit into a market to start earning" })
-            ] }) : positions.map((position) => /* @__PURE__ */ jsx(PositionCard, { position, chainId }, position.id)) })
-          ]
-        }
-      )
-    }
-  );
-}
-var BLOCK_EXPLORERS3 = {
-  ethereum: "https://etherscan.io",
-  base: "https://basescan.org",
-  arbitrum: "https://arbiscan.io"
-};
-function TxStatus({ state }) {
-  const { chainId } = useChain();
-  if (state.status === "idle") return null;
-  const explorer = BLOCK_EXPLORERS3[chainId] || BLOCK_EXPLORERS3.ethereum;
-  return /* @__PURE__ */ jsxs(
-    "div",
-    {
-      className: "mt-4 p-4 border",
-      style: {
-        borderColor: "var(--compass-color-border)",
-        borderRadius: "var(--compass-border-radius-xl)",
-        fontFamily: "var(--compass-font-family)"
-      },
-      children: [
-        state.status === "preparing" && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
-          /* @__PURE__ */ jsx(
-            Loader2,
-            {
-              className: "h-4 w-4 animate-spin",
-              style: { color: "var(--compass-color-primary)" }
-            }
-          ),
-          /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text-secondary)" }, children: "Preparing transaction..." })
-        ] }),
-        state.status === "signing" && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
-          /* @__PURE__ */ jsx(
-            Loader2,
-            {
-              className: "h-4 w-4 animate-spin",
-              style: { color: "var(--compass-color-warning)" }
-            }
-          ),
-          /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text-secondary)" }, children: "Waiting for signature..." })
-        ] }),
-        state.status === "broadcasting" && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
-          /* @__PURE__ */ jsx(
-            Loader2,
-            {
-              className: "h-4 w-4 animate-spin",
-              style: { color: "var(--compass-color-primary)" }
-            }
-          ),
-          /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text-secondary)" }, children: "Broadcasting transaction..." })
-        ] }),
-        state.status === "submitted" && /* @__PURE__ */ jsxs("div", { children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
-            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
-              /* @__PURE__ */ jsx(
-                Loader2,
-                {
-                  className: "h-4 w-4 animate-spin",
-                  style: { color: "var(--compass-color-primary)" }
-                }
-              ),
-              /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-text)" }, children: "Transaction submitted" })
-            ] }),
-            /* @__PURE__ */ jsxs(
-              "a",
-              {
-                href: `${explorer}/tx/${state.txHash}`,
-                target: "_blank",
-                rel: "noopener noreferrer",
-                className: "flex items-center gap-1.5 text-xs hover:opacity-70 transition-opacity",
-                style: { color: "var(--compass-color-text-secondary)" },
-                children: [
-                  "View on explorer",
-                  /* @__PURE__ */ jsx(ExternalLink, { className: "h-3 w-3" })
-                ]
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsx(
-            "p",
-            {
-              className: "text-xs mt-2",
-              style: { color: "var(--compass-color-text-tertiary)" },
-              children: "Waiting for on-chain confirmation. Balances will update automatically."
-            }
-          )
-        ] }),
-        state.status === "confirmed" && /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 text-sm", children: [
-            /* @__PURE__ */ jsx(
-              CheckCircle,
-              {
-                className: "h-4 w-4",
-                style: { color: "var(--compass-color-success)" }
-              }
-            ),
-            /* @__PURE__ */ jsx("span", { style: { color: "var(--compass-color-success)" }, children: "Transaction confirmed" })
-          ] }),
-          /* @__PURE__ */ jsxs(
-            "a",
-            {
-              href: `${explorer}/tx/${state.txHash}`,
-              target: "_blank",
-              rel: "noopener noreferrer",
-              className: "flex items-center gap-1.5 text-xs hover:opacity-70 transition-opacity",
-              style: { color: "var(--compass-color-text-secondary)" },
-              children: [
-                "View on explorer",
-                /* @__PURE__ */ jsx(ExternalLink, { className: "h-3 w-3" })
-              ]
-            }
-          )
-        ] }),
-        state.status === "failed" && /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3 text-sm", children: [
-          /* @__PURE__ */ jsx(
-            XCircle,
-            {
-              className: "h-4 w-4 mt-0.5 shrink-0",
-              style: { color: "var(--compass-color-error)" }
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            "span",
-            {
-              className: "break-all",
-              style: { color: "var(--compass-color-error)" },
-              children: state.error
-            }
-          )
-        ] })
-      ]
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center"
+                  },
+                  children: /* @__PURE__ */ jsx(X, { size: 16 })
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsxs("div", { style: {
+              padding: "16px 20px",
+              margin: "0 16px",
+              backgroundColor: "var(--compass-color-surface)",
+              borderRadius: "14px"
+            }, children: [
+              /* @__PURE__ */ jsxs("div", { style: {
+                display: "flex",
+                alignItems: "center",
+                gap: "8px",
+                marginBottom: "8px"
+              }, children: [
+                /* @__PURE__ */ jsx("div", { style: {
+                  width: "28px",
+                  height: "28px",
+                  borderRadius: "50%",
+                  backgroundColor: totalEarned >= 0 ? "var(--compass-color-success-muted)" : "var(--compass-color-error-muted)",
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center"
+                }, children: totalEarned >= 0 ? /* @__PURE__ */ jsx(TrendingUp, { size: 14, style: { color: "var(--compass-color-success)" } }) : /* @__PURE__ */ jsx(TrendingDown, { size: 14, style: { color: "var(--compass-color-error)" } }) }),
+                /* @__PURE__ */ jsxs("div", { children: [
+                  /* @__PURE__ */ jsx("div", { style: { fontSize: "0.6875rem", color: "var(--compass-color-text-tertiary)" }, children: "Total P&L" }),
+                  /* @__PURE__ */ jsxs("div", { style: {
+                    fontSize: "1.25rem",
+                    fontWeight: 700,
+                    color: totalEarned >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)",
+                    letterSpacing: "-0.02em"
+                  }, children: [
+                    totalEarned >= 0 ? "+" : "",
+                    formatCurrency(totalEarned)
+                  ] })
+                ] })
+              ] }),
+              /* @__PURE__ */ jsxs("div", { style: { display: "flex", gap: "16px" }, children: [
+                /* @__PURE__ */ jsxs("div", { children: [
+                  /* @__PURE__ */ jsx("span", { style: { fontSize: "0.6875rem", color: "var(--compass-color-text-tertiary)" }, children: "Unrealised " }),
+                  /* @__PURE__ */ jsxs("span", { style: {
+                    fontSize: "0.8125rem",
+                    fontWeight: 600,
+                    color: totalUnrealized >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)"
+                  }, children: [
+                    totalUnrealized >= 0 ? "+" : "",
+                    formatCurrency(totalUnrealized)
+                  ] })
+                ] }),
+                /* @__PURE__ */ jsxs("div", { children: [
+                  /* @__PURE__ */ jsx("span", { style: { fontSize: "0.6875rem", color: "var(--compass-color-text-tertiary)" }, children: "Realised " }),
+                  /* @__PURE__ */ jsxs("span", { style: {
+                    fontSize: "0.8125rem",
+                    fontWeight: 600,
+                    color: totalRealized >= 0 ? "var(--compass-color-success)" : "var(--compass-color-error)"
+                  }, children: [
+                    totalRealized >= 0 ? "+" : "",
+                    formatCurrency(totalRealized)
+                  ] })
+                ] })
+              ] })
+            ] }),
+            /* @__PURE__ */ jsx("div", { style: {
+              flex: 1,
+              overflowY: "auto",
+              scrollbarWidth: "none",
+              padding: "16px",
+              display: "flex",
+              flexDirection: "column",
+              gap: "10px"
+            }, children: isLoading ? /* @__PURE__ */ jsx("div", { style: { textAlign: "center", padding: "32px 0", color: "var(--compass-color-text-tertiary)", fontSize: "0.875rem" }, children: "Loading positions..." }) : positions.length === 0 ? /* @__PURE__ */ jsxs("div", { style: { textAlign: "center", padding: "32px 0" }, children: [
+              /* @__PURE__ */ jsx("p", { style: { color: "var(--compass-color-text-secondary)", fontSize: "0.9375rem", margin: "0 0 4px" }, children: "No active positions yet" }),
+              /* @__PURE__ */ jsx("p", { style: { color: "var(--compass-color-text-tertiary)", fontSize: "0.8125rem", margin: 0 }, children: "Deposit into a market to start earning" })
+            ] }) : positions.map((position) => /* @__PURE__ */ jsx(PositionCard, { position, chainId }, position.id)) })
+          ]
+        }
+      )
     }
   );
 }
@@ -4435,7 +4918,7 @@ function truncate2(value, decimals) {
   const factor = Math.pow(10, decimals);
   return (Math.floor(value * factor) / factor).toFixed(decimals);
 }
-var EVM_CHAIN_IDS = {
+var EVM_CHAIN_IDS2 = {
   ethereum: 1,
   base: 8453,
   arbitrum: 42161
@@ -4476,8 +4959,8 @@ function EarnAccount({
   chain: chainProp,
   height = "600px"
 }) {
-  const { address, isConnected, login, logout, signTypedData, switchChain, walletChainId } = useEmbeddableWallet();
-  const { isDeployed } = useEarnAccount();
+  const { address, isConnected, login, logout, signTypedData, switchChain, walletChainId, fundWallet, hasExternalWallet, sendTransaction } = useEmbeddableWallet();
+  const { isDeployed, earnAccountAddress } = useEarnAccount();
   const { chainId: contextChainId } = useChain();
   const CHAIN_ID = chainProp || contextChainId;
   const queryClient = useQueryClient();
@@ -4491,10 +4974,15 @@ function EarnAccount({
   const [isTokenDropdownOpen, setIsTokenDropdownOpen] = useState(false);
   const [isFundModalOpen, setIsFundModalOpen] = useState(false);
   const [fundAmount, setFundAmount] = useState("");
-  const [fundAction, setFundAction] = useState("deposit");
+  const [fundAction, setFundAction] = useState(
+    !hasExternalWallet && fundWallet ? "buy" : "deposit"
+  );
   const [fundStep, setFundStep] = useState("idle");
   const [fundTxState, setFundTxState] = useState({ status: "idle" });
   const fundPollRef = useRef(null);
+  const showBuyTab = !!fundWallet;
+  const showSendTab = !!sendTransaction && !hasExternalWallet;
+  const fundBuyOnly = !hasExternalWallet && showBuyTab && !sendTransaction;
   const actionPollRef = useRef(null);
   const actionTimeoutRef = useRef(null);
   const [isBalancesModalOpen, setIsBalancesModalOpen] = useState(false);
@@ -4534,7 +5022,7 @@ function EarnAccount({
   const fundIsValid = Number(fundAmount) > 0 && !!address && isDeployed;
   const fundPhase = getFundPhase(fundStep);
   const ensureCorrectChain = useCallback(async () => {
-    const targetChainId = EVM_CHAIN_IDS[CHAIN_ID];
+    const targetChainId = EVM_CHAIN_IDS2[CHAIN_ID];
     if (!targetChainId) return;
     if (walletChainId !== void 0 && walletChainId !== targetChainId) {
       if (!switchChain) {
@@ -4558,7 +5046,7 @@ function EarnAccount({
         return null;
       }
     },
-    enabled: !!address && isFundModalOpen && fundAction === "deposit",
+    enabled: !!address && hasExternalWallet && isFundModalOpen && fundAction === "deposit",
     staleTime: 15 * 1e3
   });
   const walletBalance = walletBalanceQuery.data?.balance || "0";
@@ -4842,7 +5330,10 @@ function EarnAccount({
           setFundTxState({ status: "failed", error: "Transaction reverted" });
           return;
         }
-      } catch {
+      } catch (err) {
+        if (err instanceof TypeError && err.message.includes("fetch")) ; else {
+          console.warn("[EarnAccount] Unexpected error polling tx receipt:", err);
+        }
       }
       if (polls >= 24) {
         clearFundPolling();
@@ -5733,13 +6224,13 @@ function EarnAccount({
         onClose: () => {
           setIsFundModalOpen(false);
           setFundAmount("");
-          setFundAction("deposit");
+          setFundAction(fundBuyOnly ? "buy" : showSendTab ? "buy" : "deposit");
           setFundStep("idle");
           setFundTxState({ status: "idle" });
         },
-        title: "Transfer Funds",
+        title: showSendTab ? "Manage Funds" : fundBuyOnly ? "Add Funds" : "Transfer Funds",
         children: /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
-          /* @__PURE__ */ jsx(
+          fundBuyOnly ? null : /* @__PURE__ */ jsx(
             "div",
             {
               className: "flex gap-1 p-1",
@@ -5748,7 +6239,9 @@ function EarnAccount({
                 borderRadius: "var(--compass-border-radius-lg)",
                 fontFamily: "var(--compass-font-family)"
               },
-              children: ["deposit", "withdraw"].map((tab) => /* @__PURE__ */ jsxs(
+              children: [
+                ...showSendTab ? ["buy", "send"] : ["deposit", "withdraw", ...showBuyTab ? ["buy"] : []]
+              ].map((tab) => /* @__PURE__ */ jsxs(
                 "button",
                 {
                   onClick: () => handleFundActionChange(tab),
@@ -5761,7 +6254,7 @@ function EarnAccount({
                     border: "none"
                   },
                   children: [
-                    tab === "deposit" ? /* @__PURE__ */ jsx(ArrowDownLeft, { size: 14 }) : /* @__PURE__ */ jsx(ArrowUpRight, { size: 14 }),
+                    tab === "deposit" ? /* @__PURE__ */ jsx(ArrowDownLeft, { size: 14 }) : tab === "withdraw" ? /* @__PURE__ */ jsx(ArrowUpRight, { size: 14 }) : tab === "send" ? /* @__PURE__ */ jsx(Send, { size: 14 }) : /* @__PURE__ */ jsx(ArrowRight, { size: 14 }),
                     tab
                   ]
                 },
@@ -5769,137 +6262,158 @@ function EarnAccount({
               ))
             }
           ),
-          (fundIsBusy || fundStep === "confirmed") && fundAction === "deposit" && /* @__PURE__ */ jsxs(
-            "div",
+          fundAction === "send" ? /* @__PURE__ */ jsx(
+            SendForm,
             {
-              className: "flex gap-3 p-3 text-xs",
-              style: {
-                backgroundColor: "var(--compass-color-surface)",
-                borderRadius: "var(--compass-border-radius-lg)",
-                fontFamily: "var(--compass-font-family)"
-              },
-              children: [
-                /* @__PURE__ */ jsx(
-                  FundStepIndicator,
-                  {
-                    number: 1,
-                    label: "Approve",
-                    state: fundPhase > 1 ? "done" : fundPhase === 1 ? "active" : "pending"
-                  }
-                ),
-                /* @__PURE__ */ jsx(
-                  FundStepIndicator,
-                  {
-                    number: 2,
-                    label: "Transfer",
-                    state: fundStep === "confirmed" ? "done" : fundPhase > 1 ? "active" : "pending"
-                  }
-                )
-              ]
+              onComplete: () => {
+                queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
+                queryClient.invalidateQueries({ queryKey: ["walletBalance"] });
+                queryClient.invalidateQueries({ queryKey: ["walletTokenBalance"] });
+              }
             }
-          ),
-          /* @__PURE__ */ jsxs("div", { children: [
-            /* @__PURE__ */ jsx(
-              "label",
+          ) : fundAction === "buy" || fundBuyOnly ? /* @__PURE__ */ jsx(
+            BuyForm,
+            {
+              targetAddress: earnAccountAddress || "",
+              onComplete: () => {
+                queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
+                queryClient.invalidateQueries({ queryKey: ["walletBalance"] });
+                queryClient.invalidateQueries({ queryKey: ["walletTokenBalance"] });
+              }
+            }
+          ) : /* @__PURE__ */ jsxs(Fragment, { children: [
+            (fundIsBusy || fundStep === "confirmed") && fundAction === "deposit" && /* @__PURE__ */ jsxs(
+              "div",
               {
-                className: "block text-sm mb-1.5",
+                className: "flex gap-3 p-3 text-xs",
                 style: {
-                  color: "var(--compass-color-text-secondary)",
+                  backgroundColor: "var(--compass-color-surface)",
+                  borderRadius: "var(--compass-border-radius-lg)",
                   fontFamily: "var(--compass-font-family)"
                 },
-                children: "Amount"
+                children: [
+                  /* @__PURE__ */ jsx(
+                    FundStepIndicator,
+                    {
+                      number: 1,
+                      label: "Approve",
+                      state: fundPhase > 1 ? "done" : fundPhase === 1 ? "active" : "pending"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx(
+                    FundStepIndicator,
+                    {
+                      number: 2,
+                      label: "Transfer",
+                      state: fundStep === "confirmed" ? "done" : fundPhase > 1 ? "active" : "pending"
+                    }
+                  )
+                ]
               }
             ),
-            /* @__PURE__ */ jsxs("div", { className: "relative", children: [
+            /* @__PURE__ */ jsxs("div", { children: [
               /* @__PURE__ */ jsx(
-                "input",
+                "label",
                 {
-                  type: "number",
-                  value: fundAmount,
-                  onChange: (e) => {
-                    setFundAmount(e.target.value);
-                    setFundTxState({ status: "idle" });
-                  },
-                  disabled: fundIsBusy,
-                  placeholder: "0.00",
-                  className: "w-full border px-3 py-2.5 pr-14 text-sm focus:outline-none disabled:opacity-50",
+                  className: "block text-sm mb-1.5",
                   style: {
-                    backgroundColor: "var(--compass-color-surface)",
-                    borderColor: "var(--compass-color-border)",
-                    borderRadius: "var(--compass-border-radius-lg)",
-                    color: "var(--compass-color-text)",
+                    color: "var(--compass-color-text-secondary)",
                     fontFamily: "var(--compass-font-family)"
-                  }
+                  },
+                  children: "Amount"
                 }
               ),
-              /* @__PURE__ */ jsx(
-                "span",
+              /* @__PURE__ */ jsxs("div", { className: "relative", children: [
+                /* @__PURE__ */ jsx(
+                  "input",
+                  {
+                    type: "number",
+                    value: fundAmount,
+                    onChange: (e) => {
+                      setFundAmount(e.target.value);
+                      setFundTxState({ status: "idle" });
+                    },
+                    disabled: fundIsBusy,
+                    placeholder: "0.00",
+                    className: "w-full border px-3 py-2.5 pr-14 text-sm focus:outline-none disabled:opacity-50",
+                    style: {
+                      backgroundColor: "var(--compass-color-surface)",
+                      borderColor: "var(--compass-color-border)",
+                      borderRadius: "var(--compass-border-radius-lg)",
+                      color: "var(--compass-color-text)",
+                      fontFamily: "var(--compass-font-family)"
+                    }
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  "span",
+                  {
+                    className: "absolute right-3 top-1/2 -translate-y-1/2 text-xs",
+                    style: { color: "var(--compass-color-text-tertiary)" },
+                    children: "USDC"
+                  }
+                )
+              ] }),
+              fundMaxBalance !== "0" && /* @__PURE__ */ jsxs(
+                "p",
                 {
-                  className: "absolute right-3 top-1/2 -translate-y-1/2 text-xs",
+                  className: "text-xs mt-1",
                   style: { color: "var(--compass-color-text-tertiary)" },
-                  children: "USDC"
+                  children: [
+                    "Available:",
+                    " ",
+                    /* @__PURE__ */ jsxs(
+                      "button",
+                      {
+                        onClick: () => setFundAmount(truncate2(parseFloat(fundMaxBalance), 2)),
+                        disabled: fundIsBusy,
+                        style: { color: "var(--compass-color-primary)", background: "none", border: "none", padding: 0, cursor: "pointer", fontSize: "inherit" },
+                        children: [
+                          truncate2(parseFloat(fundMaxBalance), 2),
+                          " USDC"
+                        ]
+                      }
+                    )
+                  ]
                 }
               )
             ] }),
-            fundMaxBalance !== "0" && /* @__PURE__ */ jsxs(
+            !fundIsBusy && fundStep !== "confirmed" && fundStep !== "failed" && fundTxState.status === "idle" && /* @__PURE__ */ jsx(
               "p",
               {
-                className: "text-xs mt-1",
-                style: { color: "var(--compass-color-text-tertiary)" },
-                children: [
-                  "Available:",
-                  " ",
-                  /* @__PURE__ */ jsxs(
-                    "button",
-                    {
-                      onClick: () => setFundAmount(truncate2(parseFloat(fundMaxBalance), 2)),
-                      disabled: fundIsBusy,
-                      style: { color: "var(--compass-color-primary)", background: "none", border: "none", padding: 0, cursor: "pointer", fontSize: "inherit" },
-                      children: [
-                        truncate2(parseFloat(fundMaxBalance), 2),
-                        " USDC"
-                      ]
-                    }
-                  )
-                ]
+                className: "text-xs",
+                style: {
+                  color: "var(--compass-color-text-tertiary)",
+                  fontFamily: "var(--compass-font-family)"
+                },
+                children: fundAction === "deposit" ? `Approves the token transfer, then transfers USDC from your ${!hasExternalWallet ? "embedded " : ""}wallet into your savings account. Requires 2 signatures.${!hasExternalWallet ? " Note: deposit and withdraw use your embedded wallet, not your bank account." : ""}` : `Moves USDC from your savings account back to your ${!hasExternalWallet ? "embedded " : ""}wallet. Requires 1 signature.${!hasExternalWallet ? " Gas fees are sponsored." : ""}`
               }
-            )
-          ] }),
-          !fundIsBusy && fundStep !== "confirmed" && fundStep !== "failed" && fundTxState.status === "idle" && /* @__PURE__ */ jsx(
-            "p",
-            {
-              className: "text-xs",
-              style: {
-                color: "var(--compass-color-text-tertiary)",
-                fontFamily: "var(--compass-font-family)"
-              },
-              children: fundAction === "deposit" ? "Approves the token transfer, then transfers USDC from your wallet into your savings account. Requires 2 signatures." : "Transfers USDC from your savings account back to your wallet. Requires 1 signature."
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            "button",
-            {
-              onClick: handleFundTransfer,
-              disabled: !fundIsValid || fundIsBusy,
-              className: "w-full py-3 px-4 text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
-              style: {
-                backgroundColor: "var(--compass-color-primary)",
-                color: "var(--compass-color-primary-text)",
-                borderRadius: "var(--compass-border-radius-xl)",
-                fontFamily: "var(--compass-font-family)",
-                transition: "all 200ms ease",
-                border: "none"
-              },
-              children: fundIsBusy ? /* @__PURE__ */ jsxs(Fragment, { children: [
-                /* @__PURE__ */ jsx(Loader2, { className: "h-4 w-4 animate-spin" }),
-                fundButtonLabel()
-              ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-                /* @__PURE__ */ jsx(ArrowRight, { className: "h-4 w-4" }),
-                fundAction === "deposit" ? "Transfer to Savings Account" : "Withdraw to Wallet"
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsx(TxStatus, { state: fundTxState })
+            ),
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                onClick: handleFundTransfer,
+                disabled: !fundIsValid || fundIsBusy,
+                className: "w-full py-3 px-4 text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
+                style: {
+                  backgroundColor: "var(--compass-color-primary)",
+                  color: "var(--compass-color-primary-text)",
+                  borderRadius: "var(--compass-border-radius-xl)",
+                  fontFamily: "var(--compass-font-family)",
+                  transition: "all 200ms ease",
+                  border: "none"
+                },
+                children: fundIsBusy ? /* @__PURE__ */ jsxs(Fragment, { children: [
+                  /* @__PURE__ */ jsx(Loader2, { className: "h-4 w-4 animate-spin" }),
+                  fundButtonLabel()
+                ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+                  /* @__PURE__ */ jsx(ArrowRight, { className: "h-4 w-4" }),
+                  fundAction === "deposit" ? "Transfer to Savings Account" : "Withdraw to Wallet"
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsx(TxStatus, { state: fundTxState })
+          ] })
         ] })
       }
     ),
@@ -7706,19 +8220,24 @@ function getPhase(step) {
   if (step === "approving" || step === "signing-approval") return 1;
   return 2;
 }
-var EVM_CHAIN_IDS2 = {
+var EVM_CHAIN_IDS3 = {
   ethereum: 1,
   base: 8453,
   arbitrum: 42161
 };
 function TopUpModal({ isOpen, onClose }) {
-  const { address, signTypedData, switchChain, walletChainId } = useEmbeddableWallet();
+  const { address, signTypedData, switchChain, walletChainId, fundWallet, hasExternalWallet, sendTransaction } = useEmbeddableWallet();
   const { chainId } = useChain();
-  const { isDeployed } = useCreditAccount();
+  const { isDeployed, creditAccountAddress } = useCreditAccount();
   const queryClient = useQueryClient();
   const prices = useTokenPrices();
   const token = "USDC";
-  const [action, setAction] = useState("deposit");
+  const [action, setAction] = useState(
+    !hasExternalWallet && fundWallet ? "buy" : "deposit"
+  );
+  const showBuyTab = !!fundWallet;
+  const showSendTab = !!sendTransaction && !hasExternalWallet;
+  const buyOnly = !hasExternalWallet && showBuyTab && !sendTransaction;
   const [amount, setAmount] = useState("");
   const [step, setStep] = useState("idle");
   const [txState, setTxState] = useState({ status: "idle" });
@@ -7767,7 +8286,7 @@ function TopUpModal({ isOpen, onClose }) {
   const isValid = Number(amount) > 0 && !!address && isDeployed;
   const isBusy = step === "approving" || step === "signing-approval" || step === "preparing-transfer" || step === "signing-transfer" || step === "executing";
   const ensureCorrectChain = useCallback(async () => {
-    const targetChainId = EVM_CHAIN_IDS2[CHAIN_ID];
+    const targetChainId = EVM_CHAIN_IDS3[CHAIN_ID];
     if (!targetChainId) return;
     if (walletChainId !== void 0 && walletChainId !== targetChainId) {
       if (!switchChain) {
@@ -7969,7 +8488,10 @@ function TopUpModal({ isOpen, onClose }) {
           setTxState({ status: "failed", error: "Transaction reverted" });
           return;
         }
-      } catch {
+      } catch (err) {
+        if (err instanceof TypeError && err.message.includes("fetch")) ; else {
+          console.warn("[TopUpModal] Unexpected error polling tx receipt:", err);
+        }
       }
       if (polls >= 24) {
         clearPolling();
@@ -8005,8 +8527,8 @@ function TopUpModal({ isOpen, onClose }) {
     color: "var(--compass-color-text-secondary)",
     fontFamily: "var(--compass-font-family)"
   };
-  return /* @__PURE__ */ jsx(ActionModal, { isOpen, onClose, title: "Transfer Funds", children: /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
-    /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(ActionModal, { isOpen, onClose, title: showSendTab ? "Manage Funds" : buyOnly ? "Add Funds" : "Transfer Funds", children: /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
+    !buyOnly && /* @__PURE__ */ jsx(
       "div",
       {
         className: "flex gap-1 p-1",
@@ -8015,7 +8537,9 @@ function TopUpModal({ isOpen, onClose }) {
           borderRadius: "var(--compass-border-radius-lg)",
           fontFamily: "var(--compass-font-family)"
         },
-        children: ["deposit", "withdraw"].map((tab) => /* @__PURE__ */ jsxs(
+        children: [
+          ...showSendTab ? ["buy", "send"] : showBuyTab ? ["deposit", "withdraw", "buy"] : ["deposit", "withdraw"]
+        ].map((tab) => /* @__PURE__ */ jsxs(
           "button",
           {
             onClick: () => handleActionChange(tab),
@@ -8027,7 +8551,7 @@ function TopUpModal({ isOpen, onClose }) {
               borderRadius: "var(--compass-border-radius-md)"
             },
             children: [
-              tab === "deposit" ? /* @__PURE__ */ jsx(ArrowDownLeft, { size: 14 }) : /* @__PURE__ */ jsx(ArrowUpRight, { size: 14 }),
+              tab === "deposit" ? /* @__PURE__ */ jsx(ArrowDownLeft, { size: 14 }) : tab === "withdraw" ? /* @__PURE__ */ jsx(ArrowUpRight, { size: 14 }) : tab === "send" ? /* @__PURE__ */ jsx(Send, { size: 14 }) : /* @__PURE__ */ jsx(ArrowRight, { size: 14 }),
               tab
             ]
           },
@@ -8035,122 +8559,143 @@ function TopUpModal({ isOpen, onClose }) {
         ))
       }
     ),
-    (isBusy || step === "confirmed") && action === "deposit" && /* @__PURE__ */ jsxs(
-      "div",
+    action === "send" ? /* @__PURE__ */ jsx(
+      SendForm,
       {
-        className: "flex gap-3 p-3 text-xs",
-        style: {
-          backgroundColor: "var(--compass-color-surface)",
-          borderRadius: "var(--compass-border-radius-lg)",
-          fontFamily: "var(--compass-font-family)"
-        },
-        children: [
+        product: "credit",
+        productAccountAddress: creditAccountAddress || void 0,
+        onComplete: () => {
+          queryClient.invalidateQueries({ queryKey: ["creditBalances"] });
+          queryClient.invalidateQueries({ queryKey: ["walletTokenBalance"] });
+        }
+      }
+    ) : action === "buy" || buyOnly ? /* @__PURE__ */ jsx(
+      BuyForm,
+      {
+        targetAddress: creditAccountAddress || "",
+        onComplete: () => {
+          queryClient.invalidateQueries({ queryKey: ["creditBalances"] });
+          queryClient.invalidateQueries({ queryKey: ["walletTokenBalance"] });
+        }
+      }
+    ) : /* @__PURE__ */ jsxs(Fragment, { children: [
+      (isBusy || step === "confirmed") && action === "deposit" && /* @__PURE__ */ jsxs(
+        "div",
+        {
+          className: "flex gap-3 p-3 text-xs",
+          style: {
+            backgroundColor: "var(--compass-color-surface)",
+            borderRadius: "var(--compass-border-radius-lg)",
+            fontFamily: "var(--compass-font-family)"
+          },
+          children: [
+            /* @__PURE__ */ jsx(
+              StepIndicator,
+              {
+                number: 1,
+                label: "Approve",
+                state: phase > 1 ? "done" : phase === 1 ? "active" : "pending"
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              StepIndicator,
+              {
+                number: 2,
+                label: "Transfer",
+                state: step === "confirmed" ? "done" : phase > 1 ? "active" : "pending"
+              }
+            )
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxs("div", { children: [
+        /* @__PURE__ */ jsx("label", { className: "block text-sm mb-1.5", style: labelStyle, children: "Amount" }),
+        /* @__PURE__ */ jsxs("div", { className: "relative", children: [
           /* @__PURE__ */ jsx(
-            StepIndicator,
+            "input",
             {
-              number: 1,
-              label: "Approve",
-              state: phase > 1 ? "done" : phase === 1 ? "active" : "pending"
+              type: "number",
+              value: amount,
+              onChange: (e) => {
+                setAmount(e.target.value);
+                setTxState({ status: "idle" });
+              },
+              disabled: isBusy,
+              placeholder: "0.00",
+              className: "w-full border px-3 py-2.5 pr-14 text-sm focus:outline-none disabled:opacity-50",
+              style: inputStyle
             }
           ),
           /* @__PURE__ */ jsx(
-            StepIndicator,
+            "span",
             {
-              number: 2,
-              label: "Transfer",
-              state: step === "confirmed" ? "done" : phase > 1 ? "active" : "pending"
+              className: "absolute right-3 top-1/2 -translate-y-1/2 text-xs",
+              style: { color: "var(--compass-color-text-tertiary)" },
+              children: token
             }
           )
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsxs("div", { children: [
-      /* @__PURE__ */ jsx("label", { className: "block text-sm mb-1.5", style: labelStyle, children: "Amount" }),
-      /* @__PURE__ */ jsxs("div", { className: "relative", children: [
-        /* @__PURE__ */ jsx(
-          "input",
+        ] }),
+        formatUsdEstimate(amount, token, prices) && /* @__PURE__ */ jsxs(
+          "p",
           {
-            type: "number",
-            value: amount,
-            onChange: (e) => {
-              setAmount(e.target.value);
-              setTxState({ status: "idle" });
-            },
-            disabled: isBusy,
-            placeholder: "0.00",
-            className: "w-full border px-3 py-2.5 pr-14 text-sm focus:outline-none disabled:opacity-50",
-            style: inputStyle
+            className: "text-xs mt-1",
+            style: { color: "var(--compass-color-text-tertiary)" },
+            children: [
+              "\u2248",
+              " ",
+              formatUsdEstimate(amount, token, prices)
+            ]
           }
         ),
-        /* @__PURE__ */ jsx(
-          "span",
+        maxBalance && maxBalance !== "0" && /* @__PURE__ */ jsxs(
+          "p",
           {
-            className: "absolute right-3 top-1/2 -translate-y-1/2 text-xs",
+            className: "text-xs mt-1",
             style: { color: "var(--compass-color-text-tertiary)" },
-            children: token
+            children: [
+              "Available: ",
+              truncate6(parseFloat(maxBalance), 2),
+              " ",
+              token
+            ]
           }
         )
       ] }),
-      formatUsdEstimate(amount, token, prices) && /* @__PURE__ */ jsxs(
+      !isBusy && step !== "confirmed" && step !== "failed" && txState.status === "idle" && /* @__PURE__ */ jsx(
         "p",
         {
-          className: "text-xs mt-1",
-          style: { color: "var(--compass-color-text-tertiary)" },
-          children: [
-            "\u2248",
-            " ",
-            formatUsdEstimate(amount, token, prices)
-          ]
+          className: "text-xs",
+          style: {
+            color: "var(--compass-color-text-tertiary)",
+            fontFamily: "var(--compass-font-family)"
+          },
+          children: action === "deposit" ? `Approves the token transfer, then transfers tokens from your ${!hasExternalWallet ? "embedded " : ""}wallet into your credit account. Requires 2 signatures.${!hasExternalWallet ? " Note: deposit and withdraw use your embedded wallet, not your bank account." : ""}` : `Moves tokens from your credit account back to your ${!hasExternalWallet ? "embedded " : ""}wallet. Requires 1 signature.${!hasExternalWallet ? " Gas fees are sponsored." : ""}`
         }
       ),
-      maxBalance && maxBalance !== "0" && /* @__PURE__ */ jsxs(
-        "p",
+      /* @__PURE__ */ jsx(
+        "button",
         {
-          className: "text-xs mt-1",
-          style: { color: "var(--compass-color-text-tertiary)" },
-          children: [
-            "Available: ",
-            truncate6(parseFloat(maxBalance), 2),
-            " ",
-            token
-          ]
+          onClick: handleTransfer,
+          disabled: !isValid || isBusy,
+          className: "w-full py-3 px-4 text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
+          style: {
+            backgroundColor: "var(--compass-color-primary)",
+            color: "white",
+            borderRadius: "var(--compass-border-radius-xl)",
+            fontFamily: "var(--compass-font-family)",
+            transition: "var(--compass-transition-normal)"
+          },
+          children: isBusy ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(Loader2, { className: "h-4 w-4 animate-spin" }),
+            buttonLabel()
+          ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(ArrowRight, { className: "h-4 w-4" }),
+            action === "deposit" ? "Transfer to Credit Account" : "Withdraw to Wallet"
+          ] })
         }
-      )
-    ] }),
-    !isBusy && step !== "confirmed" && step !== "failed" && txState.status === "idle" && /* @__PURE__ */ jsx(
-      "p",
-      {
-        className: "text-xs",
-        style: {
-          color: "var(--compass-color-text-tertiary)",
-          fontFamily: "var(--compass-font-family)"
-        },
-        children: action === "deposit" ? "Approves the token transfer, then transfers tokens from your wallet into your credit account. Requires 2 signatures." : "Transfers tokens from your credit account back to your wallet. Requires 1 signature."
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "button",
-      {
-        onClick: handleTransfer,
-        disabled: !isValid || isBusy,
-        className: "w-full py-3 px-4 text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed",
-        style: {
-          backgroundColor: "var(--compass-color-primary)",
-          color: "white",
-          borderRadius: "var(--compass-border-radius-xl)",
-          fontFamily: "var(--compass-font-family)",
-          transition: "var(--compass-transition-normal)"
-        },
-        children: isBusy ? /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(Loader2, { className: "h-4 w-4 animate-spin" }),
-          buttonLabel()
-        ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(ArrowRight, { className: "h-4 w-4" }),
-          action === "deposit" ? "Transfer to Credit Account" : "Withdraw to Wallet"
-        ] })
-      }
-    ),
-    /* @__PURE__ */ jsx(TxStatus, { state: txState })
+      ),
+      /* @__PURE__ */ jsx(TxStatus, { state: txState })
+    ] })
   ] }) });
 }
 function StepIndicator({
@@ -8178,9 +8723,10 @@ function CreditSwapModal({ isOpen, onClose }) {
   const prices = useTokenPrices();
   const { txState, executeBundle, resetState } = useCreditBundle();
   const tokens = CREDIT_TOKENS;
-  const fromToken = "USDC";
-  const [toToken, setToToken] = useState(tokens.find((t) => t !== fromToken) || tokens[0] || "WETH");
+  const [fromToken, setFromToken] = useState("USDC");
+  const [toToken, setToToken] = useState(tokens.find((t) => t !== "USDC") || tokens[0] || "WETH");
   const [fromAmount, setFromAmount] = useState("");
+  const [isFromOpen, setIsFromOpen] = useState(false);
   const [isToOpen, setIsToOpen] = useState(false);
   useEffect(() => {
     if (isOpen) {
@@ -8188,6 +8734,12 @@ function CreditSwapModal({ isOpen, onClose }) {
       resetState();
     }
   }, [isOpen]);
+  useEffect(() => {
+    if (fromToken === toToken) {
+      const alt = tokens.find((t) => t !== fromToken);
+      if (alt) setToToken(alt);
+    }
+  }, [fromToken, toToken, tokens]);
   const fromBalance = balances?.find((b) => b.tokenSymbol === fromToken);
   const fromBalanceAmount = fromBalance ? parseFloat(fromBalance.amount) : 0;
   const estimatedOutput = (() => {
@@ -8266,24 +8818,76 @@ function CreditSwapModal({ isOpen, onClose }) {
                 }
               }
             ),
-            /* @__PURE__ */ jsx(
-              "div",
-              {
-                style: {
-                  display: "flex",
-                  alignItems: "center",
-                  fontWeight: 500,
-                  backgroundColor: "var(--compass-color-background)",
-                  border: "1.5px solid var(--compass-color-border)",
-                  color: "var(--compass-color-text)",
-                  borderRadius: "var(--compass-border-radius-md)",
-                  padding: "4px 8px",
-                  fontSize: "0.8125rem",
-                  flexShrink: 0
-                },
-                children: fromToken
-              }
-            )
+            /* @__PURE__ */ jsxs("div", { style: { position: "relative", flexShrink: 0 }, children: [
+              /* @__PURE__ */ jsxs(
+                "button",
+                {
+                  onClick: () => setIsFromOpen(!isFromOpen),
+                  disabled: isBusy,
+                  style: {
+                    display: "flex",
+                    alignItems: "center",
+                    fontWeight: 500,
+                    backgroundColor: "var(--compass-color-background)",
+                    border: "1.5px solid var(--compass-color-border)",
+                    color: "var(--compass-color-text)",
+                    borderRadius: "var(--compass-border-radius-md)",
+                    padding: "4px 8px",
+                    gap: "4px",
+                    fontSize: "0.8125rem",
+                    cursor: isBusy ? "not-allowed" : "pointer"
+                  },
+                  children: [
+                    fromToken,
+                    /* @__PURE__ */ jsx(ChevronDown, { size: 12, style: { color: "var(--compass-color-text-tertiary)" } })
+                  ]
+                }
+              ),
+              isFromOpen && /* @__PURE__ */ jsx(
+                "div",
+                {
+                  style: {
+                    position: "absolute",
+                    right: 0,
+                    top: "100%",
+                    marginTop: "4px",
+                    zIndex: 10,
+                    backgroundColor: "var(--compass-color-surface)",
+                    border: "1.5px solid var(--compass-color-border)",
+                    borderRadius: "var(--compass-border-radius-lg)",
+                    boxShadow: "var(--compass-shadow-md)",
+                    minWidth: "120px",
+                    maxHeight: "200px",
+                    overflowY: "auto",
+                    scrollbarWidth: "none"
+                  },
+                  children: tokens.filter((t) => t !== toToken).map((token) => /* @__PURE__ */ jsx(
+                    "button",
+                    {
+                      onClick: () => {
+                        setFromToken(token);
+                        setFromAmount("");
+                        setIsFromOpen(false);
+                      },
+                      style: {
+                        display: "block",
+                        width: "100%",
+                        textAlign: "left",
+                        padding: "6px 10px",
+                        fontSize: "0.8125rem",
+                        fontWeight: 500,
+                        color: token === fromToken ? "var(--compass-color-primary)" : "var(--compass-color-text)",
+                        backgroundColor: token === fromToken ? "var(--compass-color-primary-muted)" : "transparent",
+                        border: "none",
+                        cursor: "pointer"
+                      },
+                      children: token
+                    },
+                    token
+                  ))
+                }
+              )
+            ] })
           ] })
         ]
       }
@@ -8490,7 +9094,7 @@ function CreditAccount({
   onBorrow: _onBorrow,
   onRepay: _onRepay
 }) {
-  const { address, isConnected, login, logout } = useEmbeddableWallet();
+  const { address, isConnected, login, logout, hasExternalWallet } = useEmbeddableWallet();
   const { isDeployed, creditAccountAddress } = useCreditAccount();
   const { chainId } = useChain();
   const { data: positions, isLoading: positionsLoading } = useCreditPositions();
@@ -8516,6 +9120,25 @@ function CreditAccount({
     return { ...b, usdValue };
   }).filter((b) => b.usdValue >= 0.01).sort((a, b) => a.tokenSymbol.localeCompare(b.tokenSymbol));
   const totalIdleUsd = balancesWithUsd.reduce((sum, b) => sum + b.usdValue, 0);
+  const { data: walletBalance } = useQuery({
+    queryKey: ["embeddedWalletBalance", chainId, address, "USDC"],
+    queryFn: async () => {
+      if (!address) return "0";
+      try {
+        const response = await fetch(
+          `/api/compass/token/balance?chain=${chainId}&token=USDC&address=${address}`
+        );
+        if (response.ok) {
+          const data = await response.json();
+          return data.balance || "0";
+        }
+      } catch {
+      }
+      return "0";
+    },
+    enabled: !!address && hasExternalWallet,
+    staleTime: 30 * 1e3
+  });
   const totalInterestEarnedUsd = (() => {
     if (!positions) return 0;
     let total = 0;
@@ -9516,6 +10139,7 @@ function PositionDetailModal({ position, onClose }) {
   const isPendle = position.venue === "pendle";
   const duration = formatDuration(position.entryTimestamp);
   const expiryDate = formatExpiryUTC(position.expiry);
+  const modalRef = useRef(null);
   useEffect(() => {
     const handleKeyDown = (e) => {
       if (e.key === "Escape") onClose();
@@ -9523,296 +10147,312 @@ function PositionDetailModal({ position, onClose }) {
     document.addEventListener("keydown", handleKeyDown);
     return () => document.removeEventListener("keydown", handleKeyDown);
   }, [onClose]);
+  const handleOverlayWheel = useCallback((e) => {
+    if (modalRef.current && !modalRef.current.contains(e.target)) {
+      window.scrollBy(0, e.deltaY);
+    }
+  }, []);
   const hasStats = position.apy || isPendle && (duration || expiryDate) || position.pnl;
-  return /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsxs(
     "div",
     {
       className: "fixed inset-0 z-50 flex items-center justify-center p-4",
-      style: { backgroundColor: "rgba(0, 0, 0, 0.7)" },
+      onWheel: handleOverlayWheel,
       onClick: onClose,
-      children: /* @__PURE__ */ jsxs(
-        "div",
-        {
-          className: "relative w-full max-w-md rounded-xl border overflow-hidden max-h-[90vh] overflow-y-auto",
-          style: {
-            backgroundColor: "var(--compass-color-background)",
-            borderColor: "var(--compass-color-border)",
-            scrollbarWidth: "none"
-          },
-          onClick: (e) => e.stopPropagation(),
-          children: [
-            /* @__PURE__ */ jsxs(
-              "div",
-              {
-                className: "sticky top-0 flex items-center justify-between p-4 border-b",
-                style: {
-                  backgroundColor: "var(--compass-color-surface)",
-                  borderColor: "var(--compass-color-border)"
-                },
-                children: [
-                  /* @__PURE__ */ jsxs("div", { children: [
-                    /* @__PURE__ */ jsx(
-                      "h2",
-                      {
-                        className: "font-semibold text-lg",
-                        style: { color: "var(--compass-color-text)" },
-                        children: position.name
-                      }
-                    ),
-                    /* @__PURE__ */ jsx(
-                      "p",
-                      {
-                        className: "text-sm",
-                        style: { color: "var(--compass-color-text-secondary)" },
-                        children: position.venueName
-                      }
-                    )
-                  ] }),
-                  /* @__PURE__ */ jsx(
-                    "button",
-                    {
-                      onClick: onClose,
-                      className: "p-2 rounded-lg hover:opacity-80 transition-opacity",
-                      style: { backgroundColor: "var(--compass-color-background)" },
-                      children: /* @__PURE__ */ jsx(X, { size: 20, style: { color: "var(--compass-color-text-secondary)" } })
-                    }
-                  )
-                ]
-              }
-            ),
-            /* @__PURE__ */ jsx("div", { className: "p-4 border-b", style: { borderColor: "var(--compass-color-border)" }, children: /* @__PURE__ */ jsxs("div", { className: "text-center", children: [
-              /* @__PURE__ */ jsx(
-                "p",
-                {
-                  className: "text-sm mb-1",
-                  style: { color: "var(--compass-color-text-secondary)" },
-                  children: "Current Balance"
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                "p",
-                {
-                  className: "text-3xl font-bold",
-                  style: { color: "var(--compass-color-text)" },
-                  children: formatUSD(position.balanceUsd)
-                }
-              ),
+      children: [
+        /* @__PURE__ */ jsx(
+          "div",
+          {
+            className: "absolute inset-0",
+            style: { backgroundColor: "rgba(0, 0, 0, 0.7)" }
+          }
+        ),
+        /* @__PURE__ */ jsxs(
+          "div",
+          {
+            ref: modalRef,
+            className: "relative w-full max-w-md rounded-xl border max-h-[85vh] overflow-y-auto",
+            style: {
+              backgroundColor: "var(--compass-color-background)",
+              borderColor: "var(--compass-color-border)",
+              scrollbarWidth: "none",
+              overscrollBehavior: "contain"
+            },
+            onClick: (e) => e.stopPropagation(),
+            children: [
               /* @__PURE__ */ jsxs(
-                "p",
-                {
-                  className: "text-sm font-mono mt-1",
-                  style: { color: "var(--compass-color-text-secondary)" },
-                  children: [
-                    formatAmount(position.balance),
-                    " ",
-                    position.assetSymbol
-                  ]
-                }
-              )
-            ] }) }),
-            hasStats && /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-3 p-4 border-b", style: { borderColor: "var(--compass-color-border)" }, children: [
-              position.apy && /* @__PURE__ */ jsxs(
-                "div",
-                {
-                  className: "p-3 rounded-lg",
-                  style: { backgroundColor: "var(--compass-color-surface)" },
-                  children: [
-                    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
-                      /* @__PURE__ */ jsx(Percent, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }),
-                      /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "APY" })
-                    ] }),
-                    /* @__PURE__ */ jsxs(
-                      "p",
-                      {
-                        className: "font-semibold",
-                        style: { color: "var(--compass-color-success)" },
-                        children: [
-                          parseFloat(position.apy).toFixed(2),
-                          "%"
-                        ]
-                      }
-                    )
-                  ]
-                }
-              ),
-              isPendle && duration && /* @__PURE__ */ jsxs(
-                "div",
-                {
-                  className: "p-3 rounded-lg",
-                  style: { backgroundColor: "var(--compass-color-surface)" },
-                  children: [
-                    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
-                      /* @__PURE__ */ jsx(Clock, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }),
-                      /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "Duration" })
-                    ] }),
-                    /* @__PURE__ */ jsx(
-                      "p",
-                      {
-                        className: "font-semibold",
-                        style: { color: "var(--compass-color-text)" },
-                        children: duration
-                      }
-                    )
-                  ]
-                }
-              ),
-              isPendle && expiryDate && /* @__PURE__ */ jsxs(
                 "div",
                 {
-                  className: "p-3 rounded-lg",
-                  style: { backgroundColor: "var(--compass-color-surface)" },
+                  className: "sticky top-0 flex items-center justify-between p-4 border-b",
+                  style: {
+                    backgroundColor: "var(--compass-color-surface)",
+                    borderColor: "var(--compass-color-border)"
+                  },
                   children: [
-                    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
-                      /* @__PURE__ */ jsx(Calendar, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }),
-                      /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "Expiry (UTC)" })
+                    /* @__PURE__ */ jsxs("div", { children: [
+                      /* @__PURE__ */ jsx(
+                        "h2",
+                        {
+                          className: "font-semibold text-lg",
+                          style: { color: "var(--compass-color-text)" },
+                          children: position.name
+                        }
+                      ),
+                      /* @__PURE__ */ jsx(
+                        "p",
+                        {
+                          className: "text-sm",
+                          style: { color: "var(--compass-color-text-secondary)" },
+                          children: position.venueName
+                        }
+                      )
                     ] }),
                     /* @__PURE__ */ jsx(
-                      "p",
+                      "button",
                       {
-                        className: "font-semibold",
-                        style: { color: "var(--compass-color-text)" },
-                        children: expiryDate
+                        onClick: onClose,
+                        className: "p-2 rounded-lg hover:opacity-80 transition-opacity",
+                        style: { backgroundColor: "var(--compass-color-background)" },
+                        children: /* @__PURE__ */ jsx(X, { size: 20, style: { color: "var(--compass-color-text-secondary)" } })
                       }
                     )
                   ]
                 }
               ),
-              position.pnl && /* @__PURE__ */ jsxs(
-                "div",
-                {
-                  className: "p-3 rounded-lg",
-                  style: { backgroundColor: "var(--compass-color-surface)" },
-                  children: [
-                    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
-                      isPnlPositive ? /* @__PURE__ */ jsx(TrendingUp, { size: 14, style: { color: "var(--compass-color-success)" } }) : /* @__PURE__ */ jsx(TrendingDown, { size: 14, style: { color: "var(--compass-color-error)" } }),
-                      /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "Total P&L" })
-                    ] }),
-                    /* @__PURE__ */ jsxs(
-                      "p",
+              /* @__PURE__ */ jsx("div", { className: "p-4 border-b", style: { borderColor: "var(--compass-color-border)" }, children: /* @__PURE__ */ jsxs("div", { className: "text-center", children: [
+                /* @__PURE__ */ jsx(
+                  "p",
+                  {
+                    className: "text-sm mb-1",
+                    style: { color: "var(--compass-color-text-secondary)" },
+                    children: "Current Balance"
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  "p",
+                  {
+                    className: "text-3xl font-bold",
+                    style: { color: "var(--compass-color-text)" },
+                    children: formatUSD(position.balanceUsd)
+                  }
+                ),
+                /* @__PURE__ */ jsxs(
+                  "p",
+                  {
+                    className: "text-sm font-mono mt-1",
+                    style: { color: "var(--compass-color-text-secondary)" },
+                    children: [
+                      formatAmount(position.balance),
+                      " ",
+                      position.assetSymbol
+                    ]
+                  }
+                )
+              ] }) }),
+              hasStats && /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-3 p-4 border-b", style: { borderColor: "var(--compass-color-border)" }, children: [
+                position.apy && /* @__PURE__ */ jsxs(
+                  "div",
+                  {
+                    className: "p-3 rounded-lg",
+                    style: { backgroundColor: "var(--compass-color-surface)" },
+                    children: [
+                      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
+                        /* @__PURE__ */ jsx(Percent, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }),
+                        /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "APY" })
+                      ] }),
+                      /* @__PURE__ */ jsxs(
+                        "p",
+                        {
+                          className: "font-semibold",
+                          style: { color: "var(--compass-color-success)" },
+                          children: [
+                            parseFloat(position.apy).toFixed(2),
+                            "%"
+                          ]
+                        }
+                      )
+                    ]
+                  }
+                ),
+                isPendle && duration && /* @__PURE__ */ jsxs(
+                  "div",
+                  {
+                    className: "p-3 rounded-lg",
+                    style: { backgroundColor: "var(--compass-color-surface)" },
+                    children: [
+                      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
+                        /* @__PURE__ */ jsx(Clock, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }),
+                        /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "Duration" })
+                      ] }),
+                      /* @__PURE__ */ jsx(
+                        "p",
+                        {
+                          className: "font-semibold",
+                          style: { color: "var(--compass-color-text)" },
+                          children: duration
+                        }
+                      )
+                    ]
+                  }
+                ),
+                isPendle && expiryDate && /* @__PURE__ */ jsxs(
+                  "div",
+                  {
+                    className: "p-3 rounded-lg",
+                    style: { backgroundColor: "var(--compass-color-surface)" },
+                    children: [
+                      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
+                        /* @__PURE__ */ jsx(Calendar, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } }),
+                        /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "Expiry (UTC)" })
+                      ] }),
+                      /* @__PURE__ */ jsx(
+                        "p",
+                        {
+                          className: "font-semibold",
+                          style: { color: "var(--compass-color-text)" },
+                          children: expiryDate
+                        }
+                      )
+                    ]
+                  }
+                ),
+                position.pnl && /* @__PURE__ */ jsxs(
+                  "div",
+                  {
+                    className: "p-3 rounded-lg",
+                    style: { backgroundColor: "var(--compass-color-surface)" },
+                    children: [
+                      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mb-1", children: [
+                        isPnlPositive ? /* @__PURE__ */ jsx(TrendingUp, { size: 14, style: { color: "var(--compass-color-success)" } }) : /* @__PURE__ */ jsx(TrendingDown, { size: 14, style: { color: "var(--compass-color-error)" } }),
+                        /* @__PURE__ */ jsx("span", { className: "text-xs", style: { color: "var(--compass-color-text-tertiary)" }, children: "Total P&L" })
+                      ] }),
+                      /* @__PURE__ */ jsxs(
+                        "p",
+                        {
+                          className: "font-semibold",
+                          style: {
+                            color: isPnlPositive ? "var(--compass-color-success)" : "var(--compass-color-error)"
+                          },
+                          children: [
+                            isPnlPositive ? "+" : "",
+                            formatUSD(position.pnl.totalPnl)
+                          ]
+                        }
+                      )
+                    ]
+                  }
+                )
+              ] }),
+              (position.deposits.length > 0 || position.withdrawals.length > 0) && /* @__PURE__ */ jsxs("div", { className: "p-4", children: [
+                /* @__PURE__ */ jsx(
+                  "h3",
+                  {
+                    className: "font-semibold mb-3",
+                    style: { color: "var(--compass-color-text)" },
+                    children: "Transaction History"
+                  }
+                ),
+                /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
+                  position.deposits.map((tx, i) => {
+                    const date = formatDate(tx.timestamp);
+                    return /* @__PURE__ */ jsxs(
+                      "div",
                       {
-                        className: "font-semibold",
-                        style: {
-                          color: isPnlPositive ? "var(--compass-color-success)" : "var(--compass-color-error)"
-                        },
+                        className: "flex items-center justify-between p-3 rounded-lg",
+                        style: { backgroundColor: "var(--compass-color-surface)" },
                         children: [
-                          isPnlPositive ? "+" : "",
-                          formatUSD(position.pnl.totalPnl)
-                        ]
-                      }
-                    )
-                  ]
-                }
-              )
-            ] }),
-            (position.deposits.length > 0 || position.withdrawals.length > 0) && /* @__PURE__ */ jsxs("div", { className: "p-4", children: [
-              /* @__PURE__ */ jsx(
-                "h3",
-                {
-                  className: "font-semibold mb-3",
-                  style: { color: "var(--compass-color-text)" },
-                  children: "Transaction History"
-                }
-              ),
-              /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
-                position.deposits.map((tx, i) => {
-                  const date = formatDate(tx.timestamp);
-                  return /* @__PURE__ */ jsxs(
-                    "div",
-                    {
-                      className: "flex items-center justify-between p-3 rounded-lg",
-                      style: { backgroundColor: "var(--compass-color-surface)" },
-                      children: [
-                        /* @__PURE__ */ jsxs("div", { children: [
-                          /* @__PURE__ */ jsxs(
-                            "p",
-                            {
-                              className: "font-medium",
-                              style: { color: "var(--compass-color-success)" },
-                              children: [
-                                "+",
-                                formatAmount(tx.amount),
-                                " ",
-                                position.assetSymbol
-                              ]
-                            }
-                          ),
-                          /* @__PURE__ */ jsx(
-                            "p",
+                          /* @__PURE__ */ jsxs("div", { children: [
+                            /* @__PURE__ */ jsxs(
+                              "p",
+                              {
+                                className: "font-medium",
+                                style: { color: "var(--compass-color-success)" },
+                                children: [
+                                  "+",
+                                  formatAmount(tx.amount),
+                                  " ",
+                                  position.assetSymbol
+                                ]
+                              }
+                            ),
+                            /* @__PURE__ */ jsx(
+                              "p",
+                              {
+                                className: "text-xs",
+                                style: { color: "var(--compass-color-text-tertiary)" },
+                                children: date ? `Deposit - ${date}` : "Deposit"
+                              }
+                            )
+                          ] }),
+                          tx.txHash && /* @__PURE__ */ jsx(
+                            "a",
                             {
-                              className: "text-xs",
-                              style: { color: "var(--compass-color-text-tertiary)" },
-                              children: date ? `Deposit - ${date}` : "Deposit"
+                              href: `https://etherscan.io/tx/${tx.txHash}`,
+                              target: "_blank",
+                              rel: "noopener noreferrer",
+                              className: "p-2 rounded-lg hover:opacity-80 transition-opacity",
+                              style: { backgroundColor: "var(--compass-color-background)" },
+                              children: /* @__PURE__ */ jsx(ExternalLink, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } })
                             }
                           )
-                        ] }),
-                        tx.txHash && /* @__PURE__ */ jsx(
-                          "a",
-                          {
-                            href: `https://etherscan.io/tx/${tx.txHash}`,
-                            target: "_blank",
-                            rel: "noopener noreferrer",
-                            className: "p-2 rounded-lg hover:opacity-80 transition-opacity",
-                            style: { backgroundColor: "var(--compass-color-background)" },
-                            children: /* @__PURE__ */ jsx(ExternalLink, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } })
-                          }
-                        )
-                      ]
-                    },
-                    `deposit-${i}`
-                  );
-                }),
-                position.withdrawals.map((tx, i) => {
-                  const date = formatDate(tx.timestamp);
-                  return /* @__PURE__ */ jsxs(
-                    "div",
-                    {
-                      className: "flex items-center justify-between p-3 rounded-lg",
-                      style: { backgroundColor: "var(--compass-color-surface)" },
-                      children: [
-                        /* @__PURE__ */ jsxs("div", { children: [
-                          /* @__PURE__ */ jsxs(
-                            "p",
-                            {
-                              className: "font-medium",
-                              style: { color: "var(--compass-color-error)" },
-                              children: [
-                                "-",
-                                formatAmount(tx.amount),
-                                " ",
-                                position.assetSymbol
-                              ]
-                            }
-                          ),
-                          /* @__PURE__ */ jsx(
-                            "p",
+                        ]
+                      },
+                      `deposit-${i}`
+                    );
+                  }),
+                  position.withdrawals.map((tx, i) => {
+                    const date = formatDate(tx.timestamp);
+                    return /* @__PURE__ */ jsxs(
+                      "div",
+                      {
+                        className: "flex items-center justify-between p-3 rounded-lg",
+                        style: { backgroundColor: "var(--compass-color-surface)" },
+                        children: [
+                          /* @__PURE__ */ jsxs("div", { children: [
+                            /* @__PURE__ */ jsxs(
+                              "p",
+                              {
+                                className: "font-medium",
+                                style: { color: "var(--compass-color-error)" },
+                                children: [
+                                  "-",
+                                  formatAmount(tx.amount),
+                                  " ",
+                                  position.assetSymbol
+                                ]
+                              }
+                            ),
+                            /* @__PURE__ */ jsx(
+                              "p",
+                              {
+                                className: "text-xs",
+                                style: { color: "var(--compass-color-text-tertiary)" },
+                                children: date ? `Withdrawal - ${date}` : "Withdrawal"
+                              }
+                            )
+                          ] }),
+                          tx.txHash && /* @__PURE__ */ jsx(
+                            "a",
                             {
-                              className: "text-xs",
-                              style: { color: "var(--compass-color-text-tertiary)" },
-                              children: date ? `Withdrawal - ${date}` : "Withdrawal"
+                              href: `https://etherscan.io/tx/${tx.txHash}`,
+                              target: "_blank",
+                              rel: "noopener noreferrer",
+                              className: "p-2 rounded-lg hover:opacity-80 transition-opacity",
+                              style: { backgroundColor: "var(--compass-color-background)" },
+                              children: /* @__PURE__ */ jsx(ExternalLink, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } })
                             }
                           )
-                        ] }),
-                        tx.txHash && /* @__PURE__ */ jsx(
-                          "a",
-                          {
-                            href: `https://etherscan.io/tx/${tx.txHash}`,
-                            target: "_blank",
-                            rel: "noopener noreferrer",
-                            className: "p-2 rounded-lg hover:opacity-80 transition-opacity",
-                            style: { backgroundColor: "var(--compass-color-background)" },
-                            children: /* @__PURE__ */ jsx(ExternalLink, { size: 14, style: { color: "var(--compass-color-text-tertiary)" } })
-                          }
-                        )
-                      ]
-                    },
-                    `withdraw-${i}`
-                  );
-                })
+                        ]
+                      },
+                      `withdraw-${i}`
+                    );
+                  })
+                ] })
               ] })
-            ] })
-          ]
-        }
-      )
+            ]
+          }
+        )
+      ]
     }
   );
 }
@@ -10581,7 +11221,7 @@ function AllocationEditor({
     ) })
   ] });
 }
-var EVM_CHAIN_IDS3 = {
+var EVM_CHAIN_IDS4 = {
   ethereum: 1,
   base: 8453,
   arbitrum: 42161
@@ -10615,7 +11255,7 @@ function RebalancingWidget({
 }) {
   const { chainId: contextChainId, setChainId } = useChain();
   const CHAIN_ID = chain || contextChainId;
-  const { address, signTypedData, isConnected, login, logout, switchChain, walletChainId } = useEmbeddableWallet();
+  const { address, signTypedData, isConnected, login, logout, switchChain, walletChainId, fundWallet, hasExternalWallet } = useEmbeddableWallet();
   const { earnAccountAddress } = useEarnAccount();
   const queryClient = useQueryClient();
   const { portfolio, earnAccountMarkets, isMarketsLoading, isLoading, isError, error, refetch } = useRebalancingData(chain);
@@ -10664,10 +11304,11 @@ function RebalancingWidget({
   const [selectedToken, setSelectedToken] = useState("USDC");
   const [depositAmount, setDepositAmount] = useState("");
   const [isTokenDropdownOpen, setIsTokenDropdownOpen] = useState(false);
-  const [isProcessing, setIsProcessing] = useState(false);
-  const [depositError, setDepositError] = useState(null);
-  const [depositStatus, setDepositStatus] = useState("");
+  const [depositTxState, setDepositTxState] = useState({ status: "idle" });
   const earnBalanceRef = useRef(null);
+  const { startPolling: startDepositPolling, clearPolling: clearDepositPolling } = useTxPolling({
+    queryKeysToInvalidate: [["earnAccountBalances"], ["rebalancing"]]
+  });
   useEffect(() => {
     setTargets([]);
     setOriginalAllocations({});
@@ -10682,9 +11323,9 @@ function RebalancingWidget({
     setIsSwapModalOpen(false);
     setSelectedMarket(null);
     setDepositAmount("");
-    setDepositError(null);
-    setDepositStatus("");
-  }, [CHAIN_ID]);
+    setDepositTxState({ status: "idle" });
+    clearDepositPolling();
+  }, [CHAIN_ID, clearDepositPolling]);
   useEffect(() => {
     if (portfolio && portfolio.positions.length > 0 && !hasInitializedTargets && !isLoading) {
       const origAllocs = {};
@@ -10765,7 +11406,7 @@ function RebalancingWidget({
     setTargets((prev) => prev.map((t, i) => i === index ? { ...t, targetPercent: rounded } : t));
   }, []);
   const ensureCorrectChain = useCallback(async () => {
-    const targetChainId = EVM_CHAIN_IDS3[CHAIN_ID];
+    const targetChainId = EVM_CHAIN_IDS4[CHAIN_ID];
     if (!targetChainId) return;
     if (walletChainId !== void 0 && walletChainId !== targetChainId) {
       if (!switchChain) {
@@ -10897,13 +11538,11 @@ function RebalancingWidget({
   };
   const handleDeposit = useCallback(async () => {
     if (!selectedMarket || !depositAmount || parseFloat(depositAmount) <= 0 || !address || !signTypedData) return;
-    setIsProcessing(true);
-    setDepositError(null);
+    setDepositTxState({ status: "preparing" });
     const underlyingToken = selectedMarket.underlyingToken;
     try {
       let resultTxHash;
       if (needsSwap) {
-        setDepositStatus("Getting swap quote...");
         const quoteResponse = await fetch(
           `/api/compass/swap/quote?owner=${address}&chain=${CHAIN_ID}&tokenIn=${selectedToken}&tokenOut=${underlyingToken}&amountIn=${depositAmount}`
         );
@@ -10917,7 +11556,6 @@ function RebalancingWidget({
           throw new Error("Invalid swap quote - no output amount");
         }
         const actualDepositAmount = (parseFloat(estimatedOutput) * 0.99999).toString();
-        setDepositStatus("Preparing swap and deposit...");
         const bundleActions = [
           {
             body: {
@@ -10951,7 +11589,7 @@ function RebalancingWidget({
           throw new Error(errorData.error || "Failed to prepare bundle");
         }
         const { eip712, normalizedTypes, domain, message } = await prepareResponse.json();
-        setDepositStatus("Please sign the transaction...");
+        setDepositTxState({ status: "signing" });
         await ensureCorrectChain();
         const signature = await signTypedData({
           domain,
@@ -10959,7 +11597,7 @@ function RebalancingWidget({
           primaryType: "SafeTx",
           message
         });
-        setDepositStatus("Executing swap and deposit...");
+        setDepositTxState({ status: "broadcasting" });
         const executeResponse = await fetch("/api/compass/bundle/execute", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -10977,7 +11615,6 @@ function RebalancingWidget({
         const result = await executeResponse.json();
         resultTxHash = result.txHash;
       } else {
-        setDepositStatus("Preparing deposit...");
         const venueParams = buildVenueParamsFromMarket(selectedMarket);
         const prepareResponse = await fetch("/api/compass/deposit/prepare", {
           method: "POST",
@@ -10994,7 +11631,7 @@ function RebalancingWidget({
           throw new Error(errData.error || "Failed to prepare deposit");
         }
         const prepareData = await prepareResponse.json();
-        setDepositStatus("Please sign the transaction...");
+        setDepositTxState({ status: "signing" });
         await ensureCorrectChain();
         const signature = await signTypedData({
           domain: prepareData.domain,
@@ -11002,7 +11639,7 @@ function RebalancingWidget({
           primaryType: "SafeTx",
           message: prepareData.message
         });
-        setDepositStatus("Executing deposit...");
+        setDepositTxState({ status: "broadcasting" });
         const executeResponse = await fetch("/api/compass/deposit/execute", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -11020,7 +11657,8 @@ function RebalancingWidget({
         const result = await executeResponse.json();
         resultTxHash = result.txHash;
       }
-      setDepositStatus("Deposit successful!");
+      setDepositTxState({ status: "submitted", txHash: resultTxHash });
+      startDepositPolling(resultTxHash, setDepositTxState);
       setDepositAmount("");
       queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
       queryClient.invalidateQueries({ queryKey: ["rebalancing"] });
@@ -11032,15 +11670,11 @@ function RebalancingWidget({
           refetch();
         }, delay);
       }
-      setTimeout(() => setDepositStatus(""), 3e3);
     } catch (err) {
-      setDepositError(err instanceof Error ? err.message : "Deposit failed");
-      setDepositStatus("");
+      setDepositTxState({ status: "failed", error: err instanceof Error ? err.message : "Deposit failed" });
       onError?.(err instanceof Error ? err : new Error("Deposit failed"));
-    } finally {
-      setIsProcessing(false);
     }
-  }, [selectedMarket, depositAmount, address, signTypedData, selectedToken, needsSwap, CHAIN_ID, ensureCorrectChain, queryClient, refetch, onError]);
+  }, [selectedMarket, depositAmount, address, signTypedData, selectedToken, needsSwap, CHAIN_ID, ensureCorrectChain, queryClient, refetch, onError, startDepositPolling]);
   return /* @__PURE__ */ jsxs("div", { className: "flex flex-col w-full", style: { gap: "0", fontFamily: "var(--compass-font-family)", height, overflow: "hidden", borderRadius: "var(--compass-border-radius-xl)" }, children: [
     /* @__PURE__ */ jsxs("div", { style: { flex: 1, minHeight: 0, overflowY: "auto", scrollbarWidth: "none", display: "flex", flexDirection: "column" }, children: [
       showChainSwitcher && !chain && /* @__PURE__ */ jsx("div", { style: { padding: "0 4px", marginBottom: "8px" }, children: /* @__PURE__ */ jsx(ChainSwitcher, {}) }),
@@ -11069,8 +11703,19 @@ function RebalancingWidget({
             }
           )
         ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx("p", { className: "text-lg font-semibold mb-2", style: { color: "var(--compass-color-text)" }, children: "No positions found" }),
-          /* @__PURE__ */ jsx("p", { className: "text-sm", style: { color: "var(--compass-color-text-secondary)" }, children: "Deposit into a vault, Aave market, or Pendle market to start rebalancing." })
+          /* @__PURE__ */ jsx("p", { className: "text-lg font-semibold mb-2", style: { color: "var(--compass-color-text)" }, children: fundWallet && !hasExternalWallet ? "Fund your account to start" : "No positions found" }),
+          /* @__PURE__ */ jsx("p", { className: "text-sm mb-4", style: { color: "var(--compass-color-text-secondary)" }, children: fundWallet && !hasExternalWallet ? "Buy crypto to get started with your DeFi portfolio." : "Deposit into a vault, Aave market, or Pendle market to start rebalancing." }),
+          fundWallet && earnAccountAddress && /* @__PURE__ */ jsx("div", { style: { width: "100%", maxWidth: "320px" }, children: /* @__PURE__ */ jsx(
+            BuyForm,
+            {
+              targetAddress: earnAccountAddress,
+              onComplete: () => {
+                queryClient.invalidateQueries({ queryKey: ["rebalancingPortfolio"] });
+                queryClient.invalidateQueries({ queryKey: ["earnAccountBalances"] });
+                refetch();
+              }
+            }
+          ) })
         ] }) }),
         state !== "loading" && state !== "empty" && portfolio && /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-center text-center", style: { padding: "16px 16px 12px" }, children: [
@@ -11237,7 +11882,7 @@ function RebalancingWidget({
                       selectedMarket,
                       onMarketSelect: (market) => {
                         setSelectedMarket(market);
-                        setDepositError(null);
+                        if (depositTxState.status === "failed") setDepositTxState({ status: "idle" });
                       },
                       isLoading: isMarketsLoading
                     }
@@ -11260,10 +11905,10 @@ function RebalancingWidget({
                               value: depositAmount,
                               onChange: (e) => {
                                 setDepositAmount(e.target.value);
-                                setDepositError(null);
+                                if (depositTxState.status === "failed") setDepositTxState({ status: "idle" });
                               },
                               placeholder: "0.00",
-                              disabled: isProcessing,
+                              disabled: depositTxState.status !== "idle" && depositTxState.status !== "confirmed" && depositTxState.status !== "failed",
                               className: "flex-1 font-bold bg-transparent outline-none",
                               style: {
                                 color: "var(--compass-color-text)",
@@ -11279,7 +11924,7 @@ function RebalancingWidget({
                               "button",
                               {
                                 onClick: () => setIsTokenDropdownOpen(!isTokenDropdownOpen),
-                                disabled: isProcessing,
+                                disabled: depositTxState.status !== "idle" && depositTxState.status !== "confirmed" && depositTxState.status !== "failed",
                                 className: "flex items-center font-semibold",
                                 style: {
                                   backgroundColor: "var(--compass-color-surface-hover, var(--compass-color-surface))",
@@ -11316,7 +11961,7 @@ function RebalancingWidget({
                                     onClick: () => {
                                       setSelectedToken(token);
                                       setIsTokenDropdownOpen(false);
-                                      setDepositError(null);
+                                      if (depositTxState.status === "failed") setDepositTxState({ status: "idle" });
                                     },
                                     className: "w-full text-left font-medium",
                                     style: {
@@ -11342,7 +11987,7 @@ function RebalancingWidget({
                             "button",
                             {
                               onClick: () => setDepositAmount(earnBalancesQuery.toString()),
-                              disabled: isProcessing,
+                              disabled: depositTxState.status !== "idle" && depositTxState.status !== "confirmed" && depositTxState.status !== "failed",
                               className: "font-semibold",
                               style: { color: "var(--compass-color-primary)", fontSize: "0.8125rem", background: "none", border: "none", padding: 0 },
                               children: [
@@ -11379,26 +12024,12 @@ function RebalancingWidget({
                       ]
                     }
                   ),
-                  depositError && /* @__PURE__ */ jsx(
-                    "div",
-                    {
-                      className: "flex items-center",
-                      style: {
-                        backgroundColor: "var(--compass-color-error-muted)",
-                        color: "var(--compass-color-error)",
-                        borderRadius: "var(--compass-border-radius-lg)",
-                        padding: "12px 14px",
-                        gap: "8px",
-                        fontSize: "0.875rem"
-                      },
-                      children: depositError
-                    }
-                  ),
+                  /* @__PURE__ */ jsx(TxStatus, { state: depositTxState }),
                   /* @__PURE__ */ jsx(
                     "button",
                     {
                       onClick: !isConnected && login ? login : handleDeposit,
-                      disabled: isConnected && (isProcessing || !selectedMarket || !depositAmount || parseFloat(depositAmount) <= 0 || parseFloat(depositAmount) > earnBalancesQuery),
+                      disabled: isConnected && (depositTxState.status !== "idle" && depositTxState.status !== "confirmed" && depositTxState.status !== "failed" || !selectedMarket || !depositAmount || parseFloat(depositAmount) <= 0 || parseFloat(depositAmount) > earnBalancesQuery),
                       className: "w-full font-bold",
                       style: {
                         backgroundColor: "var(--compass-color-primary)",
@@ -11409,26 +12040,13 @@ function RebalancingWidget({
                         fontSize: "1rem",
                         transition: "all 200ms ease",
                         border: "none",
-                        opacity: isConnected && (isProcessing || !selectedMarket || !depositAmount || parseFloat(depositAmount) <= 0 || parseFloat(depositAmount) > earnBalancesQuery) ? 0.4 : 1
+                        opacity: isConnected && (depositTxState.status !== "idle" && depositTxState.status !== "confirmed" && depositTxState.status !== "failed" || !selectedMarket || !depositAmount || parseFloat(depositAmount) <= 0 || parseFloat(depositAmount) > earnBalancesQuery) ? 0.4 : 1
                       },
-                      children: !isConnected ? "Connect Wallet" : isProcessing ? /* @__PURE__ */ jsxs("span", { className: "flex items-center justify-center", style: { gap: "8px" }, children: [
+                      children: !isConnected ? "Connect Wallet" : depositTxState.status !== "idle" && depositTxState.status !== "confirmed" && depositTxState.status !== "failed" ? /* @__PURE__ */ jsxs("span", { className: "flex items-center justify-center", style: { gap: "8px" }, children: [
                         /* @__PURE__ */ jsx(Loader2, { size: 16, className: "animate-spin" }),
                         "Processing..."
                       ] }) : !selectedMarket ? "Select a market" : needsSwap ? "Swap & Deposit" : "Deposit"
                     }
-                  ),
-                  depositStatus && !depositError && /* @__PURE__ */ jsx(
-                    "div",
-                    {
-                      className: "text-sm text-center",
-                      style: {
-                        backgroundColor: depositStatus.includes("successful") ? "var(--compass-color-success-muted)" : "var(--compass-color-primary-muted, rgba(99, 102, 241, 0.1))",
-                        color: depositStatus.includes("successful") ? "var(--compass-color-success)" : "var(--compass-color-primary)",
-                        borderRadius: "var(--compass-border-radius-lg)",
-                        padding: "10px 12px"
-                      },
-                      children: depositStatus
-                    }
                   )
                 ] }),
                 clientPreview && clientPreview.actions.length > 0 && state === "editing" && /* @__PURE__ */ jsxs(