@rhinestone/deposit-modal 0.20.0 → 0.21.0

package/dist/{chunk-247GJH57.mjs → chunk-B2LUWNFX.mjs}

@@ -58,6 +58,9 @@ import {
   getExchangeLogo,
   getExchangeLogoSrc,
   getPublicClient,
+  hasReached,
+  hostedOrderState,
+  hostedOrderStateFromSwapped,
   isDepositEvent,
   isDepositPolicyRefusal,
   isDisplayStablecoinSymbol,
@@ -66,6 +69,7 @@ import {
   isNativeAsset,
   isNativeSol,
   isSubmissionUncertain,
+  mergeHostedOrderState,
   portfolioToAssets,
   quoteFeeRow,
   readDedupedAccountSetupResult,
@@ -94,7 +98,7 @@ import {
   useTokenDisplay,
   useTokenDisplays,
   warnRemovedProps
-} from "./chunk-32ERBFMO.mjs";
+} from "./chunk-UNXUOV3F.mjs";
 import {
   AppleIcon,
   BankIcon,
@@ -115,6 +119,12 @@ import {
   WalletIcon,
   useLatestRef
 } from "./chunk-YY4ZOAH5.mjs";
+import {
+  rampQuery
+} from "./chunk-PP4QE32S.mjs";
+import {
+  createBearerTransport
+} from "./chunk-PZIKRYMO.mjs";
 import {
   HYPERCORE_CHAIN_ID,
   HYPERCORE_MIN_DEPOSIT_USD,
@@ -166,24 +176,23 @@ function getReownDependencies() {
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo9,
+  useMemo as useMemo10,
   useEffect as useEffect15,
   useRef as useRef11,
   useState as useState15,
-  useCallback as useCallback9,
-  lazy as lazy3,
+  useCallback as useCallback8,
+  lazy as lazy4,
   Suspense as Suspense3
 } from "react";
 
 // src/DepositFlow.tsx
 import {
   useState as useState13,
-  useCallback as useCallback7,
+  useCallback as useCallback6,
   useMemo as useMemo8,
   useEffect as useEffect13,
   useLayoutEffect as useLayoutEffect2,
   useRef as useRef9,
-  lazy as lazy2,
   Suspense as Suspense2
 } from "react";
 
@@ -518,6 +527,7 @@ function ConnectStep({
   onPrefetchFiatMethod,
   recommendedMethod,
   onSelectFundFromExchange,
+  fundFromExchangeLoading,
   onRequestConnect,
   onConnect,
   onDisconnect,
@@ -598,7 +608,9 @@ function ConnectStep({
           title: "Connect exchange",
           subtitle: "Instant - No limit",
           meta: EXCHANGE_META,
-          onClick: onSelectFundFromExchange
+          onClick: onSelectFundFromExchange,
+          disabled: fundFromExchangeLoading,
+          trailing: fundFromExchangeLoading ? SMALL_SPINNER : void 0
         },
         "connect-exchange"
       )
@@ -3476,8 +3488,8 @@ function DepositAddressStep({
 }
 DepositAddressStep.displayName = "DepositAddressStep";
 
-// src/components/steps/FiatOnrampStep.tsx
-import { useCallback as useCallback3 } from "react";
+// src/components/steps/RampOrderStep.tsx
+import { lazy as lazy2, useCallback as useCallback3 } from "react";
 
 // src/core/swapped.ts
 var SWAPPED_ORIGINS = [
@@ -3549,7 +3561,7 @@ function SwappedOrderTracker({
   onRetry
 }) {
   const formattedAmount = formatTrackerAmount(amount);
-  const title = terminal ? terminal.kind === "cancelled" ? "Order cancelled" : "Deposit failed" : formattedAmount ? `Depositing ${formattedAmount} ${currency}` : `Depositing ${currency}`;
+  const title = terminal ? terminal.title ?? (terminal.kind === "cancelled" ? "Order cancelled" : "Deposit failed") : formattedAmount ? `Depositing ${formattedAmount} ${currency}` : `Depositing ${currency}`;
   const labels = [
     STEP_LABELS[0],
     `${currency} received`,
@@ -3627,16 +3639,10 @@ var DEPOSIT_POLL_FAST_INTERVAL_MS = 500;
 var IFRAME_LOAD_TIMEOUT_MS = 15e3;
 var SWAPPED_SUCCESS_HANDOFF_DELAY_MS = 1400;
 var SWAPPED_IFRAME_ORIGINS = new Set(SWAPPED_ORIGINS);
-var SWAPPED_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
-  "order_completed",
-  "order_broadcasted"
-]);
-var SWAPPED_STATUS_VALUES = /* @__PURE__ */ new Set([
-  "payment_pending",
-  "order_completed",
-  "order_broadcasted",
-  "order_cancelled"
-]);
+var OUTCOMES = {
+  failed: { title: "Order failed", message: "Any charge will be refunded." },
+  refunded: { title: "Order refunded", message: "Your payment was returned." }
+};
 var SWAPPED_GO_BACK_KEY = "SWAPPED_GO_BACK";
 var OPEN_FAILED_MESSAGE = "We could not open your browser.";
 var OPEN_FAILED_CODE = "SWAPPED_BROWSER_UNAVAILABLE";
@@ -3682,19 +3688,20 @@ function parseSwappedIframeMessage(raw) {
   const obj = data;
   const inner = obj.data && typeof obj.data === "object" ? obj.data : obj;
   const rawStatus = inner.order_status ?? inner.status ?? obj.status;
-  if (typeof rawStatus !== "string" || !SWAPPED_STATUS_VALUES.has(rawStatus)) {
-    return null;
-  }
   const asString2 = (v) => typeof v === "string" && v.length > 0 ? v : void 0;
+  const state = typeof rawStatus === "string" ? hostedOrderStateFromSwapped(
+    rawStatus,
+    asString2(inner.transaction_id) ?? asString2(obj.transactionId)
+  ) : null;
+  if (!state) return null;
   return {
-    status: rawStatus,
+    state,
     orderId: asString2(inner.order_id) ?? asString2(obj.orderId),
     externalCustomerId: asString2(inner.external_customer_id) ?? asString2(obj.external_customer_id) ?? asString2(inner.externalCustomerId) ?? asString2(obj.externalCustomerId),
     orderCrypto: assetSymbol(
       asString2(inner.order_crypto) ?? asString2(obj.orderCrypto)
     ),
-    orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount),
-    transactionId: asString2(inner.transaction_id) ?? asString2(obj.transactionId)
+    orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount)
   };
 }
 function SwappedProviderStep({
@@ -3705,7 +3712,7 @@ function SwappedProviderStep({
   iframeTitle,
   loadErrorCode,
   loadErrorFallback,
-  bannerForStatus,
+  cancelledMessage,
   onSwappedComplete,
   onSwappedFailed,
   onClose,
@@ -3738,6 +3745,8 @@ function SwappedProviderStep({
   const expectedExternalCustomerIdRef = useRef6(null);
   const baselineDepositTxHashRef = useRef6(void 0);
   const currentDepositTxHashRef = useRef6(null);
+  const deliveryTxHashRef = useRef6(null);
+  deliveryTxHashRef.current = orderState?.deliveryTxHash ?? null;
   const fastDepositPollEnabledRef = useRef6(false);
   const rescheduleDepositPollRef = useRef6(
     null
@@ -3861,7 +3870,10 @@ function SwappedProviderStep({
         if (cancelled) return;
         const isCurrentOrder = res !== null && res.orderId === expectedOrderUuidRef.current;
         if (isCurrentOrder) {
-          setOrderState(res);
+          setOrderState((prev) => ({
+            ...res,
+            ...mergeHostedOrderState(prev, res)
+          }));
         }
       } catch {
       }
@@ -3898,15 +3910,29 @@ function SwappedProviderStep({
     async function pollDeposit() {
       if (cancelled) return;
       try {
-        const status = await service.fetchLatestStatus(smartAccount);
-        if (cancelled) return;
-        const event = status.lastEvent;
-        const eventTxHash = isDepositEvent(event) ? getEventTxHash(event) ?? null : null;
-        if (baselineDepositTxHashRef.current === void 0) {
-          baselineDepositTxHashRef.current = eventTxHash;
-        } else if (eventTxHash && (!baselineDepositTxHashRef.current || !txRefsMatch(eventTxHash, baselineDepositTxHashRef.current))) {
-          currentDepositTxHashRef.current = eventTxHash;
-          setLatestEvent(event ?? null);
+        const deliveryTxHash = deliveryTxHashRef.current;
+        if (deliveryTxHash) {
+          const { lastEvent } = await service.fetchStatus(
+            smartAccount,
+            deliveryTxHash
+          );
+          if (cancelled) return;
+          const txHash = isDepositEvent(lastEvent) ? getEventTxHash(lastEvent) : void 0;
+          if (lastEvent && txHash && txRefsMatch(txHash, deliveryTxHash)) {
+            currentDepositTxHashRef.current = txHash;
+            setLatestEvent(lastEvent);
+          }
+        } else {
+          const status = await service.fetchLatestStatus(smartAccount);
+          if (cancelled) return;
+          const event = status.lastEvent;
+          const eventTxHash = isDepositEvent(event) ? getEventTxHash(event) ?? null : null;
+          if (baselineDepositTxHashRef.current === void 0) {
+            baselineDepositTxHashRef.current = eventTxHash;
+          } else if (eventTxHash && (!baselineDepositTxHashRef.current || !txRefsMatch(eventTxHash, baselineDepositTxHashRef.current))) {
+            currentDepositTxHashRef.current = eventTxHash;
+            setLatestEvent(event ?? null);
+          }
         }
       } catch {
       }
@@ -3929,8 +3955,7 @@ function SwappedProviderStep({
   }, [service, smartAccount]);
   useEffect8(() => {
     if (fastDepositPollEnabledRef.current) return;
-    const status = orderState?.status;
-    if (!status || !SWAPPED_TERMINAL_STATUSES.has(status)) return;
+    if (!hasReached(orderState, "paid")) return;
     fastDepositPollEnabledRef.current = true;
     rescheduleDepositPollRef.current?.(DEPOSIT_POLL_FAST_INITIAL_DELAY_MS);
   }, [orderState]);
@@ -3954,10 +3979,9 @@ function SwappedProviderStep({
         // Normalise to the uuid the backend poll also keys on, so orderState
         // is consistent regardless of which path set it.
         orderId: expectedOrderUuidRef.current ?? prev?.orderId ?? ext,
-        status: parsed.status,
+        ...mergeHostedOrderState(prev, parsed.state),
         orderCrypto: parsed.orderCrypto ?? prev?.orderCrypto ?? null,
         orderCryptoAmount: parsed.orderCryptoAmount ?? prev?.orderCryptoAmount ?? null,
-        transactionId: parsed.transactionId ?? prev?.transactionId ?? null,
         receivedAt: (/* @__PURE__ */ new Date()).toISOString(),
         paidAmountUsd: prev?.paidAmountUsd ?? null,
         paidAmountEur: prev?.paidAmountEur ?? null,
@@ -3969,13 +3993,13 @@ function SwappedProviderStep({
     return () => window.removeEventListener("message", onMessage);
   }, [openExternally]);
   useEffect8(() => {
-    const swappedProvesLive = orderState !== null && !(variant === "fiat" && orderState.status === "payment_pending");
+    const swappedProvesLive = orderState !== null && (variant !== "fiat" || hasReached(orderState, "paying") || orderState.outcome !== null);
     if (phase === "provider" && (swappedProvesLive || latestEvent !== null)) {
       setPhase("tracker");
     }
   }, [phase, orderState, latestEvent, variant]);
   const stepStates = useMemo4(
-    () => deriveStepStates(orderState?.status ?? null, latestEvent),
+    () => deriveStepStates(orderState, latestEvent),
     [orderState, latestEvent]
   );
   const terminalState = useMemo4(() => {
@@ -3985,15 +4009,15 @@ function SwappedProviderStep({
         message: failureMessageForEvent(latestEvent ?? void 0)
       };
     }
-    if (orderState?.status === "order_cancelled") {
-      const banner = bannerForStatus("order_cancelled", {});
-      return { kind: "cancelled", message: banner.detail ?? banner.title };
+    const outcome = orderState?.outcome;
+    if (outcome) {
+      return outcome === "cancelled" ? { kind: "cancelled", message: cancelledMessage } : { kind: "cancelled", ...OUTCOMES[outcome] };
     }
     return null;
-  }, [latestEvent, orderState, bannerForStatus]);
+  }, [latestEvent, orderState, cancelledMessage]);
   useEffect8(() => {
-    if (orderState?.status === "order_cancelled") onCancelled?.();
-  }, [onCancelled, orderState?.status]);
+    if (orderState?.outcome === "cancelled") onCancelled?.();
+  }, [onCancelled, orderState?.outcome]);
   useEffect8(() => {
     if (completeFiredRef.current || failedFiredRef.current) return;
     const t = latestEvent?.type;
@@ -4143,15 +4167,14 @@ function SwappedProviderStep({
     loadError && /* @__PURE__ */ jsx17(PoweredBy, {})
   ] });
 }
-function deriveStepStates(swappedStatus, latestEvent) {
+function deriveStepStates(order, latestEvent) {
   if (isFailedEvent(latestEvent ?? void 0)) {
     return ["complete", "complete", "failed", "pending"];
   }
-  if (swappedStatus === "order_cancelled") {
+  if (order?.outcome) {
     return ["failed", "pending", "pending", "pending"];
   }
-  const step1Complete = swappedStatus === "order_completed" || swappedStatus === "order_broadcasted";
-  const step2Complete = latestEvent !== null || swappedStatus === "order_broadcasted";
+  const step2Complete = latestEvent !== null || hasReached(order, "sent");
   const step3Complete = latestEvent?.type === "bridge-complete";
   if (step3Complete) {
     return ["complete", "complete", "complete", "complete"];
@@ -4159,65 +4182,70 @@ function deriveStepStates(swappedStatus, latestEvent) {
   if (step2Complete) {
     return ["complete", "complete", "active", "pending"];
   }
-  if (step1Complete) {
+  if (hasReached(order, "paid")) {
     return ["complete", "active", "pending", "pending"];
   }
   return ["active", "pending", "pending", "pending"];
 }
 SwappedProviderStep.displayName = "SwappedProviderStep";
 
-// src/components/steps/FiatOnrampStep.tsx
+// src/components/steps/RampOrderStep.tsx
 import { jsx as jsx18 } from "react/jsx-runtime";
-function fiatBannerForStatus(status, context) {
-  if (context.currencyMismatch) {
-    return {
-      level: "warning",
-      title: "Currency mismatch",
-      detail: "Funds may not bridge automatically. Contact support if your balance does not arrive."
-    };
+var BankOnrampStep = lazy2(async () => {
+  const module = await import("./BankOnrampStep-JTU7WS5R.mjs");
+  return { default: module.BankOnrampStep };
+});
+var HOSTED = {
+  fiat: {
+    iframeTitle: "Buy crypto with Swapped",
+    loadErrorCode: "SWAPPED_URL_FAILED",
+    loadErrorFallback: "Failed to load on-ramp",
+    cancelledMessage: "If you were charged, Swapped will refund within 5 business days."
+  },
+  exchange: {
+    iframeTitle: "Fund from exchange via Swapped",
+    loadErrorCode: "SWAPPED_CONNECT_URL_FAILED",
+    loadErrorFallback: "Failed to load Connect",
+    cancelledMessage: "If your exchange already debited the funds, Swapped will refund within 5 business days."
   }
-  switch (status) {
-    case "payment_pending":
-      return { level: "info", title: "Verifying payment\u2026" };
-    case "order_completed":
-      return { level: "success", title: "Payment received \u2014 sending crypto" };
-    case "order_broadcasted":
-      return {
-        level: "success",
-        title: "Crypto sent \u2014 confirming on-chain"
-      };
-    case "order_cancelled":
-      return {
-        level: "warning",
-        title: "Order cancelled",
-        detail: "If you were charged, Swapped will refund within 5 business days."
-      };
+};
+function RampOrderStep(props) {
+  const { order, smartAccount } = props;
+  if (order.flow === "funding_account") {
+    return /* @__PURE__ */ jsx18(
+      BankOnrampStep,
+      {
+        backendUrl: order.backendUrl,
+        smartAccount,
+        getCustomerSession: order.getCustomerSession,
+        onJourney: order.onJourney,
+        onGoBack: props.onGoBack,
+        onError: props.onError,
+        openExternally: props.openExternally,
+        onUnavailable: order.onUnavailable
+      },
+      `${order.backendUrl}:${smartAccount}`
+    );
   }
+  return /* @__PURE__ */ jsx18(HostedOrder, { ...props, order });
 }
-function FiatOnrampStep({
+function HostedOrder({
+  order,
   smartAccount,
   service,
-  paymentMethod,
-  methodSelectionSource,
-  consumePrefetchedUrl,
-  onSwappedComplete,
-  onSwappedFailed,
-  onClose,
-  onGoBack,
-  onError,
-  onAttemptConsumed,
-  onProviderHandoff,
-  onRetry,
-  onCancelled,
-  onImmersiveChange,
-  openExternally
+  ...callbacks
 }) {
+  const method = order.kind === "fiat" ? order.method : void 0;
+  const source = order.kind === "fiat" ? order.methodSelectionSource : void 0;
+  const consumePrefetched = order.kind === "fiat" ? order.consumePrefetchedUrl : void 0;
+  const connection = order.kind === "exchange" ? order.connection : void 0;
+  const loadPrepared = order.kind === "exchange" ? order.loadPreparedUrl : void 0;
   const loadUrl = useCallback3(async () => {
-    const prefetched = consumePrefetchedUrl?.(
-      smartAccount,
-      paymentMethod,
-      methodSelectionSource
-    );
+    if (connection !== void 0) {
+      if (loadPrepared) return loadPrepared();
+      return service.getSwappedConnectUrl({ smartAccount, connection });
+    }
+    const prefetched = consumePrefetched?.(smartAccount, method, source);
     if (prefetched) {
       try {
         const cached = await prefetched;
@@ -4227,136 +4255,82 @@ function FiatOnrampStep({
     }
     return service.getSwappedWidgetUrl({
       smartAccount,
-      method: paymentMethod,
-      methodSelectionSource
+      method,
+      methodSelectionSource: source
     });
   }, [
     service,
     smartAccount,
-    paymentMethod,
-    methodSelectionSource,
-    consumePrefetchedUrl
+    method,
+    source,
+    consumePrefetched,
+    connection,
+    loadPrepared
   ]);
   return /* @__PURE__ */ jsx18(
     SwappedProviderStep,
     {
       smartAccount,
       service,
-      variant: "fiat",
+      variant: order.kind === "fiat" ? "fiat" : "connect",
       loadUrl,
-      iframeTitle: "Buy crypto with Swapped",
-      loadErrorCode: "SWAPPED_URL_FAILED",
-      loadErrorFallback: "Failed to load on-ramp",
-      bannerForStatus: fiatBannerForStatus,
-      onSwappedComplete,
-      onSwappedFailed,
-      onClose,
-      onGoBack,
-      onError,
-      onAttemptConsumed,
-      onProviderHandoff,
-      onRetry,
-      onCancelled,
-      onImmersiveChange,
-      openExternally
+      ...HOSTED[order.kind],
+      ...callbacks
     }
   );
 }
-FiatOnrampStep.displayName = "FiatOnrampStep";
+RampOrderStep.displayName = "RampOrderStep";
 
-// src/components/steps/ExchangeConnectStep.tsx
-import { useCallback as useCallback4 } from "react";
-import { jsx as jsx19 } from "react/jsx-runtime";
-function connectBannerForStatus(status, context) {
-  if (context.currencyMismatch) {
-    return {
-      level: "warning",
-      title: "Currency mismatch",
-      detail: "Funds may not bridge automatically. Contact support if your balance does not arrive."
-    };
+// src/core/ramp-rows.ts
+var NOT_SERVED_NOTICE = "Bank transfer isn't available in your region.";
+function resolveRampRows(input) {
+  const { providers } = input;
+  const has = (provider, kind) => providers === null || providers !== "loading" && providers.some((p) => p.provider === provider && p.kinds.includes(kind));
+  const loading = providers === "loading";
+  const exchange = !input.enableExchangeConnect ? "hidden" : loading ? "loading" : has("swapped", "exchange") ? "offered" : "hidden";
+  const bankRequested = input.virtualAccounts && input.customerSession && input.bankTransferAllowed;
+  const swappedFiat = has("swapped", "fiat");
+  const bankBy = !bankRequested ? null : has("noah", "fiat") && !input.noahNotServed ? "noah" : swappedFiat && !refusesBank(input.swappedMethods) ? "swapped" : null;
+  const notice = bankRequested && input.noahNotServed && !bankBy ? NOT_SERVED_NOTICE : null;
+  const offered = input.enableFiatOnramp && swappedFiat ? input.swappedMethods : { kind: "hidden" };
+  const swapped = offered.kind === "hidden" && bankBy ? {
+    kind: "list",
+    methods: [],
+    recommendedMethod: input.bankRow.method,
+    country: null,
+    source: "configured"
+  } : offered;
+  if (loading && (input.enableFiatOnramp || bankRequested)) {
+    return { cash: { kind: "loading" }, exchange, notice: null };
   }
-  switch (status) {
-    case "payment_pending":
-      return { level: "info", title: "Waiting for exchange transfer\u2026" };
-    case "order_completed":
-      return {
-        level: "success",
-        title: "Exchange transfer received \u2014 sending crypto"
-      };
-    case "order_broadcasted":
-      return {
-        level: "success",
-        title: "Crypto sent \u2014 confirming on-chain"
-      };
-    case "order_cancelled":
-      return {
-        level: "warning",
-        title: "Order cancelled",
-        detail: "If your exchange already debited the funds, Swapped will refund within 5 business days."
-      };
+  if (swapped.kind !== "list") return { cash: swapped, exchange, notice };
+  const methods = swapped.methods.map((m) => ({
+    ...m,
+    provider: isBankRow(m) && bankBy ? bankBy : "swapped"
+  }));
+  if (bankBy && !methods.some(isBankRow)) {
+    methods.push({ ...input.bankRow, provider: bankBy });
   }
+  return { cash: { ...swapped, methods }, exchange, notice };
 }
-function ExchangeConnectStep({
-  smartAccount,
-  service,
-  connection,
-  loadUrl: loadPreparedUrl,
-  onSwappedComplete,
-  onSwappedFailed,
-  onClose,
-  onGoBack,
-  onError,
-  onAttemptConsumed,
-  onProviderHandoff,
-  onRetry,
-  onCancelled,
-  onImmersiveChange,
-  openExternally
-}) {
-  const loadUrl = useCallback4(async () => {
-    if (loadPreparedUrl) return loadPreparedUrl();
-    const res = await service.getSwappedConnectUrl({
-      smartAccount,
-      connection
-    });
-    return res;
-  }, [loadPreparedUrl, service, smartAccount, connection]);
-  return /* @__PURE__ */ jsx19(
-    SwappedProviderStep,
-    {
-      smartAccount,
-      service,
-      variant: "connect",
-      loadUrl,
-      iframeTitle: "Fund from exchange via Swapped",
-      loadErrorCode: "SWAPPED_CONNECT_URL_FAILED",
-      loadErrorFallback: "Failed to load Connect",
-      bannerForStatus: connectBannerForStatus,
-      onSwappedComplete,
-      onSwappedFailed,
-      onClose,
-      onGoBack,
-      onError,
-      onAttemptConsumed,
-      onProviderHandoff,
-      onRetry,
-      onCancelled,
-      onImmersiveChange,
-      openExternally
-    }
-  );
+function refusesBank(swapped) {
+  if (swapped.kind === "hidden") return true;
+  if (swapped.kind !== "list" || swapped.source === "fallback") return false;
+  return !swapped.methods.some(isBankRow);
+}
+function isBankRow(m) {
+  return m.method === "bank-transfer";
 }
-ExchangeConnectStep.displayName = "ExchangeConnectStep";
 
 // src/components/steps/ExchangeSelectStep.tsx
-import { useCallback as useCallback5, useEffect as useEffect9, useState as useState9 } from "react";
-import { jsx as jsx20, jsxs as jsxs16 } from "react/jsx-runtime";
+import { useCallback as useCallback4, useEffect as useEffect9, useState as useState9 } from "react";
+import { jsx as jsx19, jsxs as jsxs16 } from "react/jsx-runtime";
 function ExchangeLogo({ exchange }) {
   const [failed, setFailed] = useState9(false);
   if (!exchange.logoUrl || failed) {
-    return /* @__PURE__ */ jsx20(BankIcon, {});
+    return /* @__PURE__ */ jsx19(BankIcon, {});
   }
-  return /* @__PURE__ */ jsx20(
+  return /* @__PURE__ */ jsx19(
     "img",
     {
       src: exchange.logoUrl,
@@ -4378,7 +4352,7 @@ function ExchangeSelectStep({
     null
   );
   const [selectionNotice, setSelectionNotice] = useState9(null);
-  const retry = useCallback5(() => {
+  const retry = useCallback4(() => {
     setRetryToken((n) => n + 1);
   }, []);
   useEffect9(() => {
@@ -4401,7 +4375,7 @@ function ExchangeSelectStep({
       cancelled = true;
     };
   }, [service, retryToken, onError]);
-  const selectExchange = useCallback5(
+  const selectExchange = useCallback4(
     async (connection) => {
       setSelectingConnection(connection);
       setSelectionNotice(null);
@@ -4419,18 +4393,18 @@ function ExchangeSelectStep({
   );
   return /* @__PURE__ */ jsxs16("div", { className: "rs-screen rs-exchange-select", children: [
     /* @__PURE__ */ jsxs16("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx20(
+      /* @__PURE__ */ jsx19(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx20(UnplugIcon, {}),
+          icon: /* @__PURE__ */ jsx19(UnplugIcon, {}),
           title: "Connect exchange",
           subtitle: "Select an exchange to connect"
         }
       ),
-      loading && /* @__PURE__ */ jsx20("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx20(Spinner, {}) }),
+      loading && /* @__PURE__ */ jsx19("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: /* @__PURE__ */ jsx19(Spinner, {}) }),
       !loading && error && /* @__PURE__ */ jsxs16("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx20("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
-        /* @__PURE__ */ jsx20(
+        /* @__PURE__ */ jsx19("div", { className: "rs-exchange-select-state-title", children: "Couldn\u2019t load exchanges" }),
+        /* @__PURE__ */ jsx19(
           "button",
           {
             type: "button",
@@ -4441,8 +4415,8 @@ function ExchangeSelectStep({
         )
       ] }),
       !loading && !error && exchanges.length === 0 && /* @__PURE__ */ jsxs16("div", { className: "rs-exchange-select-state", "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx20("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
-        /* @__PURE__ */ jsx20(
+        /* @__PURE__ */ jsx19("div", { className: "rs-exchange-select-state-title", children: "No exchanges available" }),
+        /* @__PURE__ */ jsx19(
           "button",
           {
             type: "button",
@@ -4452,7 +4426,7 @@ function ExchangeSelectStep({
           }
         )
       ] }),
-      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx20("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => {
+      !loading && !error && exchanges.length > 0 && /* @__PURE__ */ jsx19("div", { className: "rs-exchange-grid", children: exchanges.map((exchange) => {
         const brand = getExchangeLogo(exchange.name, exchange.connection);
         return /* @__PURE__ */ jsxs16(
           "button",
@@ -4464,22 +4438,22 @@ function ExchangeSelectStep({
             "aria-busy": selectingConnection === exchange.connection,
             "aria-label": `Select ${exchange.name}`,
             children: [
-              /* @__PURE__ */ jsx20(
+              /* @__PURE__ */ jsx19(
                 "span",
                 {
                   className: `rs-exchange-card-logo${brand ? " rs-exchange-card-logo--brand" : ""}`,
-                  children: brand ?? /* @__PURE__ */ jsx20(ExchangeLogo, { exchange })
+                  children: brand ?? /* @__PURE__ */ jsx19(ExchangeLogo, { exchange })
                 }
               ),
-              /* @__PURE__ */ jsx20("span", { className: "rs-exchange-card-name", children: exchange.name })
+              /* @__PURE__ */ jsx19("span", { className: "rs-exchange-card-name", children: exchange.name })
             ]
           },
           exchange.connection
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx20(PoweredBy, {}),
-    selectionNotice && /* @__PURE__ */ jsx20("p", { className: "rs-exchange-select-fee-note", role: "status", children: selectionNotice })
+    /* @__PURE__ */ jsx19(PoweredBy, {}),
+    selectionNotice && /* @__PURE__ */ jsx19("p", { className: "rs-exchange-select-fee-note", role: "status", children: selectionNotice })
   ] });
 }
 ExchangeSelectStep.displayName = "ExchangeSelectStep";
@@ -4487,7 +4461,7 @@ ExchangeSelectStep.displayName = "ExchangeSelectStep";
 // src/components/steps/SolanaTokenSelectStep.tsx
 import { useState as useState10, useEffect as useEffect10, useMemo as useMemo5 } from "react";
 import { formatUnits as formatUnits4 } from "viem";
-import { jsx as jsx21, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx20, jsxs as jsxs17 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
   service,
@@ -4595,28 +4569,28 @@ function SolanaTokenSelectStep({
   const chainName = getChainName("solana");
   return /* @__PURE__ */ jsxs17("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs17("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx21(
+      /* @__PURE__ */ jsx20(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx21(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx20(WalletIcon, {}),
           title: "Your assets",
           subtitle: "Select source assets to transfer"
         }
       ),
       loading && /* @__PURE__ */ jsxs17("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-        /* @__PURE__ */ jsx21(Spinner, { className: "rs-text-tertiary" }),
-        /* @__PURE__ */ jsx21("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+        /* @__PURE__ */ jsx20(Spinner, { className: "rs-text-tertiary" }),
+        /* @__PURE__ */ jsx20("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
-      error && /* @__PURE__ */ jsx21(Callout, { variant: "error", children: error }),
+      error && /* @__PURE__ */ jsx20(Callout, { variant: "error", children: error }),
       !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs17("div", { className: "rs-empty-state", children: [
-        /* @__PURE__ */ jsx21(WalletIcon, { className: "rs-empty-icon" }),
-        /* @__PURE__ */ jsx21("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+        /* @__PURE__ */ jsx20(WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ jsx20("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
         /* @__PURE__ */ jsxs17("div", { className: "rs-empty-address", children: [
           solanaAddress.slice(0, 6),
           "...",
           solanaAddress.slice(-4)
         ] }),
-        onDisconnect && /* @__PURE__ */ jsx21(
+        onDisconnect && /* @__PURE__ */ jsx20(
           "button",
           {
             type: "button",
@@ -4626,7 +4600,7 @@ function SolanaTokenSelectStep({
           }
         )
       ] }),
-      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx21("div", { className: "rs-asset-list", children: rows.map((entry) => {
+      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx20("div", { className: "rs-asset-list", children: rows.map((entry) => {
         const isSelected = selectedSymbol === entry.token.symbol;
         const tokenAmount = formatBalance(entry);
         return /* @__PURE__ */ jsxs17(
@@ -4639,7 +4613,7 @@ function SolanaTokenSelectStep({
             children: [
               /* @__PURE__ */ jsxs17("div", { className: "rs-asset-info", children: [
                 /* @__PURE__ */ jsxs17("div", { className: "rs-asset-icon-wrapper", children: [
-                  /* @__PURE__ */ jsx21("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx21(
+                  /* @__PURE__ */ jsx20("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx20(
                     TokenIcon,
                     {
                       token: { chain: "solana", address: entry.token.mint },
@@ -4647,11 +4621,11 @@ function SolanaTokenSelectStep({
                       fallback: entry.token.symbol.slice(0, 4)
                     }
                   ) }),
-                  chainIcon && /* @__PURE__ */ jsx21("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx21(CdnIcon, { src: chainIcon, alt: chainName }) })
+                  chainIcon && /* @__PURE__ */ jsx20("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx20(CdnIcon, { src: chainIcon, alt: chainName }) })
                 ] }),
                 /* @__PURE__ */ jsxs17("div", { className: "rs-asset-text", children: [
                   /* @__PURE__ */ jsxs17("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx21("span", { className: "rs-asset-name", children: entry.token.symbol }),
+                    /* @__PURE__ */ jsx20("span", { className: "rs-asset-name", children: entry.token.symbol }),
                     /* @__PURE__ */ jsxs17("span", { className: "rs-asset-chain", children: [
                       "on ",
                       chainName
@@ -4664,13 +4638,13 @@ function SolanaTokenSelectStep({
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx21("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
+              /* @__PURE__ */ jsx20("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
             ]
           },
           entry.token.symbol
         );
       }) }),
-      /* @__PURE__ */ jsx21(
+      /* @__PURE__ */ jsx20(
         Button,
         {
           onClick: () => selectedEntry && onContinue(
@@ -4684,14 +4658,14 @@ function SolanaTokenSelectStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx21(PoweredBy, {})
+    /* @__PURE__ */ jsx20(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
-import { useCallback as useCallback6, useEffect as useEffect11, useMemo as useMemo6, useRef as useRef7, useState as useState11 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect11, useMemo as useMemo6, useRef as useRef7, useState as useState11 } from "react";
 import { formatUnits as formatUnits5, parseUnits as parseUnits4 } from "viem";
-import { Fragment as Fragment5, jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx21, jsxs as jsxs18 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
   { value: 25, label: "25%" },
@@ -4767,7 +4741,7 @@ function SolanaAmountStep({
       return null;
     }
   }, [spendableBalance, token.decimals, tokenPriceUsd]);
-  const computePresetAmount = useCallback6(
+  const computePresetAmount = useCallback5(
     (percentage) => {
       try {
         const spendableUnits = Number(
@@ -4899,10 +4873,10 @@ function SolanaAmountStep({
   const continueDisabled = exceedsBalance || boundViolation !== null || numericAmount === 0 && !isBelowMin;
   return /* @__PURE__ */ jsxs18("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs18("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx22(BodyHeader, { icon: /* @__PURE__ */ jsx22(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsx21(BodyHeader, { icon: /* @__PURE__ */ jsx21(WalletIcon, {}), title: "Wallet deposit" }),
       /* @__PURE__ */ jsxs18("div", { className: "rs-amount-section", children: [
         /* @__PURE__ */ jsxs18("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsx22(
+          /* @__PURE__ */ jsx21(
             AnimatedAmountInput,
             {
               value: amount,
@@ -4929,7 +4903,7 @@ function SolanaAmountStep({
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx22("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx22(
+        /* @__PURE__ */ jsx21("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx21(
           "button",
           {
             type: "button",
@@ -4942,13 +4916,13 @@ function SolanaAmountStep({
       ] }),
       /* @__PURE__ */ jsxs18("div", { className: "rs-amount-details", children: [
         /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx22("span", { children: "You send" }),
+          /* @__PURE__ */ jsx21("span", { children: "You send" }),
           /* @__PURE__ */ jsxs18("span", { className: "rs-amount-detail-value", children: [
             /* @__PURE__ */ jsxs18("span", { children: [
               "Solana ",
               token.symbol
             ] }),
-            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(
+            /* @__PURE__ */ jsx21("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx21(
               TokenIcon,
               {
                 token: { chain: "solana", address: token.mint },
@@ -4958,23 +4932,23 @@ function SolanaAmountStep({
           ] })
         ] }),
         targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx22("span", { children: "Receive" }),
+          /* @__PURE__ */ jsx21("span", { children: "Receive" }),
           /* @__PURE__ */ jsxs18("span", { className: "rs-amount-detail-value", children: [
             /* @__PURE__ */ jsxs18("span", { children: [
               targetChainName,
               " ",
               targetTokenSymbol
             ] }),
-            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(TokenIcon, { token: targetToken, symbol: targetTokenSymbol }) })
+            /* @__PURE__ */ jsx21("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx21(TokenIcon, { token: targetToken, symbol: targetTokenSymbol }) })
           ] })
         ] }),
         balanceAfterUsd !== null && /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx22("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+          /* @__PURE__ */ jsx21("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx21("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsx22(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx22(
+      error && /* @__PURE__ */ jsx21(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx21(
         Button,
         {
           onClick: handleContinue,
@@ -4984,7 +4958,7 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx22(PoweredBy, {})
+    /* @__PURE__ */ jsx21(PoweredBy, {})
   ] });
 }
 
@@ -5102,7 +5076,7 @@ async function sendSolanaTransaction(provider, _connection, transaction) {
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { jsx as jsx23, jsxs as jsxs19 } from "react/jsx-runtime";
+import { jsx as jsx22, jsxs as jsxs19 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -5255,8 +5229,8 @@ function SolanaConfirmStep({
   };
   return /* @__PURE__ */ jsxs19("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs19("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx23(BodyHeader, { icon: /* @__PURE__ */ jsx23(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsx23(
+      /* @__PURE__ */ jsx22(BodyHeader, { icon: /* @__PURE__ */ jsx22(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsx22(
         ReviewDetails,
         {
           sourceChainName,
@@ -5273,8 +5247,8 @@ function SolanaConfirmStep({
           fee: { display: "$0.04", struck: feeSponsored, tooltip: feeTooltip }
         }
       ),
-      error && /* @__PURE__ */ jsx23(Callout, { variant: "error", children: error }),
-      /* @__PURE__ */ jsx23(
+      error && /* @__PURE__ */ jsx22(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx22(
         Button,
         {
           onClick: handleConfirm,
@@ -5286,12 +5260,12 @@ function SolanaConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx23(PoweredBy, {})
+    /* @__PURE__ */ jsx22(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/DappImportAssetSelectStep.tsx
-import { jsx as jsx24, jsxs as jsxs20 } from "react/jsx-runtime";
+import { jsx as jsx23, jsxs as jsxs20 } from "react/jsx-runtime";
 function DappImportAssetSelectStep({
   sourceLabel,
   assets,
@@ -5300,16 +5274,16 @@ function DappImportAssetSelectStep({
 }) {
   return /* @__PURE__ */ jsxs20("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs20("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx24(
+      /* @__PURE__ */ jsx23(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx24(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx23(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      incompleteSummary && /* @__PURE__ */ jsx24("div", { className: "rs-asset-notice", role: "status", children: incompleteSummary }),
-      /* @__PURE__ */ jsx24("div", { className: "rs-asset-list", children: assets.map((asset) => {
+      incompleteSummary && /* @__PURE__ */ jsx23("div", { className: "rs-asset-notice", role: "status", children: incompleteSummary }),
+      /* @__PURE__ */ jsx23("div", { className: "rs-asset-list", children: assets.map((asset) => {
         const tokenAmount = asset.balance ? tokenFormatter.format(
           Number(asset.balance) / 10 ** asset.decimals
         ) : "0";
@@ -5326,7 +5300,7 @@ function DappImportAssetSelectStep({
             children: [
               /* @__PURE__ */ jsxs20("div", { className: "rs-asset-info", children: [
                 /* @__PURE__ */ jsxs20("div", { className: "rs-asset-icon-wrapper", children: [
-                  /* @__PURE__ */ jsx24("span", { className: "rs-asset-icon", children: assetIcon ? /* @__PURE__ */ jsx24(CdnIcon, { src: assetIcon, alt: asset.symbol }) : /* @__PURE__ */ jsx24(
+                  /* @__PURE__ */ jsx23("span", { className: "rs-asset-icon", children: assetIcon ? /* @__PURE__ */ jsx23(CdnIcon, { src: assetIcon, alt: asset.symbol }) : /* @__PURE__ */ jsx23(
                     TokenIcon,
                     {
                       token: { chain: asset.chainId, address: asset.token },
@@ -5334,7 +5308,7 @@ function DappImportAssetSelectStep({
                       fallback: asset.symbol.slice(0, 4)
                     }
                   ) }),
-                  chainIcon ? /* @__PURE__ */ jsx24("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx24(CdnIcon, { src: chainIcon, alt: getChainName(asset.chainId) }) }) : /* @__PURE__ */ jsx24(
+                  chainIcon ? /* @__PURE__ */ jsx23("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx23(CdnIcon, { src: chainIcon, alt: getChainName(asset.chainId) }) }) : /* @__PURE__ */ jsx23(
                     "span",
                     {
                       className: "rs-asset-chain-badge",
@@ -5345,7 +5319,7 @@ function DappImportAssetSelectStep({
                 ] }),
                 /* @__PURE__ */ jsxs20("div", { className: "rs-asset-text", children: [
                   /* @__PURE__ */ jsxs20("div", { className: "rs-asset-name-row", children: [
-                    /* @__PURE__ */ jsx24("span", { className: "rs-asset-name", children: asset.symbol }),
+                    /* @__PURE__ */ jsx23("span", { className: "rs-asset-name", children: asset.symbol }),
                     /* @__PURE__ */ jsxs20("span", { className: "rs-asset-chain", children: [
                       "on ",
                       asset.sourceLabel,
@@ -5359,20 +5333,20 @@ function DappImportAssetSelectStep({
                   ] })
                 ] })
               ] }),
-              /* @__PURE__ */ jsx24("div", { className: "rs-asset-balance", children: balanceUsd })
+              /* @__PURE__ */ jsx23("div", { className: "rs-asset-balance", children: balanceUsd })
             ]
           },
           asset.id
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx24(PoweredBy, {})
+    /* @__PURE__ */ jsx23(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
 
 // src/components/steps/DappImportSelectStep.tsx
-import { jsx as jsx25, jsxs as jsxs21 } from "react/jsx-runtime";
+import { jsx as jsx24, jsxs as jsxs21 } from "react/jsx-runtime";
 function describeRow(status, comingSoon) {
   if (comingSoon) {
     return { subtitle: "Coming soon", disabled: true, busy: false };
@@ -5410,28 +5384,28 @@ function DappImportSelectStep({
   const brands = DAPP_IMPORT_CATALOG.filter((brand) => enabled.has(brand.id));
   return /* @__PURE__ */ jsxs21("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs21("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx25(
+      /* @__PURE__ */ jsx24(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx25(MigrateAssetsIcon, {}),
+          icon: /* @__PURE__ */ jsx24(MigrateAssetsIcon, {}),
           title: "Migrate assets",
           subtitle: "Select a position to migrate"
         }
       ),
-      /* @__PURE__ */ jsx25("div", { className: "rs-list", children: brands.map((brand) => {
+      /* @__PURE__ */ jsx24("div", { className: "rs-list", children: brands.map((brand) => {
         const status = byId.get(brand.id);
         const { subtitle, disabled, busy } = describeRow(
           status,
           Boolean(brand.comingSoon)
         );
-        return /* @__PURE__ */ jsx25(
+        return /* @__PURE__ */ jsx24(
           ListRow,
           {
             leadingMedia: brand.iconUrl,
             title: brand.label,
             subtitle,
             disabled,
-            trailing: busy ? /* @__PURE__ */ jsx25(Spinner, { className: "rs-spinner--sm" }) : void 0,
+            trailing: busy ? /* @__PURE__ */ jsx24(Spinner, { className: "rs-spinner--sm" }) : void 0,
             onClick: () => {
               if (status === "needs-connect") {
                 onRequestConnect?.();
@@ -5444,13 +5418,13 @@ function DappImportSelectStep({
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx25(PoweredBy, {})
+    /* @__PURE__ */ jsx24(PoweredBy, {})
   ] });
 }
 DappImportSelectStep.displayName = "DappImportSelectStep";
 
 // src/components/steps/DappImportAssetSelectSkeleton.tsx
-import { jsx as jsx26, jsxs as jsxs22 } from "react/jsx-runtime";
+import { jsx as jsx25, jsxs as jsxs22 } from "react/jsx-runtime";
 function DappImportAssetSelectSkeleton({
   sourceLabel,
   rowCount = 3,
@@ -5458,64 +5432,64 @@ function DappImportAssetSelectSkeleton({
   onRetry
 }) {
   return /* @__PURE__ */ jsxs22("div", { className: "rs-screen", "aria-busy": error ? "false" : "true", children: [
-    /* @__PURE__ */ jsx26("span", { className: "rs-sr-only", role: "status", children: error ? "Couldn't load balances" : "Loading balances\u2026" }),
+    /* @__PURE__ */ jsx25("span", { className: "rs-sr-only", role: "status", children: error ? "Couldn't load balances" : "Loading balances\u2026" }),
     /* @__PURE__ */ jsxs22("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx26(
+      /* @__PURE__ */ jsx25(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx26(WalletIcon, {}),
+          icon: /* @__PURE__ */ jsx25(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      error ? /* @__PURE__ */ jsx26("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsxs22("div", { className: "rs-loading-text", children: [
-        /* @__PURE__ */ jsx26("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t load your balances" }),
-        /* @__PURE__ */ jsx26("div", { className: "rs-loading-subtitle", children: "Check your connection and try again." })
-      ] }) }) : /* @__PURE__ */ jsx26("div", { className: "rs-asset-list", "aria-hidden": "true", children: Array.from({ length: rowCount }, (_, index) => /* @__PURE__ */ jsxs22(
+      error ? /* @__PURE__ */ jsx25("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsxs22("div", { className: "rs-loading-text", children: [
+        /* @__PURE__ */ jsx25("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t load your balances" }),
+        /* @__PURE__ */ jsx25("div", { className: "rs-loading-subtitle", children: "Check your connection and try again." })
+      ] }) }) : /* @__PURE__ */ jsx25("div", { className: "rs-asset-list", "aria-hidden": "true", children: Array.from({ length: rowCount }, (_, index) => /* @__PURE__ */ jsxs22(
         "div",
         {
           className: "rs-asset-row rs-asset-row--skeleton",
           children: [
             /* @__PURE__ */ jsxs22("div", { className: "rs-asset-info", children: [
               /* @__PURE__ */ jsxs22("div", { className: "rs-asset-icon-wrapper", children: [
-                /* @__PURE__ */ jsx26("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-fill" }) }),
-                /* @__PURE__ */ jsx26("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-fill" }) })
+                /* @__PURE__ */ jsx25("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx25("span", { className: "rs-skeleton rs-skeleton-fill" }) }),
+                /* @__PURE__ */ jsx25("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx25("span", { className: "rs-skeleton rs-skeleton-fill" }) })
               ] }),
               /* @__PURE__ */ jsxs22("div", { className: "rs-asset-text", children: [
-                /* @__PURE__ */ jsx26("div", { className: "rs-asset-name-row", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--name" }) }),
-                /* @__PURE__ */ jsx26("div", { className: "rs-asset-balance-small", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--balance" }) })
+                /* @__PURE__ */ jsx25("div", { className: "rs-asset-name-row", children: /* @__PURE__ */ jsx25("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--name" }) }),
+                /* @__PURE__ */ jsx25("div", { className: "rs-asset-balance-small", children: /* @__PURE__ */ jsx25("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--balance" }) })
               ] })
             ] }),
-            /* @__PURE__ */ jsx26("div", { className: "rs-asset-balance", children: /* @__PURE__ */ jsx26("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--usd" }) })
+            /* @__PURE__ */ jsx25("div", { className: "rs-asset-balance", children: /* @__PURE__ */ jsx25("span", { className: "rs-skeleton rs-skeleton-text rs-skeleton-text--usd" }) })
           ]
         },
         index
       )) })
     ] }),
-    error && onRetry && /* @__PURE__ */ jsx26("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx26(
+    error && onRetry && /* @__PURE__ */ jsx25("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx25(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx26("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx25("span", { children: "Try again" })
       }
     ) }),
-    /* @__PURE__ */ jsx26(PoweredBy, {})
+    /* @__PURE__ */ jsx25(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectSkeleton.displayName = "DappImportAssetSelectSkeleton";
 
 // src/core/fiat-methods.ts
 var REGIONAL_METHODS_TIMEOUT_MS = 3e3;
-var BUILT_IN_ICON_METHODS = /* @__PURE__ */ new Set([
+var PRODUCT_METHODS = /* @__PURE__ */ new Set([
   "creditcard",
   "bank-transfer",
   "apple-pay"
 ]);
 function serverMethodToOption(m) {
   const icon = m.method === "bank-transfer" ? "bank" : m.method === "apple-pay" ? "apple" : "card";
-  const remoteIcon = BUILT_IN_ICON_METHODS.has(m.method) ? {} : {
+  const remoteIcon = PRODUCT_METHODS.has(m.method) ? {} : {
     iconUrl: m.iconUrl ?? void 0,
     iconUrlLight: m.iconUrlLight ?? void 0
   };
@@ -5550,8 +5524,9 @@ function composeFiatMethods(regional, fallbackMethods) {
       source: "fallback"
     };
   }
-  if (regional.methods.length === 0) return { kind: "hidden" };
-  const methods = dedupe(regional.methods.map(serverMethodToOption));
+  const methods = dedupe(
+    regional.methods.filter((m) => PRODUCT_METHODS.has(m.method) || m.badge === "Popular").map(serverMethodToOption)
+  );
   if (methods.length === 0) return { kind: "hidden" };
   const recommendedMethod = regional.recommendedMethod && methods.some(({ method }) => method === regional.recommendedMethod) ? regional.recommendedMethod : methods[0].method;
   return {
@@ -6127,7 +6102,7 @@ import {
   useContext,
   useMemo as useMemo7
 } from "react";
-import { jsx as jsx27 } from "react/jsx-runtime";
+import { jsx as jsx26 } from "react/jsx-runtime";
 function fundingMethodForFlowMode(mode) {
   switch (mode) {
     case "wallet":
@@ -6188,7 +6163,16 @@ function analyticsStepForFlowStep(method, step) {
       return "funding_method_home";
   }
 }
+var BANK_FAILURES = {
+  BANK_ONRAMP_OPTIONS_FAILED: "bank_options_failed",
+  BANK_ONRAMP_SESSION_REFUSED: "bank_session_refused",
+  BANK_ONRAMP_SETUP_FAILED: "bank_setup_failed",
+  BANK_ONRAMP_DETAILS_FAILED: "bank_details_failed",
+  BANK_ONRAMP_DETAILS_PENDING: "bank_details_pending"
+};
 function failureReasonForCode(code, cause) {
+  const bank = code ? BANK_FAILURES[code] : void 0;
+  if (bank) return bank;
   const normalized = `${code ?? ""} ${cause ?? ""}`.toLowerCase();
   if (normalized.includes("uncertain")) return "submission_uncertain";
   if (normalized.includes("reject") && (normalized.includes("sign") || normalized.includes("permit"))) {
@@ -6423,7 +6407,7 @@ function DepositAnalyticsControllerProvider({
     [emit]
   );
   if (controllerRef) controllerRef.current = controller;
-  return /* @__PURE__ */ jsx27(DepositAnalyticsControllerContext.Provider, { value: controller, children });
+  return /* @__PURE__ */ jsx26(DepositAnalyticsControllerContext.Provider, { value: controller, children });
 }
 function useDepositAnalyticsController() {
   return useContext(DepositAnalyticsControllerContext) ?? noopController;
@@ -6505,7 +6489,8 @@ function createInitialState(overrides) {
     },
     fiat: {
       selectedMethod: null,
-      methodSelectionSource: null
+      methodSelectionSource: null,
+      selectedProvider: null
     },
     exchange: {
       selectedConnection: null
@@ -6793,7 +6778,8 @@ function applyAction(state, action) {
         fiat: {
           ...state.fiat,
           selectedMethod: action.paymentMethod ?? null,
-          methodSelectionSource: action.methodSelectionSource ?? null
+          methodSelectionSource: action.methodSelectionSource ?? null,
+          selectedProvider: action.provider ?? null
         },
         // Pin on ENTRY, not on submit: a Swapped order only reports a
         // submission on terminal success, so between paying and that callback
@@ -7374,7 +7360,11 @@ function applyAction(state, action) {
           byKey: {},
           nextRequestId: state.portfolio.nextRequestId
         },
-        fiat: { selectedMethod: null, methodSelectionSource: null },
+        fiat: {
+          selectedMethod: null,
+          methodSelectionSource: null,
+          selectedProvider: null
+        },
         exchange: { selectedConnection: null }
       };
     }
@@ -7450,11 +7440,7 @@ function useDepositStore(selector) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment6, jsx as jsx28, jsxs as jsxs23 } from "react/jsx-runtime";
-var BankOnrampStep = lazy2(async () => {
-  const module = await import("./BankOnrampStep-JG32OCM2.mjs");
-  return { default: module.BankOnrampStep };
-});
+import { Fragment as Fragment6, jsx as jsx27, jsxs as jsxs23 } from "react/jsx-runtime";
 function swappedWidgetPrefetchKey(method, methodSelectionSource) {
   return JSON.stringify([methodSelectionSource ?? null, method ?? null]);
 }
@@ -7463,17 +7449,17 @@ function AccountPreparingSkeleton({
   onRetry
 }) {
   return /* @__PURE__ */ jsxs23("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx28("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs23(Fragment6, { children: [
-      /* @__PURE__ */ jsx28("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
-      /* @__PURE__ */ jsx28("div", { className: "rs-loading-subtitle", children: errorMessage })
-    ] }) : /* @__PURE__ */ jsx28("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
-    errorMessage && onRetry && /* @__PURE__ */ jsx28("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx28(
+    /* @__PURE__ */ jsx27("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs23(Fragment6, { children: [
+      /* @__PURE__ */ jsx27("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx27("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx27("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx27("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx27(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx28("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx27("span", { children: "Try again" })
       }
     ) })
   ] });
@@ -7557,7 +7543,8 @@ function deriveStep(flow, d, p, activeEntry, fiat, exchange) {
         type: "fiat-onramp",
         smartAccount: committedAccount,
         paymentMethod: fiat.selectedMethod ?? void 0,
-        methodSelectionSource: fiat.methodSelectionSource ?? void 0
+        methodSelectionSource: fiat.methodSelectionSource ?? void 0,
+        provider: fiat.selectedProvider ?? void 0
       };
     case "exchange-select":
       return { type: "exchange-select" };
@@ -7725,7 +7712,8 @@ function DepositFlow({
   initialAssetMigration,
   enableWallet = true,
   enableFiatOnramp = false,
-  bankOnramp,
+  virtualAccountOnramp,
+  getCustomerSession,
   onBankJourney,
   backendUrl,
   enableQrTransfer = true,
@@ -7769,20 +7757,20 @@ function DepositFlow({
   const [totalBalanceUsd, setTotalBalanceUsd] = useState13(0);
   const stableWalletSignerRef = useRef9(null);
   const stableWalletSelectionKeyRef = useRef9(null);
-  const logFlow = useCallback7(
+  const logFlow = useCallback6(
     (message, data) => {
       debugLog(debug, "deposit-flow", message, data);
     },
     [debug]
   );
-  const logFlowError = useCallback7(
+  const logFlowError = useCallback6(
     (message, error, data) => {
       debugError(debug, "deposit-flow", message, error, data);
     },
     [debug]
   );
   const bankOnrampEnabled = Boolean(
-    bankOnramp && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
+    virtualAccountOnramp && getCustomerSession && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
   );
   const hasSwappedFiatMethod = Boolean(
     enableFiatOnramp && (!fiatMethods || Object.entries(fiatMethods).some(
@@ -8129,7 +8117,7 @@ function DepositFlow({
     ]
   );
   const step = effectiveStep;
-  const handleBack = useCallback7(() => {
+  const handleBack = useCallback6(() => {
     if ([
       "deposit-address",
       "select-asset",
@@ -8157,7 +8145,7 @@ function DepositFlow({
     hasWalletOptions,
     walletSession
   ]);
-  const handleProviderBack = useCallback7(() => {
+  const handleProviderBack = useCallback6(() => {
     analytics.abandon("provider_back");
     analytics.resetAttempt(
       flowMode === "exchange-connect" ? "exchange_connect" : null
@@ -8167,7 +8155,7 @@ function DepositFlow({
       hasWalletOptions: hasWalletOptions || Boolean(walletSession)
     });
   }, [analytics, flowMode, storeApi, hasWalletOptions, walletSession]);
-  const handleWalletDisconnect = useCallback7(() => {
+  const handleWalletDisconnect = useCallback6(() => {
     analytics.abandon("wallet_disconnect");
     analytics.resetAttempt();
     onDisconnect?.();
@@ -8290,11 +8278,11 @@ function DepositFlow({
   const isDappImportMode = flowMode === "dapp-import";
   const isFiatOnrampMode = flowMode === "fiat-onramp";
   const isExchangeConnectMode = flowMode === "exchange-connect";
-  const handleSelectTransferCrypto = useCallback7(() => {
+  const handleSelectTransferCrypto = useCallback6(() => {
     analytics.selectMethod("transfer", "user");
     storeApi.dispatch({ type: "connect/transfer-crypto-selected" });
   }, [analytics, storeApi]);
-  const handleConfirmWallet = useCallback7(
+  const handleConfirmWallet = useCallback6(
     (walletId) => {
       const selectedOption = walletOptions.find((o) => o.id === walletId);
       const mode = selectedOption?.kind === "solana" ? "solana-wallet" : "wallet";
@@ -8325,7 +8313,7 @@ function DepositFlow({
     ) ?? null : null,
     [initialAssetMigration, enabledDappImportProviders]
   );
-  const handleSelectDappImport = useCallback7(
+  const handleSelectDappImport = useCallback6(
     (providerId) => {
       const owner = dappImportOwner;
       if (owner) {
@@ -8349,7 +8337,7 @@ function DepositFlow({
     },
     [analytics, storeApi, walletOptions, dappImportOwner]
   );
-  const handleDappImportAssetSelected = useCallback7(
+  const handleDappImportAssetSelected = useCallback6(
     (asset) => {
       storeApi.dispatch({ type: "dapp-import/asset-selected", asset });
     },
@@ -8569,7 +8557,7 @@ function DepositFlow({
     analytics,
     storeApi
   ]);
-  const handleBootRetry = useCallback7(() => {
+  const handleBootRetry = useCallback6(() => {
     analytics.retry("migration_availability_failed", "migration_boot_resolve");
     const snapshot = storeApi.getState();
     const providerId = snapshot.dappImport.activeProviderId;
@@ -8593,32 +8581,34 @@ function DepositFlow({
       providerId
     });
   }, [analytics, storeApi, dappImportOwner]);
-  const handleSelectFiatMethod = useCallback7(
-    (paymentMethod, methodSelectionSource) => {
+  const handleSelectFiatMethod = useCallback6(
+    (paymentMethod, methodSelectionSource, provider = "swapped") => {
       analytics.selectMethod("fiat_onramp", "user", {
         payment_method: paymentMethod,
-        source: methodSelectionSource
+        source: methodSelectionSource,
+        provider
       });
       storeApi.dispatch({
         type: "connect/fiat-onramp-selected",
         paymentMethod,
-        methodSelectionSource
+        methodSelectionSource,
+        provider
       });
     },
     [analytics, storeApi]
   );
-  const handleSelectExchange = useCallback7(() => {
+  const handleSelectExchange = useCallback6(() => {
     analytics.selectMethod("exchange_connect", "user");
     storeApi.dispatch({ type: "connect/exchange-selected" });
   }, [analytics, storeApi]);
   const swappedAnalyticsCorrelatorRef = useRef9(null);
-  const handleSwappedAttemptConsumed = useCallback7(
+  const handleSwappedAttemptConsumed = useCallback6(
     (externalCustomerId) => {
       swappedAnalyticsCorrelatorRef.current = externalCustomerId;
     },
     []
   );
-  const handleSwappedProviderHandoff = useCallback7(() => {
+  const handleSwappedProviderHandoff = useCallback6(() => {
     const externalCustomerId = swappedAnalyticsCorrelatorRef.current;
     if (!externalCustomerId) return;
     analytics.handoff(
@@ -8627,7 +8617,7 @@ function DepositFlow({
       flowMode === "exchange-connect" ? "exchange_provider_handoff" : "fiat_provider_handoff"
     );
   }, [analytics, flowMode]);
-  const handleSwappedRetry = useCallback7(() => {
+  const handleSwappedRetry = useCallback6(() => {
     analytics.retry(
       "swapped_mint_failed",
       flowMode === "exchange-connect" ? "exchange_provider_mint" : "fiat_provider_mint"
@@ -8635,7 +8625,7 @@ function DepositFlow({
     swappedAnalyticsCorrelatorRef.current = null;
   }, [analytics, flowMode]);
   const swappedConnectUrlRef = useRef9(/* @__PURE__ */ new Map());
-  const handleSelectExchangeConnection = useCallback7(
+  const handleSelectExchangeConnection = useCallback6(
     async (connection) => {
       if (setupSlice.status !== "ready" || !setupSlice.smartAccount) {
         throw new Error("Deposit account is not ready");
@@ -8666,7 +8656,7 @@ function DepositFlow({
     },
     [analytics, service, setupSlice.status, setupSlice.smartAccount, storeApi]
   );
-  const loadSwappedConnectUrl = useCallback7(
+  const loadSwappedConnectUrl = useCallback6(
     async (smartAccount, connection) => {
       const key = `${smartAccount.toLowerCase()}:${connection}`;
       const entry = swappedConnectUrlRef.current.get(key);
@@ -8676,7 +8666,7 @@ function DepositFlow({
     [service]
   );
   const swappedUrlPrefetchRef = useRef9(/* @__PURE__ */ new Map());
-  const prefetchSwappedWidgetUrl = useCallback7(
+  const prefetchSwappedWidgetUrl = useCallback6(
     (smartAccount, method, methodSelectionSource) => {
       const cache = swappedUrlPrefetchRef.current;
       const key = swappedWidgetPrefetchKey(method, methodSelectionSource);
@@ -8698,7 +8688,7 @@ function DepositFlow({
     },
     [service, logFlow]
   );
-  const consumeSwappedWidgetUrlPrefetch = useCallback7(
+  const consumeSwappedWidgetUrlPrefetch = useCallback6(
     (smartAccount, method, methodSelectionSource) => {
       const cache = swappedUrlPrefetchRef.current;
       const key = swappedWidgetPrefetchKey(method, methodSelectionSource);
@@ -8710,7 +8700,7 @@ function DepositFlow({
     },
     []
   );
-  const handlePrefetchFiatMethod = useCallback7(
+  const handlePrefetchFiatMethod = useCallback6(
     (method, methodSelectionSource) => {
       if (!fiatEnabled) return;
       if (setupSlice.status !== "ready" || !setupSlice.smartAccount) return;
@@ -8732,6 +8722,26 @@ function DepositFlow({
     swappedConnectUrlRef.current.clear();
   }, [setupSlice.smartAccount]);
   const hasConfiguredFiatMethods = fiatMethods !== void 0;
+  const [providers, setProviders] = useState13("loading");
+  useEffect13(() => {
+    if (!enableFiatOnramp && !bankOnrampEnabled && !enableExchangeConnect) {
+      return;
+    }
+    let settled = false;
+    const settle = (list) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      setProviders(list);
+    };
+    setProviders("loading");
+    const timer = setTimeout(() => settle(null), REGIONAL_METHODS_TIMEOUT_MS);
+    void service.getOnrampProviders().then(settle);
+    return () => {
+      settled = true;
+      clearTimeout(timer);
+    };
+  }, [bankOnrampEnabled, enableExchangeConnect, enableFiatOnramp, service]);
   const [regionalMethods, setRegionalMethods] = useState13({
     status: "loading",
     country: null,
@@ -8778,46 +8788,51 @@ function DepositFlow({
       clearTimeout(timeoutTimer);
     };
   }, [analytics, enableFiatOnramp, hasConfiguredFiatMethods, service]);
-  const swappedCashDisplay = useMemo8(
-    () => !enableFiatOnramp ? { kind: "hidden" } : hasConfiguredFiatMethods ? {
+  const swappedMethods = useMemo8(
+    () => hasConfiguredFiatMethods ? {
       kind: "list",
       methods: configuredFiatMethods,
       recommendedMethod: configuredFiatMethods[0]?.method ?? "bank-transfer",
       country: null,
       source: "configured"
     } : composeFiatMethods(regionalMethods, FIAT_ONRAMP_METHODS),
+    [configuredFiatMethods, hasConfiguredFiatMethods, regionalMethods]
+  );
+  const [noahNotServedFor, setNoahNotServedFor] = useState13(null);
+  const noahNotServed = noahNotServedFor !== null && noahNotServedFor === setupSlice.smartAccount?.toLowerCase();
+  const rampRowInputs = useMemo8(
+    () => ({
+      enableFiatOnramp,
+      virtualAccounts: Boolean(virtualAccountOnramp),
+      customerSession: Boolean(getCustomerSession),
+      bankTransferAllowed: fiatMethods === void 0 || fiatMethods["bank-transfer"] === true,
+      enableExchangeConnect,
+      providers,
+      swappedMethods,
+      bankRow: FIAT_ONRAMP_METHODS.find(({ method }) => method === "bank-transfer"),
+      noahNotServed
+    }),
     [
-      configuredFiatMethods,
+      enableExchangeConnect,
       enableFiatOnramp,
-      hasConfiguredFiatMethods,
-      regionalMethods
+      fiatMethods,
+      getCustomerSession,
+      noahNotServed,
+      providers,
+      swappedMethods,
+      virtualAccountOnramp
     ]
   );
-  const swappedOffersBank = swappedCashDisplay.kind === "list" && swappedCashDisplay.methods.some(({ method }) => method === "bank-transfer");
-  const [bankOnrampUnavailable, setBankOnrampUnavailable] = useState13(false);
-  const bankRowOffered = bankOnrampEnabled && !bankOnrampUnavailable;
-  const swappedRefusesBank = hasConfiguredFiatMethods ? !configuredFiatMethods.some(({ method }) => method === "bank-transfer") : regionalMethods.status === "ready" && regionalMethods.country !== null && !regionalMethods.methods.some(({ method }) => method === "bank-transfer");
-  const handleBankOnrampUnavailable = useCallback7(() => {
-    setBankOnrampUnavailable(true);
-    if (swappedRefusesBank) handleProviderBack();
-  }, [handleProviderBack, swappedRefusesBank]);
-  const cashDisplay = useMemo8(() => {
-    const swappedDisplay = swappedCashDisplay;
-    if (!bankRowOffered || swappedDisplay.kind === "loading") {
-      return swappedDisplay;
-    }
-    if (swappedOffersBank) return swappedDisplay;
-    const bankTransfer = FIAT_ONRAMP_METHODS.find(
-      ({ method }) => method === "bank-transfer"
-    );
-    return {
-      kind: "list",
-      methods: swappedDisplay.kind === "list" ? [...swappedDisplay.methods, bankTransfer] : [bankTransfer],
-      recommendedMethod: swappedDisplay.kind === "list" ? swappedDisplay.recommendedMethod : bankTransfer.method,
-      country: swappedDisplay.kind === "list" ? swappedDisplay.country : null,
-      source: swappedDisplay.kind === "list" ? swappedDisplay.source : "configured"
-    };
-  }, [bankRowOffered, swappedCashDisplay, swappedOffersBank]);
+  const rampRows = useMemo8(() => resolveRampRows(rampRowInputs), [rampRowInputs]);
+  const cashDisplay = rampRows.cash;
+  const handleNoahNotServed = useCallback6(
+    (smartAccount) => {
+      setNoahNotServedFor(smartAccount.toLowerCase());
+      const after = resolveRampRows({ ...rampRowInputs, noahNotServed: true });
+      if (after.notice) handleProviderBack();
+    },
+    [handleProviderBack, rampRowInputs]
+  );
   useEffect13(() => {
     if (cashDisplay.kind === "hidden" && fiatEnabled) {
       analytics.friction(
@@ -8832,22 +8847,25 @@ function DepositFlow({
     }
   }, [analytics, cashDisplay, fiatEnabled, hasConfiguredFiatMethods]);
   const displayedFiatSource = cashDisplay.kind === "list" ? cashDisplay.source : void 0;
-  const handleSelectDisplayedFiatMethod = useCallback7(
+  const providerOf = useCallback6(
+    (method) => cashDisplay.kind === "list" && cashDisplay.methods.find((m) => m.method === method)?.provider || "swapped",
+    [cashDisplay]
+  );
+  const handleSelectDisplayedFiatMethod = useCallback6(
     (method) => {
       if (!displayedFiatSource) return;
-      handleSelectFiatMethod(method, displayedFiatSource);
+      handleSelectFiatMethod(method, displayedFiatSource, providerOf(method));
     },
-    [displayedFiatSource, handleSelectFiatMethod]
+    [displayedFiatSource, handleSelectFiatMethod, providerOf]
   );
-  const handlePrefetchDisplayedFiatMethod = useCallback7(
+  const handlePrefetchDisplayedFiatMethod = useCallback6(
     (method) => {
-      if (!displayedFiatSource) return;
-      if (bankRowOffered && method === "bank-transfer") return;
+      if (!displayedFiatSource || providerOf(method) !== "swapped") return;
       handlePrefetchFiatMethod(method, displayedFiatSource);
     },
-    [bankRowOffered, displayedFiatSource, handlePrefetchFiatMethod]
+    [displayedFiatSource, handlePrefetchFiatMethod, providerOf]
   );
-  const handleNewDeposit = useCallback7(() => {
+  const handleNewDeposit = useCallback6(() => {
     analytics.completeStep();
     analytics.resetAttempt();
     onLifecycleRef.current?.({
@@ -8995,7 +9013,7 @@ function DepositFlow({
       })();
     });
   }, [desiredPortfolios, service, storeApi, portfolioSlice.byKey]);
-  const handleDepositAddressSubmitted = useCallback7(
+  const handleDepositAddressSubmitted = useCallback6(
     (data) => {
       logFlow("deposit-address:detected", {
         txHash: data.txHash,
@@ -9010,7 +9028,7 @@ function DepositFlow({
     },
     [analytics, logFlow, onLifecycleRef]
   );
-  const handleSolanaTokenContinue = useCallback7(
+  const handleSolanaTokenContinue = useCallback6(
     (token, balance, balanceUsd) => {
       logFlow("solana:token:continue", { token: token.symbol });
       storeApi.dispatch({
@@ -9023,7 +9041,7 @@ function DepositFlow({
     },
     [defaultAmount, logFlow, storeApi]
   );
-  const handleSolanaAmountContinue = useCallback7(
+  const handleSolanaAmountContinue = useCallback6(
     (token, sourceAmount, inputAmountUsd) => {
       const targetTokenPriceUsd = isTargetStablecoin ? 1 : targetMarketPriceRef.current;
       logFlow("solana:amount:continue", {
@@ -9043,7 +9061,7 @@ function DepositFlow({
     },
     [isTargetStablecoin, targetSymbol, logFlow, storeApi]
   );
-  const handleSolanaConfirmed = useCallback7(
+  const handleSolanaConfirmed = useCallback6(
     (txHash, amountUnits, routed) => {
       const depositAtSubmit = storeApi.getState().deposit;
       const tokenAtSubmit = depositAtSubmit.selectedSolanaToken;
@@ -9084,7 +9102,7 @@ function DepositFlow({
     },
     [analytics, logFlow, onLifecycleRef, storeApi]
   );
-  const handleAssetContinue = useCallback7(
+  const handleAssetContinue = useCallback6(
     (asset) => {
       analytics.completeStep("wallet_source_asset");
       storeApi.dispatch({
@@ -9095,7 +9113,7 @@ function DepositFlow({
     },
     [analytics, defaultAmount, storeApi]
   );
-  const handleAmountContinue = useCallback7(
+  const handleAmountContinue = useCallback6(
     (amount, targetAmount, balance) => {
       const entry = storeApi.getState().setup;
       if (entry.status !== "ready") return;
@@ -9110,13 +9128,13 @@ function DepositFlow({
     },
     [isTargetStablecoin, storeApi, activeOwner]
   );
-  const handleQrReviewRequested = useCallback7(
+  const handleQrReviewRequested = useCallback6(
     (asset) => {
       storeApi.dispatch({ type: "qr/review-requested", asset });
     },
     [storeApi]
   );
-  const handleQrAmountContinue = useCallback7(
+  const handleQrAmountContinue = useCallback6(
     (amount, targetAmount) => {
       const targetTokenPriceUsd = isTargetStablecoin ? 1 : targetMarketPriceRef.current;
       storeApi.dispatch({
@@ -9128,7 +9146,7 @@ function DepositFlow({
     },
     [isTargetStablecoin, storeApi]
   );
-  const handleDepositSubmitted = useCallback7(
+  const handleDepositSubmitted = useCallback6(
     (txHash, chainId, amount, token, quote, routed) => {
       logFlow("evm:submitted", {
         txHash,
@@ -9174,7 +9192,7 @@ function DepositFlow({
     },
     [analytics, flowMode, logFlow, storeApi]
   );
-  const handleSwappedComplete = useCallback7(
+  const handleSwappedComplete = useCallback6(
     (info) => {
       logFlow("swapped:complete", {
         txHash: info.txHash,
@@ -9231,7 +9249,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef, service, storeApi]
   );
-  const handleDepositSubmittedCallback = useCallback7(
+  const handleDepositSubmittedCallback = useCallback6(
     (txHash, sourceChain, amount) => {
       const depositAtSubmit = storeApi.getState().deposit;
       onLifecycleRef.current?.({
@@ -9245,7 +9263,7 @@ function DepositFlow({
     },
     [onLifecycleRef, storeApi]
   );
-  const handleDepositComplete = useCallback7(
+  const handleDepositComplete = useCallback6(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
       analytics.openStep(
@@ -9261,7 +9279,7 @@ function DepositFlow({
     },
     [analytics, analyticsMethod, logFlow, onLifecycleRef]
   );
-  const handleDepositFailed = useCallback7(
+  const handleDepositFailed = useCallback6(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
       analytics.openStep(
@@ -9273,7 +9291,7 @@ function DepositFlow({
     },
     [analytics, analyticsMethod, logFlowError, onLifecycleRef]
   );
-  const handleError = useCallback7(
+  const handleError = useCallback6(
     (message, code, cause) => {
       logFlowError("flow:error", cause ?? message, { code });
       if (code === "PROCESS_TIMEOUT") {
@@ -9295,7 +9313,7 @@ function DepositFlow({
     },
     [analytics, logFlowError, onErrorRef]
   );
-  const handleTotalBalanceComputed = useCallback7((total) => {
+  const handleTotalBalanceComputed = useCallback6((total) => {
     setTotalBalanceUsd(total);
   }, []);
   useEffect13(() => {
@@ -9348,12 +9366,12 @@ function DepositFlow({
   }, [enableWallet, walletOptions, setupSlice, portfolioSlice]);
   const transferCryptoEntry = setupSlice;
   const transferCryptoState = transferCryptoEntry.status === "ready" ? "ready" : transferCryptoEntry.status === "error" ? "error" : "loading";
-  const handleRetrySetup = useCallback7(() => {
+  const handleRetrySetup = useCallback6(() => {
     analytics.retry("account_setup_failed", "account_setup");
     storeApi.dispatch({ type: "setup/retry-requested" });
   }, [analytics, storeApi]);
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx28("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx28(
+    return /* @__PURE__ */ jsx27("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx27(
       ConnectStep,
       {
         title: payment ? "Pay" : void 0,
@@ -9375,11 +9393,12 @@ function DepositFlow({
         ),
         fiatPaymentMethods: cashDisplay.kind === "list" ? cashDisplay.methods : void 0,
         fiatLoading: cashDisplay.kind === "loading",
-        fiatNotice: bankOnrampUnavailable && swappedRefusesBank ? "Bank transfer isn't available in your region." : void 0,
+        fiatNotice: rampRows.notice ?? void 0,
         recommendedMethod: cashDisplay.kind === "list" ? cashDisplay.recommendedMethod : void 0,
         onSelectFiatMethod: cashDisplay.kind === "list" ? handleSelectDisplayedFiatMethod : void 0,
         onPrefetchFiatMethod: cashDisplay.kind === "list" ? handlePrefetchDisplayedFiatMethod : void 0,
-        onSelectFundFromExchange: enableExchangeConnect ? () => handleSelectExchange() : void 0,
+        onSelectFundFromExchange: rampRows.exchange === "hidden" ? void 0 : () => handleSelectExchange(),
+        fundFromExchangeLoading: rampRows.exchange === "loading",
         onRequestConnect: enableWallet ? onRequestConnect : void 0,
         onConnect: enableWallet ? onConnect : void 0,
         onDisconnect,
@@ -9412,14 +9431,14 @@ function DepositFlow({
   }
   if (isDepositAddressMode) {
     return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx28(
+      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx27(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.message ?? void 0,
           onRetry: () => handleRetrySetup()
         }
-      ) : /* @__PURE__ */ jsx28(DepositAddressSkeleton, { uiConfig })),
-      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx28(
+      ) : /* @__PURE__ */ jsx27(DepositAddressSkeleton, { uiConfig })),
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx27(
         DepositAddressStep,
         {
           payment,
@@ -9464,7 +9483,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx27(
         AmountStep,
         {
           asset: effectiveStep.asset,
@@ -9480,7 +9499,7 @@ function DepositFlow({
           onContinue: handleQrAmountContinue
         }
       ),
-      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx27(
         QrReviewStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -9496,30 +9515,21 @@ function DepositFlow({
       )
     ] });
   }
+  const rampCallbacks = {
+    service,
+    onSwappedComplete: handleSwappedComplete,
+    onSwappedFailed: handleDepositFailed,
+    onClose: () => onClose?.(openExternally ? "native_dismiss_request" : "header_button"),
+    onGoBack: handleProviderBack,
+    onError: handleError,
+    onAttemptConsumed: handleSwappedAttemptConsumed,
+    onProviderHandoff: handleSwappedProviderHandoff,
+    onRetry: handleSwappedRetry,
+    onCancelled: () => analytics.outcome("cancelled"),
+    onImmersiveChange: onSwappedImmersiveChange,
+    openExternally
+  };
   if (isFiatOnrampMode) {
-    const swappedStep = step.type === "fiat-onramp" ? /* @__PURE__ */ jsx28(
-      FiatOnrampStep,
-      {
-        smartAccount: step.smartAccount,
-        service,
-        paymentMethod: step.paymentMethod,
-        methodSelectionSource: step.methodSelectionSource,
-        consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch,
-        onSwappedComplete: handleSwappedComplete,
-        onSwappedFailed: handleDepositFailed,
-        onClose: () => onClose?.(
-          openExternally ? "native_dismiss_request" : "header_button"
-        ),
-        onGoBack: handleProviderBack,
-        onError: handleError,
-        onAttemptConsumed: handleSwappedAttemptConsumed,
-        onProviderHandoff: handleSwappedProviderHandoff,
-        onRetry: handleSwappedRetry,
-        onCancelled: () => analytics.outcome("cancelled"),
-        onImmersiveChange: onSwappedImmersiveChange,
-        openExternally
-      }
-    ) : null;
     return /* @__PURE__ */ jsxs23(
       "div",
       {
@@ -9527,29 +9537,34 @@ function DepositFlow({
         "data-flow-mode": "fiat-onramp",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx28(
+          step.type === "setup" && /* @__PURE__ */ jsx27(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "fiat-onramp" && bankRowOffered && bankOnramp && step.paymentMethod === "bank-transfer" && /* @__PURE__ */ jsx28(Suspense2, { fallback: /* @__PURE__ */ jsx28(AccountPreparingSkeleton, {}), children: /* @__PURE__ */ jsx28(
-            BankOnrampStep,
+          step.type === "fiat-onramp" && /* @__PURE__ */ jsx27(Suspense2, { fallback: /* @__PURE__ */ jsx27(AccountPreparingSkeleton, {}), children: /* @__PURE__ */ jsx27(
+            RampOrderStep,
             {
-              backendUrl,
+              ...rampCallbacks,
               smartAccount: step.smartAccount,
-              bankOnramp,
-              onJourney: onBankJourney,
-              onGoBack: handleProviderBack,
-              onError: handleError,
-              openExternally,
-              onUnavailable: handleBankOnrampUnavailable
-            },
-            `${backendUrl}:${step.smartAccount}`
+              order: step.provider === "noah" && !noahNotServed && getCustomerSession ? {
+                flow: "funding_account",
+                backendUrl,
+                getCustomerSession,
+                onJourney: onBankJourney,
+                onUnavailable: () => handleNoahNotServed(step.smartAccount)
+              } : {
+                flow: "hosted",
+                kind: "fiat",
+                method: step.paymentMethod,
+                methodSelectionSource: step.methodSelectionSource,
+                consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch
+              }
+            }
           ) }),
-          step.type === "fiat-onramp" && (!bankRowOffered || step.paymentMethod !== "bank-transfer") && swappedStep,
-          step.type === "processing" && /* @__PURE__ */ jsx28(
+          step.type === "processing" && /* @__PURE__ */ jsx27(
             ProcessingStep,
             {
               flowLabel: payment ? "payment" : void 0,
@@ -9593,14 +9608,14 @@ function DepositFlow({
         "data-flow-mode": "exchange-connect",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx28(
+          step.type === "setup" && /* @__PURE__ */ jsx27(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "exchange-select" && /* @__PURE__ */ jsx28(
+          step.type === "exchange-select" && /* @__PURE__ */ jsx27(
             ExchangeSelectStep,
             {
               service,
@@ -9608,29 +9623,20 @@ function DepositFlow({
               onError: handleError
             }
           ),
-          step.type === "exchange-connect" && /* @__PURE__ */ jsx28(
-            ExchangeConnectStep,
+          step.type === "exchange-connect" && /* @__PURE__ */ jsx27(
+            RampOrderStep,
             {
+              ...rampCallbacks,
               smartAccount: step.smartAccount,
-              service,
-              connection: step.connection,
-              loadUrl: () => loadSwappedConnectUrl(step.smartAccount, step.connection),
-              onSwappedComplete: handleSwappedComplete,
-              onSwappedFailed: handleDepositFailed,
-              onClose: () => onClose?.(
-                openExternally ? "native_dismiss_request" : "header_button"
-              ),
-              onGoBack: handleProviderBack,
-              onError: handleError,
-              onAttemptConsumed: handleSwappedAttemptConsumed,
-              onProviderHandoff: handleSwappedProviderHandoff,
-              onRetry: handleSwappedRetry,
-              onCancelled: () => analytics.outcome("cancelled"),
-              onImmersiveChange: onSwappedImmersiveChange,
-              openExternally
+              order: {
+                flow: "hosted",
+                kind: "exchange",
+                connection: step.connection,
+                loadPreparedUrl: () => loadSwappedConnectUrl(step.smartAccount, step.connection)
+              }
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx28(
+          step.type === "processing" && /* @__PURE__ */ jsx27(
             ProcessingStep,
             {
               flowLabel: payment ? "payment" : void 0,
@@ -9670,14 +9676,14 @@ function DepositFlow({
     const solanaAddr = walletSession?.solanaAddress;
     const solanaProvider = walletSession?.solanaProvider;
     return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx27(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
         }
       ),
-      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx27(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -9688,7 +9694,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx27(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -9705,7 +9711,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx28(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx27(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -9729,14 +9735,14 @@ function DepositFlow({
         }
       ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs23("div", { className: "rs-step", children: [
         /* @__PURE__ */ jsxs23("div", { className: "rs-loading-state", children: [
-          /* @__PURE__ */ jsx28("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx28(
+          /* @__PURE__ */ jsx27("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx27(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: "2",
-              children: /* @__PURE__ */ jsx28(
+              children: /* @__PURE__ */ jsx27(
                 "path",
                 {
                   strokeLinecap: "round",
@@ -9747,21 +9753,21 @@ function DepositFlow({
             }
           ) }),
           /* @__PURE__ */ jsxs23("div", { className: "rs-loading-text", children: [
-            /* @__PURE__ */ jsx28("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
-            /* @__PURE__ */ jsx28("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+            /* @__PURE__ */ jsx27("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx27("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
           ] })
         ] }),
-        /* @__PURE__ */ jsx28("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx28(
+        /* @__PURE__ */ jsx27("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx27(
           "button",
           {
             type: "button",
             className: "rs-button rs-button--default rs-button--full-width",
             onClick: handleBack,
-            children: /* @__PURE__ */ jsx28("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx27("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
         ProcessingStep,
         {
           flowLabel: payment ? "payment" : void 0,
@@ -9793,13 +9799,13 @@ function DepositFlow({
     ] });
   }
   if (isDappImportMode && effectiveStep.type === "dapp-import-resolving") {
-    return /* @__PURE__ */ jsx28(
+    return /* @__PURE__ */ jsx27(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "dapp-import",
         "data-step-type": effectiveStep.type,
-        children: /* @__PURE__ */ jsx28(
+        children: /* @__PURE__ */ jsx27(
           DappImportAssetSelectSkeleton,
           {
             sourceLabel: activeDappImportProvider?.sourceLabel ?? "",
@@ -9811,13 +9817,13 @@ function DepositFlow({
     );
   }
   if (effectiveStep.type === "dapp-import-select") {
-    return /* @__PURE__ */ jsx28(
+    return /* @__PURE__ */ jsx27(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "dapp-import",
         "data-step-type": effectiveStep.type,
-        children: /* @__PURE__ */ jsx28(
+        children: /* @__PURE__ */ jsx27(
           DappImportSelectStep,
           {
             enabledIds: enabledAssetMigrationIds,
@@ -9844,7 +9850,7 @@ function DepositFlow({
     );
   }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return /* @__PURE__ */ jsx28("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx28("div", { className: "rs-step", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
+    return /* @__PURE__ */ jsx27("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx27("div", { className: "rs-step", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? setupChainId;
@@ -9855,14 +9861,14 @@ function DepositFlow({
     return getPublicClient(chainId, rpcUrls);
   };
   return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
-    effectiveStep.type === "setup" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx27(
       AccountPreparingSkeleton,
       {
         errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
         onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
       }
     ),
-    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx27(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -9875,7 +9881,7 @@ function DepositFlow({
         onDisconnect: onDisconnect ? handleWalletDisconnect : void 0
       }
     ),
-    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx27(
       DappImportAssetSelectStep,
       {
         sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.sourceLabel,
@@ -9884,7 +9890,7 @@ function DepositFlow({
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx27(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -9908,7 +9914,7 @@ function DepositFlow({
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx27(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -9959,7 +9965,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
       ProcessingStep,
       {
         flowLabel: payment ? "payment" : void 0,
@@ -9997,9 +10003,9 @@ function DepositFlow({
   ] });
 }
 
-// src/components/history/useBankHistory.ts
-import { useCallback as useCallback8, useEffect as useEffect14, useRef as useRef10, useState as useState14 } from "react";
-function useBankHistory(source, open, panelOpen) {
+// src/components/history/useOrderHistory.ts
+import { useCallback as useCallback7, useEffect as useEffect14, useMemo as useMemo9, useRef as useRef10, useState as useState14 } from "react";
+function useOrderHistory(source, open, panelOpen) {
   const [orders, setOrders] = useState14([]);
   const [unread, setUnread] = useState14(false);
   const [loading, setLoading] = useState14(false);
@@ -10012,7 +10018,7 @@ function useBankHistory(source, open, panelOpen) {
   const paged = useRef10(false);
   const panel = useRef10(panelOpen);
   panel.current = panelOpen;
-  const load = useCallback8(
+  const load = useCallback7(
     async (next) => {
       if (!source || !open || busy.current || document.visibilityState === "hidden")
         return;
@@ -10025,9 +10031,11 @@ function useBankHistory(source, open, panelOpen) {
           ...next ? { cursor: next } : {}
         });
         if (current !== generation.current) return;
-        const bank = page.items.filter((order) => order.provider === "noah");
+        const listed = page.items.filter(
+          (order) => order.provider === "noah" || hostedOrderState(order).progress !== "awaiting_payment"
+        );
         let changed = false;
-        for (const order of bank) {
+        for (const order of listed) {
           const fingerprint = JSON.stringify(order.stages);
           if (!next && seen.current.get(order.id) !== fingerprint)
             changed = true;
@@ -10037,7 +10045,7 @@ function useBankHistory(source, open, panelOpen) {
         if (!next) baselined.current = true;
         setOrders((previous) => {
           const merged = new Map(previous.map((order) => [order.id, order]));
-          for (const order of bank) merged.set(order.id, order);
+          for (const order of listed) merged.set(order.id, order);
           return [...merged.values()].sort(
             (a, b) => b.createdAt.localeCompare(a.createdAt)
           );
@@ -10047,7 +10055,7 @@ function useBankHistory(source, open, panelOpen) {
         setError(null);
       } catch {
         if (current === generation.current)
-          setError("Bank transfer history is unavailable. Try again shortly.");
+          setError("Order history is unavailable. Try again shortly.");
       } finally {
         if (current === generation.current) {
           busy.current = false;
@@ -10100,12 +10108,53 @@ function useBankHistory(source, open, panelOpen) {
     }
   };
 }
+function useSessionOrders(backendUrl, getCustomerSession, smartAccount) {
+  const getSession = useLatestRef(getCustomerSession);
+  const enabled = Boolean(getCustomerSession);
+  return useMemo9(() => {
+    if (!enabled || !smartAccount) return null;
+    return {
+      listOrders: async ({ cursor, limit }) => {
+        let refused = false;
+        const request = createBearerTransport({
+          backendUrl,
+          getSession: async () => {
+            try {
+              return await getSession.current(smartAccount, {
+                resumeOnly: true
+              });
+            } catch (error) {
+              refused = true;
+              throw error;
+            }
+          }
+        });
+        try {
+          return await request(
+            `/onramp/orders?${rampQuery({ cursor, limit })}`
+          );
+        } catch (error) {
+          if (refused) return { items: [], nextCursor: null };
+          throw error;
+        }
+      }
+    };
+  }, [backendUrl, enabled, smartAccount, getSession]);
+}
 
 // src/DepositModal.tsx
-import { jsx as jsx29, jsxs as jsxs24 } from "react/jsx-runtime";
-var ReownDepositInner = lazy3(async () => {
+import { jsx as jsx28, jsxs as jsxs24 } from "react/jsx-runtime";
+var warnedNoCustomerSession = false;
+function warnNoCustomerSession() {
+  if (warnedNoCustomerSession) return;
+  warnedNoCustomerSession = true;
+  console.warn(
+    "[rhinestone] `virtualAccountOnramp` needs `getCustomerSession`; it is ignored without one."
+  );
+}
+var ReownDepositInner = lazy4(async () => {
   await loadReownDependencies();
-  const module = await import("./DepositModalReown-3FGTPER6.mjs");
+  const module = await import("./DepositModalReown-FJBSF4VL.mjs");
   return { default: module.DepositModalReown };
 });
 function buildDepositAnalyticsSessionProperties({
@@ -10164,11 +10213,12 @@ function hasSuppliedWalletClient(props) {
 }
 function DepositModal(props) {
   warnRemovedProps("DepositModal", props);
+  if (props.virtualAccountOnramp && !props.getCustomerSession) warnNoCustomerSession();
   checkBackendUrl("DepositModal", props.backendUrl);
   const needsReown = !!props.reownAppId;
   const hasWalletClientProp = hasSuppliedWalletClient(props);
   if (needsReown) {
-    return /* @__PURE__ */ jsx29(Suspense3, { fallback: null, children: /* @__PURE__ */ jsx29(
+    return /* @__PURE__ */ jsx28(Suspense3, { fallback: null, children: /* @__PURE__ */ jsx28(
       ReownDepositInner,
       {
         ...props,
@@ -10176,7 +10226,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx29(
+  return /* @__PURE__ */ jsx28(
     DepositModalInner,
     {
       ...props,
@@ -10207,7 +10257,8 @@ function DepositModalInner({
   assetMigrations,
   initialAssetMigration,
   enableFiatOnramp = false,
-  bankOnramp,
+  virtualAccountOnramp,
+  getCustomerSession,
   enableQrTransfer = true,
   enableGaslessDeposit = false,
   fiatMethods,
@@ -10241,22 +10292,10 @@ function DepositModalInner({
   const onReadyRef = useLatestRef(onReady);
   const onUiStateRef = useLatestRef(onUiState);
   const [currentScreen, setCurrentScreen] = useState15("connect");
-  const bankScope = `${backendUrl}:${recipient}:${typeof targetChainProp === "string" ? targetChainProp : getChainId(targetChainProp)}:${targetToken}`;
-  const [bankSession, setBankSession] = useState15(null);
   const [bankJourneyVisible, setBankJourneyVisible] = useState15(false);
-  const onBankJourney = useCallback9((journey) => {
-    setBankJourneyVisible(Boolean(journey));
-    if (journey)
-      setBankSession(
-        journey.source ? { source: journey.source, scope: bankScope } : null
-      );
-  }, [bankScope]);
-  const bankSource = bankSession?.scope === bankScope ? bankSession.source : null;
+  const [smartAccount, setSmartAccount] = useState15(null);
   useEffect15(() => {
-    if (!isOpen) {
-      setBankSession(null);
-      setBankJourneyVisible(false);
-    }
+    if (!isOpen) setBankJourneyVisible(false);
   }, [isOpen]);
   const [swappedImmersive, setSwappedImmersive] = useState15(false);
   const [submitting, setSubmitting] = useState15(false);
@@ -10271,15 +10310,21 @@ function DepositModalInner({
   }));
   const targetChain = typeof targetChainProp === "string" ? targetChainProp : getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
+  const accountScope = `${isOpen}|${backendUrl}|${recipient}|${targetChain}|${targetToken}`;
+  const [scope, setScope] = useState15(accountScope);
+  if (scope !== accountScope) {
+    setScope(accountScope);
+    setSmartAccount(null);
+  }
   const rpcUrls = useStableRpcUrls(rpcUrlsProp);
-  const service = useMemo9(
+  const service = useMemo10(
     () => createDepositService(backendUrl, {
       debug,
       debugScope: "service:deposit"
     }),
     [backendUrl, debug]
   );
-  const historyAnalytics = useMemo9(
+  const historyAnalytics = useMemo10(
     () => createHistoryAnalytics({
       modal: "deposit",
       controllerRef: analyticsControllerRef,
@@ -10294,18 +10339,21 @@ function DepositModalInner({
     canRecover: Boolean(signRecovery),
     analytics: historyAnalytics
   });
-  const bankOrders = useBankHistory(bankSource, isOpen && !payment, history.isPanelOpen);
-  const bankHistory = bankJourneyVisible && !bankSource ? { ...bankOrders, loading: true } : bankOrders;
+  const orderHistory = useOrderHistory(
+    useSessionOrders(backendUrl, getCustomerSession, smartAccount),
+    isOpen && !payment,
+    history.isPanelOpen
+  );
   const historyDepositsRef = useLatestRef(history.deposits);
   useEffect15(() => {
-    const waitingForSettlement = bankHistory.orders.some((order) => {
+    const waitingForSettlement = orderHistory.orders.some((order) => {
       if (order.stages.delivery.status !== "completed") return false;
       const { depositId } = order.stages.delivery;
       const deposit = historyDepositsRef.current.find((item) => item.id === depositId);
       return !deposit || deposit.status === "pending" || deposit.status === "processing";
     });
     if (waitingForSettlement) history.markStale();
-  }, [bankHistory.orders, history.markStale, historyDepositsRef]);
+  }, [orderHistory.orders, history.markStale, historyDepositsRef]);
   const {
     markStale: markHistoryStale,
     invalidate: invalidateHistory,
@@ -10329,7 +10377,7 @@ function DepositModalInner({
       console.debug("[deposit] client setup config (not shown yet)", clientSetup);
     }
   }, [debug, clientSetup]);
-  const store = useMemo9(
+  const store = useMemo10(
     () => createDepositStore({ targetChain, targetToken }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
@@ -10361,7 +10409,7 @@ function DepositModalInner({
     recoverySubmitting,
     onUiStateRef
   ]);
-  const handleStepChange = useCallback9(
+  const handleStepChange = useCallback8(
     (onBack, screen) => {
       setBackHandler(() => onBack);
       if (screen) setCurrentScreen(screen);
@@ -10369,11 +10417,12 @@ function DepositModalInner({
     []
   );
   const onLifecycleRef = useLatestRef(onLifecycle);
-  const handleLifecycle = useCallback9(
+  const handleLifecycle = useCallback8(
     (event) => {
       onLifecycleRef.current?.(event);
-      if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
-        invalidateHistory();
+      if (event.type === "smart-account-changed") {
+        setSmartAccount(event.evm);
+        if (!event.evm && !event.solana) invalidateHistory();
       }
       if (event.type === "submitted" || event.type === "complete" || event.type === "failed") {
         markHistoryStale();
@@ -10381,7 +10430,7 @@ function DepositModalInner({
     },
     [onLifecycleRef, markHistoryStale, invalidateHistory]
   );
-  const closeWithSource = useCallback9(
+  const closeWithSource = useCallback8(
     (source) => {
       if (recoverySubmitting) return;
       const analytics = analyticsControllerRef.current;
@@ -10391,7 +10440,7 @@ function DepositModalInner({
     },
     [onClose, recoverySubmitting]
   );
-  const handleModalDismiss = useCallback9(
+  const handleModalDismiss = useCallback8(
     (reason) => {
       closeWithSource(
         reason === "escape" ? "escape" : reason === "overlay" ? "overlay" : "header_button"
@@ -10437,7 +10486,7 @@ function DepositModalInner({
     sourceToken,
     defaultAmount,
     bankOnrampEnabled: Boolean(
-      bankOnramp && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
+      virtualAccountOnramp && getCustomerSession && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
     ),
     walletIntegration,
     targetChain,
@@ -10447,7 +10496,7 @@ function DepositModalInner({
   const canGoBack = backHandler !== void 0;
   const hideHeaderChrome = swappedImmersive;
   const modalClassName = `rs-modal${hideHeaderChrome ? " rs-modal--swapped-iframe" : ""}`;
-  return /* @__PURE__ */ jsx29(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx29(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx29(AssetMetadataProvider, { service, children: /* @__PURE__ */ jsx29(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx29(
+  return /* @__PURE__ */ jsx28(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx28(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx28(AssetMetadataProvider, { service, children: /* @__PURE__ */ jsx28(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx28(
     Modal,
     {
       isOpen,
@@ -10456,7 +10505,7 @@ function DepositModalInner({
       inline,
       closeOnOverlayClick,
       ariaLabel: "Deposit",
-      children: /* @__PURE__ */ jsx29(
+      children: /* @__PURE__ */ jsx28(
         AnalyticsSession,
         {
           modal: "deposit",
@@ -10466,45 +10515,45 @@ function DepositModalInner({
           enableIngest: enableAnalyticsIngest,
           ingestUrl: analyticsIngestUrl,
           sessionIdRef: analyticsSessionIdRef,
-          children: /* @__PURE__ */ jsx29(
+          children: /* @__PURE__ */ jsx28(
             DepositAnalyticsControllerProvider,
             {
               controllerRef: analyticsControllerRef,
               children: /* @__PURE__ */ jsxs24("div", { ref: modalRef, className: modalClassName, children: [
                 !hideHeaderChrome && /* @__PURE__ */ jsxs24("div", { className: "rs-modal-header--redesigned", children: [
-                  /* @__PURE__ */ jsx29("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx29(
+                  /* @__PURE__ */ jsx28("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx28(
                     "button",
                     {
                       type: "button",
                       className: "rs-modal-header-back",
                       "aria-label": "Go back",
                       onClick: backHandler,
-                      children: /* @__PURE__ */ jsx29(ChevronLeftIcon, {})
+                      children: /* @__PURE__ */ jsx28(ChevronLeftIcon, {})
                     }
                   ) }),
                   /* @__PURE__ */ jsxs24("div", { className: "rs-modal-header-nav-right", children: [
-                    historyButtonVisible && /* @__PURE__ */ jsx29(
+                    historyButtonVisible && /* @__PURE__ */ jsx28(
                       HistoryEntryButton,
                       {
                         badge: bankJourneyVisible ? null : history.badge,
-                        unread: bankHistory.unread,
+                        unread: orderHistory.unread,
                         onClick: history.openPanel,
                         disabled: !recipient
                       }
                     ),
-                    /* @__PURE__ */ jsx29(
+                    /* @__PURE__ */ jsx28(
                       "button",
                       {
                         type: "button",
                         onClick: () => closeWithSource("header_button"),
                         className: "rs-modal-close",
                         "aria-label": "Close",
-                        children: /* @__PURE__ */ jsx29(CloseIcon, {})
+                        children: /* @__PURE__ */ jsx28(CloseIcon, {})
                       }
                     )
                   ] })
                 ] }),
-                /* @__PURE__ */ jsx29(
+                /* @__PURE__ */ jsx28(
                   DepositFlow,
                   {
                     walletClientProp,
@@ -10525,8 +10574,9 @@ function DepositModalInner({
                     assetMigrations,
                     initialAssetMigration,
                     enableFiatOnramp,
-                    bankOnramp,
-                    onBankJourney,
+                    virtualAccountOnramp,
+                    getCustomerSession,
+                    onBankJourney: setBankJourneyVisible,
                     backendUrl,
                     enableQrTransfer,
                     enableGaslessDeposit,
@@ -10552,12 +10602,12 @@ function DepositModalInner({
                     debug
                   }
                 ),
-                history.isPanelOpen && /* @__PURE__ */ jsx29(
+                history.isPanelOpen && /* @__PURE__ */ jsx28(
                   HistoryOverlay,
                   {
                     controller: history,
-                    bankHistory,
-                    bankSupportUrl: bankOnramp?.supportUrl,
+                    orderHistory,
+                    bankSupportUrl: virtualAccountOnramp?.supportUrl,
                     backLabel: "Deposit",
                     recipient,
                     backendUrl,