@rhinestone/deposit-modal 0.5.0 → 0.6.0

package/dist/{chunk-ZYYLKWU2.mjs → chunk-NSAODZSS.mjs}

@@ -66,8 +66,9 @@ import {
   tokenFormatter,
   txRefsMatch,
   useLatestRef,
-  useRpcUrls
-} from "./chunk-PS7HJ62M.mjs";
+  useRpcUrls,
+  useStableRpcUrls
+} from "./chunk-GQDVHMOT.mjs";
 import {
   SAFE_ABI
 } from "./chunk-F7P4MV72.mjs";
@@ -1173,7 +1174,6 @@ function DepositNotification({
   solanaDepositAddress,
   targetChain,
   targetToken,
-  hasPostBridgeActions,
   service,
   onComplete,
   onFailed,
@@ -1207,8 +1207,7 @@ function DepositNotification({
     sourceToken: token,
     sourceDecimals,
     targetChain,
-    targetToken,
-    hasPostBridgeActions
+    targetToken
   });
   const onCompleteRef = useLatestRef(onComplete);
   const onFailedRef = useLatestRef(onFailed);
@@ -1254,17 +1253,7 @@ function DepositNotification({
         if (!isMounted) return;
         const lastEvent = data.lastEvent;
         const eventForTx = isEventForTx(lastEvent, txHash) ? lastEvent : void 0;
-        const awaitingPostBridgeSwap = depositContextRef.current.hasPostBridgeActions;
-        if (eventForTx?.type === "post-bridge-swap-complete") {
-          const swapTxHash = eventForTx.data?.swap?.transactionHash;
-          handleComplete(swapTxHash);
-          return;
-        }
-        if (eventForTx?.type === "post-bridge-swap-failed") {
-          handleFailed(formatBridgeFailedMessage(eventForTx));
-          return;
-        }
-        if (eventForTx?.type === "bridge-complete" && !awaitingPostBridgeSwap) {
+        if (eventForTx?.type === "bridge-complete") {
           const destTx = eventForTx.data?.destination?.transactionHash;
           handleComplete(destTx);
           return;
@@ -1529,7 +1518,6 @@ function DepositAddressStep({
   allowedRoutes,
   targetChain,
   targetToken,
-  hasPostBridgeActions,
   uiConfig,
   onDepositSubmitted,
   onDepositComplete,
@@ -2036,7 +2024,6 @@ function DepositAddressStep({
         solanaDepositAddress,
         targetChain,
         targetToken,
-        hasPostBridgeActions,
         service,
         onComplete: handleNotificationComplete,
         onFailed: handleNotificationFailed,
@@ -2052,6 +2039,20 @@ DepositAddressStep.displayName = "DepositAddressStep";
 // src/components/steps/FiatOnrampStep.tsx
 import { useCallback as useCallback3 } from "react";
 
+// src/core/swapped.ts
+var SWAPPED_ORIGINS = [
+  "https://connect.swapped.com",
+  "https://sandbox.swapped.com",
+  "https://widget.swapped.com"
+];
+var WIDGET_URL_EXPIRY_BUFFER_MS = 1e4;
+function isSwappedWidgetUrlFresh(res, now = Date.now()) {
+  if (!res.expiresAt) return false;
+  const expiry = Date.parse(res.expiresAt);
+  if (!Number.isFinite(expiry)) return false;
+  return expiry - now > WIDGET_URL_EXPIRY_BUFFER_MS;
+}
+
 // src/components/steps/SwappedIframeStep.tsx
 import { useState as useState6, useEffect as useEffect6, useRef as useRef6, useMemo as useMemo4 } from "react";
 
@@ -2060,7 +2061,19 @@ import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 function FinalisingDepositStep() {
   return /* @__PURE__ */ jsxs7("div", { className: "rs-screen rs-finalising", children: [
     /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-finalising-body", children: [
-      /* @__PURE__ */ jsx7("span", { className: "rs-finalising-spinner", children: /* @__PURE__ */ jsx7(Spinner, {}) }),
+      /* @__PURE__ */ jsxs7(
+        "svg",
+        {
+          className: "rs-finalising-spinner",
+          viewBox: "0 0 80 80",
+          fill: "none",
+          "aria-hidden": "true",
+          children: [
+            /* @__PURE__ */ jsx7("circle", { className: "rs-finalising-spinner-track", cx: "40", cy: "40", r: "34" }),
+            /* @__PURE__ */ jsx7("circle", { className: "rs-finalising-spinner-head", cx: "40", cy: "40", r: "34" })
+          ]
+        }
+      ),
       /* @__PURE__ */ jsxs7("div", { className: "rs-finalising-text", children: [
         /* @__PURE__ */ jsx7("h2", { className: "rs-finalising-title", children: "Finalising deposit" }),
         /* @__PURE__ */ jsx7("p", { className: "rs-finalising-subtitle", children: "We are depositing your funds to the application." })
@@ -2082,7 +2095,6 @@ var STEP_LABELS = [
 function SwappedOrderTracker({
   amount,
   currency = "USDC",
-  chainLabel = "Base",
   stepStates,
   terminal = null,
   onRetry
@@ -2091,7 +2103,7 @@ function SwappedOrderTracker({
   const title = terminal ? terminal.kind === "cancelled" ? "Order cancelled" : "Deposit failed" : formattedAmount ? `Depositing ${formattedAmount} ${currency}` : `Depositing ${currency}`;
   const labels = [
     STEP_LABELS[0],
-    `${currency} received on ${chainLabel}`,
+    `${currency} received`,
     STEP_LABELS[2],
     STEP_LABELS[3]
   ];
@@ -2164,11 +2176,7 @@ var DEPOSIT_POLL_INTERVAL_MS = 2e3;
 var DEPOSIT_POLL_FAST_INITIAL_DELAY_MS = 1e3;
 var DEPOSIT_POLL_FAST_INTERVAL_MS = 500;
 var IFRAME_LOAD_TIMEOUT_MS = 15e3;
-var SWAPPED_IFRAME_ORIGINS = /* @__PURE__ */ new Set([
-  "https://connect.swapped.com",
-  "https://sandbox.swapped.com",
-  "https://widget.swapped.com"
-]);
+var SWAPPED_IFRAME_ORIGINS = new Set(SWAPPED_ORIGINS);
 var SWAPPED_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
   "order_completed",
   "order_broadcasted"
@@ -2179,6 +2187,24 @@ var SWAPPED_STATUS_VALUES = /* @__PURE__ */ new Set([
   "order_broadcasted",
   "order_cancelled"
 ]);
+var SWAPPED_GO_BACK_KEY = "SWAPPED_GO_BACK";
+function parseMaybeJsonString(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return raw;
+  }
+}
+function isSwappedGoBackMessage(raw) {
+  let data = raw;
+  if (typeof data === "string") {
+    data = parseMaybeJsonString(data);
+  }
+  if (data === SWAPPED_GO_BACK_KEY) return true;
+  if (!data || typeof data !== "object") return false;
+  const obj = data;
+  return obj.key === SWAPPED_GO_BACK_KEY || obj.type === SWAPPED_GO_BACK_KEY;
+}
 function parseSwappedIframeMessage(raw) {
   let data = raw;
   if (typeof data === "string") {
@@ -2199,6 +2225,7 @@ function parseSwappedIframeMessage(raw) {
   return {
     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),
     orderCryptoAmount: asString2(inner.order_crypto_amount) ?? asString2(obj.orderCryptoAmount),
     transactionId: asString2(inner.transaction_id) ?? asString2(obj.transactionId)
@@ -2216,6 +2243,7 @@ function SwappedIframeStep({
   onSwappedComplete,
   onSwappedFailed,
   onClose,
+  onGoBack,
   onError
 }) {
   const [widgetUrl, setWidgetUrl] = useState6(null);
@@ -2229,6 +2257,7 @@ function SwappedIframeStep({
   const completeFiredRef = useRef6(false);
   const failedFiredRef = useRef6(false);
   const expectedOrderUuidRef = useRef6(null);
+  const expectedExternalCustomerIdRef = useRef6(null);
   const baselineDepositTxHashRef = useRef6(void 0);
   const currentDepositTxHashRef = useRef6(null);
   const fastDepositPollEnabledRef = useRef6(false);
@@ -2241,6 +2270,8 @@ function SwappedIframeStep({
   onSwappedFailedRef.current = onSwappedFailed;
   const onErrorRef = useRef6(onError);
   onErrorRef.current = onError;
+  const onGoBackRef = useRef6(onGoBack);
+  onGoBackRef.current = onGoBack;
   const loadUrlRef = useRef6(loadUrl);
   loadUrlRef.current = loadUrl;
   useEffect6(() => {
@@ -2252,6 +2283,7 @@ function SwappedIframeStep({
     setLatestEvent(null);
     setPhase("iframe");
     expectedOrderUuidRef.current = null;
+    expectedExternalCustomerIdRef.current = null;
     completeFiredRef.current = false;
     failedFiredRef.current = false;
     baselineDepositTxHashRef.current = void 0;
@@ -2260,6 +2292,7 @@ function SwappedIframeStep({
     loadUrlRef.current().then((res) => {
       if (cancelled) return;
       setWidgetUrl(res.url);
+      expectedExternalCustomerIdRef.current = res.externalCustomerId;
       const sep = res.externalCustomerId.indexOf(":");
       expectedOrderUuidRef.current = sep >= 0 ? res.externalCustomerId.slice(sep + 1) : null;
     }).catch((err) => {
@@ -2349,14 +2382,21 @@ function SwappedIframeStep({
     function onMessage(e) {
       if (!SWAPPED_IFRAME_ORIGINS.has(e.origin)) return;
       if (e.source !== iframeRef.current?.contentWindow) return;
+      if (isSwappedGoBackMessage(e.data)) {
+        onGoBackRef.current();
+        return;
+      }
       const parsed = parseSwappedIframeMessage(e.data);
       if (!parsed) return;
-      const orderId = parsed.orderId;
-      if (!orderId || orderId !== expectedOrderUuidRef.current) {
+      const ext = parsed.externalCustomerId;
+      const expected = expectedExternalCustomerIdRef.current;
+      if (!ext || !expected || ext.toLowerCase() !== expected.toLowerCase()) {
         return;
       }
       setOrderState((prev) => ({
-        orderId,
+        // 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,
         orderCrypto: parsed.orderCrypto ?? prev?.orderCrypto ?? null,
         orderCryptoAmount: parsed.orderCryptoAmount ?? prev?.orderCryptoAmount ?? null,
@@ -2396,7 +2436,7 @@ function SwappedIframeStep({
   useEffect6(() => {
     if (completeFiredRef.current || failedFiredRef.current) return;
     const t = latestEvent?.type;
-    const isSuccess = t === "bridge-complete" || t === "post-bridge-swap-complete";
+    const isSuccess = t === "bridge-complete";
     if (!isSuccess) return;
     const txHash = currentDepositTxHashRef.current;
     if (!txHash) return;
@@ -2479,7 +2519,7 @@ function deriveStepStates(swappedStatus, latestEvent) {
   }
   const step1Complete = swappedStatus === "order_completed" || swappedStatus === "order_broadcasted";
   const step2Complete = latestEvent !== null;
-  const step3Complete = latestEvent?.type === "bridge-complete" || latestEvent?.type === "post-bridge-swap-complete";
+  const step3Complete = latestEvent?.type === "bridge-complete";
   if (step3Complete) {
     return ["complete", "complete", "complete", "pending"];
   }
@@ -2525,18 +2565,27 @@ function FiatOnrampStep({
   smartAccount,
   service,
   paymentMethod,
+  consumePrefetchedUrl,
   onSwappedComplete,
   onSwappedFailed,
   onClose,
+  onGoBack,
   onError
 }) {
   const loadUrl = useCallback3(async () => {
-    const res = await service.getSwappedWidgetUrl({
+    const prefetched = consumePrefetchedUrl?.(smartAccount, paymentMethod);
+    if (prefetched) {
+      try {
+        const cached = await prefetched;
+        if (isSwappedWidgetUrlFresh(cached)) return cached;
+      } catch {
+      }
+    }
+    return service.getSwappedWidgetUrl({
       smartAccount,
       method: paymentMethod
     });
-    return res;
-  }, [service, smartAccount, paymentMethod]);
+  }, [service, smartAccount, paymentMethod, consumePrefetchedUrl]);
   return /* @__PURE__ */ jsx10(
     SwappedIframeStep,
     {
@@ -2551,6 +2600,7 @@ function FiatOnrampStep({
       onSwappedComplete,
       onSwappedFailed,
       onClose,
+      onGoBack,
       onError
     }
   );
@@ -2596,6 +2646,7 @@ function ExchangeConnectStep({
   onSwappedComplete,
   onSwappedFailed,
   onClose,
+  onGoBack,
   onError
 }) {
   const loadUrl = useCallback4(async () => {
@@ -2619,6 +2670,7 @@ function ExchangeConnectStep({
       onSwappedComplete,
       onSwappedFailed,
       onClose,
+      onGoBack,
       onError
     }
   );
@@ -4093,6 +4145,67 @@ function getEnabledProviders(config) {
   );
 }
 
+// src/store/state.ts
+function portfolioKey(network, address) {
+  return network === "evm" ? `evm:${address.toLowerCase()}` : `solana:${address}`;
+}
+function createInitialState(overrides) {
+  return {
+    flow: {
+      step: "connect",
+      mode: null,
+      isConnectSelectionConfirmed: false,
+      hasNavigatedBack: false
+    },
+    wallet: {
+      selectedWalletId: null
+    },
+    deposit: {
+      targetChain: overrides.targetChain,
+      targetToken: overrides.targetToken,
+      sourceChain: null,
+      sourceToken: null,
+      sourceSymbol: null,
+      sourceDecimals: null,
+      selectedAsset: null,
+      selectedSolanaToken: null,
+      amount: null,
+      targetAmount: null,
+      targetTokenPriceUsd: null,
+      balance: null,
+      balanceUsd: null,
+      inputAmountUsd: null,
+      liquidityWarning: null
+    },
+    processing: {
+      txHash: null,
+      directTransfer: false,
+      swappedContext: null
+    },
+    dappImport: {
+      activeProviderId: null,
+      availabilityOwner: null,
+      availability: {},
+      selectedAsset: null,
+      bootError: false,
+      attemptNonce: 0
+    },
+    setup: {
+      byOwner: {}
+    },
+    portfolio: {
+      byKey: {},
+      nextRequestId: 0
+    },
+    fiat: {
+      selectedMethod: null
+    },
+    exchange: {
+      selectedConnection: null
+    }
+  };
+}
+
 // src/store/selectors.ts
 var selectedWalletIdSelector = (state) => state.wallet.selectedWalletId;
 var IDLE_SETUP_ENTRY = {
@@ -4112,6 +4225,10 @@ function readSetupForOwner(setup, owner) {
   const entry = setup.byOwner[owner.toLowerCase()];
   return entry ?? { ...IDLE_SETUP_ENTRY, owner };
 }
+function readPortfolioEntry(portfolio, network, address) {
+  if (!address) return void 0;
+  return portfolio.byKey[portfolioKey(network, address)];
+}
 
 // src/core/dapp-imports/status.ts
 function computeDappImportStatus(providerId, inputs) {
@@ -4519,6 +4636,79 @@ function applyAction(state, action) {
         message: null,
         attemptNonce: entry.attemptNonce + 1
       }));
+    case "portfolio/loading": {
+      const key = portfolioKey(action.network, action.address);
+      const requestId = state.portfolio.nextRequestId + 1;
+      return {
+        ...state,
+        portfolio: {
+          nextRequestId: requestId,
+          byKey: {
+            ...state.portfolio.byKey,
+            [key]: { status: "loading", requestId, totalUsd: null }
+          }
+        }
+      };
+    }
+    case "portfolio/reconciled": {
+      const retainedKeys = new Set(
+        action.wallets.map(
+          ({ network, address }) => portfolioKey(network, address)
+        )
+      );
+      const entries = Object.entries(state.portfolio.byKey);
+      const retainedEntries = entries.filter(([key]) => retainedKeys.has(key));
+      if (retainedEntries.length === entries.length) return state;
+      return {
+        ...state,
+        portfolio: {
+          ...state.portfolio,
+          byKey: Object.fromEntries(retainedEntries)
+        }
+      };
+    }
+    case "portfolio/loaded": {
+      const key = portfolioKey(action.network, action.address);
+      const existing = state.portfolio.byKey[key];
+      if (!existing || existing.status !== "loading" || existing.requestId !== action.requestId) {
+        return state;
+      }
+      return {
+        ...state,
+        portfolio: {
+          ...state.portfolio,
+          byKey: {
+            ...state.portfolio.byKey,
+            [key]: {
+              status: "ready",
+              requestId: action.requestId,
+              totalUsd: action.totalUsd
+            }
+          }
+        }
+      };
+    }
+    case "portfolio/failed": {
+      const key = portfolioKey(action.network, action.address);
+      const existing = state.portfolio.byKey[key];
+      if (!existing || existing.status !== "loading" || existing.requestId !== action.requestId) {
+        return state;
+      }
+      return {
+        ...state,
+        portfolio: {
+          ...state.portfolio,
+          byKey: {
+            ...state.portfolio.byKey,
+            [key]: {
+              status: "error",
+              requestId: action.requestId,
+              totalUsd: existing.totalUsd
+            }
+          }
+        }
+      };
+    }
     case "asset/selected":
       return {
         ...state,
@@ -4785,6 +4975,13 @@ function applyAction(state, action) {
           attemptNonce: 0
         },
         setup: { byOwner: preservedByOwner },
+        // Ephemeral fetched balances — drop wholesale on close so a reopen
+        // refetches rather than surfacing a stale balance (same hazard the
+        // dappImport drop above guards against).
+        portfolio: {
+          byKey: {},
+          nextRequestId: state.portfolio.nextRequestId
+        },
         fiat: { selectedMethod: null },
         exchange: { selectedConnection: null }
       };
@@ -4819,60 +5016,6 @@ function applyAction(state, action) {
   }
 }
 
-// src/store/state.ts
-function createInitialState(overrides) {
-  return {
-    flow: {
-      step: "connect",
-      mode: null,
-      isConnectSelectionConfirmed: false,
-      hasNavigatedBack: false
-    },
-    wallet: {
-      selectedWalletId: null
-    },
-    deposit: {
-      targetChain: overrides.targetChain,
-      targetToken: overrides.targetToken,
-      sourceChain: null,
-      sourceToken: null,
-      sourceSymbol: null,
-      sourceDecimals: null,
-      selectedAsset: null,
-      selectedSolanaToken: null,
-      amount: null,
-      targetAmount: null,
-      targetTokenPriceUsd: null,
-      balance: null,
-      balanceUsd: null,
-      inputAmountUsd: null,
-      liquidityWarning: null
-    },
-    processing: {
-      txHash: null,
-      directTransfer: false,
-      swappedContext: null
-    },
-    dappImport: {
-      activeProviderId: null,
-      availabilityOwner: null,
-      availability: {},
-      selectedAsset: null,
-      bootError: false,
-      attemptNonce: 0
-    },
-    setup: {
-      byOwner: {}
-    },
-    fiat: {
-      selectedMethod: null
-    },
-    exchange: {
-      selectedConnection: null
-    }
-  };
-}
-
 // src/store/index.ts
 function createDepositStore(overrides) {
   const store = createStore(() => createInitialState(overrides));
@@ -4956,8 +5099,7 @@ function computeRequestKey(input, sessionOwnerAddress) {
     signerAddress: input.signerAddress.toLowerCase(),
     sessionChainIds: input.sessionChainIds ?? null,
     enableSolana: input.enableSolana ?? true,
-    forceRegister: input.forceRegister ?? false,
-    postBridgeActions: input.postBridgeActions ?? null
+    forceRegister: input.forceRegister ?? false
   });
 }
 function computeCacheKey(input, sessionOwnerAddress) {
@@ -4975,7 +5117,7 @@ function computeCacheKey(input, sessionOwnerAddress) {
   });
 }
 function computeIsCacheable(input) {
-  return !input.forceRegister && !(input.postBridgeActions?.length ?? 0);
+  return !input.forceRegister;
 }
 var SETUP_REQUEST_DEDUPE_TTL_MS = 3e4;
 var setupRequestDedupe = /* @__PURE__ */ new Map();
@@ -4996,7 +5138,6 @@ async function runAccountSetup(input, deps) {
     debugLog(debug, "account-setup", "setup:start", {
       owner: input.ownerAddress,
       sessionOwner: sessionOwner.address,
-      hasPostBridgeActions: Boolean(input.postBridgeActions?.length),
       forceRegister: input.forceRegister ?? false
     });
     const setup = await service.setupAccount({
@@ -5005,7 +5146,6 @@ async function runAccountSetup(input, deps) {
       targetChain: targetChainToCaip2(input.targetChain),
       targetToken: input.targetToken,
       recipient: input.recipient,
-      postBridgeActions: input.postBridgeActions,
       outputTokenRules: input.outputTokenRules,
       rejectUnmapped: input.rejectUnmapped,
       signerAddress: input.signerAddress,
@@ -5058,9 +5198,6 @@ async function runAccountSetup(input, deps) {
         chain: targetChainToCaip2(input.targetChain),
         token: input.targetToken,
         ...input.recipient && { recipient: input.recipient },
-        ...input.postBridgeActions?.length && {
-          postBridgeActions: input.postBridgeActions
-        },
         ...input.outputTokenRules?.length && {
           outputTokenRules: input.outputTokenRules
         },
@@ -5350,7 +5487,6 @@ function DepositFlow({
   amount: defaultAmount,
   recipient,
   appBalanceUsd,
-  postBridgeActions,
   outputTokenRules,
   rejectUnmapped,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
@@ -5386,6 +5522,7 @@ function DepositFlow({
   const depositSlice = useDepositStore((s) => s.deposit);
   const processingSlice = useDepositStore((s) => s.processing);
   const setupSlice = useDepositStore((s) => s.setup);
+  const portfolioSlice = useDepositStore((s) => s.portfolio);
   const fiatSlice = useDepositStore((s) => s.fiat);
   const exchangeSlice = useDepositStore((s) => s.exchange);
   const flowMode = flowSlice.mode;
@@ -5406,6 +5543,25 @@ function DepositFlow({
     },
     [debug]
   );
+  const enableSwappedPreconnect = enableFiatOnramp || enableExchangeConnect;
+  useEffect10(() => {
+    if (!enableSwappedPreconnect) return;
+    if (typeof document === "undefined") return;
+    const links = [];
+    for (const origin of SWAPPED_ORIGINS) {
+      for (const rel of ["preconnect", "dns-prefetch"]) {
+        const link = document.createElement("link");
+        link.rel = rel;
+        link.href = origin;
+        link.dataset.rsSwappedPreconnect = "";
+        document.head.appendChild(link);
+        links.push(link);
+      }
+    }
+    return () => {
+      for (const link of links) link.remove();
+    };
+  }, [enableSwappedPreconnect]);
   const dappSwitchChain = useMemo7(() => {
     if (!dappWalletClient?.switchChain) return void 0;
     return async (chainId) => {
@@ -6114,6 +6270,46 @@ function DepositFlow({
     },
     [storeApi]
   );
+  const swappedUrlPrefetchRef = useRef8(/* @__PURE__ */ new Map());
+  const prefetchSwappedWidgetUrl = useCallback7(
+    (smartAccount, method) => {
+      const cache = swappedUrlPrefetchRef.current;
+      const key = method ?? "";
+      const owner = smartAccount.toLowerCase();
+      const existing = cache.get(key);
+      if (existing && existing.smartAccount === owner) return;
+      const promise = service.getSwappedWidgetUrl({ smartAccount, method });
+      promise.catch(() => {
+      });
+      cache.set(key, { smartAccount: owner, promise });
+      logFlow("swapped:prefetch", { method: method ?? null });
+    },
+    [service, logFlow]
+  );
+  const consumeSwappedWidgetUrlPrefetch = useCallback7(
+    (smartAccount, method) => {
+      const cache = swappedUrlPrefetchRef.current;
+      const key = method ?? "";
+      const entry = cache.get(key);
+      if (!entry) return null;
+      cache.delete(key);
+      if (entry.smartAccount !== smartAccount.toLowerCase()) return null;
+      return entry.promise;
+    },
+    []
+  );
+  const handlePrefetchFiatMethod = useCallback7(
+    (method) => {
+      if (!enableFiatOnramp || !dappAddress) return;
+      const entry = readSetupForOwner(setupSlice, dappAddress);
+      if (entry.status !== "ready" || !entry.smartAccount) return;
+      prefetchSwappedWidgetUrl(entry.smartAccount, method);
+    },
+    [enableFiatOnramp, dappAddress, setupSlice, prefetchSwappedWidgetUrl]
+  );
+  useEffect10(() => {
+    swappedUrlPrefetchRef.current.clear();
+  }, [dappAddress]);
   const handleNewDeposit = useCallback7(() => {
     onLifecycleRef.current?.({
       type: "smart-account-changed",
@@ -6123,6 +6319,7 @@ function DepositFlow({
     storeApi.dispatch({ type: "flow/reset" });
     stableWalletSignerRef.current = null;
     stableWalletSelectionKeyRef.current = null;
+    swappedUrlPrefetchRef.current.clear();
   }, [onLifecycleRef, storeApi]);
   const setupInputBase = useMemo7(
     () => ({
@@ -6131,7 +6328,6 @@ function DepositFlow({
       signerAddress,
       sessionChainIds,
       recipient,
-      postBridgeActions,
       outputTokenRules,
       rejectUnmapped,
       forceRegister,
@@ -6143,7 +6339,6 @@ function DepositFlow({
       signerAddress,
       sessionChainIds,
       recipient,
-      postBridgeActions,
       outputTokenRules,
       rejectUnmapped,
       forceRegister,
@@ -6266,6 +6461,58 @@ function DepositFlow({
     storeApi,
     setupSlice.byOwner
   ]);
+  const walletOptionsKey = useMemo7(
+    () => walletOptions.map((option) => option.id).join(","),
+    [walletOptions]
+  );
+  const desiredPortfolios = useMemo7(
+    () => walletOptions.flatMap((option) => {
+      const network = option.kind === "solana" ? "solana" : "evm";
+      const address = option.kind === "solana" ? option.solanaAddress : option.address;
+      return address ? [{ network, address }] : [];
+    }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- keyed on the stable id-join, not the walletOptions array identity
+    [walletOptionsKey]
+  );
+  useEffect10(() => {
+    storeApi.dispatch({
+      type: "portfolio/reconciled",
+      wallets: desiredPortfolios
+    });
+    desiredPortfolios.forEach(({ network, address }) => {
+      if (readPortfolioEntry(storeApi.getState().portfolio, network, address)) {
+        return;
+      }
+      storeApi.dispatch({ type: "portfolio/loading", network, address });
+      const requestId = readPortfolioEntry(
+        storeApi.getState().portfolio,
+        network,
+        address
+      )?.requestId;
+      if (requestId === void 0) return;
+      void (async () => {
+        try {
+          const portfolio = network === "solana" ? await service.fetchSolanaPortfolio(address, {
+            forceRefresh: true
+          }) : await service.fetchPortfolio(address, { forceRefresh: true });
+          storeApi.dispatch({
+            type: "portfolio/loaded",
+            network,
+            address,
+            requestId,
+            totalUsd: portfolio.totalUsd
+          });
+        } catch {
+          storeApi.dispatch({
+            type: "portfolio/failed",
+            network,
+            address,
+            requestId
+          });
+        }
+      })();
+    });
+  }, [desiredPortfolios, service, storeApi, portfolioSlice.byKey]);
   const handleDepositAddressSubmitted = useCallback7(
     (data) => {
       logFlow("deposit-address:detected", {
@@ -6486,10 +6733,6 @@ function DepositFlow({
   const handleTotalBalanceComputed = useCallback7((total) => {
     setTotalBalanceUsd(total);
   }, []);
-  const walletOptionsKey = useMemo7(
-    () => walletOptions.map((option) => option.id).join(","),
-    [walletOptions]
-  );
   useEffect10(() => {
     if (storeApi.getState().flow.mode) {
       return;
@@ -6526,6 +6769,13 @@ function DepositFlow({
       const ownerForRow = option.kind === "solana" ? dappAddress : option.address ?? null;
       const entry = readSetupForOwner(setupSlice, ownerForRow ?? null);
       const state = entry.status === "ready" ? "ready" : entry.status === "error" ? "error" : "loading";
+      const network = option.kind === "solana" ? "solana" : "evm";
+      const balanceAddress = option.kind === "solana" ? option.solanaAddress : option.address;
+      const portfolioEntry = readPortfolioEntry(
+        portfolioSlice,
+        network,
+        balanceAddress
+      );
       return {
         id: option.id,
         kind: option.kind,
@@ -6533,10 +6783,12 @@ function DepositFlow({
         icon: option.icon,
         address: option.address ?? option.solanaAddress ?? option.id,
         state,
-        errorReason: entry.message ?? void 0
+        errorReason: entry.message ?? void 0,
+        balanceStatus: portfolioEntry?.status ?? "loading",
+        balanceUsd: portfolioEntry?.status === "ready" ? portfolioEntry.totalUsd : null
       };
     });
-  }, [walletOptions, setupSlice, dappAddress]);
+  }, [walletOptions, setupSlice, dappAddress, portfolioSlice]);
   const transferCryptoEntry = useMemo7(
     () => readSetupForOwner(setupSlice, dappAddress),
     [setupSlice, dappAddress]
@@ -6564,6 +6816,7 @@ function DepositFlow({
         } : void 0,
         fiatPaymentMethods: enableFiatOnramp && dappAddress ? fiatOnrampMethods && fiatOnrampMethods.length > 0 ? fiatOnrampMethods : DEFAULT_FIAT_ONRAMP_METHODS : void 0,
         onSelectFiatMethod: enableFiatOnramp && dappAddress ? (method) => handleSelectFiatMethod(method) : void 0,
+        onPrefetchFiatMethod: enableFiatOnramp && dappAddress ? handlePrefetchFiatMethod : void 0,
         onSelectFundFromExchange: enableExchangeConnect && dappAddress ? () => handleSelectExchange() : void 0,
         onRequestConnect,
         onConnect,
@@ -6628,7 +6881,6 @@ function DepositFlow({
           allowedRoutes,
           targetChain,
           targetToken,
-          hasPostBridgeActions: Boolean(postBridgeActions?.length),
           uiConfig,
           onDepositSubmitted: handleDepositAddressSubmitted,
           onDepositComplete: handleDepositComplete,
@@ -6672,10 +6924,12 @@ function DepositFlow({
               smartAccount: step.smartAccount,
               service,
               paymentMethod: step.paymentMethod,
+              consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch,
               onSwappedComplete: handleSwappedComplete,
               onSwappedFailed: handleDepositFailed,
               onClose: onClose ?? (() => {
               }),
+              onGoBack: handleBack,
               onError: handleError
             }
           ),
@@ -6694,7 +6948,6 @@ function DepositFlow({
               sourceDecimals: step.sourceDecimals,
               amountUsd: step.inputAmountUsd,
               swappedContext: step.swappedContext,
-              hasPostBridgeActions: Boolean(postBridgeActions?.length),
               service,
               directTransfer: step.directTransfer,
               isSwappedOrder: true,
@@ -6744,6 +6997,7 @@ function DepositFlow({
               onSwappedFailed: handleDepositFailed,
               onClose: onClose ?? (() => {
               }),
+              onGoBack: handleBack,
               onError: handleError
             }
           ),
@@ -6762,7 +7016,6 @@ function DepositFlow({
               sourceDecimals: step.sourceDecimals,
               amountUsd: step.inputAmountUsd,
               swappedContext: step.swappedContext,
-              hasPostBridgeActions: Boolean(postBridgeActions?.length),
               service,
               directTransfer: step.directTransfer,
               isSwappedOrder: true,
@@ -6892,7 +7145,6 @@ function DepositFlow({
           sourceSymbol: effectiveStep.sourceSymbol,
           sourceDecimals: effectiveStep.sourceDecimals,
           amountUsd: effectiveStep.inputAmountUsd,
-          hasPostBridgeActions: Boolean(postBridgeActions?.length),
           service,
           directTransfer: effectiveStep.directTransfer,
           onClose,
@@ -7054,7 +7306,6 @@ function DepositFlow({
         sourceSymbol: effectiveStep.sourceSymbol,
         sourceDecimals: effectiveStep.sourceDecimals,
         amountUsd: effectiveStep.inputAmountUsd,
-        hasPostBridgeActions: Boolean(postBridgeActions?.length),
         service,
         directTransfer: effectiveStep.directTransfer,
         uiConfig,
@@ -7357,7 +7608,7 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 import { jsx as jsx21, jsxs as jsxs19 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-6AO4QURQ.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-YD7TLEAA.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -7407,7 +7658,7 @@ function DepositModalInner({
   recipient,
   appBalanceUsd,
   backendUrl = DEFAULT_BACKEND_URL,
-  rpcUrls,
+  rpcUrls: rpcUrlsProp,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -7418,7 +7669,6 @@ function DepositModalInner({
   enableQrTransfer = true,
   fiatOnrampMethods,
   enableExchangeConnect = false,
-  postBridgeActions,
   outputTokenRules,
   rejectUnmapped,
   reownWallet,
@@ -7454,6 +7704,7 @@ function DepositModalInner({
   const historyLoadedRef = useRef9(false);
   const targetChain = targetChainProp === "solana" ? "solana" : getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
+  const rpcUrls = useStableRpcUrls(rpcUrlsProp);
   const [recipientIsContract, setRecipientIsContract] = useState13(false);
   const onErrorRef = useLatestRef(onError);
   useEffect11(() => {
@@ -7667,7 +7918,6 @@ function DepositModalInner({
             amount: defaultAmount,
             recipient,
             appBalanceUsd,
-            postBridgeActions,
             outputTokenRules,
             rejectUnmapped,
             signerAddress,