@rhinestone/deposit-modal 0.19.0 → 0.20.1

package/dist/{chunk-NITKDXHR.mjs → chunk-FW7ZMXQS.mjs}

@@ -9,45 +9,30 @@ import {
   executePolymarketSafeTransfer,
   fetchPolymarketProxyWallet,
   readPolymarketBalances
-} from "./chunk-FTWKAJGN.mjs";
+} from "./chunk-2FOPO4N5.mjs";
 import {
   AnalyticsSession,
-  AppleIcon,
-  BankIcon,
-  BodyHeader,
+  AssetMetadataProvider,
   Button,
   Callout,
-  CardIcon,
   CdnIcon,
   ChainCatalogProvider,
-  CheckIcon,
-  ChevronDownIcon,
-  ChevronLeftIcon,
-  CloseIcon,
-  CopyIcon,
-  ExternalLinkIcon,
-  HandCoinsIcon,
   HistoryEntryButton,
   HistoryOverlay,
-  InfoIcon,
   ListRow,
-  MigrateAssetsIcon,
   Modal,
   PermitDepositSubmitError,
   PoweredBy,
   ProcessingStep,
   RpcUrlsProvider,
+  SOLANA_TOKENS,
   SUPPORTED_CONNECT_EXCHANGE_COUNT,
   SetupError,
-  Spinner,
-  SwappedConnectFeeChangedError,
   TokenIcon,
   Tooltip,
-  TransferCryptoIcon,
-  UnplugIcon,
-  WalletIcon,
   analyticsTargetProperties,
   applyTheme,
+  assetIdFor,
   catalogKeyForChain,
   chainIdsByValue,
   checkBackendUrl,
@@ -62,7 +47,6 @@ import {
   depositBoundsViolation,
   describePolicyRefusal,
   failureMessageForEvent,
-  fetchTokenPriceUsd,
   formatExpectedDuration,
   formatQuotedReceive,
   formatReceiveEstimate,
@@ -74,22 +58,28 @@ import {
   getExchangeLogo,
   getExchangeLogoSrc,
   getPublicClient,
+  hasReached,
+  hostedOrderStateFromSwapped,
   isDepositEvent,
   isDepositPolicyRefusal,
   isDisplayStablecoinSymbol,
   isFailedEvent,
   isHistoryEntryVisible,
   isNativeAsset,
-  isRecognizedToken,
+  isNativeSol,
   isSubmissionUncertain,
+  mergeHostedOrderState,
   portfolioToAssets,
   quoteFeeRow,
   readDedupedAccountSetupResult,
   resolveAppFeeBps,
+  resolveCuratedToken,
+  resolveSolanaToken,
   rpcUrlFor,
   runAccountSetupDeduped,
   tokenFormatter,
   txRefsMatch,
+  useAssetStore,
   useCatalogChain,
   useChainCatalog,
   useChainName,
@@ -100,38 +90,54 @@ import {
   useExplorerTxUrl,
   useHistoryPanel,
   useIsDepositChain,
-  useLatestRef,
+  useIsRecognizedToken,
   useRestrictedListExclusion,
   useRpcUrls,
   useStableRpcUrls,
+  useTokenDisplay,
+  useTokenDisplays,
   warnRemovedProps
-} from "./chunk-5NWLS5BQ.mjs";
+} from "./chunk-OZPMRTW3.mjs";
+import {
+  AppleIcon,
+  BankIcon,
+  BodyHeader,
+  CardIcon,
+  CheckIcon,
+  ChevronDownIcon,
+  ChevronLeftIcon,
+  CloseIcon,
+  CopyIcon,
+  ExternalLinkIcon,
+  HandCoinsIcon,
+  InfoIcon,
+  MigrateAssetsIcon,
+  Spinner,
+  TransferCryptoIcon,
+  UnplugIcon,
+  WalletIcon,
+  useLatestRef
+} from "./chunk-YY4ZOAH5.mjs";
 import {
   HYPERCORE_CHAIN_ID,
   HYPERCORE_MIN_DEPOSIT_USD,
   HYPERCORE_SPOT_CAIP2,
   NATIVE_TOKEN_ADDRESS,
   SOLANA_MAINNET_CAIP2,
-  SOLANA_TOKENS,
   SUPPORTED_CHAIN_IDS,
   cdnIconUrl,
-  findTokenDecimals,
   getChainBadge,
   getChainIcon,
   getChainId,
   getChainName,
-  getNativeSymbol,
   getSupportedChainIds,
-  getTargetTokenSymbol,
-  getTargetTokenSymbolsForChain,
   isHyperCoreDestination,
-  isNativeSol,
   isStablecoinSymbol,
   isVirtualDestination,
   parseEvmChainId,
   targetChainToChainId,
   toEvmCaip2
-} from "./chunk-EAGMY3QE.mjs";
+} from "./chunk-E7IMWVMN.mjs";
 
 // src/core/reown-dependencies.ts
 var dependencies;
@@ -164,22 +170,23 @@ function getReownDependencies() {
 // src/DepositModal.tsx
 import {
   useMemo as useMemo9,
-  useEffect as useEffect14,
-  useRef as useRef10,
-  useState as useState14,
+  useEffect as useEffect15,
+  useRef as useRef11,
+  useState as useState15,
   useCallback as useCallback8,
-  lazy as lazy2,
-  Suspense as Suspense2
+  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
+  useRef as useRef9,
+  Suspense as Suspense2
 } from "react";
 
 // src/components/steps/ConnectStep.tsx
@@ -508,10 +515,12 @@ function ConnectStep({
   transferCryptoErrorReason,
   fiatPaymentMethods,
   fiatLoading,
+  fiatNotice,
   onSelectFiatMethod,
   onPrefetchFiatMethod,
   recommendedMethod,
   onSelectFundFromExchange,
+  fundFromExchangeLoading,
   onRequestConnect,
   onConnect,
   onDisconnect,
@@ -592,7 +601,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"
       )
@@ -685,6 +696,7 @@ function ConnectStep({
           ) : void 0
         }
       ),
+      fiatNotice && (activeTab === "cash" || !hasCash) && /* @__PURE__ */ jsx5(Callout, { variant: "warning", children: fiatNotice }),
       /* @__PURE__ */ jsx5(
         "div",
         {
@@ -801,7 +813,7 @@ function AssetSelectStep({
     isDepositChain,
     catalog
   ]);
-  const rows = useMemo(() => {
+  const filteredRows = useMemo(() => {
     return assets.filter((a) => {
       if (!isDepositChain(a.chainId)) return false;
       try {
@@ -827,6 +839,20 @@ function AssetSelectStep({
       return 0;
     });
   }, [assets, isDepositChain, isExcludedByRestrictedList]);
+  const displays = useTokenDisplays(
+    filteredRows.map((asset) => ({
+      chain: asset.chainId,
+      address: asset.token,
+      fallback: { symbol: asset.symbol, decimals: asset.decimals }
+    }))
+  );
+  const rows = useMemo(
+    () => filteredRows.map((asset, i) => {
+      const symbol = displays[i]?.symbol ?? asset.symbol;
+      return symbol === asset.symbol ? asset : { ...asset, symbol, name: symbol };
+    }),
+    [filteredRows, displays]
+  );
   useEffect2(() => {
     if (!defaultAssetId || selectedAssetId) return;
     if (rows.some((asset) => asset.id === defaultAssetId)) {
@@ -896,6 +922,7 @@ function AssetSelectStep({
                   /* @__PURE__ */ jsx6("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx6(
                     TokenIcon,
                     {
+                      token: { chain: asset.chainId, address: asset.token },
                       symbol: asset.symbol,
                       fallback: asset.symbol.slice(0, 4)
                     }
@@ -958,7 +985,7 @@ async function fetchNativeAssets(address, publicClient, existing, isDepositChain
   if (existingIds.has(id)) return [];
   try {
     const balance = await publicClient.getBalance({ address });
-    const nativeSymbol = catalogChain?.nativeToken.symbol ?? getNativeSymbol(connectedChainId);
+    const nativeSymbol = catalogChain?.nativeToken.symbol ?? "Token";
     const nativeDecimals = catalogChain?.nativeToken.decimals ?? 18;
     return [
       {
@@ -1140,7 +1167,7 @@ function AmountStep({
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
   );
   const targetChainId = targetChainToChainId(targetChain);
-  const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
+  const targetSymbol = useTokenDisplay(targetChainId, targetToken).symbol;
   const isSourceStablecoin = isStablecoinSymbol(asset.symbol);
   const derivedPriceUsd = useMemo2(() => {
     if (tokenPriceUsdOverride !== void 0 && tokenPriceUsdOverride > 0)
@@ -1457,7 +1484,13 @@ function AmountStep({
               " ",
               asset.symbol
             ] }),
-            /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8(TokenIcon, { symbol: asset.symbol }) })
+            /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8(
+              TokenIcon,
+              {
+                token: { chain: asset.chainId, address: asset.token },
+                symbol: asset.symbol
+              }
+            ) })
           ] })
         ] }),
         /* @__PURE__ */ jsxs6("div", { className: "rs-amount-detail-row", children: [
@@ -1468,7 +1501,13 @@ function AmountStep({
               " ",
               targetSymbol
             ] }),
-            /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8(TokenIcon, { symbol: targetSymbol }) })
+            /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8(
+              TokenIcon,
+              {
+                token: { chain: targetChainId, address: targetToken },
+                symbol: targetSymbol
+              }
+            ) })
           ] })
         ] }),
         balanceAfterUsd !== null && /* @__PURE__ */ jsxs6("div", { className: "rs-amount-detail-row", children: [
@@ -1517,8 +1556,10 @@ function ReviewDetails({
   estimatedTime,
   sendAmount,
   sendSymbol,
+  sendToken,
   receiveDisplay,
   receiveSymbol,
+  receiveToken,
   fee
 }) {
   return /* @__PURE__ */ jsxs7("div", { className: "rs-review-details", children: [
@@ -1548,14 +1589,14 @@ function ReviewDetails({
           " ",
           sendSymbol
         ] }),
-        /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { symbol: sendSymbol }) })
+        /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { token: sendToken, symbol: sendSymbol }) })
       ] })
     ] }),
     /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
       /* @__PURE__ */ jsx9("span", { children: "Receive" }),
       /* @__PURE__ */ jsxs7("span", { className: "rs-review-detail-value", children: [
         /* @__PURE__ */ jsx9("span", { children: receiveDisplay }),
-        /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { symbol: receiveSymbol }) })
+        /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9(TokenIcon, { token: receiveToken, symbol: receiveSymbol }) })
       ] })
     ] }),
     /* @__PURE__ */ jsxs7("div", { className: "rs-review-detail-row", children: [
@@ -1785,7 +1826,9 @@ function ConfirmStep({
   ]);
   const quote = setupReady && quoteResult?.requestKey === quoteRequestKey ? quoteResult.quote : null;
   const targetChainId = targetChainToChainId(targetChain);
-  const targetSymbol = sameRoute ? asset.symbol : getTargetTokenSymbol(targetToken, targetChainId);
+  const resolvedTargetSymbol = useTokenDisplay(targetChainId, targetToken).symbol;
+  const targetSymbol = sameRoute ? asset.symbol : resolvedTargetSymbol;
+  const sourceTrusted = useIsRecognizedToken(asset.chainId, asset.token);
   const sourceChainName = getChainName(asset.chainId);
   const targetChainName = getChainName(targetChainId);
   const sourceChainIcon = getChainIcon(asset.chainId);
@@ -1838,7 +1881,7 @@ function ConfirmStep({
       sourceSymbol: asset.symbol,
       targetSymbol,
       sourceAmountUsd,
-      sourceTrusted: isRecognizedToken(asset.token, asset.chainId),
+      sourceTrusted,
       // The target is the curated deposit destination, so a stablecoin target
       // estimates at $1 when unquoted (DepositFlow skips fetching stablecoin
       // target prices). Not applied to the source — that can be a held token.
@@ -2143,8 +2186,10 @@ function ConfirmStep({
           estimatedTime: estimatedTimeDisplay,
           sendAmount: formattedSendAmount,
           sendSymbol: asset.symbol,
+          sendToken: { chain: asset.chainId, address: asset.token },
           receiveDisplay,
           receiveSymbol: targetSymbol,
+          receiveToken: sameRoute ? { chain: asset.chainId, address: asset.token } : { chain: targetChainId, address: targetToken },
           fee: { display: feeDisplay, struck: feesFullySponsored }
         }
       ),
@@ -2200,7 +2245,8 @@ function QrReviewStep({
 }) {
   const [quote, setQuote] = useState5({ state: "loading", value: null });
   const targetChainId = targetChainToChainId(targetChain);
-  const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
+  const targetSymbol = useTokenDisplay(targetChainId, targetToken).symbol;
+  const sourceTrusted = useIsRecognizedToken(asset.chainId, asset.token);
   const boundsFor = useDepositBounds();
   useEffect5(() => {
     let cancelled = false;
@@ -2253,7 +2299,7 @@ function QrReviewStep({
       sourceSymbol: asset.symbol,
       targetSymbol,
       sourceAmountUsd: Number.isFinite(usdValue) && usdValue > 0 ? usdValue : void 0,
-      sourceTrusted: isRecognizedToken(asset.token, asset.chainId),
+      sourceTrusted,
       prices: targetTokenPriceUsd !== null && targetTokenPriceUsd > 0 ? { [targetSymbol.toUpperCase()]: targetTokenPriceUsd } : isDisplayStablecoinSymbol(targetSymbol) ? { [targetSymbol.toUpperCase()]: 1 } : {}
     });
     return estimate ?? targetSymbol;
@@ -2275,8 +2321,10 @@ function QrReviewStep({
           estimatedTime,
           sendAmount: formattedSendAmount,
           sendSymbol: asset.symbol,
+          sendToken: { chain: asset.chainId, address: asset.token },
           receiveDisplay,
           receiveSymbol: targetSymbol,
+          receiveToken: { chain: targetChainId, address: targetToken },
           fee: { display: feeDisplay, struck }
         }
       ),
@@ -2311,8 +2359,7 @@ function DepositAddressSkeleton({
 }) {
   const evmChainIds = getSupportedChainIds();
   const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
-  const tokensForChain = getTargetTokenSymbolsForChain(defaultChainId);
-  const defaultToken = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
+  const defaultToken = "USDC";
   const chainName = getChainName(defaultChainId);
   const chainIcon = getChainIcon(defaultChainId);
   return /* @__PURE__ */ jsxs10("div", { className: "rs-screen", "aria-busy": "true", children: [
@@ -2351,10 +2398,10 @@ function DepositAddressSkeleton({
           ] }),
           /* @__PURE__ */ jsxs10("div", { className: "rs-deposit-address-dropdown-trigger", children: [
             /* @__PURE__ */ jsx12(
-              TokenIcon,
+              "span",
               {
-                symbol: defaultToken,
-                className: "rs-deposit-address-dropdown-icon"
+                className: "rs-token-icon rs-deposit-address-dropdown-icon",
+                "data-loading": ""
               }
             ),
             /* @__PURE__ */ jsx12("span", { children: defaultToken }),
@@ -2786,18 +2833,8 @@ function asString(value) {
   return typeof value === "string" ? value : void 0;
 }
 function resolveSolanaTokenMeta(token) {
-  if (!token) return {};
-  const normalized = token.toLowerCase();
-  const matched = SOLANA_TOKENS.find(
-    (entry) => entry.mint.toLowerCase() === normalized
-  );
-  if (matched) {
-    return { sourceSymbol: matched.symbol, sourceDecimals: matched.decimals };
-  }
-  if (normalized === "native" || normalized === "11111111111111111111111111111111" || normalized === "so11111111111111111111111111111111111111112") {
-    return { sourceSymbol: "SOL", sourceDecimals: 9 };
-  }
-  return {};
+  const matched = token ? resolveSolanaToken(token) : void 0;
+  return matched ? { sourceSymbol: matched.symbol, sourceDecimals: matched.decimals } : {};
 }
 function getDepositEventDetails(event) {
   if (!event?.type || !isRecord(event.data)) return {};
@@ -2855,10 +2892,11 @@ function selectionAsAsset(chainId, symbol, offer, catalogChain) {
     decimals
   };
 }
-function TokenGlyph({ symbol }) {
+function TokenGlyph({ symbol, token }) {
   return /* @__PURE__ */ jsx14(
     TokenIcon,
     {
+      token,
       symbol,
       className: "rs-deposit-address-dropdown-icon",
       fallback: /* @__PURE__ */ jsx14("span", { className: "rs-deposit-address-dropdown-icon rs-deposit-address-dropdown-icon--fallback", children: symbol.slice(0, 3) })
@@ -3005,7 +3043,22 @@ function DepositAddressStep({
       clearInterval(timer);
     };
   }, [payment, sourceChainId, sourceTokenIdentity, smartAccount, service]);
-  const paymentDecimals = typeof sourceChainId === "number" && sourceTokenIdentity ? findTokenDecimals(sourceTokenIdentity, sourceChainId) : void 0;
+  const tokenRefFor = (symbol) => {
+    const address = resolveSourceTokenIdentity({
+      chain: sourceChainId,
+      symbol,
+      shortlist,
+      catalogTokens: offer.restricted ? void 0 : catalogFor(sourceChainId)?.supportedTokens
+    });
+    return address ? { chain: sourceChainId, address } : void 0;
+  };
+  const assetStore = useAssetStore();
+  const assetStoreRef = useRef5(assetStore);
+  assetStoreRef.current = assetStore;
+  const paymentDecimals = useTokenDisplay(
+    typeof sourceChainId === "number" ? sourceChainId : void 0,
+    sourceTokenIdentity
+  ).decimals;
   const paymentAmountUnits = payment && paymentUnits !== "loading" && paymentUnits !== "unavailable" ? paymentUnits : null;
   const paymentDisplay = paymentAmountUnits !== null && paymentDecimals !== void 0 ? formatUnits3(BigInt(paymentAmountUnits), paymentDecimals) : null;
   const qrValue = paymentAmountUnits !== null && typeof sourceChainId === "number" && sourceTokenIdentity ? paymentRequestUri({
@@ -3151,10 +3204,10 @@ function DepositAddressStep({
           baselineTxHashRef.current = eventTxHash;
           isTrackingRef.current = true;
           const isEvmToken = token ? /^0x[a-fA-F0-9]{40}$/.test(token) : false;
-          const sourceDecimals = details.sourceDecimals ?? (isEvmToken ? findTokenDecimals(
-            token,
-            typeof chainId === "number" ? chainId : void 0
-          ) : void 0);
+          const knownChain = chainId === "unknown" ? void 0 : chainId;
+          const sourceDecimals = details.sourceDecimals ?? (token && knownChain !== void 0 ? resolveCuratedToken(token, knownChain)?.decimals ?? (knownChain === "hypercore" ? void 0 : assetStoreRef.current?.peekMeta(
+            assetIdFor(knownChain, token) ?? ""
+          )?.decimals) : void 0);
           const directTransfer = typeof chainId === "number" && isEvmToken && isSameRoute(
             chainId,
             token,
@@ -3314,7 +3367,13 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                /* @__PURE__ */ jsx14(TokenGlyph, { symbol: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx14(
+                  TokenGlyph,
+                  {
+                    symbol: sourceTokenSymbol,
+                    token: tokenRefFor(sourceTokenSymbol)
+                  }
+                ),
                 /* @__PURE__ */ jsx14("span", { children: sourceTokenSymbol }),
                 /* @__PURE__ */ jsx14(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
@@ -3330,7 +3389,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                /* @__PURE__ */ jsx14(TokenGlyph, { symbol }),
+                /* @__PURE__ */ jsx14(TokenGlyph, { symbol, token: tokenRefFor(symbol) }),
                 /* @__PURE__ */ jsx14("span", { children: symbol })
               ]
             },
@@ -3422,8 +3481,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 = [
@@ -3495,7 +3554,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`,
@@ -3573,16 +3632,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";
@@ -3611,6 +3664,10 @@ function isSwappedGoBackMessage(raw) {
   const obj = data;
   return obj.key === SWAPPED_GO_BACK_KEY || obj.type === SWAPPED_GO_BACK_KEY;
 }
+function assetSymbol(currencyCode) {
+  const separator = currencyCode?.indexOf("_") ?? -1;
+  return separator > 0 ? currencyCode.slice(0, separator) : currencyCode;
+}
 function parseSwappedIframeMessage(raw) {
   let data = raw;
   if (typeof data === "string") {
@@ -3624,17 +3681,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: asString2(inner.order_crypto) ?? asString2(obj.orderCrypto),
-    orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount),
-    transactionId: asString2(inner.transaction_id) ?? asString2(obj.transactionId)
+    orderCrypto: assetSymbol(
+      asString2(inner.order_crypto) ?? asString2(obj.orderCrypto)
+    ),
+    orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount)
   };
 }
 function SwappedProviderStep({
@@ -3645,7 +3705,7 @@ function SwappedProviderStep({
   iframeTitle,
   loadErrorCode,
   loadErrorFallback,
-  bannerForStatus,
+  cancelledMessage,
   onSwappedComplete,
   onSwappedFailed,
   onClose,
@@ -3678,6 +3738,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
@@ -3733,8 +3795,7 @@ function SwappedProviderStep({
       setWidgetUrl(res.url);
       expectedExternalCustomerIdRef.current = res.externalCustomerId;
       onAttemptConsumed?.(res.externalCustomerId);
-      const sep = res.externalCustomerId.indexOf(":");
-      expectedOrderUuidRef.current = sep >= 0 ? res.externalCustomerId.slice(sep + 1) : null;
+      expectedOrderUuidRef.current = res.orderId;
     }).catch((err) => {
       if (cancelled) return;
       const message = err instanceof Error ? err.message : loadErrorFallback;
@@ -3797,11 +3858,15 @@ function SwappedProviderStep({
     async function poll() {
       if (cancelled) return;
       try {
-        const res = await service.fetchSwappedOrderStatus(smartAccount);
+        const orderId = expectedOrderUuidRef.current;
+        const res = orderId ? await service.fetchSwappedOrder(orderId) : null;
         if (cancelled) return;
-        const isCurrentOrder = res !== null && expectedOrderUuidRef.current !== null && res.orderId === expectedOrderUuidRef.current;
+        const isCurrentOrder = res !== null && res.orderId === expectedOrderUuidRef.current;
         if (isCurrentOrder) {
-          setOrderState(res);
+          setOrderState((prev) => ({
+            ...res,
+            ...mergeHostedOrderState(prev, res)
+          }));
         }
       } catch {
       }
@@ -3838,15 +3903,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 {
       }
@@ -3869,8 +3948,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]);
@@ -3894,10 +3972,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,
@@ -3909,13 +3986,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(() => {
@@ -3925,15 +4002,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;
@@ -4083,15 +4160,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"];
@@ -4099,65 +4175,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-4D24HVHV.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,
+        bankOnramp: order.bankOnramp,
+        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;
@@ -4167,136 +4248,41 @@ 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";
-
-// 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."
-    };
-  }
-  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."
-      };
-  }
-}
-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
-    }
-  );
-}
-ExchangeConnectStep.displayName = "ExchangeConnectStep";
+RampOrderStep.displayName = "RampOrderStep";
 
 // 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,
@@ -4305,9 +4291,6 @@ function ExchangeLogo({ exchange }) {
     }
   );
 }
-function formatFeeRate(bps) {
-  return `${(bps / 100).toFixed(2).replace(/\.?0+$/, "")}%`;
-}
 function ExchangeSelectStep({
   service,
   onSelectExchange,
@@ -4317,12 +4300,11 @@ function ExchangeSelectStep({
   const [loading, setLoading] = useState9(true);
   const [error, setError] = useState9(null);
   const [retryToken, setRetryToken] = useState9(0);
-  const [exchangeFeeBps, setExchangeFeeBps] = useState9(0);
   const [selectingConnection, setSelectingConnection] = useState9(
     null
   );
   const [selectionNotice, setSelectionNotice] = useState9(null);
-  const retry = useCallback5(() => {
+  const retry = useCallback4(() => {
     setRetryToken((n) => n + 1);
   }, []);
   useEffect9(() => {
@@ -4332,12 +4314,10 @@ function ExchangeSelectStep({
     service.getSwappedConnectExchanges().then((res) => {
       if (cancelled) return;
       setExchanges(res.exchanges);
-      setExchangeFeeBps(res.exchangeFeeBps ?? 0);
     }).catch((err) => {
       if (cancelled) return;
       const message = err instanceof Error ? err.message : "Failed to load exchanges";
       setExchanges([]);
-      setExchangeFeeBps(0);
       setError(message);
       onError?.(message, "SWAPPED_CONNECT_EXCHANGES_FAILED");
     }).finally(() => {
@@ -4347,21 +4327,12 @@ function ExchangeSelectStep({
       cancelled = true;
     };
   }, [service, retryToken, onError]);
-  const selectExchange = useCallback5(
+  const selectExchange = useCallback4(
     async (connection) => {
       setSelectingConnection(connection);
       setSelectionNotice(null);
       try {
-        const actualFeeBps = await onSelectExchange(
-          connection,
-          exchangeFeeBps
-        );
-        if (actualFeeBps !== exchangeFeeBps) {
-          setExchangeFeeBps(actualFeeBps);
-          setSelectionNotice(
-            "The Exchange Fee changed. Review the updated rate and select your exchange again."
-          );
-        }
+        await onSelectExchange(connection);
       } catch (err) {
         const message = err instanceof Error ? err.message : "Failed to prepare Connect";
         setSelectionNotice(message);
@@ -4370,22 +4341,22 @@ function ExchangeSelectStep({
         setSelectingConnection(null);
       }
     },
-    [exchangeFeeBps, onError, onSelectExchange]
+    [onError, onSelectExchange]
   );
   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",
@@ -4396,8 +4367,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",
@@ -4407,7 +4378,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",
@@ -4419,27 +4390,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, {}),
-    exchangeFeeBps > 0 && /* @__PURE__ */ jsxs16("p", { className: "rs-exchange-select-fee-note", children: [
-      "A ",
-      formatFeeRate(exchangeFeeBps),
-      " Exchange Fee applies to your deposit."
-    ] }),
-    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";
@@ -4447,7 +4413,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,
@@ -4555,28 +4521,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",
@@ -4586,7 +4552,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(
@@ -4599,18 +4565,19 @@ 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 },
                       symbol: entry.token.symbol,
                       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
@@ -4623,13 +4590,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(
@@ -4643,14 +4610,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%" },
@@ -4667,6 +4634,7 @@ function SolanaAmountStep({
   targetChain,
   targetChainName,
   targetTokenSymbol,
+  targetToken,
   appBalanceUsd,
   onContinue,
   debug
@@ -4725,7 +4693,7 @@ function SolanaAmountStep({
       return null;
     }
   }, [spendableBalance, token.decimals, tokenPriceUsd]);
-  const computePresetAmount = useCallback6(
+  const computePresetAmount = useCallback5(
     (percentage) => {
       try {
         const spendableUnits = Number(
@@ -4857,10 +4825,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,
@@ -4887,7 +4855,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",
@@ -4900,33 +4868,39 @@ 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(TokenIcon, { symbol: token.symbol }) })
+            /* @__PURE__ */ jsx21("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx21(
+              TokenIcon,
+              {
+                token: { chain: "solana", address: token.mint },
+                symbol: token.symbol
+              }
+            ) })
           ] })
         ] }),
         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, { 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,
@@ -4936,7 +4910,7 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx22(PoweredBy, {})
+    /* @__PURE__ */ jsx21(PoweredBy, {})
   ] });
 }
 
@@ -5054,7 +5028,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,
@@ -5086,7 +5060,7 @@ function SolanaConfirmStep({
     return () => onSubmittingChangeRef.current?.(false);
   }, [isSubmitting]);
   const targetChainId = targetChainToChainId(targetChain);
-  const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
+  const targetSymbol = useTokenDisplay(targetChainId, targetToken).symbol;
   const sourceChainName = getChainName("solana");
   const targetChainName = getChainName(targetChainId);
   const sourceChainIcon = getChainIcon("solana");
@@ -5102,7 +5076,8 @@ function SolanaConfirmStep({
       sourceSymbol: token.symbol,
       targetSymbol,
       sourceAmountUsd,
-      sourceTrusted: isRecognizedToken(token.mint, "solana"),
+      // The wallet flow only offers the allowlist, so this is the check.
+      sourceTrusted: resolveSolanaToken(token.mint) !== void 0,
       // Curated stablecoin target estimates at $1 when unquoted; never applied
       // to the source (a held token). See ConfirmStep for the rationale.
       prices: targetTokenPriceUsd !== null && targetTokenPriceUsd > 0 ? { [targetSymbol.toUpperCase()]: targetTokenPriceUsd } : isDisplayStablecoinSymbol(targetSymbol) ? { [targetSymbol.toUpperCase()]: 1 } : {}
@@ -5206,8 +5181,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,
@@ -5217,13 +5192,15 @@ function SolanaConfirmStep({
           estimatedTime,
           sendAmount: formattedAmount,
           sendSymbol: token.symbol,
+          sendToken: { chain: "solana", address: token.mint },
           receiveDisplay,
           receiveSymbol: targetSymbol,
+          receiveToken: { chain: targetChainId, address: targetToken },
           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,
@@ -5235,12 +5212,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,
@@ -5249,16 +5226,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";
@@ -5275,14 +5252,15 @@ 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 },
                       symbol: asset.symbol,
                       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",
@@ -5293,7 +5271,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,
@@ -5307,20 +5285,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 };
@@ -5358,28 +5336,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?.();
@@ -5392,13 +5370,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,
@@ -5406,64 +5384,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
   };
@@ -5498,8 +5476,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 {
@@ -6075,7 +6054,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":
@@ -6136,7 +6115,15 @@ function analyticsStepForFlowStep(method, step) {
       return "funding_method_home";
   }
 }
+var BANK_FAILURES = {
+  BANK_ONRAMP_OPTIONS_FAILED: "bank_options_failed",
+  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"))) {
@@ -6371,7 +6358,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;
@@ -6453,7 +6440,8 @@ function createInitialState(overrides) {
     },
     fiat: {
       selectedMethod: null,
-      methodSelectionSource: null
+      methodSelectionSource: null,
+      selectedProvider: null
     },
     exchange: {
       selectedConnection: null
@@ -6741,7 +6729,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
@@ -7322,7 +7311,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 }
       };
     }
@@ -7398,7 +7391,7 @@ function useDepositStore(selector) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment6, jsx as jsx28, jsxs as jsxs23 } from "react/jsx-runtime";
+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]);
 }
@@ -7407,17 +7400,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" })
       }
     ) })
   ] });
@@ -7501,7 +7494,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" };
@@ -7669,6 +7663,9 @@ function DepositFlow({
   initialAssetMigration,
   enableWallet = true,
   enableFiatOnramp = false,
+  bankOnramp,
+  onBankJourney,
+  backendUrl,
   enableQrTransfer = true,
   enableGaslessDeposit = false,
   fiatMethods,
@@ -7710,19 +7707,27 @@ 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 enableSwappedPreconnect = enableFiatOnramp || enableExchangeConnect;
+  const bankOnrampEnabled = Boolean(
+    bankOnramp && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
+  );
+  const hasSwappedFiatMethod = Boolean(
+    enableFiatOnramp && (!fiatMethods || Object.entries(fiatMethods).some(
+      ([method, enabled]) => enabled && !(bankOnrampEnabled && method === "bank-transfer")
+    ))
+  );
+  const enableSwappedPreconnect = hasSwappedFiatMethod || enableExchangeConnect;
   useEffect13(() => {
     if (!enableSwappedPreconnect) return;
     if (typeof document === "undefined") return;
@@ -7797,11 +7802,14 @@ function DepositFlow({
     walletSession?.solanaAddress,
     walletSession?.caipAddress
   ]);
-  const offeredFiatMethods = useMemo8(
-    () => fiatMethods ? FIAT_ONRAMP_METHODS.filter((m) => fiatMethods[m.method]) : FIAT_ONRAMP_METHODS,
+  const configuredFiatMethods = useMemo8(
+    () => fiatMethods ? FIAT_ONRAMP_METHODS.filter(
+      (m) => fiatMethods[m.method]
+    ) : FIAT_ONRAMP_METHODS,
     [fiatMethods]
   );
-  const fiatEnabled = enableFiatOnramp && offeredFiatMethods.length > 0;
+  const swappedFiatEnabled = enableFiatOnramp && configuredFiatMethods.length > 0;
+  const fiatEnabled = bankOnrampEnabled || swappedFiatEnabled;
   const enabledAssetMigrationIds = useMemo8(
     () => Object.entries(assetMigrations ?? {}).filter(([, on]) => on).map(([id]) => id),
     [assetMigrations]
@@ -7841,27 +7849,23 @@ function DepositFlow({
   ]);
   const setupChainId = typeof targetChain === "number" && !isVirtualDestination(targetChain) ? targetChain : typeof defaultSourceChain === "number" ? defaultSourceChain : DEFAULT_SETUP_CHAIN_ID;
   const targetChainId = targetChainToChainId(targetChain);
-  const targetSymbol = getTargetTokenSymbol(targetToken, targetChainId);
+  const targetDisplay = useTokenDisplay(targetChainId, targetToken);
+  const targetSymbol = targetDisplay.symbol;
   const isTargetStablecoin = isStablecoinSymbol(targetSymbol);
+  const assetStore = useAssetStore();
   const targetMarketPriceRef = useRef9(null);
   useEffect13(() => {
     targetMarketPriceRef.current = null;
-    if (isTargetStablecoin || targetSymbol === "Token") {
-      return;
-    }
+    if (isTargetStablecoin || !assetStore) return;
     let cancelled = false;
-    fetchTokenPriceUsd(service, {
-      chainId: targetChainId,
-      address: targetToken,
-      symbol: targetSymbol
-    }).then((price) => {
+    assetStore.resolvePrice({ chain: targetChainId, address: targetToken }).then((price) => {
       if (cancelled) return;
       targetMarketPriceRef.current = price;
     });
     return () => {
       cancelled = true;
     };
-  }, [service, targetSymbol, isTargetStablecoin, targetChain, targetToken]);
+  }, [assetStore, isTargetStablecoin, targetChainId, targetToken]);
   const walletSignerContext = useMemo8(() => {
     if (flowMode === "deposit-address") {
       return null;
@@ -8063,7 +8067,7 @@ function DepositFlow({
     ]
   );
   const step = effectiveStep;
-  const handleBack = useCallback7(() => {
+  const handleBack = useCallback6(() => {
     if ([
       "deposit-address",
       "select-asset",
@@ -8091,7 +8095,7 @@ function DepositFlow({
     hasWalletOptions,
     walletSession
   ]);
-  const handleProviderBack = useCallback7(() => {
+  const handleProviderBack = useCallback6(() => {
     analytics.abandon("provider_back");
     analytics.resetAttempt(
       flowMode === "exchange-connect" ? "exchange_connect" : null
@@ -8101,7 +8105,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?.();
@@ -8116,11 +8120,14 @@ function DepositFlow({
   useEffect13(() => {
     setQrSourcePrice({ resolved: false, usd: null });
     if (!qrSourceAsset) return;
+    if (!assetStore) {
+      setQrSourcePrice({ resolved: true, usd: null });
+      return;
+    }
     let cancelled = false;
-    fetchTokenPriceUsd(service, {
-      chainId: qrSourceAsset.chainId,
-      address: qrSourceAsset.token,
-      symbol: qrSourceAsset.symbol
+    assetStore.resolvePrice({
+      chain: qrSourceAsset.chainId,
+      address: qrSourceAsset.token
     }).then((usd) => {
       if (!cancelled) setQrSourcePrice({ resolved: true, usd });
     }).catch(() => {
@@ -8129,7 +8136,7 @@ function DepositFlow({
     return () => {
       cancelled = true;
     };
-  }, [service, qrSourceKey]);
+  }, [assetStore, qrSourceKey]);
   const canGoBackFromHere = effectiveStep.type === "deposit-address" || effectiveStep.type === "solana-token-select" || effectiveStep.type === "solana-amount" || effectiveStep.type === "solana-confirm" || effectiveStep.type === "amount" || effectiveStep.type === "confirm" || // Without these the QR detour has no exit but the modal's close button,
   // which drops the user out of the deposit entirely rather than back to
   // the address they came from.
@@ -8221,11 +8228,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";
@@ -8251,10 +8258,12 @@ function DepositFlow({
     [assetMigrationsKey, isSolanaWalletConnected]
   );
   const initialAssetMigrationProvider = useMemo8(
-    () => initialAssetMigration ? enabledDappImportProviders.find((p) => p.id === initialAssetMigration) ?? null : null,
+    () => initialAssetMigration ? enabledDappImportProviders.find(
+      (p) => p.id === initialAssetMigration
+    ) ?? null : null,
     [initialAssetMigration, enabledDappImportProviders]
   );
-  const handleSelectDappImport = useCallback7(
+  const handleSelectDappImport = useCallback6(
     (providerId) => {
       const owner = dappImportOwner;
       if (owner) {
@@ -8278,7 +8287,7 @@ function DepositFlow({
     },
     [analytics, storeApi, walletOptions, dappImportOwner]
   );
-  const handleDappImportAssetSelected = useCallback7(
+  const handleDappImportAssetSelected = useCallback6(
     (asset) => {
       storeApi.dispatch({ type: "dapp-import/asset-selected", asset });
     },
@@ -8498,11 +8507,8 @@ function DepositFlow({
     analytics,
     storeApi
   ]);
-  const handleBootRetry = useCallback7(() => {
-    analytics.retry(
-      "migration_availability_failed",
-      "migration_boot_resolve"
-    );
+  const handleBootRetry = useCallback6(() => {
+    analytics.retry("migration_availability_failed", "migration_boot_resolve");
     const snapshot = storeApi.getState();
     const providerId = snapshot.dappImport.activeProviderId;
     if (!providerId) return;
@@ -8525,29 +8531,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((externalCustomerId) => {
-    swappedAnalyticsCorrelatorRef.current = externalCustomerId;
-  }, []);
-  const handleSwappedProviderHandoff = useCallback7(() => {
+  const handleSwappedAttemptConsumed = useCallback6(
+    (externalCustomerId) => {
+      swappedAnalyticsCorrelatorRef.current = externalCustomerId;
+    },
+    []
+  );
+  const handleSwappedProviderHandoff = useCallback6(() => {
     const externalCustomerId = swappedAnalyticsCorrelatorRef.current;
     if (!externalCustomerId) return;
     analytics.handoff(
@@ -8556,7 +8567,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"
@@ -8564,45 +8575,27 @@ function DepositFlow({
     swappedAnalyticsCorrelatorRef.current = null;
   }, [analytics, flowMode]);
   const swappedConnectUrlRef = useRef9(/* @__PURE__ */ new Map());
-  const acknowledgedConnectFeeRef = useRef9(/* @__PURE__ */ new Map());
-  const handleSelectExchangeConnection = useCallback7(
-    async (connection, disclosedFeeBps) => {
+  const handleSelectExchangeConnection = useCallback6(
+    async (connection) => {
       if (setupSlice.status !== "ready" || !setupSlice.smartAccount) {
         throw new Error("Deposit account is not ready");
       }
       const smartAccount = setupSlice.smartAccount;
       const owner = smartAccount.toLowerCase();
       const key = `${owner}:${connection}`;
-      let entry = swappedConnectUrlRef.current.get(key);
-      if (!entry) {
-        let response;
-        try {
-          response = await service.getSwappedConnectUrl({
-            smartAccount,
-            connection,
-            acceptedExchangeFeeBps: disclosedFeeBps
-          });
-        } catch (error) {
-          if (error instanceof SwappedConnectFeeChangedError) {
-            return error.exchangeFeeBps;
-          }
-          throw error;
-        }
-        entry = { smartAccount: owner, response };
-      }
+      const entry = swappedConnectUrlRef.current.get(key) ?? {
+        smartAccount: owner,
+        response: await service.getSwappedConnectUrl({
+          smartAccount,
+          connection
+        })
+      };
       const currentAccount = storeApi.getState().setup.smartAccount;
       if (currentAccount?.toLowerCase() !== owner) {
         swappedConnectUrlRef.current.delete(key);
         throw new Error("Deposit account changed. Select your exchange again.");
       }
-      const actualFeeBps = entry.response.exchangeFeeBps ?? 0;
-      if (actualFeeBps !== disclosedFeeBps) {
-        swappedConnectUrlRef.current.delete(key);
-        acknowledgedConnectFeeRef.current.delete(key);
-        return actualFeeBps;
-      }
       swappedConnectUrlRef.current.set(key, entry);
-      acknowledgedConnectFeeRef.current.set(key, actualFeeBps);
       analytics.selectMethod("exchange_connect", "user", {
         exchange: connection
       });
@@ -8610,38 +8603,20 @@ function DepositFlow({
         type: "exchange/connection-selected",
         connection
       });
-      return actualFeeBps;
     },
     [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);
-      const expectedFeeBps = acknowledgedConnectFeeRef.current.get(key);
-      if (expectedFeeBps === void 0) {
-        throw new Error(
-          "The Exchange Fee changed. Go back and select your exchange again."
-        );
-      }
       swappedConnectUrlRef.current.delete(key);
-      const response = entry?.smartAccount === smartAccount.toLowerCase() ? entry.response : await service.getSwappedConnectUrl({
-        smartAccount,
-        connection,
-        acceptedExchangeFeeBps: expectedFeeBps
-      });
-      const actualFeeBps = response.exchangeFeeBps ?? 0;
-      if (actualFeeBps !== expectedFeeBps) {
-        throw new Error(
-          "The Exchange Fee changed. Go back and select your exchange again."
-        );
-      }
-      return response;
+      return entry?.smartAccount === smartAccount.toLowerCase() ? entry.response : service.getSwappedConnectUrl({ smartAccount, connection });
     },
     [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);
@@ -8663,7 +8638,7 @@ function DepositFlow({
     },
     [service, logFlow]
   );
-  const consumeSwappedWidgetUrlPrefetch = useCallback7(
+  const consumeSwappedWidgetUrlPrefetch = useCallback6(
     (smartAccount, method, methodSelectionSource) => {
       const cache = swappedUrlPrefetchRef.current;
       const key = swappedWidgetPrefetchKey(method, methodSelectionSource);
@@ -8675,7 +8650,7 @@ function DepositFlow({
     },
     []
   );
-  const handlePrefetchFiatMethod = useCallback7(
+  const handlePrefetchFiatMethod = useCallback6(
     (method, methodSelectionSource) => {
       if (!fiatEnabled) return;
       if (setupSlice.status !== "ready" || !setupSlice.smartAccount) return;
@@ -8695,9 +8670,33 @@ function DepositFlow({
   useEffect13(() => {
     swappedUrlPrefetchRef.current.clear();
     swappedConnectUrlRef.current.clear();
-    acknowledgedConnectFeeRef.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 providersLoading = providers === "loading";
+  const offers = (provider, kind) => providers === null || providers !== "loading" && providers.some((p) => p.provider === provider && p.kinds.includes(kind));
+  const swappedFiatOffered = offers("swapped", "fiat");
+  const noahOffered = offers("noah", "fiat");
+  const exchangeOffered = enableExchangeConnect && offers("swapped", "exchange");
   const [regionalMethods, setRegionalMethods] = useState13({
     status: "loading",
     country: null,
@@ -8705,7 +8704,7 @@ function DepositFlow({
     recommendedMethod: null
   });
   useEffect13(() => {
-    if (!fiatEnabled || hasConfiguredFiatMethods) return;
+    if (!enableFiatOnramp || hasConfiguredFiatMethods) return;
     let cancelled = false;
     setRegionalMethods({
       status: "loading",
@@ -8743,24 +8742,57 @@ function DepositFlow({
       cancelled = true;
       clearTimeout(timeoutTimer);
     };
-  }, [analytics, fiatEnabled, hasConfiguredFiatMethods, service]);
+  }, [analytics, enableFiatOnramp, hasConfiguredFiatMethods, service]);
+  const swappedCashDisplay = useMemo8(
+    () => !enableFiatOnramp || !swappedFiatOffered ? { kind: "hidden" } : hasConfiguredFiatMethods ? {
+      kind: "list",
+      methods: configuredFiatMethods,
+      recommendedMethod: configuredFiatMethods[0]?.method ?? "bank-transfer",
+      country: null,
+      source: "configured"
+    } : composeFiatMethods(regionalMethods, FIAT_ONRAMP_METHODS),
+    [
+      configuredFiatMethods,
+      enableFiatOnramp,
+      hasConfiguredFiatMethods,
+      regionalMethods,
+      swappedFiatOffered
+    ]
+  );
+  const swappedOffersBank = swappedCashDisplay.kind === "list" && swappedCashDisplay.methods.some(({ method }) => method === "bank-transfer");
+  const [bankOnrampUnavailable, setBankOnrampUnavailable] = useState13(false);
+  const bankRowOffered = bankOnrampEnabled && noahOffered && !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 = useCallback6(() => {
+    setBankOnrampUnavailable(true);
+    if (swappedRefusesBank) handleProviderBack();
+  }, [handleProviderBack, swappedRefusesBank]);
   const cashDisplay = useMemo8(() => {
-    if (!fiatEnabled) return { kind: "hidden" };
-    if (hasConfiguredFiatMethods) {
-      return {
-        kind: "list",
-        methods: offeredFiatMethods,
-        recommendedMethod: offeredFiatMethods[0].method,
-        country: null,
-        source: "configured"
-      };
+    if (providersLoading && fiatEnabled) return { kind: "loading" };
+    const swappedDisplay = swappedCashDisplay;
+    if (!bankRowOffered || swappedDisplay.kind === "loading") {
+      return swappedDisplay;
+    }
+    const asNoah = (m) => m.method === "bank-transfer" ? { ...m, provider: "noah" } : m;
+    if (swappedOffersBank && swappedDisplay.kind === "list") {
+      return { ...swappedDisplay, methods: swappedDisplay.methods.map(asNoah) };
     }
-    return composeFiatMethods(regionalMethods, FIAT_ONRAMP_METHODS);
+    const bankTransfer = asNoah(
+      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,
     fiatEnabled,
-    hasConfiguredFiatMethods,
-    offeredFiatMethods,
-    regionalMethods
+    providersLoading,
+    swappedCashDisplay,
+    swappedOffersBank
   ]);
   useEffect13(() => {
     if (cashDisplay.kind === "hidden" && fiatEnabled) {
@@ -8776,21 +8808,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 (!displayedFiatSource || providerOf(method) !== "swapped") return;
       handlePrefetchFiatMethod(method, displayedFiatSource);
     },
-    [displayedFiatSource, handlePrefetchFiatMethod]
+    [displayedFiatSource, handlePrefetchFiatMethod, providerOf]
   );
-  const handleNewDeposit = useCallback7(() => {
+  const handleNewDeposit = useCallback6(() => {
     analytics.completeStep();
     analytics.resetAttempt();
     onLifecycleRef.current?.({
@@ -8803,7 +8839,6 @@ function DepositFlow({
     stableWalletSelectionKeyRef.current = null;
     swappedUrlPrefetchRef.current.clear();
     swappedConnectUrlRef.current.clear();
-    acknowledgedConnectFeeRef.current.clear();
     lastSmartAccountLifecycleKeyRef.current = null;
   }, [analytics, onLifecycleRef, storeApi]);
   const setupInput = useMemo8(
@@ -8939,7 +8974,7 @@ function DepositFlow({
       })();
     });
   }, [desiredPortfolios, service, storeApi, portfolioSlice.byKey]);
-  const handleDepositAddressSubmitted = useCallback7(
+  const handleDepositAddressSubmitted = useCallback6(
     (data) => {
       logFlow("deposit-address:detected", {
         txHash: data.txHash,
@@ -8954,7 +8989,7 @@ function DepositFlow({
     },
     [analytics, logFlow, onLifecycleRef]
   );
-  const handleSolanaTokenContinue = useCallback7(
+  const handleSolanaTokenContinue = useCallback6(
     (token, balance, balanceUsd) => {
       logFlow("solana:token:continue", { token: token.symbol });
       storeApi.dispatch({
@@ -8967,16 +9002,14 @@ function DepositFlow({
     },
     [defaultAmount, logFlow, storeApi]
   );
-  const handleSolanaAmountContinue = useCallback7(
+  const handleSolanaAmountContinue = useCallback6(
     (token, sourceAmount, inputAmountUsd) => {
-      const targetSym = getTargetTokenSymbol(targetToken, targetChainId);
-      const isTargetStable = isStablecoinSymbol(targetSym);
-      const targetTokenPriceUsd = isTargetStable ? 1 : targetMarketPriceRef.current;
+      const targetTokenPriceUsd = isTargetStablecoin ? 1 : targetMarketPriceRef.current;
       logFlow("solana:amount:continue", {
         token: token.symbol,
         sourceAmount,
         inputAmountUsd,
-        targetSymbol: targetSym,
+        targetSymbol,
         targetTokenPriceUsd
       });
       storeApi.dispatch({
@@ -8987,9 +9020,9 @@ function DepositFlow({
         targetTokenPriceUsd
       });
     },
-    [targetToken, targetChain, logFlow, storeApi]
+    [isTargetStablecoin, targetSymbol, logFlow, storeApi]
   );
-  const handleSolanaConfirmed = useCallback7(
+  const handleSolanaConfirmed = useCallback6(
     (txHash, amountUnits, routed) => {
       const depositAtSubmit = storeApi.getState().deposit;
       const tokenAtSubmit = depositAtSubmit.selectedSolanaToken;
@@ -9030,7 +9063,7 @@ function DepositFlow({
     },
     [analytics, logFlow, onLifecycleRef, storeApi]
   );
-  const handleAssetContinue = useCallback7(
+  const handleAssetContinue = useCallback6(
     (asset) => {
       analytics.completeStep("wallet_source_asset");
       storeApi.dispatch({
@@ -9041,13 +9074,11 @@ function DepositFlow({
     },
     [analytics, defaultAmount, storeApi]
   );
-  const handleAmountContinue = useCallback7(
+  const handleAmountContinue = useCallback6(
     (amount, targetAmount, balance) => {
       const entry = storeApi.getState().setup;
       if (entry.status !== "ready") return;
-      const targetSym = getTargetTokenSymbol(targetToken, targetChainId);
-      const isTargetStable = isStablecoinSymbol(targetSym);
-      const targetTokenPriceUsd = isTargetStable ? 1 : targetMarketPriceRef.current;
+      const targetTokenPriceUsd = isTargetStablecoin ? 1 : targetMarketPriceRef.current;
       storeApi.dispatch({
         type: "amount/entered",
         amount,
@@ -9056,18 +9087,17 @@ function DepositFlow({
         balance
       });
     },
-    [targetToken, targetChain, storeApi, activeOwner]
+    [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 targetSym = getTargetTokenSymbol(targetToken, targetChainId);
-      const targetTokenPriceUsd = isStablecoinSymbol(targetSym) ? 1 : targetMarketPriceRef.current;
+      const targetTokenPriceUsd = isTargetStablecoin ? 1 : targetMarketPriceRef.current;
       storeApi.dispatch({
         type: "qr/amount-entered",
         amount,
@@ -9075,9 +9105,9 @@ function DepositFlow({
         targetTokenPriceUsd
       });
     },
-    [targetToken, targetChainId, storeApi]
+    [isTargetStablecoin, storeApi]
   );
-  const handleDepositSubmitted = useCallback7(
+  const handleDepositSubmitted = useCallback6(
     (txHash, chainId, amount, token, quote, routed) => {
       logFlow("evm:submitted", {
         txHash,
@@ -9123,7 +9153,7 @@ function DepositFlow({
     },
     [analytics, flowMode, logFlow, storeApi]
   );
-  const handleSwappedComplete = useCallback7(
+  const handleSwappedComplete = useCallback6(
     (info) => {
       logFlow("swapped:complete", {
         txHash: info.txHash,
@@ -9180,7 +9210,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef, service, storeApi]
   );
-  const handleDepositSubmittedCallback = useCallback7(
+  const handleDepositSubmittedCallback = useCallback6(
     (txHash, sourceChain, amount) => {
       const depositAtSubmit = storeApi.getState().deposit;
       onLifecycleRef.current?.({
@@ -9194,7 +9224,7 @@ function DepositFlow({
     },
     [onLifecycleRef, storeApi]
   );
-  const handleDepositComplete = useCallback7(
+  const handleDepositComplete = useCallback6(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
       analytics.openStep(
@@ -9210,7 +9240,7 @@ function DepositFlow({
     },
     [analytics, analyticsMethod, logFlow, onLifecycleRef]
   );
-  const handleDepositFailed = useCallback7(
+  const handleDepositFailed = useCallback6(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
       analytics.openStep(
@@ -9222,16 +9252,13 @@ 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") {
         analytics.friction("processor_status_poll_failed");
       } else {
-        const reason = failureReasonForCode(
-          code,
-          `${message} ${cause ?? ""}`
-        );
+        const reason = failureReasonForCode(code, `${message} ${cause ?? ""}`);
         const failureStep = code === "SWAPPED_URL_FAILED" ? "fiat_provider_mint" : code === "SWAPPED_CONNECT_URL_FAILED" ? "exchange_provider_mint" : void 0;
         analytics.failure(
           reason,
@@ -9239,11 +9266,15 @@ function DepositFlow({
           failureStep
         );
       }
-      onErrorRef.current?.({ message, code, cause });
+      onErrorRef.current?.({
+        message,
+        code,
+        ...cause === void 0 ? {} : { cause }
+      });
     },
     [analytics, logFlowError, onErrorRef]
   );
-  const handleTotalBalanceComputed = useCallback7((total) => {
+  const handleTotalBalanceComputed = useCallback6((total) => {
     setTotalBalanceUsd(total);
   }, []);
   useEffect13(() => {
@@ -9296,12 +9327,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,
@@ -9323,10 +9354,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,
         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: exchangeOffered || enableExchangeConnect && providersLoading ? () => handleSelectExchange() : void 0,
+        fundFromExchangeLoading: enableExchangeConnect && providersLoading,
         onRequestConnect: enableWallet ? onRequestConnect : void 0,
         onConnect: enableWallet ? onConnect : void 0,
         onDisconnect,
@@ -9359,19 +9392,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,
@@ -9416,7 +9444,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx27(
         AmountStep,
         {
           asset: effectiveStep.asset,
@@ -9432,7 +9460,7 @@ function DepositFlow({
           onContinue: handleQrAmountContinue
         }
       ),
-      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx27(
         QrReviewStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -9448,6 +9476,20 @@ 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) {
     return /* @__PURE__ */ jsxs23(
       "div",
@@ -9456,37 +9498,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" && /* @__PURE__ */ jsx28(
-            FiatOnrampStep,
+          step.type === "fiat-onramp" && /* @__PURE__ */ jsx27(Suspense2, { fallback: /* @__PURE__ */ jsx27(AccountPreparingSkeleton, {}), children: /* @__PURE__ */ jsx27(
+            RampOrderStep,
             {
+              ...rampCallbacks,
               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
+              order: step.provider === "noah" && bankRowOffered && bankOnramp ? {
+                flow: "funding_account",
+                backendUrl,
+                bankOnramp,
+                onJourney: onBankJourney,
+                onUnavailable: handleBankOnrampUnavailable
+              } : {
+                flow: "hosted",
+                kind: "fiat",
+                method: step.paymentMethod,
+                methodSelectionSource: step.methodSelectionSource,
+                consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch
+              }
             }
-          ),
-          step.type === "processing" && /* @__PURE__ */ jsx28(
+          ) }),
+          step.type === "processing" && /* @__PURE__ */ jsx27(
             ProcessingStep,
             {
               flowLabel: payment ? "payment" : void 0,
@@ -9530,14 +9569,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,
@@ -9545,29 +9584,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,
@@ -9607,14 +9637,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,
@@ -9625,7 +9655,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx28(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx27(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -9635,13 +9665,14 @@ function DepositFlow({
           uiConfig,
           targetChain,
           targetChainName: getChainName(targetChainId),
-          targetTokenSymbol: getTargetTokenSymbol(targetToken, targetChainId),
+          targetTokenSymbol: targetSymbol,
+          targetToken: { chain: targetChainId, address: targetToken },
           appBalanceUsd,
           onContinue: handleSolanaAmountContinue,
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx28(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx27(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -9665,14 +9696,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",
@@ -9683,21 +9714,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,
@@ -9729,13 +9760,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 ?? "",
@@ -9747,13 +9778,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,
@@ -9780,7 +9811,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;
@@ -9791,14 +9822,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,
@@ -9811,7 +9842,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,
@@ -9820,7 +9851,7 @@ function DepositFlow({
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx27(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -9844,7 +9875,7 @@ function DepositFlow({
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx27(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -9895,7 +9926,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
       ProcessingStep,
       {
         flowLabel: payment ? "payment" : void 0,
@@ -9933,11 +9964,115 @@ function DepositFlow({
   ] });
 }
 
+// src/components/history/useBankHistory.ts
+import { useCallback as useCallback7, useEffect as useEffect14, useRef as useRef10, useState as useState14 } from "react";
+function useBankHistory(source, open, panelOpen) {
+  const [orders, setOrders] = useState14([]);
+  const [unread, setUnread] = useState14(false);
+  const [loading, setLoading] = useState14(false);
+  const [error, setError] = useState14(null);
+  const [cursor, setCursor] = useState14(null);
+  const generation = useRef10(0);
+  const busy = useRef10(false);
+  const seen = useRef10(/* @__PURE__ */ new Map());
+  const baselined = useRef10(false);
+  const paged = useRef10(false);
+  const panel = useRef10(panelOpen);
+  panel.current = panelOpen;
+  const load = useCallback7(
+    async (next) => {
+      if (!source || !open || busy.current || document.visibilityState === "hidden")
+        return;
+      const current = generation.current;
+      busy.current = true;
+      setLoading(true);
+      try {
+        const page = await source.listOrders({
+          limit: 20,
+          ...next ? { cursor: next } : {}
+        });
+        if (current !== generation.current) return;
+        const bank = page.items.filter((order) => order.provider === "noah");
+        let changed = false;
+        for (const order of bank) {
+          const fingerprint = JSON.stringify(order.stages);
+          if (!next && seen.current.get(order.id) !== fingerprint)
+            changed = true;
+          seen.current.set(order.id, fingerprint);
+        }
+        if (baselined.current && changed && !panel.current) setUnread(true);
+        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);
+          return [...merged.values()].sort(
+            (a, b) => b.createdAt.localeCompare(a.createdAt)
+          );
+        });
+        if (next) paged.current = true;
+        if (next || !paged.current) setCursor(page.nextCursor);
+        setError(null);
+      } catch {
+        if (current === generation.current)
+          setError("Bank transfer history is unavailable. Try again shortly.");
+      } finally {
+        if (current === generation.current) {
+          busy.current = false;
+          setLoading(false);
+        }
+      }
+    },
+    [source, open]
+  );
+  useEffect14(() => {
+    generation.current += 1;
+    busy.current = false;
+    seen.current = /* @__PURE__ */ new Map();
+    baselined.current = false;
+    paged.current = false;
+    setOrders([]);
+    setUnread(false);
+    setCursor(null);
+    setError(null);
+    setLoading(false);
+    if (!open || !source) return;
+    void load();
+    const refresh = () => {
+      void load();
+    };
+    const timer = setInterval(refresh, 3e4);
+    window.addEventListener("focus", refresh);
+    document.addEventListener("visibilitychange", refresh);
+    return () => {
+      generation.current += 1;
+      clearInterval(timer);
+      window.removeEventListener("focus", refresh);
+      document.removeEventListener("visibilitychange", refresh);
+    };
+  }, [source, open, load]);
+  useEffect14(() => {
+    if (panelOpen) {
+      setUnread(false);
+      void load();
+    }
+  }, [panelOpen, load]);
+  return {
+    orders,
+    unread,
+    loading,
+    error,
+    hasMore: cursor !== null,
+    loadMore: () => {
+      if (cursor) void load(cursor);
+    }
+  };
+}
+
 // src/DepositModal.tsx
-import { jsx as jsx29, jsxs as jsxs24 } from "react/jsx-runtime";
-var ReownDepositInner = lazy2(async () => {
+import { jsx as jsx28, jsxs as jsxs24 } from "react/jsx-runtime";
+var ReownDepositInner = lazy4(async () => {
   await loadReownDependencies();
-  const module = await import("./DepositModalReown-XBNY6QCI.mjs");
+  const module = await import("./DepositModalReown-SYQ2SCHC.mjs");
   return { default: module.DepositModalReown };
 });
 function buildDepositAnalyticsSessionProperties({
@@ -9954,6 +10089,7 @@ function buildDepositAnalyticsSessionProperties({
   sourceChain,
   sourceToken,
   defaultAmount,
+  bankOnrampEnabled = false,
   walletIntegration,
   targetChain,
   targetToken
@@ -9966,7 +10102,7 @@ function buildDepositAnalyticsSessionProperties({
     enabledFundingMethods.push("wallet");
   }
   if (enableQrTransfer) enabledFundingMethods.push("transfer");
-  if (enableFiatOnramp && configuredFiatIdentifiers?.length !== 0) {
+  if (bankOnrampEnabled || enableFiatOnramp && configuredFiatIdentifiers?.length !== 0) {
     enabledFundingMethods.push("fiat_onramp");
   }
   if (enableExchangeConnect) enabledFundingMethods.push("exchange_connect");
@@ -9999,7 +10135,7 @@ function DepositModal(props) {
   const needsReown = !!props.reownAppId;
   const hasWalletClientProp = hasSuppliedWalletClient(props);
   if (needsReown) {
-    return /* @__PURE__ */ jsx29(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx29(
+    return /* @__PURE__ */ jsx28(Suspense3, { fallback: null, children: /* @__PURE__ */ jsx28(
       ReownDepositInner,
       {
         ...props,
@@ -10007,7 +10143,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx29(
+  return /* @__PURE__ */ jsx28(
     DepositModalInner,
     {
       ...props,
@@ -10038,6 +10174,7 @@ function DepositModalInner({
   assetMigrations,
   initialAssetMigration,
   enableFiatOnramp = false,
+  bankOnramp,
   enableQrTransfer = true,
   enableGaslessDeposit = false,
   fiatMethods,
@@ -10064,24 +10201,41 @@ function DepositModalInner({
   signRecovery,
   debug
 }) {
-  const modalRef = useRef10(null);
-  const analyticsControllerRef = useRef10(null);
-  const analyticsSessionIdRef = useRef10(null);
-  const previousOpenRef = useRef10(isOpen);
+  const modalRef = useRef11(null);
+  const analyticsControllerRef = useRef11(null);
+  const analyticsSessionIdRef = useRef11(null);
+  const previousOpenRef = useRef11(isOpen);
   const onReadyRef = useLatestRef(onReady);
   const onUiStateRef = useLatestRef(onUiState);
-  const [currentScreen, setCurrentScreen] = useState14("connect");
-  const [swappedImmersive, setSwappedImmersive] = useState14(false);
-  const [submitting, setSubmitting] = useState14(false);
-  const [backHandler, setBackHandler] = useState14(
+  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 = useCallback8((journey) => {
+    setBankJourneyVisible(Boolean(journey));
+    if (journey)
+      setBankSession(
+        journey.source ? { source: journey.source, scope: bankScope } : null
+      );
+  }, [bankScope]);
+  const bankSource = bankSession?.scope === bankScope ? bankSession.source : null;
+  useEffect15(() => {
+    if (!isOpen) {
+      setBankSession(null);
+      setBankJourneyVisible(false);
+    }
+  }, [isOpen]);
+  const [swappedImmersive, setSwappedImmersive] = useState15(false);
+  const [submitting, setSubmitting] = useState15(false);
+  const [backHandler, setBackHandler] = useState15(
     void 0
   );
-  const [processingSettled, setProcessingSettled] = useState14(false);
-  const historyButtonVisible = !payment && isHistoryEntryVisible({
+  const [processingSettled, setProcessingSettled] = useState15(false);
+  const historyButtonVisible = !payment && (bankJourneyVisible || isHistoryEntryVisible({
     screen: currentScreen,
     submitting,
     settled: processingSettled
-  });
+  }));
   const targetChain = typeof targetChainProp === "string" ? targetChainProp : getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
   const rpcUrls = useStableRpcUrls(rpcUrlsProp);
@@ -10107,15 +10261,27 @@ function DepositModalInner({
     canRecover: Boolean(signRecovery),
     analytics: historyAnalytics
   });
+  const bankOrders = useBankHistory(bankSource, isOpen && !payment, history.isPanelOpen);
+  const bankHistory = bankJourneyVisible && !bankSource ? { ...bankOrders, loading: true } : bankOrders;
+  const historyDepositsRef = useLatestRef(history.deposits);
+  useEffect15(() => {
+    const waitingForSettlement = bankHistory.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]);
   const {
     markStale: markHistoryStale,
     invalidate: invalidateHistory,
     recoverySubmitting
   } = history;
-  const [clientSetup, setClientSetup] = useState14(
+  const [clientSetup, setClientSetup] = useState15(
     null
   );
-  useEffect14(() => {
+  useEffect15(() => {
     if (!isOpen) return;
     let active = true;
     service.getSetup().then((config) => {
@@ -10125,7 +10291,7 @@ function DepositModalInner({
       active = false;
     };
   }, [isOpen, service]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (debug && clientSetup) {
       console.debug("[deposit] client setup config (not shown yet)", clientSetup);
     }
@@ -10135,19 +10301,19 @@ function DepositModalInner({
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
   );
-  useEffect14(() => {
+  useEffect15(() => {
     store.dispatch({ type: "target/changed", targetChain, targetToken });
   }, [store, targetChain, targetToken]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (!isOpen || !modalRef.current) return;
     return applyTheme(modalRef.current, theme);
   }, [isOpen, theme]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (isOpen) {
       onReadyRef.current?.();
     }
   }, [isOpen, onReadyRef]);
-  useEffect14(() => {
+  useEffect15(() => {
     onUiStateRef.current?.({
       screen: currentScreen,
       back: backHandler,
@@ -10200,7 +10366,7 @@ function DepositModalInner({
     },
     [closeWithSource]
   );
-  useEffect14(() => {
+  useEffect15(() => {
     if (previousOpenRef.current && !isOpen) {
       const analytics = analyticsControllerRef.current;
       analytics?.abandon("modal_close");
@@ -10208,7 +10374,7 @@ function DepositModalInner({
     }
     previousOpenRef.current = isOpen;
   }, [isOpen]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (!isOpen) {
       setCurrentScreen("connect");
       setBackHandler(void 0);
@@ -10217,7 +10383,7 @@ function DepositModalInner({
       setProcessingSettled(false);
     }
   }, [isOpen]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (!isOpen) {
       store.dispatch({ type: "flow/reset" });
     }
@@ -10237,6 +10403,9 @@ function DepositModalInner({
     sourceChain: sourceChainProp,
     sourceToken,
     defaultAmount,
+    bankOnrampEnabled: Boolean(
+      bankOnramp && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
+    ),
     walletIntegration,
     targetChain,
     targetToken
@@ -10245,7 +10414,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(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,
@@ -10254,7 +10423,7 @@ function DepositModalInner({
       inline,
       closeOnOverlayClick,
       ariaLabel: "Deposit",
-      children: /* @__PURE__ */ jsx29(
+      children: /* @__PURE__ */ jsx28(
         AnalyticsSession,
         {
           modal: "deposit",
@@ -10264,44 +10433,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: history.badge,
+                        badge: bankJourneyVisible ? null : history.badge,
+                        unread: bankHistory.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,
@@ -10322,6 +10492,9 @@ function DepositModalInner({
                     assetMigrations,
                     initialAssetMigration,
                     enableFiatOnramp,
+                    bankOnramp,
+                    onBankJourney,
+                    backendUrl,
                     enableQrTransfer,
                     enableGaslessDeposit,
                     fiatMethods,
@@ -10346,10 +10519,12 @@ function DepositModalInner({
                     debug
                   }
                 ),
-                history.isPanelOpen && /* @__PURE__ */ jsx29(
+                history.isPanelOpen && /* @__PURE__ */ jsx28(
                   HistoryOverlay,
                   {
                     controller: history,
+                    bankHistory,
+                    bankSupportUrl: bankOnramp?.supportUrl,
                     backLabel: "Deposit",
                     recipient,
                     backendUrl,
@@ -10371,7 +10546,7 @@ function DepositModalInner({
         }
       )
     }
-  ) }) }) });
+  ) }) }) }) });
 }
 
 export {