@agg-build/hooks 1.2.0 → 1.2.11

package/dist/{chunk-KSSPFJM2.mjs → chunk-CWEJLBYY.mjs}

@@ -1,6 +1,6 @@
 import {
   __async,
-  invalidateBalanceQueries,
+  invalidateUserMoneyState,
   useAggBalanceState,
   useAggClient,
   useAggWebSocket,
@@ -10,7 +10,7 @@ import {
   useOnWithdrawalLifecycle,
   useSyncBalances,
   useWithdrawManaged
-} from "./chunk-U3DRHUR5.mjs";
+} from "./chunk-553OI6M2.mjs";
 
 // src/withdraw/use-withdraw-flow.ts
 import { useCallback, useEffect, useMemo, useState } from "react";
@@ -28,7 +28,9 @@ var WITHDRAWAL_SUPPORTED_CHAIN_IDS = /* @__PURE__ */ new Set([
   // Base
   56,
   // BNB
-  SOLANA_CHAIN_ID
+  SOLANA_CHAIN_ID,
+  1337
+  // Hyperliquid
 ]);
 var isValidDestinationAddress = (address, chainId) => {
   if (chainId === SOLANA_CHAIN_ID) return SOLANA_ADDRESS_REGEX.test(address);
@@ -265,12 +267,60 @@ function useWithdrawFlow(options) {
   };
 }
 
+// src/withdraw/use-withdraw-estimate.ts
+import { useMemo as useMemo2 } from "react";
+function useWithdrawEstimate({
+  amount,
+  selectedToken,
+  selectedNetwork
+}) {
+  return useMemo2(() => {
+    const numAmount = Number(amount);
+    if (!amount || isNaN(numAmount) || numAmount <= 0 || !selectedToken || !selectedNetwork) {
+      return null;
+    }
+    const network = selectedNetwork.toLowerCase();
+    let feeVal = 0.1;
+    let reserveVal = 0.2;
+    if (network === "1" || network === "mainnet" || network === "ethereum") {
+      feeVal = 1.22;
+      reserveVal = 0.3;
+    } else if (network === "137" || network === "polygon") {
+      feeVal = 0.05;
+      reserveVal = 0.15;
+    } else if (network === "42161" || network === "arbitrum") {
+      feeVal = 0.05;
+      reserveVal = 0.15;
+    } else if (network === "8453" || network === "base") {
+      feeVal = 0.05;
+      reserveVal = 0.15;
+    } else if (network === "56" || network === "bnb" || network === "bsc") {
+      feeVal = 0.1;
+      reserveVal = 0.2;
+    } else if (network === "792703809" || network === "solana") {
+      feeVal = 0.01;
+      reserveVal = 0.04;
+    } else if (network === "1337" || network === "hyperliquid") {
+      feeVal = 0.02;
+      reserveVal = 0.08;
+    }
+    const youReceiveVal = Math.max(0, numAmount - feeVal);
+    return {
+      estimatedFees: `~$${feeVal.toFixed(2)}`,
+      networkReserve: `~$${reserveVal.toFixed(2)}`,
+      youReceive: `~${youReceiveVal.toFixed(2)} ${selectedToken}`
+    };
+  }, [amount, selectedToken, selectedNetwork]);
+}
+
 // src/withdraw/use-withdrawal-lifecycle.ts
