@avail-project/widgets 2.0.0 → 2.0.2

package/dist/nexus-widget/nexus-widget.js

@@ -38,7 +38,7 @@ const SCIENTIFIC_DECIMAL_REGEX = /^-?(?:\d+\.?\d*|\.\d+)e[+-]?\d+$/i;
 const QUOTE_REFRESH_INTERVAL_MS = 30000;
 const EXACT_OUT_INPUT_DEBOUNCE_MS = 1300;
 const DRAWER_CLOSE_MS = 220;
-const BALANCE_REFRESH_AFTER_TERMINAL_MS = 5000;
+const BALANCE_REFRESH_AFTER_TERMINAL_MS = 3000;
 const MODAL_HEIGHT_TRANSITION_MS = 220;
 const ROOT_HEIGHT_TRANSITION_MS = 140;
 const ASSET_SELECTOR_DRAWER_HEIGHT = "90%";
@@ -47,8 +47,25 @@ const CONFIGURED_RECEIVE_SELECTOR_BASE_HEIGHT = 170;
 const CONFIGURED_RECEIVE_SELECTOR_ROW_HEIGHT = 62;
 const BASIS_POINTS = 10000;
 const PREDICTIVE_EXACT_IN_DISCOUNT_BPS = 50;
-const PREDICTIVE_EXACT_OUT_BUFFER_BPS = 100;
+const PREDICTIVE_EXACT_OUT_DESTINATION_BUFFER_PCT = 0.1;
+const PREDICTIVE_EXACT_OUT_DESTINATION_BUFFER_MAX_USD = 2;
+const PREDICTIVE_EXACT_OUT_SOURCE_BUFFER_PCT = 0.02;
+const PREDICTIVE_EXACT_OUT_SOURCE_BUFFER_MAX_USD = 1;
 const PREDICTIVE_QUOTE_DISPLAY_DECIMALS = 8;
