@unifold/ui-react 0.1.69 → 0.1.70

package/dist/index.mjs

@@ -3,11 +3,11 @@ import {
   useState as useState40,
   useEffect as useEffect34,
   useLayoutEffect as useLayoutEffect2,
-  useCallback as useCallback10,
+  useCallback as useCallback11,
   useRef as useRef13,
   useMemo as useMemo14
 } from "react";
-import { ChevronRight as ChevronRight18, MapPinOff as MapPinOff2, AlertTriangle as AlertTriangle3, Bitcoin, DollarSign as DollarSign3 } from "lucide-react";
+import { ChevronRight as ChevronRight18, MapPinOff as MapPinOff2, AlertTriangle as AlertTriangle4, Bitcoin, DollarSign as DollarSign3 } from "lucide-react";
 
 // src/components/shared/dialog.tsx
 import * as React3 from "react";
@@ -600,7 +600,8 @@ import {
 // src/hooks/use-deposit-address.ts
 import { useQuery } from "@tanstack/react-query";
 import {
-  createDepositAddress
+  createDepositAddress,
+  isDepositAddressValidationError
 } from "@unifold/core";
 function useDepositAddress(params) {
   const {
@@ -646,7 +647,13 @@ function useDepositAddress(params) {
     // 24 hours in cache
     refetchOnMount: false,
     refetchOnWindowFocus: false,
-    retry: 3,
+    // Don't retry recipient-address validation errors — they're deterministic
+    // (a 400 won't succeed on retry) and we want to surface the invalid-address
+    // screen immediately rather than after 3 backoff attempts.
+    retry: (failureCount, error) => {
+      if (isDepositAddressValidationError(error)) return false;
+      return failureCount < 3;
+    },
     retryDelay: (attempt) => Math.min(1e3 * 2 ** attempt, 1e4)
     // 1s, 2s, 4s (max 10s)
   });
@@ -667,7 +674,7 @@ function useDebounce(value, delay) {
 import { useState as useState5 } from "react";
 
 // src/components/deposits/DepositHeader.tsx
-import { ArrowLeft, X as X2 } from "lucide-react";
+import { AlertTriangle, ArrowLeft, Info, X as X2 } from "lucide-react";
 import { useEffect as useEffect3, useLayoutEffect, useState as useState3 } from "react";
 import { getAddressBalance } from "@unifold/core";
 
@@ -873,7 +880,8 @@ function DepositHeader({
   balanceChainId,
   balanceTokenAddress,
   projectName,
-  publishableKey
+  publishableKey,
+  incident
 }) {
   const { colors: colors2, fonts, components } = useTheme();
   const [balance, setBalance] = useState3(null);
@@ -971,19 +979,64 @@ function DepositHeader({
     balanceTokenAddress,
     publishableKey
   ]);
-  return /* @__PURE__ */ jsx4("div", { children: /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-items-center uf-justify-between uf-pb-6", children: [
-    showBack ? /* @__PURE__ */ jsx4(
-      "button",
-      {
-        onClick: onBack,
-        className: "hover:uf-bg-secondary uf-rounded-lg uf-p-1 uf-transition-colors",
-        style: { color: components.header.buttonColor },
-        children: /* @__PURE__ */ jsx4(ArrowLeft, { className: "uf-w-5 uf-h-5" })
-      }
-    ) : /* @__PURE__ */ jsx4("div", { className: "uf-w-5 uf-h-5 uf-invisible" }),
-    /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-flex-col uf-items-center", children: [
-      badge ? /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-items-center uf-gap-2", children: [
-        /* @__PURE__ */ jsx4(
+  const incidentMessages = incident?.messages ?? [];
+  const showIncident = incident?.enabled && incidentMessages.length > 0;
+  const incidentSeverity = incident?.severity ?? "degraded";
+  const incidentSeverityLabel = incidentSeverity === "outage" ? "Outage" : incidentSeverity === "info" ? "Info" : "Degraded service";
+  const incidentStyles = incidentSeverity === "outage" ? {
+    bg: "rgba(239, 68, 68, 0.12)",
+    border: "rgba(239, 68, 68, 0.35)",
+    text: "#fca5a5",
+    link: "#fca5a5"
+  } : incidentSeverity === "info" ? {
+    bg: "rgba(59, 130, 246, 0.12)",
+    border: "rgba(59, 130, 246, 0.35)",
+    text: "#93c5fd",
+    link: "#93c5fd"
+  } : {
+    bg: "rgba(245, 158, 11, 0.12)",
+    border: "rgba(245, 158, 11, 0.35)",
+    text: "#fcd34d",
+    link: "#fcd34d"
+  };
+  const IncidentIcon = incidentSeverity === "info" ? Info : AlertTriangle;
+  return /* @__PURE__ */ jsxs3("div", { children: [
+    /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-items-center uf-justify-between uf-pb-6", children: [
+      showBack ? /* @__PURE__ */ jsx4(
+        "button",
+        {
+          onClick: onBack,
+          className: "hover:uf-bg-secondary uf-rounded-lg uf-p-1 uf-transition-colors",
+          style: { color: components.header.buttonColor },
+          children: /* @__PURE__ */ jsx4(ArrowLeft, { className: "uf-w-5 uf-h-5" })
+        }
+      ) : /* @__PURE__ */ jsx4("div", { className: "uf-w-5 uf-h-5 uf-invisible" }),
+      /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-flex-col uf-items-center", children: [
+        badge ? /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-items-center uf-gap-2", children: [
+          /* @__PURE__ */ jsx4(
+            DialogTitle,
+            {
+              className: "uf-text-center uf-text-base",
+              style: {
+                color: components.header.titleColor,
+                fontFamily: fonts.medium
+              },
+              children: title
+            }
+          ),
+          /* @__PURE__ */ jsx4(
+            "div",
+            {
+              className: "uf-px-2 uf-py-0.5 uf-rounded-full uf-text-[10px]",
+              style: {
+                backgroundColor: colors2.card,
+                color: colors2.foregroundMuted,
+                fontFamily: fonts.regular
+              },
+              children: badge.count
+            }
+          )
+        ] }) : /* @__PURE__ */ jsx4(
           DialogTitle,
           {
             className: "uf-text-center uf-text-base",
@@ -994,61 +1047,91 @@ function DepositHeader({
             children: title
           }
         ),
-        /* @__PURE__ */ jsx4(
+        subtitle ? /* @__PURE__ */ jsx4(
           "div",
           {
-            className: "uf-px-2 uf-py-0.5 uf-rounded-full uf-text-[10px]",
+            className: "uf-text-xs uf-mt-1",
             style: {
-              backgroundColor: colors2.card,
               color: colors2.foregroundMuted,
               fontFamily: fonts.regular
             },
-            children: badge.count
+            children: subtitle
           }
-        )
-      ] }) : /* @__PURE__ */ jsx4(
-        DialogTitle,
-        {
-          className: "uf-text-center uf-text-base",
-          style: {
-            color: components.header.titleColor,
-            fontFamily: fonts.medium
-          },
-          children: title
-        }
-      ),
-      subtitle ? /* @__PURE__ */ jsx4(
-        "div",
-        {
-          className: "uf-text-xs uf-mt-1",
-          style: {
-            color: colors2.foregroundMuted,
-            fontFamily: fonts.regular
-          },
-          children: subtitle
-        }
-      ) : showBalanceBlock ? isLoadingBalance && showBalanceSkeleton ? /* @__PURE__ */ jsx4("div", { className: "uf-h-3 uf-w-32 uf-bg-muted uf-rounded uf-animate-pulse uf-mt-1" }) : balance ? /* @__PURE__ */ jsx4(
-        "div",
+        ) : showBalanceBlock ? isLoadingBalance && showBalanceSkeleton ? /* @__PURE__ */ jsx4("div", { className: "uf-h-3 uf-w-32 uf-bg-muted uf-rounded uf-animate-pulse uf-mt-1" }) : balance ? /* @__PURE__ */ jsx4(
+          "div",
+          {
+            className: "uf-text-xs uf-mt-1",
+            style: {
+              color: colors2.foregroundMuted,
+              fontFamily: fonts.regular
+            },
+            children: formatBalanceDisplay(balance, projectName)
+          }
+        ) : null : null
+      ] }),
+      showClose ? /* @__PURE__ */ jsx4(
+        "button",
         {
-          className: "uf-text-xs uf-mt-1",
-          style: {
-            color: colors2.foregroundMuted,
-            fontFamily: fonts.regular
-          },
-          children: formatBalanceDisplay(balance, projectName)
+          onClick: onClose,
+          className: "hover:uf-bg-secondary uf-rounded-lg uf-p-1 uf-transition-colors",
+          style: { color: components.header.buttonColor },
+          children: /* @__PURE__ */ jsx4(X2, { className: "uf-w-5 uf-h-5" })
         }
-      ) : null : null
+      ) : /* @__PURE__ */ jsx4("div", { className: "uf-w-5 uf-h-5 uf-invisible" })
     ] }),
-    showClose ? /* @__PURE__ */ jsx4(
-      "button",
+    showIncident && /* @__PURE__ */ jsx4(
+      "div",
       {
-        onClick: onClose,
-        className: "hover:uf-bg-secondary uf-rounded-lg uf-p-1 uf-transition-colors",
-        style: { color: components.header.buttonColor },
-        children: /* @__PURE__ */ jsx4(X2, { className: "uf-w-5 uf-h-5" })
+        className: "uf-rounded-lg uf-px-3 uf-py-2.5 uf-mb-4",
+        style: {
+          backgroundColor: incidentStyles.bg,
+          border: `1px solid ${incidentStyles.border}`
+        },
+        children: /* @__PURE__ */ jsxs3("div", { className: "uf-flex uf-items-start uf-gap-2.5", children: [
+          /* @__PURE__ */ jsx4(
+            IncidentIcon,
+            {
+              className: "uf-w-4 uf-h-4 uf-mt-0.5 uf-shrink-0",
+              style: { color: incidentStyles.text }
+            }
+          ),
+          /* @__PURE__ */ jsxs3("div", { className: "uf-min-w-0 uf-flex-1", children: [
+            /* @__PURE__ */ jsx4("div", { className: "uf-flex uf-items-center uf-gap-2 uf-mb-1.5", children: /* @__PURE__ */ jsx4(
+              "span",
+              {
+                className: "uf-text-[11px] uf-leading-none uf-px-1.5 uf-py-1 uf-rounded-md",
+                style: {
+                  color: incidentStyles.text,
+                  border: `1px solid ${incidentStyles.border}`,
+                  fontFamily: fonts.medium
+                },
+                children: incidentSeverityLabel
+              }
+            ) }),
+            /* @__PURE__ */ jsx4(
+              "div",
+              {
+                className: "uf-space-y-1",
+                style: { color: incidentStyles.text, fontFamily: fonts.regular },
+                children: incidentMessages.map((message, index) => /* @__PURE__ */ jsx4("p", { className: "uf-text-xs uf-leading-relaxed", children: message }, `${message}-${index}`))
+              }
+            ),
+            incident.statusPageUrl && /* @__PURE__ */ jsx4(
+              "a",
+              {
+                href: incident.statusPageUrl,
+                target: "_blank",
+                rel: "noreferrer",
+                className: "uf-inline-block uf-mt-1.5 uf-text-xs uf-underline uf-underline-offset-2",
+                style: { color: incidentStyles.link, fontFamily: fonts.medium },
+                children: "View status"
+              }
+            )
+          ] })
+        ] })
       }
-    ) : /* @__PURE__ */ jsx4("div", { className: "uf-w-5 uf-h-5 uf-invisible" })
-  ] }) });
+    )
+  ] });
 }
 
 // src/components/currency/CurrencyListItem.tsx
@@ -1386,7 +1469,8 @@ var en_default = {
     },
     stripeLink: {
       title: "Pay with Link",
-      subtitle: "Buy with card or bank"
+      subtitle: "Buy with card or bank",
+      unavailableInRegionMessage: "Pay with Link is currently unavailable in your region."
     },
     browserWallet: {
       title: "Connect Wallet",
@@ -6554,7 +6638,7 @@ function BankTransfer({
       subdivision_code: userIpInfo?.subdivisionCode || void 0,
       // A provider may advertise multiple rails; default to the first.
       // UIs that want per-rail rows would need to render one entry per element.
-      payment_method: provider.payment_methods[0]
+      payment_method_type: provider.payment_methods[0]
     });
     setActiveProvider(provider);
     const convertedPrefilled = await resolvePrefilledSourceAmount(provider.source_currency);
@@ -7885,7 +7969,7 @@ function AppleLogo({ className, style }) {
     }
   );
 }
