@rhinestone/deposit-modal 0.18.0 → 0.20.0

package/dist/{chunk-EKC2IRQG.mjs → chunk-247GJH57.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,
@@ -80,16 +64,19 @@ import {
   isFailedEvent,
   isHistoryEntryVisible,
   isNativeAsset,
-  isRecognizedToken,
+  isNativeSol,
   isSubmissionUncertain,
   portfolioToAssets,
   quoteFeeRow,
   readDedupedAccountSetupResult,
   resolveAppFeeBps,
+  resolveCuratedToken,
+  resolveSolanaToken,
   rpcUrlFor,
   runAccountSetupDeduped,
   tokenFormatter,
   txRefsMatch,
+  useAssetStore,
   useCatalogChain,
   useChainCatalog,
   useChainName,
@@ -100,38 +87,54 @@ import {
   useExplorerTxUrl,
   useHistoryPanel,
   useIsDepositChain,
-  useLatestRef,
+  useIsRecognizedToken,
   useRestrictedListExclusion,
   useRpcUrls,
   useStableRpcUrls,
+  useTokenDisplay,
+  useTokenDisplays,
   warnRemovedProps
-} from "./chunk-AIZKGFVA.mjs";
+} from "./chunk-32ERBFMO.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,12 +167,12 @@ function getReownDependencies() {
 // src/DepositModal.tsx
 import {
   useMemo as useMemo9,
-  useEffect as useEffect14,
-  useRef as useRef10,
-  useState as useState14,
-  useCallback as useCallback8,
-  lazy as lazy2,
-  Suspense as Suspense2
+  useEffect as useEffect15,
+  useRef as useRef11,
+  useState as useState15,
+  useCallback as useCallback9,
+  lazy as lazy3,
+  Suspense as Suspense3
 } from "react";
 
 // src/DepositFlow.tsx
@@ -179,7 +182,9 @@ import {
   useMemo as useMemo8,
   useEffect as useEffect13,
   useLayoutEffect as useLayoutEffect2,
-  useRef as useRef9
+  useRef as useRef9,
+  lazy as lazy2,
+  Suspense as Suspense2
 } from "react";
 
 // src/components/steps/ConnectStep.tsx
@@ -508,6 +513,7 @@ function ConnectStep({
   transferCryptoErrorReason,
   fiatPaymentMethods,
   fiatLoading,
+  fiatNotice,
   onSelectFiatMethod,
   onPrefetchFiatMethod,
   recommendedMethod,
@@ -685,6 +691,7 @@ function ConnectStep({
           ) : void 0
         }
       ),
+      fiatNotice && (activeTab === "cash" || !hasCash) && /* @__PURE__ */ jsx5(Callout, { variant: "warning", children: fiatNotice }),
       /* @__PURE__ */ jsx5(
         "div",
         {
@@ -801,7 +808,7 @@ function AssetSelectStep({
     isDepositChain,
     catalog
   ]);
-  const rows = useMemo(() => {
+  const filteredRows = useMemo(() => {
     return assets.filter((a) => {
       if (!isDepositChain(a.chainId)) return false;
       try {
@@ -827,6 +834,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 +917,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 +980,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 [
       {
@@ -1083,6 +1105,16 @@ function AnimatedAmountInput({
 
 // src/components/steps/AmountStep.tsx
 import { Fragment as Fragment3, jsx as jsx8, jsxs as jsxs6 } from "react/jsx-runtime";
+function requiredSourceAmount(quote, decimals) {
+  const raw = quote?.input?.amount;
+  if (raw === void 0) return null;
+  try {
+    return formatUnits2(BigInt(raw), decimals);
+  } catch {
+    return null;
+  }
+}
+var PAYMENT_QUOTE_REFRESH_MS = 3e4;
 var PRESETS = [
   { value: 25, label: "25%" },
   { value: 50, label: "50%" },
@@ -1113,6 +1145,8 @@ function AmountStep({
   sourcePriceUnavailable = false,
   appBalanceUsd,
   title = "Wallet deposit",
+  payment,
+  account,
   onContinue,
   onCtaClick,
   service
@@ -1120,6 +1154,7 @@ function AmountStep({
   const [amount, setAmount] = useState3("");
   const [balance, setBalance] = useState3(null);
   const [error, setError] = useState3(null);
+  const [paymentQuote, setPaymentQuote] = useState3("loading");
   const hasAttemptedSwitch = useRef2(false);
   const hasAppliedDefaultRef = useRef2(false);
   const isMaxDefault = defaultAmount?.trim().toLowerCase() === "max";
@@ -1127,7 +1162,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)
@@ -1241,7 +1276,15 @@ function AmountStep({
     return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
   }, [amount]);
   const amountUsd = numericAmount;
+  const lockedAmount = payment && typeof paymentQuote !== "string" ? requiredSourceAmount(paymentQuote, asset.decimals) : null;
   const sourceAmountUnits = useMemo2(() => {
+    if (lockedAmount !== null) {
+      try {
+        return parseUnits(lockedAmount, asset.decimals);
+      } catch {
+        return null;
+      }
+    }
     if (numericAmount <= 0) return null;
     const raw = isSourceStablecoin || !hasPricing ? numericAmount : numericAmount / (tokenPriceUsd ?? 1);
     try {
@@ -1249,7 +1292,14 @@ function AmountStep({
     } catch {
       return null;
     }
-  }, [numericAmount, isSourceStablecoin, hasPricing, tokenPriceUsd, asset.decimals]);
+  }, [
+    lockedAmount,
+    numericAmount,
+    isSourceStablecoin,
+    hasPricing,
+    tokenPriceUsd,
+    asset.decimals
+  ]);
   const minDepositUsd = isHyperCoreDestination(targetChain) ? Math.max(HYPERCORE_MIN_DEPOSIT_USD, uiConfig?.minDepositUsd ?? 0) : uiConfig?.minDepositUsd ?? null;
   const maxDepositUsd = uiConfig?.maxDepositUsd ?? null;
   const isBelowMin = minDepositUsd !== null && numericAmount > 0 && amountUsd < minDepositUsd;
@@ -1263,6 +1313,36 @@ function AmountStep({
     sourceAmountUnits
   );
   const balanceAfterUsd = appBalanceUsd !== void 0 ? appBalanceUsd + numericAmount : null;
+  useEffect3(() => {
+    if (!payment || !account) return;
+    let active = true;
+    setPaymentQuote("loading");
+    const load = async () => {
+      const result = await service.getQuotePreview({
+        account,
+        sourceChainId: asset.chainId,
+        sourceToken: asset.token,
+        direction: "exactOut",
+        amountOut: payment.amount
+      });
+      if (!active) return;
+      setPaymentQuote(
+        result && "output" in result && result.input ? result : "unavailable"
+      );
+    };
+    void load();
+    const timer = setInterval(load, PAYMENT_QUOTE_REFRESH_MS);
+    return () => {
+      active = false;
+      clearInterval(timer);
+    };
+  }, [
+    payment,
+    account,
+    asset.chainId,
+    asset.token,
+    service
+  ]);
   const handlePresetClick = (percentage) => {
     if (balance === null) return;
     onCtaClick?.(percentage === 100 ? "Max" : `${percentage}%`);
@@ -1286,6 +1366,19 @@ function AmountStep({
   };
   const handleContinue = async () => {
     if (chainMismatch || boundViolation) return;
+    if (payment) {
+      if (!lockedAmount) return;
+      if (balance !== null && parseUnits(lockedAmount, asset.decimals) > balance) {
+        setError("Insufficient balance");
+        return;
+      }
+      setError(null);
+      onCtaClick?.("continue");
+      const lockedUnits = Number(lockedAmount);
+      const usd = isSourceStablecoin || !hasPricing ? lockedUnits : lockedUnits * (tokenPriceUsd ?? 1);
+      onContinue(lockedAmount, usd.toString(), balance ?? void 0);
+      return;
+    }
     let effectiveAmount = numericAmount;
     if (isBelowMin && minDepositUsd !== null) {
       effectiveAmount = minDepositUsd;
@@ -1323,7 +1416,13 @@ function AmountStep({
   const knowsBalance = address !== void 0;
   const needsPricing = !knowsBalance && !isSourceStablecoin;
   const blockedOnPricing = needsPricing && !hasPricing;
-  const continueDisabled = chainMismatch || exceedsBalance || boundViolation !== null || blockedOnPricing || numericAmount === 0 && !isBelowMin || knowsBalance && balance === null;
+  const continueDisabled = payment ? (
+    // No input to validate — only whether the quote resolved and whether the
+    // payer can cover it. Bounds still apply: they are the project's ingest
+    // limits, so an invoice under a chain's minimum genuinely cannot be paid
+    // that way and the payer has to be told, not left on a dead button.
+    chainMismatch || lockedAmount === null || exceedsBalance || boundViolation !== null || knowsBalance && balance === null
+  ) : chainMismatch || exceedsBalance || boundViolation !== null || blockedOnPricing || numericAmount === 0 && !isBelowMin || knowsBalance && balance === null;
   const chainName = useChainName();
   const sourceChainName = chainName(asset.chainId);
   const targetChainName = chainName(targetChainId);
@@ -1332,7 +1431,7 @@ function AmountStep({
       /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title }),
       /* @__PURE__ */ jsxs6("div", { className: "rs-amount-section", children: [
         /* @__PURE__ */ jsxs6("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsx8(
+          payment ? /* @__PURE__ */ jsx8("div", { className: "rs-amount-fixed", "aria-label": "Amount to pay", children: lockedAmount ? `${tokenFormatter.format(Number(lockedAmount))} ${asset.symbol}` : "\u2014" }) : /* @__PURE__ */ jsx8(
             AnimatedAmountInput,
             {
               value: amount,
@@ -1359,7 +1458,7 @@ function AmountStep({
             ] })
           ] })
         ] }),
-        knowsBalance && /* @__PURE__ */ jsx8("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx8(
+        knowsBalance && !payment && /* @__PURE__ */ jsx8("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx8(
           "button",
           {
             type: "button",
@@ -1380,7 +1479,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: [
@@ -1391,7 +1496,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: [
@@ -1399,6 +1510,14 @@ function AmountStep({
           /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
+      payment && paymentQuote === "unavailable" && /* @__PURE__ */ jsxs6(Callout, { variant: "error", children: [
+        "This payment can't be priced from ",
+        asset.symbol,
+        " on",
+        " ",
+        sourceChainName,
+        " right now. Try another asset."
+      ] }),
       blockedOnPricing && sourcePriceUnavailable && /* @__PURE__ */ jsxs6(Callout, { variant: "error", children: [
         asset.symbol,
         " can't be priced right now, so this deposit can't be estimated. You can still send any amount to the deposit address."
@@ -1432,8 +1551,10 @@ function ReviewDetails({
   estimatedTime,
   sendAmount,
   sendSymbol,
+  sendToken,
   receiveDisplay,
   receiveSymbol,
+  receiveToken,
   fee
 }) {
   return /* @__PURE__ */ jsxs7("div", { className: "rs-review-details", children: [
@@ -1463,14 +1584,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: [
@@ -1656,7 +1777,9 @@ function ConfirmStep({
   onError,
   onDepositSubmitted,
   onSubmittingChange,
-  executeTransfer
+  executeTransfer,
+  title = "Review deposit",
+  routeThroughAccount = false
 }) {
   const [isSubmitting, setIsSubmitting] = useState4(false);
   const [error, setError] = useState4(null);
@@ -1698,7 +1821,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);
@@ -1712,7 +1837,7 @@ function ConfirmStep({
   const { display: feeDisplay, struck: feesFullySponsored } = quoteFeeRow(
     quote?.fees
   );
-  const directTransfer = sameRoute && !mustHaveQuote && !executeTransfer;
+  const directTransfer = sameRoute && !mustHaveQuote && !executeTransfer && !routeThroughAccount;
   const permitEligible = enableGaslessDeposit && !isNativeAsset(asset) && !isDappImportAsset(asset) && !executeTransfer && !directTransfer && asset.chainId !== HYPERCORE_CHAIN_ID;
   const permitRequestKey = JSON.stringify([
     smartAccount.toLowerCase(),
@@ -1751,7 +1876,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.
@@ -2045,7 +2170,7 @@ function ConfirmStep({
   };
   return /* @__PURE__ */ jsxs8("div", { className: "rs-screen", children: [
     /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx10(BodyHeader, { icon: /* @__PURE__ */ jsx10(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsx10(BodyHeader, { icon: /* @__PURE__ */ jsx10(WalletIcon, {}), title }),
       /* @__PURE__ */ jsx10(
         ReviewDetails,
         {
@@ -2056,8 +2181,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 }
         }
       ),
@@ -2113,7 +2240,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;
@@ -2166,7 +2294,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;
@@ -2188,8 +2316,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 }
         }
       ),
@@ -2214,6 +2344,7 @@ import {
   lazy,
   Suspense
 } from "react";
+import { formatUnits as formatUnits3 } from "viem";
 
 // src/components/steps/DepositAddressSkeleton.tsx
 import { jsx as jsx12, jsxs as jsxs10 } from "react/jsx-runtime";
@@ -2223,8 +2354,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: [
@@ -2263,10 +2393,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 }),
@@ -2411,7 +2541,7 @@ function DepositNotification({
   const onCompleteRef = useLatestRef(onComplete);
   const onFailedRef = useLatestRef(onFailed);
   const handleComplete = useCallback(
-    (destTxHash) => {
+    (destTxHash, destAmount) => {
       if (completedRef.current) return;
       completedRef.current = true;
       setDestinationTxHash(destTxHash ?? null);
@@ -2424,7 +2554,8 @@ function DepositNotification({
         sourceToken: context.sourceToken,
         sourceDecimals: context.sourceDecimals,
         targetChain: context.targetChain,
-        targetToken: context.targetToken
+        targetToken: context.targetToken,
+        destinationAmount: destAmount
       });
     },
     [depositContextRef, onCompleteRef, txHash]
@@ -2453,8 +2584,11 @@ function DepositNotification({
         const lastEvent = data.lastEvent;
         const eventForTx = isEventForTx(lastEvent, txHash) ? lastEvent : void 0;
         if (eventForTx?.type === "bridge-complete") {
-          const destTx = eventForTx.data?.destination?.transactionHash;
-          handleComplete(destTx);
+          const destination = eventForTx.data?.destination;
+          handleComplete(
+            destination?.transactionHash,
+            typeof destination?.amount === "string" ? destination.amount : void 0
+          );
           return;
         }
         if (eventForTx?.type === "bridge-failed") {
@@ -2622,6 +2756,15 @@ function DepositNotification({
   );
 }
 
+// src/core/payment-uri.ts
+function paymentRequestUri(input) {
+  const { to, chainId, token, amount } = input;
+  if (token.toLowerCase() === NATIVE_TOKEN_ADDRESS.toLowerCase() || token.toLowerCase() === "0x0") {
+    return `ethereum:${to}@${chainId}?value=${amount}`;
+  }
+  return `ethereum:${token}@${chainId}/transfer?address=${to}&uint256=${amount}`;
+}
+
 // src/core/deposit-source-identity.ts
 var SOLANA_NATIVE_MINT = "11111111111111111111111111111111";
 var EVM_ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
@@ -2643,6 +2786,7 @@ function resolveSourceTokenIdentity(input) {
     const isNative = raw.toLowerCase() === "native" || raw.toLowerCase() === EVM_ZERO_ADDRESS;
     return isNative ? SOLANA_NATIVE_MINT : raw;
   }
+  if (raw.toLowerCase() === "0x0") return EVM_ZERO_ADDRESS;
   return raw.toLowerCase();
 }
 
@@ -2652,6 +2796,7 @@ var QRCode = lazy(
   () => import("./QRCode-5RGIZZHL.mjs").then((m) => ({ default: m.QRCode }))
 );
 var POLL_INTERVAL_MS = 4e3;
+var PAYMENT_QUOTE_REFRESH_MS2 = 3e4;
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
@@ -2683,18 +2828,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 {};
@@ -2752,10 +2887,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) })
@@ -2779,6 +2915,7 @@ function DepositAddressStep({
   onDepositComplete,
   onDepositFailed,
   onAddressShown,
+  payment,
   onCopyAddress,
   onReviewDeposit,
   onError
@@ -2864,6 +3001,7 @@ function DepositAddressStep({
   const baselineTxHashRef = useRef5(void 0);
   const notificationIdRef = useRef5(0);
   const displayAddress = isSolana && solanaDepositAddress ? solanaDepositAddress : smartAccount;
+  const [paymentUnits, setPaymentUnits] = useState7("loading");
   const sourceTokenIdentity = useMemo3(
     () => resolveSourceTokenIdentity({
       chain: sourceChainId,
@@ -2873,6 +3011,59 @@ function DepositAddressStep({
     }),
     [sourceChainId, sourceTokenSymbol, shortlist, offer.restricted, catalogFor]
   );
+  useEffect7(() => {
+    if (!payment) return;
+    if (typeof sourceChainId !== "number" || !sourceTokenIdentity) {
+      setPaymentUnits("unavailable");
+      return;
+    }
+    setPaymentUnits("loading");
+    let active = true;
+    const load = async () => {
+      const quote = await service.getQuotePreview({
+        account: smartAccount,
+        sourceChainId,
+        sourceToken: sourceTokenIdentity,
+        direction: "exactOut",
+        amountOut: payment.amount
+      });
+      if (!active) return;
+      const answered = quote && "output" in quote ? quote.input?.amount : void 0;
+      setPaymentUnits(answered ?? "unavailable");
+    };
+    void load();
+    const timer = setInterval(load, PAYMENT_QUOTE_REFRESH_MS2);
+    return () => {
+      active = false;
+      clearInterval(timer);
+    };
+  }, [payment, sourceChainId, sourceTokenIdentity, smartAccount, service]);
+  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({
+    to: displayAddress,
+    chainId: sourceChainId,
+    token: sourceTokenIdentity,
+    amount: paymentAmountUnits
+  }) : displayAddress;
+  const withholdPaymentQr = Boolean(payment) && paymentAmountUnits === null;
+  const paymentUnquotable = Boolean(payment) && paymentUnits === "unavailable";
   const pendingChain = pendingChainRef.current;
   const sourceSelectionSettled = !catalogLoading && offer.status === "ready" && chainOptions.length > 0 && (pendingChain === void 0 || pendingChain === sourceChainId) && (chainChosenByUser.current ? chainOptions.includes(sourceChainId) : sourceChainId === preferredChainId(chainOptions));
   useEffect7(() => {
@@ -3008,10 +3199,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,
@@ -3171,7 +3362,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" })
               ]
@@ -3187,7 +3384,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                /* @__PURE__ */ jsx14(TokenGlyph, { symbol }),
+                /* @__PURE__ */ jsx14(TokenGlyph, { symbol, token: tokenRefFor(symbol) }),
                 /* @__PURE__ */ jsx14("span", { children: symbol })
               ]
             },
@@ -3201,14 +3398,34 @@ function DepositAddressStep({
           style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
           children: [
             /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-well", children: [
-              /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx14(
+              /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-qr", children: withholdPaymentQr ? /* @__PURE__ */ jsx14("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) : /* @__PURE__ */ jsx14(
                 Suspense,
                 {
-                  fallback: /* @__PURE__ */ jsx14("div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }),
-                  children: /* @__PURE__ */ jsx14(QRCode, { value: displayAddress, size: 190, iconSrc: qrIconSrc })
+                  fallback: /* @__PURE__ */ jsx14(
+                    "div",
+                    {
+                      className: "rs-skeleton rs-skeleton-qr",
+                      "aria-hidden": "true"
+                    }
+                  ),
+                  children: /* @__PURE__ */ jsx14(QRCode, { value: qrValue, size: 190, iconSrc: qrIconSrc })
                 }
               ) }),
-              /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-value", children: displayAddress })
+              payment && paymentDisplay && /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-amount", children: [
+                "Send exactly ",
+                paymentDisplay,
+                " ",
+                sourceTokenSymbol
+              ] }),
+              !withholdPaymentQr && /* @__PURE__ */ jsx14("div", { className: "rs-deposit-address-value", children: displayAddress })
+            ] }),
+            paymentUnquotable && /* @__PURE__ */ jsxs12(Callout, { variant: "error", children: [
+              "This payment can't be priced from ",
+              sourceTokenSymbol,
+              " on",
+              " ",
+              chainLabel(sourceChainId, catalogFor(sourceChainId)),
+              " right now. Pick another chain or token."
             ] }),
             /* @__PURE__ */ jsxs12("div", { className: "rs-deposit-address-actions", children: [
               /* @__PURE__ */ jsxs12(
@@ -3217,6 +3434,7 @@ function DepositAddressStep({
                   type: "button",
                   className: "rs-deposit-address-copy",
                   onClick: handleCopy,
+                  disabled: withholdPaymentQr,
                   children: [
                     copied ? /* @__PURE__ */ jsx14(CheckIcon, {}) : /* @__PURE__ */ jsx14(CopyIcon, {}),
                     copied ? "Copied!" : "Copy address"
@@ -3447,6 +3665,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") {
@@ -3468,7 +3690,9 @@ function parseSwappedIframeMessage(raw) {
     status: rawStatus,
     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),
+    orderCrypto: assetSymbol(
+      asString2(inner.order_crypto) ?? asString2(obj.orderCrypto)
+    ),
     orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount),
     transactionId: asString2(inner.transaction_id) ?? asString2(obj.transactionId)
   };
@@ -3569,8 +3793,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;
@@ -3633,9 +3856,10 @@ 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);
         }
@@ -4141,9 +4365,6 @@ function ExchangeLogo({ exchange }) {
     }
   );
 }
-function formatFeeRate(bps) {
-  return `${(bps / 100).toFixed(2).replace(/\.?0+$/, "")}%`;
-}
 function ExchangeSelectStep({
   service,
   onSelectExchange,
@@ -4153,7 +4374,6 @@ 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
   );
@@ -4168,12 +4388,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(() => {
@@ -4188,16 +4406,7 @@ function ExchangeSelectStep({
       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);
@@ -4206,7 +4415,7 @@ 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: [
@@ -4270,11 +4479,6 @@ function ExchangeSelectStep({
       }) })
     ] }),
     /* @__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 })
   ] });
 }
@@ -4282,7 +4486,7 @@ ExchangeSelectStep.displayName = "ExchangeSelectStep";
 
 // src/components/steps/SolanaTokenSelectStep.tsx
 import { useState as useState10, useEffect as useEffect10, useMemo as useMemo5 } from "react";
-import { formatUnits as formatUnits3 } from "viem";
+import { formatUnits as formatUnits4 } from "viem";
 import { jsx as jsx21, jsxs as jsxs17 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
@@ -4379,7 +4583,7 @@ function SolanaTokenSelectStep({
   const selectedEntry = selectedSymbol ? rows.find((r) => r.token.symbol === selectedSymbol) : null;
   const formatBalance = (entry) => {
     try {
-      const raw = formatUnits3(entry.balance, entry.token.decimals);
+      const raw = formatUnits4(entry.balance, entry.token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return tokenFormatter.format(numeric);
@@ -4438,6 +4642,7 @@ function SolanaTokenSelectStep({
                   /* @__PURE__ */ jsx21("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx21(
                     TokenIcon,
                     {
+                      token: { chain: "solana", address: entry.token.mint },
                       symbol: entry.token.symbol,
                       fallback: entry.token.symbol.slice(0, 4)
                     }
@@ -4485,7 +4690,7 @@ function SolanaTokenSelectStep({
 
 // src/components/steps/SolanaAmountStep.tsx
 import { useCallback as useCallback6, useEffect as useEffect11, useMemo as useMemo6, useRef as useRef7, useState as useState11 } from "react";
-import { formatUnits as formatUnits4, parseUnits as parseUnits4 } from "viem";
+import { formatUnits as formatUnits5, parseUnits as parseUnits4 } from "viem";
 import { Fragment as Fragment5, jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
@@ -4503,6 +4708,7 @@ function SolanaAmountStep({
   targetChain,
   targetChainName,
   targetTokenSymbol,
+  targetToken,
   appBalanceUsd,
   onContinue,
   debug
@@ -4515,7 +4721,7 @@ function SolanaAmountStep({
   const tokenPriceUsd = useMemo6(() => {
     if (isSourceStablecoin) return 1;
     try {
-      const balanceUnits = Number(formatUnits4(balance, token.decimals));
+      const balanceUnits = Number(formatUnits5(balance, token.decimals));
       if (!Number.isFinite(balanceUnits) || balanceUnits <= 0 || balanceUsd <= 0) {
         return null;
       }
@@ -4528,7 +4734,7 @@ function SolanaAmountStep({
   const hasPricing = tokenPriceUsd !== null;
   const formattedBalance = useMemo6(() => {
     try {
-      const raw = formatUnits4(balance, token.decimals);
+      const raw = formatUnits5(balance, token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return tokenFormatter.format(numeric);
@@ -4538,7 +4744,7 @@ function SolanaAmountStep({
   }, [balance, token.decimals]);
   const computedBalanceUsd = useMemo6(() => {
     try {
-      const balanceUnits = Number(formatUnits4(balance, token.decimals));
+      const balanceUnits = Number(formatUnits5(balance, token.decimals));
       if (!Number.isFinite(balanceUnits) || balanceUnits < 0) return null;
       if (tokenPriceUsd !== null) return balanceUnits * tokenPriceUsd;
       if (Number.isFinite(balanceUsd) && balanceUsd > 0) return balanceUsd;
@@ -4553,7 +4759,7 @@ function SolanaAmountStep({
   }, [balance, token]);
   const spendableBalanceUsd = useMemo6(() => {
     try {
-      const spendableUnits = Number(formatUnits4(spendableBalance, token.decimals));
+      const spendableUnits = Number(formatUnits5(spendableBalance, token.decimals));
       if (!Number.isFinite(spendableUnits) || spendableUnits < 0) return null;
       if (tokenPriceUsd !== null) return spendableUnits * tokenPriceUsd;
       return null;
@@ -4565,7 +4771,7 @@ function SolanaAmountStep({
     (percentage) => {
       try {
         const spendableUnits = Number(
-          formatUnits4(spendableBalance, token.decimals)
+          formatUnits5(spendableBalance, token.decimals)
         );
         if (!Number.isFinite(spendableUnits) || spendableUnits <= 0) return "";
         const value = isSourceStablecoin || !hasPricing ? spendableUnits * percentage / 100 : (spendableBalanceUsd ?? 0) * percentage / 100;
@@ -4742,7 +4948,13 @@ function SolanaAmountStep({
               "Solana ",
               token.symbol
             ] }),
-            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(TokenIcon, { symbol: token.symbol }) })
+            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(
+              TokenIcon,
+              {
+                token: { chain: "solana", address: token.mint },
+                symbol: token.symbol
+              }
+            ) })
           ] })
         ] }),
         targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
@@ -4753,7 +4965,7 @@ function SolanaAmountStep({
               " ",
               targetTokenSymbol
             ] }),
-            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(TokenIcon, { symbol: targetTokenSymbol }) })
+            /* @__PURE__ */ jsx22("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx22(TokenIcon, { token: targetToken, symbol: targetTokenSymbol }) })
           ] })
         ] }),
         balanceAfterUsd !== null && /* @__PURE__ */ jsxs18("div", { className: "rs-amount-detail-row", children: [
@@ -4922,7 +5134,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");
@@ -4938,7 +5150,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 } : {}
@@ -5053,8 +5266,10 @@ 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 }
         }
       ),
@@ -5114,6 +5329,7 @@ function DappImportAssetSelectStep({
                   /* @__PURE__ */ jsx24("span", { className: "rs-asset-icon", children: assetIcon ? /* @__PURE__ */ jsx24(CdnIcon, { src: assetIcon, alt: asset.symbol }) : /* @__PURE__ */ jsx24(
                     TokenIcon,
                     {
+                      token: { chain: asset.chainId, address: asset.token },
                       symbol: asset.symbol,
                       fallback: asset.symbol.slice(0, 4)
                     }
@@ -5530,7 +5746,7 @@ function withdrawableUsd(position) {
 }
 
 // src/core/dapp-imports/polymarket/index.ts
-import { formatUnits as formatUnits5 } from "viem";
+import { formatUnits as formatUnits6 } from "viem";
 
 // src/core/dapp-imports/polymarket/deposit-wallet.ts
 import {
@@ -5789,7 +6005,7 @@ function buildAsset2(params) {
   const isPusd = tokenKind === "pusd";
   const tokenAddress = isPusd ? POLYMARKET_PUSD_ADDRESS : POLYMARKET_USDCE_ADDRESS;
   const symbol = isPusd ? "pUSD" : "USDC.e";
-  const balanceUsd = Number(formatUnits5(balance, 6));
+  const balanceUsd = Number(formatUnits6(balance, 6));
   const metadata = { proxyWallet, tokenKind, walletKind };
   return {
     id: `polymarket:${tokenKind}`,
@@ -7235,6 +7451,10 @@ function useDepositStore(selector) {
 
 // src/DepositFlow.tsx
 import { Fragment as Fragment6, jsx as jsx28, jsxs as jsxs23 } from "react/jsx-runtime";
+var BankOnrampStep = lazy2(async () => {
+  const module = await import("./BankOnrampStep-JG32OCM2.mjs");
+  return { default: module.BankOnrampStep };
+});
 function swappedWidgetPrefetchKey(method, methodSelectionSource) {
   return JSON.stringify([methodSelectionSource ?? null, method ?? null]);
 }
@@ -7496,6 +7716,7 @@ function DepositFlow({
   sourceToken: defaultSourceToken,
   amount: defaultAmount,
   recipient,
+  payment,
   appBalanceUsd,
   outputTokenRules,
   rejectUnmapped,
@@ -7504,6 +7725,9 @@ function DepositFlow({
   initialAssetMigration,
   enableWallet = true,
   enableFiatOnramp = false,
+  bankOnramp,
+  onBankJourney,
+  backendUrl,
   enableQrTransfer = true,
   enableGaslessDeposit = false,
   fiatMethods,
@@ -7557,7 +7781,15 @@ function DepositFlow({
     },
     [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;
@@ -7632,11 +7864,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]
@@ -7676,27 +7911,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;
@@ -7951,11 +8182,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(() => {
@@ -7964,7 +8198,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.
@@ -8086,7 +8320,9 @@ 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(
@@ -8334,10 +8570,7 @@ function DepositFlow({
     storeApi
   ]);
   const handleBootRetry = useCallback7(() => {
-    analytics.retry(
-      "migration_availability_failed",
-      "migration_boot_resolve"
-    );
+    analytics.retry("migration_availability_failed", "migration_boot_resolve");
     const snapshot = storeApi.getState();
     const providerId = snapshot.dappImport.activeProviderId;
     if (!providerId) return;
@@ -8379,9 +8612,12 @@ function DepositFlow({
     storeApi.dispatch({ type: "connect/exchange-selected" });
   }, [analytics, storeApi]);
   const swappedAnalyticsCorrelatorRef = useRef9(null);
-  const handleSwappedAttemptConsumed = useCallback7((externalCustomerId) => {
-    swappedAnalyticsCorrelatorRef.current = externalCustomerId;
-  }, []);
+  const handleSwappedAttemptConsumed = useCallback7(
+    (externalCustomerId) => {
+      swappedAnalyticsCorrelatorRef.current = externalCustomerId;
+    },
+    []
+  );
   const handleSwappedProviderHandoff = useCallback7(() => {
     const externalCustomerId = swappedAnalyticsCorrelatorRef.current;
     if (!externalCustomerId) return;
@@ -8399,45 +8635,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) => {
+    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
       });
@@ -8445,7 +8663,6 @@ function DepositFlow({
         type: "exchange/connection-selected",
         connection
       });
-      return actualFeeBps;
     },
     [analytics, service, setupSlice.status, setupSlice.smartAccount, storeApi]
   );
@@ -8453,25 +8670,8 @@ function DepositFlow({
     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]
   );
@@ -8530,7 +8730,6 @@ function DepositFlow({
   useEffect13(() => {
     swappedUrlPrefetchRef.current.clear();
     swappedConnectUrlRef.current.clear();
-    acknowledgedConnectFeeRef.current.clear();
   }, [setupSlice.smartAccount]);
   const hasConfiguredFiatMethods = fiatMethods !== void 0;
   const [regionalMethods, setRegionalMethods] = useState13({
@@ -8540,7 +8739,7 @@ function DepositFlow({
     recommendedMethod: null
   });
   useEffect13(() => {
-    if (!fiatEnabled || hasConfiguredFiatMethods) return;
+    if (!enableFiatOnramp || hasConfiguredFiatMethods) return;
     let cancelled = false;
     setRegionalMethods({
       status: "loading",
@@ -8578,25 +8777,47 @@ function DepositFlow({
       cancelled = true;
       clearTimeout(timeoutTimer);
     };
-  }, [analytics, fiatEnabled, hasConfiguredFiatMethods, service]);
+  }, [analytics, enableFiatOnramp, hasConfiguredFiatMethods, service]);
+  const swappedCashDisplay = useMemo8(
+    () => !enableFiatOnramp ? { 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
+    ]
+  );
+  const swappedOffersBank = swappedCashDisplay.kind === "list" && swappedCashDisplay.methods.some(({ method }) => method === "bank-transfer");
+  const [bankOnrampUnavailable, setBankOnrampUnavailable] = useState13(false);
+  const bankRowOffered = bankOnrampEnabled && !bankOnrampUnavailable;
+  const swappedRefusesBank = hasConfiguredFiatMethods ? !configuredFiatMethods.some(({ method }) => method === "bank-transfer") : regionalMethods.status === "ready" && regionalMethods.country !== null && !regionalMethods.methods.some(({ method }) => method === "bank-transfer");
+  const handleBankOnrampUnavailable = useCallback7(() => {
+    setBankOnrampUnavailable(true);
+    if (swappedRefusesBank) handleProviderBack();
+  }, [handleProviderBack, swappedRefusesBank]);
   const cashDisplay = useMemo8(() => {
-    if (!fiatEnabled) return { kind: "hidden" };
-    if (hasConfiguredFiatMethods) {
-      return {
-        kind: "list",
-        methods: offeredFiatMethods,
-        recommendedMethod: offeredFiatMethods[0].method,
-        country: null,
-        source: "configured"
-      };
+    const swappedDisplay = swappedCashDisplay;
+    if (!bankRowOffered || swappedDisplay.kind === "loading") {
+      return swappedDisplay;
     }
-    return composeFiatMethods(regionalMethods, FIAT_ONRAMP_METHODS);
-  }, [
-    fiatEnabled,
-    hasConfiguredFiatMethods,
-    offeredFiatMethods,
-    regionalMethods
-  ]);
+    if (swappedOffersBank) return swappedDisplay;
+    const bankTransfer = FIAT_ONRAMP_METHODS.find(
+      ({ method }) => method === "bank-transfer"
+    );
+    return {
+      kind: "list",
+      methods: swappedDisplay.kind === "list" ? [...swappedDisplay.methods, bankTransfer] : [bankTransfer],
+      recommendedMethod: swappedDisplay.kind === "list" ? swappedDisplay.recommendedMethod : bankTransfer.method,
+      country: swappedDisplay.kind === "list" ? swappedDisplay.country : null,
+      source: swappedDisplay.kind === "list" ? swappedDisplay.source : "configured"
+    };
+  }, [bankRowOffered, swappedCashDisplay, swappedOffersBank]);
   useEffect13(() => {
     if (cashDisplay.kind === "hidden" && fiatEnabled) {
       analytics.friction(
@@ -8621,9 +8842,10 @@ function DepositFlow({
   const handlePrefetchDisplayedFiatMethod = useCallback7(
     (method) => {
       if (!displayedFiatSource) return;
+      if (bankRowOffered && method === "bank-transfer") return;
       handlePrefetchFiatMethod(method, displayedFiatSource);
     },
-    [displayedFiatSource, handlePrefetchFiatMethod]
+    [bankRowOffered, displayedFiatSource, handlePrefetchFiatMethod]
   );
   const handleNewDeposit = useCallback7(() => {
     analytics.completeStep();
@@ -8638,7 +8860,6 @@ function DepositFlow({
     stableWalletSelectionKeyRef.current = null;
     swappedUrlPrefetchRef.current.clear();
     swappedConnectUrlRef.current.clear();
-    acknowledgedConnectFeeRef.current.clear();
     lastSmartAccountLifecycleKeyRef.current = null;
   }, [analytics, onLifecycleRef, storeApi]);
   const setupInput = useMemo8(
@@ -8648,7 +8869,8 @@ function DepositFlow({
       recipient,
       outputTokenRules,
       rejectUnmapped,
-      forceRegister
+      forceRegister,
+      ...payment ? { salt: payment.salt } : {}
     }),
     [
       targetChain,
@@ -8656,7 +8878,8 @@ function DepositFlow({
       recipient,
       outputTokenRules,
       rejectUnmapped,
-      forceRegister
+      forceRegister,
+      payment
     ]
   );
   const desiredSetupRequestKey = computeRequestKey(setupInput);
@@ -8802,14 +9025,12 @@ function DepositFlow({
   );
   const handleSolanaAmountContinue = useCallback7(
     (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({
@@ -8820,7 +9041,7 @@ function DepositFlow({
         targetTokenPriceUsd
       });
     },
-    [targetToken, targetChain, logFlow, storeApi]
+    [isTargetStablecoin, targetSymbol, logFlow, storeApi]
   );
   const handleSolanaConfirmed = useCallback7(
     (txHash, amountUnits, routed) => {
@@ -8878,9 +9099,7 @@ function DepositFlow({
     (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,
@@ -8889,7 +9108,7 @@ function DepositFlow({
         balance
       });
     },
-    [targetToken, targetChain, storeApi, activeOwner]
+    [isTargetStablecoin, storeApi, activeOwner]
   );
   const handleQrReviewRequested = useCallback7(
     (asset) => {
@@ -8899,8 +9118,7 @@ function DepositFlow({
   );
   const handleQrAmountContinue = useCallback7(
     (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,
@@ -8908,7 +9126,7 @@ function DepositFlow({
         targetTokenPriceUsd
       });
     },
-    [targetToken, targetChainId, storeApi]
+    [isTargetStablecoin, storeApi]
   );
   const handleDepositSubmitted = useCallback7(
     (txHash, chainId, amount, token, quote, routed) => {
@@ -9061,10 +9279,7 @@ function DepositFlow({
       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,
@@ -9072,7 +9287,11 @@ function DepositFlow({
           failureStep
         );
       }
-      onErrorRef.current?.({ message, code, cause });
+      onErrorRef.current?.({
+        message,
+        code,
+        ...cause === void 0 ? {} : { cause }
+      });
     },
     [analytics, logFlowError, onErrorRef]
   );
@@ -9137,6 +9356,7 @@ function DepositFlow({
     return /* @__PURE__ */ jsx28("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx28(
       ConnectStep,
       {
+        title: payment ? "Pay" : void 0,
         walletRows,
         defaultMethodTab: flowSlice.methodTab,
         onMethodTabChange: (tab) => storeApi.dispatch({ type: "connect/method-tab-changed", tab }),
@@ -9155,6 +9375,7 @@ 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,
@@ -9197,15 +9418,11 @@ function DepositFlow({
           errorMessage: activeEntry.message ?? void 0,
           onRetry: () => handleRetrySetup()
         }
-      ) : /* @__PURE__ */ jsx28(
-        DepositAddressSkeleton,
-        {
-          uiConfig
-        }
-      )),
+      ) : /* @__PURE__ */ jsx28(DepositAddressSkeleton, { uiConfig })),
       effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx28(
         DepositAddressStep,
         {
+          payment,
           smartAccount: effectiveStep.smartAccount,
           solanaDepositAddress: effectiveStep.solanaDepositAddress,
           service,
@@ -9280,6 +9497,29 @@ function DepositFlow({
     ] });
   }
   if (isFiatOnrampMode) {
+    const swappedStep = step.type === "fiat-onramp" ? /* @__PURE__ */ jsx28(
+      FiatOnrampStep,
+      {
+        smartAccount: step.smartAccount,
+        service,
+        paymentMethod: step.paymentMethod,
+        methodSelectionSource: step.methodSelectionSource,
+        consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch,
+        onSwappedComplete: handleSwappedComplete,
+        onSwappedFailed: handleDepositFailed,
+        onClose: () => onClose?.(
+          openExternally ? "native_dismiss_request" : "header_button"
+        ),
+        onGoBack: handleProviderBack,
+        onError: handleError,
+        onAttemptConsumed: handleSwappedAttemptConsumed,
+        onProviderHandoff: handleSwappedProviderHandoff,
+        onRetry: handleSwappedRetry,
+        onCancelled: () => analytics.outcome("cancelled"),
+        onImmersiveChange: onSwappedImmersiveChange,
+        openExternally
+      }
+    ) : null;
     return /* @__PURE__ */ jsxs23(
       "div",
       {
@@ -9294,32 +9534,25 @@ function DepositFlow({
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "fiat-onramp" && /* @__PURE__ */ jsx28(
-            FiatOnrampStep,
+          step.type === "fiat-onramp" && bankRowOffered && bankOnramp && step.paymentMethod === "bank-transfer" && /* @__PURE__ */ jsx28(Suspense2, { fallback: /* @__PURE__ */ jsx28(AccountPreparingSkeleton, {}), children: /* @__PURE__ */ jsx28(
+            BankOnrampStep,
             {
+              backendUrl,
               smartAccount: step.smartAccount,
-              service,
-              paymentMethod: step.paymentMethod,
-              methodSelectionSource: step.methodSelectionSource,
-              consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch,
-              onSwappedComplete: handleSwappedComplete,
-              onSwappedFailed: handleDepositFailed,
-              onClose: () => onClose?.(
-                openExternally ? "native_dismiss_request" : "header_button"
-              ),
+              bankOnramp,
+              onJourney: onBankJourney,
               onGoBack: handleProviderBack,
               onError: handleError,
-              onAttemptConsumed: handleSwappedAttemptConsumed,
-              onProviderHandoff: handleSwappedProviderHandoff,
-              onRetry: handleSwappedRetry,
-              onCancelled: () => analytics.outcome("cancelled"),
-              onImmersiveChange: onSwappedImmersiveChange,
-              openExternally
-            }
-          ),
+              openExternally,
+              onUnavailable: handleBankOnrampUnavailable
+            },
+            `${backendUrl}:${step.smartAccount}`
+          ) }),
+          step.type === "fiat-onramp" && (!bankRowOffered || step.paymentMethod !== "bank-transfer") && swappedStep,
           step.type === "processing" && /* @__PURE__ */ jsx28(
             ProcessingStep,
             {
+              flowLabel: payment ? "payment" : void 0,
               smartAccount: step.smartAccount,
               solanaDepositAddress: step.solanaDepositAddress,
               txHash: step.txHash,
@@ -9400,6 +9633,7 @@ function DepositFlow({
           step.type === "processing" && /* @__PURE__ */ jsx28(
             ProcessingStep,
             {
+              flowLabel: payment ? "payment" : void 0,
               smartAccount: step.smartAccount,
               solanaDepositAddress: step.solanaDepositAddress,
               txHash: step.txHash,
@@ -9464,7 +9698,8 @@ function DepositFlow({
           uiConfig,
           targetChain,
           targetChainName: getChainName(targetChainId),
-          targetTokenSymbol: getTargetTokenSymbol(targetToken, targetChainId),
+          targetTokenSymbol: targetSymbol,
+          targetToken: { chain: targetChainId, address: targetToken },
           appBalanceUsd,
           onContinue: handleSolanaAmountContinue,
           debug
@@ -9529,6 +9764,7 @@ function DepositFlow({
       effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
         ProcessingStep,
         {
+          flowLabel: payment ? "payment" : void 0,
           smartAccount: effectiveStep.smartAccount,
           solanaDepositAddress: effectiveStep.solanaDepositAddress,
           txHash: effectiveStep.txHash,
@@ -9663,6 +9899,9 @@ function DepositFlow({
         uiConfig,
         appBalanceUsd,
         service,
+        payment,
+        account: effectiveStep.smartAccount,
+        title: payment ? "Amount to pay" : void 0,
         onContinue: handleAmountContinue,
         onCtaClick: (ctaName) => {
           if (ctaName === "continue") analytics.completeStep();
@@ -9678,6 +9917,8 @@ function DepositFlow({
         recipient,
         asset: effectiveStep.asset,
         amount: effectiveStep.amount,
+        title: payment ? "Review payment" : void 0,
+        routeThroughAccount: Boolean(payment),
         targetAmount: effectiveStep.targetAmount,
         targetTokenPriceUsd: effectiveStep.targetTokenPriceUsd,
         balance: effectiveStep.balance,
@@ -9721,6 +9962,7 @@ function DepositFlow({
     effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
       ProcessingStep,
       {
+        flowLabel: payment ? "payment" : void 0,
         smartAccount: effectiveStep.smartAccount,
         solanaDepositAddress: effectiveStep.solanaDepositAddress,
         txHash: effectiveStep.txHash,
@@ -9755,11 +9997,115 @@ function DepositFlow({
   ] });
 }
 
+// src/components/history/useBankHistory.ts
+import { useCallback as useCallback8, useEffect as useEffect14, useRef as useRef10, useState as useState14 } from "react";
+function useBankHistory(source, open, panelOpen) {
+  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 = useCallback8(
+    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 () => {
+var ReownDepositInner = lazy3(async () => {
   await loadReownDependencies();
-  const module = await import("./DepositModalReown-VCY65DJX.mjs");
+  const module = await import("./DepositModalReown-3FGTPER6.mjs");
   return { default: module.DepositModalReown };
 });
 function buildDepositAnalyticsSessionProperties({
@@ -9776,6 +10122,7 @@ function buildDepositAnalyticsSessionProperties({
   sourceChain,
   sourceToken,
   defaultAmount,
+  bankOnrampEnabled = false,
   walletIntegration,
   targetChain,
   targetToken
@@ -9788,7 +10135,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");
@@ -9821,7 +10168,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__ */ jsx29(Suspense3, { fallback: null, children: /* @__PURE__ */ jsx29(
       ReownDepositInner,
       {
         ...props,
@@ -9852,6 +10199,7 @@ function DepositModalInner({
   sourceToken,
   defaultAmount,
   recipient,
+  payment,
   appBalanceUsd,
   backendUrl,
   rpcUrls: rpcUrlsProp,
@@ -9859,6 +10207,7 @@ function DepositModalInner({
   assetMigrations,
   initialAssetMigration,
   enableFiatOnramp = false,
+  bankOnramp,
   enableQrTransfer = true,
   enableGaslessDeposit = false,
   fiatMethods,
@@ -9885,24 +10234,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 = useCallback9((journey) => {
+    setBankJourneyVisible(Boolean(journey));
+    if (journey)
+      setBankSession(
+        journey.source ? { source: journey.source, scope: bankScope } : null
+      );
+  }, [bankScope]);
+  const bankSource = bankSession?.scope === bankScope ? bankSession.source : null;
+  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 = 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);
@@ -9922,21 +10288,33 @@ function DepositModalInner({
     []
   );
   const history = useHistoryPanel({
-    isOpen,
+    isOpen: isOpen && !payment,
     recipient,
     service,
     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) => {
@@ -9946,7 +10324,7 @@ function DepositModalInner({
       active = false;
     };
   }, [isOpen, service]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (debug && clientSetup) {
       console.debug("[deposit] client setup config (not shown yet)", clientSetup);
     }
@@ -9956,19 +10334,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,
@@ -9983,7 +10361,7 @@ function DepositModalInner({
     recoverySubmitting,
     onUiStateRef
   ]);
-  const handleStepChange = useCallback8(
+  const handleStepChange = useCallback9(
     (onBack, screen) => {
       setBackHandler(() => onBack);
       if (screen) setCurrentScreen(screen);
@@ -9991,7 +10369,7 @@ function DepositModalInner({
     []
   );
   const onLifecycleRef = useLatestRef(onLifecycle);
-  const handleLifecycle = useCallback8(
+  const handleLifecycle = useCallback9(
     (event) => {
       onLifecycleRef.current?.(event);
       if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
@@ -10003,7 +10381,7 @@ function DepositModalInner({
     },
     [onLifecycleRef, markHistoryStale, invalidateHistory]
   );
-  const closeWithSource = useCallback8(
+  const closeWithSource = useCallback9(
     (source) => {
       if (recoverySubmitting) return;
       const analytics = analyticsControllerRef.current;
@@ -10013,7 +10391,7 @@ function DepositModalInner({
     },
     [onClose, recoverySubmitting]
   );
-  const handleModalDismiss = useCallback8(
+  const handleModalDismiss = useCallback9(
     (reason) => {
       closeWithSource(
         reason === "escape" ? "escape" : reason === "overlay" ? "overlay" : "header_button"
@@ -10021,7 +10399,7 @@ function DepositModalInner({
     },
     [closeWithSource]
   );
-  useEffect14(() => {
+  useEffect15(() => {
     if (previousOpenRef.current && !isOpen) {
       const analytics = analyticsControllerRef.current;
       analytics?.abandon("modal_close");
@@ -10029,7 +10407,7 @@ function DepositModalInner({
     }
     previousOpenRef.current = isOpen;
   }, [isOpen]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (!isOpen) {
       setCurrentScreen("connect");
       setBackHandler(void 0);
@@ -10038,7 +10416,7 @@ function DepositModalInner({
       setProcessingSettled(false);
     }
   }, [isOpen]);
-  useEffect14(() => {
+  useEffect15(() => {
     if (!isOpen) {
       store.dispatch({ type: "flow/reset" });
     }
@@ -10058,6 +10436,9 @@ function DepositModalInner({
     sourceChain: sourceChainProp,
     sourceToken,
     defaultAmount,
+    bankOnrampEnabled: Boolean(
+      bankOnramp && (fiatMethods === void 0 || fiatMethods["bank-transfer"] === true)
+    ),
     walletIntegration,
     targetChain,
     targetToken
@@ -10066,7 +10447,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__ */ jsx29(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx29(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx29(AssetMetadataProvider, { service, children: /* @__PURE__ */ jsx29(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx29(
     Modal,
     {
       isOpen,
@@ -10105,7 +10486,8 @@ function DepositModalInner({
                     historyButtonVisible && /* @__PURE__ */ jsx29(
                       HistoryEntryButton,
                       {
-                        badge: history.badge,
+                        badge: bankJourneyVisible ? null : history.badge,
+                        unread: bankHistory.unread,
                         onClick: history.openPanel,
                         disabled: !recipient
                       }
@@ -10135,6 +10517,7 @@ function DepositModalInner({
                     sourceToken,
                     amount: defaultAmount,
                     recipient,
+                    payment,
                     appBalanceUsd,
                     outputTokenRules,
                     rejectUnmapped,
@@ -10142,6 +10525,9 @@ function DepositModalInner({
                     assetMigrations,
                     initialAssetMigration,
                     enableFiatOnramp,
+                    bankOnramp,
+                    onBankJourney,
+                    backendUrl,
                     enableQrTransfer,
                     enableGaslessDeposit,
                     fiatMethods,
@@ -10170,6 +10556,8 @@ function DepositModalInner({
                   HistoryOverlay,
                   {
                     controller: history,
+                    bankHistory,
+                    bankSupportUrl: bankOnramp?.supportUrl,
                     backLabel: "Deposit",
                     recipient,
                     backendUrl,
@@ -10191,7 +10579,7 @@ function DepositModalInner({
         }
       )
     }
-  ) }) }) });
+  ) }) }) }) });
 }
 
 export {