+const DEPOSIT_TOKEN_DISPLAY_DECIMALS = 8;
+const ETHEREUM_MAINNET_CHAIN_ID = 1;
+const SDK_EXACT_OUT_STABLE_SYMBOLS = new Set([
+    "USDC",
+    "USDT",
+    "DAI",
+    "BUSD",
+    "TUSD",
+    "FRAX",
+    "LUSD",
+    "USDD",
+    "USDP",
+    "GUSD",
+]);
 const SWAP_HISTORY_STORAGE_KEY_PREFIX = "nexus-widget-transaction-history-v1";
 const TIMEOUT_LABEL = "Timed Out";
 const PROGRESS_EVENT_NAMES = {
@@ -58,20 +75,12 @@ const PROGRESS_EVENT_NAMES = {
     SWAP_PLAN_PROGRESS: "swap_plan_progress",
 };
 const PLAN_FINAL_STATES = new Set(["completed", "confirmed", "submitted"]);
-const PLAN_STEP_FUNDS_MOVED_STATES = new Set([
+const PLAN_STEP_FUNDS_MAY_HAVE_MOVED_STATES = new Set([
     "completed",
     "confirmed",
     "submitted",
+    "failed",
 ]);
-const waitForNextPaint = () => new Promise((resolve) => {
-    if (typeof window === "undefined" || !window.requestAnimationFrame) {
-        resolve();
-        return;
-    }
-    window.requestAnimationFrame(() => {
-        window.setTimeout(() => resolve(), 0);
-    });
-});
 const theme = nexusWidgetTheme;
 const tooltipSurface = theme.colors.surface;
 const tooltipText = theme.colors.textStrong;
@@ -80,7 +89,32 @@ const uiFont = theme.fonts.sans;
 const modalHeightTransitionStyle = {
     interpolateSize: "allow-keywords",
 };
+const getCappedTokenDisplayDecimals = (decimals) => {
+    const parsedDecimals = Number(decimals);
+    if (!Number.isFinite(parsedDecimals) || parsedDecimals < 0) {
+        return DEPOSIT_TOKEN_DISPLAY_DECIMALS;
+    }
+    return Math.min(Math.floor(parsedDecimals), DEPOSIT_TOKEN_DISPLAY_DECIMALS);
+};
 const modalHeightTransition = `height ${MODAL_HEIGHT_TRANSITION_MS}ms ease, max-height ${MODAL_HEIGHT_TRANSITION_MS}ms ease`;
+const normalizeSdkExactOutStableSymbol = (symbol) => (symbol ?? "")
+    .trim()
+    .toUpperCase()
+    .replaceAll("\u20ae", "T")
+    .replaceAll(/[^A-Z0-9]/g, "");
+const isSdkExactOutStableSymbol = (symbol) => SDK_EXACT_OUT_STABLE_SYMBOLS.has(normalizeSdkExactOutStableSymbol(symbol));
+const applyPredictiveExactOutBufferUsd = (amount, pct, maxUsd) => Decimal.min(amount.mul(pct), new Decimal(maxUsd));
+const getPredictiveExactOutSourceTargetUsd = (destinationUsdNeedingSources, cachedSourceUsdRatio) => {
+    if (destinationUsdNeedingSources.lte(0))
+        return new Decimal(0);
+    if (cachedSourceUsdRatio?.gt(0)) {
+        return destinationUsdNeedingSources.mul(cachedSourceUsdRatio);
+    }
+    const destinationBuffer = applyPredictiveExactOutBufferUsd(destinationUsdNeedingSources, PREDICTIVE_EXACT_OUT_DESTINATION_BUFFER_PCT, PREDICTIVE_EXACT_OUT_DESTINATION_BUFFER_MAX_USD);
+    const destinationBuffered = destinationUsdNeedingSources.plus(destinationBuffer);
+    const sourceBuffer = applyPredictiveExactOutBufferUsd(destinationBuffered, PREDICTIVE_EXACT_OUT_SOURCE_BUFFER_PCT, PREDICTIVE_EXACT_OUT_SOURCE_BUFFER_MAX_USD);
+    return destinationBuffered.plus(sourceBuffer);
+};
 const getSwapHistoryStorageKey = (ownerAddress) => `${SWAP_HISTORY_STORAGE_KEY_PREFIX}:${ownerAddress?.toLowerCase() || "anonymous"}`;
 const getTokenSelectionKey = (token) => {
     if (!token)
@@ -90,6 +124,46 @@ const getTokenSelectionKey = (token) => {
     }
     return `${token.chainId ?? "unknown"}:${token.contractAddress.toLowerCase()}`;
 };
+const getDisplaySourceTokenKey = (token) => {
+    if (!token)
+        return "";
+    const chainId = token.chainId ?? "unknown";
+    const address = token.contractAddress?.toLowerCase();
+    return address
+        ? `${chainId}:${address}`
+        : `${chainId}:symbol:${token.symbol.toUpperCase()}`;
+};
+const sumDecimalStrings = (left, right) => {
+    const leftAmount = parseDecimalLoose(left) ?? new Decimal(0);
+    const rightAmount = parseDecimalLoose(right) ?? new Decimal(0);
+    const sum = leftAmount.plus(rightAmount);
+    return sum.gt(0) ? sum.toFixed() : undefined;
+};
+const mergeDisplaySourceTokens = (tokens) => {
+    const merged = new Map();
+    for (const token of tokens) {
+        const key = getDisplaySourceTokenKey(token);
+        if (!key)
+            continue;
+        const existing = merged.get(key);
+        if (!existing) {
+            merged.set(key, token);
+            continue;
+        }
+        const userAmount = sumDecimalStrings(existing.userAmount || existing.balance, token.userAmount || token.balance);
+        const userAmountUsd = sumDecimalStrings(existing.userAmountUsd || existing.balanceInFiat, token.userAmountUsd || token.balanceInFiat);
+        merged.set(key, {
+            ...existing,
+            balance: userAmount ?? existing.balance,
+            balanceInFiat: userAmountUsd ?? existing.balanceInFiat,
+            chainLogo: existing.chainLogo || token.chainLogo,
+            logo: existing.logo || token.logo,
+            userAmount: userAmount ?? existing.userAmount,
+            userAmountUsd: userAmountUsd ?? existing.userAmountUsd,
+        });
+    }
+    return Array.from(merged.values());
+};
 const getTokenQuoteKey = (token) => {
     if (!token)
         return "";
@@ -115,6 +189,14 @@ const getSourceTokensQuoteKey = (tokens) => tokens
     token.userAmountMode ?? "",
 ].join(":"))
     .join("|");
+const getSourceTokenSyncKey = (token) => [
+    getTokenSelectionKey(token),
+    token.userAmount ?? "",
+    token.userAmountUsd ?? "",
+    token.balance ?? "",
+    token.balanceInFiat ?? "",
+].join(":");
+const getSourceTokenListSyncKey = (tokens) => tokens.map(getSourceTokenSyncKey).join("|");
 const isSameTokenSelection = (a, b) => Boolean(a && b && getTokenSelectionKey(a) === getTokenSelectionKey(b));
 const getDepositConfigIdentity = (deposit) => {
     if (!deposit)
@@ -152,6 +234,7 @@ const normalizeConfiguredAddress = (value) => {
     const text = normalizeConfiguredString(value);
     return text && isAddress(text) ? text : undefined;
 };
+const isPositiveGasLimit = (value) => typeof value === "bigint" && value > BigInt(0);
 const normalizePositiveNumericString = (value) => {
     const text = normalizeConfiguredString(value);
     if (!text)
@@ -768,12 +851,22 @@ const formatTokenDisplay = (value) => {
 const getSwapTokenUsdValue = (token) => parseDecimalLoose(token.userAmountUsd) ??
     parseDecimalLoose(token.balanceInFiat) ??
     new Decimal(0);
+const getSwapTokenBalanceUsdValue = (token) => parseDecimalLoose(token.balanceInFiat) ?? new Decimal(0);
 const sortSwapTokensByUsdDesc = (tokens) => [...tokens].sort((a, b) => {
     const usdDelta = getSwapTokenUsdValue(b).cmp(getSwapTokenUsdValue(a));
     if (usdDelta !== 0)
         return usdDelta;
     return (a.symbol ?? "").localeCompare(b.symbol ?? "");
 });
+const sortDisplaySourcesByBalanceUsdDesc = (tokens) => [...tokens].sort((a, b) => {
+    const balanceUsdDelta = getSwapTokenBalanceUsdValue(b).cmp(getSwapTokenBalanceUsdValue(a));
+    if (balanceUsdDelta !== 0)
+        return balanceUsdDelta;
+    const spendUsdDelta = getSwapTokenUsdValue(b).cmp(getSwapTokenUsdValue(a));
+    if (spendUsdDelta !== 0)
+        return spendUsdDelta;
+    return `${a.symbol ?? ""} ${a.chainName ?? ""}`.localeCompare(`${b.symbol ?? ""} ${b.chainName ?? ""}`);
+});
 const getIntentSourceUsdValue = (source) => parseDecimalLoose(source.value) ?? new Decimal(0);
 const sortIntentSourcesByUsdDesc = (sources) => [...sources].sort((a, b) => {
     const usdDelta = getIntentSourceUsdValue(b).cmp(getIntentSourceUsdValue(a));
@@ -1011,7 +1104,9 @@ const getDisplayDestinationSourceRow = (entry) => {
             : undefined;
     return {
         key: `destination-balance-${entry.toToken.chainId}-${entry.toToken.contractAddress}`,
-        tokenLogo: entry.toToken.logo,
+        chainId: entry.toToken.chainId,
+        contractAddress: entry.toToken.contractAddress,
+        tokenLogo: entry.intentData?.destination.token.logo || entry.toToken.logo,
         chainLogo: entry.toToken.chainLogo,
         symbol: entry.toToken.symbol,
         chainName: getShortChainName(entry.toToken.chainId, entry.toToken.chainName),
@@ -1023,7 +1118,42 @@ const getDisplayDestinationSourceRow = (entry) => {
             : entry.toToken.balanceInFiat,
     };
 };
+const getHistorySourceRowMergeKey = (row) => {
+    const chainKey = row.chainId ?? row.chainName;
+    const address = row.contractAddress?.toLowerCase();
+    return address
+        ? `${chainKey}:${address}`
+        : `${chainKey}:symbol:${row.symbol.toUpperCase()}`;
+};
+const mergeHistorySourceRows = (rows) => {
+    const merged = new Map();
+    for (const row of rows) {
+        const key = getHistorySourceRowMergeKey(row);
+        const existing = merged.get(key);
+        if (!existing) {
+            merged.set(key, row);
+            continue;
+        }
+        merged.set(key, {
+            ...existing,
+            amount: sumDecimalStrings(existing.amount, row.amount) ?? existing.amount,
+            chainLogo: existing.chainLogo || row.chainLogo,
+            key: existing.key,
+            tokenLogo: existing.tokenLogo || row.tokenLogo,
+            value: sumDecimalStrings(String(existing.value ?? ""), String(row.value ?? "")),
+        });
+    }
+    return Array.from(merged.values());
+};
 const getProgressStepType = (step) => String(step?.type ?? step?.typeID ?? "").toUpperCase();
+const isSourceMovementProgressStep = (type, rawStepType) => rawStepType === "source_swap" ||
+    rawStepType === "eoa_to_ephemeral_transfer" ||
+    rawStepType === "bridge_deposit" ||
+    rawStepType === "vault_deposit" ||
+    type.includes("SOURCE_SWAP") ||
+    type.includes("EOA_TO_EPHEMERAL_TRANSFER") ||
+    type.includes("BRIDGE_DEPOSIT") ||
+    type.includes("VAULT_DEPOSIT");
 const isBridgeRefundStepType = (type) => type.includes("BRIDGE_INTENT_SUBMISSION") || type.includes("BRIDGE_DEPOSIT");
 const isSwapSkippedStepType = (type) => type.includes("SWAP_SKIPPED");
 const isAutoRefundAvailableProgressEvent = (event) => event?.name === PROGRESS_EVENT_NAMES.SWAP_PLAN_PROGRESS &&
@@ -1160,6 +1290,12 @@ const normalizeSdkIntentString = (value) => {
     return String(value);
 };
 const normalizeSdkIntentAmount = (value, fallback = "0") => normalizeSdkIntentString(value) ?? fallback;
+const getLogoFromMetadata = (metadata) => metadata?.logo ??
+    metadata?.logoURI ??
+    metadata?.logoUri ??
+    metadata?.logoUrl ??
+    metadata?.icon ??
+    "";
 const normalizeSdkIntentChain = (chain) => {
     const id = Number(chain?.id ?? chain?.chainId);
     if (!Number.isFinite(id))
@@ -1167,7 +1303,7 @@ const normalizeSdkIntentChain = (chain) => {
     const chainMeta = CHAIN_METADATA[id];
     return {
         id,
-        logo: chain?.logo ?? chainMeta?.logo ?? "",
+        logo: getLogoFromMetadata(chain) || chainMeta?.logo || "",
         name: chain?.name ?? chainMeta?.name ?? "",
     };
 };
@@ -1180,6 +1316,7 @@ const normalizeSdkIntentToken = (token, chainId) => {
             token?.tokenAddress ??
             zeroAddress,
         decimals: Number.isFinite(decimals) ? decimals : 18,
+        logo: getLogoFromMetadata(token) || undefined,
         symbol: token?.symbol ?? token?.tokenSymbol ?? "",
     };
 };
@@ -1250,11 +1387,14 @@ const normalizeSwapAndExecuteRequirementIntent = (intent) => {
 };
 const normalizeRenderableSwapIntentData = (rawIntent, bridgeProvider) => {
     const direct = normalizeSwapIntentData(rawIntent);
-    const nestedSwap = direct ? null : normalizeSwapIntentData(rawIntent?.swap);
-    const requirement = direct || nestedSwap
+    const normalizedIntent = direct
+        ? null
+        : normalizeSwapIntentData(rawIntent?.normalizedIntent);
+    const nestedSwap = direct || normalizedIntent ? null : normalizeSwapIntentData(rawIntent?.swap);
+    const requirement = direct || normalizedIntent || nestedSwap
         ? null
         : normalizeSwapAndExecuteRequirementIntent(rawIntent);
-    const normalized = direct ?? nestedSwap ?? requirement;
+    const normalized = direct ?? normalizedIntent ?? nestedSwap ?? requirement;
     if (!normalized)
         return null;
     return bridgeProvider === undefined
@@ -1341,7 +1481,9 @@ const getSourceRows = (entry) => {
                     token.symbol === source.token.symbol));
             return {
                 key: `${source.chain.id}-${source.token.contractAddress}-${index}`,
-                tokenLogo: fallback?.logo,
+                chainId: source.chain.id,
+                contractAddress: source.token.contractAddress,
+                tokenLogo: source.token.logo || fallback?.logo,
                 chainLogo: source.chain.logo || fallback?.chainLogo,
                 symbol: source.token.symbol,
                 chainName: getShortChainName(source.chain.id, source.chain.name),
@@ -1349,12 +1491,14 @@ const getSourceRows = (entry) => {
                 value: source.value,
             };
         });
-        return displayDestinationSourceRow
+        return mergeHistorySourceRows(displayDestinationSourceRow
             ? [displayDestinationSourceRow, ...sourceRows]
-            : sourceRows;
+            : sourceRows);
     }
     const fallbackRows = entry.fromTokens.map((token, index) => ({
         key: `${token.chainId}-${token.contractAddress}-${index}`,
+        chainId: token.chainId,
+        contractAddress: token.contractAddress,
         tokenLogo: token.logo,
         chainLogo: token.chainLogo,
         symbol: token.symbol,
@@ -1362,9 +1506,9 @@ const getSourceRows = (entry) => {
         amount: token.userAmount || "0",
         value: token.balanceInFiat,
     }));
-    return displayDestinationSourceRow
+    return mergeHistorySourceRows(displayDestinationSourceRow
         ? [displayDestinationSourceRow, ...fallbackRows]
-        : fallbackRows;
+        : fallbackRows);
 };
 function SourceRowsList({ entry, maxHeight = 236, borderTopFirst = true, scrollAfterRows = 4, }) {
     const rows = getSourceRows(entry);
@@ -1437,6 +1581,10 @@ function SwapReceiptPanel({ entry, onDone, }) {
     const chainName = getShortChainName(destination?.chain.id ?? entry.toToken?.chainId, destination?.chain.name || entry.toToken?.chainName || "");
     const depositVenue = entry.opportunity?.title || entry.opportunity?.protocol || chainName;
     const amount = destination?.amount || "";
+    const destinationLogo = destination?.token.logo ||
+        entry.toToken?.logo ||
+        entry.opportunity?.tokenLogo ||
+        (isDeposit ? entry.opportunity?.logo : undefined);
     const requestedExactOutAmount = (isDeposit || isSend) && entry.requestedToAmount
         ? entry.requestedToAmount
         : undefined;
@@ -1489,9 +1637,7 @@ function SwapReceiptPanel({ entry, onDone, }) {
                             display: "inline-flex",
                             marginBottom: "10px",
                             position: "relative",
-                        }, children: [_jsx(MiniLogo, { fontSize: 17, label: tokenSymbol, size: 45, src: isDeposit
-                                    ? entry.opportunity?.logo || entry.toToken?.logo
-                                    : entry.toToken?.logo }), _jsx("div", { style: {
+                        }, children: [_jsx(MiniLogo, { fontSize: 17, label: tokenSymbol, size: 45, src: destinationLogo }), _jsx("div", { style: {
                                     alignItems: "center",
                                     background: isFailed
                                         ? "#E92C2C"
@@ -1719,7 +1865,10 @@ function SwapHistoryPanel({ entries, now, }) {
             width: "100%",
         }, children: sortedEntries.map((entry) => {
             const destination = entry.intentData?.destination;
-            const destinationLogo = entry.toToken?.logo;
+            const destinationLogo = destination?.token.logo ||
+                entry.toToken?.logo ||
+                entry.opportunity?.tokenLogo ||
+                "";
             const destinationChainLogo = destination?.chain.logo || entry.toToken?.chainLogo || "";
             const destinationChainName = getShortChainName(destination?.chain.id ?? entry.toToken?.chainId, destination?.chain.name || entry.toToken?.chainName || "");
             const destinationSymbol = destination?.token.symbol || entry.toToken?.symbol || "";
@@ -1865,10 +2014,11 @@ export function NexusWidget(props) {
                     }, type: "button", children: "Reload Page" })] }), children: _jsx(NexusWidgetInner, { ...props }) }));
 }
 function NexusWidgetInner({ config: rawConfig, embed = true, className, connectedAddress, open: controlledOpen, onOpenChange, defaultOpen = false, onComplete, onConnectClick, onStart, onError, onReceiveAssetChange, onClose, onConnectWallet, }) {
-    const { nexusSDK, bridgableBalance, swapBalance, getFiatValue, resolveTokenUsdRate, swapSupportedChainsAndTokens, supportedChainsAndTokens, fetchSwapBalance, handleInit, swapIntent: providerSwapIntent, network, loading: nexusLoading, } = useNexus();
+    const { nexusSDK, bridgableBalance, swapBalance, swapBalanceLoading, getFiatValue, resolveTokenUsdRate, swapSupportedChainsAndTokens, supportedChainsAndTokens, fetchSwapBalance, handleInit, swapIntent: providerSwapIntent, network, loading: nexusLoading, } = useNexus();
     const appConfig = useMemo(() => ({
         nexusNetwork: network ?? "mainnet",
     }), [network]);
+    const isSwapBalancePending = Boolean(nexusSDK) && (swapBalanceLoading || swapBalance === null);
     const normalizedWidgetConfig = useMemo(() => normalizeNexusWidgetConfig(rawConfig), [rawConfig]);
     const config = normalizedWidgetConfig.config;
     const activeMode = normalizedWidgetConfig.activeMode;
@@ -1878,7 +2028,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const isConfiguredAmountFixed = normalizedWidgetConfig.isAmountFixed;
     const isConfiguredRecipientLocked = normalizedWidgetConfig.isRecipientLocked;
     const primaryColor = normalizeNexusWidgetPrimaryColor(appearanceConfig?.primaryColor);
-    const primaryButtonBackground = primaryColor ?? nexusWidgetTheme.colors.text;
+    const primaryButtonBackground = primaryColor ?? NEXUS_WIDGET_DEFAULT_PRIMARY_COLOR;
     const primaryButtonForeground = getReadableTextColor(primaryButtonBackground);
     const theme = useMemo(() => ({
         ...nexusWidgetTheme,
@@ -1920,7 +2070,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             preloadReceiveTokens();
         }
     }, [nexusSDK]);
-    const { connector, status: walletStatus } = useAccount();
+    const { address: accountAddress, connector, status: walletStatus, } = useAccount();
     const { connectors, connectAsync, isPending: isWalletConnectPending, } = useConnect();
     const { data: walletClient } = useWalletClient();
     const { data: connectorClient } = useConnectorClient();
@@ -1930,12 +2080,66 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         isAddress(connectedAddress) &&
         connectedAddress.toLowerCase() !== zeroAddress
         ? connectedAddress
-        : walletClientAddress &&
-            isAddress(walletClientAddress) &&
-            walletClientAddress.toLowerCase() !== zeroAddress
-            ? walletClientAddress
+        : accountAddress &&
+            isAddress(accountAddress) &&
+            accountAddress.toLowerCase() !== zeroAddress
+            ? accountAddress
+            : walletClientAddress &&
+                isAddress(walletClientAddress) &&
+                walletClientAddress.toLowerCase() !== zeroAddress
+                ? walletClientAddress
+                : undefined;
+    const getEffectiveWalletProvider = useCallback(async (activeConnector = connector) => {
+        let connectorProvider;
+        try {
+            connectorProvider = await activeConnector?.getProvider();
+        }
+        catch {
+            connectorProvider = undefined;
+        }
+        const connectorClientProvider = connectorClient
+            ? {
+                request: (args) => connectorClient.request(args),
+            }
+            : undefined;
+        const walletClientProvider = walletClient
+            ? {
+                request: (args) => walletClient.request(args),
+            }
+            : undefined;
+        const windowProvider = typeof window !== "undefined"
+            ? window.ethereum
             : undefined;
+        const effectiveProvider = connectorProvider &&
+            typeof connectorProvider.request === "function"
+            ? connectorProvider
+            : (connectorClientProvider ?? walletClientProvider ?? windowProvider);
+        return effectiveProvider &&
+            typeof effectiveProvider.request === "function"
+            ? effectiveProvider
+            : undefined;
+    }, [connector, connectorClient, walletClient]);
     const historyStorageKey = getSwapHistoryStorageKey(ownerAddress);
+    useEffect(() => {
+        if (walletStatus !== "connected" || !ownerAddress) {
+            return;
+        }
+        let cancelled = false;
+        void (async () => {
+            const effectiveProvider = await getEffectiveWalletProvider();
+            if (cancelled || !effectiveProvider) {
+                return;
+            }
+            await handleInit(effectiveProvider, ownerAddress);
+        })().catch((error) => {
+            if (!cancelled) {
+                console.error("Unable to initialize Nexus for wallet address:", error);
+            }
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [getEffectiveWalletProvider, handleInit, ownerAddress, walletStatus]);
     // Global form state
     const [amount, setAmount] = useState("");
     const [recipientAddress, setRecipientAddress] = useState("");
@@ -1961,7 +2165,6 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         : hasCustomSwapRecipient
             ? recipientAddress
             : undefined;
-    const previousDefaultRecipientRef = useRef(defaultRecipientAddress);
     // Swap-specific
     const [swapType, setSwapType] = useState("exactIn");
     const [swapStep, setSwapStep] = useState("idle");
@@ -1978,6 +2181,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const [fromTokens, setFromTokens] = useState([]);
     const [sourceSelectionTouched, setSourceSelectionTouched] = useState(false);
     const [sourceSelectionRevision, setSourceSelectionRevision] = useState(0);
+    const [sourceSelectionRequiredUsdDisplay, setSourceSelectionRequiredUsdDisplay,] = useState(undefined);
+    const [sourcePickerDraftTokens, setSourcePickerDraftTokens] = useState(null);
+    const sourcePickerDraftTokensRef = useRef(null);
+    const sourcePickerDraftDepositFilterRef = useRef("all");
+    const sourcePickerDraftTouchedRef = useRef(false);
+    const sourcePickerDraftModeRef = useRef("all");
     const [exactOutQuoteSourceMode, setExactOutQuoteSourceMode] = useState("all");
     const exactOutQuoteSourceModeRef = useRef("all");
     const [toToken, setToToken] = useState(undefined);
@@ -2060,17 +2269,14 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         setExactOutQuoteSourceModeValue("all");
     }, [activeMode, setExactOutQuoteSourceModeValue]);
     useEffect(() => {
-        const previousDefault = previousDefaultRecipientRef.current;
-        previousDefaultRecipientRef.current = defaultRecipientAddress;
-        if (activeMode !== "swap" || !defaultRecipientAddress)
+        if (activeMode !== "swap")
             return;
         setRecipientAddress((current) => {
-            if (!current ||
-                (previousDefault &&
-                    current.toLowerCase() === previousDefault.toLowerCase())) {
-                return defaultRecipientAddress;
-            }
-            return current;
+            if (!defaultRecipientAddress)
+                return current ? "" : current;
+            return current.toLowerCase() === defaultRecipientAddress.toLowerCase()
+                ? current
+                : defaultRecipientAddress;
         });
     }, [activeMode, defaultRecipientAddress]);
     const { steps, seed, onStepsList, onStepComplete, reset: resetSteps, } = useTransactionSteps();
@@ -2095,6 +2301,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const widgetOpenedFiredRef = useRef(false);
     const reachedTerminalRef = useRef(false);
     const lastIntentSourceTokensRef = useRef([]);
+    const lastAutoIntentSourceTokensRef = useRef([]);
     const immediateQuoteAfterSourceEditRef = useRef(false);
     const amountEnteredLastValueRef = useRef("");
     const lastInputMethodRef = useRef("typed");
@@ -2123,11 +2330,14 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const [quoteRefreshing, setQuoteRefreshing] = useState(false);
     const [receiveMaxCalculating, setReceiveMaxCalculating] = useState(false);
     const [maxCalculationPercent, setMaxCalculationPercent] = useState(null);
-    const maxSwapQuoteCacheRef = useRef({});
     const intentDestinationUsdRateCacheRef = useRef({});
     const intentSymbolUsdRateCacheRef = useRef({});
     const predictiveQuoteCacheRef = useRef({});
     const predictiveQuoteRunRef = useRef(0);
+    const latestIntentFetchRunIdRef = useRef(0);
+    const intentFetchTimingRef = useRef(null);
+    const intentUiRenderLoggedRunIdRef = useRef(null);
+    const [intentFetchTiming, setIntentFetchTiming] = useState(null);
     const [predictiveQuote, setPredictiveQuote] = useState(null);
     const maxPercentRunRef = useRef(0);
     const [previewQuoteRefreshing, setPreviewQuoteRefreshing] = useState(false);
@@ -2154,6 +2364,68 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const activeQuoteInputKeyRef = useRef("");
     // Ref to store swap intent hook allow/deny callbacks
     const swapIntentRef = useRef(null);
+    const startIntentFetchTiming = useCallback(({ background, operation, quoteInputKey, runId, }) => {
+        const startTimeMs = Date.now();
+        const timing = {
+            background,
+            operation,
+            quoteInputKey,
+            runId,
+            startTimeMs,
+            walletAddress: ownerAddress ?? null,
+        };
+        latestIntentFetchRunIdRef.current = runId;
+        intentFetchTimingRef.current = timing;
+        intentUiRenderLoggedRunIdRef.current = null;
+        setIntentFetchTiming(timing);
+        console.log("[NexusWidget] intent fetch start", {
+            runId,
+            walletAddress: timing.walletAddress,
+            operation,
+            quoteInputKey,
+            background,
+            dateNow: startTimeMs,
+            date: new Date(startTimeMs),
+        });
+        return timing;
+    }, [ownerAddress]);
+    const finishIntentFetchTiming = useCallback((runId, status = "resolved") => {
+        const timing = intentFetchTimingRef.current;
+        if (!timing || timing.runId !== runId)
+            return;
+        if (timing.endTimeMs !== undefined)
+            return;
+        const endTimeMs = Date.now();
+        if (latestIntentFetchRunIdRef.current !== runId) {
+            return;
+        }
+        const fetchDurationMs = endTimeMs - timing.startTimeMs;
+        const completedTiming = {
+            ...timing,
+            endTimeMs,
+            fetchDurationMs,
+        };
+        intentFetchTimingRef.current = completedTiming;
+        setIntentFetchTiming(completedTiming);
+        console.log("[NexusWidget] intent fetch end", {
+            runId,
+            walletAddress: timing.walletAddress,
+            operation: timing.operation,
+            quoteInputKey: timing.quoteInputKey,
+            status,
+            dateNow: endTimeMs,
+            date: new Date(endTimeMs),
+        });
+        console.log("[NexusWidget] intent fetch total", {
+            runId,
+            walletAddress: timing.walletAddress,
+            operation: timing.operation,
+            quoteInputKey: timing.quoteInputKey,
+            totalTimeSeconds: fetchDurationMs / 1000,
+            elapsedMs: fetchDurationMs,
+            dateNow: endTimeMs,
+        });
+    }, []);
     useEffect(() => {
         swapStepRef.current = swapStep;
     }, [swapStep]);
@@ -2297,6 +2569,112 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         return () => window.clearInterval(timer);
     }, [swapStep]);
     const normalizeAddress = (value) => (value ?? "").toLowerCase();
+    const getTokenLookupAddress = (value) => {
+        if (!value)
+            return "";
+        return isNativeTokenAddress(value) ? zeroAddress : value.toLowerCase();
+    };
+    const findBalanceTokenLogo = (chainId, contractAddress, symbol) => {
+        if (!chainId)
+            return "";
+        const lookupAddress = getTokenLookupAddress(contractAddress);
+        const lookupSymbol = symbol?.toUpperCase();
+        let symbolMatchLogo = "";
+        for (const asset of swapBalance ?? []) {
+            for (const breakdown of asset.breakdown ?? []) {
+                if (breakdown.chain?.id !== chainId)
+                    continue;
+                const breakdownAddress = getTokenLookupAddress(breakdown.contractAddress);
+                const addressMatches = lookupAddress && breakdownAddress === lookupAddress;
+                const symbolMatches = lookupSymbol &&
+                    [breakdown.symbol, asset.symbol]
+                        .filter(Boolean)
+                        .some((candidate) => candidate.toUpperCase() === lookupSymbol);
+                const logo = getLogoFromMetadata(breakdown) || getLogoFromMetadata(asset);
+                if (addressMatches && logo)
+                    return logo;
+                if (!symbolMatchLogo && symbolMatches && logo) {
+                    symbolMatchLogo = logo;
+                }
+            }
+        }
+        return symbolMatchLogo;
+    };
+    const findSupportedTokenLogo = (chains, chainId, contractAddress, symbol) => {
+        if (!chainId)
+            return "";
+        const chain = chains?.find((item) => Number(item?.id ?? item?.chainId) === chainId);
+        const tokens = chain?.tokens ?? chain?.assets ?? [];
+        const lookupAddress = getTokenLookupAddress(contractAddress);
+        const lookupSymbol = symbol?.toUpperCase();
+        const addressMatch = lookupAddress &&
+            tokens.find((token) => {
+                const tokenAddress = getTokenLookupAddress(token?.contractAddress ?? token?.address ?? token?.tokenAddress);
+                return tokenAddress === lookupAddress;
+            });
+        const symbolMatch = lookupSymbol &&
+            tokens.find((token) => {
+                const tokenSymbol = (token?.symbol ?? token?.tokenSymbol ?? "")
+                    .toString()
+                    .toUpperCase();
+                return tokenSymbol === lookupSymbol;
+            });
+        return getLogoFromMetadata(addressMatch) || getLogoFromMetadata(symbolMatch);
+    };
+    const resolveTokenLogo = (token, chainId) => {
+        const explicitLogo = getLogoFromMetadata(token);
+        if (explicitLogo)
+            return explicitLogo;
+        const contractAddress = token?.contractAddress ?? token?.address ?? token?.tokenAddress;
+        const symbol = token?.symbol ?? token?.tokenSymbol;
+        const citreaToken = findCitreaReceiveToken({
+            address: contractAddress,
+            chainId,
+            symbol,
+        });
+        const tokenMeta = symbol
+            ? TOKEN_METADATA[symbol]
+            : undefined;
+        return (findBalanceTokenLogo(chainId, contractAddress, symbol) ||
+            findSupportedTokenLogo(swapSupportedChainsAndTokens, chainId, contractAddress, symbol) ||
+            findSupportedTokenLogo(supportedChainsAndTokens, chainId, contractAddress, symbol) ||
+            citreaToken?.logo ||
+            tokenMeta?.logo ||
+            (contractAddress && isNativeTokenAddress(contractAddress)
+                ? CHAIN_METADATA[chainId ?? 0]?.logo
+                : "") ||
+            "");
+    };
+    const enrichIntentToken = (token, chainId) => {
+        const logo = resolveTokenLogo(token, chainId);
+        return logo && logo !== token.logo ? { ...token, logo } : token;
+    };
+    const enrichTokenOptionLogo = (token) => {
+        if (!token)
+            return undefined;
+        const chainMeta = token.chainId ? CHAIN_METADATA[token.chainId] : undefined;
+        const logo = resolveTokenLogo(token, token.chainId);
+        const next = {
+            ...token,
+            chainLogo: token.chainLogo || chainMeta?.logo,
+            logo: token.logo || logo,
+        };
+        if (next.chainLogo === token.chainLogo && next.logo === token.logo) {
+            return token;
+        }
+        return next;
+    };
+    const enrichSwapIntentTokenMetadata = (intent) => ({
+        ...intent,
+        destination: {
+            ...intent.destination,
+            token: enrichIntentToken(intent.destination.token, intent.destination.chain.id),
+        },
+        sources: (intent.sources ?? []).map((source) => ({
+            ...source,
+            token: enrichIntentToken(source.token, source.chain.id),
+        })),
+    });
     const buildIntentSourceToken = (source) => {
         let matchedAsset;
         let matchedBreakdown;
@@ -2326,7 +2704,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         const sourceDecimals = isNativeSource && nativeCurrency?.decimals !== undefined
             ? nativeCurrency.decimals
             : source.token.decimals;
-        const sourceLogo = matchedAsset?.logo ?? (isNativeSource ? chainMeta?.logo : "");
+        const sourceLogo = resolveTokenLogo(source.token, source.chain.id);
         return {
             contractAddress: source.token.contractAddress,
             symbol: sourceSymbol,
@@ -2412,8 +2790,9 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return undefined;
         }
     };
-    const minimumSourceUsd = new Decimal(0);
-    const hasMinimumSourceUsdBalance = (token) => (parseFiatNumber(token.balanceInFiat) ?? new Decimal(0)).gte(minimumSourceUsd);
+    const minimumSourceUsd = new Decimal(1);
+    const hasMinimumSourceUsdValue = (value) => (parseFiatNumber(value) ?? new Decimal(0)).gte(minimumSourceUsd);
+    const hasMinimumSourceUsdBalance = (token) => hasMinimumSourceUsdValue(token.balanceInFiat);
     const filterMinimumSourceUsdTokens = (tokens) => tokens.filter(hasMinimumSourceUsdBalance);
     const getTokenUsdRateCacheKeyFromParts = (chainId, contractAddress, symbol) => {
         if (!chainId || !symbol)
@@ -2485,6 +2864,10 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         if (tokenBalance.gt(0) && fiatBalance.gt(0)) {
             return fiatBalance.div(tokenBalance);
         }
+        const priceUsd = parseFiatNumber(token.priceUSD);
+        if (priceUsd && priceUsd.gt(0)) {
+            return priceUsd;
+        }
         const fallbackRate = getFiatValue(1, token.symbol);
         if (Number.isFinite(fallbackRate) && fallbackRate > 0) {
             return new Decimal(fallbackRate);
@@ -2502,42 +2885,80 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         const rate = parseFiatNumber(cached?.rate);
         return rate && rate.gt(0) ? rate : new Decimal(0);
     };
-    const getTotalBalancePercentUsdAmount = (pct) => getSwapBalanceTotalUsd().mul(pct).div(100);
-    const formatTokenAmountFromUsd = (usdAmount, token) => {
-        const rate = getUsdRateForSymbol(token.symbol);
-        if (rate.lte(0))
+    const getFeeTokenLookupAddress = (value) => {
+        const lower = (value ?? "").toLowerCase();
+        if (!lower || lower === "0x" || isNativeTokenAddress(lower)) {
+            return zeroAddress;
+        }
+        return lower;
+    };
+    const getTokenUsdRateFromBalances = (chainId, contractAddress, symbol) => {
+        if (!chainId)
             return undefined;
-        return usdAmount
-            .div(rate)
-            .toDecimalPlaces(Math.max(0, token.decimals ?? 18), Decimal.ROUND_DOWN)
-            .toFixed();
+        const lookupAddress = getFeeTokenLookupAddress(contractAddress);
+        const lookupSymbol = symbol?.toUpperCase();
+        for (const asset of swapBalance ?? []) {
+            for (const breakdown of asset.breakdown ?? []) {
+                if (breakdown.chain?.id !== chainId)
+                    continue;
+                const breakdownAddress = getFeeTokenLookupAddress(breakdown.contractAddress);
+                const addressMatches = lookupAddress && breakdownAddress === lookupAddress;
+                const symbolMatches = lookupSymbol &&
+                    [breakdown.symbol, asset.symbol]
+                        .filter(Boolean)
+                        .some((candidate) => candidate.toUpperCase() === lookupSymbol);
+                if (!addressMatches && !symbolMatches)
+                    continue;
+                const balance = parseFiatNumber(breakdown.balance);
+                const fiatBalance = parseFiatNumber(breakdown.balanceInFiat);
+                if (balance && fiatBalance && balance.gt(0) && fiatBalance.gt(0)) {
+                    return fiatBalance.div(balance);
+                }
+            }
+        }
+        return undefined;
     };
-    const getMaxSwapQuoteCacheKey = (token) => {
-        if (!token?.chainId)
-            return "";
-        return [
-            token.chainId,
-            (token.contractAddress || zeroAddress).toLowerCase(),
-            token.symbol.toUpperCase(),
-        ].join(":");
+    const getTokenUsdRateFromSupportedChains = (chains, chainId, contractAddress, symbol) => {
+        if (!chainId)
+            return undefined;
+        const chain = chains?.find((item) => Number(item?.id ?? item?.chainId) === chainId);
+        const tokens = chain?.tokens ?? chain?.assets ?? [];
+        const lookupAddress = getFeeTokenLookupAddress(contractAddress);
+        const lookupSymbol = symbol?.toUpperCase();
+        const matchedToken = tokens.find((token) => {
+            const tokenAddress = getFeeTokenLookupAddress(token?.contractAddress ?? token?.address ?? token?.tokenAddress);
+            const addressMatches = lookupAddress && tokenAddress === lookupAddress;
+            const tokenSymbol = (token?.symbol ?? token?.tokenSymbol ?? "")
+                .toString()
+                .toUpperCase();
+            const symbolMatches = lookupSymbol && tokenSymbol === lookupSymbol;
+            return addressMatches || symbolMatches;
+        });
+        const priceUsd = parseFiatNumber(matchedToken?.priceUSD ??
+            matchedToken?.priceUsd ??
+            matchedToken?.usdPrice ??
+            matchedToken?.price);
+        return priceUsd && priceUsd.gt(0) ? priceUsd : undefined;
     };
-    const getCachedMaxSwapQuote = (token) => {
-        const key = getMaxSwapQuoteCacheKey(token);
-        return key ? maxSwapQuoteCacheRef.current[key] : undefined;
+    const getIntentDestinationGasUsdValue = (intent) => {
+        const gas = intent?.destination?.gas;
+        const explicitValue = parseFiatNumber(gas?.value);
+        if (explicitValue && explicitValue.gt(0))
+            return explicitValue;
+        const amount = parseFiatNumber(gas?.amount);
+        if (!amount || amount.lte(0))
+            return undefined;
+        const chainId = intent?.destination?.chain?.id;
+        const contractAddress = gas?.token?.contractAddress;
+        const symbol = gas?.token?.symbol;
+        const rate = getTokenUsdRateFromBalances(chainId, contractAddress, symbol) ??
+            getTokenUsdRateFromSupportedChains(swapSupportedChainsAndTokens, chainId, contractAddress, symbol) ??
+            getTokenUsdRateFromSupportedChains(supportedChainsAndTokens, chainId, contractAddress, symbol) ??
+            getUsdRateForSymbol(symbol);
+        return rate.gt(0) ? amount.mul(rate) : undefined;
     };
     const getCachedDestinationUsdRate = (token) => {
-        const intentCachedRate = getCachedIntentUsdRate(token);
-        if (intentCachedRate && intentCachedRate.gt(0)) {
-            return intentCachedRate;
-        }
-        const cached = getCachedMaxSwapQuote(token);
-        if (!cached ||
-            !cached.maxUsdAmount ||
-            cached.maxUsdAmount.lte(0) ||
-            cached.maxTokenAmount.lte(0)) {
-            return undefined;
-        }
-        return cached.maxUsdAmount.div(cached.maxTokenAmount);
+        return getCachedIntentUsdRate(token);
     };
     const resolveUsdRateForSymbol = async (symbol) => {
         if (!symbol)
@@ -2555,79 +2976,6 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return new Decimal(0);
         }
     };
-    const resolveMaxSwapQuote = async (token) => {
-        const key = getMaxSwapQuoteCacheKey(token);
-        if (!key)
-            return undefined;
-        const cached = maxSwapQuoteCacheRef.current[key];
-        if (cached)
-            return cached;
-        const calculateMaxForSwap = nexusSDK?.calculateMaxForSwap;
-        if (typeof calculateMaxForSwap !== "function" || !token.chainId) {
-            return undefined;
-        }
-        const max = await calculateMaxForSwap({
-            toChainId: token.chainId,
-            toTokenAddress: (token.contractAddress || zeroAddress),
-        });
-        const decimals = Number.isFinite(Number(max.decimals))
-            ? Number(max.decimals)
-            : token.decimals || 18;
-        const maxAmount = parseFiatNumber(max.maxAmount) ??
-            (max.maxAmountRaw !== undefined
-                ? new Decimal(max.maxAmountRaw.toString()).div(new Decimal(10).pow(decimals))
-                : undefined);
-        if (!maxAmount || maxAmount.lte(0))
-            return undefined;
-        const safeMaxAmount = maxAmount.mul(receiveMaxSafetyMultiplier);
-        const destinationRate = await resolveUsdRateForSymbol(max.symbol || token.symbol);
-        let maxUsdAmount = destinationRate.gt(0)
-            ? safeMaxAmount.mul(destinationRate)
-            : undefined;
-        if (!maxUsdAmount || maxUsdAmount.lte(0)) {
-            const sourcesUsd = await (max.sources ?? []).reduce(async (sumPromise, source) => {
-                const sum = await sumPromise;
-                const amount = parseFiatNumber(source.amount) ?? new Decimal(0);
-                if (amount.lte(0))
-                    return sum;
-                const sourceRate = await resolveUsdRateForSymbol(source.symbol);
-                return sourceRate.gt(0) ? sum.plus(amount.mul(sourceRate)) : sum;
-            }, Promise.resolve(new Decimal(0)));
-            if (sourcesUsd.gt(0)) {
-                maxUsdAmount = sourcesUsd.mul(receiveMaxSafetyMultiplier);
-            }
-        }
-        const quote = {
-            decimals,
-            maxTokenAmount: safeMaxAmount,
-            maxUsdAmount,
-            symbol: max.symbol || token.symbol,
-        };
-        maxSwapQuoteCacheRef.current[key] = quote;
-        return quote;
-    };
-    const getPercentAmountFromMaxQuote = async (token, pct, preferUsd) => {
-        const maxQuote = await resolveMaxSwapQuote(token);
-        if (!maxQuote)
-            return undefined;
-        const ratio = new Decimal(pct).div(100);
-        if (preferUsd && maxQuote.maxUsdAmount && maxQuote.maxUsdAmount.gt(0)) {
-            return {
-                amount: maxQuote.maxUsdAmount
-                    .mul(ratio)
-                    .toDecimalPlaces(2, Decimal.ROUND_DOWN)
-                    .toFixed(),
-                mode: "usd",
-            };
-        }
-        return {
-            amount: maxQuote.maxTokenAmount
-                .mul(ratio)
-                .toDecimalPlaces(Math.max(0, maxQuote.decimals), Decimal.ROUND_DOWN)
-                .toFixed(),
-            mode: "token",
-        };
-    };
     const getTokenUsdValue = (token, fallbackAmount) => {
         const amountNumber = parseFiatNumber(token.userAmount || fallbackAmount) ?? new Decimal(0);
         if (amountNumber.lte(0))
@@ -2642,6 +2990,50 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     };
     const getTokenBalanceAmount = (token) => parseFiatNumber(token.balance) ?? new Decimal(0);
     const getTokenBalanceUsd = (token) => parseFiatNumber(token.balanceInFiat) ?? new Decimal(0);
+    const getSdkExactOutSourcePriority = (token) => {
+        const isSameChain = Boolean(token.chainId && toToken?.chainId) &&
+            token.chainId === toToken?.chainId;
+        const isSameToken = Boolean(token.contractAddress && toToken?.contractAddress) &&
+            ((isNativeTokenAddress(token.contractAddress) &&
+                isNativeTokenAddress(toToken?.contractAddress)) ||
+                token.contractAddress.toLowerCase() ===
+                    toToken?.contractAddress.toLowerCase());
+        const isStable = isSdkExactOutStableSymbol(token.symbol);
+        const isGas = isNativeTokenAddress(token.contractAddress);
+        const isEthereum = token.chainId === ETHEREUM_MAINNET_CHAIN_ID;
+        if (isSameChain) {
+            if (isSameToken)
+                return 1;
+            if (isStable)
+                return 2;
+            if (isGas)
+                return 3;
+            return 4;
+        }
+        if (isEthereum) {
+            if (isSameToken)
+                return 8;
+            if (isStable)
+                return 9;
+            if (isGas)
+                return 10;
+            return 11;
+        }
+        if (isSameToken)
+            return 5;
+        if (isStable)
+            return 6;
+        return 7;
+    };
+    const sortExactOutSourcesBySdkPriority = (tokens) => [...tokens].sort((a, b) => {
+        const priorityDiff = getSdkExactOutSourcePriority(a) - getSdkExactOutSourcePriority(b);
+        if (priorityDiff !== 0)
+            return priorityDiff;
+        const usdDiff = getTokenBalanceUsd(b).cmp(getTokenBalanceUsd(a));
+        if (usdDiff !== 0)
+            return usdDiff;
+        return `${a.symbol} ${a.chainName ?? ""}`.localeCompare(`${b.symbol} ${b.chainName ?? ""}`);
+    });
     const getTokenAmountForUsd = (token, usdAmount) => {
         const rate = getTokenUsdRate(token);
         if (rate.lte(0) || usdAmount.lte(0))
@@ -2974,6 +3366,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         : [token])
         .filter(hasMinimumSourceUsdBalance);
     const hasPositiveDecimalInput = (value) => Boolean(parseFiatNumber(value)?.gt(0));
+    const hasPositiveSourceSpend = (token) => hasPositiveDecimalInput(token.userAmount) ||
+        hasPositiveDecimalInput(token.userAmountUsd);
     const getReadyExactInSourceTokens = (tokens) => getExactInSourceTokens(tokens).filter((token) => Boolean(token.chainId && token.contractAddress) &&
         hasPositiveDecimalInput(token.userAmount));
     const hasReadyExactInSwapInput = (tokens, destination) => Boolean(destination?.chainId &&
@@ -3062,6 +3456,51 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         }
         return getExpandedSourceTokens(tokens).filter(hasGasForSource);
     };
+    const getMinimumBalanceSourceTokens = () => filterMinimumSourceUsdTokens(getExpandedSourceTokens(swapBalance
+        ? deriveTokenOptions(swapBalance, swapSupportedChainsAndTokens)
+        : []));
+    const getHeldDestinationTokenOption = () => {
+        if (!toToken?.chainId || !toToken.contractAddress)
+            return undefined;
+        for (const asset of swapBalance ?? []) {
+            for (const breakdown of asset.breakdown ?? []) {
+                const chainId = breakdown.chain?.id;
+                if (chainId !== toToken.chainId)
+                    continue;
+                const breakdownAddress = breakdown.contractAddress;
+                const addressMatches = breakdownAddress &&
+                    (breakdownAddress.toLowerCase() ===
+                        toToken.contractAddress.toLowerCase() ||
+                        (isNativeTokenAddress(breakdownAddress) &&
+                            isNativeTokenAddress(toToken.contractAddress)));
+                const symbolMatches = (breakdown.symbol ?? asset.symbol ?? "").toUpperCase() ===
+                    toToken.symbol.toUpperCase();
+                if (!addressMatches && !symbolMatches)
+                    continue;
+                const balanceAmount = parseFiatNumber(breakdown.balance);
+                if (!balanceAmount || balanceAmount.lte(0))
+                    continue;
+                const chainMeta = CHAIN_METADATA[chainId];
+                const symbol = breakdown.symbol ?? asset.symbol ?? toToken.symbol;
+                const fiatBalance = parseFiatNumber(breakdown.balanceInFiat);
+                return {
+                    chainId,
+                    chainLogo: chainMeta?.logo ?? breakdown.chain?.logo ?? toToken.chainLogo,
+                    chainName: getShortChainName(chainId, chainMeta?.name ?? breakdown.chain?.name ?? toToken.chainName),
+                    contractAddress: breakdown.contractAddress ?? toToken.contractAddress,
+                    decimals: breakdown.decimals ?? asset.decimals ?? toToken.decimals ?? 18,
+                    logo: asset.logo ?? toToken.logo,
+                    name: symbol,
+                    symbol,
+                    balance: `${breakdown.balance} ${symbol}`,
+                    balanceInFiat: fiatBalance !== undefined
+                        ? `$${fiatBalance.toDecimalPlaces(2).toFixed()}`
+                        : "$0.00",
+                };
+            }
+        }
+        return undefined;
+    };
     const getDepositDestinationForSourceSelection = () => {
         const destination = activeMode === "deposit" ? selectedOpportunity : toToken;
         const chainId = destination?.chainId;
@@ -3160,7 +3599,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const getExactOutSourceTokens = (mode = exactOutQuoteSourceModeRef.current, targetAmountUsd) => {
         if (activeMode === "deposit") {
             const selection = getResolvedDepositSourceSelection({ targetAmountUsd });
-            return getDepositSourceTokensForIds(selection.selectedSourceIds);
+            return getDepositSourceTokensForIds(mode === "all" ? selection.sourcePoolIds : selection.selectedSourceIds);
         }
         if (activeMode === "send" && mode === "selected" && fromTokens.length > 0) {
             return filterMinimumSourceUsdTokens(getExpandedSourceTokens(fromTokens)).filter(hasGasForSource);
@@ -3194,60 +3633,16 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return true;
         });
     };
-    const getHeldNativeGasSourceForChain = (chainId) => {
-        if (!chainId)
-            return undefined;
-        const nativeSymbol = CHAIN_METADATA[chainId]?.nativeCurrency?.symbol?.toUpperCase();
-        for (const asset of swapBalance ?? []) {
-            for (const breakdown of asset.breakdown ?? []) {
-                if (breakdown.chain?.id !== chainId)
-                    continue;
-                const breakdownSymbol = (breakdown.symbol ??
-                    asset.symbol ??
-                    "").toUpperCase();
-                const assetSymbol = (asset.symbol ?? "").toUpperCase();
-                const isNativeBalance = isNativeTokenAddress(breakdown.contractAddress) ||
-                    Boolean(nativeSymbol &&
-                        (breakdownSymbol === nativeSymbol || assetSymbol === nativeSymbol));
-                const balance = parseFiatNumber(breakdown.balance) ?? new Decimal(0);
-                if (!isNativeBalance || balance.lte(0))
-                    continue;
-                return {
-                    chainId,
-                    tokenAddress: (breakdown.contractAddress ||
-                        zeroAddress),
-                };
-            }
-        }
-        return undefined;
-    };
     const getHeldDestinationTokenSource = () => {
-        if (!toToken?.chainId || !toToken.contractAddress)
+        const heldDestinationToken = getHeldDestinationTokenOption();
+        if (!heldDestinationToken?.chainId ||
+            !heldDestinationToken.contractAddress) {
             return undefined;
-        for (const asset of swapBalance ?? []) {
-            for (const breakdown of asset.breakdown ?? []) {
-                const chainId = breakdown.chain?.id;
-                if (chainId !== toToken.chainId)
-                    continue;
-                const breakdownAddress = breakdown.contractAddress;
-                const addressMatches = breakdownAddress &&
-                    (breakdownAddress.toLowerCase() ===
-                        toToken.contractAddress.toLowerCase() ||
-                        (isNativeTokenAddress(breakdownAddress) &&
-                            isNativeTokenAddress(toToken.contractAddress)));
-                const symbolMatches = (breakdown.symbol ?? asset.symbol ?? "").toUpperCase() ===
-                    toToken.symbol.toUpperCase();
-                const balance = parseFiatNumber(breakdown.balance) ?? new Decimal(0);
-                if ((!addressMatches && !symbolMatches) || balance.lte(0))
-                    continue;
-                return {
-                    chainId,
-                    tokenAddress: (breakdown.contractAddress ||
-                        toToken.contractAddress),
-                };
-            }
         }
-        return undefined;
+        return {
+            chainId: heldDestinationToken.chainId,
+            tokenAddress: heldDestinationToken.contractAddress,
+        };
     };
     const shouldSendExactOutSourceAllowlist = () => {
         if (activeMode === "deposit") {
@@ -3262,14 +3657,13 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         if (activeMode !== "deposit" && activeMode !== "send") {
             return buildExplicitSourcesPayload(tokens);
         }
-        if (!shouldSendExactOutSourceAllowlist()) {
-            return {};
-        }
-        const explicitSources = buildExplicitSourcesPayload(tokens).sources;
+        const sourceTokens = shouldSendExactOutSourceAllowlist()
+            ? tokens
+            : getExactOutSourceTokens("all");
+        const explicitSources = buildExplicitSourcesPayload(sourceTokens).sources;
         const sources = dedupeSdkSources([
             ...explicitSources,
             getHeldDestinationTokenSource(),
-            getHeldNativeGasSourceForChain(toToken?.chainId),
         ]);
         return sources.length > 0 ? { sources } : {};
     };
@@ -3277,16 +3671,16 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         if (requiredSourceUsd.lte(0))
             return [];
         const destinationKey = getTokenSelectionKey(toToken);
-        const candidates = getExactOutSourceTokens(exactOutQuoteSourceModeRef.current, requiredSourceUsd)
+        const candidates = sortExactOutSourcesBySdkPriority(getExactOutSourceTokens(exactOutQuoteSourceModeRef.current, requiredSourceUsd)
             .filter((token) => getTokenSelectionKey(token) !== destinationKey)
-            .filter((token) => getTokenBalanceUsd(token).gt(0));
+            .filter(hasMinimumSourceUsdBalance));
         const sources = [];
         let remainingUsd = requiredSourceUsd;
         for (const token of candidates) {
             if (remainingUsd.lte(0))
                 break;
             const availableUsd = getTokenBalanceUsd(token);
-            if (availableUsd.lte(0))
+            if (availableUsd.lt(minimumSourceUsd))
                 continue;
             const rate = await resolveUsdRateForToken(token);
             if (rate.lte(0))
@@ -3343,27 +3737,91 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         if (!amountNumber || amountNumber.lte(0) || !toToken?.symbol) {
             return undefined;
         }
+        if (activeMode === "deposit" && depositAmountMode === "usd") {
+            return amountNumber;
+        }
         const fiatValue = getFiatValue(amountNumber.toNumber(), toToken.symbol);
         return Number.isFinite(fiatValue) && fiatValue > 0
             ? new Decimal(fiatValue)
             : undefined;
     };
-    const getExactOutAvailableSourceUsd = () => {
-        const selectedSourceTotal = exactOutQuoteSourceModeRef.current === "selected" && fromTokens.length > 0
-            ? fromTokens.reduce((sum, token) => {
+    const getExactOutAvailableSourceUsd = (sourceTokensOverride) => {
+        const sumTokensWithDestinationCredit = (tokens) => {
+            const heldDestinationToken = getHeldDestinationTokenOption();
+            const heldDestinationKey = getTokenSelectionKey(heldDestinationToken);
+            let hasHeldDestinationToken = false;
+            const sourceTotal = tokens.reduce((sum, token) => {
                 const value = parseFiatNumber(token.balanceInFiat) ?? new Decimal(0);
-                return value.gte(minimumSourceUsd) ? sum.plus(value) : sum;
-            }, new Decimal(0))
-            : undefined;
-        if (selectedSourceTotal && selectedSourceTotal.gt(0)) {
-            return selectedSourceTotal;
+                const isHeldDestinationToken = heldDestinationKey &&
+                    getTokenSelectionKey(token) === heldDestinationKey;
+                if (isHeldDestinationToken) {
+                    hasHeldDestinationToken = true;
+                }
+                return value.gt(0) &&
+                    (isHeldDestinationToken || value.gte(minimumSourceUsd))
+                    ? sum.plus(value)
+                    : sum;
+            }, new Decimal(0));
+            if (!heldDestinationToken || hasHeldDestinationToken) {
+                return sourceTotal;
+            }
+            const heldDestinationUsd = parseFiatNumber(heldDestinationToken.balanceInFiat) ?? new Decimal(0);
+            return heldDestinationUsd.gt(0)
+                ? sourceTotal.plus(heldDestinationUsd)
+                : sourceTotal;
+        };
+        if (sourceTokensOverride ||
+            exactOutQuoteSourceModeRef.current === "selected") {
+            const selectedSourceTokens = sourceTokensOverride ?? fromTokens;
+            return sumTokensWithDestinationCredit(selectedSourceTokens);
         }
-        const allSourceTotal = getGasCapableBalanceSourceTokens().reduce((sum, token) => {
-            const value = parseFiatNumber(token.balanceInFiat) ?? new Decimal(0);
-            return value.gte(minimumSourceUsd) ? sum.plus(value) : sum;
-        }, new Decimal(0));
+        return getExactOutTotalSourceBalanceUsd();
+    };
+    const getExactOutTotalSourceBalanceUsd = () => {
+        const allSourceTotal = getExactOutAvailableSourceUsd(getMinimumBalanceSourceTokens());
         return allSourceTotal.gt(0) ? allSourceTotal : getSwapBalanceTotalUsd();
     };
+    const getExactOutIntentSourceUsd = () => {
+        const intentSourceUsd = (intentData?.sources ?? []).reduce((sum, source) => sum.plus(parseFiatNumber(source.value) ?? new Decimal(0)), new Decimal(0));
+        return intentSourceUsd.gt(0) ? intentSourceUsd : undefined;
+    };
+    const getExactOutHeldDestinationUsd = () => {
+        const heldDestinationToken = getHeldDestinationTokenOption();
+        const value = parseFiatNumber(heldDestinationToken?.balanceInFiat);
+        return value && value.gt(0) ? value : new Decimal(0);
+    };
+    const exactOutIntentIncludesHeldDestination = () => {
+        const heldDestinationToken = getHeldDestinationTokenOption();
+        const heldDestinationKey = getTokenSelectionKey(heldDestinationToken);
+        if (!heldDestinationKey)
+            return false;
+        return (intentData?.sources ?? []).some((source) => {
+            const chainId = source.chain?.id;
+            const tokenAddress = source.token?.contractAddress;
+            if (!chainId || !tokenAddress)
+                return false;
+            return (getTokenSelectionKey({
+                chainId,
+                contractAddress: tokenAddress,
+            }) === heldDestinationKey);
+        });
+    };
+    const getExactOutRequiredSourceUsd = () => {
+        const intentSourceUsd = getExactOutIntentSourceUsd();
+        if (intentSourceUsd)
+            return intentSourceUsd;
+        return undefined;
+    };
+    const getExactOutRequiredFundingUsd = () => {
+        const sourceRequiredUsd = getExactOutRequiredSourceUsd();
+        if (sourceRequiredUsd) {
+            const destinationCreditUsd = exactOutIntentIncludesHeldDestination()
+                ? new Decimal(0)
+                : getExactOutHeldDestinationUsd();
+            return sourceRequiredUsd.plus(destinationCreditUsd);
+        }
+        return getExactOutRequestedUsd();
+    };
     const getExactInSourceDeficitUsd = () => {
         if (swapType !== "exactIn" || fromTokens.length === 0)
             return undefined;
@@ -3402,7 +3860,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             details.availableAmountUsd ??
             details.availableAmount ??
             details.available) ?? parseLabeledErrorDecimal(errorText, "available");
-        const requestedUsd = getExactOutRequestedUsd();
+        const requestedUsd = getExactOutRequiredFundingUsd();
         const availableUsd = getExactOutAvailableSourceUsd();
         const exactInSourceDeficitUsd = getExactInSourceDeficitUsd();
         let missingUsd = exactInSourceDeficitUsd && exactInSourceDeficitUsd.gt(0)
@@ -3429,11 +3887,11 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             message: "Add more source balance across your assets",
         };
     };
-    const buildExactOutSourceBalanceIssue = () => {
+    const buildExactOutSourceBalanceIssue = (sourceTokensOverride) => {
         if (activeMode !== "deposit" && activeMode !== "send")
             return null;
-        const requestedUsd = getExactOutRequestedUsd();
-        const availableUsd = getExactOutAvailableSourceUsd();
+        const requestedUsd = getExactOutRequiredFundingUsd();
+        const availableUsd = getExactOutAvailableSourceUsd(sourceTokensOverride);
         if (!requestedUsd || requestedUsd.lte(0) || !availableUsd)
             return null;
         const missingUsd = requestedUsd.minus(availableUsd);
@@ -3757,22 +4215,29 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             ...intent,
             sources: sortIntentSourcesByUsdDesc(intent.sources ?? []),
         };
-        const sortedIntentSourceTokens = sortSwapTokensByUsdDesc((sortedIntent.sources ?? []).map(buildIntentSourceToken));
+        const enrichedIntent = enrichSwapIntentTokenMetadata(sortedIntent);
+        const sortedIntentSourceTokens = sortSwapTokensByUsdDesc((enrichedIntent.sources ?? []).map(buildIntentSourceToken));
         lastSwapIntentRefreshAtRef.current = Date.now();
         lastIntentSourceTokensRef.current = sortedIntentSourceTokens;
-        cacheDestinationUsdRateFromIntent(sortedIntent);
-        cachePredictiveBaselineFromIntent(sortedIntent);
-        setIntentData(sortedIntent);
-        setIntentToAmount(sortedIntent.destination?.amount || undefined);
+        if (!sourceSelectionTouched &&
+            (activeMode === "send" ||
+                (activeMode === "deposit" && swapType === "exactOut"))) {
+            lastAutoIntentSourceTokensRef.current = sortedIntentSourceTokens;
+        }
+        cacheDestinationUsdRateFromIntent(enrichedIntent);
+        cachePredictiveBaselineFromIntent(enrichedIntent);
+        setIntentData(enrichedIntent);
+        setIntentToAmount(enrichedIntent.destination?.amount || undefined);
         setSwapQuoteIssue(null);
         if (!sourceSelectionTouched &&
+            swapStepRef.current !== "choose-swap-asset" &&
             (activeMode === "send" ||
                 (activeMode === "deposit" && swapType === "exactOut"))) {
             syncingIntentSourcesRef.current = true;
             setFromTokens(sortedIntentSourceTokens);
         }
         try {
-            const bridgeFees = sortedIntent.feesAndBuffer?.bridge;
+            const bridgeFees = enrichedIntent.feesAndBuffer?.bridge;
             const bridgeFeeData = bridgeFees && typeof bridgeFees === "object" ? bridgeFees : undefined;
             const collectionFee = parseFiatNumber(bridgeFeeData?.collection);
             const fulfilmentFee = parseFiatNumber(bridgeFeeData?.fulfilment);
@@ -3780,20 +4245,29 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                 (collectionFee !== undefined || fulfilmentFee !== undefined
                     ? (collectionFee ?? new Decimal(0)).plus(fulfilmentFee ?? new Decimal(0))
                     : undefined);
+            const bridgeGasSuppliedFee = parseFiatNumber(bridgeFeeData?.gasSupplied);
+            const destinationGasSuppliedFee = getIntentDestinationGasUsdValue(enrichedIntent);
+            const gasSuppliedFee = bridgeGasSuppliedFee ?? destinationGasSuppliedFee;
             const bridgeComponentsTotal = bridgeFeeData
                 ? [
                     executionGasFee,
                     parseFiatNumber(bridgeFeeData.protocol),
                     parseFiatNumber(bridgeFeeData.solver),
-                    parseFiatNumber(bridgeFeeData.gasSupplied),
+                    gasSuppliedFee,
                 ].reduce((sum, value) => sum.plus(value ?? new Decimal(0)), new Decimal(0))
                 : undefined;
-            const bridgeTotal = typeof bridgeFees === "string"
+            const rawBridgeTotal = typeof bridgeFees === "string"
                 ? parseFiatNumber(bridgeFees)
-                : (parseFiatNumber(bridgeFeeData?.total) ??
+                : parseFiatNumber(bridgeFeeData?.total);
+            const bridgeTotal = rawBridgeTotal &&
+                !bridgeGasSuppliedFee &&
+                destinationGasSuppliedFee &&
+                destinationGasSuppliedFee.gt(0)
+                ? rawBridgeTotal.plus(destinationGasSuppliedFee)
+                : (rawBridgeTotal ??
                     (bridgeComponentsTotal && bridgeComponentsTotal.gt(0)
                         ? bridgeComponentsTotal
-                        : undefined));
+                        : destinationGasSuppliedFee));
             if (bridgeTotal !== undefined) {
                 setIntentFeeUsd(bridgeTotal.gt(0) ? bridgeTotal.toDecimalPlaces(6).toFixed() : "0");
             }
@@ -3808,14 +4282,20 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     }, [
         activeMode,
         fromTokens,
+        getFiatValue,
         sourceSelectionTouched,
         swapType,
         swapBalance,
+        swapSupportedChainsAndTokens,
+        supportedChainsAndTokens,
         toToken,
     ]);
     const handleSwapIntentCallback = useCallback((data, runId, quoteInputKey) => {
         const { intent, allow, deny, refresh } = data;
-        const bridgeProvider = normalizeBridgeProvider(data?.bridgeProvider ?? intent?.bridgeProvider ?? intent?.swap?.bridgeProvider);
+        const bridgeProvider = normalizeBridgeProvider(data?.bridgeProvider ??
+            intent?.bridgeProvider ??
+            intent?.normalizedIntent?.bridgeProvider ??
+            intent?.swap?.bridgeProvider);
         const intentWithBridgeProvider = normalizeRenderableSwapIntentData(intent, bridgeProvider);
         logSdkIntentEvent("onIntent", data, {
             bridgeProvider,
@@ -3834,11 +4314,21 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             deny();
             return;
         }
+        if (quoteInputKey && activeQuoteInputKeyRef.current !== quoteInputKey) {
+            logSdkIntentEvent("ignored stale quote input onIntent", data, {
+                currentQuoteInputKey: activeQuoteInputKeyRef.current,
+                quoteInputKey,
+                runId,
+            });
+            deny();
+            return;
+        }
         if (!intentWithBridgeProvider) {
             console.warn("[NexusWidget SDK][intent] Unsupported intent shape", {
                 intent,
                 raw: data,
             });
+            finishIntentFetchTiming(runId, "failed");
             deny();
             setIntentLoading(false);
             setQuoteRefreshing(false);
@@ -3847,16 +4337,18 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             setTxError("Quote unavailable");
             return;
         }
-        const resolvedQuoteInputKey = activeQuoteInputKeyRef.current || quoteInputKey;
+        const resolvedQuoteInputKey = quoteInputKey;
         const normalizedRefresh = typeof refresh === "function"
             ? async (...args) => {
                 const refreshed = await refresh(...args);
                 const refreshedBridgeProvider = normalizeBridgeProvider(refreshed?.bridgeProvider ??
+                    refreshed?.normalizedIntent?.bridgeProvider ??
                     refreshed?.swap?.bridgeProvider ??
                     bridgeProvider);
                 return (normalizeRenderableSwapIntentData(refreshed, refreshedBridgeProvider) ?? refreshed);
             }
             : refresh;
+        finishIntentFetchTiming(runId);
         providerSwapIntent.current = {
             intent: intentWithBridgeProvider,
             allow,
@@ -3878,7 +4370,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             setReceiveMaxCalculating(false);
             setPreviewQuoteRefreshing(false);
         });
-    }, [applySwapIntent, providerSwapIntent]);
+    }, [applySwapIntent, finishIntentFetchTiming, providerSwapIntent]);
     // Deposit-specific
     const [selectedOpportunity, setSelectedOpportunity] = useState(() => (activeMode === "deposit" ? configuredDeposit : undefined));
     const selectedOpportunityIdentity = getDepositConfigIdentity(selectedOpportunity);
@@ -4328,11 +4820,16 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         : undefined;
     const usdValue = getFiatValue(Number(amount) || 0, currentAsset?.symbol || "USDC");
     const getDepositTokenUsdRate = () => {
-        if (!selectedOpportunity?.tokenSymbol)
-            return new Decimal(0);
-        const fiat = getFiatValue(1, selectedOpportunity.tokenSymbol);
-        if (Number.isFinite(fiat) && fiat > 0) {
-            return new Decimal(fiat);
+        if (selectedOpportunity?.tokenSymbol) {
+            const fiat = getFiatValue(1, selectedOpportunity.tokenSymbol);
+            if (Number.isFinite(fiat) && fiat > 0) {
+                return new Decimal(fiat);
+            }
+        }
+        if (toToken) {
+            const tokenRate = getTokenUsdRate(toToken);
+            if (tokenRate.gt(0))
+                return tokenRate;
         }
         return getCachedDestinationUsdRate(toToken) ?? new Decimal(0);
     };
@@ -4356,8 +4853,45 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             : new Decimal(0);
     const depositUsdDisplay = depositUsdDecimal.toDecimalPlaces(2).toFixed();
     const depositTokenDisplay = depositTokenAmountForQuote
-        ?.toDecimalPlaces(toToken?.decimals ?? 18)
+        ?.toDecimalPlaces(getCappedTokenDisplayDecimals(toToken?.decimals), Decimal.ROUND_DOWN)
         .toFixed() ?? "0";
+    const isExactOutMode = activeMode === "deposit" || activeMode === "send";
+    const getActiveTotalBalanceUsd = () => isExactOutMode
+        ? getExactOutTotalSourceBalanceUsd()
+        : getSwapBalanceTotalUsd();
+    const getTotalBalancePercentUsdAmount = (pct) => {
+        const ratio = isExactOutMode && pct === 100
+            ? receiveMaxSafetyMultiplier
+            : new Decimal(pct).div(100);
+        return getActiveTotalBalanceUsd().mul(ratio);
+    };
+    const getExactOutDestinationUsdRate = (token) => {
+        if (activeMode === "deposit") {
+            return getDepositTokenUsdRate();
+        }
+        return getTokenUsdRate(token);
+    };
+    const getExactOutPercentAmountFromBalance = (token, pct, preferUsd) => {
+        const usdAmount = getTotalBalancePercentUsdAmount(pct);
+        if (usdAmount.lte(0))
+            return undefined;
+        if (preferUsd) {
+            return {
+                amount: usdAmount.toDecimalPlaces(2, Decimal.ROUND_DOWN).toFixed(),
+                mode: "usd",
+            };
+        }
+        const rate = getExactOutDestinationUsdRate(token);
+        if (rate.lte(0))
+            return undefined;
+        return {
+            amount: usdAmount
+                .div(rate)
+                .toDecimalPlaces(getCappedTokenDisplayDecimals(token.decimals), Decimal.ROUND_DOWN)
+                .toFixed(),
+            mode: "token",
+        };
+    };
     const depositSourceTargetUsdKey = activeMode === "deposit"
         ? (getDepositSourceTargetUsd()?.toFixed() ?? "")
         : "";
@@ -4394,14 +4928,60 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             ].join(":")
             : "",
     ].join("|");
+    const exactOutAutoSourceInputKey = [
+        activeMode,
+        normalizedQuoteAmountKey,
+        toTokenQuoteKey,
+        quoteRecipientKey.toLowerCase(),
+        activeMode === "deposit"
+            ? [
+                depositAmountMode,
+                depositQuoteAmountKey,
+                selectedOpportunityIdentity,
+                depositSourceTargetUsdKey,
+            ].join(":")
+            : "",
+    ].join("|");
+    activeQuoteInputKeyRef.current = activeQuoteInputKey;
+    useEffect(() => {
+        lastAutoIntentSourceTokensRef.current = [];
+    }, [exactOutAutoSourceInputKey]);
     useEffect(() => {
-        activeQuoteInputKeyRef.current = activeQuoteInputKey;
         setTxError(null);
     }, [activeQuoteInputKey]);
     const hasCurrentQuoteIntent = Boolean(intentData &&
         swapIntentRef.current &&
         swapIntentRef.current.runId === swapRunIdRef.current &&
         swapIntentRef.current.quoteInputKey === activeQuoteInputKey);
+    useEffect(() => {
+        if (swapStep !== "idle")
+            return;
+        if (!hasCurrentQuoteIntent)
+            return;
+        if (sourceSelectionTouched)
+            return;
+        if (activeMode !== "send" &&
+            !(activeMode === "deposit" && swapType === "exactOut")) {
+            return;
+        }
+        const nextTokens = lastIntentSourceTokensRef.current;
+        if (nextTokens.length === 0)
+            return;
+        setFromTokens((current) => {
+            if (getSourceTokenListSyncKey(current) ===
+                getSourceTokenListSyncKey(nextTokens)) {
+                return current;
+            }
+            syncingIntentSourcesRef.current = true;
+            return nextTokens;
+        });
+    }, [
+        activeMode,
+        hasCurrentQuoteIntent,
+        sourceSelectionTouched,
+        swapStep,
+        swapType,
+    ]);
     useEffect(() => {
         if (activeMode !== "deposit")
             return;
@@ -4506,15 +5086,17 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         : activeMode === "send"
             ? Boolean(hasPositiveDecimalInput(amount) && toToken)
             : false;
-    const invalidateExactOutQuoteForRefresh = () => {
+    const invalidateExactOutQuoteForRefresh = (options) => {
         immediateQuoteAfterSourceEditRef.current = true;
-        const receiveIssue = buildReceiveAmountIssue();
+        const receiveIssue = buildReceiveAmountIssue({
+            sourceTokens: options?.sourceTokens,
+        });
         applyReceiveAmountIssue(receiveIssue);
         const configuredIssue = buildConfiguredAmountIssue();
         if (configuredIssue) {
             clearPreviewForBlockingAmountIssue();
         }
-        const sourceBalanceIssue = buildExactOutSourceBalanceIssue();
+        const sourceBalanceIssue = buildExactOutSourceBalanceIssue(options?.sourceTokens);
         if (sourceBalanceIssue) {
             clearPreviewForBlockingAmountIssue();
             setSwapQuoteIssue(sourceBalanceIssue);
@@ -4666,13 +5248,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             });
             const destinationUsdNeedingSources = Decimal.max(destinationUsd.minus(destinationCoverage?.usd ?? new Decimal(0)), new Decimal(0));
             const cachedSourceUsdRatio = parseFiatNumber(baseline?.exactOutSourceUsdPerDestinationUsd);
-            const requiredSourceUsd = destinationUsdNeedingSources.lte(0)
-                ? new Decimal(0)
-                : cachedSourceUsdRatio && cachedSourceUsdRatio.gt(0)
-                    ? destinationUsdNeedingSources.mul(cachedSourceUsdRatio)
-                    : destinationUsdNeedingSources
-                        .mul(BASIS_POINTS + PREDICTIVE_EXACT_OUT_BUFFER_BPS)
-                        .div(BASIS_POINTS);
+            const requiredSourceUsd = getPredictiveExactOutSourceTargetUsd(destinationUsdNeedingSources, cachedSourceUsdRatio);
             const sources = requiredSourceUsd.gt(0)
                 ? await buildPredictiveExactOutSources(requiredSourceUsd)
                 : [];
@@ -4741,49 +5317,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             requiredDestinationTokenAmount.lte(0)) {
             return [];
         }
-        for (const asset of swapBalance ?? []) {
-            for (const breakdown of asset.breakdown ?? []) {
-                const chainId = breakdown.chain?.id;
-                if (chainId !== toToken.chainId)
-                    continue;
-                const breakdownAddress = breakdown.contractAddress;
-                const addressMatches = breakdownAddress &&
-                    toToken.contractAddress &&
-                    (breakdownAddress.toLowerCase() ===
-                        toToken.contractAddress.toLowerCase() ||
-                        (isNativeTokenAddress(breakdownAddress) &&
-                            isNativeTokenAddress(toToken.contractAddress)));
-                const symbolMatches = (breakdown.symbol ?? asset.symbol ?? "").toUpperCase() ===
-                    toToken.symbol.toUpperCase();
-                if (!addressMatches && !symbolMatches)
-                    continue;
-                const balanceAmount = parseFiatNumber(breakdown.balance);
-                if (!balanceAmount || balanceAmount.lte(0))
-                    continue;
-                const chainMeta = CHAIN_METADATA[chainId];
-                const symbol = breakdown.symbol ?? asset.symbol ?? toToken.symbol;
-                const fiatBalance = parseFiatNumber(breakdown.balanceInFiat);
-                if (!fiatBalance || fiatBalance.lt(minimumSourceUsd))
-                    continue;
-                return [
-                    {
-                        chainId,
-                        chainLogo: chainMeta?.logo ?? breakdown.chain?.logo ?? toToken.chainLogo,
-                        chainName: getShortChainName(chainId, chainMeta?.name ?? breakdown.chain?.name ?? toToken.chainName),
-                        contractAddress: breakdown.contractAddress ?? toToken.contractAddress,
-                        decimals: breakdown.decimals ?? asset.decimals ?? toToken.decimals ?? 18,
-                        logo: asset.logo ?? toToken.logo,
-                        name: symbol,
-                        symbol,
-                        balance: `${breakdown.balance} ${symbol}`,
-                        balanceInFiat: fiatBalance !== undefined
-                            ? `$${fiatBalance.toDecimalPlaces(2).toFixed()}`
-                            : "$0.00",
-                    },
-                ];
-            }
-        }
-        return [];
+        const heldDestinationToken = getHeldDestinationTokenOption();
+        return heldDestinationToken ? [heldDestinationToken] : [];
     }, [
         activeMode,
         requiredDestinationTokenAmount?.toFixed(),
@@ -4796,6 +5331,120 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         toToken?.logo,
         toToken?.symbol,
     ]);
+    const setSourcePickerDraftSelection = useCallback((tokens) => {
+        const nextTokens = tokens.map((token) => ({
+            ...token,
+            userAmount: "",
+        }));
+        sourcePickerDraftTokensRef.current = nextTokens;
+        setSourcePickerDraftTokens(nextTokens);
+    }, []);
+    const getAutoExactOutSourceTokensForPicker = useCallback(() => {
+        const autoIntentTokens = lastAutoIntentSourceTokensRef.current;
+        if (autoIntentTokens.length > 0) {
+            return autoIntentTokens;
+        }
+        return sourceSelectionTouched ? [] : fromTokens;
+    }, [fromTokens, sourceSelectionTouched]);
+    const resetSourcePickerDraft = useCallback(() => {
+        sourcePickerDraftTokensRef.current = null;
+        setSourcePickerDraftTokens(null);
+    }, []);
+    const beginSourcePickerEdit = useCallback(() => {
+        if (activeMode !== "deposit" && activeMode !== "send") {
+            resetSourcePickerDraft();
+            return;
+        }
+        sourcePickerDraftDepositFilterRef.current = depositSourceFilter;
+        sourcePickerDraftTouchedRef.current = sourceSelectionTouched;
+        sourcePickerDraftModeRef.current = exactOutQuoteSourceModeRef.current;
+        setSourcePickerDraftSelection(fromTokens);
+    }, [
+        activeMode,
+        depositSourceFilter,
+        fromTokens,
+        resetSourcePickerDraft,
+        setSourcePickerDraftSelection,
+        sourceSelectionTouched,
+    ]);
+    const handleSourcePickerCancel = useCallback(() => {
+        resetSourcePickerDraft();
+        closeDrawerToIdle();
+    }, [closeDrawerToIdle, resetSourcePickerDraft]);
+    const handleSourcePickerDraftSelectionChange = useCallback((tokens) => {
+        if (activeMode !== "deposit" && activeMode !== "send")
+            return;
+        setSourcePickerDraftSelection(tokens);
+        sourcePickerDraftTouchedRef.current = true;
+        sourcePickerDraftModeRef.current = "selected";
+        if (activeMode === "deposit") {
+            sourcePickerDraftDepositFilterRef.current = "custom";
+        }
+    }, [activeMode, setSourcePickerDraftSelection]);
+    const handleSourcePickerFilterTabSelect = useCallback((tab) => {
+        if (activeMode !== "deposit" && activeMode !== "send")
+            return;
+        const nextFilter = tab === "stables" ? "stablecoins" : tab;
+        if (tab === "all") {
+            sourcePickerDraftDepositFilterRef.current = nextFilter;
+            sourcePickerDraftTouchedRef.current = false;
+            sourcePickerDraftModeRef.current = "all";
+            setSourcePickerDraftSelection(getAutoExactOutSourceTokensForPicker());
+            return;
+        }
+        if (activeMode !== "deposit")
+            return;
+        const selection = getResolvedDepositSourceSelection({
+            filter: nextFilter,
+            isManualSelection: false,
+        });
+        const sourcePoolTokens = getDepositSourceTokensForIds(selection.sourcePoolIds);
+        sourcePickerDraftDepositFilterRef.current = nextFilter;
+        sourcePickerDraftTouchedRef.current = false;
+        sourcePickerDraftModeRef.current = "all";
+        setSourcePickerDraftSelection(sourcePoolTokens);
+    }, [
+        activeMode,
+        getAutoExactOutSourceTokensForPicker,
+        getDepositSourceTokensForIds,
+        getResolvedDepositSourceSelection,
+        setSourcePickerDraftSelection,
+    ]);
+    const commitSourcePickerDraft = useCallback((tokens) => {
+        if (activeMode !== "deposit" && activeMode !== "send") {
+            resetSourcePickerDraft();
+            closeDrawerToIdle();
+            return;
+        }
+        const nextTokens = tokens ?? sourcePickerDraftTokensRef.current ?? fromTokens;
+        const normalizedTokens = nextTokens.map((token) => ({
+            ...token,
+            userAmount: "",
+        }));
+        setSourceSelectionTouched(sourcePickerDraftTouchedRef.current);
+        setExactOutQuoteSourceModeValue(sourcePickerDraftModeRef.current);
+        if (activeMode === "deposit") {
+            setDepositSourceFilter(sourcePickerDraftDepositFilterRef.current);
+        }
+        invalidateExactOutQuoteForRefresh({
+            sourceTokens: normalizedTokens,
+        });
+        setSourceSelectionRevision((current) => current + 1);
+        setFromTokens(normalizedTokens);
+        resetSourcePickerDraft();
+        closeDrawerToIdle();
+    }, [
+        activeMode,
+        closeDrawerToIdle,
+        fromTokens,
+        invalidateExactOutQuoteForRefresh,
+        resetSourcePickerDraft,
+        setExactOutQuoteSourceModeValue,
+    ]);
+    const sourcePickerSelectedTokens = (activeMode === "deposit" || activeMode === "send") &&
+        swapStep === "choose-swap-asset"
+        ? (sourcePickerDraftTokens ?? fromTokens)
+        : fromTokens;
     useEffect(() => {
         if (activeMode !== "deposit" && activeMode !== "send")
             return;
@@ -4949,8 +5598,15 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         applyConfiguredPrefillsAfterReset();
         rotateAttempt();
     };
+    const resetSourceSelectionAfterFailure = () => {
+        lastAutoIntentSourceTokensRef.current = [];
+        lastIntentSourceTokensRef.current = [];
+        resetSourcePickerDraft();
+        resetExactOutSourcesToAuto();
+    };
     const handleFailureBack = () => {
         clearPendingSwapIntent();
+        resetSourceSelectionAfterFailure();
         setTxError(null);
         void refreshSelectedSourceBalances();
         setSwapStep("idle");
@@ -4959,7 +5615,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         currentSwapStartedAtRef.current = 0;
         rotateAttempt();
     };
-    const resetInputsAfterSuccessfulExecution = () => {
+    const clearTerminalInputState = () => {
         setAmount("");
         setRecipientAddress("");
         setTxError(null);
@@ -4971,6 +5627,9 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         setSourceSelectionTouched(false);
         setDepositSourceFilter("all");
         setDepositAmountMode("token");
+    };
+    const resetInputsAfterSuccessfulExecution = () => {
+        clearTerminalInputState();
         if (activeMode === "deposit") {
             setSelectedOpportunity(configuredDeposit);
             setToToken(configuredDeposit
@@ -4981,6 +5640,17 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             setToToken(undefined);
         }
     };
+    const handleTerminalReceiptDone = () => {
+        clearPendingSwapIntent();
+        clearTerminalInputState();
+        void refreshSelectedSourceBalances();
+        setSwapStep("idle");
+        setCurrentSwapId(null);
+        currentSwapIdRef.current = null;
+        currentSwapStartedAtRef.current = 0;
+        amountEnteredLastValueRef.current = "";
+        rotateAttempt();
+    };
     const handleModalOpenChange = useCallback((open) => {
         if (!open && swapStepRef.current === "progress")
             return;
@@ -5031,33 +5701,14 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                     throw new Error("No wallet connector available.");
                 }
                 await connectAsync({ connector: nextConnector });
-                activeConnector = nextConnector;
+                return;
             }
-            const connectorProvider = await activeConnector
-                ?.getProvider()
-                .catch(() => undefined);
-            const connectorClientProvider = connectorClient
-                ? {
-                    request: (args) => connectorClient.request(args),
-                }
-                : undefined;
-            const walletClientProvider = walletClient
-                ? {
-                    request: (args) => walletClient.request(args),
-                }
-                : undefined;
-            const windowProvider = typeof window !== "undefined"
-                ? window.ethereum
-                : undefined;
-            const effectiveProvider = connectorProvider &&
-                typeof connectorProvider.request === "function"
-                ? connectorProvider
-                : (connectorClientProvider ?? walletClientProvider ?? windowProvider);
+            const effectiveProvider = await getEffectiveWalletProvider(activeConnector);
             if (!effectiveProvider ||
                 typeof effectiveProvider.request !== "function") {
                 throw new Error("Wallet provider is not ready yet.");
             }
-            await handleInit(effectiveProvider);
+            await handleInit(effectiveProvider, ownerAddress);
         }
         catch (error) {
             setTxError(error?.message || "Unable to connect wallet.");
@@ -5267,6 +5918,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             const rawStepType = String(event?.stepType ?? step?.type ?? step?.typeID ?? "").toLowerCase();
             const rawState = String(event?.state ?? "").toLowerCase();
             const explorerUrl = getPlanStepExplorerUrl(event, step);
+            const sourceMovementStep = isSourceMovementProgressStep(type, rawStepType);
+            const hasSourceMovementTransaction = Boolean(explorerUrl || getPlanStepTransactionHash(event, step));
             const intentExplorerUrl = getEventIntentExplorerUrl(appConfig.nexusNetwork, event, step);
             patchCurrentIntentExplorerUrl(intentExplorerUrl);
             if (type === "TRANSACTION_SENT" ||
@@ -5280,12 +5933,9 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                 type === "SWAP_SKIPPED") {
                 markSwapExecutionStarted();
             }
-            if (PLAN_STEP_FUNDS_MOVED_STATES.has(rawState) &&
-                (rawStepType === "source_swap" ||
-                    rawStepType === "eoa_to_ephemeral_transfer" ||
-                    rawStepType === "bridge_deposit" ||
-                    type.includes("SOURCE_SWAP") ||
-                    type === "BRIDGE_DEPOSIT")) {
+            if (sourceMovementStep &&
+                hasSourceMovementTransaction &&
+                PLAN_STEP_FUNDS_MAY_HAVE_MOVED_STATES.has(rawState)) {
                 fundsMovedRef.current = true;
             }
             if (explorerUrl) {
@@ -5296,11 +5946,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                     type === "TRANSACTION_CONFIRMED") {
                     mergeExplorerUrls({ destinationExplorerUrl: explorerUrl });
                 }
-                else if (rawStepType === "source_swap" ||
-                    rawStepType === "eoa_to_ephemeral_transfer" ||
-                    rawStepType === "bridge_deposit" ||
-                    type.includes("SOURCE_SWAP") ||
-                    type === "BRIDGE_DEPOSIT") {
+                else if (sourceMovementStep) {
                     mergeExplorerUrls({ sourceExplorerUrl: explorerUrl });
                 }
                 if (!intentUrlRef.current &&
@@ -5512,6 +6158,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                             quoteInputKey,
                             runId,
                         });
+                        startIntentFetchTiming({
+                            background,
+                            operation: "swapWithExactIn",
+                            quoteInputKey,
+                            runId,
+                        });
                         const result = await nexusSDK.swapWithExactIn(exactInSwapPayload, {
                             hooks: {
                                 onIntent: (data) => handleSwapIntentCallback(data, runId, quoteInputKey),
@@ -5540,6 +6192,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                         quoteInputKey,
                         runId,
                     });
+                    startIntentFetchTiming({
+                        background,
+                        operation: "swapWithExactIn",
+                        quoteInputKey,
+                        runId,
+                    });
                     const result = await nexusSDK.swapWithExactIn(exactInSwapPayload, {
                         hooks: {
                             onIntent: (data) => handleSwapIntentCallback(data, runId, quoteInputKey),
@@ -5604,12 +6262,15 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                 if (activeMode === "deposit" && selectedOpportunity) {
                     const user = (ownerAddress ?? connectedAddress);
                     const executeParams = selectedOpportunity.executeDeposit(selectedOpportunity.tokenSymbol, selectedOpportunity.tokenAddress, amountBigInt, selectedOpportunity.chainId, user);
+                    if (!isPositiveGasLimit(executeParams.gas)) {
+                        throw new Error("Deposit config executeDeposit must return a positive gas limit.");
+                    }
                     executeConfig = {
                         to: executeParams.to,
                         value: executeParams.value,
                         data: executeParams.data,
                         tokenApproval: executeParams.tokenApproval,
-                        gas: executeParams.gas ?? BigInt(400_000),
+                        gas: executeParams.gas,
                     };
                 }
                 else if ((activeMode === "send" || hasCustomSwapRecipient) &&
@@ -5654,6 +6315,14 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                         quoteInputKey,
                         runId,
                     });
+                    startIntentFetchTiming({
+                        background,
+                        operation: isTransferExactOut
+                            ? "swapAndTransfer exactOut"
+                            : "swapAndExecute exactOut",
+                        quoteInputKey,
+                        runId,
+                    });
                     const result = isTransferExactOut
                         ? await sdkWithOptionalTransfer.swapAndTransfer(exactOutOperationInput, {
                             onEvent,
@@ -5704,6 +6373,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                         quoteInputKey,
                         runId,
                     });
+                    startIntentFetchTiming({
+                        background,
+                        operation: "swapWithExactOut",
+                        quoteInputKey,
+                        runId,
+                    });
                     const result = await nexusSDK.swapWithExactOut(exactOutSwapInput, {
                         hooks: {
                             onIntent: (data) => handleSwapIntentCallback(data, runId, quoteInputKey),
@@ -5758,6 +6433,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             if (swapRunIdRef.current !== runId || !isCurrentQuoteInput()) {
                 return;
             }
+            finishIntentFetchTiming(runId, "failed");
             if (activeMode === "deposit" && err?.code !== "USER_DENIED_INTENT") {
                 const hasActiveExecution = swapStepRef.current === "progress" &&
                     Boolean(currentSwapIdRef.current);
@@ -5779,19 +6455,26 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                             ? "no_eligible_sources"
                             : !hasActiveExecution
                                 ? "quote_failed"
-                                : "execution_failed";
+                                : fundsMovedRef.current
+                                    ? "pending_after_funds_moved"
+                                    : "execution_failed";
                 reachedTerminalRef.current = true;
                 if (fundsMovedRef.current) {
-                    trackDeposit("deposit_partial_movement_detected", {
+                    trackDeposit("deposit_pending_after_funds_moved", {
+                        errorCode: err?.code ?? "UNKNOWN",
+                        errorMessage: errMessage || "Transaction pending.",
                         intentUrl: intentUrlRef.current,
+                        failedAtStep,
+                    });
+                }
+                else {
+                    trackDeposit("deposit_failed", {
+                        errorCode: err?.code ?? "UNKNOWN",
+                        errorCategory,
+                        errorMessage: errMessage || "Transaction failed.",
+                        failedAtStep,
                     });
                 }
-                trackDeposit("deposit_failed", {
-                    errorCode: err?.code ?? "UNKNOWN",
-                    errorCategory,
-                    errorMessage: errMessage || "Transaction failed.",
-                    failedAtStep,
-                });
             }
             setQuoteRefreshing(false);
             setIntentLoading(false);
@@ -5879,6 +6562,13 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                 setTxError(null);
                 return;
             }
+            if (hasActiveExecution && fundsMovedRef.current) {
+                showTimeoutReceipt(errorMessage, {
+                    failureDescription: "Funds have already moved and the transaction is still pending. Check the intent explorer for the latest status.",
+                });
+                setTxError(null);
+                return;
+            }
             if (hasActiveExecution) {
                 showFailedProgressThenReceipt(errorMessage);
             }
@@ -5896,7 +6586,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return;
         if (syncingIntentSourcesRef.current) {
             syncingIntentSourcesRef.current = false;
-            return;
+            if (hasCurrentQuoteIntent) {
+                setIntentLoading(false);
+                setQuoteRefreshing(false);
+                setReceiveMaxCalculating(false);
+                return;
+            }
         }
         if (hasReceiveAmountQuoteIssue) {
             clearPendingSwapIntent(true);
@@ -5926,10 +6621,11 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         clearPendingSwapIntent(true, { keepQuoteRefreshing: true });
         setQuoteRefreshing(true);
         let quoteStarted = false;
+        const quoteDelay = getQuoteRequestDelay();
         const timer = window.setTimeout(() => {
             quoteStarted = true;
             void handleEnterPreview({ background: true });
-        }, EXACT_OUT_INPUT_DEBOUNCE_MS);
+        }, quoteDelay);
         return () => {
             window.clearTimeout(timer);
             if (syncingIntentSourcesRef.current)
@@ -5947,6 +6643,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         hasCurrentQuoteIntent,
         hasInsufficientSourcesQuoteIssue,
         hasReceiveAmountQuoteIssue,
+        getQuoteRequestDelay,
         nexusSDK,
         recipientAddress,
         swapStep,
@@ -5957,7 +6654,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return;
         if (syncingIntentSourcesRef.current) {
             syncingIntentSourcesRef.current = false;
-            return;
+            if (hasCurrentQuoteIntent) {
+                setIntentLoading(false);
+                setQuoteRefreshing(false);
+                setReceiveMaxCalculating(false);
+                return;
+            }
         }
         if (hasReceiveAmountQuoteIssue) {
             clearPendingSwapIntent(true);
@@ -5990,10 +6692,11 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         clearPendingSwapIntent(true, { keepQuoteRefreshing: true });
         setQuoteRefreshing(true);
         let quoteStarted = false;
+        const quoteDelay = getQuoteRequestDelay();
         const timer = window.setTimeout(() => {
             quoteStarted = true;
             void handleEnterPreview({ background: true });
-        }, EXACT_OUT_INPUT_DEBOUNCE_MS);
+        }, quoteDelay);
         return () => {
             window.clearTimeout(timer);
             if (syncingIntentSourcesRef.current)
@@ -6011,6 +6714,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         hasCurrentQuoteIntent,
         hasInsufficientSourcesQuoteIssue,
         hasReceiveAmountQuoteIssue,
+        getQuoteRequestDelay,
         nexusSDK,
         sourceSelectionRevision,
         selectedOpportunityIdentity,
@@ -6022,7 +6726,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return;
         if (syncingIntentSourcesRef.current) {
             syncingIntentSourcesRef.current = false;
-            return;
+            if (hasCurrentQuoteIntent) {
+                setIntentLoading(false);
+                setQuoteRefreshing(false);
+                setReceiveMaxCalculating(false);
+                return;
+            }
         }
         if (hasReceiveAmountQuoteIssue) {
             clearPendingSwapIntent(true);
@@ -6052,10 +6761,11 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         clearPendingSwapIntent(true, { keepQuoteRefreshing: true });
         setQuoteRefreshing(true);
         let quoteStarted = false;
+        const quoteDelay = getQuoteRequestDelay();
         const timer = window.setTimeout(() => {
             quoteStarted = true;
             void handleEnterPreview({ background: true });
-        }, EXACT_OUT_INPUT_DEBOUNCE_MS);
+        }, quoteDelay);
         return () => {
             window.clearTimeout(timer);
             if (syncingIntentSourcesRef.current)
@@ -6071,6 +6781,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         hasCurrentQuoteIntent,
         hasInsufficientSourcesQuoteIssue,
         hasReceiveAmountQuoteIssue,
+        getQuoteRequestDelay,
         nexusSDK,
         sourceSelectionRevision,
         swapStep,
@@ -6102,6 +6813,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         try {
             const updatedRaw = await activeIntent.refresh();
             const updatedBridgeProvider = normalizeBridgeProvider(updatedRaw?.bridgeProvider ??
+                updatedRaw?.normalizedIntent?.bridgeProvider ??
                 updatedRaw?.swap?.bridgeProvider ??
                 activeIntent.intent?.bridgeProvider);
             const updated = normalizeRenderableSwapIntentData(updatedRaw, updatedBridgeProvider);
@@ -6330,7 +7042,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return;
         }
         if (swapStep === "choose-swap-asset") {
-            closeDrawerToIdle();
+            handleSourcePickerCancel();
             return;
         }
         if (swapStep === "choose-receive-asset") {
@@ -6472,7 +7184,9 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         if (parsedAmount.gt(0) && rate.gt(0)) {
             const converted = depositAmountMode === "token"
                 ? parsedAmount.mul(rate).toDecimalPlaces(2)
-                : parsedAmount.div(rate).toDecimalPlaces(toToken?.decimals ?? 18);
+                : parsedAmount
+                    .div(rate)
+                    .toDecimalPlaces(getCappedTokenDisplayDecimals(toToken?.decimals), Decimal.ROUND_DOWN);
             setAmount(converted.toFixed());
         }
         clearPendingSwapIntent();
@@ -6498,87 +7212,33 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                             ? "percent_75"
                             : "percent_max";
         if (pct !== 100) {
-            const usdAmount = getTotalBalancePercentUsdAmount(pct);
-            const shouldUseMaxQuoteFallback = depositAmountMode === "usd" && getDepositTokenUsdRate().lte(0);
-            const nextAmount = depositAmountMode === "usd"
-                ? usdAmount.toDecimalPlaces(2, Decimal.ROUND_DOWN).toFixed()
-                : formatTokenAmountFromUsd(usdAmount, toToken);
-            if (nextAmount && !shouldUseMaxQuoteFallback) {
+            const nextAmount = getExactOutPercentAmountFromBalance(toToken, pct, depositAmountMode === "usd");
+            if (nextAmount) {
                 setQuoteRefreshing(false);
                 setReceiveMaxCalculating(false);
                 setMaxCalculationPercent(null);
-                handleDepositAmountChange(nextAmount);
+                setDepositAmountMode(nextAmount.mode);
+                handleDepositAmountChange(nextAmount.amount);
                 return;
             }
             setQuoteRefreshing(false);
-            setReceiveMaxCalculating(true);
-            setMaxCalculationPercent(pct);
-            try {
-                await waitForNextPaint();
-                const fallback = await getPercentAmountFromMaxQuote(toToken, pct, depositAmountMode === "usd");
-                if (runId !== maxPercentRunRef.current)
-                    return;
-                if (!fallback) {
-                    setQuoteRefreshing(false);
-                    setReceiveMaxCalculating(false);
-                    setMaxCalculationPercent(null);
-                    setTxError("Unable to calculate this percentage for the deposit asset.");
-                    return;
-                }
-                setDepositAmountMode(fallback.mode);
-                setReceiveMaxCalculating(false);
-                setMaxCalculationPercent(null);
-                handleDepositAmountChange(fallback.amount);
-            }
-            catch (error) {
-                if (runId !== maxPercentRunRef.current)
-                    return;
-                console.error("Unable to calculate percentage deposit amount", error);
-                setReceiveMaxCalculating(false);
-                setMaxCalculationPercent(null);
-                setQuoteRefreshing(false);
-                if (isInsufficientSourcesError(error)) {
-                    setSwapQuoteIssue(buildInsufficientSourcesIssue(error));
-                    return;
-                }
-                setTxError(error?.message ||
-                    "Unable to calculate this percentage for the deposit asset.");
-            }
-            return;
-        }
-        setQuoteRefreshing(false);
-        setReceiveMaxCalculating(true);
-        setMaxCalculationPercent(100);
-        try {
-            await waitForNextPaint();
-            const maxAmount = await getPercentAmountFromMaxQuote(toToken, 100, depositAmountMode === "usd");
-            if (runId !== maxPercentRunRef.current)
-                return;
-            if (!maxAmount) {
-                setReceiveMaxCalculating(false);
-                setMaxCalculationPercent(null);
-                setQuoteRefreshing(false);
-                setTxError("No depositable amount is available for this deposit.");
-                return;
-            }
-            setDepositAmountMode(maxAmount.mode);
             setReceiveMaxCalculating(false);
             setMaxCalculationPercent(null);
-            handleDepositAmountChange(maxAmount.amount);
+            setTxError("Unable to calculate this percentage for the deposit asset.");
+            return;
         }
-        catch (error) {
-            if (runId !== maxPercentRunRef.current)
-                return;
-            console.error("Unable to calculate max deposit amount", error);
-            setReceiveMaxCalculating(false);
-            setMaxCalculationPercent(null);
-            setQuoteRefreshing(false);
-            if (isInsufficientSourcesError(error)) {
-                setSwapQuoteIssue(buildInsufficientSourcesIssue(error));
-                return;
-            }
-            setTxError(error?.message || "Unable to calculate the max deposit amount.");
+        setQuoteRefreshing(false);
+        setReceiveMaxCalculating(false);
+        setMaxCalculationPercent(null);
+        const maxAmount = getExactOutPercentAmountFromBalance(toToken, 100, depositAmountMode === "usd");
+        if (runId !== maxPercentRunRef.current)
+            return;
+        if (!maxAmount) {
+            setTxError("No depositable amount is available for this deposit.");
+            return;
         }
+        setDepositAmountMode(maxAmount.mode);
+        handleDepositAmountChange(maxAmount.amount);
     };
     const handleSendPercentSelect = async (pct) => {
         if (isConfiguredAmountFixed)
@@ -6600,82 +7260,31 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                             ? "percent_75"
                             : "percent_max";
         if (pct !== 100) {
-            const usdAmount = getTotalBalancePercentUsdAmount(pct);
-            const nextAmount = formatTokenAmountFromUsd(usdAmount, toToken);
+            const nextAmount = getExactOutPercentAmountFromBalance(toToken, pct, false);
             if (nextAmount) {
                 setQuoteRefreshing(false);
                 setReceiveMaxCalculating(false);
                 setMaxCalculationPercent(null);
-                handleSendAmountChange(nextAmount);
+                handleSendAmountChange(nextAmount.amount);
                 return;
             }
             setQuoteRefreshing(false);
-            setReceiveMaxCalculating(true);
-            setMaxCalculationPercent(pct);
-            try {
-                await waitForNextPaint();
-                const fallback = await getPercentAmountFromMaxQuote(toToken, pct, false);
-                if (runId !== maxPercentRunRef.current)
-                    return;
-                if (!fallback) {
-                    setQuoteRefreshing(false);
-                    setReceiveMaxCalculating(false);
-                    setMaxCalculationPercent(null);
-                    setTxError("Unable to calculate this percentage for the send asset.");
-                    return;
-                }
-                setReceiveMaxCalculating(false);
-                setMaxCalculationPercent(null);
-                handleSendAmountChange(fallback.amount);
-            }
-            catch (error) {
-                if (runId !== maxPercentRunRef.current)
-                    return;
-                console.error("Unable to calculate percentage send amount", error);
-                setReceiveMaxCalculating(false);
-                setMaxCalculationPercent(null);
-                setQuoteRefreshing(false);
-                if (isInsufficientSourcesError(error)) {
-                    setSwapQuoteIssue(buildInsufficientSourcesIssue(error));
-                    return;
-                }
-                setTxError(error?.message ||
-                    "Unable to calculate this percentage for the send asset.");
-            }
-            return;
-        }
-        setQuoteRefreshing(false);
-        setReceiveMaxCalculating(true);
-        setMaxCalculationPercent(100);
-        try {
-            await waitForNextPaint();
-            const maxAmount = await getPercentAmountFromMaxQuote(toToken, 100, false);
-            if (runId !== maxPercentRunRef.current)
-                return;
-            if (!maxAmount) {
-                setReceiveMaxCalculating(false);
-                setMaxCalculationPercent(null);
-                setQuoteRefreshing(false);
-                setTxError("No transferable amount is available for this asset.");
-                return;
-            }
             setReceiveMaxCalculating(false);
             setMaxCalculationPercent(null);
-            handleSendAmountChange(maxAmount.amount);
+            setTxError("Unable to calculate this percentage for the send asset.");
+            return;
         }
-        catch (error) {
-            if (runId !== maxPercentRunRef.current)
-                return;
-            console.error("Unable to calculate max send amount", error);
-            setReceiveMaxCalculating(false);
-            setMaxCalculationPercent(null);
-            setQuoteRefreshing(false);
-            if (isInsufficientSourcesError(error)) {
-                setSwapQuoteIssue(buildInsufficientSourcesIssue(error));
-                return;
-            }
-            setTxError(error?.message || "Unable to calculate the max send amount.");
+        setQuoteRefreshing(false);
+        setReceiveMaxCalculating(false);
+        setMaxCalculationPercent(null);
+        const maxAmount = getExactOutPercentAmountFromBalance(toToken, 100, false);
+        if (runId !== maxPercentRunRef.current)
+            return;
+        if (!maxAmount) {
+            setTxError("No transferable amount is available for this asset.");
+            return;
         }
+        handleSendAmountChange(maxAmount.amount);
     };
     // ---------------------------------------------------------------------------
     // Render
@@ -6706,6 +7315,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const hasPositiveRootAmount = hasPositiveDecimalInput(amount);
     const hasReadySwapQuoteInput = hasReadyExactInSwapInput(fromTokens, toToken);
     const needsWalletConnection = !ownerAddress || !nexusSDK;
+    const isExactOutPaymentQuotePending = isExactOutPaymentFlow && (quoteRefreshing || intentLoading);
     const walletConnectBusy = walletActionPending ||
         nexusLoading ||
         isWalletConnectPending ||
@@ -6727,10 +7337,9 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         : !hasPositiveRootAmount ||
             !toToken ||
             receiveMaxCalculating ||
+            isExactOutPaymentQuotePending ||
             (!hasCurrentExactOutPaymentIntent &&
-                (quoteRefreshing ||
-                    intentLoading ||
-                    isQuoteUnavailableForAutoSourceFlow)) ||
+                isQuoteUnavailableForAutoSourceFlow) ||
             Boolean(blockingQuoteIssue);
     const sendNeedsRecipient = activeMode === "send" && !recipientAddress;
     const isSendCtaDisabled = needsWalletConnection
@@ -6740,10 +7349,9 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             hasSameOwnerSendRecipient ||
             receiveMaxCalculating ||
             (!sendNeedsRecipient &&
-                !hasCurrentExactOutPaymentIntent &&
-                (quoteRefreshing ||
-                    intentLoading ||
-                    isQuoteUnavailableForAutoSourceFlow)) ||
+                (isExactOutPaymentQuotePending ||
+                    (!hasCurrentExactOutPaymentIntent &&
+                        isQuoteUnavailableForAutoSourceFlow))) ||
             Boolean(blockingQuoteIssue);
     const quoteCtaLabel = (fallback) => {
         if (needsWalletConnection)
@@ -6756,7 +7364,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             return configuredAmountIssue.ctaLabel;
         if (receiveMaxCalculating)
             return "Calculating...";
-        if (!hasCurrentExactOutPaymentIntent && (quoteRefreshing || intentLoading)) {
+        if (isExactOutPaymentQuotePending ||
+            (!hasCurrentExactOutPaymentIntent && (quoteRefreshing || intentLoading))) {
             return "Fetching quotes...";
         }
         if (isQuoteUnavailableForAutoSourceFlow)
@@ -6822,6 +7431,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
     const previewToAmountUsd = previewDestinationUsdNumber && previewDestinationUsdNumber.gt(0)
         ? previewDestinationUsdNumber.toDecimalPlaces(6).toFixed()
         : undefined;
+    const previewDestinationGasFeeUsd = (() => {
+        const value = getIntentDestinationGasUsdValue(intentData);
+        return value && value.gt(0)
+            ? value.toDecimalPlaces(6, Decimal.ROUND_DOWN).toFixed()
+            : undefined;
+    })();
     const predictiveExactInQuote = predictiveQuote?.mode === "exactIn" &&
         predictiveQuote.key === getPredictiveQuoteCacheKey("swap", "exactIn")
         ? predictiveQuote
@@ -6830,13 +7445,20 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         predictiveQuote.key === getPredictiveQuoteCacheKey(activeMode, "exactOut")
         ? predictiveQuote
         : null;
+    const shouldUseCurrentExactOutIntentSources = isExactOutPaymentFlow && hasCurrentQuoteIntent && hasIntentSources;
+    const currentExactOutIntentSourceTokens = shouldUseCurrentExactOutIntentSources
+        ? sortSwapTokensByUsdDesc((intentData?.sources ?? [])
+            .map(buildIntentSourceToken)
+            .filter(hasPositiveSourceSpend))
+        : [];
     const resolvedToToken = toToken ??
         (activeMode === "deposit" && selectedOpportunity
             ? toTokenFromOpportunity(selectedOpportunity)
             : undefined);
-    const toTokenWithFetchedBalance = resolvedToToken && destinationBalance
-        ? { ...resolvedToToken, balance: destinationBalance }
-        : resolvedToToken;
+    const enrichedResolvedToToken = enrichTokenOptionLogo(resolvedToToken);
+    const toTokenWithFetchedBalance = enrichedResolvedToToken && destinationBalance
+        ? { ...enrichedResolvedToToken, balance: destinationBalance }
+        : enrichedResolvedToToken;
     const idleReceiveQuoteAmount = activeMode === "swap" && swapType === "exactIn"
         ? (intentToAmount ?? predictiveExactInQuote?.toAmount)
         : undefined;
@@ -6861,14 +7483,18 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         Boolean(predictiveExactOutQuote &&
             ((predictiveExactOutQuote.sources?.length ?? 0) > 0 ||
                 destinationBalanceDisplayToken));
-    const baseDisplayFromTokens = shouldShowPredictiveExactOutDisplay
-        ? (predictiveExactOutQuote?.sources ?? fromTokens)
-        : fromTokens;
+    const baseDisplayFromTokens = shouldUseCurrentExactOutIntentSources
+        ? currentExactOutIntentSourceTokens
+        : shouldShowPredictiveExactOutDisplay
+            ? (predictiveExactOutQuote?.sources ?? fromTokens)
+            : fromTokens;
     const displayFromTokens = (() => {
-        if (!destinationBalanceDisplayToken ||
-            (activeMode !== "deposit" && activeMode !== "send")) {
+        if (activeMode !== "deposit" && activeMode !== "send") {
             return baseDisplayFromTokens;
         }
+        if (!destinationBalanceDisplayToken) {
+            return mergeDisplaySourceTokens(sortDisplaySourcesByBalanceUsdDesc(baseDisplayFromTokens));
+        }
         const destinationKey = getTokenSelectionKey(destinationBalanceDisplayToken);
         let replacedEmptyDestinationToken = false;
         const tokens = baseDisplayFromTokens.map((token) => {
@@ -6881,21 +7507,124 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             }
             return token;
         });
-        return replacedEmptyDestinationToken
+        const displayTokens = replacedEmptyDestinationToken
             ? tokens
             : [...tokens, destinationBalanceDisplayToken];
+        return mergeDisplaySourceTokens(sortDisplaySourcesByBalanceUsdDesc(displayTokens));
     })();
     const displayExactOutRouteLoading = isExactOutRouteLoading && !shouldShowPredictiveExactOutDisplay;
-    const totalSwapBalanceUsd = getSwapBalanceTotalUsd()
+    const isSourcePickerRefreshDisabled = quoteRefreshing || intentLoading || previewQuoteRefreshing;
+    const isIntentSourceUiActionable = activeMode === "deposit"
+        ? !isDepositCtaDisabled
+        : activeMode === "send"
+            ? !isSendCtaDisabled
+            : !isSwapCtaDisabled;
+    useEffect(() => {
+        if (!intentFetchTiming?.endTimeMs) {
+            return;
+        }
+        if (latestIntentFetchRunIdRef.current !== intentFetchTiming.runId) {
+            return;
+        }
+        if (intentUiRenderLoggedRunIdRef.current === intentFetchTiming.runId) {
+            return;
+        }
+        const hasRenderedSources = displayFromTokens.length > 0 ||
+            hasIntentSources ||
+            Boolean(intentData?.destination);
+        if (!hasRenderedSources)
+            return;
+        if (isSwapBalancePending ||
+            isSourcePickerRefreshDisabled ||
+            quoteRefreshing ||
+            intentLoading ||
+            previewQuoteRefreshing ||
+            receiveMaxCalculating ||
+            displayExactOutRouteLoading ||
+            !isIntentSourceUiActionable) {
+            return;
+        }
+        const renderTimeMs = Date.now();
+        const renderDurationMs = renderTimeMs - intentFetchTiming.startTimeMs;
+        const fetchDurationMs = intentFetchTiming.fetchDurationMs ??
+            intentFetchTiming.endTimeMs - intentFetchTiming.startTimeMs;
+        const differenceMs = renderDurationMs - fetchDurationMs;
+        console.log("[NexusWidget] intent sources UI render complete", {
+            runId: intentFetchTiming.runId,
+            walletAddress: intentFetchTiming.walletAddress,
+            operation: intentFetchTiming.operation,
+            quoteInputKey: intentFetchTiming.quoteInputKey,
+            sourceCount: displayFromTokens.length,
+            dateNow: renderTimeMs,
+            date: new Date(renderTimeMs),
+            totalRenderTimeSeconds: renderDurationMs / 1000,
+            elapsedMs: renderDurationMs,
+        });
+        console.log("[NexusWidget] intent render/fetch difference", {
+            runId: intentFetchTiming.runId,
+            walletAddress: intentFetchTiming.walletAddress,
+            operation: intentFetchTiming.operation,
+            quoteInputKey: intentFetchTiming.quoteInputKey,
+            differenceMs,
+            dateNow: renderTimeMs,
+            date: new Date(renderTimeMs),
+        });
+        intentUiRenderLoggedRunIdRef.current = intentFetchTiming.runId;
+    }, [
+        displayExactOutRouteLoading,
+        displayFromTokens.length,
+        hasIntentSources,
+        intentLoading,
+        intentData?.destination,
+        intentFetchTiming,
+        isDepositCtaDisabled,
+        isIntentSourceUiActionable,
+        isSendCtaDisabled,
+        isSourcePickerRefreshDisabled,
+        isSwapCtaDisabled,
+        isSwapBalancePending,
+        previewQuoteRefreshing,
+        quoteRefreshing,
+        receiveMaxCalculating,
+    ]);
+    const totalSwapBalanceUsd = getActiveTotalBalanceUsd()
         .toDecimalPlaces(2)
         .toFixed();
-    const sendAmountUsd = amount && toToken
+    const requestedOutputUsd = amount && toToken
         ? getTokenUsdValue({
             ...toToken,
             userAmount: amount,
             userAmountMode: "token",
-        }, amount).toNumber()
-        : 0;
+        }, amount)
+        : new Decimal(0);
+    const sendAmountUsd = requestedOutputUsd.toNumber();
+    const exactOutRequiredUsdAmount = (() => {
+        if (activeMode !== "deposit" && activeMode !== "send")
+            return undefined;
+        const issueMissingUsd = parseFiatNumber(insufficientSourceIssue?.missingUsd);
+        if (issueMissingUsd && issueMissingUsd.gt(0)) {
+            return getExactOutAvailableSourceUsd().plus(issueMissingUsd);
+        }
+        const requiredFundingUsd = getExactOutRequiredFundingUsd();
+        if (requiredFundingUsd?.gt(0))
+            return requiredFundingUsd;
+        if (requestedOutputUsd.gt(0))
+            return requestedOutputUsd;
+        return undefined;
+    })();
+    const exactOutRequiredUsdDisplay = exactOutRequiredUsdAmount
+        ?.toDecimalPlaces(2)
+        .toFixed();
+    const assetSelectorRequiredUsdDisplay = (activeMode === "deposit" || activeMode === "send") &&
+        (swapStep === "choose-swap-asset" ||
+            closingDrawerStep === "choose-swap-asset")
+        ? (sourceSelectionRequiredUsdDisplay ?? exactOutRequiredUsdDisplay)
+        : exactOutRequiredUsdDisplay;
+    const captureSourceSelectionRequiredUsd = () => {
+        if (activeMode !== "deposit" && activeMode !== "send")
+            return;
+        setSourceSelectionRequiredUsdDisplay(exactOutRequiredUsdDisplay);
+    };
     const isIdleSwapQuoteLoading = activeMode === "swap" &&
         swapStep === "idle" &&
         (quoteRefreshing || intentLoading);
@@ -6939,6 +7668,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
         swapStep === "choose-receive-asset" ||
         swapStep === "enter-recipient" ||
         closingDrawerStep !== null;
+    const isPreviewIntentScreen = swapStep === "preview-intent";
     const displayedRootContentHeight = hasMeasuredRootContent && rootContentHeight
         ? Math.max(rootContentHeight, tokenAssetDrawerMinRootContentHeight)
         : null;
@@ -6976,8 +7706,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
             lineHeight: "17px",
             margin: "auto",
             overflowX: "hidden",
-            overflowY: isDrawerOverlayActive ? "hidden" : "auto",
-            overscrollBehavior: isDrawerOverlayActive ? "contain" : "auto",
+            overflowY: isDrawerOverlayActive || isPreviewIntentScreen ? "hidden" : "auto",
+            overscrollBehavior: isDrawerOverlayActive || isPreviewIntentScreen ? "contain" : "auto",
             padding: "16px",
             scrollbarColor: `${theme.colors.textEmpty} transparent`,
             scrollbarWidth: "thin",
@@ -7086,7 +7816,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                 swapStep !== "choose-swap-asset" &&
                                 swapStep !== "choose-receive-asset" &&
                                 swapStep !== "enter-recipient" && (_jsxs(_Fragment, { children: [swapStep === "preview-intent" && (_jsx("div", { className: "w-full", style: {
-                                            maxHeight: "calc(90dvh - 66px)",
+                                            maxHeight: "calc(90dvh - 92px)",
                                             minHeight: 0,
                                             overflowX: "hidden",
                                             overflowY: isPreviewTransitioning ? "hidden" : "auto",
@@ -7094,7 +7824,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                             scrollbarColor: "#C8C8C7 transparent",
                                             scrollbarWidth: "thin",
                                             width: "100%",
-                                        }, children: _jsx(SwapIntentPreview, { activeMode: activeMode, estimatedTime: "10s", explorerUrls: explorerUrls, fromAmount: amount, fromAmountUsd: previewFromAmountUsd, fromToken: fromTokens[0], fromTokens: fromTokens, intentData: intentData, isLoading: intentLoading, isRefreshing: previewQuoteRefreshing, mode: activeMode, onAccept: handleSwapAccept, onReject: () => {
+                                        }, children: _jsx(SwapIntentPreview, { activeMode: activeMode, destinationGasFeeUsd: previewDestinationGasFeeUsd, estimatedTime: "10s", explorerUrls: explorerUrls, fromAmount: amount, fromAmountUsd: previewFromAmountUsd, fromToken: fromTokens[0], fromTokens: fromTokens, intentData: intentData, isLoading: intentLoading, isRefreshing: previewQuoteRefreshing, mode: activeMode, onAccept: handleSwapAccept, onReject: () => {
                                                 clearPendingSwapIntent();
                                                 setSwapStep("idle");
                                             }, onTransitionChange: setIsPreviewTransitioning, opportunity: selectedOpportunity, recipientAddress: transferRecipientAddress, steps: steps, supportedTokenAssets: supportedChainsAndTokens, swapBalances: swapBalance, swapType: swapType, toAmount: previewDestinationAmount, toAmountTokens: previewDestinationAmount
@@ -7102,13 +7832,13 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                                 : undefined, toAmountUsd: previewToAmountUsd, toToken: toTokenWithFetchedBalance, totalFeeUsd: intentFeeUsd }) })), swapStep === "progress" && (_jsx(NexusWidgetProgressScreen, { failedStep: failedProgressStep, fromAmountUsd: previewFromAmountUsd, fromTokens: fromTokens, intentData: intentData, mode: activeMode, opportunity: selectedOpportunity, progressEvents: progressEvents, recipientAddress: transferRecipientAddress, steps: steps, toAmount: previewDestinationAmount, toAmountUsd: previewToAmountUsd, toToken: toTokenWithFetchedBalance })), (swapStep === "success" || swapStep === "failed") &&
                                         currentSwapEntry && (_jsx("div", { className: "animate-in fade-in slide-in-from-bottom-4 duration-500 w-full", children: _jsx(SwapReceiptPanel, { entry: currentSwapEntry, onDone: swapStep === "failed"
                                                 ? handleFailureBack
-                                                : handleReset }) }))] })), swapStep === "history" && (_jsx(SwapHistoryPanel, { entries: swapHistory, now: historyNow })), activeMode === "swap" &&
+                                                : handleTerminalReceiptDone }) }))] })), swapStep === "history" && (_jsx(SwapHistoryPanel, { entries: swapHistory, now: historyNow })), activeMode === "swap" &&
                                 [
                                     "idle",
                                     "choose-swap-asset",
                                     "choose-receive-asset",
                                     "enter-recipient",
-                                ].includes(swapStep) && (_jsxs(_Fragment, { children: [_jsx(SwapIdleForm, { amount: amount, defaultRecipientAddress: defaultRecipientAddress, fromTokens: fromTokens, isReceiveAmountLoading: isReceiveAmountLoading, isReceiveUsdLoading: isReceiveUsdLoading, isAmountReadOnly: isConfiguredAmountFixed, isDestinationPickerDisabled: isReceiveAssetPickerLocked, hideDestinationTokenDropdownIcon: hideDestinationTokenDropdownIcon, onAmountChange: (val, panel) => {
+                                ].includes(swapStep) && (_jsxs(_Fragment, { children: [_jsx(SwapIdleForm, { amount: amount, defaultRecipientAddress: defaultRecipientAddress, fromTokens: fromTokens, isReceiveAmountLoading: isReceiveAmountLoading, isReceiveUsdLoading: isReceiveUsdLoading, isAmountReadOnly: isConfiguredAmountFixed, isBalanceLoading: isSwapBalancePending, isDestinationPickerDisabled: isReceiveAssetPickerLocked, hideDestinationTokenDropdownIcon: hideDestinationTokenDropdownIcon, onAmountChange: (val, panel) => {
                                             handleSwapAmountChange(val, panel);
                                         }, onOpenDestPicker: () => openDrawerStep("choose-receive-asset"), onOpenRecipientPicker: handleOpenRecipientEditor, onOpenSourcePicker: (index) => {
                                             if (needsWalletConnection) {
@@ -7116,6 +7846,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                                 return;
                                             }
                                             setEditingAssetIndex(index ?? null);
+                                            beginSourcePickerEdit();
                                             openDrawerStep("choose-swap-asset");
                                         }, onUpdateTokens: handleSwapTokensUpdate, receiveQuoteAmount: swapType === "exactIn" ? idleReceiveQuoteAmount : undefined, receiveQuoteUsd: idleReceiveQuoteUsd, recipientAddress: effectiveRecipientAddress, sourceRouteMessage: insufficientSourceIssue?.message, sourceRouteStatus: insufficientSourceIssue
                                             ? "insufficient"
@@ -7187,12 +7918,14 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                     "choose-swap-asset",
                                     "choose-receive-asset",
                                     "enter-recipient",
-                                ].includes(swapStep) && (_jsx(_Fragment, { children: selectedOpportunity && (_jsxs(_Fragment, { children: [_jsx(DepositIdleForm, { amount: amount, amountMode: depositAmountMode, calculatingPercent: maxCalculationPercent, fromTokens: displayFromTokens, isAmountReadOnly: isConfiguredAmountFixed, isCalculatingMax: receiveMaxCalculating, isQuoteRefreshing: !hasCurrentExactOutPaymentIntent &&
-                                                (quoteRefreshing || intentLoading), onAmountChange: handleDepositAmountChange, onAmountModeToggle: handleDepositAmountModeToggle, onOpenSourcePicker: () => {
+                                ].includes(swapStep) && (_jsx(_Fragment, { children: selectedOpportunity && (_jsxs(_Fragment, { children: [_jsx(DepositIdleForm, { amount: amount, amountMode: depositAmountMode, calculatingPercent: maxCalculationPercent, fromTokens: displayFromTokens, isAmountReadOnly: isConfiguredAmountFixed, isBalanceLoading: isSwapBalancePending, isCalculatingMax: receiveMaxCalculating, isQuoteRefreshing: !hasCurrentExactOutPaymentIntent &&
+                                                (quoteRefreshing || intentLoading), isSourcePickerDisabled: isSourcePickerRefreshDisabled, onAmountChange: handleDepositAmountChange, onAmountModeToggle: handleDepositAmountModeToggle, onOpenSourcePicker: () => {
                                                 if (needsWalletConnection) {
                                                     void handleConnectWallet();
                                                     return;
                                                 }
+                                                captureSourceSelectionRequiredUsd();
+                                                beginSourcePickerEdit();
                                                 openDrawerStep("choose-swap-asset");
                                             }, onOpenTokenPicker: () => openDrawerStep("choose-receive-asset"), onSetPercent: handleDepositPercentSelect, routeMessage: insufficientSourceIssue?.message, routeStatus: insufficientSourceIssue
                                                 ? "insufficient"
@@ -7238,8 +7971,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                                             height: "14px",
                                                             width: "14px",
                                                         } })) : (needsWalletConnection && walletConnectBusy) ||
-                                                        (!hasCurrentExactOutPaymentIntent &&
-                                                            (quoteRefreshing || intentLoading)) ||
+                                                        isExactOutPaymentQuotePending ||
                                                         receiveMaxCalculating ? (_jsx(Loader2, { className: "animate-spin", style: {
                                                             color: isDepositCtaDisabled
                                                                 ? theme.colors.muted
@@ -7263,8 +7995,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                     "choose-swap-asset",
                                     "choose-receive-asset",
                                     "enter-recipient",
-                                ].includes(swapStep) && (_jsxs(_Fragment, { children: [_jsx(SendIdleForm, { amount: amount, calculatingPercent: maxCalculationPercent, fromTokens: displayFromTokens, isAmountReadOnly: isConfiguredAmountFixed, isAssetPickerDisabled: isReceiveAssetPickerLocked, hideDestinationTokenDropdownIcon: hideDestinationTokenDropdownIcon, isCalculatingMax: receiveMaxCalculating, isQuoteRefreshing: !hasCurrentExactOutPaymentIntent &&
-                                            (quoteRefreshing || intentLoading), onAmountChange: handleSendAmountChange, onOpenAssetPicker: () => openDrawerStep("choose-receive-asset"), isRecipientLocked: isConfiguredRecipientLocked, onOpenRecipientPicker: isConfiguredRecipientLocked
+                                ].includes(swapStep) && (_jsxs(_Fragment, { children: [_jsx(SendIdleForm, { amount: amount, calculatingPercent: maxCalculationPercent, fromTokens: displayFromTokens, isAmountReadOnly: isConfiguredAmountFixed, isAssetPickerDisabled: isReceiveAssetPickerLocked, isBalanceLoading: isSwapBalancePending, hideDestinationTokenDropdownIcon: hideDestinationTokenDropdownIcon, isCalculatingMax: receiveMaxCalculating, isQuoteRefreshing: !hasCurrentExactOutPaymentIntent &&
+                                            (quoteRefreshing || intentLoading), isSourcePickerDisabled: isSourcePickerRefreshDisabled, onAmountChange: handleSendAmountChange, onOpenAssetPicker: () => openDrawerStep("choose-receive-asset"), isRecipientLocked: isConfiguredRecipientLocked, onOpenRecipientPicker: isConfiguredRecipientLocked
                                             ? () => undefined
                                             : handleOpenRecipientEditor, onOpenSourcePicker: () => {
                                             if (needsWalletConnection) {
@@ -7272,6 +8004,8 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                                 return;
                                             }
                                             setEditingAssetIndex(null);
+                                            captureSourceSelectionRequiredUsd();
+                                            beginSourcePickerEdit();
                                             openDrawerStep("choose-swap-asset");
                                         }, onSetPercent: handleSendPercentSelect, recipientAddress: recipientAddress || "", routeMessage: insufficientSourceIssue?.message, routeStatus: insufficientSourceIssue
                                             ? "insufficient"
@@ -7320,8 +8054,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                                         width: "14px",
                                                     } })) : (needsWalletConnection && walletConnectBusy) ||
                                                     (!sendNeedsRecipient &&
-                                                        ((!hasCurrentExactOutPaymentIntent &&
-                                                            (quoteRefreshing || intentLoading)) ||
+                                                        (isExactOutPaymentQuotePending ||
                                                             receiveMaxCalculating)) ? (_jsx(Loader2, { className: "animate-spin", style: {
                                                         color: isSendCtaDisabled
                                                             ? theme.colors.muted
@@ -7508,7 +8241,7 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                     display: "flex",
                     flexDirection: "column",
                     justifyContent: "flex-end",
-                }, children: [_jsx("div", { onClick: closeDrawerToIdle, style: {
+                }, children: [_jsx("div", { onClick: handleSourcePickerCancel, style: {
                             position: "absolute",
                             top: 0,
                             left: 0,
@@ -7546,31 +8279,16 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                             willChange: "height, max-height, transform, opacity",
                         }, children: _jsx(SwapAssetSelector, { allowSelectedTokenRemoval: false, allowUnified: activeMode === "deposit" ||
                                 activeMode === "send" ||
-                                activeMode === "swap", autoSelectFilterTabs: activeMode === "deposit" || activeMode === "send", editingAssetIndex: editingAssetIndex, filterTabBehavior: activeMode === "deposit" ? "source-pool" : "select-all", hideCustomTab: activeMode === "swap", isMulti: activeMode === "deposit" || activeMode === "send", lockedTokens: lockedDestinationSourceTokens, onBack: closeDrawerToIdle, onClearSelection: activeMode === "deposit" || activeMode === "send"
-                                ? () => {
-                                    setSourceSelectionTouched(true);
-                                    setExactOutQuoteSourceModeValue("selected");
-                                    if (activeMode === "deposit") {
-                                        setDepositSourceFilter("custom");
-                                    }
-                                    invalidateExactOutQuoteForRefresh();
-                                    setSourceSelectionRevision((current) => current + 1);
-                                    setFromTokens((current) => current.length === 0 ? current : []);
-                                }
-                                : undefined, onDone: closeDrawerToIdle, onFilterTabSelect: activeMode === "deposit"
-                                ? (tab) => {
-                                    const nextFilter = tab === "stables" ? "stablecoins" : tab;
-                                    setDepositSourceFilter(nextFilter);
-                                    setSourceSelectionTouched(false);
-                                    setExactOutQuoteSourceModeValue("all");
-                                    invalidateExactOutQuoteForRefresh();
-                                    setSourceSelectionRevision((current) => current + 1);
-                                    const selection = getResolvedDepositSourceSelection({
-                                        filter: nextFilter,
-                                        isManualSelection: false,
-                                    });
-                                    setFromTokens(getDepositSourceTokensForIds(selection.selectedSourceIds));
-                                }
+                                activeMode === "swap", autoSelectFilterTabs: activeMode === "deposit" || activeMode === "send", editingAssetIndex: editingAssetIndex, filterTabBehavior: activeMode === "deposit" ? "source-pool" : "select-all", hideCustomTab: activeMode === "swap", initialFilterTab: activeMode === "deposit"
+                                ? depositSourceFilter === "stablecoins"
+                                    ? "stables"
+                                    : depositSourceFilter
+                                : activeMode === "send" && sourceSelectionTouched
+                                    ? "custom"
+                                    : "all", isMulti: activeMode === "deposit" || activeMode === "send", lockedTokens: lockedDestinationSourceTokens, onBack: handleSourcePickerCancel, onDone: activeMode === "deposit" || activeMode === "send"
+                                ? commitSourcePickerDraft
+                                : closeDrawerToIdle, onFilterTabSelect: activeMode === "deposit" || activeMode === "send"
+                                ? handleSourcePickerFilterTabSelect
                                 : undefined, onSelect: (token) => {
                                 if (activeMode === "swap") {
                                     const next = [...fromTokens];
@@ -7606,71 +8324,43 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                 }
                                 else if (activeMode === "deposit" ||
                                     activeMode === "send") {
-                                    setSourceSelectionTouched(true);
-                                    setExactOutQuoteSourceModeValue("selected");
-                                    if (activeMode === "deposit") {
-                                        setDepositSourceFilter("custom");
-                                    }
-                                    invalidateExactOutQuoteForRefresh();
-                                    setSourceSelectionRevision((current) => current + 1);
-                                    setFromTokens([{ ...token, userAmount: amount }]);
-                                    closeDrawerToIdle();
+                                    handleSourcePickerDraftSelectionChange([
+                                        { ...token, userAmount: "" },
+                                    ]);
                                 }
                             }, onSelectionChange: activeMode === "deposit" || activeMode === "send"
-                                ? (tokens) => {
-                                    setSourceSelectionTouched(true);
-                                    setExactOutQuoteSourceModeValue("selected");
-                                    if (activeMode === "deposit") {
-                                        setDepositSourceFilter("custom");
-                                    }
-                                    invalidateExactOutQuoteForRefresh();
-                                    setSourceSelectionRevision((current) => current + 1);
-                                    setFromTokens(tokens.map((token) => ({
-                                        ...token,
-                                        userAmount: "",
-                                    })));
-                                }
+                                ? handleSourcePickerDraftSelectionChange
                                 : undefined, onToggle: (token) => {
-                                if (activeMode === "deposit" || activeMode === "send") {
-                                    setSourceSelectionTouched(true);
-                                    setExactOutQuoteSourceModeValue("selected");
-                                    if (activeMode === "deposit") {
-                                        setDepositSourceFilter("custom");
+                                const isDepositOrSendSourcePicker = activeMode === "deposit" || activeMode === "send";
+                                const prevTokens = isDepositOrSendSourcePicker
+                                    ? sourcePickerSelectedTokens
+                                    : fromTokens;
+                                const isSameSelection = (a, b) => {
+                                    if (a.isUnified || b.isUnified) {
+                                        return Boolean(a.isUnified &&
+                                            b.isUnified &&
+                                            a.unifiedSymbol === b.unifiedSymbol);
                                     }
-                                    invalidateExactOutQuoteForRefresh();
-                                    setSourceSelectionRevision((current) => current + 1);
-                                }
-                                else {
-                                    clearPendingSwapIntent();
-                                }
-                                setFromTokens((prev) => {
-                                    const isSameSelection = (a, b) => {
-                                        if (a.isUnified || b.isUnified) {
-                                            return Boolean(a.isUnified &&
-                                                b.isUnified &&
-                                                a.unifiedSymbol === b.unifiedSymbol);
-                                        }
-                                        return (a.contractAddress.toLowerCase() ===
-                                            b.contractAddress.toLowerCase() &&
-                                            a.chainId === b.chainId);
-                                    };
-                                    const isDepositOrSendSourcePicker = activeMode === "deposit" || activeMode === "send";
-                                    const sourceTokens = token.sourceTokens ?? [];
-                                    const isSameUnifiedGroup = (item) => Boolean(item.isUnified &&
-                                        token.isUnified &&
-                                        item.unifiedSymbol === token.unifiedSymbol);
-                                    const withDefaultAmount = (item) => ({
-                                        ...item,
-                                        userAmount: activeMode === "swap" && prev.length === 0
-                                            ? amount
-                                            : "",
-                                    });
+                                    return (a.contractAddress.toLowerCase() ===
+                                        b.contractAddress.toLowerCase() && a.chainId === b.chainId);
+                                };
+                                const sourceTokens = token.sourceTokens ?? [];
+                                const isSameUnifiedGroup = (item) => Boolean(item.isUnified &&
+                                    token.isUnified &&
+                                    item.unifiedSymbol === token.unifiedSymbol);
+                                const withDefaultAmount = (item) => ({
+                                    ...item,
+                                    userAmount: activeMode === "swap" && prevTokens.length === 0
+                                        ? amount
+                                        : "",
+                                });
+                                const getNextTokens = () => {
                                     if (isDepositOrSendSourcePicker &&
                                         token.isUnified &&
                                         sourceTokens.length > 0) {
-                                        const hasUnifiedSelection = prev.some(isSameUnifiedGroup);
-                                        const areAllChildrenSelected = sourceTokens.every((source) => prev.some((item) => isSameSelection(item, source)));
-                                        const withoutGroup = prev.filter((item) => !isSameUnifiedGroup(item) &&
+                                        const hasUnifiedSelection = prevTokens.some(isSameUnifiedGroup);
+                                        const areAllChildrenSelected = sourceTokens.every((source) => prevTokens.some((item) => isSameSelection(item, source)));
+                                        const withoutGroup = prevTokens.filter((item) => !isSameUnifiedGroup(item) &&
                                             !sourceTokens.some((source) => isSameSelection(item, source)));
                                         if (hasUnifiedSelection || areAllChildrenSelected) {
                                             return withoutGroup;
@@ -7681,10 +8371,10 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                         ];
                                     }
                                     if (isDepositOrSendSourcePicker && !token.isUnified) {
-                                        const unifiedSelection = prev.find((item) => item.isUnified &&
+                                        const unifiedSelection = prevTokens.find((item) => item.isUnified &&
                                             item.sourceTokens?.some((source) => isSameSelection(source, token)));
                                         if (unifiedSelection?.sourceTokens?.length) {
-                                            const withoutUnified = prev.filter((item) => !isSameSelection(item, unifiedSelection));
+                                            const withoutUnified = prevTokens.filter((item) => !isSameSelection(item, unifiedSelection));
                                             return [
                                                 ...withoutUnified,
                                                 ...unifiedSelection.sourceTokens
@@ -7693,12 +8383,12 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                             ];
                                         }
                                     }
-                                    const exists = prev.find((item) => isSameSelection(item, token));
+                                    const exists = prevTokens.find((item) => isSameSelection(item, token));
                                     if (exists) {
-                                        return prev.filter((item) => !isSameSelection(item, token));
+                                        return prevTokens.filter((item) => !isSameSelection(item, token));
                                     }
                                     const tokenSourceKeys = new Set((token.sourceTokens ?? []).map((source) => `${source.chainId}-${source.contractAddress.toLowerCase()}`));
-                                    const next = prev.filter((existing) => {
+                                    const next = prevTokens.filter((existing) => {
                                         if (token.isUnified &&
                                             tokenSourceKeys.has(`${existing.chainId}-${existing.contractAddress.toLowerCase()}`)) {
                                             return false;
@@ -7712,12 +8402,16 @@ function NexusWidgetInner({ config: rawConfig, embed = true, className, connecte
                                         return true;
                                     });
                                     return [...next, withDefaultAmount(token)];
-                                });
-                            }, preserveSelectedBelowMinimum: false, requiredUsd: activeMode === "deposit"
-                                ? depositUsdDisplay
-                                : activeMode === "send" && sendAmountUsd > 0
-                                    ? sendAmountUsd.toFixed(2)
-                                    : undefined, selectedTokens: fromTokens, swapBalance: swapBalance, swapSupportedChains: swapSupportedChainsAndTokens, title: activeMode === "deposit" || activeMode === "send"
+                                };
+                                const nextTokens = getNextTokens();
+                                if (isDepositOrSendSourcePicker) {
+                                    handleSourcePickerDraftSelectionChange(nextTokens);
+                                }
+                                else {
+                                    clearPendingSwapIntent();
+                                    setFromTokens(nextTokens);
+                                }
+                            }, preserveSelectedBelowMinimum: false, requiredUsd: assetSelectorRequiredUsdDisplay, selectedTokens: sourcePickerSelectedTokens, showBelowMinimumInline: activeMode === "swap" && swapType === "exactIn", swapBalance: swapBalance, swapSupportedChains: swapSupportedChainsAndTokens, title: activeMode === "deposit" || activeMode === "send"
                                 ? "Choose Assets to Pay with"
                                 : "Choose assets to send" }) })] })), (activeMode === "swap" ||
                 activeMode === "send" ||