-function ApplePayButton({ onClick, title, subtitle }) {
+function ApplePayButton({ onClick, title, subtitle, iconUrl }) {
   const { colors: colors2, fonts, components } = useTheme();
   const [isHovered, setIsHovered] = React14.useState(false);
   const [isTouchDevice, setIsTouchDevice] = React14.useState(false);
@@ -7907,7 +7991,14 @@ function ApplePayButton({ onClick, title, subtitle }) {
       },
       children: [
         /* @__PURE__ */ jsxs23("div", { className: "uf-flex uf-items-center uf-gap-3", children: [
-          /* @__PURE__ */ jsx26("div", { className: "uf-rounded-lg uf-p-2", children: /* @__PURE__ */ jsx26(AppleLogo, { className: "uf-w-5 uf-h-5", style: { color: components.card.iconColor } }) }),
+          /* @__PURE__ */ jsx26("div", { className: "uf-rounded-lg uf-overflow-hidden uf-w-9 uf-h-9 uf-flex uf-items-center uf-justify-center", children: iconUrl ? /* @__PURE__ */ jsx26("img", { src: iconUrl, alt: "Apple Pay", width: 36, height: 36, className: "uf-rounded-lg" }) : /* @__PURE__ */ jsx26(
+            "div",
+            {
+              className: "uf-w-9 uf-h-9 uf-rounded-lg uf-flex uf-items-center uf-justify-center",
+              style: { backgroundColor: "#000" },
+              children: /* @__PURE__ */ jsx26(AppleLogo, { className: "uf-w-5 uf-h-5", style: { color: "#fff" } })
+            }
+          ) }),
           /* @__PURE__ */ jsxs23("div", { className: "uf-text-left", children: [
             /* @__PURE__ */ jsx26(
               "div",
@@ -8141,13 +8232,6 @@ function solanaCandidate(provider, type, name, icon) {
       if (provider.isConnected && provider.publicKey) {
         return { type, name, address: provider.publicKey.toString(), icon };
       }
-      try {
-        const resp = await provider.connect({ onlyIfTrusted: true });
-        if (resp.publicKey) {
-          return { type, name, address: resp.publicKey.toString(), icon };
-        }
-      } catch {
-      }
       return null;
     }
   };
@@ -8376,6 +8460,180 @@ async function disconnectInjectedBrowserWallet(wallet) {
   );
 }
 
+// src/components/deposits/browser-wallets/providerResolvers.ts
+var STORED_TYPE_TO_EIP6963_WALLET_ID = {
+  metamask: "metamask",
+  "phantom-ethereum": "phantom",
+  coinbase: "coinbase",
+  trust: "trust",
+  rainbow: "rainbow",
+  rabby: "rabby",
+  okx: "okx"
+};
+var EIP6963_WALLET_ID_TO_INFO = {
+  metamask: { walletType: "metamask", name: "MetaMask", icon: "metamask" },
+  phantom: { walletType: "phantom-ethereum", name: "Phantom", icon: "phantom" },
+  coinbase: { walletType: "coinbase", name: "Coinbase Wallet", icon: "coinbase" },
+  trust: { walletType: "trust", name: "Trust Wallet", icon: "trust" },
+  rainbow: { walletType: "rainbow", name: "Rainbow", icon: "rainbow" },
+  rabby: { walletType: "rabby", name: "Rabby", icon: "rabby" },
+  okx: { walletType: "okx", name: "OKX Wallet", icon: "okx" }
+};
+var WALLET_ID_TO_WALLET_TYPE = {
+  phantom: "phantom-ethereum",
+  coinbase: "coinbase",
+  trust: "trust",
+  rainbow: "rainbow",
+  rabby: "rabby",
+  okx: "okx",
+  metamask: "metamask"
+};
+var WALLET_TYPE_TO_WALLET_ID = {
+  "phantom-ethereum": "phantom",
+  coinbase: "coinbase",
+  trust: "trust",
+  okx: "okx",
+  rainbow: "rainbow",
+  rabby: "rabby",
+  metamask: "metamask"
+};
+function isWalletType(value) {
+  return value === "phantom-solana" || value === "phantom-ethereum" || value === "metamask" || value === "coinbase" || value === "solflare" || value === "backpack" || value === "glow" || value === "trust" || value === "rainbow" || value === "rabby" || value === "okx";
+}
+function walletIdToWalletType(walletId) {
+  return WALLET_ID_TO_WALLET_TYPE[walletId] || "metamask";
+}
+function walletTypeToWalletId(walletType) {
+  return WALLET_TYPE_TO_WALLET_ID[walletType] || walletType;
+}
+function getLegacyEvmProviders(win) {
+  if (!win) return {};
+  const anyWin = win;
+  return {
+    ethereum: anyWin.ethereum,
+    phantomEthereum: anyWin.phantom?.ethereum,
+    coinbaseEthereum: anyWin.coinbaseWalletExtension,
+    trustEthereum: anyWin.trustwallet?.ethereum,
+    okxEthereum: anyWin.okxwallet
+  };
+}
+function getInjectedSolanaProviders(win) {
+  if (!win) return {};
+  const anyWin = win;
+  return {
+    phantomSolana: anyWin.phantom?.solana,
+    solflare: anyWin.solflare,
+    backpack: anyWin.backpack,
+    glow: anyWin.glow,
+    coinbaseSolana: anyWin.coinbaseSolana || anyWin.coinbaseWalletExtension?.solana,
+    trustSolana: anyWin.trustwallet?.solana
+  };
+}
+function describeEip6963Provider(wp) {
+  const mapped = EIP6963_WALLET_ID_TO_INFO[wp.walletId];
+  return {
+    provider: wp.provider,
+    walletType: mapped?.walletType ?? "metamask",
+    name: mapped?.name ?? wp.info.name,
+    icon: mapped?.icon ?? wp.info.icon
+  };
+}
+function resolveQuickConnectEvmProvider(win) {
+  const eip6963Providers = getEip6963Providers();
+  if (eip6963Providers.length > 0) {
+    const stored = getStoredWalletState();
+    const preferredWalletId = stored?.walletType && isWalletType(stored.walletType) ? STORED_TYPE_TO_EIP6963_WALLET_ID[stored.walletType] : void 0;
+    if (preferredWalletId) {
+      const preferred = findProviderByWalletId(preferredWalletId);
+      if (preferred) return describeEip6963Provider(preferred);
+    }
+    if (eip6963Providers.length === 1) {
+      return describeEip6963Provider(eip6963Providers[0]);
+    }
+    return void 0;
+  }
+  const anyWin = win;
+  const legacy = anyWin.phantom?.ethereum || anyWin.ethereum;
+  if (!legacy) return void 0;
+  const isPhantom = legacy.isPhantom;
+  return {
+    provider: legacy,
+    walletType: isPhantom ? "phantom-ethereum" : "metamask",
+    name: isPhantom ? "Phantom" : "MetaMask",
+    icon: isPhantom ? "phantom" : "metamask"
+  };
+}
+function resolveSolanaPublicKey(provider, response) {
+  if (response?.publicKey) return { publicKey: response.publicKey };
+  if (provider.publicKey) return { publicKey: provider.publicKey };
+  return null;
+}
+function isUserRejectedSolanaConnectError(error) {
+  if (!error || typeof error !== "object") return false;
+  const maybeCode = "code" in error ? error.code : void 0;
+  if (maybeCode === 4001) return true;
+  const msg = "message" in error && typeof error.message === "string" ? error.message.toLowerCase() : "";
+  return msg.includes("user rejected") || msg.includes("user denied") || msg.includes("rejected the request") || msg.includes("declined");
+}
+function isSolanaConnectTimeoutError(error) {
+  return error instanceof Error && error.message.toLowerCase().includes("did not respond to the connection request");
+}
+async function connectSolanaProviderWithRecovery(provider, walletId, walletName) {
+  if (provider.isConnected && provider.publicKey) {
+    return { publicKey: provider.publicKey };
+  }
+  const connectOnce = () => provider.connect(walletId === "solflare" ? { onlyIfTrusted: false } : void 0);
+  const withTimeout = async (ms = 2e4) => await Promise.race([
+    connectOnce(),
+    new Promise(
+      (resolve, reject) => setTimeout(() => {
+        const connected = resolveSolanaPublicKey(provider);
+        if (connected) {
+          resolve(connected);
+          return;
+        }
+        reject(
+          new Error(
+            `${walletName} did not respond to the connection request. Please unlock the wallet and try again.`
+          )
+        );
+      }, ms)
+    )
+  ]);
+  if (walletId === "solflare") {
+    await provider.disconnect?.().catch(() => {
+    });
+  }
+  const connectAndResolve = async () => {
+    try {
+      const response = await withTimeout();
+      const resolved = resolveSolanaPublicKey(provider, response);
+      if (resolved) return resolved;
+      await new Promise((resolve) => setTimeout(resolve, 120));
+      const delayedResolved = resolveSolanaPublicKey(provider);
+      if (delayedResolved) return delayedResolved;
+      throw new Error(`${walletName} connected but did not expose a public key.`);
+    } catch (error) {
+      const connected = resolveSolanaPublicKey(provider);
+      if (connected) return connected;
+      throw error;
+    }
+  };
+  try {
+    return await connectAndResolve();
+  } catch (err) {
+    if (isUserRejectedSolanaConnectError(err)) throw err;
+    if (isSolanaConnectTimeoutError(err)) throw err;
+    if (walletId === "solflare") {
+      await provider.disconnect?.().catch(() => {
+      });
+      await new Promise((resolve) => setTimeout(resolve, 150));
+      return await connectAndResolve();
+    }
+    throw err;
+  }
+}
+
 // src/resources/icons/MetamaskIcon.tsx
 import * as React17 from "react";
 import { jsx as jsx28, jsxs as jsxs25 } from "react/jsx-runtime";
@@ -10288,21 +10546,19 @@ function BrowserWalletButton({
         }
       }
       if (!chainType || chainType === "ethereum") {
-        const ethProvider = window.phantom?.ethereum || window.ethereum;
-        if (ethProvider) {
-          const accounts = await ethProvider.request({
+        const resolved = resolveQuickConnectEvmProvider(window);
+        if (resolved) {
+          const accounts = await resolved.provider.request({
             method: "eth_requestAccounts"
           });
           if (accounts && accounts.length > 0) {
             setUserDisconnectedWallet(false);
-            const isPhantom = ethProvider.isPhantom;
-            const walletType = isPhantom ? "phantom-ethereum" : "metamask";
-            setStoredWalletState(walletType);
+            setStoredWalletState(resolved.walletType);
             setWallet({
-              type: walletType,
-              name: isPhantom ? "Phantom" : "MetaMask",
+              type: resolved.walletType,
+              name: resolved.name,
               address: accounts[0],
-              icon: isPhantom ? "phantom" : "metamask"
+              icon: resolved.icon
             });
           }
         }
@@ -10336,7 +10592,10 @@ function BrowserWalletButton({
   if (isLoading) {
     return null;
   }
-  const hasWalletExtension = (!chainType || chainType === "ethereum") && getEip6963Providers().length > 0 || (!chainType || chainType === "solana") && (window.phantom?.solana?.isPhantom || window.solana?.isPhantom) || (!chainType || chainType === "ethereum") && (window.phantom?.ethereum || window.ethereum);
+  const eip6963EvmProviderCount = getEip6963Providers().length;
+  const legacyEvmProviders = getLegacyEvmProviders(window);
+  const hasLegacyEvmProvider = eip6963EvmProviderCount === 0 && !!(legacyEvmProviders.ethereum || legacyEvmProviders.phantomEthereum || legacyEvmProviders.coinbaseEthereum || legacyEvmProviders.trustEthereum || legacyEvmProviders.okxEthereum);
+  const hasWalletExtension = (!chainType || chainType === "ethereum") && eip6963EvmProviderCount > 0 || (!chainType || chainType === "solana") && (window.phantom?.solana?.isPhantom || window.solana?.isPhantom) || (!chainType || chainType === "ethereum") && hasLegacyEvmProvider;
   if (!onConnectClick && !wallet && !hasWalletExtension) {
     return null;
   }
@@ -10346,11 +10605,25 @@ function BrowserWalletButton({
     border: `${components.card.borderWidth}px solid ${components.card.borderColor}`
   };
   const sortedWallets = featuredWallets ? [...featuredWallets].sort((a, b) => a.position - b.position) : [];
+  const isImageIcon = !!wallet && (wallet.icon.startsWith("data:") || wallet.icon.startsWith("http"));
   const walletIconBlock = wallet ? WALLET_ICON_COMPONENTS[wallet.icon] ? React29.createElement(WALLET_ICON_COMPONENTS[wallet.icon], {
     size: 36,
     className: "uf-rounded-lg",
     variant: "color"
-  }) : /* @__PURE__ */ jsx41("div", { className: "uf-w-9 uf-h-9 uf-rounded-lg uf-bg-gray-500" }) : /* @__PURE__ */ jsx41("div", { className: "uf-rounded-lg uf-p-2", children: /* @__PURE__ */ jsx41(Wallet, { className: "uf-w-5 uf-h-5", style: { color: components.card.iconColor } }) });
+  }) : isImageIcon ? (
+    // Wallet announced via EIP-6963 with no internal icon component: render its
+    // own advertised icon (`info.icon`) rather than a generic placeholder.
+    /* @__PURE__ */ jsx41(
+      "img",
+      {
+        src: wallet.icon,
+        alt: wallet.name,
+        width: 36,
+        height: 36,
+        className: "uf-rounded-lg uf-w-9 uf-h-9"
+      }
+    )
+  ) : /* @__PURE__ */ jsx41("div", { className: "uf-w-9 uf-h-9 uf-rounded-lg uf-bg-gray-500" }) : /* @__PURE__ */ jsx41("div", { className: "uf-rounded-lg uf-p-2", children: /* @__PURE__ */ jsx41(Wallet, { className: "uf-w-5 uf-h-5", style: { color: components.card.iconColor } }) });
   const titleSubtitleBlock = /* @__PURE__ */ jsxs38("div", { className: "uf-text-left uf-min-w-0", children: [
     /* @__PURE__ */ jsx41(
       "div",
@@ -10579,7 +10852,7 @@ import {
   Loader2 as Loader25,
   CreditCard as CreditCard3,
   CheckCircle2 as CheckCircle22,
-  AlertTriangle,
+  AlertTriangle as AlertTriangle2,
   ArrowRight,
   Zap as Zap2,
   ChevronDown as ChevronDown3
@@ -10945,6 +11218,13 @@ function setStoredSelectedToken(customerId, token) {
   } catch {
   }
 }
+function clearStoredSelectedToken(customerId) {
+  try {
+    if (typeof window === "undefined" || !customerId) return;
+    localStorage.removeItem(selectedTokenKey(customerId));
+  } catch {
+  }
+}
 
 // src/components/deposits/stripe-link/PayWithStripeLink.tsx
 import { Fragment as Fragment6, jsx as jsx44, jsxs as jsxs41 } from "react/jsx-runtime";
@@ -10962,6 +11242,31 @@ var STRIPE_SESSION_STATUS = {
   EXPIRED: "expired"
 };
 var STRIPE_SESSION_POLL_INTERVAL_MS = 3e3;
+var STRIPE_CONSUMED_PAYMENT_METHOD_CODE = "payment_method_unexpected_state";
+function isConsumedPaymentMethodError(err) {
+  return err instanceof StripeApiResponseError && (err.errorType === "stripe_onramp_payment_method_consumed" || err.stripeCode === STRIPE_CONSUMED_PAYMENT_METHOD_CODE);
+}
+var STRIPE_PAYMENT_FAILURE_MESSAGES = {
+  card_declined: "Your card was declined. Try again or use a different payment method.",
+  insufficient_funds: "Your card has insufficient funds. Try a different payment method.",
+  expired_card: "Your card has expired. Use a different payment method.",
+  incorrect_cvc: "Your card\u2019s security code is incorrect. Try again or use a different card.",
+  incorrect_number: "Your card number is incorrect. Try again or use a different card.",
+  card_not_supported: "This card isn\u2019t supported for this purchase. Try a different payment method.",
+  processing_error: "We couldn\u2019t process your card. Please try again in a moment.",
+  authentication_required: "Your bank requires authentication for this payment. Please try again.",
+  payment_intent_authentication_failure: "Card authentication failed. Try again or use a different card.",
+  payment_method_provider_decline: "Your payment provider declined the charge. Try a different payment method.",
+  payment_failed: "Your payment didn\u2019t go through. Try again or use a different payment method."
+};
+function describeStripePaymentFailure(reason) {
+  if (!reason) return null;
+  return STRIPE_PAYMENT_FAILURE_MESSAGES[reason] ?? null;
+}
+var PAYMENT_FAILED_LEAD = "We couldn\u2019t complete your payment.";
+function unmappedPaymentFailureMessage(stripeMessage) {
+  return stripeMessage ? `${PAYMENT_FAILED_LEAD} ${stripeMessage}` : `${PAYMENT_FAILED_LEAD} Please try again.`;
+}
 var NO_AUTOFILL = {
   autoComplete: "off",
   "data-lpignore": "true",
@@ -11063,7 +11368,11 @@ function PayWithStripeLink({
   }, [controlledStep]);
   useEffect24(() => {
     setLoading(false);
-    setError(null);
+    if (preserveErrorOnNextStepRef.current) {
+      preserveErrorOnNextStepRef.current = false;
+    } else {
+      setError(null);
+    }
     setKycPendingMessage(null);
     setQuoteLoading(false);
     if (step !== "checkout") {
@@ -11152,7 +11461,10 @@ function PayWithStripeLink({
   const pendingAddPaymentRef = useRef9(false);
   const autoOpenedAddPaymentRef = useRef9(false);
   const checkoutGenRef = useRef9(0);
+  const preserveErrorOnNextStepRef = useRef9(false);
+  const spentSessionIdsRef = useRef9(/* @__PURE__ */ new Set());
   const [stripePaymentUIReady, setStripePaymentUIReady] = useState29(false);
+  const [addPaymentHovered, setAddPaymentHovered] = useState29(false);
   const [oauthToken, setOauthToken] = useState29(null);
   const [refreshTokenValue, setRefreshTokenValue] = useState29(null);
   const [customerId, setCustomerId] = useState29(null);
@@ -11301,7 +11613,7 @@ function PayWithStripeLink({
             const merged = [
               ...pmResult.data.map((t13) => ({ id: t13.id, ...formatPaymentToken(t13) })),
               ...persistedNotInApi ? [persisted] : []
-            ];
+            ].filter((t13) => !deadPaymentTokenIdsRef.current.has(t13.id));
             if (merged.length > 0) {
               const preferred = persisted && merged.find((m) => m.id === persisted.id) || merged[0];
               selectPaymentToken(preferred);
@@ -11366,6 +11678,7 @@ function PayWithStripeLink({
   const [selectedPaymentToken, setSelectedPaymentToken] = useState29(null);
   const [paymentDisplay, setPaymentDisplay] = useState29(null);
   const selectedTokenSingleUseRef = useRef9(false);
+  const deadPaymentTokenIdsRef = useRef9(/* @__PURE__ */ new Set());
   const selectPaymentToken = useCallback6(
     (token) => {
       selectedTokenSingleUseRef.current = !!token.singleUse;
@@ -11393,9 +11706,25 @@ function PayWithStripeLink({
       setStoredSelectedTokenState(null);
     }
   }, [customerId]);
+  const forgetSelectedPaymentToken = useCallback6(
+    (tokenId) => {
+      selectedTokenSingleUseRef.current = false;
+      if (customerId) {
+        const persisted = getStoredSelectedToken(customerId);
+        if (!tokenId || persisted?.id === tokenId) {
+          clearStoredSelectedToken(customerId);
+        }
+      }
+      setSelectedPaymentToken((prev) => !tokenId || prev === tokenId ? null : prev);
+      setPaymentDisplay((prev) => !tokenId || !prev ? null : prev);
+      setStoredSelectedTokenState((prev) => !tokenId || prev?.id === tokenId ? null : prev);
+    },
+    [customerId]
+  );
   const displayPaymentTokens = (() => {
-    const apiDisplay = paymentTokens.map((t13) => ({ id: t13.id, ...formatPaymentToken(t13) }));
-    if (storedSelectedToken && !paymentTokens.some((t13) => t13.id === storedSelectedToken.id)) {
+    const isDead = (id) => deadPaymentTokenIdsRef.current.has(id);
+    const apiDisplay = paymentTokens.filter((t13) => !isDead(t13.id)).map((t13) => ({ id: t13.id, ...formatPaymentToken(t13) }));
+    if (storedSelectedToken && !isDead(storedSelectedToken.id) && !paymentTokens.some((t13) => t13.id === storedSelectedToken.id)) {
       return [...apiDisplay, storedSelectedToken];
     }
     return apiDisplay;
@@ -12044,7 +12373,7 @@ function PayWithStripeLink({
         const merged = [
           ...existing.data.map((t13) => ({ id: t13.id, ...formatPaymentToken(t13) })),
           ...storedNotInApi ? [stored] : []
-        ];
+        ].filter((t13) => !deadPaymentTokenIdsRef.current.has(t13.id));
         if (merged.length === 0) {
           if (!autoOpenedAddPaymentRef.current) {
             autoOpenedAddPaymentRef.current = true;
@@ -12086,6 +12415,9 @@ function PayWithStripeLink({
       paymentInnerRef.current.replaceChildren();
     };
   }, [step, oauthToken, customerId, publishableKey, coordinator]);
+  useEffect24(() => {
+    if (step !== "payment") setAddPaymentHovered(false);
+  }, [step]);
   useEffect24(() => {
     if (step !== "add_payment") return;
     if (!isCustomerVerified(customer)) {
@@ -12236,6 +12568,17 @@ function PayWithStripeLink({
       }
       if (message) onDepositError?.({ message, error: err });
     };
+    const isRetriablePaymentToken = (id) => !!id && paymentTokens.some((t13) => t13.id === id);
+    const dropConsumedToken = (message, cause) => {
+      if (selectedPaymentToken) deadPaymentTokenIdsRef.current.add(selectedPaymentToken);
+      setSessionForCheckout(null);
+      forgetSelectedPaymentToken(selectedPaymentToken);
+      preserveErrorOnNextStepRef.current = true;
+      setError(message);
+      setStep("amount");
+      onDepositError?.({ message, error: cause });
+    };
+    const CONSUMED_TOKEN_MESSAGE = "That payment method can\u2019t be used. Please choose another.";
     if (!sessionForCheckout || sessionForCheckout.amount !== amount || sessionForCheckout.paymentToken !== selectedPaymentToken) {
       return;
     }
@@ -12243,19 +12586,29 @@ function PayWithStripeLink({
     setLoading(true);
     setError(null);
     setStep("checkout");
+    let lastConfirmError = null;
     try {
-      const runCheckout = (sid) => coordinator.performCheckout(sid, async (onrampSessionId) => {
-        try {
-          await withTokenRefresh(
-            (tok) => stripeRefreshQuote(onrampSessionId, tok, publishableKey)
-          );
-        } catch {
-        }
-        const confirmResponse = await withTokenRefresh(
-          (tok) => stripeConfirmSession(onrampSessionId, tok, {}, publishableKey)
-        );
-        return confirmResponse.client_secret ?? "";
-      });
+      const runCheckout = (sid) => {
+        spentSessionIdsRef.current.add(sid);
+        return coordinator.performCheckout(sid, async (onrampSessionId) => {
+          try {
+            await withTokenRefresh(
+              (tok) => stripeRefreshQuote(onrampSessionId, tok, publishableKey)
+            );
+          } catch {
+          }
+          try {
+            const confirmResponse = await withTokenRefresh(
+              (tok) => stripeConfirmSession(onrampSessionId, tok, {}, publishableKey)
+            );
+            lastConfirmError = null;
+            return confirmResponse.client_secret ?? "";
+          } catch (confirmErr) {
+            lastConfirmError = confirmErr;
+            throw confirmErr;
+          }
+        });
+      };
       const lastErrorFor = async (sid) => {
         const sessionState = await withTokenRefresh(
           (tok) => stripeGetSession(sid, tok, publishableKey)
@@ -12315,8 +12668,9 @@ function PayWithStripeLink({
         setStep("success");
       } else if (lastError === "quote_rate_drifted" || lastError === "charged_with_expired_quote") {
         setSessionForCheckout(null);
-        setStep("amount");
+        preserveErrorOnNextStepRef.current = true;
         setError("Pricing updated. Please try again.");
+        setStep("amount");
       } else if (lastError === "missing_document_verification") {
         surfaceStepUpOnAmount(void 0, void 0, "l2");
       } else if (lastError === "transaction_limit_reached") {
@@ -12327,28 +12681,52 @@ function PayWithStripeLink({
       } else if (lastError === "missing_consumer_wallet") {
         setStep("wallet");
         setError(null);
+      } else if (isConsumedPaymentMethodError(lastConfirmError)) {
+        dropConsumedToken(CONSUMED_TOKEN_MESSAGE, lastConfirmError);
       } else {
-        setSessionForCheckout(null);
-        setError(lastError ?? "Checkout failed. Please try again.");
-        setStep("amount");
+        const confirmErr = lastConfirmError instanceof StripeApiResponseError ? lastConfirmError : void 0;
+        const reason = describeStripePaymentFailure(lastError) ?? describeStripePaymentFailure(confirmErr?.stripeCode) ?? unmappedPaymentFailureMessage(confirmErr?.stripeMessage);
+        if (!isRetriablePaymentToken(selectedPaymentToken)) {
+          dropConsumedToken(reason, lastConfirmError ?? void 0);
+        } else {
+          setSessionForCheckout(null);
+          preserveErrorOnNextStepRef.current = true;
+          setError(reason);
+          setStep("amount");
+          onDepositError?.({
+            message: lastError ?? confirmErr?.stripeCode ?? "checkout_failed",
+            error: lastConfirmError ?? void 0
+          });
+        }
       }
     } catch (err) {
       if (isStale()) return;
-      const msg = err instanceof Error ? err.message : "Checkout failed";
-      const errorType = err instanceof StripeApiResponseError ? err.errorType : void 0;
-      if (errorType === "stripe_onramp_missing_minimum_identity_verification") {
+      const stripeErr = lastConfirmError instanceof StripeApiResponseError ? lastConfirmError : err instanceof StripeApiResponseError ? err : void 0;
+      const effectiveError = stripeErr ?? err;
+      const msg = stripeErr?.message ?? (err instanceof Error ? err.message : "Checkout failed");
+      const errorType = stripeErr?.errorType;
+      if (isConsumedPaymentMethodError(effectiveError)) {
+        dropConsumedToken(CONSUMED_TOKEN_MESSAGE, effectiveError);
+      } else if (errorType === "stripe_onramp_missing_minimum_identity_verification") {
         setStep("kyc");
         setError(null);
       } else if (errorType === "stripe_onramp_missing_identity_verification") {
-        surfaceStepUpOnAmount(err, msg, "l1");
+        surfaceStepUpOnAmount(effectiveError, msg, "l1");
       } else if (errorType === "stripe_onramp_missing_document_verification") {
-        surfaceStepUpOnAmount(err, msg, "l2");
+        surfaceStepUpOnAmount(effectiveError, msg, "l2");
       } else if (errorType === "stripe_onramp_purchase_limit_reached") {
-        surfaceStepUpOnAmount(err, msg, null);
+        surfaceStepUpOnAmount(effectiveError, msg, null);
       } else {
-        setError(msg);
-        setStep("amount");
-        onDepositError?.({ message: msg, error: err });
+        const reason = describeStripePaymentFailure(stripeErr?.stripeCode) ?? (stripeErr?.stripeMessage ? unmappedPaymentFailureMessage(stripeErr.stripeMessage) : msg || unmappedPaymentFailureMessage());
+        if (!isRetriablePaymentToken(selectedPaymentToken)) {
+          dropConsumedToken(reason, effectiveError);
+        } else {
+          setSessionForCheckout(null);
+          preserveErrorOnNextStepRef.current = true;
+          setError(reason);
+          setStep("amount");
+          onDepositError?.({ message: msg || "checkout_failed", error: effectiveError });
+        }
       }
     } finally {
       setLoading(false);
@@ -12374,7 +12752,7 @@ function PayWithStripeLink({
       const merged = [
         ...existing.data.map((t13) => ({ id: t13.id, ...formatPaymentToken(t13) })),
         ...stored && !existing.data.some((t13) => t13.id === stored.id) ? [stored] : []
-      ];
+      ].filter((t13) => !deadPaymentTokenIdsRef.current.has(t13.id));
       if (merged.length > 0) {
         const preferred = stored && merged.find((m) => m.id === stored.id) || merged[0];
         selectPaymentToken(preferred);
@@ -12453,7 +12831,7 @@ function PayWithStripeLink({
   useEffect24(() => {
     if (step === "review") {
       const existing = sessionForCheckoutRef.current;
-      const hasFreshSession = !!(existing && existing.amount === amount && existing.paymentToken === selectedPaymentToken);
+      const hasFreshSession = !!(existing && existing.amount === amount && existing.paymentToken === selectedPaymentToken && !spentSessionIdsRef.current.has(existing.id));
       if (quoteNonce === quoteNonceAtReviewRef.current && hasFreshSession) return;
       quoteNonceAtReviewRef.current = quoteNonce;
     } else if (step !== "amount") {
@@ -12477,7 +12855,9 @@ function PayWithStripeLink({
         const hasPaymentMethod = !!(isAuthenticated && selectedPaymentToken && onrampWalletAddress && isOnrampWalletRegistered);
         if (hasPaymentMethod) {
           const existing = sessionForCheckoutRef.current;
-          const canRefreshExisting = step === "review" && existing != null && existing.amount === amount && existing.paymentToken === selectedPaymentToken;
+          const canRefreshExisting = step === "review" && existing != null && existing.amount === amount && existing.paymentToken === selectedPaymentToken && // Never refresh (and thereby reuse) a session already checked out —
+          // its PaymentIntent is spent. Build a fresh one instead.
+          !spentSessionIdsRef.current.has(existing.id);
           const session = canRefreshExisting ? await withTokenRefresh((tok) => stripeRefreshQuote(existing.id, tok, publishableKey)) : await withTokenRefresh(
             (tok) => stripeCreateSession(
               {
@@ -12605,7 +12985,7 @@ function PayWithStripeLink({
   const exceedsReachedLimit = limitReachedAmount !== null && hasInput && amountNum >= limitReachedAmount;
   const exceedsLimit = exceedsKnownLimit || exceedsReachedLimit || requiredStepUp !== null;
   const isValidAmount = hasInput && amountNum >= 5 && !exceedsLimit;
-  const hasValidSession = !!(sessionForCheckout && sessionForCheckout.amount === amount && sessionForCheckout.paymentToken === selectedPaymentToken);
+  const hasValidSession = !!(sessionForCheckout && sessionForCheckout.amount === amount && sessionForCheckout.paymentToken === selectedPaymentToken && !spentSessionIdsRef.current.has(sessionForCheckout.id));
   const canCheckoutDirectly = !!(oauthToken && customerId && selectedPaymentToken && isOnrampWalletRegistered);
   const isPreparingSession = canCheckoutDirectly && isValidAmount && !quoteError && (quoteLoading || !hasValidSession);
   const custTiers = customer?.kyc_tiers ?? [];
@@ -12625,7 +13005,7 @@ function PayWithStripeLink({
   };
   if (configError) {
     return /* @__PURE__ */ jsxs41("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-12 uf-px-4", children: [
-      /* @__PURE__ */ jsx44(AlertTriangle, { className: "uf-w-10 uf-h-10 uf-mb-3", style: { color: colors2.error } }),
+      /* @__PURE__ */ jsx44(AlertTriangle2, { className: "uf-w-10 uf-h-10 uf-mb-3", style: { color: colors2.error } }),
       /* @__PURE__ */ jsx44(
         "p",
         {
@@ -12639,7 +13019,7 @@ function PayWithStripeLink({
   if (step === "kyc" || step === "wallet") {
     if (error && !loading) {
       return /* @__PURE__ */ jsxs41("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-12 uf-px-4", children: [
-        /* @__PURE__ */ jsx44(AlertTriangle, { className: "uf-w-10 uf-h-10 uf-mb-3", style: { color: colors2.error } }),
+        /* @__PURE__ */ jsx44(AlertTriangle2, { className: "uf-w-10 uf-h-10 uf-mb-3", style: { color: colors2.error } }),
         /* @__PURE__ */ jsx44(
           "p",
           {
@@ -12778,7 +13158,7 @@ function PayWithStripeLink({
                 },
                 children: [
                   /* @__PURE__ */ jsx44(
-                    AlertTriangle,
+                    AlertTriangle2,
                     {
                       className: "uf-w-4 uf-h-4 uf-mt-0.5 uf-shrink-0",
                       style: { color: colors2.error }
@@ -13122,7 +13502,7 @@ function PayWithStripeLink({
               {
                 onClick: kycFormMode === "name" ? handleNameNext : handleKycSubmit,
                 disabled: loading || (kycFormMode === "name" ? !kycForm.givenName || !kycForm.surname : kycFormMode === "address" ? !kycForm.addressLine1 || !kycForm.addressCity || !kycForm.addressState || !kycForm.addressPostalCode : !kycForm.ssn || !kycForm.dob.day || !kycForm.dob.month || !kycForm.dob.year),
-                className: "uf-flex-1 uf-py-3.5 uf-text-white uf-font-medium uf-transition-colors disabled:uf-opacity-40",
+                className: "uf-flex-1 uf-py-3.5 uf-text-white uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-40",
                 style: {
                   backgroundColor: components.button.primaryBackground,
                   fontFamily: fonts.medium,
@@ -13181,7 +13561,17 @@ function PayWithStripeLink({
               className: "uf-w-full uf-flex-1 uf-overflow-y-auto uf-overflow-x-hidden"
             }
           ),
-          !stripePaymentUIReady && /* @__PURE__ */ jsx44("div", { className: "uf-flex uf-items-center uf-justify-center uf-py-8", children: /* @__PURE__ */ jsx44(Loader25, { className: "uf-w-8 uf-h-8 uf-animate-spin", style: { color: colors2.primary } }) }),
+          !stripePaymentUIReady && /* @__PURE__ */ jsxs41("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-gap-3 uf-py-10", children: [
+            /* @__PURE__ */ jsx44(Loader25, { className: "uf-w-8 uf-h-8 uf-animate-spin", style: { color: colors2.primary } }),
+            /* @__PURE__ */ jsx44(
+              "p",
+              {
+                className: "uf-text-sm uf-text-center",
+                style: { color: colors2.foregroundMuted, fontFamily: fonts.regular },
+                children: "Setting up secure payment\u2026"
+              }
+            )
+          ] }),
           error && /* @__PURE__ */ jsx44(
             "div",
             {
@@ -13288,35 +13678,14 @@ function PayWithStripeLink({
           isCustomerVerified(customer) && /* @__PURE__ */ jsx44("div", { className: "uf-px-1", children: /* @__PURE__ */ jsxs41(
             "button",
             {
-              onClick: async () => {
-                if (coordinator && sdkAuthenticatedRef.current) {
-                  setStep("add_payment");
-                  return;
-                }
-                pendingAddPaymentRef.current = true;
-                if (accessTokenRef.current && email) {
-                  setLoading(true);
-                  try {
-                    await withTokenRefresh(
-                      (tok) => stripeGetCustomer(customerId, tok, publishableKey)
-                    );
-                    const sdk = await initialize();
-                    if (!sdk) throw new Error("SDK failed to load");
-                    const authResult = await stripeCreateAuthIntent(email, publishableKey);
-                    setAuthIntentId(authResult.auth_intent_id);
-                    setStep("auth");
-                  } catch {
-                    setStep("email");
-                  } finally {
-                    setLoading(false);
-                  }
-                  return;
-                }
-                setStep("email");
+              onClick: () => {
+                setStep("add_payment");
               },
+              onMouseEnter: () => setAddPaymentHovered(true),
+              onMouseLeave: () => setAddPaymentHovered(false),
               className: "uf-w-full uf-p-3 uf-flex uf-items-center uf-gap-3 uf-transition-colors",
               style: {
-                backgroundColor: components.card.backgroundColor,
+                backgroundColor: addPaymentHovered ? colors2.cardHover : components.card.backgroundColor,
                 borderRadius: components.card.borderRadius,
                 border: `${components.card.borderWidth}px solid ${components.card.borderColor}`
               },
@@ -13431,7 +13800,7 @@ function PayWithStripeLink({
             {
               onClick: () => handleEmailSubmit(),
               disabled: loading || !email.trim(),
-              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-colors disabled:uf-opacity-40",
+              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-40",
               style: {
                 backgroundColor: components.button.primaryBackground,
                 fontFamily: fonts.medium,
@@ -13660,7 +14029,7 @@ function PayWithStripeLink({
             {
               onClick: handleRegisterSubmit,
               disabled: loading || phone.length !== 10,
-              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-colors disabled:uf-opacity-40",
+              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-40",
               style: {
                 backgroundColor: components.button.primaryBackground,
                 fontFamily: fonts.medium,
@@ -13683,7 +14052,7 @@ function PayWithStripeLink({
     const fatalError = sdkError || configError;
     if (fatalError) {
       return /* @__PURE__ */ jsxs41("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-12 uf-px-4", children: [
-        /* @__PURE__ */ jsx44(AlertTriangle, { className: "uf-w-10 uf-h-10 uf-mb-3", style: { color: colors2.error } }),
+        /* @__PURE__ */ jsx44(AlertTriangle2, { className: "uf-w-10 uf-h-10 uf-mb-3", style: { color: colors2.error } }),
         /* @__PURE__ */ jsx44(
           "p",
           {
@@ -13794,7 +14163,9 @@ function PayWithStripeLink({
     );
   }
   if (step === "amount") {
-    const paymentSelector = oauthToken && customerId && isCustomerVerified(customer) ? /* @__PURE__ */ jsxs41(
+    const canSelectPaymentMethod = !!(oauthToken && customerId && isCustomerVerified(customer));
+    const needsPaymentMethodSelection = canSelectPaymentMethod && !selectedPaymentToken;
+    const paymentSelector = canSelectPaymentMethod ? /* @__PURE__ */ jsxs41(
       "button",
       {
         onClick: () => setStep("payment"),
@@ -13868,6 +14239,35 @@ function PayWithStripeLink({
         style: { backgroundColor: colors2.background },
         children: [
           /* @__PURE__ */ jsxs41("div", { className: "uf-mb-6 uf-pt-2", children: [
+            error && /* @__PURE__ */ jsxs41(
+              "div",
+              {
+                className: "uf-flex uf-items-start uf-gap-2 uf-mx-1 uf-mb-4 uf-px-3 uf-py-2.5",
+                role: "alert",
+                style: {
+                  backgroundColor: `${colors2.error}14`,
+                  border: `1px solid ${colors2.error}40`,
+                  borderRadius: components.card.borderRadius
+                },
+                children: [
+                  /* @__PURE__ */ jsx44(
+                    AlertTriangle2,
+                    {
+                      className: "uf-w-4 uf-h-4 uf-mt-0.5 uf-shrink-0",
+                      style: { color: colors2.error }
+                    }
+                  ),
+                  /* @__PURE__ */ jsx44(
+                    "span",
+                    {
+                      className: "uf-text-xs uf-text-left",
+                      style: { color: colors2.error, fontFamily: fonts.regular },
+                      children: error
+                    }
+                  )
+                ]
+              }
+            ),
             paymentSelector,
             /* @__PURE__ */ jsxs41("div", { className: "uf-text-center uf-mb-4", children: [
               /* @__PURE__ */ jsx44(
@@ -13904,7 +14304,7 @@ function PayWithStripeLink({
                   children: amount && amountNum < 5 && !error ? /* @__PURE__ */ jsx44("span", { style: { color: colors2.error }, children: "Minimum amount is $5" }) : exceedsLimit && canRaiseLimit && !error ? /* @__PURE__ */ jsxs41("span", { style: { color: colors2.foregroundMuted }, children: [
                     purchaseLimit !== null ? `Limit $${purchaseLimit.toLocaleString()} \xB7 ` : "Limit reached \xB7 ",
                     "Verify to raise"
-                  ] }) : exceedsLimit && !error ? /* @__PURE__ */ jsx44("span", { style: { color: colors2.error }, children: purchaseLimit !== null ? `Limit $${purchaseLimit.toLocaleString()} \xB7 Try less` : "Limit reached \xB7 Try less" }) : error ? /* @__PURE__ */ jsx44("span", { style: { color: colors2.error }, children: error }) : quoteError ? /* @__PURE__ */ jsx44("span", { style: { color: colors2.error }, children: quoteError }) : quoteLoading ? /* @__PURE__ */ jsxs41(Fragment6, { children: [
+                  ] }) : exceedsLimit && !error ? /* @__PURE__ */ jsx44("span", { style: { color: colors2.error }, children: purchaseLimit !== null ? `Limit $${purchaseLimit.toLocaleString()} \xB7 Try less` : "Limit reached \xB7 Try less" }) : quoteError ? /* @__PURE__ */ jsx44("span", { style: { color: colors2.error }, children: quoteError }) : quoteLoading ? /* @__PURE__ */ jsxs41(Fragment6, { children: [
                     /* @__PURE__ */ jsx44(
                       Loader25,
                       {
@@ -13994,7 +14394,7 @@ function PayWithStripeLink({
             {
               onClick: startLimitStepUp,
               disabled: loading,
-              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-colors disabled:uf-opacity-40",
+              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-40",
               style: {
                 backgroundColor: components.button.primaryBackground,
                 fontFamily: fonts.medium,
@@ -14006,8 +14406,8 @@ function PayWithStripeLink({
             "button",
             {
               onClick: handleAmountContinue,
-              disabled: loading || !isValidAmount || !quote || isPreparingSession,
-              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-colors disabled:uf-opacity-40",
+              disabled: loading || !isValidAmount || !quote || isPreparingSession || needsPaymentMethodSelection,
+              className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-40",
               style: {
                 backgroundColor: components.button.primaryBackground,
                 fontFamily: fonts.medium,
@@ -14137,7 +14537,7 @@ function PayWithStripeLink({
               {
                 onClick: isBuyNow ? handleCheckout : handleReviewContinue,
                 disabled: loading || !quote || isBuyNow && !hasValidSession,
-                className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-colors disabled:uf-opacity-40",
+                className: "uf-w-full uf-py-3.5 uf-text-white uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-40",
                 style: {
                   backgroundColor: components.button.primaryBackground,
                   fontFamily: fonts.medium,
@@ -14238,7 +14638,7 @@ function PayWithStripeLink({
               backgroundColor: isSessionFulfilled ? colors2.success : isSessionFailed ? colors2.error : "#f59e0b",
               border: `2px solid ${colors2.background}`
             },
-            children: isSessionFulfilled ? /* @__PURE__ */ jsx44(CheckCircle22, { className: "uf-w-4 uf-h-4 uf-text-white" }) : isSessionFailed ? /* @__PURE__ */ jsx44(AlertTriangle, { className: "uf-w-3.5 uf-h-3.5 uf-text-white" }) : /* @__PURE__ */ jsx44(Loader25, { className: "uf-w-3.5 uf-h-3.5 uf-text-white uf-animate-spin" })
+            children: isSessionFulfilled ? /* @__PURE__ */ jsx44(CheckCircle22, { className: "uf-w-4 uf-h-4 uf-text-white" }) : isSessionFailed ? /* @__PURE__ */ jsx44(AlertTriangle2, { className: "uf-w-3.5 uf-h-3.5 uf-text-white" }) : /* @__PURE__ */ jsx44(Loader25, { className: "uf-w-3.5 uf-h-3.5 uf-text-white uf-animate-spin" })
           }
         )
       ] }),
@@ -14267,7 +14667,7 @@ function PayWithStripeLink({
         {
           className: "uf-w-20 uf-h-20 uf-rounded-full uf-flex uf-items-center uf-justify-center uf-mb-6",
           style: { backgroundColor: `${colors2.error}20` },
-          children: /* @__PURE__ */ jsx44(AlertTriangle, { className: "uf-w-10 uf-h-10", style: { color: colors2.error } })
+          children: /* @__PURE__ */ jsx44(AlertTriangle2, { className: "uf-w-10 uf-h-10", style: { color: colors2.error } })
         }
       ),
       /* @__PURE__ */ jsx44(
@@ -16406,14 +16806,36 @@ function useExchanges({
   return { exchanges, isLoading };
 }
 
-// src/hooks/use-apple-pay-providers.ts
+// src/hooks/use-public-incident.ts
 import { useQuery as useQuery13 } from "@tanstack/react-query";
+import { getPublicIncident } from "@unifold/core";
+function usePublicIncident({
+  publishableKey,
+  enabled = true
+}) {
+  const {
+    data: incident,
+    isLoading,
+    error
+  } = useQuery13({
+    queryKey: ["unifold", "publicIncident", publishableKey],
+    queryFn: () => getPublicIncident(publishableKey),
+    enabled,
+    staleTime: 1e3 * 30,
+    refetchInterval: 1e3 * 30,
+    refetchOnWindowFocus: true
+  });
+  return { incident, isLoading, error: error ?? null };
+}
+
+// src/hooks/use-apple-pay-providers.ts
+import { useQuery as useQuery14 } from "@tanstack/react-query";
 import { getApplePayProviders } from "@unifold/core";
 function useApplePayProviders({
   publishableKey,
   enabled = true
 }) {
-  const { data: providers, isLoading } = useQuery13({
+  const { data: providers, isLoading } = useQuery14({
     queryKey: ["unifold", "applePayProviders", publishableKey],
     queryFn: () => getApplePayProviders(publishableKey),
     enabled,
@@ -16432,7 +16854,8 @@ import {
   refreshIntegrationToken as refreshIntegrationToken2,
   revokeIntegrationToken,
   IntegrationProvider as IntegrationProvider2,
-  ActionType as ActionType3
+  ActionType as ActionType3,
+  isDepositAddressValidationError as isDepositAddressValidationError2
 } from "@unifold/core";
 
 // src/hooks/use-allowed-country.ts
@@ -16478,7 +16901,7 @@ function useAllowedCountry(publishableKey) {
 }
 
 // src/hooks/use-address-validation.ts
-import { useQuery as useQuery14 } from "@tanstack/react-query";
+import { useQuery as useQuery15 } from "@tanstack/react-query";
 import {
   verifyRecipientAddress
 } from "@unifold/core";
@@ -16492,7 +16915,7 @@ function useAddressValidation({
   refetchOnMount = false
 }) {
   const shouldValidate = enabled && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
-  const { data, isLoading, error } = useQuery14({
+  const { data, isLoading, error } = useQuery15({
     queryKey: [
       "unifold",
       "addressValidation",
@@ -16523,6 +16946,7 @@ function useAddressValidation({
     return {
       isValid: null,
       failureCode: null,
+      message: null,
       metadata: null,
       isLoading: false,
       error: null
@@ -16531,6 +16955,7 @@ function useAddressValidation({
   return {
     isValid: data?.valid ?? null,
     failureCode: data?.failure_code ?? null,
+    message: data?.message ?? null,
     metadata: data?.metadata ?? null,
     isLoading,
     error: error ?? null
@@ -16542,7 +16967,7 @@ import { useState as useState36, useEffect as useEffect30, useMemo as useMemo11
 import {
   ChevronDown as ChevronDown5,
   ChevronUp as ChevronUp3,
-  Info,
+  Info as Info2,
   Check as Check4,
   DollarSign,
   ShieldCheck,
@@ -17390,10 +17815,41 @@ function TokenSelectorSheet({
 }
 
 // src/hooks/use-default-token.ts
-import { useState as useState33, useEffect as useEffect29, useRef as useRef11 } from "react";
+import { useState as useState33, useEffect as useEffect29, useRef as useRef11, useCallback as useCallback8 } from "react";
 var getChainKey = (chainId, chainType) => {
   return `${chainType}:${chainId}`;
 };
+function getStoredSelection(key) {
+  if (typeof window === "undefined") return null;
+  try {
+    const raw = localStorage.getItem(key);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed.symbol === "string" && typeof parsed.chainType === "string" && typeof parsed.chainId === "string") {
+      return parsed;
+    }
+  } catch {
+  }
+  return null;
+}
+function saveStoredSelection(key, symbol, chainType, chainId) {
+  if (typeof window === "undefined") return;
+  try {
+    localStorage.setItem(key, JSON.stringify({ symbol, chainType, chainId }));
+  } catch {
+  }
+}
+function resolveFromStorage(tokens, stored) {
+  for (const t13 of tokens) {
+    if (t13.symbol !== stored.symbol) continue;
+    const matchedChain = t13.chains.find(
+      (c) => c.chain_type === stored.chainType && c.chain_id === stored.chainId
+    );
+    if (matchedChain) return { token: t13, chain: matchedChain };
+    if (t13.chains.length > 0) return { token: t13, chain: t13.chains[0] };
+  }
+  return null;
+}
 function resolveToken(tokens, defaultChainType, defaultChainId, defaultTokenAddress, defaultSymbol) {
   if (!tokens.length) return null;
   let selectedToken;
@@ -17443,27 +17899,73 @@ function useDefaultToken({
   defaultChainType,
   defaultChainId,
   defaultTokenAddress,
-  defaultSymbol
+  defaultSymbol,
+  storageKey: storageKey2
 }) {
-  const [token, setToken] = useState33(null);
-  const [chain, setChain] = useState33(null);
+  const [token, setTokenState] = useState33(null);
+  const [chain, setChainState] = useState33(null);
   const [initialSelectionDone, setInitialSelectionDone] = useState33(false);
   const appliedDefaultsRef = useRef11("");
+  const tokenRef = useRef11(null);
+  const chainRef = useRef11(null);
+  tokenRef.current = token;
+  chainRef.current = chain;
+  const setToken = useCallback8(
+    (newToken) => {
+      tokenRef.current = newToken;
+      setTokenState(newToken);
+      if (storageKey2 && chainRef.current) {
+        const [chainType, chainId] = chainRef.current.split(":");
+        saveStoredSelection(storageKey2, newToken, chainType, chainId);
+      }
+    },
+    [storageKey2]
+  );
+  const setChain = useCallback8(
+    (newChain) => {
+      chainRef.current = newChain;
+      setChainState(newChain);
+      if (storageKey2 && tokenRef.current) {
+        const [chainType, chainId] = newChain.split(":");
+        saveStoredSelection(storageKey2, tokenRef.current, chainType, chainId);
+      }
+    },
+    [storageKey2]
+  );
   useEffect29(() => {
     if (!tokens.length) return;
     const defaultsKey = `${defaultTokenAddress ?? ""}|${defaultSymbol ?? ""}|${defaultChainType ?? ""}|${defaultChainId ?? ""}`;
     const defaultsChanged = appliedDefaultsRef.current !== defaultsKey;
     if (initialSelectionDone && !defaultsChanged) return;
-    const result = resolveToken(
-      tokens,
-      defaultChainType,
-      defaultChainId,
-      defaultTokenAddress,
-      defaultSymbol
-    );
+    const hasExplicitDefaults = defaultTokenAddress && defaultChainType && defaultChainId || defaultSymbol && defaultChainType && defaultChainId;
+    let result = null;
+    if (hasExplicitDefaults) {
+      result = resolveToken(
+        tokens,
+        defaultChainType,
+        defaultChainId,
+        defaultTokenAddress,
+        defaultSymbol
+      );
+      if (result) {
+        const matched = defaultTokenAddress && result.chain.token_address.toLowerCase() === defaultTokenAddress.toLowerCase() && result.chain.chain_type === defaultChainType && result.chain.chain_id === defaultChainId || defaultSymbol && result.token.symbol === defaultSymbol && result.chain.chain_type === defaultChainType && result.chain.chain_id === defaultChainId;
+        if (!matched) {
+          result = null;
+        }
+      }
+    }
+    if (!result && storageKey2) {
+      const stored = getStoredSelection(storageKey2);
+      if (stored) {
+        result = resolveFromStorage(tokens, stored);
+      }
+    }
+    if (!result) {
+      result = resolveToken(tokens);
+    }
     if (result) {
-      setToken(result.token.symbol);
-      setChain(getChainKey(result.chain.chain_id, result.chain.chain_type));
+      setTokenState(result.token.symbol);
+      setChainState(getChainKey(result.chain.chain_id, result.chain.chain_type));
       appliedDefaultsRef.current = defaultsKey;
       setInitialSelectionDone(true);
     }
@@ -17473,7 +17975,8 @@ function useDefaultToken({
     defaultSymbol,
     defaultChainType,
     defaultChainId,
-    initialSelectionDone
+    initialSelectionDone,
+    storageKey2
   ]);
   useEffect29(() => {
     if (!tokens.length || !token) return;
@@ -17484,13 +17987,14 @@ function useDefaultToken({
     });
     if (!isChainAvailable) {
       const firstChain = currentToken.chains[0];
-      setChain(getChainKey(firstChain.chain_id, firstChain.chain_type));
+      setChainState(getChainKey(firstChain.chain_id, firstChain.chain_type));
     }
   }, [token, tokens, chain]);
   return { token, chain, setToken, setChain, initialSelectionDone };
 }
 
 // src/hooks/use-default-source-token.ts
+var STORAGE_KEY2 = "unifold_last_deposit_from_token";
 function useDefaultSourceToken({
   supportedTokens,
   defaultSourceChainType,
@@ -17503,7 +18007,8 @@ function useDefaultSourceToken({
     defaultChainType: defaultSourceChainType,
     defaultChainId: defaultSourceChainId,
     defaultTokenAddress: defaultSourceTokenAddress,
-    defaultSymbol: defaultSourceSymbol
+    defaultSymbol: defaultSourceSymbol,
+    storageKey: STORAGE_KEY2
   });
 }
 
@@ -17854,7 +18359,7 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-hypercore-activation.ts
-import { useQuery as useQuery15 } from "@tanstack/react-query";
+import { useQuery as useQuery16 } from "@tanstack/react-query";
 import { checkHypercoreActivation } from "@unifold/core";
 
 // src/lib/constants.ts
@@ -17873,7 +18378,7 @@ function useHypercoreActivation(params) {
   const recipient = recipientAddress?.trim() ?? "";
   const source = sourceAddress?.trim() ?? "";
   const hasAddresses = !!recipient && !!source;
-  const { data, isLoading } = useQuery15({
+  const { data, isLoading } = useQuery16({
     queryKey: ["unifold", "hypercoreActivation", source, recipient, publishableKey],
     queryFn: () => checkHypercoreActivation(
       {
@@ -17901,7 +18406,7 @@ function useHypercoreActivation(params) {
 }
 
 // src/components/shared/HypercoreActivationWarning.tsx
-import { AlertTriangle as AlertTriangle2 } from "lucide-react";
+import { AlertTriangle as AlertTriangle3 } from "lucide-react";
 import { jsx as jsx53, jsxs as jsxs48 } from "react/jsx-runtime";
 function HypercoreActivationWarning({
   activationFee,
@@ -17919,7 +18424,7 @@ function HypercoreActivationWarning({
       },
       children: [
         /* @__PURE__ */ jsx53(
-          AlertTriangle2,
+          AlertTriangle3,
           {
             className: "uf-w-4 uf-h-4 uf-flex-shrink-0 uf-mt-0.5",
             style: { color: colors2.warning }
@@ -18234,7 +18739,7 @@ function TransferCryptoSingleInput({
         ),
         error && !loading && /* @__PURE__ */ jsxs49("div", { className: "uf-bg-destructive/10 uf-border uf-border-destructive/20 uf-rounded-xl uf-p-3 uf-space-y-2", children: [
           /* @__PURE__ */ jsxs49("div", { className: "uf-flex uf-items-start uf-gap-2", children: [
-            /* @__PURE__ */ jsx54(Info, { className: "uf-w-4 uf-h-4 uf-text-destructive uf-flex-shrink-0 uf-mt-0.5" }),
+            /* @__PURE__ */ jsx54(Info2, { className: "uf-w-4 uf-h-4 uf-text-destructive uf-flex-shrink-0 uf-mt-0.5" }),
             /* @__PURE__ */ jsxs49("div", { className: "uf-flex-1 uf-min-w-0", children: [
               /* @__PURE__ */ jsx54("div", { className: "uf-text-xs uf-font-medium uf-text-destructive uf-mb-1", children: "Failed to create deposit address" }),
               /* @__PURE__ */ jsx54("div", { className: "uf-text-xs uf-text-muted-foreground", children: error })
@@ -18629,7 +19134,7 @@ import { useState as useState37, useEffect as useEffect31, useMemo as useMemo12
 import {
   ChevronDown as ChevronDown7,
   ChevronUp as ChevronUp5,
-  Info as Info2,
+  Info as Info3,
   Check as Check6,
   DollarSign as DollarSign2,
   ShieldCheck as ShieldCheck2,
@@ -19098,7 +19603,7 @@ function TransferCryptoDoubleInput({
     ] }),
     error && !loading && /* @__PURE__ */ jsxs51("div", { className: "uf-bg-destructive/10 uf-border uf-border-destructive/20 uf-rounded-xl uf-p-3 uf-space-y-2", children: [
       /* @__PURE__ */ jsxs51("div", { className: "uf-flex uf-items-start uf-gap-2", children: [
-        /* @__PURE__ */ jsx56(Info2, { className: "uf-w-4 uf-h-4 uf-text-destructive uf-flex-shrink-0 uf-mt-0.5" }),
+        /* @__PURE__ */ jsx56(Info3, { className: "uf-w-4 uf-h-4 uf-text-destructive uf-flex-shrink-0 uf-mt-0.5" }),
         /* @__PURE__ */ jsxs51("div", { className: "uf-flex-1 uf-min-w-0", children: [
           /* @__PURE__ */ jsx56("div", { className: "uf-text-xs uf-font-medium uf-text-destructive uf-mb-1", children: "Failed to create deposit address" }),
           /* @__PURE__ */ jsx56("div", { className: "uf-text-xs uf-text-muted-foreground", children: error })
@@ -19472,7 +19977,7 @@ async function sendHypercoreEvmTransfer(params) {
 }
 
 // src/hooks/use-deposit-quote.ts
-import { useQuery as useQuery16 } from "@tanstack/react-query";
+import { useQuery as useQuery17 } from "@tanstack/react-query";
 import { getDepositQuote } from "@unifold/core";
 function useDepositQuote(params) {
   const {
@@ -19499,7 +20004,7 @@ function useDepositQuote(params) {
     ...adjustForSlippage ? { adjust_for_slippage: true } : {},
     ...stablecoinParity ? { stablecoin_parity: true } : {}
   };
-  return useQuery16({
+  return useQuery17({
     queryKey: [
       "unifold",
       "depositQuote",
@@ -19527,13 +20032,13 @@ function useDepositQuote(params) {
 }
 
 // src/hooks/use-external-wallets.ts
-import { useQuery as useQuery17 } from "@tanstack/react-query";
+import { useQuery as useQuery18 } from "@tanstack/react-query";
 import { getExternalWallets } from "@unifold/core";
 function useExternalWallets({
   publishableKey,
   enabled = true
 }) {
-  const { data: wallets = [], isLoading } = useQuery17({
+  const { data: wallets = [], isLoading } = useQuery18({
     queryKey: ["unifold", "external-wallets", publishableKey],
     queryFn: () => getExternalWallets(publishableKey).then((res) => res.data),
     enabled: enabled && !!publishableKey,
@@ -20644,33 +21149,11 @@ function balancesRepresentSameToken(a, b) {
   if (!tokenA || !tokenB) return false;
   return tokenA.chain_type === tokenB.chain_type && tokenA.chain_id === tokenB.chain_id && normalizeTokenAddress(tokenA.token_address) === normalizeTokenAddress(tokenB.token_address);
 }
-function getSolanaProviders() {
-  if (typeof window === "undefined") return {};
-  const win = window;
-  return {
-    phantomSolana: win.phantom?.solana,
-    solflare: win.solflare,
-    backpack: win.backpack,
-    glow: win.glow,
-    coinbaseSolana: win.coinbaseSolana || win.coinbaseWalletExtension?.solana
-  };
-}
-function getLegacyEvmProviders() {
-  if (typeof window === "undefined") return {};
-  const win = window;
-  return {
-    ethereum: win.ethereum,
-    phantomEthereum: win.phantom?.ethereum,
-    coinbaseEthereum: win.coinbaseWalletExtension,
-    trustEthereum: win.trustwallet?.ethereum,
-    okxEthereum: win.okxwallet
-  };
-}
 function detectAvailableWallets(definitions, recentWalletId, filterChainType) {
-  const solProviders = getSolanaProviders();
-  const legacyEvm = getLegacyEvmProviders();
-  const eip6963List = getEip6963Providers();
   const win = typeof window !== "undefined" ? window : null;
+  const solProviders = getInjectedSolanaProviders(win);
+  const legacyEvm = getLegacyEvmProviders(win);
+  const eip6963List = getEip6963Providers();
   const hasEip6963 = (walletId) => eip6963List.some((d) => {
     const rdns = d.info?.rdns || "";
     switch (walletId) {
@@ -20922,7 +21405,7 @@ function WalletConnect({
   const chainType = activeDepositWallet?.chain_type ?? "ethereum";
   const recipientAddress = activeDepositWallet?.address ?? "";
   const isCheckoutMode = !!checkoutAmountUsd;
-  const supportedChainType = chainType === "algorand" || chainType === "xrpl" || chainType === "cardano" || chainType === "n1" ? "ethereum" : chainType;
+  const supportedChainType = chainType === "algorand" || chainType === "xrpl" || chainType === "cardano" || chainType === "n1" || chainType === "tron" ? "ethereum" : chainType;
   const transitionTo = React35.useCallback((nextView) => {
     if (nextView === viewRef.current) return;
     setIsTransitioning(true);
@@ -20939,10 +21422,13 @@ function WalletConnect({
   };
   const openMobileWalletBrowse = async (wallet, depositAddresses) => {
     try {
+      const cleanedAmountUsd = amountUsd?.replace(/[^0-9.]/g, "") ?? "";
+      const forwardedAmountUsd = parseFloat(cleanedAmountUsd) > 0 ? cleanedAmountUsd : void 0;
       const res = await getWalletMobileDeepLink(
         wallet.id,
         depositAddresses,
-        publishableKey
+        publishableKey,
+        forwardedAmountUsd
       );
       if (res.deeplink) {
         setMobileRedirect({ walletId: wallet.id, walletName: wallet.name, deeplink: res.deeplink });
@@ -21031,7 +21517,7 @@ function WalletConnect({
         const eip6963Match = findProviderByWalletId(wallet.id);
         let provider = eip6963Match?.provider;
         if (!provider) {
-          const legacyEvm = getLegacyEvmProviders();
+          const legacyEvm = getLegacyEvmProviders(win);
           switch (wallet.id) {
             case "metamask":
               if (legacyEvm.ethereum?.isMetaMask && !legacyEvm.ethereum?.isPhantom)
@@ -21063,16 +21549,7 @@ function WalletConnect({
         const accounts = await provider.request({ method: "eth_requestAccounts" });
         if (!accounts?.length) throw new Error("No accounts returned from wallet");
         setUserDisconnectedWallet(false);
-        const walletIdToType = {
-          phantom: "phantom-ethereum",
-          coinbase: "coinbase",
-          trust: "trust",
-          rainbow: "rainbow",
-          rabby: "rabby",
-          okx: "okx",
-          metamask: "metamask"
-        };
-        const walletType = walletIdToType[wallet.id] || "metamask";
+        const walletType = walletIdToWalletType(wallet.id);
         setStoredWalletState(walletType);
         connectedInfo = {
           type: walletType,
@@ -21081,7 +21558,7 @@ function WalletConnect({
           icon: wallet.id
         };
       } else {
-        const solProviders = getSolanaProviders();
+        const solProviders = getInjectedSolanaProviders(win);
         let provider;
         switch (wallet.id) {
           case "phantom":
@@ -21100,11 +21577,11 @@ function WalletConnect({
             provider = solProviders.coinbaseSolana || win?.coinbaseWalletExtension?.solana;
             break;
           case "trust":
-            provider = win?.trustwallet?.solana;
+            provider = solProviders.trustSolana;
             break;
         }
         if (!provider) throw new Error(`${wallet.name} Solana wallet not found.`);
-        const response = await provider.connect();
+        const response = await connectSolanaProviderWithRecovery(provider, wallet.id, wallet.name);
         setUserDisconnectedWallet(false);
         const walletType = wallet.id === "solflare" ? "solflare" : wallet.id === "backpack" ? "backpack" : wallet.id === "glow" ? "glow" : "phantom-solana";
         setStoredWalletState(walletType);
@@ -21277,7 +21754,7 @@ function WalletConnect({
     let cancelled = false;
     setIsLoading(true);
     setError(null);
-    const sct = activeDepositWallet.chain_type === "algorand" || activeDepositWallet.chain_type === "xrpl" || activeDepositWallet.chain_type === "cardano" || activeDepositWallet.chain_type === "n1" ? "ethereum" : activeDepositWallet.chain_type;
+    const sct = activeDepositWallet.chain_type === "algorand" || activeDepositWallet.chain_type === "xrpl" || activeDepositWallet.chain_type === "cardano" || activeDepositWallet.chain_type === "n1" || activeDepositWallet.chain_type === "tron" ? "ethereum" : activeDepositWallet.chain_type;
     getAddressBalances2(activeWalletInfo.address, sct, publishableKey).then((response) => {
       if (cancelled) return;
       const nonZero = response.balances.filter((b) => b.amount !== "0");
@@ -21455,16 +21932,7 @@ function WalletConnect({
     return (integerPart + decimalPart.padEnd(decimals, "0").slice(0, decimals)).replace(/^0+/, "") || "0";
   };
   const resolveEvmProvider = () => {
-    const walletIdMap = {
-      "phantom-ethereum": "phantom",
-      coinbase: "coinbase",
-      trust: "trust",
-      okx: "okx",
-      rainbow: "rainbow",
-      rabby: "rabby",
-      metamask: "metamask"
-    };
-    const lookupId = walletIdMap[walletInfo.type] || walletInfo.type;
+    const lookupId = walletTypeToWalletId(walletInfo.type);
     const eip6963Match = findProviderByWalletId(lookupId);
     let provider = eip6963Match?.provider;
     if (!provider) {
@@ -22196,6 +22664,7 @@ function DepositModal({
   applePayTitle = "Pay with Apple Pay",
   applePaySubTitle = "Instant",
   enableBankTransfer,
+  enableIncidentBanner = false,
   // No default: left undefined so the backend `stripe_link.enabled` can govern
   // (via the `??` chain in showStripeLink) once a dashboard toggle exists.
   enableStripeLink,
@@ -22220,7 +22689,7 @@ function DepositModal({
     () => normalizePrefilledUsdAmount(prefilledAmountUsd),
     [prefilledAmountUsd]
   );
-  const onDepositSuccessFor = useCallback10(
+  const onDepositSuccessFor = useCallback11(
     (method) => onDepositSuccess || onEvent ? (data) => {
       const payload = { ...data, method };
       onDepositSuccess?.(payload);
@@ -22233,7 +22702,7 @@ function DepositModal({
     } : void 0,
     [onDepositSuccess, onEvent]
   );
-  const onDepositErrorFor = useCallback10(
+  const onDepositErrorFor = useCallback11(
     (method) => onDepositError ? (error) => onDepositError({ ...error, method }) : void 0,
     [onDepositError]
   );
@@ -22241,7 +22710,7 @@ function DepositModal({
     const s = initialScreen ?? "main";
     if (s === "tracker" && hideDepositTracker === true) return "main";
     if (s === "cashapp" && enableCashApp === false) return "main";
-    if (s === "stripe_link" && !enableStripeLink) return "main";
+    if (s === "stripe_link" && enableStripeLink === false) return "main";
     if (s === "apple_pay" && enableApplePay === false) return "main";
     if (s === "card" && enableFiatOnramp === false) return "main";
     if (s === "pay_with_exchange") return enablePayWithExchange === false ? "main" : "exchange";
@@ -22263,7 +22732,7 @@ function DepositModal({
     enableStripeLink
   ]);
   const [containerEl, setContainerEl] = useState40(null);
-  const containerCallbackRef = useCallback10((el) => {
+  const containerCallbackRef = useCallback11((el) => {
     setContainerEl(el);
   }, []);
   const [view, setView] = useState40(effectiveInitialScreen);
@@ -22300,6 +22769,16 @@ function DepositModal({
   const showApplePay = enableApplePay ?? projectConfig?.apple_pay?.enabled ?? true;
   const showBankTransfer = enableBankTransfer ?? projectConfig?.bank_transfer?.enabled ?? true;
   const showDepositTracker = hideDepositTracker ? false : projectConfig?.deposit_tracker?.enabled ?? true;
+  const { incident: publicIncident } = usePublicIncident({
+    publishableKey,
+    enabled: open && enableIncidentBanner
+  });
+  const activeIncident = enableIncidentBanner && publicIncident?.enabled && (publicIncident.messages?.length ?? 0) > 0 ? {
+    enabled: true,
+    messages: publicIncident.messages,
+    severity: publicIncident.severity,
+    statusPageUrl: publicIncident.status_page_url
+  } : void 0;
   const [integrationExchanges, setIntegrationExchanges] = useState40([]);
   useEffect34(() => {
     if (!showConnectExchange || !open) return;
@@ -22366,7 +22845,11 @@ function DepositModal({
       setConnectedExchange((prev) => prev ? { ...prev, iconUrl } : prev);
     }
   }, [integrationExchanges, connectedExchange]);
-  const { data: depositAddressResponse, isLoading: walletsLoading } = useDepositAddress({
+  const {
+    data: depositAddressResponse,
+    isLoading: walletsLoading,
+    error: walletsError
+  } = useDepositAddress({
     userId,
     publishableKey,
     recipientAddress,
@@ -22499,6 +22982,7 @@ function DepositModal({
   const {
     isValid: isAddressValid,
     failureCode: addressFailureCode,
+    message: addressFailureMessage,
     metadata: addressFailureMetadata,
     isLoading: isAddressValidationLoading
   } = useAddressValidation({
@@ -22512,17 +22996,31 @@ function DepositModal({
     refetchOnMount: "always"
   });
   const addressValidationMessages = i18n.transferCrypto.addressValidation;
-  const getAddressValidationErrorMessage = (code, metadata) => {
+  const getAddressValidationErrorMessage = (message, code, metadata) => {
+    if (message && message.trim().length > 0) return message;
     if (!code) return addressValidationMessages.defaultError;
     const errors = addressValidationMessages.errors;
     const template = errors[code] ?? addressValidationMessages.defaultError;
     return interpolate(template, metadata);
   };
+  const walletsRecipientError = isDepositAddressValidationError2(walletsError) ? walletsError.message : null;
+  const isRecipientAddressInvalid = isAddressValid === false || walletsRecipientError !== null;
+  const recipientInvalidMessage = getAddressValidationErrorMessage(
+    addressFailureMessage ?? walletsRecipientError,
+    addressFailureCode,
+    addressFailureMetadata
+  );
   const openingScreen = effectiveInitialScreen;
   const sessionOpenedFromMenu = openingScreen === "main";
   const standaloneNeedsDepositPrereq = openingScreen !== "main" && (view === "transfer" || view === "card");
   let depositPrerequisiteBody;
-  if (isCountryLoading || isAddressValidationLoading || tokensLoading || walletsLoading || !projectConfig || // Bank-transfer row visibility depends on the country-gated providers
+  if (isRecipientAddressInvalid) {
+    depositPrerequisiteBody = /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-8 uf-px-4 uf-text-center", children: [
+      /* @__PURE__ */ jsx63("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx63(AlertTriangle4, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
+      /* @__PURE__ */ jsx63("h3", { className: "uf-text-lg uf-font-semibold uf-text-foreground uf-mb-2", children: addressValidationMessages.unableToReceiveFunds }),
+      /* @__PURE__ */ jsx63("p", { className: "uf-text-sm uf-text-muted-foreground uf-max-w-[280px]", children: recipientInvalidMessage })
+    ] });
+  } else if (isCountryLoading || isAddressValidationLoading || tokensLoading || walletsLoading || !projectConfig || // Bank-transfer row visibility depends on the country-gated providers
   // fetch — block the menu on it so the row never flashes in or out.
   showBankTransfer && bankTransferProvidersLoading || // Same for Apple Pay: row visibility depends on the geo/platform-gated
   // providers fetch — block the menu so the row doesn't pop in or out.
@@ -22534,7 +23032,7 @@ function DepositModal({
     ] });
   } else if (countryError) {
     depositPrerequisiteBody = /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-8 uf-px-4 uf-text-center", children: [
-      /* @__PURE__ */ jsx63("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx63(AlertTriangle3, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
+      /* @__PURE__ */ jsx63("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx63(AlertTriangle4, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
       /* @__PURE__ */ jsx63("h3", { className: "uf-text-lg uf-font-semibold uf-text-foreground uf-mb-2", children: "Unable to Verify Location" }),
       /* @__PURE__ */ jsx63("p", { className: "uf-text-sm uf-text-muted-foreground uf-max-w-[280px]", children: "We couldn't verify your location. Please check your connection and try again." })
     ] });
@@ -22544,12 +23042,6 @@ function DepositModal({
       /* @__PURE__ */ jsx63("h3", { className: "uf-text-lg uf-font-semibold uf-text-foreground uf-mb-2", children: "No Tokens Available" }),
       /* @__PURE__ */ jsx63("p", { className: "uf-text-sm uf-text-muted-foreground uf-max-w-[280px]", children: "There are no supported tokens available from your current location." })
     ] });
-  } else if (isAddressValid === false) {
-    depositPrerequisiteBody = /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-8 uf-px-4 uf-text-center", children: [
-      /* @__PURE__ */ jsx63("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx63(AlertTriangle3, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
-      /* @__PURE__ */ jsx63("h3", { className: "uf-text-lg uf-font-semibold uf-text-foreground uf-mb-2", children: addressValidationMessages.unableToReceiveFunds }),
-      /* @__PURE__ */ jsx63("p", { className: "uf-text-sm uf-text-muted-foreground uf-max-w-[280px]", children: getAddressValidationErrorMessage(addressFailureCode, addressFailureMetadata) })
-    ] });
   } else {
     depositPrerequisiteBody = null;
   }
@@ -23043,6 +23535,7 @@ function DepositModal({
                       title: modalTitle || "Deposit",
                       showClose: !hideOverlay,
                       onClose: handleClose,
+                      incident: activeIncident,
                       showBalance: showBalanceHeader,
                       balanceAddress: recipientAddress,
                       balanceChainType: destinationChainType === "ethereum" || destinationChainType === "solana" || destinationChainType === "bitcoin" || destinationChainType === "n1" ? destinationChainType : void 0,
@@ -23062,6 +23555,7 @@ function DepositModal({
                       showBack: showBackTransfer,
                       onBack: handleBack,
                       onClose: handleClose,
+                      incident: activeIncident,
                       showBalance: showBalanceHeader,
                       balanceAddress: recipientAddress,
                       balanceChainType: destinationChainType === "ethereum" || destinationChainType === "solana" || destinationChainType === "bitcoin" || destinationChainType === "n1" ? destinationChainType : void 0,
@@ -23122,7 +23616,8 @@ function DepositModal({
                       title: selectedExecution ? "Deposit Details" : depositTrackerTitle,
                       showBack: showBackTracker,
                       onBack: handleBack,
-                      onClose: handleClose
+                      onClose: handleClose,
+                      incident: activeIncident
                     }
                   ),
                   /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
@@ -23154,6 +23649,7 @@ function DepositModal({
                       showBack: showBackCard,
                       onBack: handleBack,
                       onClose: handleClose,
+                      incident: activeIncident,
                       badge: cardView === "quotes" ? { count: quotesCount } : void 0,
                       showBalance: showBalanceHeader,
                       balanceAddress: recipientAddress,
@@ -23203,7 +23699,8 @@ function DepositModal({
                       title: payWithExchangeTitle,
                       showBack: exchangeView === "pending" || sessionOpenedFromMenu,
                       onBack: handleBack,
-                      onClose: handleClose
+                      onClose: handleClose,
+                      incident: activeIncident
                     }
                   ),
                   /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
@@ -23317,7 +23814,8 @@ function DepositModal({
                       title: t8.bankTransfer.title,
                       showBack: bankTransferView !== "providers" || sessionOpenedFromMenu,
                       onBack: handleBack,
-                      onClose: handleClose
+                      onClose: handleClose,
+                      incident: activeIncident
                     }
                   ),
                   /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
@@ -23351,26 +23849,24 @@ function DepositModal({
                       title: "Deposit with Link",
                       showBack: stripeLinkStep !== "checkout" && stripeLinkStep !== "success",
                       onBack: handleBack,
+                      incident: activeIncident,
                       showClose: stripeLinkStep !== "checkout" && stripeLinkStep !== "auth",
                       onClose: handleClose
                     }
                   ),
                   /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
                     isLoadingIp ? (
-                      // Hold the geo decision until IP resolves so we don't mount
-                      // PayWithStripeLink (which kicks off config/OAuth work) for a
-                      // deep-link user who turns out to be outside the US.
+                      // Wait for location so the first config fetch is region-aware.
                       /* @__PURE__ */ jsx63(SkeletonButton, { variant: "with-icons" })
                     ) : !showStripeLink ? (
-                      // Stripe Link's crypto on-ramp is US-only. On a direct open
-                      // (initialScreen="stripe_link") the row isn't in a menu to
-                      // fall back to, so show a geo-restriction screen rather than
-                      // the Link UI.
+                      // Direct opens (initialScreen="stripe_link") have no menu row
+                      // to fall back to, so render an unavailable state when backend
+                      // config resolves Stripe Link disabled/hidden.
                       /* @__PURE__ */ jsx63(
                         GeoRestrictionScreen,
                         {
                           methodName: t8.stripeLink.title,
-                          message: "Pay with Link is only available in the US."
+                          message: t8.stripeLink.unavailableInRegionMessage
                         }
                       )
                     ) : /* @__PURE__ */ jsx63(
@@ -23403,7 +23899,8 @@ function DepositModal({
                       title: cashAppView !== "amount" && cashAppAmount ? `Pay $${cashAppAmount} via Cash App` : "Pay with Cash App",
                       showBack: cashAppView !== "amount" || sessionOpenedFromMenu,
                       onBack: handleBack,
-                      onClose: handleClose
+                      onClose: handleClose,
+                      incident: activeIncident
                     }
                   ),
                   /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
@@ -23439,7 +23936,8 @@ function DepositModal({
                         const handled = applePayHandleRef.current?.requestBack() ?? false;
                         if (!handled) handleBack();
                       },
-                      onClose: handleClose
+                      onClose: handleClose,
+                      incident: activeIncident
                     }
                   ),
                   /* @__PURE__ */ jsxs57("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
@@ -23481,16 +23979,16 @@ function DepositModal({
 }
 
 // src/components/checkout/CheckoutModal.tsx
-import { useState as useState41, useEffect as useEffect35, useLayoutEffect as useLayoutEffect3, useCallback as useCallback11, useRef as useRef14, useMemo as useMemo15 } from "react";
-import { AlertTriangle as AlertTriangle4, ChevronRight as ChevronRight19 } from "lucide-react";
+import { useState as useState41, useEffect as useEffect35, useLayoutEffect as useLayoutEffect3, useCallback as useCallback12, useRef as useRef14, useMemo as useMemo15 } from "react";
+import { AlertTriangle as AlertTriangle5, ChevronRight as ChevronRight19 } from "lucide-react";
 
 // src/hooks/use-payment-intent.ts
-import { useQuery as useQuery18 } from "@tanstack/react-query";
+import { useQuery as useQuery19 } from "@tanstack/react-query";
 import { retrievePaymentIntent } from "@unifold/core";
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["succeeded", "expired", "refunded", "canceled"]);
 function usePaymentIntent(params) {
   const { clientSecret, publishableKey, enabled = true, pollingInterval = 3e3 } = params;
-  return useQuery18({
+  return useQuery19({
     queryKey: ["unifold", "paymentIntent", clientSecret, publishableKey],
     queryFn: () => retrievePaymentIntent(clientSecret, publishableKey),
     enabled: enabled && !!clientSecret && !!publishableKey,
@@ -23569,6 +24067,7 @@ function CheckoutModal({
   modalTitle,
   enableTransferCrypto,
   enableConnectWallet,
+  enableIncidentBanner = false,
   defaultSourceChainType,
   defaultSourceChainId,
   defaultSourceTokenAddress,
@@ -23584,7 +24083,7 @@ function CheckoutModal({
   const [browserWalletInfo, setBrowserWalletInfo] = useState41(null);
   const [browserWalletChainType, setBrowserWalletChainType] = useState41(() => getStoredWalletState()?.chainType);
   const lastCheckoutMethodRef = useRef14(void 0);
-  const emitCheckoutSuccess = useCallback11(
+  const emitCheckoutSuccess = useCallback12(
     (data, method) => {
       const isSucceeded = data.status === "succeeded";
       const richIntent = isSucceeded && data.paymentIntent ? mapToCheckoutPaymentIntent(data.paymentIntent) : void 0;
@@ -23640,6 +24139,16 @@ function CheckoutModal({
   });
   const showTransferCrypto = enableTransferCrypto ?? projectConfig?.transfer_crypto?.enabled ?? true;
   const showConnectWallet = enableConnectWallet ?? projectConfig?.connect_wallet?.enabled ?? true;
+  const { incident: publicIncident } = usePublicIncident({
+    publishableKey,
+    enabled: open && enableIncidentBanner
+  });
+  const activeIncident = enableIncidentBanner && publicIncident?.enabled && (publicIncident.messages?.length ?? 0) > 0 ? {
+    enabled: true,
+    messages: publicIncident.messages,
+    severity: publicIncident.severity,
+    statusPageUrl: publicIncident.status_page_url
+  } : void 0;
   useEffect35(() => {
     if (view === "transfer" && !showTransferCrypto) {
       setView("main");
@@ -23735,7 +24244,7 @@ function CheckoutModal({
       sourceAmountUsd: minUsd.toFixed(2)
     };
   }, [sourceQuote, selectedSource]);
-  const handleBrowserWalletClick = useCallback11(
+  const handleBrowserWalletClick = useCallback12(
     (walletInfo) => {
       const walletChainType = walletInfo.type === "phantom-solana" || walletInfo.type === "solflare" || walletInfo.type === "backpack" || walletInfo.type === "glow" ? "solana" : "ethereum";
       setStoredWalletState(walletInfo.type);
@@ -23758,19 +24267,19 @@ function CheckoutModal({
     },
     [wallets, onCheckoutError]
   );
-  const handleWalletConnectClick = useCallback11(() => {
+  const handleWalletConnectClick = useCallback12(() => {
     setBrowserWalletInfo(null);
     lastCheckoutMethodRef.current = "wallet_connect";
     setView("wallet_connect");
   }, []);
-  const handleWalletDisconnect = useCallback11(() => {
+  const handleWalletDisconnect = useCallback12(() => {
     setUserDisconnectedWallet(true);
     clearStoredWalletState();
     setBrowserWalletChainType(void 0);
     setBrowserWalletInfo(null);
     setView("main");
   }, []);
-  const handleClose = useCallback11(() => {
+  const handleClose = useCallback12(() => {
     onOpenChange(false);
     if (resetViewTimeoutRef.current) {
       clearTimeout(resetViewTimeoutRef.current);
@@ -23800,7 +24309,7 @@ function CheckoutModal({
     },
     []
   );
-  const handleBack = useCallback11(() => {
+  const handleBack = useCallback12(() => {
     setView("main");
   }, []);
   const poweredByFooter = /* @__PURE__ */ jsx64("div", { className: "uf-pt-3", children: /* @__PURE__ */ jsx64(
@@ -23941,7 +24450,15 @@ function CheckoutModal({
         {
           className: view === "wallet_connect" ? "uf-flex uf-min-h-0 uf-flex-col" : void 0,
           children: view === "main" ? /* @__PURE__ */ jsxs58(Fragment15, { children: [
-            /* @__PURE__ */ jsx64(DepositHeader, { title: modalTitle || "Checkout", showClose: true, onClose: handleClose }),
+            /* @__PURE__ */ jsx64(
+              DepositHeader,
+              {
+                title: modalTitle || "Checkout",
+                showClose: true,
+                onClose: handleClose,
+                incident: activeIncident
+              }
+            ),
             /* @__PURE__ */ jsxs58("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
               piLoading ? /* @__PURE__ */ jsxs58("div", { className: "uf-space-y-3", children: [
                 /* @__PURE__ */ jsx64(
@@ -23978,7 +24495,7 @@ function CheckoutModal({
                 /* @__PURE__ */ jsx64(SkeletonButton2, {}),
                 /* @__PURE__ */ jsx64(SkeletonButton2, {})
               ] }) : piError ? /* @__PURE__ */ jsxs58("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-8 uf-px-4 uf-text-center", children: [
-                /* @__PURE__ */ jsx64("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx64(AlertTriangle4, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
+                /* @__PURE__ */ jsx64("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx64(AlertTriangle5, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
                 /* @__PURE__ */ jsx64(
                   "h3",
                   {
@@ -24039,7 +24556,8 @@ function CheckoutModal({
                 title: modalTitle || "Checkout",
                 showBack: true,
                 onBack: handleBack,
-                onClose: handleClose
+                onClose: handleClose,
+                incident: activeIncident
               }
             ),
             /* @__PURE__ */ jsxs58("div", { className: "uf-flex uf-flex-col uf-gap-1.5", children: [
@@ -24200,16 +24718,16 @@ function CheckoutModal({
 }
 
 // src/components/withdrawals/WithdrawModal.tsx
-import { useState as useState45, useEffect as useEffect39, useLayoutEffect as useLayoutEffect4, useCallback as useCallback13, useRef as useRef16 } from "react";
-import { AlertTriangle as AlertTriangle6, ChevronRight as ChevronRight21, Clock as Clock6 } from "lucide-react";
+import { useState as useState45, useEffect as useEffect39, useLayoutEffect as useLayoutEffect4, useCallback as useCallback14, useRef as useRef16 } from "react";
+import { AlertTriangle as AlertTriangle7, ChevronRight as ChevronRight21, Clock as Clock6 } from "lucide-react";
 
 // src/hooks/use-supported-destination-tokens.ts
-import { useQuery as useQuery19 } from "@tanstack/react-query";
+import { useQuery as useQuery20 } from "@tanstack/react-query";
 import {
   getSupportedDestinationTokens
 } from "@unifold/core";
 function useSupportedDestinationTokens(publishableKey, enabled = true) {
-  return useQuery19({
+  return useQuery20({
     queryKey: ["unifold", "supportedDestinationTokens", publishableKey],
     queryFn: () => getSupportedDestinationTokens(publishableKey),
     staleTime: 1e3 * 60 * 5,
@@ -24221,6 +24739,7 @@ function useSupportedDestinationTokens(publishableKey, enabled = true) {
 }
 
 // src/hooks/use-default-destination-token.ts
+var STORAGE_KEY3 = "unifold_last_withdraw_to_token";
 function useDefaultDestinationToken({
   destinationTokens,
   defaultDestinationChainType,
@@ -24233,12 +24752,13 @@ function useDefaultDestinationToken({
     defaultChainType: defaultDestinationChainType,
     defaultChainId: defaultDestinationChainId,
     defaultTokenAddress: defaultDestinationTokenAddress,
-    defaultSymbol: defaultDestinationSymbol
+    defaultSymbol: defaultDestinationSymbol,
+    storageKey: STORAGE_KEY3
   });
 }
 
 // src/hooks/use-source-token-validation.ts
-import { useQuery as useQuery20 } from "@tanstack/react-query";
+import { useQuery as useQuery21 } from "@tanstack/react-query";
 import { getSupportedDepositTokens as getSupportedDepositTokens3 } from "@unifold/core";
 function useSourceTokenValidation(params) {
   const {
@@ -24250,7 +24770,7 @@ function useSourceTokenValidation(params) {
     enabled = true
   } = params;
   const hasParams = !!sourceChainType && !!sourceChainId && !!sourceTokenAddress;
-  return useQuery20({
+  return useQuery21({
     queryKey: [
       "unifold",
       "sourceTokenValidation",
@@ -24298,12 +24818,12 @@ function useSourceTokenValidation(params) {
 }
 
 // src/hooks/use-address-balance.ts
-import { useQuery as useQuery21 } from "@tanstack/react-query";
+import { useQuery as useQuery22 } from "@tanstack/react-query";
 import { getAddressBalance as getAddressBalance2 } from "@unifold/core";
 function useAddressBalance(params) {
   const { address, chainType, chainId, tokenAddress, publishableKey, enabled = true } = params;
   const hasParams = !!address && !!chainType && !!chainId && !!tokenAddress;
-  return useQuery21({
+  return useQuery22({
     queryKey: [
       "unifold",
       "addressBalance",
@@ -24359,11 +24879,11 @@ function useAddressBalance(params) {
 }
 
 // src/hooks/use-executions.ts
-import { useQuery as useQuery22 } from "@tanstack/react-query";
+import { useQuery as useQuery23 } from "@tanstack/react-query";
 import { queryExecutions as queryExecutions4, ActionType as ActionType4 } from "@unifold/core";
 function useExecutions(userId, publishableKey, options) {
   const actionType = options?.actionType ?? ActionType4.Deposit;
-  return useQuery22({
+  return useQuery23({
     queryKey: ["unifold", "executions", actionType, userId, publishableKey],
     queryFn: () => queryExecutions4(userId, publishableKey, actionType),
     enabled: (options?.enabled ?? true) && !!userId,
@@ -24694,9 +25214,9 @@ function WithdrawDoubleInput({
 }
 
 // src/components/withdrawals/WithdrawForm.tsx
-import { useState as useState43, useCallback as useCallback12, useMemo as useMemo17, useEffect as useEffect37 } from "react";
+import { useState as useState43, useCallback as useCallback13, useMemo as useMemo17, useEffect as useEffect37 } from "react";
 import {
-  AlertTriangle as AlertTriangle5,
+  AlertTriangle as AlertTriangle6,
   ArrowUpDown,
   ChevronDown as ChevronDown9,
   ChevronUp as ChevronUp7,
@@ -24712,7 +25232,7 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-verify-recipient-address.ts
-import { useQuery as useQuery23 } from "@tanstack/react-query";
+import { useQuery as useQuery24 } from "@tanstack/react-query";
 import { verifyRecipientAddress as verifyRecipientAddress2 } from "@unifold/core";
 function useVerifyRecipientAddress(params) {
   const {
@@ -24725,7 +25245,7 @@ function useVerifyRecipientAddress(params) {
   } = params;
   const trimmedAddress = recipientAddress?.trim() || "";
   const hasAllParams = !!chainType && !!chainId && !!tokenAddress && trimmedAddress.length > 0;
-  return useQuery23({
+  return useQuery24({
     queryKey: [
       "unifold",
       "verifyRecipientAddress",
@@ -24976,7 +25496,7 @@ import { useMemo as useMemo16 } from "react";
 import { ActionType as ActionType6 } from "@unifold/core";
 
 // src/hooks/use-get-deposit-address.ts
-import { useQuery as useQuery24 } from "@tanstack/react-query";
+import { useQuery as useQuery25 } from "@tanstack/react-query";
 import { getDepositAddress } from "@unifold/core";
 function useGetDepositAddress(params) {
   const {
@@ -24990,7 +25510,7 @@ function useGetDepositAddress(params) {
     enabled = true
   } = params;
   const canFire = !!userId && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
-  return useQuery24({
+  return useQuery25({
     queryKey: [
       "unifold",
       "getDepositAddress",
@@ -25186,6 +25706,9 @@ function WithdrawForm({
     if (isDebouncing || isVerifyingAddress) return null;
     if (verifyError) return t10.invalidAddress;
     if (addressVerification && !addressVerification.valid) {
+      if (addressVerification.message && addressVerification.message.trim().length > 0) {
+        return addressVerification.message;
+      }
       if (addressVerification.failure_code === "account_not_found")
         return `Account not found on ${selectedChain?.chain_name}`;
       if (addressVerification.failure_code === "not_opted_in")
@@ -25283,7 +25806,7 @@ function WithdrawForm({
     tokenSymbol,
     isStablecoin
   ]);
-  const handleSwitchUnit = useCallback12(() => {
+  const handleSwitchUnit = useCallback13(() => {
     if (isMaxed && balanceData) {
       if (inputUnit === "crypto") {
         setAmount((Math.round(balanceUsdNum * 100) / 100).toFixed(2));
@@ -25310,7 +25833,7 @@ function WithdrawForm({
       setInputUnit("crypto");
     }
   }, [amount, inputUnit, exchangeRate, sourceDecimals, isMaxed, balanceData, balanceUsdNum]);
-  const handleMaxClick = useCallback12(() => {
+  const handleMaxClick = useCallback13(() => {
     if (inputUnit === "crypto") {
       if (balanceCrypto <= 0) return;
       setAmount(balanceData?.balanceHuman ?? "0");
@@ -25324,7 +25847,7 @@ function WithdrawForm({
   const isBelowMinimum = minimumWithdrawAmountUsd !== null && fiatAmountFromInput > 0 && Math.round(fiatAmountFromInput * 100) / 100 < minimumWithdrawAmountUsd;
   const isOverBalance = inputUnit === "crypto" ? cryptoAmountFromInput > 0 && balanceCrypto > 0 && cryptoAmountFromInput > balanceCrypto : fiatAmountFromInput > 0 && balanceUsdNum > 0 && Math.round(fiatAmountFromInput * 100) / 100 > Math.round(balanceUsdNum * 100) / 100;
   const isFormValid = trimmedAddress.length > 0 && amount.trim().length > 0 && cryptoAmountFromInput > 0 && isAddressValid && !isBelowMinimum && !isOverBalance && !isBalanceBelowMinimum && !!balanceData;
-  const handleWithdraw = useCallback12(async () => {
+  const handleWithdraw = useCallback13(async () => {
     if (!selectedToken || !selectedChain) return;
     if (!isFormValid) return;
     setIsSubmitting(true);
@@ -25521,7 +26044,7 @@ function WithdrawForm({
         )
       ] }),
       addressError && /* @__PURE__ */ jsxs60("div", { className: "uf-flex uf-items-center uf-gap-1.5 uf-mt-1.5", children: [
-        /* @__PURE__ */ jsx66(AlertTriangle5, { className: "uf-w-3 uf-h-3", style: { color: colors2.error } }),
+        /* @__PURE__ */ jsx66(AlertTriangle6, { className: "uf-w-3 uf-h-3", style: { color: colors2.error } }),
         /* @__PURE__ */ jsx66("span", { className: "uf-text-xs", style: { color: colors2.error, fontFamily: fonts.regular }, children: addressError })
       ] })
     ] }),
@@ -26110,7 +26633,7 @@ function WithdrawModal({
   theme = "dark",
   hideOverlay = false
 }) {
-  const onWithdrawSuccessFor = useCallback13(
+  const onWithdrawSuccessFor = useCallback14(
     (data) => {
       onWithdrawSuccess?.(data);
       if (data.execution) {
@@ -26121,7 +26644,7 @@ function WithdrawModal({
   );
   const { colors: colors2, fonts, components } = useTheme();
   const [containerEl, setContainerEl] = useState45(null);
-  const containerCallbackRef = useCallback13((el) => {
+  const containerCallbackRef = useCallback14((el) => {
     setContainerEl(el);
   }, []);
   const [resolvedTheme, setResolvedTheme] = useState45(
@@ -26194,7 +26717,7 @@ function WithdrawModal({
     refetchInterval: view === "tracker" || view === "detail" ? 5e3 : 15e3
   });
   const allWithdrawals = allWithdrawalsData?.data ?? [];
-  const handleDepositWalletCreation = useCallback13(
+  const handleDepositWalletCreation = useCallback14(
     async (params) => {
       const { data: wallets } = await createDepositAddress2(
         {
@@ -26217,12 +26740,12 @@ function WithdrawModal({
     },
     [externalUserId, publishableKey, sourceChainType]
   );
-  const handleWithdrawSubmitted = useCallback13((txInfo) => {
+  const handleWithdrawSubmitted = useCallback14((txInfo) => {
     setSubmittedTxInfo(txInfo);
     setView("confirming");
   }, []);
   const resetViewTimeoutRef = useRef16(null);
-  const handleClose = useCallback13(() => {
+  const handleClose = useCallback14(() => {
     onOpenChange(false);
     if (resetViewTimeoutRef.current) clearTimeout(resetViewTimeoutRef.current);
     resetViewTimeoutRef.current = setTimeout(() => {
@@ -26250,13 +26773,13 @@ function WithdrawModal({
     },
     []
   );
-  const handleTokenSymbolChange = useCallback13(
+  const handleTokenSymbolChange = useCallback14(
     (symbol) => {
       setSelectedTokenSymbol(symbol);
     },
     [setSelectedTokenSymbol]
   );
-  const handleChainKeyChange = useCallback13(
+  const handleChainKeyChange = useCallback14(
     (chainKey) => {
       setSelectedChainKey(chainKey);
     },
@@ -26363,7 +26886,7 @@ function WithdrawModal({
                   },
                   i
                 )) }) : isSourceSupported === false ? /* @__PURE__ */ jsxs63("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-8 uf-px-4 uf-text-center", children: [
-                  /* @__PURE__ */ jsx69("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx69(AlertTriangle6, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
+                  /* @__PURE__ */ jsx69("div", { className: "uf-w-16 uf-h-16 uf-rounded-full uf-bg-muted uf-flex uf-items-center uf-justify-center uf-mb-4", children: /* @__PURE__ */ jsx69(AlertTriangle7, { className: "uf-w-8 uf-h-8 uf-text-muted-foreground" }) }),
                   /* @__PURE__ */ jsx69(
                     "h3",
                     {
@@ -26732,6 +27255,7 @@ export {
   useDepositPolling,
   useDepositQuote,
   usePaymentIntent,
+  usePublicIncident,
   useSourceTokenValidation,
   useSupportedDepositTokens,
   useSupportedDestinationTokens,