@rhinestone/deposit-modal 0.3.0 → 0.4.0

package/dist/{chunk-KJ2RR2D4.mjs → chunk-3PVDRSJ7.mjs}

@@ -1,3 +1,13 @@
+import {
+  POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS,
+  POLYMARKET_ICON_URL,
+  POLYMARKET_POLYGON_CHAIN_ID,
+  POLYMARKET_PUSD_ADDRESS,
+  POLYMARKET_USDCE_ADDRESS,
+  executePolymarketSafeTransfer,
+  fetchPolymarketProxyWallet,
+  readPolymarketBalances
+} from "./chunk-FJWLC4AM.mjs";
 import {
   AlertTriangleIcon,
   ArrowUpRightIcon,
@@ -21,10 +31,10 @@ import {
   PlusCircleIcon,
   PoweredBy,
   ProcessingStep,
-  SAFE_ABI,
   Spinner,
   Tooltip,
   TransferCryptoIcon,
+  UnplugIcon,
   WalletIcon,
   accountFromPrivateKey,
   applyTheme,
@@ -35,6 +45,8 @@ import {
   debugError,
   debugLog,
   failureMessageForEvent,
+  formatReceiveEstimate,
+  formatTokenAmount,
   formatUserError,
   getAssetId,
   getEventSourceDetails,
@@ -50,7 +62,10 @@ import {
   tokenFormatter,
   txRefsMatch,
   useLatestRef
-} from "./chunk-KAWJABTW.mjs";
+} from "./chunk-GKC22JC4.mjs";
+import {
+  SAFE_ABI
+} from "./chunk-F7P4MV72.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -80,7 +95,7 @@ import {
   isVirtualDestination,
   parseEvmChainId,
   targetChainToCaip2
-} from "./chunk-6YRDD462.mjs";
+} from "./chunk-WJX3TJFK.mjs";
 
 // src/DepositModal.tsx
 import {
@@ -92,7 +107,7 @@ import {
   lazy as lazy2,
   Suspense as Suspense2
 } from "react";
-import { isAddress as isAddress2 } from "viem";
+import { isAddress } from "viem";
 
 // src/DepositFlow.tsx
 import {
@@ -863,25 +878,21 @@ function ConfirmStep({
   const targetChainIcon = getChainIcon(targetChain);
   const sourceTokenIcon = getTokenIcon(asset.symbol);
   const targetTokenIcon = getTokenIcon(targetSymbol);
-  const formattedSendAmount = amount && !Number.isNaN(Number(amount)) ? Number(amount).toLocaleString("en-US", {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 6
-  }) : "0";
-  const formattedReceiveAmount = (() => {
-    if (sameRoute) return formattedSendAmount;
-    const dollarValue = Number(targetAmount);
-    if (!Number.isFinite(dollarValue) || dollarValue <= 0)
-      return formattedSendAmount;
-    if (targetTokenPriceUsd !== null && targetTokenPriceUsd > 0) {
-      const tokenAmount = dollarValue / targetTokenPriceUsd;
-      return tokenAmount.toLocaleString("en-US", {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 6
-      });
-    }
-    return formattedSendAmount;
+  const formattedSendAmount = amount && Number.isFinite(Number(amount)) ? formatTokenAmount(Number(amount), asset.symbol) ?? "0" : "0";
+  const receiveDisplay = (() => {
+    if (sameRoute) return `${formattedSendAmount} ${asset.symbol}`;
+    const usdValue = Number(targetAmount);
+    const sourceAmountUsd = Number.isFinite(usdValue) && usdValue > 0 ? usdValue : void 0;
+    const estimate = formatReceiveEstimate({
+      sourceAmount: Number.isFinite(Number(amount)) ? Number(amount) : void 0,
+      sourceSymbol: asset.symbol,
+      targetSymbol,
+      sourceAmountUsd,
+      prices: targetTokenPriceUsd !== null && targetTokenPriceUsd > 0 ? { [targetSymbol.toUpperCase()]: targetTokenPriceUsd } : {}
+    });
+    if (estimate !== void 0) return estimate;
+    return sourceAmountUsd !== void 0 ? `~$${sourceAmountUsd.toFixed(2)}` : `${formattedSendAmount} ${asset.symbol}`;
   })();
-  const receiveAmount = sameRoute ? formattedReceiveAmount : `~${formattedReceiveAmount}`;
   const feeSponsored = uiConfig?.feeSponsored ?? false;
   const feeTooltip = uiConfig?.feeTooltip ?? (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.");
   const feeDisplay = quote ? `$${quote.fees.totalUsd.toFixed(2)}` : null;
@@ -1035,11 +1046,7 @@ function ConfirmStep({
         /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
           /* @__PURE__ */ jsx4("span", { children: "Receive" }),
           /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs4("span", { children: [
-              receiveAmount,
-              " ",
-              targetSymbol
-            ] }),
+            /* @__PURE__ */ jsx4("span", { children: receiveDisplay }),
             targetTokenIcon && /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
@@ -2041,12 +2048,28 @@ import { useCallback as useCallback3 } from "react";
 // src/components/steps/SwappedIframeStep.tsx
 import { useState as useState6, useEffect as useEffect6, useRef as useRef6, useMemo as useMemo4 } from "react";
 
-// src/components/steps/SwappedOrderTracker.tsx
+// src/components/steps/FinalisingDepositStep.tsx
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+function FinalisingDepositStep() {
+  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen rs-finalising", children: [
+    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-finalising-body", children: [
+      /* @__PURE__ */ jsx7("span", { className: "rs-finalising-spinner", children: /* @__PURE__ */ jsx7(Spinner, {}) }),
+      /* @__PURE__ */ jsxs7("div", { className: "rs-finalising-text", children: [
+        /* @__PURE__ */ jsx7("h2", { className: "rs-finalising-title", children: "Finalising deposit" }),
+        /* @__PURE__ */ jsx7("p", { className: "rs-finalising-subtitle", children: "We are depositing your funds to the application." })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx7(PoweredBy, {})
+  ] });
+}
+FinalisingDepositStep.displayName = "FinalisingDepositStep";
+
+// src/components/steps/SwappedOrderTracker.tsx
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var STEP_LABELS = [
   "Payment received",
   null,
-  "Processing App deposit",
+  "Processing deposit",
   "Deposit successful"
 ];
 function SwappedOrderTracker({
@@ -2065,23 +2088,23 @@ function SwappedOrderTracker({
     STEP_LABELS[2],
     STEP_LABELS[3]
   ];
-  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen rs-swapped-tracker", children: [
-    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx7(BodyHeader, { icon: /* @__PURE__ */ jsx7(HandCoinsIcon, {}), title }),
-      /* @__PURE__ */ jsx7("ol", { className: "rs-swapped-tracker-steps", children: labels.map((label, idx) => {
+  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen rs-swapped-tracker", children: [
+    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(HandCoinsIcon, {}), title }),
+      /* @__PURE__ */ jsx8("ol", { className: "rs-swapped-tracker-steps", children: labels.map((label, idx) => {
         const status = stepStates[idx];
-        return /* @__PURE__ */ jsxs7(
+        return /* @__PURE__ */ jsxs8(
           "li",
           {
             className: `rs-swapped-tracker-step rs-swapped-tracker-step--${status}`,
             children: [
-              /* @__PURE__ */ jsx7("span", { className: "rs-swapped-tracker-step-label", children: label }),
-              /* @__PURE__ */ jsx7(
+              /* @__PURE__ */ jsx8("span", { className: "rs-swapped-tracker-step-label", children: label }),
+              /* @__PURE__ */ jsx8(
                 "span",
                 {
                   className: "rs-swapped-tracker-step-marker",
                   "aria-hidden": "true",
-                  children: status === "complete" ? /* @__PURE__ */ jsx7(CheckIcon, {}) : status === "failed" ? /* @__PURE__ */ jsx7(CloseIcon, {}) : status === "active" ? /* @__PURE__ */ jsx7(Spinner, {}) : null
+                  children: status === "complete" ? /* @__PURE__ */ jsx8(CheckIcon, {}) : status === "failed" ? /* @__PURE__ */ jsx8(CloseIcon, {}) : status === "active" ? /* @__PURE__ */ jsx8(Spinner, {}) : null
                 }
               )
             ]
@@ -2089,13 +2112,13 @@ function SwappedOrderTracker({
           label
         );
       }) }),
-      terminal && /* @__PURE__ */ jsxs7(
+      terminal && /* @__PURE__ */ jsxs8(
         "div",
         {
           className: `rs-swapped-tracker-terminal rs-swapped-tracker-terminal--${terminal.kind}`,
           children: [
-            /* @__PURE__ */ jsx7("p", { className: "rs-swapped-tracker-terminal-message", children: terminal.message }),
-            terminal.kind === "cancelled" && onRetry && /* @__PURE__ */ jsx7(
+            /* @__PURE__ */ jsx8("p", { className: "rs-swapped-tracker-terminal-message", children: terminal.message }),
+            terminal.kind === "cancelled" && onRetry && /* @__PURE__ */ jsx8(
               "button",
               {
                 type: "button",
@@ -2108,7 +2131,7 @@ function SwappedOrderTracker({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx7(PoweredBy, {})
+    /* @__PURE__ */ jsx8(PoweredBy, {})
   ] });
 }
 function formatTrackerAmount(amount) {
@@ -2120,7 +2143,7 @@ function formatTrackerAmount(amount) {
 SwappedOrderTracker.displayName = "SwappedOrderTracker";
 
 // src/components/steps/SwappedIframeStep.tsx
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
 var STATUS_POLL_INTERVAL_MS = 2e3;
 var DEPOSIT_POLL_INTERVAL_MS = 2e3;
 var DEPOSIT_POLL_FAST_INITIAL_DELAY_MS = 1e3;
@@ -2377,7 +2400,11 @@ function SwappedIframeStep({
     );
   }, [latestEvent]);
   if (phase === "tracker") {
-    return /* @__PURE__ */ jsx8(
+    const paymentReceived = stepStates[0] === "complete";
+    if (variant === "connect" && !terminalState && paymentReceived) {
+      return /* @__PURE__ */ jsx9(FinalisingDepositStep, {});
+    }
+    return /* @__PURE__ */ jsx9(
       SwappedOrderTracker,
       {
         amount: orderState?.orderCryptoAmount ?? null,
@@ -2389,20 +2416,20 @@ function SwappedIframeStep({
       }
     );
   }
-  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen rs-fiat-onramp", "data-variant": variant, children: [
-    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen rs-fiat-onramp", "data-variant": variant, children: [
+    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx9(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx8(HandCoinsIcon, {}),
+          icon: /* @__PURE__ */ jsx9(HandCoinsIcon, {}),
           title: "Deposit",
           subtitle: "Add money to your balance"
         }
       ),
-      /* @__PURE__ */ jsxs8("div", { className: "rs-fiat-onramp-iframe-wrap", children: [
-        loadError && /* @__PURE__ */ jsxs8("div", { className: "rs-fiat-onramp-error", children: [
-          /* @__PURE__ */ jsx8("div", { children: loadError }),
-          /* @__PURE__ */ jsx8(
+      /* @__PURE__ */ jsxs9("div", { className: "rs-fiat-onramp-iframe-wrap", children: [
+        loadError && /* @__PURE__ */ jsxs9("div", { className: "rs-fiat-onramp-error", children: [
+          /* @__PURE__ */ jsx9("div", { children: loadError }),
+          /* @__PURE__ */ jsx9(
             "button",
             {
               type: "button",
@@ -2412,8 +2439,8 @@ function SwappedIframeStep({
             }
           )
         ] }),
-        !loadError && !iframeLoaded && /* @__PURE__ */ jsx8("div", { className: "rs-fiat-onramp-loading", children: /* @__PURE__ */ jsx8(Spinner, {}) }),
-        widgetUrl && !loadError && /* @__PURE__ */ jsx8(
+        !loadError && !iframeLoaded && /* @__PURE__ */ jsx9("div", { className: "rs-fiat-onramp-loading", children: /* @__PURE__ */ jsx9(Spinner, {}) }),
+        widgetUrl && !loadError && /* @__PURE__ */ jsx9(
           "iframe",
           {
             src: widgetUrl,
@@ -2427,7 +2454,7 @@ function SwappedIframeStep({
         )
       ] })
     ] }),
-    /* @__PURE__ */ jsx8(PoweredBy, {})
+    /* @__PURE__ */ jsx9(PoweredBy, {})
   ] });
 }
 function deriveStepStates(swappedStatus, latestEvent) {
@@ -2454,7 +2481,7 @@ function deriveStepStates(swappedStatus, latestEvent) {
 SwappedIframeStep.displayName = "SwappedIframeStep";
 
 // src/components/steps/FiatOnrampStep.tsx
-import { jsx as jsx9 } from "react/jsx-runtime";
+import { jsx as jsx10 } from "react/jsx-runtime";
 function fiatBannerForStatus(status, context) {
   if (context.currencyMismatch) {
     return {
@@ -2495,14 +2522,9 @@ function FiatOnrampStep({
       smartAccount,
       method: paymentMethod
     });
-    if (res.currencyCode !== "USDC_BASE") {
-      console.warn(
-        `[FiatOnrampStep] Expected backend to return currencyCode=USDC_BASE, got ${res.currencyCode}. Swapped purchases may not bridge as expected.`
-      );
-    }
     return res;
   }, [service, smartAccount, paymentMethod]);
-  return /* @__PURE__ */ jsx9(
+  return /* @__PURE__ */ jsx10(
     SwappedIframeStep,
     {
       smartAccount,
@@ -2524,7 +2546,7 @@ FiatOnrampStep.displayName = "FiatOnrampStep";
 
 // src/components/steps/ExchangeConnectStep.tsx
 import { useCallback as useCallback4 } from "react";
-import { jsx as jsx10 } from "react/jsx-runtime";
+import { jsx as jsx11 } from "react/jsx-runtime";
 function connectBannerForStatus(status, context) {
   if (context.currencyMismatch) {
     return {
@@ -2568,14 +2590,9 @@ function ExchangeConnectStep({
       smartAccount,
       connection
     });
-    if (res.currencyCode !== "USDC_BASE") {
-      console.warn(
-        `[ExchangeConnectStep] Expected backend to return currencyCode=USDC_BASE, got ${res.currencyCode}. Swapped Connect pulls may not bridge as expected.`
-      );
-    }
     return res;
   }, [service, smartAccount, connection]);
-  return /* @__PURE__ */ jsx10(
+  return /* @__PURE__ */ jsx11(
     SwappedIframeStep,
     {
       smartAccount,
@@ -2597,13 +2614,117 @@ ExchangeConnectStep.displayName = "ExchangeConnectStep";
 
 // src/components/steps/ExchangeSelectStep.tsx
 import { useCallback as useCallback5, useEffect as useEffect7, useState as useState7 } from "react";
-import { jsx as jsx11, jsxs as jsxs9 } from "react/jsx-runtime";
+
+// src/components/ui/ExchangeLogos.tsx
+import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
+var HTX_LOGO_DATA_URI = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXYAAACQCAMAAAAr6rB8AAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAACNUExURQAAAAAAPgAAPgAAPgAAQAAAPQAAPgAAPQAAPQAAPgAAOAAAPgAAPQAAPQAAPAAAOgAAPgAAPQAAPQAAQAAAQACK1QCM1QCNzwCL1gCL1gCM1QCM1gCL1gAAPgCL1wCK1ACL1QCL0wCM1gCM1QCM1ACL1AAAPQCM1gAAPgCM1gAAOgCM1gAAPgCM1v///6KyLqIAAAAsdFJOUwCAj88Qn6BQv+8g33CvQDCQT2AgUCBgEN+AkL/eb58wcECw71Cgvs/O7zGgm66ePgAAAAFiS0dELlTTEIcAAAAHdElNRQfoDAUMAwII1OX3AAAI7ElEQVR42u2dbWPaOBCEQ8Ml4UyAg5IQ0ru8kLS9Vv7/f+9CaArYs7sjg/GtrfmKjeXHYjVarcXZGa/ep4iDk46lXjjvN92GDqoXEvcG9IY9/NF0I7qnizfsodd0Kzqnd+zhsulmdE1X79gHfzbdjo5pgz1cNd2OjinbYA/DphvSLf2iHgbJRZ5Q/Q/s4brppnRJo9/Yw6jptnRIl1vsaVQ9nXohdfcGdL2D/bzpxnRHVyF19wY02MWeovuJNA4hdffT63Ife+rup9FkH3tIU9WT6LyAPSXeT6F+gXoYNN2iTuiyiD0NqqfQRQn7pOkmdUFZSFHm9BqHkKLM6TUB2CdNN6r9ygD2lA+rWyjGpBlT7bqA2P9qulktVz+D2CdNt6vlmkLqKR1Ws3BnT869XgmdPYRUl1enMgl7GlNrlNjZw7TpprVZYmdPVqZGyZ09vdtRn/pyZ08Osj71ZOopK1ObZgr1kDXdutYqS9gbkBZiEva6pIaYhL0m9bOEvQF9Cgn76dUzqCffXofGFvX07lgNmmUm9vSG6tFlDadrpUqZo+vcpp5KB44uy8QcPqKOpyUxv56+ddpseiSN1982Qp98pm5wfoOknmKamLUOW+XoVXuOYAa3n38e2Q3n9F7BPxugj5hB7XaRA90dTP3ApVQf2EGFeeB2d1ki6veHUz/QtTvBDss/iZT3DaL+Za6c8TfXrAMXsL1gx5bO2pxxDkOMFtmnXKsOzQx4wS5MG43h/x5R/+dw6uUBVfsBecZ+NkSf6uH9LjbEjAdco0qd/SF/bCn2/ff+mcbOEfX86XDq5c5+Y7gjx9hjXWS0dyQSMRuVI/uz5Ur9YscuMoylNkLv+OUI1IFnX5mzAb/YsYvMhOQI9I65HNh56pPSuS/ELMwv9hgXOY8NMUz6a/Ocy539mbCmfrELLhKmR6B3VKanTPpLutx27H5oJXbeRcZ6R3JyGmDJ6evvKyxI/+4MO3aRX5X+x01PZ3R7wFCya5m+tRM7dpHF8I69ozw9ZVaTfgn8svYG72UrsQsuspAkwN5RDgB8YEc7yew/Y2U65hg75SKf4qanbCYGlwsUnOritkHsiq4OOPdMCgiF8A5G1LvIb4RPF6WAigGNCTP+sAsuspAkKPlHZXrKLWyshWbE5SdMhBmH2AUXuY9kviqwUKanNHUU2MG0TF288osdu8hCeH9hQ4ywp0AgW/ma5xW6u0vslItckh2QHvxh8gdOEBbtxC64yP3/idn17trSBvzpAOEVlW8Iu52b8Ykdu8gCmIcVg4Hu7LAsB6c57ejuFDvlIh8/KGirp2xkhztu4jQnEd2dYhfW3wou8tkOMayNwVBeBepmd/eKHbvIQpLgV3jXuh7Z2eE8CU+GNzKmqm6xUy7yyfCOxjuQW+EChYWM/bGt2LGLLCRNlur0lB5Q8VbKS5m6FWX8YheQlZIE6sIDF2Nw85QQY0YZx9gpFzl/VL+CijE4sM8XKnb9up6xYxf5PeI1Cy7G4MD+qlJXTatv7IKLjPizcCr3iAP7jU49/7e92CkXGdmUknBxrxFi8lwfU3xjx9z4P5Nlah4rhZjcyMvwKX5LjWDHLvIrebb9zq8UYl5M6voik3PsnIuUdBlMCe8PmCEmz5/bjB27SLkeNfbmcYi5s6nrFTPusWMXmVEu8tq6J6Fhc4K6bmXcYz/7Ud1FmkYmqzqertVu7IKLZMK7WeSLx1Oqs+sOsgXYq7tIKzUgjKf3CftaP2B7vtsnWreEX3C35qddwS6kEe3wbtxRdfP4Lq3WvQXYh1KLzCRBpTt6Iqm3vLfPxBm+6SKNO8KjAxnZ245dGRetJIGeksG5qQeWeruxqzdguEjdyeABlfPsa1VutQPsn9U2DfQkge7bYYgiPXve7lmq9TKpHt7V5ACOMax7bHdOxpzeqy5yop2JA9Q3GnvsXkGDjND/AzvRaS6V04faidB+8jEmOt/uZ3WJqaTTkgRqvh2e8chjf2krdu6dI+V2+sppeEMsPsboL2R7xk7WL/bkb1CeG9zCNyLGtLZygH6tUU4SKA9ugo4nllA/pK7pOcY+Y7c6Ulyk8uTgb2TJY4/e4dMJdhggerD/int+K8EdYqfzMUaZjF/s0Dt+FYZZMUkg+36YGuCpt7TiFyYF1kufsIJDdJGy8UdPik+DWS+NOcWOkwLvPXSIPpHqUeUog4IMnWq3YoxX7DCb0hO/X04SiFFmAg7mEzJ6va9X7DA2fKzBYYsjuEix1Bo1ialKojq7T+w4KfA7fkdtfy3ZUDRLpbG38r1U063AzKJwW9Kgiv5inMZubjrgETv05rtfEeMi+1J3Z/d9qxDZXWKHU8v9sjkc3vFSk9TdwQ7tLHZ7ezx/2KkRcwgfDXSRUh5zUj6UdDLE5qf+sOOkQPEo6DDxZYSsO8DAZcLsbU0cYle941Yx4R1790H5t8HlfZmt8bxhp+f+EUkCIZcJnP6KoE7tr+wMu5IUKAq6SFyPOoTYJ+UDiQwkt+2pM+wRITsmSYBLtcvH2Uup5Ca/vrDjwC6kuSKSBPhHVD7UTEGuGt5auRbsRlKgKGzw4UOCr0pOysdZS9jUTrPOsPc577hVRJJgCI4EXsaYMDW+bX4d2OEGyFpVb4yL7FFH3q6OQt0TdiIpUBR8vWZAJwkACWURe8VTd4Qdj5DG/2cO4aPCYzBAUR5U5RnTiv2DCF/YYcCYVLiYuNRUZgFQSNGd/XsIZ9jJpECpofz8Cl2j3N2F6P6T2bXdH3a8+Ea8expVSTAkWKAp0+oxCrob7LO48pddxSw1la8DZlflDMF95P9HusFuLigp+o7OlSoJZoUrARjFreEXakm1Z+w4sJObJEVVErz51Mw6bq9cZhFhG51hx0kBekuwIXxoYj3qfodHNLZuZnUXN5R6wh6dFCgqrh717e52E51oAHmtHNQ/rjAqidl5qF8+bcZechx7LrjYmyJusj9F0l7iG23Bg8zM2e0mJfazIvQkUbOLTPlZve9H+Bz9pUmERhvyqLuv/wohbl6aFKHx9Dob4NexlzE5mKSt/gNCZI6GyUmWNAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyNC0xMi0wNVQxMjowMzowMiswMDowMLpM60QAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjQtMTItMDVUMTI6MDM6MDIrMDA6MDDLEVP4AAAAKHRFWHRkYXRlOnRpbWVzdGFtcAAyMDI0LTEyLTA1VDEyOjAzOjAyKzAwOjAwnARyJwAAAABJRU5ErkJggg==";
+function Tile({
+  bg,
+  children,
+  fg = "#fff"
+}) {
+  return /* @__PURE__ */ jsxs10("svg", { viewBox: "0 0 40 40", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx12("rect", { width: "40", height: "40", fill: bg }),
+    /* @__PURE__ */ jsx12("g", { color: fg, children })
+  ] });
+}
+function Icon({
+  children,
+  x = 8,
+  y = 8,
+  size = 24,
+  viewBox = "0 0 24 24"
+}) {
+  return /* @__PURE__ */ jsx12("svg", { x, y, width: size, height: size, viewBox, children });
+}
+var LOGOS = {
+  coinbase: () => /* @__PURE__ */ jsx12(Tile, { bg: "#0052FF", children: /* @__PURE__ */ jsx12(Icon, { x: 7, y: 7, size: 26, viewBox: "0 0 512 512", children: /* @__PURE__ */ jsx12(
+    "path",
+    {
+      fill: "#fff",
+      d: "M256.737 338.138c-45.081 0-81.512-36.531-81.512-81.513 0-44.98 36.53-81.512 81.512-81.512 40.356 0 73.863 29.387 80.306 67.925h82.113C412.212 159.313 342.175 93.5 256.637 93.5c-90.069 0-163.125 73.063-163.125 163.125 0 90.07 73.056 163.125 163.125 163.125 85.538 0 155.575-65.812 162.519-149.537h-82.213c-6.443 38.537-39.85 67.925-80.206 67.925z"
+    }
+  ) }) }),
+  binance: () => /* @__PURE__ */ jsx12(Tile, { bg: "#181A20", children: /* @__PURE__ */ jsx12(Icon, { children: /* @__PURE__ */ jsx12(
+    "path",
+    {
+      fill: "#F0B90B",
+      d: "m16.624 13.920 2.718 2.716-7.353 7.353-7.353-7.353 2.717-2.716 4.636 4.66zm4.637-4.636L24 12l-2.715 2.716L18.568 12zm-9.272.001 2.716 2.691-2.716 2.717L9.272 12zm-9.273-.001L5.409 12l-2.692 2.692L0 12zM11.989.012l7.353 7.329-2.718 2.715-4.635-4.636-4.636 4.66-2.717-2.716z"
+    }
+  ) }) }),
+  bitfinex: () => /* @__PURE__ */ jsx12(Tile, { bg: "#101914", children: /* @__PURE__ */ jsxs10(Icon, { x: 5, y: 8, size: 30, viewBox: "780 0 116 100", children: [
+    /* @__PURE__ */ jsx12(
+      "path",
+      {
+        fill: "#97C554",
+        d: "m792.54 88.414c4.795 5.078 31.135 29.418 72.478 1.17C894.913 66.302 894.166 15.827 891.294.584c-1 2.219-35.724 78.26-98.754 87.83Z"
+      }
+    ),
+    /* @__PURE__ */ jsx12(
+      "path",
+      {
+        fill: "#709B30",
+        d: "M891.29.572c-.366-.152-38.827-5.395-76.85 19.094-23.61 15.207-26.731 37.464-25.654 52.295 55.273-6.185 101.25-69.646 102.504-71.39Z"
+      }
+    )
+  ] }) }),
+  bybit: () => /* @__PURE__ */ jsx12(Tile, { bg: "#16171A", children: /* @__PURE__ */ jsx12(Icon, { x: 4, y: 4, size: 32, children: /* @__PURE__ */ jsxs10("g", { fill: "none", children: [
+    /* @__PURE__ */ jsx12("path", { fill: "#F6A500", d: "M15.829 13.626V9h.93v4.626z" }),
+    /* @__PURE__ */ jsx12(
+      "path",
+      {
+        fill: "#fff",
+        d: "M4.993 15H3v-4.626h1.913c.93 0 1.471.507 1.471 1.3 0 .513-.348.845-.588.955.287.13.655.423.655 1.04 0 .863-.609 1.33-1.458 1.33m-.154-3.82h-.91v1.065h.91c.395 0 .615-.214.615-.533 0-.317-.22-.532-.615-.532m.06 1.877h-.97v1.137h.97c.42 0 .622-.259.622-.571s-.201-.565-.622-.565zm4.388.046V15h-.923v-1.898l-1.431-2.728h1.01l.889 1.864.877-1.864h1.01zM13.355 15h-1.993v-4.626h1.913c.93 0 1.47.507 1.47 1.3 0 .513-.347.845-.588.955.287.13.655.423.655 1.04 0 .863-.608 1.33-1.457 1.33m-.155-3.82h-.91v1.065h.91c.395 0 .616-.214.616-.533 0-.317-.22-.532-.616-.532m.06 1.877h-.97v1.137h.97c.422 0 .622-.259.622-.571s-.2-.565-.622-.565zm6.495-1.876V15h-.929v-3.82h-1.245v-.806H21v.806z"
+      }
+    )
+  ] }) }) }),
+  btcturk: () => /* @__PURE__ */ jsx12(Tile, { bg: "#FFFFFF", fg: "#0D0D17", children: /* @__PURE__ */ jsx12(Icon, { x: 7, y: 7, size: 26, children: /* @__PURE__ */ jsx12(
+    "path",
+    {
+      fill: "currentColor",
+      d: "M14.126 18.743c-1.05.742-1.67 1.67-1.38 2.072s1.365.128 2.414-.612 1.667-1.668 1.379-2.072c-.089-.12-.256-.186-.474-.186-.48 0-1.218.29-1.94.798m-5.76-1.584c-2.028.842-3.433 2.088-3.141 2.796.291.709 2.17.607 4.2-.23 2.03-.836 3.428-2.084 3.137-2.797-.13-.317-.576-.47-1.21-.47-.787 0-1.865.24-2.987.701m9.293-.84c-.36.683-.47 1.33-.251 1.44.22.11.685-.345 1.043-1.028s.47-1.33.25-1.44a.15.15 0 0 0-.074-.017c-.24 0-.648.433-.968 1.045m-2.927-1.891c-.695.4-1.058 1.073-.812 1.5s1.008.448 1.703.047c.695-.4 1.057-1.073.811-1.5-.128-.222-.396-.335-.72-.335-.346.01-.684.11-.981.288m2.568-.91c-.202.348-.188.735.03.86.218.127.56-.053.76-.404.202-.35.19-.735-.03-.861a.3.3 0 0 0-.155-.041c-.204 0-.447.17-.6.445m-2.592-1.499c0 .418.384.758.858.758s.858-.34.858-.758c0-.417-.384-.757-.858-.757s-.858.339-.858.757m-5.728 0c0 .938 1.057 1.697 2.361 1.697s2.36-.755 2.36-1.697-1.055-1.698-2.36-1.698-2.361.761-2.361 1.698m8.369-2.4c-.218.12-.232.513-.03.862.201.35.541.531.76.404.22-.127.232-.51.03-.861-.158-.274-.401-.446-.6-.446a.3.3 0 0 0-.155.041m-3.413-1.545c-.24.427.12 1.099.811 1.5.691.4 1.457.38 1.703-.047s-.12-1.098-.811-1.5a2 2 0 0 0-.983-.287c-.325 0-.593.112-.72.334m3.456-1.833c-.218.12-.107.762.25 1.44.358.678.825 1.144 1.045 1.029.22-.116.105-.762-.252-1.44-.32-.612-.73-1.046-.969-1.046a.2.2 0 0 0-.074.017M5.225 4.05c-.292.708 1.115 1.96 3.14 2.797s3.902.94 4.197.233-1.115-1.962-3.14-2.798c-1.123-.464-2.196-.702-2.988-.702-.633 0-1.08.154-1.21.47m7.51-.864c-.284.403.337 1.33 1.386 2.071s2.13 1.016 2.413.612c.283-.403-.336-1.33-1.387-2.071C14.427 3.289 13.692 3 13.21 3c-.219 0-.385.06-.48.186"
+    }
+  ) }) }),
+  gate: () => /* @__PURE__ */ jsx12(Tile, { bg: "#FFFFFF", children: /* @__PURE__ */ jsx12(Icon, { x: 7, y: 7, size: 26, children: /* @__PURE__ */ jsxs10("g", { fill: "none", children: [
+    /* @__PURE__ */ jsx12("path", { fill: "#2354E6", d: "M12 16.95a4.95 4.95 0 1 1 0-9.9V3a9 9 0 1 0 9 9h-4.05A4.95 4.95 0 0 1 12 16.95" }),
+    /* @__PURE__ */ jsx12("path", { fill: "#17E6A1", d: "M16.95 7.05H12V12h4.95z" })
+  ] }) }) }),
+  gateio: () => LOGOS.gate(),
+  htx: () => /* @__PURE__ */ jsxs10("svg", { viewBox: "0 0 40 40", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": "true", children: [
+    /* @__PURE__ */ jsx12("rect", { width: "40", height: "40", fill: "#fff" }),
+    /* @__PURE__ */ jsx12("image", { href: HTX_LOGO_DATA_URI, x: "3", y: "12", width: "34", height: "13.1", preserveAspectRatio: "xMidYMid meet" })
+  ] }),
+  kraken: () => /* @__PURE__ */ jsx12(Tile, { bg: "#7133F5", children: /* @__PURE__ */ jsx12(Icon, { x: 6, y: 6, size: 28, children: /* @__PURE__ */ jsx12(
+    "path",
+    {
+      fill: "#fff",
+      d: "M11.998 4.5C7.028 4.5 3 8.774 3 14.047v4.09c0 .753.575 1.363 1.285 1.363s1.288-.61 1.288-1.362v-4.091c0-.755.573-1.365 1.285-1.365.71 0 1.284.61 1.284 1.365v4.09c0 .753.575 1.363 1.285 1.363.712 0 1.286-.61 1.286-1.362v-4.091c0-.755.575-1.365 1.285-1.365.712 0 1.289.61 1.289 1.365v4.09c0 .753.574 1.363 1.284 1.363s1.285-.61 1.285-1.362v-4.091c0-.755.574-1.365 1.288-1.365.71 0 1.285.61 1.285 1.365v4.09c0 .753.575 1.363 1.287 1.363.71 0 1.284-.61 1.284-1.362v-4.091C21 8.774 16.97 4.5 11.998 4.5"
+    }
+  ) }) }),
+  kucoin: () => /* @__PURE__ */ jsx12(Tile, { bg: "#01BC8D", children: /* @__PURE__ */ jsx12(Icon, { x: 7, y: 7, size: 26, children: /* @__PURE__ */ jsx12(
+    "path",
+    {
+      fill: "#fff",
+      d: "m7.928 11.996 7.122 7.122 4.49-4.49a2.004 2.004 0 0 1 2.865 0 2.004 2.004 0 0 1 0 2.865l-5.918 5.918a2.058 2.058 0 0 1-2.883 0l-8.541-8.542v5.07a2.034 2.034 0 1 1-4.07 0V4.043a2.034 2.034 0 1 1 4.07 0v5.088L13.604.589a2.058 2.058 0 0 1 2.883 0l5.918 5.918c.785.803.785 2.088 0 2.865-.804.785-2.089.785-2.865 0l-4.49-4.49zM15.05 9.96a2.038 2.038 0 0 0-2.053 2.035c0 1.133.902 2.052 2.035 2.052a2.038 2.038 0 0 0 2.053-2.035v-.018a2.07 2.07 0 0 0-2.035-2.034z"
+    }
+  ) }) })
+};
+function normalize(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]/g, "");
+}
+function getExchangeLogo(name, connection) {
+  const render = LOGOS[normalize(name)] ?? LOGOS[normalize(connection ?? "")];
+  return render ? render() : null;
+}
+
+// src/components/steps/ExchangeSelectStep.tsx
+import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
 function ExchangeLogo({ exchange }) {
   const [failed, setFailed] = useState7(false);
   if (!exchange.logoUrl || failed) {
-    return /* @__PURE__ */ jsx11(BankIcon, {});
+    return /* @__PURE__ */ jsx13(BankIcon, {});
   }
-  return /* @__PURE__ */ jsx11(
+  return /* @__PURE__ */ jsx13(
     "img",
     {
       src: exchange.logoUrl,
@@ -2644,20 +2765,20 @@ function ExchangeSelectStep({
       cancelled = true;
     };
   }, [service, retryToken, onError]);
-  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen rs-exchange-select", children: [
-    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx11(
+  return /* @__PURE__ */ jsxs11("div", { className: "rs-screen rs-exchange-select", children: [
+    /* @__PURE__ */ jsxs11("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx13(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx11(BankIcon, {}),
-          title: "Fund from Exchange",
-          subtitle: "Choose your exchange"
+          icon: /* @__PURE__ */ jsx13(UnplugIcon, {}),
+          title: "Connect exchange",
+          subtitle: "Select an exchange to connect"
         }
       ),
-      loading && /* @__PURE__ */ jsx11("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx11(Spinner, {}) }),
-      !loading && error && /* @__PURE__ */ jsxs9("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx11("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
-        /* @__PURE__ */ jsx11(
+      loading && /* @__PURE__ */ jsx13("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx13(Spinner, {}) }),
+      !loading && error && /* @__PURE__ */ jsxs11("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx13("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
+        /* @__PURE__ */ jsx13(
           "button",
           {
             type: "button",
@@ -2667,9 +2788,9 @@ function ExchangeSelectStep({
           }
         )
       ] }),
-      !loading && !error && exchanges.length === 0 && /* @__PURE__ */ jsxs9("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx11("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
-        /* @__PURE__ */ jsx11(
+      !loading && !error && exchanges.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx13("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
+        /* @__PURE__ */ jsx13(
           "button",
           {
             type: "button",
@@ -2679,28 +2800,37 @@ function ExchangeSelectStep({
           }
         )
       ] }),
-      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx11("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => /* @__PURE__ */ jsxs9(
-        "button",
-        {
-          type: "button",
-          className: "rs-exchange-card",
-          onClick: () => onSelectExchange(exchange.connection),
-          "aria-label": `Select ${exchange.name}`,
-          children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-exchange-card-logo", children: /* @__PURE__ */ jsx11(ExchangeLogo, { exchange }) }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-exchange-card-name", children: exchange.name })
-          ]
-        },
-        exchange.connection
-      )) })
+      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx13("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => {
+        const brand = getExchangeLogo(exchange.name, exchange.connection);
+        return /* @__PURE__ */ jsxs11(
+          "button",
+          {
+            type: "button",
+            className: "rs-exchange-card",
+            onClick: () => onSelectExchange(exchange.connection),
+            "aria-label": `Select ${exchange.name}`,
+            children: [
+              /* @__PURE__ */ jsx13(
+                "span",
+                {
+                  className: `rs-exchange-card-logo${brand ? " rs-exchange-card-logo--brand" : ""}`,
+                  children: brand ?? /* @__PURE__ */ jsx13(ExchangeLogo, { exchange })
+                }
+              ),
+              /* @__PURE__ */ jsx13("span", { className: "rs-exchange-card-name", children: exchange.name })
+            ]
+          },
+          exchange.connection
+        );
+      }) })
     ] }),
-    /* @__PURE__ */ jsx11(PoweredBy, {})
+    /* @__PURE__ */ jsx13(PoweredBy, {})
   ] });
 }
 ExchangeSelectStep.displayName = "ExchangeSelectStep";
 
 // src/components/steps/DepositAddressSkeleton.tsx
-import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 var BASE_CHAIN_ID = 8453;
 function DepositAddressSkeleton({
   uiConfig,
@@ -2721,15 +2851,15 @@ function DepositAddressSkeleton({
   const chainName = getChainName(defaultChainId);
   const chainIcon = getChainIcon(defaultChainId);
   const tokenIcon = getTokenIcon(defaultToken);
-  return /* @__PURE__ */ jsxs10("div", { className: "rs-screen", "aria-busy": "true", children: [
-    /* @__PURE__ */ jsx12("span", { className: "rs-sr-only", role: "status", children: "Preparing deposit details\u2026" }),
-    /* @__PURE__ */ jsxs10("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx12(BodyHeader, { icon: /* @__PURE__ */ jsx12(TransferCryptoIcon, {}), title: "Transfer crypto" }),
-      /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-selectors", "aria-hidden": "true", children: [
-        /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown", children: [
-          /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
-          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-trigger", children: [
-            chainIcon && /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsxs12("div", { className: "rs-screen", "aria-busy": "true", children: [
+    /* @__PURE__ */ jsx14("span", { className: "rs-sr-only", role: "status", children: "Preparing deposit details\u2026" }),
+    /* @__PURE__ */ jsxs12("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx14(BodyHeader, { icon: /* @__PURE__ */ jsx14(TransferCryptoIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-selectors", "aria-hidden": "true", children: [
+        /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown", children: [
+          /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
+          /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            chainIcon && /* @__PURE__ */ jsx14(
               "img",
               {
                 src: chainIcon,
@@ -2737,17 +2867,17 @@ function DepositAddressSkeleton({
                 className: "rs-deposit-address-dropdown-icon"
               }
             ),
-            /* @__PURE__ */ jsx12("span", { children: chainName }),
-            /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+            /* @__PURE__ */ jsx14("span", { children: chainName }),
+            /* @__PURE__ */ jsx14(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown", children: [
-          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
-            /* @__PURE__ */ jsx12("span", { children: "Supported token" }),
-            /* @__PURE__ */ jsxs10("span", { className: "rs-deposit-address-min", children: [
+        /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown", children: [
+          /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
+            /* @__PURE__ */ jsx14("span", { children: "Supported token" }),
+            /* @__PURE__ */ jsxs12("span", { className: "rs-deposit-address-min", children: [
               "Min.$",
               (uiConfig?.minDepositUsd ?? 0.1).toFixed(2),
-              /* @__PURE__ */ jsx12(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx12(
+              /* @__PURE__ */ jsx14(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx14(
                 InfoIcon,
                 {
                   className: "rs-deposit-address-min-icon",
@@ -2756,8 +2886,8 @@ function DepositAddressSkeleton({
               ) })
             ] })
           ] }),
-          /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-trigger", children: [
-            tokenIcon && /* @__PURE__ */ jsx12(
+          /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            tokenIcon && /* @__PURE__ */ jsx14(
               "img",
               {
                 src: tokenIcon,
@@ -2765,21 +2895,21 @@ function DepositAddressSkeleton({
                 className: "rs-deposit-address-dropdown-icon"
               }
             ),
-            /* @__PURE__ */ jsx12("span", { children: defaultToken }),
-            /* @__PURE__ */ jsx12(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+            /* @__PURE__ */ jsx14("span", { children: defaultToken }),
+            /* @__PURE__ */ jsx14(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
           ] })
         ] })
       ] }),
-      /* @__PURE__ */ jsxs10(
+      /* @__PURE__ */ jsxs12(
         "div",
         {
           style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
           children: [
-            /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-well", children: [
-              /* @__PURE__ */ jsx12("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx12("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) }),
-              /* @__PURE__ */ jsx12("div", { className: "rs-skeleton rs-skeleton-address", "aria-hidden": "true" })
+            /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-well", children: [
+              /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx14("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) }),
+              /* @__PURE__ */ jsx14("div", { className: "rs-skeleton rs-skeleton-address", "aria-hidden": "true" })
             ] }),
-            /* @__PURE__ */ jsxs10(
+            /* @__PURE__ */ jsxs12(
               "button",
               {
                 type: "button",
@@ -2787,7 +2917,7 @@ function DepositAddressSkeleton({
                 disabled: true,
                 "aria-hidden": "true",
                 children: [
-                  /* @__PURE__ */ jsx12(CopyIcon, {}),
+                  /* @__PURE__ */ jsx14(CopyIcon, {}),
                   "Copy address"
                 ]
               }
@@ -2795,20 +2925,20 @@ function DepositAddressSkeleton({
           ]
         }
       ),
-      /* @__PURE__ */ jsx12("div", { className: "rs-price-impact", "aria-hidden": "true", children: /* @__PURE__ */ jsxs10("div", { className: "rs-price-impact-header", children: [
-        /* @__PURE__ */ jsxs10("span", { className: "rs-price-impact-header-left", children: [
-          /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-label", children: "Price impact" }),
-          /* @__PURE__ */ jsx12("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx12("strong", { children: "0.00%" }) }),
-          /* @__PURE__ */ jsx12(
+      /* @__PURE__ */ jsx14("div", { className: "rs-price-impact", "aria-hidden": "true", children: /* @__PURE__ */ jsxs12("div", { className: "rs-price-impact-header", children: [
+        /* @__PURE__ */ jsxs12("span", { className: "rs-price-impact-header-left", children: [
+          /* @__PURE__ */ jsx14("span", { className: "rs-price-impact-label", children: "Price impact" }),
+          /* @__PURE__ */ jsx14("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx14("strong", { children: "0.00%" }) }),
+          /* @__PURE__ */ jsx14(
             Tooltip,
             {
               className: "rs-price-impact-info",
               content: "Price impact is the difference between expected and execution price, due to trade size and liquidity.",
-              children: /* @__PURE__ */ jsx12(InfoIcon, { "aria-hidden": "true" })
+              children: /* @__PURE__ */ jsx14(InfoIcon, { "aria-hidden": "true" })
             }
           )
         ] }),
-        /* @__PURE__ */ jsx12(
+        /* @__PURE__ */ jsx14(
           ChevronDownIcon,
           {
             className: "rs-price-impact-chevron",
@@ -2817,7 +2947,7 @@ function DepositAddressSkeleton({
         )
       ] }) })
     ] }),
-    /* @__PURE__ */ jsx12(PoweredBy, {})
+    /* @__PURE__ */ jsx14(PoweredBy, {})
   ] });
 }
 DepositAddressSkeleton.displayName = "DepositAddressSkeleton";
@@ -2825,7 +2955,7 @@ DepositAddressSkeleton.displayName = "DepositAddressSkeleton";
 // src/components/steps/SolanaTokenSelectStep.tsx
 import { useState as useState8, useEffect as useEffect8, useMemo as useMemo5 } from "react";
 import { formatUnits as formatUnits4 } from "viem";
-import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
   service,
@@ -2931,30 +3061,30 @@ function SolanaTokenSelectStep({
   };
   const chainIcon = getChainIcon("solana");
   const chainName = getChainName("solana");
-  return /* @__PURE__ */ jsxs11("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs11("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsxs13("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs13("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx15(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx13(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx15(WalletIcon, {}),
           title: "Your assets",
           subtitle: "Select source assets to transfer"
         }
       ),
-      loading && /* @__PURE__ */ jsxs11("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-        /* @__PURE__ */ jsx13(Spinner, { className: "rs-text-tertiary" }),
-        /* @__PURE__ */ jsx13("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+      loading && /* @__PURE__ */ jsxs13("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
+        /* @__PURE__ */ jsx15(Spinner, { className: "rs-text-tertiary" }),
+        /* @__PURE__ */ jsx15("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
-      error && /* @__PURE__ */ jsx13(Callout, { variant: "error", children: error }),
-      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-empty-state", children: [
-        /* @__PURE__ */ jsx13(WalletIcon, { className: "rs-empty-icon" }),
-        /* @__PURE__ */ jsx13("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
-        /* @__PURE__ */ jsxs11("div", { className: "rs-empty-address", children: [
+      error && /* @__PURE__ */ jsx15(Callout, { variant: "error", children: error }),
+      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs13("div", { className: "rs-empty-state", children: [
+        /* @__PURE__ */ jsx15(WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ jsx15("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+        /* @__PURE__ */ jsxs13("div", { className: "rs-empty-address", children: [
           solanaAddress.slice(0, 6),
           "...",
           solanaAddress.slice(-4)
         ] }),
-        onDisconnect && /* @__PURE__ */ jsx13(
+        onDisconnect && /* @__PURE__ */ jsx15(
           "button",
           {
             type: "button",
@@ -2964,11 +3094,11 @@ function SolanaTokenSelectStep({
           }
         )
       ] }),
-      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx13("div", { className: "rs-asset-list", children: rows.map((entry) => {
+      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx15("div", { className: "rs-asset-list", children: rows.map((entry) => {
         const isSelected = selectedSymbol === entry.token.symbol;
         const tokenAmount = formatBalance(entry);
         const tokenIcon = getTokenIcon(entry.token.symbol);
-        return /* @__PURE__ */ jsxs11(
+        return /* @__PURE__ */ jsxs13(
           "button",
           {
             type: "button",
@@ -2976,33 +3106,33 @@ function SolanaTokenSelectStep({
             className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
             "aria-pressed": isSelected,
             children: [
-              /* @__PURE__ */ jsxs11("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs11("div", { className: "rs-asset-icon-wrapper", children: [
-                  tokenIcon ? /* @__PURE__ */ jsx13("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx13("img", { src: tokenIcon, alt: entry.token.symbol }) }) : /* @__PURE__ */ jsx13("span", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
-                  chainIcon && /* @__PURE__ */ jsx13("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx13("img", { src: chainIcon, alt: chainName }) })
+              /* @__PURE__ */ jsxs13("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs13("div", { className: "rs-asset-icon-wrapper", children: [
+                  tokenIcon ? /* @__PURE__ */ jsx15("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx15("img", { src: tokenIcon, alt: entry.token.symbol }) }) : /* @__PURE__ */ jsx15("span", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
+                  chainIcon && /* @__PURE__ */ jsx15("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx15("img", { src: chainIcon, alt: chainName }) })
                 ] }),
-                /* @__PURE__ */ jsxs11("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs11("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx13("span", { className: "rs-asset-name", children: entry.token.symbol }),
-                    /* @__PURE__ */ jsxs11("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs13("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs13("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx15("span", { className: "rs-asset-name", children: entry.token.symbol }),
+                    /* @__PURE__ */ jsxs13("span", { className: "rs-asset-chain", children: [
                       "on ",
                       chainName
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs11("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs13("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     entry.token.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx13("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
+              /* @__PURE__ */ jsx15("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
             ]
           },
           entry.token.symbol
         );
       }) }),
-      /* @__PURE__ */ jsx13(
+      /* @__PURE__ */ jsx15(
         Button,
         {
           onClick: () => selectedEntry && onContinue(
@@ -3016,14 +3146,14 @@ function SolanaTokenSelectStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx13(PoweredBy, {})
+    /* @__PURE__ */ jsx15(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
 import { useCallback as useCallback6, useEffect as useEffect9, useMemo as useMemo6, useRef as useRef7, useState as useState9 } from "react";
 import { formatUnits as formatUnits5, parseUnits as parseUnits3 } from "viem";
-import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
   { value: 25, label: "25%" },
@@ -3224,12 +3354,12 @@ function SolanaAmountStep({
   const continueLabel = exceedsBalance ? "Insufficient balance" : isAboveMax ? "Continue with max allowed deposit" : isBelowMin ? "Continue with minimum deposit" : "Continue";
   const continueDisabled = exceedsBalance || numericAmount === 0 && !isBelowMin;
   const sourceTokenIcon = getTokenIcon(token.symbol);
-  return /* @__PURE__ */ jsxs12("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs12("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx14(BodyHeader, { icon: /* @__PURE__ */ jsx14(WalletIcon, {}), title: "Wallet deposit" }),
-      /* @__PURE__ */ jsxs12("div", { className: "rs-amount-section", children: [
-        /* @__PURE__ */ jsxs12("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsx14(
+  return /* @__PURE__ */ jsxs14("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs14("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx16(BodyHeader, { icon: /* @__PURE__ */ jsx16(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs14("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs14("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsx16(
             AnimatedAmountInput,
             {
               value: amount,
@@ -3238,25 +3368,25 @@ function SolanaAmountStep({
               autoFocus: true
             }
           ),
-          /* @__PURE__ */ jsxs12("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs12("span", { className: "rs-amount-meta-balance", children: [
+          /* @__PURE__ */ jsxs14("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs14("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               token.symbol,
               " available",
-              computedBalanceUsd !== null && /* @__PURE__ */ jsxs12(Fragment2, { children: [
+              computedBalanceUsd !== null && /* @__PURE__ */ jsxs14(Fragment2, { children: [
                 " (~",
                 currencyFormatter.format(computedBalanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs12("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs14("span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
               currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx14("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx14(
+        /* @__PURE__ */ jsx16("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx16(
           "button",
           {
             type: "button",
@@ -3267,36 +3397,36 @@ function SolanaAmountStep({
           preset.value
         )) })
       ] }),
-      /* @__PURE__ */ jsxs12("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx14("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs12("span", { children: [
+      /* @__PURE__ */ jsxs14("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs14("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx16("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs14("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs14("span", { children: [
               "Solana ",
               token.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx14("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx14("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx16("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx16("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx14("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs12("span", { children: [
+        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs14("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx16("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs14("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs14("span", { children: [
               targetChainName,
               " ",
               targetTokenSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx14("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx14("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx16("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx16("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        balanceAfterUsd !== null && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx14("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx14("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+        balanceAfterUsd !== null && /* @__PURE__ */ jsxs14("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx16("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx16("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      targetChain === HYPERCORE_CHAIN_ID && /* @__PURE__ */ jsx14(Callout, { variant: "warning", children: "First deposit to a new HyperCore account includes a ~1 USDC activation fee." }),
-      error && /* @__PURE__ */ jsx14(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx14(
+      targetChain === HYPERCORE_CHAIN_ID && /* @__PURE__ */ jsx16(Callout, { variant: "warning", children: "First deposit to a new HyperCore account includes a ~1 USDC activation fee." }),
+      error && /* @__PURE__ */ jsx16(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx16(
         Button,
         {
           onClick: handleContinue,
@@ -3306,7 +3436,7 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx14(PoweredBy, {})
+    /* @__PURE__ */ jsx16(PoweredBy, {})
   ] });
 }
 
@@ -3419,7 +3549,7 @@ async function sendSolanaTransaction(provider, _connection, transaction) {
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -3443,7 +3573,6 @@ function SolanaConfirmStep({
   const [isSubmitting, setIsSubmitting] = useState10(false);
   const [error, setError] = useState10(null);
   const targetSymbol = getTargetTokenSymbol(targetToken, targetChain);
-  const isSameToken = token.symbol.toUpperCase() === targetSymbol.toUpperCase();
   const sourceChainName = getChainName("solana");
   const targetChainName = getChainName(targetChain);
   const sourceChainIcon = getChainIcon("solana");
@@ -3452,25 +3581,20 @@ function SolanaConfirmStep({
   const targetTokenIcon = getTokenIcon(targetSymbol);
   const feeSponsored = uiConfig?.feeSponsored ?? false;
   const feeTooltip = uiConfig?.feeTooltip ?? (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.");
-  const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 6
-  }) : "0";
-  const formattedReceiveAmount = (() => {
-    if (isSameToken) return formattedAmount;
-    const dollarValue = Number(targetAmount);
-    if (!Number.isFinite(dollarValue) || dollarValue <= 0)
-      return formattedAmount;
-    if (targetTokenPriceUsd !== null && targetTokenPriceUsd > 0) {
-      const tokenAmount = dollarValue / targetTokenPriceUsd;
-      return tokenAmount.toLocaleString("en-US", {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 6
-      });
-    }
-    return formattedAmount;
+  const formattedAmount = sourceAmount && Number.isFinite(Number(sourceAmount)) ? formatTokenAmount(Number(sourceAmount), token.symbol) ?? "0" : "0";
+  const receiveDisplay = (() => {
+    const usdValue = Number(targetAmount);
+    const sourceAmountUsd = Number.isFinite(usdValue) && usdValue > 0 ? usdValue : void 0;
+    const estimate = formatReceiveEstimate({
+      sourceAmount: Number.isFinite(Number(sourceAmount)) ? Number(sourceAmount) : void 0,
+      sourceSymbol: token.symbol,
+      targetSymbol,
+      sourceAmountUsd,
+      prices: targetTokenPriceUsd !== null && targetTokenPriceUsd > 0 ? { [targetSymbol.toUpperCase()]: targetTokenPriceUsd } : {}
+    });
+    if (estimate !== void 0) return estimate;
+    return sourceAmountUsd !== void 0 ? `~$${sourceAmountUsd.toFixed(2)}` : `${formattedAmount} ${token.symbol}`;
   })();
-  const receiveAmount = isSameToken ? formattedReceiveAmount : `~${formattedReceiveAmount}`;
   const handleConfirm = async () => {
     if (!solanaProvider) {
       debugLog(debug, "solana-confirm", "submit:blocked", {
@@ -3560,66 +3684,62 @@ function SolanaConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs13("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs13("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx15(BodyHeader, { icon: /* @__PURE__ */ jsx15(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsxs13("div", { className: "rs-review-details", children: [
-        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx15("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx15("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: sourceChainIcon, alt: "" }) })
+  return /* @__PURE__ */ jsxs15("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs15("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx17(BodyHeader, { icon: /* @__PURE__ */ jsx17(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsxs15("div", { className: "rs-review-details", children: [
+        /* @__PURE__ */ jsxs15("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx17("span", { children: "Source chain" }),
+          /* @__PURE__ */ jsxs15("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx17("span", { children: sourceChainName }),
+            sourceChainIcon && /* @__PURE__ */ jsx17("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx17("img", { src: sourceChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx15("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx15("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: targetChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs15("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx17("span", { children: "Destination chain" }),
+          /* @__PURE__ */ jsxs15("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx17("span", { children: targetChainName }),
+            targetChainIcon && /* @__PURE__ */ jsx17("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx17("img", { src: targetChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx15("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-value", children: estimatedTime })
+        /* @__PURE__ */ jsxs15("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx17("span", { children: "Estimated time" }),
+          /* @__PURE__ */ jsx17("span", { className: "rs-review-detail-value", children: estimatedTime })
         ] }),
-        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx15("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs13("span", { children: [
+        /* @__PURE__ */ jsxs15("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx17("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs15("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs15("span", { children: [
               formattedAmount,
               " ",
               token.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx17("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx17("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx15("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs13("span", { children: [
-              receiveAmount,
-              " ",
-              targetSymbol
-            ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx15("img", { src: targetTokenIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs15("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx17("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs15("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx17("span", { children: receiveDisplay }),
+            targetTokenIcon && /* @__PURE__ */ jsx17("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx17("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs13("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx15("span", { children: "Fees" }),
-          /* @__PURE__ */ jsxs13("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx15(
+        /* @__PURE__ */ jsxs15("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx17("span", { children: "Fees" }),
+          /* @__PURE__ */ jsxs15("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx17(
               "span",
               {
                 style: feeSponsored ? { textDecoration: "line-through" } : void 0,
                 children: "$0.04"
               }
             ),
-            /* @__PURE__ */ jsx15(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx15("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx15(InfoIcon, {}) }) })
+            /* @__PURE__ */ jsx17(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx17("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx17(InfoIcon, {}) }) })
           ] })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsx15(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx15(
+      error && /* @__PURE__ */ jsx17(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx17(
         Button,
         {
           onClick: handleConfirm,
@@ -3631,28 +3751,28 @@ function SolanaConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx15(PoweredBy, {})
+    /* @__PURE__ */ jsx17(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/DappImportAssetSelectStep.tsx
-import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
 function DappImportAssetSelectStep({
   sourceLabel,
   assets,
   onSelect
 }) {
-  return /* @__PURE__ */ jsxs14("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs14("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx16(
+  return /* @__PURE__ */ jsxs16("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs16("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx18(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx16(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx18(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      /* @__PURE__ */ jsx16("div", { className: "rs-asset-list", children: assets.map((asset) => {
+      /* @__PURE__ */ jsx18("div", { className: "rs-asset-list", children: assets.map((asset) => {
         const tokenAmount = asset.balance ? tokenFormatter.format(
           Number(asset.balance) / 10 ** asset.decimals
         ) : "0";
@@ -3660,23 +3780,23 @@ function DappImportAssetSelectStep({
         const tokenIcon = asset.icon ?? getTokenIcon(asset.symbol);
         const chainIcon = getChainIcon(asset.chainId);
         const badge = getChainBadge(asset.chainId);
-        return /* @__PURE__ */ jsxs14(
+        return /* @__PURE__ */ jsxs16(
           "button",
           {
             type: "button",
             className: "rs-asset-row",
             onClick: () => onSelect(asset),
             children: [
-              /* @__PURE__ */ jsxs14("div", { className: "rs-asset-info", children: [
-                /* @__PURE__ */ jsxs14("div", { className: "rs-asset-icon-wrapper", children: [
-                  /* @__PURE__ */ jsx16("span", { className: "rs-asset-icon", children: tokenIcon ? /* @__PURE__ */ jsx16("img", { src: tokenIcon, alt: asset.symbol }) : asset.symbol.slice(0, 4) }),
-                  chainIcon ? /* @__PURE__ */ jsx16("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx16(
+              /* @__PURE__ */ jsxs16("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs16("div", { className: "rs-asset-icon-wrapper", children: [
+                  /* @__PURE__ */ jsx18("span", { className: "rs-asset-icon", children: tokenIcon ? /* @__PURE__ */ jsx18("img", { src: tokenIcon, alt: asset.symbol }) : asset.symbol.slice(0, 4) }),
+                  chainIcon ? /* @__PURE__ */ jsx18("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx18(
                     "img",
                     {
                       src: chainIcon,
                       alt: getChainName(asset.chainId)
                     }
-                  ) }) : /* @__PURE__ */ jsx16(
+                  ) }) : /* @__PURE__ */ jsx18(
                     "span",
                     {
                       className: "rs-asset-chain-badge",
@@ -3685,46 +3805,94 @@ function DappImportAssetSelectStep({
                     }
                   )
                 ] }),
-                /* @__PURE__ */ jsxs14("div", { className: "rs-asset-text", children: [
-                  /* @__PURE__ */ jsxs14("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx16("span", { className: "rs-asset-name", children: asset.symbol }),
-                    /* @__PURE__ */ jsxs14("span", { className: "rs-asset-chain", children: [
+                /* @__PURE__ */ jsxs16("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs16("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx18("span", { className: "rs-asset-name", children: asset.symbol }),
+                    /* @__PURE__ */ jsxs16("span", { className: "rs-asset-chain", children: [
                       "on ",
                       asset.sourceLabel
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsxs14("div", { className: "rs-asset-balance-small", children: [
+                  /* @__PURE__ */ jsxs16("div", { className: "rs-asset-balance-small", children: [
                     tokenAmount,
                     " ",
                     asset.symbol
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx16("div", { className: "rs-asset-balance", children: balanceUsd })
+              /* @__PURE__ */ jsx18("div", { className: "rs-asset-balance", children: balanceUsd })
             ]
           },
           asset.id
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx16(PoweredBy, {})
+    /* @__PURE__ */ jsx18(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
 
+// src/components/steps/DappImportAssetSelectSkeleton.tsx
+import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
+function DappImportAssetSelectSkeleton({
+  sourceLabel,
+  rowCount = 3,
+  error = false,
+  onRetry
+}) {
+  return /* @__PURE__ */ jsxs17("div", { className: "rs-screen", "aria-busy": error ? "false" : "true", children: [
+    /* @__PURE__ */ jsx19("span", { className: "rs-sr-only", role: "status", children: error ? "Couldn't load balances" : "Loading balances\u2026" }),
+    /* @__PURE__ */ jsxs17("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx19(
+        BodyHeader,
+        {
+          icon: /* @__PURE__ */ jsx19(WalletIcon, {}),
+          title: `Transfer from ${sourceLabel}`,
+          subtitle: "Pick the balance to import"
+        }
+      ),
+      error ? /* @__PURE__ */ jsx19("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsxs17("div", { className: "rs-loading-text", children: [
+        /* @__PURE__ */ jsx19("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t load your balances" }),
+        /* @__PURE__ */ jsx19("div", { className: "rs-loading-subtitle", children: "Check your connection and try again." })
+      ] }) }) : /* @__PURE__ */ jsx19("div", { className: "rs-asset-list", "aria-hidden": "true", children: Array.from({ length: rowCount }, (_, index) => /* @__PURE__ */ jsxs17(
+        "div",
+        {
+          className: "rs-asset-row rs-asset-row--skeleton",
+          children: [
+            /* @__PURE__ */ jsxs17("div", { className: "rs-asset-info", children: [
+              /* @__PURE__ */ jsxs17("div", { className: "rs-asset-icon-wrapper", children: [
+                /* @__PURE__ */ jsx19("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx19("span", { className: "rs-skeleton rs-skeleton-fill" }) }),
+                /* @__PURE__ */ jsx19("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx19("span", { className: "rs-skeleton rs-skeleton-fill" }) })
+              ] }),
+              /* @__PURE__ */ jsxs17("div", { className: "rs-asset-text", children: [
+                /* @__PURE__ */ jsx19("div", { className: "rs-asset-name-row", children: /* @__PURE__ */ jsx19("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--name" }) }),
+                /* @__PURE__ */ jsx19("div", { className: "rs-asset-balance-small", children: /* @__PURE__ */ jsx19("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--balance" }) })
+              ] })
+            ] }),
+            /* @__PURE__ */ jsx19("div", { className: "rs-asset-balance", children: /* @__PURE__ */ jsx19("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--usd" }) })
+          ]
+        },
+        index
+      )) })
+    ] }),
+    error && onRetry && /* @__PURE__ */ jsx19("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx19(
+      "button",
+      {
+        type: "button",
+        className: "rs-button rs-button--default rs-button--full-width",
+        onClick: onRetry,
+        children: /* @__PURE__ */ jsx19("span", { children: "Try again" })
+      }
+    ) }),
+    /* @__PURE__ */ jsx19(PoweredBy, {})
+  ] });
+}
+DappImportAssetSelectSkeleton.displayName = "DappImportAssetSelectSkeleton";
+
 // src/core/dapp-imports/polymarket/index.ts
 import { createElement } from "react";
 import { formatUnits as formatUnits6 } from "viem";
 
-// src/core/dapp-imports/polymarket/constants.ts
-var POLYMARKET_POLYGON_CHAIN_ID = 137;
-var POLYMARKET_PUSD_ADDRESS = "0xC011a7E12a19f7B1f670d46F03B03f3342E82DFB";
-var POLYMARKET_USDCE_ADDRESS = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174";
-var POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS = "0x2957922Eb93258b93368531d39fAcCA3B4dC5854";
-var SAFE_MULTI_SEND_CALL_ONLY_ADDRESS = "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D";
-var GAMMA_API_PUBLIC_PROFILE = "https://gamma-api.polymarket.com/public-profile";
-var POLYMARKET_ICON_URL = "data:image/svg+xml,%3Csvg width='512' height='512' viewBox='0 0 512 512' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='512' height='512' fill='%232E5CFF'/%3E%3Cpath d='M375.84 389.422C375.84 403.572 375.84 410.647 371.212 414.154C366.585 417.662 359.773 415.75 346.15 411.927L127.22 350.493C119.012 348.19 114.907 347.038 112.534 343.907C110.161 340.776 110.161 336.513 110.161 327.988V184.012C110.161 175.487 110.161 171.224 112.534 168.093C114.907 164.962 119.012 163.81 127.22 161.507L346.15 100.072C359.773 96.2495 366.585 94.338 371.212 97.8455C375.84 101.353 375.84 108.428 375.84 122.578V389.422ZM164.761 330.463L346.035 381.337V279.595L164.761 330.463ZM139.963 306.862L321.201 256L139.963 205.138V306.862ZM164.759 181.537L346.035 232.406V130.663L164.759 181.537Z' fill='white'/%3E%3C/svg%3E";
-
 // src/core/dapp-imports/polymarket/deposit-wallet.ts
 import {
   encodeFunctionData,
@@ -3891,204 +4059,12 @@ function buildPusdUnwrapCalls(recipient, amount) {
   ];
 }
 
-// src/core/dapp-imports/polymarket/gamma-api.ts
-import { getAddress, isAddress, zeroAddress } from "viem";
-async function fetchPolymarketProxyWallet(eoa, signal) {
-  const url = `${GAMMA_API_PUBLIC_PROFILE}?address=${eoa}`;
-  let response;
-  try {
-    response = await fetch(url, { signal });
-  } catch {
-    return null;
-  }
-  if (!response.ok) {
-    return null;
-  }
-  let payload;
-  try {
-    payload = await response.json();
-  } catch {
-    return null;
-  }
-  const raw = payload.proxyWallet;
-  if (!raw || !isAddress(raw)) {
-    return null;
-  }
-  const checksummed = getAddress(raw);
-  if (checksummed === zeroAddress) {
-    return null;
-  }
-  return checksummed;
-}
-
-// src/core/dapp-imports/polymarket/safe.ts
-import {
-  concat,
-  encodeFunctionData as encodeFunctionData2,
-  encodePacked,
-  erc20Abi as erc20Abi4,
-  pad,
-  parseAbi as parseAbi2,
-  parseEventLogs,
-  toHex,
-  zeroAddress as zeroAddress2
-} from "viem";
-var COLLATERAL_OFFRAMP_ABI2 = parseAbi2([
-  "function unwrap(address _asset, address _to, uint256 _amount)"
-]);
-var MULTI_SEND_ABI = parseAbi2(["function multiSend(bytes transactions)"]);
-async function readPolymarketBalances(params) {
-  const { publicClient, proxyWallet } = params;
-  try {
-    const results = await publicClient.multicall({
-      allowFailure: true,
-      contracts: [
-        {
-          address: POLYMARKET_PUSD_ADDRESS,
-          abi: erc20Abi4,
-          functionName: "balanceOf",
-          args: [proxyWallet]
-        },
-        {
-          address: POLYMARKET_USDCE_ADDRESS,
-          abi: erc20Abi4,
-          functionName: "balanceOf",
-          args: [proxyWallet]
-        }
-      ]
-    });
-    return {
-      pusd: results[0].status === "success" ? results[0].result : 0n,
-      usdce: results[1].status === "success" ? results[1].result : 0n
-    };
-  } catch {
-    return { pusd: 0n, usdce: 0n };
-  }
-}
-async function executePolymarketSafeTransfer(params) {
-  const {
-    walletClient,
-    publicClient,
-    safeAddress,
-    recipient,
-    amount,
-    tokenKind
-  } = params;
-  const account = walletClient.account;
-  const chain = walletClient.chain;
-  if (!account || !chain) {
-    throw new Error("Wallet not connected");
-  }
-  if (chain.id !== POLYMARKET_POLYGON_CHAIN_ID) {
-    throw new Error("Switch to Polygon to sign");
-  }
-  const isOwner = await publicClient.readContract({
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "isOwner",
-    args: [account.address]
-  });
-  if (!isOwner) {
-    throw new Error("Connected wallet is not a Polymarket Safe owner");
-  }
-  const safeTx = tokenKind === "pusd" ? buildPusdUnwrapSafeTx(recipient, amount) : buildUsdceTransferSafeTx(recipient, amount);
-  const signature = concat([
-    pad(account.address, { size: 32 }),
-    pad(toHex(0), { size: 32 }),
-    toHex(1, { size: 1 })
-  ]);
-  const txHash = await walletClient.writeContract({
-    account,
-    chain,
-    address: safeAddress,
-    abi: SAFE_ABI,
-    functionName: "execTransaction",
-    args: [
-      safeTx.to,
-      0n,
-      safeTx.data,
-      safeTx.operation,
-      0n,
-      0n,
-      0n,
-      zeroAddress2,
-      zeroAddress2,
-      signature
-    ]
-  });
-  const receipt = await publicClient.waitForTransactionReceipt({
-    hash: txHash
-  });
-  const parsed = parseEventLogs({
-    abi: SAFE_ABI,
-    logs: receipt.logs.filter(
-      (log) => log.address.toLowerCase() === safeAddress.toLowerCase()
-    ),
-    strict: false
-  });
-  if (parsed.some((log) => log.eventName === "ExecutionFailure")) {
-    throw new Error("Polymarket Safe transaction failed");
-  }
-  if (!parsed.some((log) => log.eventName === "ExecutionSuccess")) {
-    throw new Error("Polymarket Safe transaction status unavailable");
-  }
-  return {
-    txHash,
-    // The smart account always receives USDC.e — pUSD is unwrapped to USDC.e
-    // before it lands at `recipient`.
-    sourceToken: POLYMARKET_USDCE_ADDRESS,
-    sourceSymbol: tokenKind === "pusd" ? "pUSD" : "USDC.e"
-  };
-}
-function buildUsdceTransferSafeTx(recipient, amount) {
-  return {
-    to: POLYMARKET_USDCE_ADDRESS,
-    data: encodeFunctionData2({
-      abi: erc20Abi4,
-      functionName: "transfer",
-      args: [recipient, amount]
-    }),
-    operation: 0
-  };
-}
-function buildPusdUnwrapSafeTx(recipient, amount) {
-  const approveData = encodeFunctionData2({
-    abi: erc20Abi4,
-    functionName: "approve",
-    args: [POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, amount]
-  });
-  const unwrapData = encodeFunctionData2({
-    abi: COLLATERAL_OFFRAMP_ABI2,
-    functionName: "unwrap",
-    args: [POLYMARKET_USDCE_ADDRESS, recipient, amount]
-  });
-  return {
-    to: SAFE_MULTI_SEND_CALL_ONLY_ADDRESS,
-    data: encodeFunctionData2({
-      abi: MULTI_SEND_ABI,
-      functionName: "multiSend",
-      args: [
-        concat([
-          encodeMultiSendCall(POLYMARKET_PUSD_ADDRESS, approveData),
-          encodeMultiSendCall(POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, unwrapData)
-        ])
-      ]
-    }),
-    operation: 1
-  };
-}
-function encodeMultiSendCall(to, data) {
-  return encodePacked(
-    ["uint8", "address", "uint256", "uint256", "bytes"],
-    [0, to, 0n, BigInt((data.length - 2) / 2), data]
-  );
-}
-
 // src/core/dapp-imports/polymarket/index.ts
 var PROVIDER_ID = "polymarket";
 var polymarketProvider = {
   id: PROVIDER_ID,
   label: "Transfer from Polymarket",
+  sourceLabel: "Polymarket",
   icon: createElement("img", {
     src: POLYMARKET_ICON_URL,
     alt: "Polymarket",
@@ -4213,6 +4189,77 @@ function getEnabledProviders(config) {
   );
 }
 
+// src/store/selectors.ts
+var selectedWalletIdSelector = (state) => state.wallet.selectedWalletId;
+var IDLE_SETUP_ENTRY = {
+  owner: null,
+  requestKey: null,
+  cacheKey: null,
+  status: "idle",
+  smartAccount: null,
+  sessionOwnerAddress: null,
+  solanaDepositAddress: null,
+  message: null,
+  cacheable: true,
+  attemptNonce: 0
+};
+function readSetupForOwner(setup, owner) {
+  if (!owner) return IDLE_SETUP_ENTRY;
+  const entry = setup.byOwner[owner.toLowerCase()];
+  return entry ?? { ...IDLE_SETUP_ENTRY, owner };
+}
+
+// src/core/dapp-imports/status.ts
+function computeDappImportStatus(providerId, inputs) {
+  const { owner, availability, availabilityOwner, setup } = inputs;
+  if (!owner) return "needs-connect";
+  const entry = availabilityOwner?.toLowerCase() === owner.toLowerCase() ? availability[providerId] : void 0;
+  if (entry === "loading" || entry === void 0) return "loading";
+  if (entry === "error") {
+    return {
+      enabled: false,
+      reason: "Couldn't load balance \u2014 tap to retry",
+      retryable: true
+    };
+  }
+  if (entry === null) return { enabled: false, reason: "No balance" };
+  const setupEntry = readSetupForOwner(setup, owner);
+  if (setupEntry.status === "loading") return "loading";
+  if (setupEntry.status === "error") {
+    return {
+      enabled: false,
+      reason: "Couldn't prepare account \u2014 tap to retry",
+      retryable: true
+    };
+  }
+  return { enabled: true, balanceUsd: entry.totalUsd };
+}
+function resolveBootOutcome(params) {
+  const { status, setupStatus, timedOut, walletHydrating, signerAvailable } = params;
+  if (status === "needs-connect") {
+    return walletHydrating && !timedOut ? "wait" : "unavailable";
+  }
+  if (status === "loading") return timedOut ? "error" : "wait";
+  if (!status.enabled) {
+    return status.retryable ? "error" : "unavailable";
+  }
+  if (setupStatus === "ready") {
+    if (!signerAvailable) return timedOut ? "error" : "wait";
+    return "ready";
+  }
+  if (setupStatus === "error") return "error";
+  return timedOut ? "error" : "wait";
+}
+function bootRetryPlan(params) {
+  const { setupStatus, availabilityEntry } = params;
+  return {
+    restartSetup: setupStatus !== "ready",
+    // `null` is a delivered "no account" — only refetch when nothing
+    // usable came back ("error", still "loading", or never recorded).
+    refetchAvailability: availabilityEntry === "error" || availabilityEntry === "loading" || availabilityEntry === void 0
+  };
+}
+
 // src/core/dapp-imports/types.ts
 function isDappImportAsset(asset) {
   return typeof asset.source === "string" && typeof asset.sourceLabel === "string" && "providerMetadata" in asset;
@@ -4336,6 +4383,7 @@ function applyBack(state, hasWalletOptions) {
     case "fiat-onramp":
     case "exchange-select":
     case "solana-token-select":
+    case "dapp-import-resolving":
     case "dapp-import-asset-select":
       return {
         ...state,
@@ -4350,7 +4398,8 @@ function applyBack(state, hasWalletOptions) {
         dappImport: {
           ...state.dappImport,
           activeProviderId: null,
-          selectedAsset: null
+          selectedAsset: null,
+          bootError: false
         },
         exchange: { selectedConnection: null }
       };
@@ -4493,16 +4542,6 @@ function applyAction(state, action) {
         },
         exchange: { selectedConnection: action.connection }
       };
-    case "connect/auto-locked":
-      return {
-        ...state,
-        flow: {
-          ...state.flow,
-          mode: "wallet",
-          isConnectSelectionConfirmed: true,
-          step: "select-asset"
-        }
-      };
     case "connect/wallet-picker-requested":
       return {
         ...state,
@@ -4685,17 +4724,41 @@ function applyAction(state, action) {
           }
         }
       };
-    case "dapp-import/availability-cleared":
+    case "dapp-import/availability-failed":
+      if (!state.dappImport.availabilityOwner || ownerKey(state.dappImport.availabilityOwner) !== ownerKey(action.owner)) {
+        return state;
+      }
+      return {
+        ...state,
+        dappImport: {
+          ...state.dappImport,
+          availability: {
+            ...state.dappImport.availability,
+            [action.providerId]: "error"
+          }
+        }
+      };
+    case "dapp-import/availability-retry-requested":
+      return {
+        ...state,
+        dappImport: {
+          ...state.dappImport,
+          attemptNonce: state.dappImport.attemptNonce + 1
+        }
+      };
+    case "dapp-import/availability-cleared": {
+      const isBootResolving = state.flow.step === "dapp-import-resolving";
       return {
         ...state,
         dappImport: {
           ...state.dappImport,
           availabilityOwner: null,
           availability: {},
-          activeProviderId: null,
-          selectedAsset: null
+          activeProviderId: isBootResolving ? state.dappImport.activeProviderId : null,
+          selectedAsset: isBootResolving ? state.dappImport.selectedAsset : null
         }
       };
+    }
     case "dapp-import/provider-selected":
       return {
         ...state,
@@ -4724,6 +4787,57 @@ function applyAction(state, action) {
         },
         flow: { ...state.flow, step: "amount" }
       };
+    case "dapp-import/boot-requested":
+      return {
+        ...state,
+        flow: {
+          ...state.flow,
+          mode: "dapp-import",
+          isConnectSelectionConfirmed: true,
+          step: "dapp-import-resolving"
+        },
+        dappImport: {
+          ...state.dappImport,
+          activeProviderId: action.providerId,
+          selectedAsset: null,
+          bootError: false
+        }
+      };
+    case "dapp-import/boot-resolved": {
+      if (state.flow.step !== "dapp-import-resolving" || state.dappImport.activeProviderId !== action.providerId) {
+        return state;
+      }
+      switch (action.outcome) {
+        case "ready":
+          return {
+            ...state,
+            flow: { ...state.flow, step: "dapp-import-asset-select" },
+            dappImport: { ...state.dappImport, bootError: false }
+          };
+        case "unavailable":
+          return {
+            ...state,
+            flow: {
+              ...state.flow,
+              step: "connect",
+              mode: null,
+              isConnectSelectionConfirmed: false,
+              hasNavigatedBack: true
+            },
+            dappImport: {
+              ...state.dappImport,
+              activeProviderId: null,
+              selectedAsset: null,
+              bootError: false
+            }
+          };
+        case "error":
+          return {
+            ...state,
+            dappImport: { ...state.dappImport, bootError: true }
+          };
+      }
+    }
     case "back/requested":
       return applyBack(state, action.hasWalletOptions);
     case "flow/reset": {
@@ -4751,12 +4865,18 @@ function applyAction(state, action) {
           txHash: null,
           directTransfer: false
         },
-        // Preserve fetched availability for its recorded EOA — refetching on
-        // every modal close burns a request. Just clear active selection.
+        // Drop fetched availability wholesale. The fetch effect refetches
+        // unconditionally on remount (so keeping the map saves nothing),
+        // and a preserved terminal entry (null / "error") could be consumed
+        // by a fresh pre-routed boot before the refetch's loading update
+        // lands — routing a now-funded account home off stale data.
         dappImport: {
-          ...state.dappImport,
           activeProviderId: null,
-          selectedAsset: null
+          availabilityOwner: null,
+          availability: {},
+          selectedAsset: null,
+          bootError: false,
+          attemptNonce: 0
         },
         setup: { byOwner: preservedByOwner },
         fiat: { selectedMethod: null },
@@ -4830,7 +4950,9 @@ function createInitialState(overrides) {
       activeProviderId: null,
       availabilityOwner: null,
       availability: {},
-      selectedAsset: null
+      selectedAsset: null,
+      bootError: false,
+      attemptNonce: 0
     },
     setup: {
       byOwner: {}
@@ -4844,26 +4966,6 @@ function createInitialState(overrides) {
   };
 }
 
-// src/store/selectors.ts
-var selectedWalletIdSelector = (state) => state.wallet.selectedWalletId;
-var IDLE_SETUP_ENTRY = {
-  owner: null,
-  requestKey: null,
-  cacheKey: null,
-  status: "idle",
-  smartAccount: null,
-  sessionOwnerAddress: null,
-  solanaDepositAddress: null,
-  message: null,
-  cacheable: true,
-  attemptNonce: 0
-};
-function readSetupForOwner(setup, owner) {
-  if (!owner) return IDLE_SETUP_ENTRY;
-  const entry = setup.byOwner[owner.toLowerCase()];
-  return entry ?? { ...IDLE_SETUP_ENTRY, owner };
-}
-
 // src/store/index.ts
 function createDepositStore(overrides) {
   const store = createStore(() => createInitialState(overrides));
@@ -5142,34 +5244,55 @@ function mapError(error) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment3, jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx20, jsxs as jsxs18 } from "react/jsx-runtime";
 function AccountPreparingSkeleton({
   errorMessage,
   onRetry
 }) {
-  return /* @__PURE__ */ jsxs15("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx17("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx17("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx17("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs15(Fragment3, { children: [
-      /* @__PURE__ */ jsx17("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
-      /* @__PURE__ */ jsx17("div", { className: "rs-loading-subtitle", children: errorMessage })
-    ] }) : /* @__PURE__ */ jsx17("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
-    errorMessage && onRetry && /* @__PURE__ */ jsx17("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs18("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx20("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx20("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx20("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs18(Fragment3, { children: [
+      /* @__PURE__ */ jsx20("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx20("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx20("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx20("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx20(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx17("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx20("span", { children: "Try again" })
       }
     ) })
   ] });
 }
 var QR_AUTO_ADVANCE_HYDRATION_GRACE_MS = 1e3;
+var DAPP_IMPORT_RESOLVE_TIMEOUT_MS = 1e4;
 function isSameRoute2(sourceChain, sourceToken, targetChain, targetToken) {
   return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
 }
 var SWAPPED_SOURCE_CHAIN = 8453;
 var SWAPPED_SOURCE_TOKEN = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
 var SWAPPED_SOURCE_DECIMALS = 6;
+var DEFAULT_FIAT_ONRAMP_METHODS = [
+  {
+    method: "creditcard",
+    label: "Debit/Credit card",
+    sublabel: "Instant - $10,000 limit",
+    icon: "card"
+  },
+  {
+    method: "bank-transfer",
+    label: "Bank transfer",
+    sublabel: "Instant - $10,000 limit",
+    icon: "bank"
+  },
+  {
+    method: "apple-pay",
+    label: "Apple pay",
+    sublabel: "Instant - $10,000 limit",
+    icon: "apple"
+  }
+];
 function getAddressKey(address) {
   return address ? address.toLowerCase() : null;
 }
@@ -5252,6 +5375,8 @@ function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
         balanceUsd: d.balanceUsd,
         inputAmountUsd: d.inputAmountUsd ?? void 0
       };
+    case "dapp-import-resolving":
+      return { type: "dapp-import-resolving" };
     case "dapp-import-asset-select":
       if (!smartAccount) return { type: "setup" };
       return { type: "dapp-import-asset-select", smartAccount };
@@ -5326,6 +5451,7 @@ function DepositFlow({
   forceRegister = false,
   enableSolana = true,
   dappImports,
+  initialDappImport,
   enableFiatOnramp = false,
   enableQrTransfer = true,
   fiatOnrampMethods,
@@ -5466,6 +5592,9 @@ function DepositFlow({
   const isWalletHydrationPending = Boolean(
     dappAddress && !hasWalletOptions && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady)
   );
+  const isDappImportWalletHydrating = Boolean(
+    hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady
+  );
   const showConnectStep = flowMode === null && !isConnectSelectionConfirmed;
   useEffect10(() => {
     if (!isWalletHydrationPending) {
@@ -5730,7 +5859,10 @@ function DepositFlow({
       portfolioAssetsRef.current = [];
     }
   }, [storeApi, hasWalletOptions, reownWallet]);
-  const canGoBackFromHere = effectiveStep.type === "deposit-address" || effectiveStep.type === "solana-token-select" || effectiveStep.type === "solana-amount" || effectiveStep.type === "solana-confirm" || effectiveStep.type === "amount" || effectiveStep.type === "confirm" || effectiveStep.type === "dapp-import-asset-select" || effectiveStep.type === "fiat-onramp" || effectiveStep.type === "exchange-select" || effectiveStep.type === "exchange-connect" || effectiveStep.type === "select-asset" && signerContext && !canAutoLock;
+  const canGoBackFromHere = effectiveStep.type === "deposit-address" || effectiveStep.type === "solana-token-select" || effectiveStep.type === "solana-amount" || effectiveStep.type === "solana-confirm" || effectiveStep.type === "amount" || effectiveStep.type === "confirm" || // Escape hatch from a slow or stuck pre-routed resolve. Mode-gated so
+  // the chevron doesn't linger if a disconnect cleared the mode out from
+  // under the step.
+  effectiveStep.type === "dapp-import-resolving" && flowMode === "dapp-import" || effectiveStep.type === "dapp-import-asset-select" || effectiveStep.type === "fiat-onramp" || effectiveStep.type === "exchange-select" || effectiveStep.type === "exchange-connect" || effectiveStep.type === "select-asset" && signerContext && !canAutoLock;
   const currentBackHandler = canGoBackFromHere ? handleBack : void 0;
   const currentScreen = showConnectStep ? "connect" : effectiveStep.type;
   useEffect10(() => {
@@ -5868,6 +6000,10 @@ function DepositFlow({
     // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: keyed on dappImportsKey, not the dappImports object identity
     [dappImportsKey, isSolanaWalletConnected]
   );
+  const initialDappImportProvider = useMemo7(
+    () => initialDappImport ? enabledDappImportProviders.find((p) => p.id === initialDappImport) ?? null : null,
+    [initialDappImport, enabledDappImportProviders]
+  );
   const handleSelectDappImport = useCallback7(
     (providerId) => {
       const owner = dappImportOwner;
@@ -5895,6 +6031,9 @@ function DepositFlow({
     },
     [storeApi]
   );
+  const dappImportAttemptNonce = useDepositStore(
+    (s) => s.dappImport.attemptNonce
+  );
   useEffect10(() => {
     if (!dappImportOwner || enabledDappImportProviders.length === 0) {
       storeApi.dispatch({ type: "dapp-import/availability-cleared" });
@@ -5928,15 +6067,29 @@ function DepositFlow({
       }).catch(() => {
         if (controller.signal.aborted) return;
         storeApi.dispatch({
-          type: "dapp-import/availability-loaded",
+          type: "dapp-import/availability-failed",
           providerId: provider.id,
-          owner: dappImportOwner,
-          availability: null
+          owner: dappImportOwner
         });
       });
     }
     return () => controller.abort();
-  }, [dappImportOwner, enabledDappImportProviders, storeApi]);
+  }, [
+    dappImportOwner,
+    enabledDappImportProviders,
+    dappImportAttemptNonce,
+    storeApi
+  ]);
+  useLayoutEffect2(() => {
+    if (!initialDappImportProvider) return;
+    if (flowSlice.step !== "connect" || flowSlice.mode !== null || flowSlice.isConnectSelectionConfirmed || flowSlice.hasNavigatedBack) {
+      return;
+    }
+    storeApi.dispatch({
+      type: "dapp-import/boot-requested",
+      providerId: initialDappImportProvider.id
+    });
+  }, [initialDappImportProvider, flowSlice, storeApi]);
   const dappImportAvailability = useDepositStore((s) => s.dappImport.availability);
   const dappImportAvailabilityOwner = useDepositStore(
     (s) => s.dappImport.availabilityOwner
@@ -5944,48 +6097,19 @@ function DepositFlow({
   const activeDappImportProviderId = useDepositStore(
     (s) => s.dappImport.activeProviderId
   );
+  const dappImportBootError = useDepositStore((s) => s.dappImport.bootError);
   const connectStepDappImports = useMemo7(
-    () => enabledDappImportProviders.map((provider) => {
-      const baseRow = {
-        id: provider.id,
-        label: provider.label,
-        icon: provider.icon
-      };
-      if (!dappImportOwner) {
-        return { ...baseRow, status: "needs-connect" };
-      }
-      const availabilityEntry = dappImportAvailabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? dappImportAvailability[provider.id] : void 0;
-      const dappImportSetup = readSetupForOwner(setupSlice, dappImportOwner);
-      if (availabilityEntry === "loading" || availabilityEntry === void 0) {
-        return { ...baseRow, status: "loading" };
-      }
-      if (availabilityEntry === null) {
-        return {
-          ...baseRow,
-          status: { enabled: false, reason: "No balance" }
-        };
-      }
-      if (dappImportSetup.status === "loading" || !dappImportOwner) {
-        return { ...baseRow, status: "loading" };
-      }
-      if (dappImportSetup.status === "error") {
-        return {
-          ...baseRow,
-          status: {
-            enabled: false,
-            reason: "Couldn't prepare account \u2014 tap to retry",
-            retryable: true
-          }
-        };
-      }
-      return {
-        ...baseRow,
-        status: {
-          enabled: true,
-          balanceUsd: availabilityEntry.totalUsd
-        }
-      };
-    }),
+    () => enabledDappImportProviders.map((provider) => ({
+      id: provider.id,
+      label: provider.label,
+      icon: provider.icon,
+      status: computeDappImportStatus(provider.id, {
+        owner: dappImportOwner,
+        availability: dappImportAvailability,
+        availabilityOwner: dappImportAvailabilityOwner,
+        setup: setupSlice
+      })
+    })),
     [
       enabledDappImportProviders,
       dappImportAvailability,
@@ -6006,7 +6130,7 @@ function DepositFlow({
       return null;
     }
     const entry = dappImportAvailability[activeDappImportProviderId];
-    if (!entry || entry === "loading") return null;
+    if (!entry || entry === "loading" || entry === "error") return null;
     return entry;
   }, [
     activeDappImportProviderId,
@@ -6014,6 +6138,96 @@ function DepositFlow({
     dappImportAvailabilityOwner,
     dappImportOwner
   ]);
+  const isBootResolving = isDappImportMode && flowSlice.step === "dapp-import-resolving";
+  const [hasResolveDeadlinePassed, setHasResolveDeadlinePassed] = useState11(false);
+  useEffect10(() => {
+    setHasResolveDeadlinePassed(false);
+    if (!isBootResolving || dappImportBootError) return;
+    const timeout = window.setTimeout(() => {
+      setHasResolveDeadlinePassed(true);
+    }, DAPP_IMPORT_RESOLVE_TIMEOUT_MS);
+    return () => window.clearTimeout(timeout);
+  }, [isBootResolving, dappImportBootError]);
+  useEffect10(() => {
+    if (!isBootResolving || dappImportBootError) return;
+    const providerId = activeDappImportProviderId;
+    if (!providerId) return;
+    if (!enabledDappImportProviders.some((p) => p.id === providerId)) {
+      storeApi.dispatch({
+        type: "dapp-import/boot-resolved",
+        providerId,
+        outcome: "unavailable"
+      });
+      return;
+    }
+    const status = computeDappImportStatus(providerId, {
+      owner: dappImportOwner,
+      availability: dappImportAvailability,
+      availabilityOwner: dappImportAvailabilityOwner,
+      setup: setupSlice
+    });
+    const pinnableWallet = dappImportOwner ? walletOptions.find(
+      (o) => (o.address ?? null)?.toLowerCase() === dappImportOwner.toLowerCase()
+    ) ?? null : null;
+    const outcome = resolveBootOutcome({
+      status,
+      setupStatus: readSetupForOwner(setupSlice, dappImportOwner).status,
+      timedOut: hasResolveDeadlinePassed,
+      walletHydrating: isDappImportWalletHydrating,
+      signerAvailable: pinnableWallet !== null
+    });
+    if (outcome === "wait") return;
+    if (outcome === "ready" && pinnableWallet) {
+      storeApi.dispatch({
+        type: "wallet/id-selected",
+        walletId: pinnableWallet.id
+      });
+    }
+    storeApi.dispatch({
+      type: "dapp-import/boot-resolved",
+      providerId,
+      outcome
+    });
+  }, [
+    isBootResolving,
+    dappImportBootError,
+    activeDappImportProviderId,
+    enabledDappImportProviders,
+    dappImportOwner,
+    dappImportAvailability,
+    dappImportAvailabilityOwner,
+    setupSlice,
+    hasResolveDeadlinePassed,
+    isDappImportWalletHydrating,
+    walletOptions,
+    storeApi
+  ]);
+  const handleBootRetry = useCallback7(() => {
+    const snapshot = storeApi.getState();
+    const providerId = snapshot.dappImport.activeProviderId;
+    if (!providerId) return;
+    if (dappImportOwner) {
+      const plan = bootRetryPlan({
+        setupStatus: readSetupForOwner(snapshot.setup, dappImportOwner).status,
+        availabilityEntry: snapshot.dappImport.availabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? snapshot.dappImport.availability[providerId] : void 0
+      });
+      if (plan.restartSetup) {
+        storeApi.dispatch({
+          type: "setup/retry-requested",
+          owner: dappImportOwner
+        });
+      }
+      if (plan.refetchAvailability) {
+        storeApi.dispatch({
+          type: "dapp-import/availability-retry-requested"
+        });
+      }
+    }
+    storeApi.dispatch({
+      type: "dapp-import/boot-requested",
+      providerId
+    });
+  }, [storeApi, dappImportOwner]);
   const handleSelectFiatMethod = useCallback7(
     (paymentMethod) => {
       storeApi.dispatch({
@@ -6414,10 +6628,17 @@ function DepositFlow({
     }
   }, [walletOptionsKey]);
   useEffect10(() => {
-    if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && !signerContext) {
+    if (!showConnectStep && isConnectSelectionConfirmed && (flowMode === "wallet" || flowMode === "dapp-import") && flowSlice.step !== "dapp-import-resolving" && !signerContext) {
       storeApi.dispatch({ type: "wallet/cleared" });
     }
-  }, [showConnectStep, isConnectSelectionConfirmed, flowMode, signerContext, storeApi]);
+  }, [
+    showConnectStep,
+    isConnectSelectionConfirmed,
+    flowMode,
+    flowSlice.step,
+    signerContext,
+    storeApi
+  ]);
   useEffect10(() => {
     if (enableSolana || flowMode !== "solana-wallet") {
       return;
@@ -6428,7 +6649,7 @@ function DepositFlow({
     }
   }, [enableSolana, flowMode, storeApi]);
   useEffect10(() => {
-    if (hasNavigatedBack || isConnectSelectionConfirmed || flowMode || enableFiatOnramp || enableExchangeConnect) {
+    if (hasNavigatedBack || isConnectSelectionConfirmed || flowMode || enableFiatOnramp || enableExchangeConnect || initialDappImportProvider) {
       return;
     }
     if (enableQrTransfer && !hasWalletOptions && dappAddress && !hasReownSession && !dappWalletClient && hasQrAutoAdvanceGraceElapsed) {
@@ -6444,6 +6665,7 @@ function DepositFlow({
     hasNavigatedBack,
     dappAddress,
     dappWalletClient,
+    initialDappImportProvider,
     handleSelectTransferCrypto
   ]);
   const walletRows = useMemo7(() => {
@@ -6474,7 +6696,7 @@ function DepositFlow({
     [storeApi]
   );
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx17("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsx20("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx20(
       ConnectStep,
       {
         walletRows,
@@ -6487,8 +6709,7 @@ function DepositFlow({
           }
           handleSelectTransferCrypto();
         } : void 0,
-        onSelectPayWithCard: enableFiatOnramp && dappAddress && (!fiatOnrampMethods || fiatOnrampMethods.length === 0) ? () => handleSelectFiatMethod() : void 0,
-        fiatPaymentMethods: enableFiatOnramp && dappAddress ? fiatOnrampMethods : void 0,
+        fiatPaymentMethods: enableFiatOnramp && dappAddress ? fiatOnrampMethods && fiatOnrampMethods.length > 0 ? fiatOnrampMethods : DEFAULT_FIAT_ONRAMP_METHODS : void 0,
         onSelectFiatMethod: enableFiatOnramp && dappAddress ? (method) => handleSelectFiatMethod(method) : void 0,
         onSelectFundFromExchange: enableExchangeConnect && dappAddress ? () => handleSelectExchange() : void 0,
         onRequestConnect,
@@ -6508,6 +6729,13 @@ function DepositFlow({
         },
         dappImports: connectStepDappImports,
         onSelectDappImport: (providerId) => {
+          const availabilityEntry = dappImportOwner && dappImportAvailabilityOwner?.toLowerCase() === dappImportOwner.toLowerCase() ? dappImportAvailability[providerId] : void 0;
+          if (availabilityEntry === "error") {
+            storeApi.dispatch({
+              type: "dapp-import/availability-retry-requested"
+            });
+            return;
+          }
           const dappImportEntry = readSetupForOwner(
             setupSlice,
             dappImportOwner
@@ -6524,21 +6752,21 @@ function DepositFlow({
   }
   if (isDepositAddressMode) {
     if (!dappAddress) return null;
-    return /* @__PURE__ */ jsxs15("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsxs18("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx20(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.message ?? void 0,
           onRetry: () => handleRetrySetup(dappAddress)
         }
-      ) : /* @__PURE__ */ jsx17(
+      ) : /* @__PURE__ */ jsx20(
         DepositAddressSkeleton,
         {
           uiConfig,
           allowedRoutes
         }
       )),
-      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx17(
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx20(
         DepositAddressStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -6571,21 +6799,21 @@ function DepositFlow({
   }
   if (isFiatOnrampMode) {
     if (!dappAddress) return null;
-    return /* @__PURE__ */ jsxs15(
+    return /* @__PURE__ */ jsxs18(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "fiat-onramp",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx17(
+          step.type === "setup" && /* @__PURE__ */ jsx20(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
             }
           ),
-          step.type === "fiat-onramp" && /* @__PURE__ */ jsx17(
+          step.type === "fiat-onramp" && /* @__PURE__ */ jsx20(
             FiatOnrampStep,
             {
               smartAccount: step.smartAccount,
@@ -6598,7 +6826,7 @@ function DepositFlow({
               onError: handleError
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx17(
+          step.type === "processing" && /* @__PURE__ */ jsx20(
             ProcessingStep,
             {
               smartAccount: step.smartAccount,
@@ -6630,21 +6858,21 @@ function DepositFlow({
   }
   if (isExchangeConnectMode) {
     if (!dappAddress) return null;
-    return /* @__PURE__ */ jsxs15(
+    return /* @__PURE__ */ jsxs18(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "exchange-connect",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx17(
+          step.type === "setup" && /* @__PURE__ */ jsx20(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
             }
           ),
-          step.type === "exchange-select" && /* @__PURE__ */ jsx17(
+          step.type === "exchange-select" && /* @__PURE__ */ jsx20(
             ExchangeSelectStep,
             {
               service,
@@ -6652,7 +6880,7 @@ function DepositFlow({
               onError: handleError
             }
           ),
-          step.type === "exchange-connect" && /* @__PURE__ */ jsx17(
+          step.type === "exchange-connect" && /* @__PURE__ */ jsx20(
             ExchangeConnectStep,
             {
               smartAccount: step.smartAccount,
@@ -6665,7 +6893,7 @@ function DepositFlow({
               onError: handleError
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx17(
+          step.type === "processing" && /* @__PURE__ */ jsx20(
             ProcessingStep,
             {
               smartAccount: step.smartAccount,
@@ -6699,15 +6927,15 @@ function DepositFlow({
     if (!dappAddress) return null;
     const solanaAddr = reownWallet?.solanaAddress;
     const solanaProvider = reownWallet?.solanaProvider;
-    return /* @__PURE__ */ jsxs15("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsxs18("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx20(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
         }
       ),
-      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx17(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx20(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -6721,7 +6949,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx17(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx20(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -6740,7 +6968,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx17(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx20(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -6761,16 +6989,16 @@ function DepositFlow({
           onError: handleError,
           debug
         }
-      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs15("div", { className: "rs-step", children: [
-        /* @__PURE__ */ jsxs15("div", { className: "rs-loading-state", children: [
-          /* @__PURE__ */ jsx17("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx17(
+      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs18("div", { className: "rs-step", children: [
+        /* @__PURE__ */ jsxs18("div", { className: "rs-loading-state", children: [
+          /* @__PURE__ */ jsx20("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx20(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: "2",
-              children: /* @__PURE__ */ jsx17(
+              children: /* @__PURE__ */ jsx20(
                 "path",
                 {
                   strokeLinecap: "round",
@@ -6780,22 +7008,22 @@ function DepositFlow({
               )
             }
           ) }),
-          /* @__PURE__ */ jsxs15("div", { className: "rs-loading-text", children: [
-            /* @__PURE__ */ jsx17("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
-            /* @__PURE__ */ jsx17("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+          /* @__PURE__ */ jsxs18("div", { className: "rs-loading-text", children: [
+            /* @__PURE__ */ jsx20("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx20("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
           ] })
         ] }),
-        /* @__PURE__ */ jsx17("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx17(
+        /* @__PURE__ */ jsx20("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx20(
           "button",
           {
             type: "button",
             className: "rs-button rs-button--default rs-button--full-width",
             onClick: handleBack,
-            children: /* @__PURE__ */ jsx17("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx20("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      effectiveStep.type === "processing" && /* @__PURE__ */ jsx17(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx20(
         ProcessingStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -6822,8 +7050,26 @@ function DepositFlow({
       )
     ] });
   }
+  if (isDappImportMode && effectiveStep.type === "dapp-import-resolving") {
+    return /* @__PURE__ */ jsx20(
+      "div",
+      {
+        className: "rs-modal-body",
+        "data-flow-mode": "dapp-import",
+        "data-step-type": effectiveStep.type,
+        children: /* @__PURE__ */ jsx20(
+          DappImportAssetSelectSkeleton,
+          {
+            sourceLabel: activeDappImportProvider?.sourceLabel ?? "",
+            error: dappImportBootError,
+            onRetry: handleBootRetry
+          }
+        )
+      }
+    );
+  }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return /* @__PURE__ */ jsx17("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx17("div", { className: "rs-step", children: /* @__PURE__ */ jsx17("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx17("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx17("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
+    return /* @__PURE__ */ jsx20("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx20("div", { className: "rs-step", children: /* @__PURE__ */ jsx20("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx20("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx20("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? setupChainId;
@@ -6833,15 +7079,15 @@ function DepositFlow({
     }
     return getPublicClient(chainId);
   };
-  return /* @__PURE__ */ jsxs15("div", { className: "rs-modal-body", children: [
-    effectiveStep.type === "setup" && /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs18("div", { className: "rs-modal-body", children: [
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx20(
       AccountPreparingSkeleton,
       {
         errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
         onRetry: activeEntry.status === "error" ? () => handleRetrySetup(ownerAddress) : void 0
       }
     ),
-    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx17(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx20(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -6859,15 +7105,15 @@ function DepositFlow({
         } : void 0
       }
     ),
-    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx17(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx20(
       DappImportAssetSelectStep,
       {
-        sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.label,
+        sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.sourceLabel,
         assets: activeDappImportAvailability.assets,
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx17(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx20(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -6899,7 +7145,7 @@ function DepositFlow({
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx17(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx20(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -6940,7 +7186,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx17(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx20(
       ProcessingStep,
       {
         smartAccount: effectiveStep.smartAccount,
@@ -6972,7 +7218,7 @@ function DepositFlow({
 
 // src/components/history/DepositHistoryPanel.tsx
 import { useCallback as useCallback8, useMemo as useMemo8, useState as useState12 } from "react";
-import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
   return `${hash.slice(0, 6)}\u2026${hash.slice(-4)}`;
@@ -7099,7 +7345,7 @@ function DepositHistoryPanel({
       (d) => !(d.txHash && sourceHashes.has(d.txHash.toLowerCase()))
     );
   }, [deposits]);
-  return /* @__PURE__ */ jsxs16(
+  return /* @__PURE__ */ jsxs19(
     "div",
     {
       className: "rs-history-panel",
@@ -7107,55 +7353,55 @@ function DepositHistoryPanel({
       "aria-label": "Deposit history",
       onKeyDown: handleKeyDown,
       children: [
-        /* @__PURE__ */ jsxs16("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx18("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx18(
+        /* @__PURE__ */ jsxs19("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx21("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx21(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Back",
               onClick: onClose,
-              children: /* @__PURE__ */ jsx18(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx21(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsx18("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx18(
+          /* @__PURE__ */ jsx21("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx21(
             "button",
             {
               type: "button",
               className: "rs-modal-close",
               "aria-label": "Close",
               onClick: onCloseModal,
-              children: /* @__PURE__ */ jsx18(CloseIcon, {})
+              children: /* @__PURE__ */ jsx21(CloseIcon, {})
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsxs16("div", { className: "rs-history-screen", children: [
-          /* @__PURE__ */ jsxs16("div", { className: "rs-history-screen-body", children: [
-            /* @__PURE__ */ jsx18(BodyHeader, { icon: /* @__PURE__ */ jsx18(HistoryIcon, {}), title: "History" }),
-            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs16("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx18(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs16("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx18(Spinner, { className: "rs-spinner--sm" }),
-                /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
+        /* @__PURE__ */ jsxs19("div", { className: "rs-history-screen", children: [
+          /* @__PURE__ */ jsxs19("div", { className: "rs-history-screen-body", children: [
+            /* @__PURE__ */ jsx21(BodyHeader, { icon: /* @__PURE__ */ jsx21(HistoryIcon, {}), title: "History" }),
+            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs19("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx21(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs19("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx21(Spinner, { className: "rs-spinner--sm" }),
+                /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
               ] })
             ] }),
-            error && !isLoading && /* @__PURE__ */ jsxs16("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx18(AlertTriangleIcon, {}) }),
-              /* @__PURE__ */ jsxs16("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
-                /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-hint", children: error })
+            error && !isLoading && /* @__PURE__ */ jsxs19("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx21(AlertTriangleIcon, {}) }),
+              /* @__PURE__ */ jsxs19("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
+                /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-hint", children: error })
               ] })
             ] }),
-            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs16("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx18(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs16("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
-                /* @__PURE__ */ jsx18("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
+            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs19("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx21(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs19("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
+                /* @__PURE__ */ jsx21("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
               ] })
             ] }),
-            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs16("div", { className: "rs-history-list", children: [
-              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx18(HistoryCard, { deposit }, deposit.txHash || i)),
-              hasMore && /* @__PURE__ */ jsx18(
+            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs19("div", { className: "rs-history-list", children: [
+              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx21(HistoryCard, { deposit }, deposit.txHash || i)),
+              hasMore && /* @__PURE__ */ jsx21(
                 "button",
                 {
                   type: "button",
@@ -7167,7 +7413,7 @@ function DepositHistoryPanel({
               )
             ] })
           ] }),
-          /* @__PURE__ */ jsx18(PoweredBy, {})
+          /* @__PURE__ */ jsx21(PoweredBy, {})
         ] })
       ]
     }
@@ -7193,7 +7439,7 @@ function HistoryCard({ deposit }) {
   const date = deposit.createdAt ? formatDate(deposit.createdAt) : null;
   const txTypeLabel = `Deposit${sourceSymbol ? ` ${sourceSymbol}` : ""}`;
   const srcTxUrl = deposit.sourceTxHash ? getTxExplorerUrl(deposit.sourceTxHash, sourceChainId) : null;
-  return /* @__PURE__ */ jsxs16(
+  return /* @__PURE__ */ jsxs19(
     "button",
     {
       type: "button",
@@ -7201,38 +7447,38 @@ function HistoryCard({ deposit }) {
       onClick: () => setExpanded((v) => !v),
       "aria-expanded": expanded,
       children: [
-        /* @__PURE__ */ jsxs16("div", { className: "rs-history-card-row", children: [
-          /* @__PURE__ */ jsxs16("div", { className: "rs-history-card-icons", children: [
-            /* @__PURE__ */ jsx18("span", { className: "rs-history-card-token", children: sourceTokenIcon ? /* @__PURE__ */ jsx18("img", { src: sourceTokenIcon, alt: "" }) : sourceSymbol.slice(0, 2) }),
-            sourceChainIcon && /* @__PURE__ */ jsx18("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx18("img", { src: sourceChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs19("div", { className: "rs-history-card-row", children: [
+          /* @__PURE__ */ jsxs19("div", { className: "rs-history-card-icons", children: [
+            /* @__PURE__ */ jsx21("span", { className: "rs-history-card-token", children: sourceTokenIcon ? /* @__PURE__ */ jsx21("img", { src: sourceTokenIcon, alt: "" }) : sourceSymbol.slice(0, 2) }),
+            sourceChainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx21("img", { src: sourceChainIcon, alt: "" }) })
           ] }),
-          /* @__PURE__ */ jsxs16("div", { className: "rs-history-card-text", children: [
-            /* @__PURE__ */ jsx18("span", { className: "rs-history-card-title", children: txTypeLabel }),
-            date && /* @__PURE__ */ jsx18("span", { className: "rs-history-card-date", children: date })
+          /* @__PURE__ */ jsxs19("div", { className: "rs-history-card-text", children: [
+            /* @__PURE__ */ jsx21("span", { className: "rs-history-card-title", children: txTypeLabel }),
+            date && /* @__PURE__ */ jsx21("span", { className: "rs-history-card-date", children: date })
           ] }),
-          /* @__PURE__ */ jsxs16("div", { className: "rs-history-card-side", children: [
-            /* @__PURE__ */ jsx18("span", { className: "rs-history-card-amount", children: displayAmount }),
-            /* @__PURE__ */ jsx18("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
+          /* @__PURE__ */ jsxs19("div", { className: "rs-history-card-side", children: [
+            /* @__PURE__ */ jsx21("span", { className: "rs-history-card-amount", children: displayAmount }),
+            /* @__PURE__ */ jsx21("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx18("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx18("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs16("div", { className: "rs-history-card-details", children: [
-          sourceChainName && /* @__PURE__ */ jsxs16("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx18("span", { children: "Source chain" }),
-            /* @__PURE__ */ jsxs16("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx18("span", { children: sourceChainName }),
-              sourceChainIcon && /* @__PURE__ */ jsx18("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx18("img", { src: sourceChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsx21("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx21("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs19("div", { className: "rs-history-card-details", children: [
+          sourceChainName && /* @__PURE__ */ jsxs19("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx21("span", { children: "Source chain" }),
+            /* @__PURE__ */ jsxs19("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx21("span", { children: sourceChainName }),
+              sourceChainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx21("img", { src: sourceChainIcon, alt: "" }) })
             ] })
           ] }),
-          targetChainName && /* @__PURE__ */ jsxs16("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx18("span", { children: "Destination chain" }),
-            /* @__PURE__ */ jsxs16("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx18("span", { children: targetChainName }),
-              targetChainIcon && /* @__PURE__ */ jsx18("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx18("img", { src: targetChainIcon, alt: "" }) })
+          targetChainName && /* @__PURE__ */ jsxs19("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx21("span", { children: "Destination chain" }),
+            /* @__PURE__ */ jsxs19("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx21("span", { children: targetChainName }),
+              targetChainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx21("img", { src: targetChainIcon, alt: "" }) })
             ] })
           ] }),
-          srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs16("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx18("span", { children: "Transaction details" }),
-            /* @__PURE__ */ jsxs16(
+          srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs19("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx21("span", { children: "Transaction details" }),
+            /* @__PURE__ */ jsxs19(
               "a",
               {
                 href: srcTxUrl,
@@ -7241,8 +7487,8 @@ function HistoryCard({ deposit }) {
                 className: "rs-history-card-link",
                 onClick: (e) => e.stopPropagation(),
                 children: [
-                  /* @__PURE__ */ jsx18("span", { children: shortenHash(deposit.sourceTxHash) }),
-                  /* @__PURE__ */ jsx18(ArrowUpRightIcon, {})
+                  /* @__PURE__ */ jsx21("span", { children: shortenHash(deposit.sourceTxHash) }),
+                  /* @__PURE__ */ jsx21(ArrowUpRightIcon, {})
                 ]
               }
             )
@@ -7255,9 +7501,9 @@ function HistoryCard({ deposit }) {
 DepositHistoryPanel.displayName = "DepositHistoryPanel";
 
 // src/DepositModal.tsx
-import { jsx as jsx19, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx22, jsxs as jsxs20 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-6SUEC5IU.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-PC7EX5VK.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -7273,7 +7519,7 @@ function DepositModal(props) {
     "dappWalletClient"
   );
   if (needsReown) {
-    return /* @__PURE__ */ jsx19(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx19(
+    return /* @__PURE__ */ jsx22(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx22(
       ReownDepositInner,
       {
         ...props,
@@ -7281,7 +7527,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx19(
+  return /* @__PURE__ */ jsx22(
     DepositModalInner,
     {
       ...props,
@@ -7313,6 +7559,7 @@ function DepositModalInner({
   forceRegister = false,
   enableSolana = true,
   dappImports,
+  initialDappImport,
   enableFiatOnramp = false,
   enableQrTransfer = true,
   fiatOnrampMethods,
@@ -7356,7 +7603,7 @@ function DepositModalInner({
   const [recipientIsContract, setRecipientIsContract] = useState13(false);
   const onErrorRef = useLatestRef(onError);
   useEffect11(() => {
-    if (targetChain !== HYPERCORE_CHAIN_ID || !isAddress2(recipient, { strict: false })) {
+    if (targetChain !== HYPERCORE_CHAIN_ID || !isAddress(recipient, { strict: false })) {
       setRecipientIsContract(false);
       return;
     }
@@ -7510,7 +7757,7 @@ function DepositModalInner({
   }, [isOpen, store]);
   const showBackButton = uiConfig?.showBackButton ?? true;
   const canGoBack = backHandler !== void 0;
-  return /* @__PURE__ */ jsx19(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx19(
+  return /* @__PURE__ */ jsx22(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx22(
     Modal,
     {
       isOpen,
@@ -7518,20 +7765,20 @@ function DepositModalInner({
       className,
       inline,
       closeOnOverlayClick,
-      children: /* @__PURE__ */ jsxs17("div", { ref: modalRef, className: "rs-modal", children: [
-        /* @__PURE__ */ jsxs17("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx19("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx19(
+      children: /* @__PURE__ */ jsxs20("div", { ref: modalRef, className: "rs-modal", children: [
+        /* @__PURE__ */ jsxs20("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx22("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx22(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: backHandler,
-              children: /* @__PURE__ */ jsx19(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx22(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsxs17("div", { className: "rs-modal-header-nav-right", children: [
-            historyButtonVisible && /* @__PURE__ */ jsx19(
+          /* @__PURE__ */ jsxs20("div", { className: "rs-modal-header-nav-right", children: [
+            historyButtonVisible && /* @__PURE__ */ jsx22(
               "button",
               {
                 type: "button",
@@ -7539,22 +7786,22 @@ function DepositModalInner({
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
                 disabled: !recipient,
-                children: /* @__PURE__ */ jsx19(HistoryIcon, {})
+                children: /* @__PURE__ */ jsx22(HistoryIcon, {})
               }
             ),
-            /* @__PURE__ */ jsx19(
+            /* @__PURE__ */ jsx22(
               "button",
               {
                 type: "button",
                 onClick: onClose,
                 className: "rs-modal-close",
                 "aria-label": "Close",
-                children: /* @__PURE__ */ jsx19(CloseIcon, {})
+                children: /* @__PURE__ */ jsx22(CloseIcon, {})
               }
             )
           ] })
         ] }),
-        recipientIsContract ? /* @__PURE__ */ jsx19("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx19(Callout, { variant: "error", children: "HyperCore deposits require an EOA recipient. The configured recipient is a smart contract, which is not supported." }) }) : /* @__PURE__ */ jsx19(
+        recipientIsContract ? /* @__PURE__ */ jsx22("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx22(Callout, { variant: "error", children: "HyperCore deposits require an EOA recipient. The configured recipient is a smart contract, which is not supported." }) }) : /* @__PURE__ */ jsx22(
           DepositFlow,
           {
             dappWalletClient,
@@ -7577,6 +7824,7 @@ function DepositModalInner({
             forceRegister,
             enableSolana,
             dappImports,
+            initialDappImport,
             enableFiatOnramp,
             enableQrTransfer,
             fiatOnrampMethods,
@@ -7595,7 +7843,7 @@ function DepositModalInner({
             debug
           }
         ),
-        showHistoryButton && historyOpen && /* @__PURE__ */ jsx19(
+        showHistoryButton && historyOpen && /* @__PURE__ */ jsx22(
           DepositHistoryPanel,
           {
             deposits: historyDeposits,