-import { useCallback as useCallback2, useEffect as useEffect2, useMemo as useMemo2, useRef, useState as useState2 } from "react";
+import { useCallback as useCallback2, useEffect as useEffect2, useMemo as useMemo3, useRef, useState as useState2 } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 var INITIAL_STATE = {
   pending: true,
   status: null,
+  requestedAmountRaw: null,
+  completedAmountRaw: null,
   terminal: false,
   lastLeg: null,
   legs: [],
@@ -301,14 +351,16 @@ var mergeLegs = (prev, snapshot, delta) => {
   return next;
 };
 var restToLifecycleState = (response) => {
-  var _a;
+  var _a, _b;
   return {
     pending: false,
     status: response.status,
+    requestedAmountRaw: response.requested.amountRaw,
+    completedAmountRaw: (_a = response.completedAmountRaw) != null ? _a : null,
     terminal: response.status === "completed" || response.status === "partial" || response.status === "failed",
     lastLeg: null,
     legs: response.legs.map(restLegToWsLeg),
-    errorMessage: (_a = response.errorMessage) != null ? _a : null,
+    errorMessage: (_b = response.errorMessage) != null ? _b : null,
     // No server timestamp on the REST response — we use 0 as "older than any
     // WS timestamp" so a subsequent WS event always wins. Callers that read
     // `timestamp` should treat 0/null interchangeably as "unset".
@@ -345,17 +397,19 @@ function useWithdrawalLifecycle(withdrawalId) {
       cancelled = true;
     };
   }, [client, withdrawalId, wsConnected]);
-  const handler = useMemo2(() => {
+  const handler = useMemo3(() => {
     if (!withdrawalId) return null;
     return (msg) => {
       if (msg.withdrawalId !== withdrawalId) return;
       setState((prev) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return {
           pending: false,
           status: msg.status,
+          requestedAmountRaw: (_a = msg.requestedAmountRaw) != null ? _a : prev.requestedAmountRaw,
+          completedAmountRaw: (_b = msg.completedAmountRaw) != null ? _b : prev.completedAmountRaw,
           terminal: msg.terminal,
-          lastLeg: (_a = msg.leg) != null ? _a : null,
+          lastLeg: (_c = msg.leg) != null ? _c : null,
           // `legs[]` is the cumulative server-known truth. Snapshots
           // (`pending` / terminal rollup) carry a full `legs[]` and replace
           // it. Intermediate per-leg deltas carry only `leg` (no `legs[]`)
@@ -363,7 +417,7 @@ function useWithdrawalLifecycle(withdrawalId) {
           // (sourceChainId, destChainId, type) so the timeline UI doesn't
           // collapse to empty between snapshots.
           legs: mergeLegs(prev.legs, msg.legs, msg.leg),
-          errorMessage: (_b = msg.errorMessage) != null ? _b : null,
+          errorMessage: (_d = msg.errorMessage) != null ? _d : null,
           timestamp: msg.timestamp
         };
       });
@@ -375,7 +429,7 @@ function useWithdrawalLifecycle(withdrawalId) {
     if (!state.terminal) return;
     if (balanceRefetchedForRef.current === withdrawalId) return;
     balanceRefetchedForRef.current = withdrawalId;
-    invalidateBalanceQueries(queryClient);
+    invalidateUserMoneyState(queryClient);
     client.syncManagedBalances().catch(() => {
     });
   }, [client, queryClient, state.terminal, withdrawalId]);
@@ -385,5 +439,6 @@ function useWithdrawalLifecycle(withdrawalId) {
 
 export {
   useWithdrawFlow,
+  useWithdrawEstimate,
   useWithdrawalLifecycle
 };

package/dist/{chunk-FKTRXKYA.mjs → chunk-JWPZNCGY.mjs}

@@ -1,7 +1,7 @@
 import {
   __async,
   useAggClient
-} from "./chunk-U3DRHUR5.mjs";
+} from "./chunk-553OI6M2.mjs";
 
 // src/use-ramp-quotes.ts
 import { useMutation } from "@tanstack/react-query";

package/dist/deposit.d.mts

@@ -1,5 +1,5 @@
 export { U as UseDepositAddressesOptions, u as useDepositAddresses } from './use-deposit-addresses-B9ICS-3U.mjs';
-export { U as UseSyncBalancesOptions, u as useSyncBalances } from './use-sync-balances-B1_8tBKw.mjs';
+export { U as UseSyncBalancesOptions, u as useSyncBalances } from './use-sync-balances-CeD8qZWP.mjs';
 import '@tanstack/react-query';
 import '@agg-build/sdk';
 
@@ -121,6 +121,13 @@ interface UseDepositFlowResult {
     onWalletAmountChange: (amount: string) => void;
     onWalletMax: () => void;
     onConfirmWalletDeposit: (params: WalletDepositConfirmParams) => Promise<void>;
+    /**
+     * Clears any in-flight wallet-transaction state so the deposit modal can
+     * return the user to the wallet form. Called from the processing step's
+     * Cancel affordance when a wallet popup was dismissed silently or a
+     * broadcast tx was canceled/replaced without a clean error.
+     */
+    onCancelWalletDeposit: () => void;
     onWalletNetworkChange: (chainId: string) => void;
     onWalletTokenChange: (tokenSymbol: string) => void;
     initialWalletChainId: string | undefined;
@@ -130,7 +137,6 @@ interface UseDepositFlowResult {
     connectedWalletKind?: "evm" | "solana";
     sendCryptoConfig: {
         minDeposit: string;
-        feeEstimate: string;
         eta: string;
     };
     onDoneSendCrypto: () => void;

package/dist/deposit.d.ts

@@ -1,5 +1,5 @@
 export { U as UseDepositAddressesOptions, u as useDepositAddresses } from './use-deposit-addresses-B9ICS-3U.js';
-export { U as UseSyncBalancesOptions, u as useSyncBalances } from './use-sync-balances-B1_8tBKw.js';
+export { U as UseSyncBalancesOptions, u as useSyncBalances } from './use-sync-balances-CeD8qZWP.js';
 import '@tanstack/react-query';
 import '@agg-build/sdk';
 
@@ -121,6 +121,13 @@ interface UseDepositFlowResult {
     onWalletAmountChange: (amount: string) => void;
     onWalletMax: () => void;
     onConfirmWalletDeposit: (params: WalletDepositConfirmParams) => Promise<void>;
+    /**
+     * Clears any in-flight wallet-transaction state so the deposit modal can
+     * return the user to the wallet form. Called from the processing step's
+     * Cancel affordance when a wallet popup was dismissed silently or a
+     * broadcast tx was canceled/replaced without a clean error.
+     */
+    onCancelWalletDeposit: () => void;
     onWalletNetworkChange: (chainId: string) => void;
     onWalletTokenChange: (tokenSymbol: string) => void;
     initialWalletChainId: string | undefined;
@@ -130,7 +137,6 @@ interface UseDepositFlowResult {
     connectedWalletKind?: "evm" | "solana";
     sendCryptoConfig: {
         minDeposit: string;
-        feeEstimate: string;
         eta: string;
     };
     onDoneSendCrypto: () => void;

package/dist/deposit.js

@@ -91,23 +91,10 @@ function normalizeWalletError(error, supportedChains) {
 }
 
 // src/deposit/use-wallet-token-balance.ts
-var import_react3 = require("react");
+var import_web3 = require("@solana/web3.js");
 var import_react_query = require("@tanstack/react-query");
 var import_viem = require("viem");
 var import_wagmi = require("wagmi");
-var import_wallet_adapter_react = require("@solana/wallet-adapter-react");
-var import_web3 = require("@solana/web3.js");
-
-// ../common/src/utils/auth.ts
-function getWalletAddressFromUserProfile(user) {
-  var _a, _b, _c, _d, _e;
-  const oauthWallet = (_b = (_a = user == null ? void 0 : user.accounts) == null ? void 0 : _a.find(
-    (a) => a.type === "oauth" /* oauth */ && String(a.provider).toLowerCase() === "wallet"
-  )) != null ? _b : null;
-  if (oauthWallet == null ? void 0 : oauthWallet.providerAccountId) return oauthWallet.providerAccountId;
-  const siweAccount = (_d = (_c = user == null ? void 0 : user.accounts) == null ? void 0 : _c.find((a) => a.type === "siwe" /* siwe */)) != null ? _d : null;
-  return (_e = siweAccount == null ? void 0 : siweAccount.providerAccountId) != null ? _e : void 0;
-}
 
 // src/core/providers/contexts.ts
 var import_react = require("react");
@@ -276,6 +263,12 @@ var enUsLabels = {
       max: "Max",
       tokenLabel: "Receive token",
       networkLabel: "Receive network",
+      estimatedFees: "Est. fees",
+      networkReserve: "Network reserve",
+      networkReserveTooltipAria: "Network reserve details",
+      networkReserveTooltipLineOne: "This reserve helps cover network and bridge costs.",
+      networkReserveTooltipLineTwo: "Any unused amount stays in your balance.",
+      youReceive: "You'll receive",
       confirm: "Confirm withdrawal",
       successTitle: "Withdrawal submitted",
       successDescription: (tokenSymbol) => `Your ${tokenSymbol} withdrawal is being processed and will arrive shortly.`,
@@ -284,12 +277,16 @@ var enUsLabels = {
       // terminal status — otherwise a finished withdrawal would keep showing
       // "submitted / processing" forever and force the user to hard-refresh.
       successTitleCompleted: "Withdrawal complete",
-      successDescriptionCompleted: (tokenSymbol) => `Your ${tokenSymbol} withdrawal has been delivered.`,
+      successDescriptionCompleted: (tokenSymbol) => `Your ${tokenSymbol} has been successfully sent to your wallet.`,
       successTitlePartial: "Withdrawal partially completed",
-      successDescriptionPartial: (tokenSymbol) => `Some legs of your ${tokenSymbol} withdrawal completed; see details below.`,
+      successDescriptionPartial: () => "Part of your withdrawal was completed successfully, but the remaining funds failed to transfer and were returned to your balance.",
       successTitleFailed: "Withdrawal failed",
-      successDescriptionFailed: (tokenSymbol) => `Your ${tokenSymbol} withdrawal could not be completed.`,
+      successDescriptionFailed: () => "We couldn't complete your withdrawal. Your funds were returned to your balance.",
+      retry: "Try Again",
+      close: "Close",
+      loadingDescription: "This may take a few minutes. You can safely close this window and check the status later in your activity.",
       summary: {
+        requestedWithdrawal: "Requested withdrawal",
         // The response is `pricingStatus: "unquoted"` — we don't know net
         // output until on-chain settlement. Calling this "Amount received"
         // would imply receipt before the lifecycle has confirmed. Keep it
@@ -307,6 +304,12 @@ var enUsLabels = {
         completed: "Withdrawal complete.",
         partial: "Withdrawal partially completed \u2014 see details below.",
         failed: "Withdrawal failed.",
+        loadingSteps: {
+          preparing: "Preparing funds",
+          bridging: "Bridging between networks",
+          sending: "Sending to your wallet",
+          confirming: "Waiting for network confirmation"
+        },
         steps: {
           bridge: (sourceChainName, destChainName) => `Bridging from ${sourceChainName} to ${destChainName}`,
           transfer: (destChainName) => `Transferring on ${destChainName}`
@@ -362,10 +365,37 @@ var enUsLabels = {
         externalWallet: "Deposit from external wallet",
         card: "Deposit with card"
       },
+      depositStatusTitles: {
+        connectedWallet: {
+          pending: "Processing deposit from connected wallet",
+          completed: "Successful deposit from connected wallet",
+          failed: "Failed deposit from connected wallet",
+          canceled: "Canceled deposit from connected wallet"
+        },
+        externalWallet: {
+          pending: "Processing deposit from external wallet",
+          completed: "Successful deposit from external wallet",
+          failed: "Failed deposit from external wallet",
+          canceled: "Canceled deposit from external wallet"
+        },
+        card: {
+          pending: "Processing deposit with card",
+          completed: "Successful deposit with card",
+          failed: "Failed deposit with card",
+          canceled: "Canceled deposit with card"
+        }
+      },
+      withdrawalStatusTitles: {
+        pending: "Processing withdrawal",
+        completed: "Successful withdrawal",
+        failed: "Failed withdrawal",
+        canceled: "Canceled withdrawal"
+      },
       // Activity-row title for any withdrawal regardless of lifecycle
-      // state (pending / completed / failed) — render the asset rather
-      // than implying success. The ActivityRow renders a separate status
-      // chip when the row is failed.
+      // state — render the asset rather than implying success. The
+      // ActivityRow renders a separate status chip when the row is
+      // failed. Retained for partner overrides that still want a
+      // status-agnostic title.
       withdrawalTitle: (tokenSymbol) => `Withdraw ${tokenSymbol}`
     },
     positions: {
@@ -586,6 +616,7 @@ var enUsLabels = {
     noMarketSelected: "Select a market to place an order.",
     noOrderbooks: "No live orderbooks are available for this market right now.",
     quoteUnavailable: "Quote temporarily unavailable. Please try again.",
+    quoteBalanceMismatch: "Quote balance mismatch. Try a different amount.",
     selectedVenueUnavailable: "The venue you selected is no longer available on this route. Review the updated options and try again.",
     engineUnavailable: "The routing engine is temporarily unavailable. Please try again in a moment.",
     insufficientInputAmount: "Trade amount is too small to cover bridging and execution costs. Increase your spend or deposit funds on the destination chain.",
@@ -623,6 +654,7 @@ var enUsLabels = {
     buyingOutcome: (label) => `Buying ${label}`,
     sellingOutcome: (label) => `Selling ${label}`,
     findingBestRoute: "Finding the best route...",
+    checkingBalance: "Checking balance",
     submittingOrderProgress: "Submitting order...",
     orderSubmittedProgress: (orderId) => `Order #${orderId.replace(/^#/, "")} submitted`,
     executingOnVenue: (venueLabel) => `Executing on ${venueLabel}...`,
@@ -861,6 +893,7 @@ var defaultAggUiSearchConfig = {
 var defaultAggUiConfig = {
   enableLogs: false,
   enableWebsocketsLogs: false,
+  enableDebug: false,
   general: {
     locale: DEFAULT_LOCALE,
     theme: "light",
@@ -935,6 +968,33 @@ var invalidateBalanceQueries = (queryClient, options) => {
     refetchType
   });
 };
+var invalidatePositionQueries = (queryClient, options) => {
+  var _a;
+  queryClient.invalidateQueries({
+    queryKey: executionKeys.positionsPrefix(),
+    refetchType: (_a = options == null ? void 0 : options.refetchType) != null ? _a : "active"
+  });
+};
+var userActivityQueryKeys = {
+  all: () => ["user-activity"]
+};
+var invalidateUserActivityQueries = (queryClient, options) => {
+  var _a;
+  const strategy = (_a = options == null ? void 0 : options.strategy) != null ? _a : "remove";
+  if (strategy === "remove") {
+    queryClient.removeQueries({ queryKey: userActivityQueryKeys.all() });
+    return;
+  }
+  queryClient.invalidateQueries({
+    queryKey: userActivityQueryKeys.all(),
+    refetchType: "all"
+  });
+};
+var invalidateUserMoneyState = (queryClient, options) => {
+  invalidateBalanceQueries(queryClient, { refetchType: options == null ? void 0 : options.refetchType });
+  invalidatePositionQueries(queryClient, { refetchType: options == null ? void 0 : options.refetchType });
+  invalidateUserActivityQueries(queryClient, { strategy: options == null ? void 0 : options.activityStrategy });
+};
 
 // src/core/providers/hooks.ts
 var import_react2 = require("react");
@@ -968,6 +1028,35 @@ var useAggBalanceState = useAggBalanceContext;
 // src/deposit/constants.ts
 var DEFAULT_SOLANA_RPC_ENDPOINT = "https://solana-rpc.publicnode.com";
 var SVM_CHAIN_IDS = /* @__PURE__ */ new Set([792703809]);
+var MULTI_CHAIN_SOLANA_WALLET_NAMES = /* @__PURE__ */ new Set(["Phantom"]);
+
+// src/deposit/use-svm-address.ts
+var import_react3 = require("react");
+var import_wallet_adapter_react = require("@solana/wallet-adapter-react");
+function getPhantomProvider() {
+  var _a, _b;
+  if (typeof window === "undefined") return void 0;
+  const w = window;
+  return (_b = (_a = w.phantom) == null ? void 0 : _a.solana) != null ? _b : w.solana;
+}
+function useSvmAddress() {
+  var _a;
+  const { publicKey: adapterPublicKey } = (0, import_wallet_adapter_react.useWallet)();
+  const [phantomAddress, setPhantomAddress] = (0, import_react3.useState)(void 0);
+  (0, import_react3.useEffect)(() => {
+    var _a2;
+    const provider = getPhantomProvider();
+    if (!provider) return;
+    const existing = (_a2 = provider.publicKey) == null ? void 0 : _a2.toBase58();
+    if (existing) {
+      setPhantomAddress(existing);
+      return;
+    }
+    provider.connect({ onlyIfTrusted: true }).then((res) => setPhantomAddress(res.publicKey.toString())).catch(() => {
+    });
+  }, []);
+  return (_a = adapterPublicKey == null ? void 0 : adapterPublicKey.toBase58()) != null ? _a : phantomAddress;
+}
 
 // src/deposit/use-wallet-token-balance.ts
 var ERC20_BALANCE_OF_ABI = [
@@ -979,11 +1068,46 @@ var ERC20_BALANCE_OF_ABI = [
     outputs: [{ name: "", type: "uint256" }]
   }
 ];
-function getPhantomProvider() {
-  var _a, _b;
-  if (typeof window === "undefined") return void 0;
-  const w = window;
-  return (_b = (_a = w.phantom) == null ? void 0 : _a.solana) != null ? _b : w.solana;
+var SVM_BALANCE_RPC_TIMEOUT_MS = 2e3;
+var SVM_BALANCE_STALE_TIME_MS = 3e4;
+var SvmBalanceTimeoutError = class extends Error {
+  constructor() {
+    super("Solana balance request timed out");
+    this.name = "SvmBalanceTimeoutError";
+  }
+};
+function withTimeout(promise, timeoutMs) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new SvmBalanceTimeoutError()), timeoutMs);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (err) => {
+        clearTimeout(timer);
+        reject(err);
+      }
+    );
+  });
+}
+function fetchSvmTokenBalance(rpcUrl, owner, mint) {
+  return __async(this, null, function* () {
+    var _a;
+    const connection = new import_web3.Connection(rpcUrl);
+    const accounts = yield withTimeout(
+      connection.getTokenAccountsByOwner(owner, { mint }),
+      SVM_BALANCE_RPC_TIMEOUT_MS
+    );
+    if (accounts.value.length === 0) return 0;
+    const first = accounts.value[0];
+    if (!first) return 0;
+    const balance = yield withTimeout(
+      connection.getTokenAccountBalance(first.pubkey),
+      SVM_BALANCE_RPC_TIMEOUT_MS
+    );
+    return (_a = balance.value.uiAmount) != null ? _a : 0;
+  });
 }
 function useWalletTokenBalance({
   isOpen = true,
@@ -992,7 +1116,7 @@ function useWalletTokenBalance({
   decimals,
   svmAddress
 }) {
-  var _a, _b, _c;
+  var _a;
   const { solanaRpcUrl } = useAggUiConfig();
   const rpcEndpoint = solanaRpcUrl != null ? solanaRpcUrl : DEFAULT_SOLANA_RPC_ENDPOINT;
   const isSvm = chainId !== void 0 && SVM_CHAIN_IDS.has(chainId);
@@ -1006,45 +1130,27 @@ function useWalletTokenBalance({
     args: evmAddress ? [evmAddress] : void 0,
     query: { enabled: evmEnabled, staleTime: 0, refetchOnMount: true }
   });
-  const { publicKey: adapterPublicKey } = (0, import_wallet_adapter_react.useWallet)();
-  const [phantomAddress, setPhantomAddress] = (0, import_react3.useState)(void 0);
-  (0, import_react3.useEffect)(() => {
-    var _a2;
-    if (!isSvm) return;
-    const provider = getPhantomProvider();
-    if (!provider) return;
-    const existing = (_a2 = provider.publicKey) == null ? void 0 : _a2.toBase58();
-    if (existing) {
-      setPhantomAddress(existing);
-      return;
-    }
-    provider.connect({ onlyIfTrusted: true }).then((res) => setPhantomAddress(res.publicKey.toString())).catch(() => {
-    });
-  }, [isSvm]);
-  const resolvedSvmAddress = (_b = (_a = adapterPublicKey == null ? void 0 : adapterPublicKey.toBase58()) != null ? _a : phantomAddress) != null ? _b : svmAddress;
-  const connection = (0, import_react3.useMemo)(() => new import_web3.Connection(rpcEndpoint), [rpcEndpoint]);
+  const detectedSvmAddress = useSvmAddress();
+  const resolvedSvmAddress = detectedSvmAddress != null ? detectedSvmAddress : svmAddress;
   const svmEnabled = isOpen && isSvm && !!resolvedSvmAddress && !!tokenAddress;
   const svmQuery = (0, import_react_query.useQuery)({
     queryKey: ["svm-token-balance", resolvedSvmAddress != null ? resolvedSvmAddress : null, tokenAddress != null ? tokenAddress : null, isOpen],
     enabled: svmEnabled,
-    staleTime: 0,
+    staleTime: SVM_BALANCE_STALE_TIME_MS,
+    retry: false,
+    refetchOnWindowFocus: "always",
+    refetchOnReconnect: "always",
     queryFn: () => __async(null, null, function* () {
-      var _a2;
       if (!resolvedSvmAddress || !tokenAddress) return 0;
       const owner = new import_web3.PublicKey(resolvedSvmAddress);
       const mint = new import_web3.PublicKey(tokenAddress);
-      const accounts = yield connection.getTokenAccountsByOwner(owner, { mint });
-      if (accounts.value.length === 0) return 0;
-      const first = accounts.value[0];
-      if (!first) return 0;
-      const balance = yield connection.getTokenAccountBalance(first.pubkey);
-      return (_a2 = balance.value.uiAmount) != null ? _a2 : 0;
+      return yield fetchSvmTokenBalance(rpcEndpoint, owner, mint);
     })
   });
   if (isSvm) {
     const awaitingSelection2 = isOpen && !!chainId && !tokenAddress;
     return {
-      balance: (_c = svmQuery.data) != null ? _c : 0,
+      balance: (_a = svmQuery.data) != null ? _a : 0,
       isLoading: awaitingSelection2 || svmQuery.isLoading || svmQuery.isFetching
     };
   }
@@ -1372,7 +1478,7 @@ function useSyncBalances(options) {
     mutationFn: () => client.syncManagedBalances(),
     onSuccess: () => {
       var _a;
-      invalidateBalanceQueries(queryClient);
+      invalidateUserMoneyState(queryClient);
       (_a = options == null ? void 0 : options.onSuccess) == null ? void 0 : _a.call(options);
     },
     onError: options == null ? void 0 : options.onError
@@ -1402,8 +1508,10 @@ function useRampSession() {
 }
 
 // src/deposit/use-deposit-flow.ts
+var DEFAULT_WALLET_CHAIN_ID = 1;
+var DEFAULT_WALLET_TOKEN_SYMBOL = "USDC";
 function useDepositFlow(options) {
-  var _a, _b;
+  var _a, _b, _c;
   const { open, onOpenChange } = options;
   const { user } = useAggAuthState();
   const { walletActions } = useAggUiConfig();
@@ -1447,8 +1555,16 @@ function useDepositFlow(options) {
   }, []);
   const { chainId: connectedChainId, address: connectedAddress } = (0, import_wagmi4.useAccount)();
   const { switchChainAsync } = (0, import_wagmi4.useSwitchChain)();
-  const { publicKey: solanaPublicKey } = (0, import_wallet_adapter_react3.useWallet)();
-  const balanceChainId = walletModalChainId ? Number(walletModalChainId) : connectedChainId;
+  const { wallet: solanaWallet } = (0, import_wallet_adapter_react3.useWallet)();
+  const resolvedSvmAddress = useSvmAddress();
+  const solanaAdapterName = (_b = solanaWallet == null ? void 0 : solanaWallet.adapter) == null ? void 0 : _b.name;
+  const isMultiChainSolanaWallet = Boolean(
+    solanaAdapterName && MULTI_CHAIN_SOLANA_WALLET_NAMES.has(solanaAdapterName)
+  );
+  const hasSolanaCapability = Boolean(resolvedSvmAddress || (solanaWallet == null ? void 0 : solanaWallet.adapter));
+  const hasEvmCapability = Boolean(connectedAddress) || isMultiChainSolanaWallet;
+  const defaultBalanceChainId = hasEvmCapability && (supportedChains == null ? void 0 : supportedChains.some((chain) => chain.chainId === DEFAULT_WALLET_CHAIN_ID)) ? DEFAULT_WALLET_CHAIN_ID : connectedChainId;
+  const balanceChainId = walletModalChainId ? Number(walletModalChainId) : defaultBalanceChainId;
   const selectedChainTokens = (0, import_react7.useMemo)(() => {
     var _a2;
     if (!supportedChains || !balanceChainId) return [];
@@ -1456,23 +1572,17 @@ function useDepositFlow(options) {
     return (_a2 = chain == null ? void 0 : chain.tokens) != null ? _a2 : [];
   }, [supportedChains, balanceChainId]);
   const selectedTokenMeta = (0, import_react7.useMemo)(() => {
-    if (!walletModalTokenSymbol) return void 0;
-    const match = selectedChainTokens.find((t) => t.symbol === walletModalTokenSymbol);
+    const preferredTokenSymbol = walletModalTokenSymbol != null ? walletModalTokenSymbol : DEFAULT_WALLET_TOKEN_SYMBOL;
+    const match = selectedChainTokens.find((t) => t.symbol === preferredTokenSymbol);
     return match ? { address: match.address, decimals: match.decimals } : void 0;
   }, [selectedChainTokens, walletModalTokenSymbol]);
-  const authSvmAddress = (0, import_react7.useMemo)(() => {
-    var _a2;
-    const wallets = user == null ? void 0 : user.wallets;
-    return (_a2 = wallets == null ? void 0 : wallets.find((w) => w.chain === "solana" || w.chain === "svm")) == null ? void 0 : _a2.address;
-  }, [user]);
   const isSvmBalanceChain = balanceChainId !== void 0 && SVM_CHAIN_IDS.has(balanceChainId);
   const walletAddress = (0, import_react7.useMemo)(() => {
-    var _a2, _b2, _c;
     if (isSvmBalanceChain) {
-      return (_b2 = (_a2 = solanaPublicKey == null ? void 0 : solanaPublicKey.toBase58()) != null ? _a2 : authSvmAddress) != null ? _b2 : "";
+      return resolvedSvmAddress != null ? resolvedSvmAddress : "";
     }
-    return (_c = connectedAddress != null ? connectedAddress : getWalletAddressFromUserProfile(user)) != null ? _c : "";
-  }, [authSvmAddress, connectedAddress, isSvmBalanceChain, solanaPublicKey, user]);
+    return connectedAddress != null ? connectedAddress : "";
+  }, [connectedAddress, isSvmBalanceChain, resolvedSvmAddress]);
   const walletLabel = (0, import_react7.useMemo)(() => {
     return walletAddress ? `${walletAddress.slice(0, 6)}...${walletAddress.slice(-4)}` : "\u2014";
   }, [walletAddress]);
@@ -1480,12 +1590,11 @@ function useDepositFlow(options) {
     isOpen: open,
     chainId: balanceChainId,
     tokenAddress: selectedTokenMeta == null ? void 0 : selectedTokenMeta.address,
-    decimals: selectedTokenMeta == null ? void 0 : selectedTokenMeta.decimals,
-    svmAddress: authSvmAddress
+    decimals: selectedTokenMeta == null ? void 0 : selectedTokenMeta.decimals
   });
   const { status: observedWalletTransactionStatus, gasFee: walletTransactionGasFee } = useWalletTransactionStatus({
     chainId: walletTransaction == null ? void 0 : walletTransaction.chainId,
-    txId: (_b = walletTransaction == null ? void 0 : walletTransaction.txId) != null ? _b : null
+    txId: (_c = walletTransaction == null ? void 0 : walletTransaction.txId) != null ? _c : null
   });
   const walletTransactionStatus = walletTransactionError ? "error" : walletTransaction ? observedWalletTransactionStatus != null ? observedWalletTransactionStatus : "submitted" : void 0;
   const syncedDepositTxIdRef = (0, import_react7.useRef)(null);
@@ -1513,9 +1622,15 @@ function useDepositFlow(options) {
     },
     [onOpenChange]
   );
+  const handleCancelWalletDeposit = (0, import_react7.useCallback)(() => {
+    setWalletTransaction(null);
+    setWalletTransactionError(null);
+    setWalletTransactionErrorTone("error");
+    syncedDepositTxIdRef.current = null;
+  }, []);
   const handleConfirmWalletDeposit = (0, import_react7.useCallback)(
     (params) => __async(null, null, function* () {
-      var _a2, _b2, _c;
+      var _a2, _b2, _c2;
       const { address, amount, chainId, token } = params;
       const chain = (_a2 = supportedChains == null ? void 0 : supportedChains.find((c) => c.chainId === chainId)) != null ? _a2 : null;
       const tokenMeta = (_b2 = chain == null ? void 0 : chain.tokens.find((t) => t.symbol === token)) != null ? _b2 : null;
@@ -1531,7 +1646,7 @@ function useDepositFlow(options) {
           token: {
             symbol: token,
             address: tokenMeta == null ? void 0 : tokenMeta.address,
-            decimals: (_c = tokenMeta == null ? void 0 : tokenMeta.decimals) != null ? _c : 6
+            decimals: (_c2 = tokenMeta == null ? void 0 : tokenMeta.decimals) != null ? _c2 : 6
           },
           to: address,
           amount
@@ -1599,11 +1714,12 @@ function useDepositFlow(options) {
     onWalletAmountChange: setDepositAmount,
     onWalletMax: (0, import_react7.useCallback)(() => setDepositAmount(String(walletBalance)), [walletBalance]),
     onConfirmWalletDeposit: handleConfirmWalletDeposit,
+    onCancelWalletDeposit: handleCancelWalletDeposit,
     onWalletNetworkChange: setWalletModalChainId,
     onWalletTokenChange: setWalletModalTokenSymbol,
     initialWalletChainId: connectedChainId ? String(connectedChainId) : void 0,
-    connectedWalletKind: connectedChainId && !solanaPublicKey ? "evm" : solanaPublicKey && !connectedChainId ? "solana" : void 0,
-    sendCryptoConfig: { minDeposit: "$1", feeEstimate: "~$0.01", eta: "~30s" },
+    connectedWalletKind: hasEvmCapability && !hasSolanaCapability ? "evm" : hasSolanaCapability && !hasEvmCapability ? "solana" : void 0,
+    sendCryptoConfig: { minDeposit: "$1", eta: "~30s" },
     onDoneSendCrypto: (0, import_react7.useCallback)(
       () => handleDepositModalOpenChange(false),
       [handleDepositModalOpenChange]