@orderly.network/ui-transfer 3.1.7 → 3.1.8

package/dist/index.js

@@ -1702,14 +1702,14 @@ var SlippageItem = ({ value, isActive, onClick }) => {
 var Web3Wallet = () => {
   const { t } = i18n.useTranslation();
   const { wallet, connectedChain } = hooks.useWalletConnector();
-  const { state: accountState, account: account2 } = hooks.useAccount();
+  const { state: accountState, account } = hooks.useAccount();
   const address = react.useMemo(() => {
     let address2 = accountState.address;
     if (connectedChain?.id && types.ABSTRACT_CHAIN_ID_MAP.has(parseInt(connectedChain?.id))) {
-      address2 = account2.getAdditionalInfo()?.AGWAddress;
+      address2 = account.getAdditionalInfo()?.AGWAddress;
     }
     return address2;
-  }, [wallet, accountState, account2, connectedChain]);
+  }, [wallet, accountState, account, connectedChain]);
   return /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { justify: "between", children: [
     /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "sm", intensity: 98, children: t("transfer.web3Wallet.your") }),
     /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { gapX: 1, children: [
@@ -2484,10 +2484,10 @@ function useDepositAction(options2) {
 }
 function useDepositFee(options2) {
   const { nativeSymbol, depositFee = 0, getIndexPrice, networkId } = options2;
-  const { account: account2 } = hooks.useAccount();
+  const { account } = hooks.useAccount();
   const tokenInfo = hooks.useTokenInfo(nativeSymbol, networkId);
   const feeProps = react.useMemo(() => {
-    const decimals = account2.walletAdapter?.chainNamespace === types.ChainNamespace.solana ? 9 : 18;
+    const decimals = account.walletAdapter?.chainNamespace === types.ChainNamespace.solana ? 9 : 18;
     const dstGasFee = new utils.Decimal(depositFee.toString()).div(new utils.Decimal(10).pow(decimals)).toString();
     const indexPrice = getIndexPrice(nativeSymbol);
     const feeAmount = new utils.Decimal(dstGasFee).mul(indexPrice || 0).toString();
@@ -2588,7 +2588,7 @@ var useDepositValidation = (options2) => {
     dstGasFee,
     nativeSymbol,
     nativeBalance,
-    account: account2,
+    account,
     currentChain,
     depositError,
     needSwap
@@ -2635,7 +2635,7 @@ var useDepositValidation = (options2) => {
   }, [depositError]);
   const insufficientGasMessage = react.useMemo(() => {
     if (nativeSymbol && quantity && Number(quantity) > 0 && // when insufficient balance, the input status is error, so we don't need to check gas balance
-    !insufficientBalance && !depositFeeRevalidating && !nativeBalanceRevalidating && (account2.walletAdapter?.chainNamespace === types.ChainNamespace.solana || dstGasFee)) {
+    !insufficientBalance && !depositFeeRevalidating && !nativeBalanceRevalidating && (account.walletAdapter?.chainNamespace === types.ChainNamespace.solana || dstGasFee)) {
       const notEnoughGas = new utils.Decimal(nativeBalance || 0).lt(dstGasFee || 0);
       const isNotSolBalance = Number(dstGasFee) === 0 && Number(nativeBalance) == Number(dstGasFee);
       if (notEnoughGas || isNotSolBalance) {
@@ -2652,7 +2652,7 @@ var useDepositValidation = (options2) => {
     t,
     nativeSymbol,
     insufficientBalance,
-    account2,
+    account,
     nativeBalance
   ]);
   const gasFeeMessage = react.useMemo(() => {
@@ -2696,10 +2696,10 @@ var useDepositValidation = (options2) => {
     t
   ]);
   const feeWarningMessage = react.useMemo(() => {
-    if (quantity && Number(quantity) > 0 && depositFee === 0n && !depositFeeRevalidating && account2.walletAdapter?.chainNamespace !== types.ChainNamespace.solana) {
+    if (quantity && Number(quantity) > 0 && depositFee === 0n && !depositFeeRevalidating && account.walletAdapter?.chainNamespace !== types.ChainNamespace.solana) {
       return t("transfer.deposit.feeUnavailable");
     }
-  }, [t, quantity, depositFee, depositFeeRevalidating, account2]);
+  }, [t, quantity, depositFee, depositFeeRevalidating, account]);
   const { inputStatus, hintMessage } = react.useMemo(() => {
     if (!quantity) {
       return { inputStatus: "default", hintMessage: "" };
@@ -4123,7 +4123,7 @@ var useSwapQuote = (options2) => {
 var SWAP_CONTRACT_ADDRESS = "0xe18f1051d1cCeCb61572eb686e1beb34A8612bf3";
 var useSwapDeposit = (options2) => {
   const { sourceToken, targetToken, currentChain, quantity, depositFee } = options2;
-  const { account: account2 } = hooks.useAccount();
+  const { account } = hooks.useAccount();
   const brokerId = hooks.useConfig("brokerId");
   const { slippage, onSlippageChange } = useSlippage();
   const { t } = i18n.useTranslation();
@@ -4142,10 +4142,10 @@ var useSwapDeposit = (options2) => {
     slippage
   });
   const onSwapDeposit = react.useCallback(async () => {
-    if (!account2.address || !account2.walletAdapter || !swapData || !sourceToken || !targetToken || !brokerId) {
+    if (!account.address || !account.walletAdapter || !swapData || !sourceToken || !targetToken || !brokerId) {
       return;
     }
-    const userAddress = account2.address;
+    const userAddress = account.address;
     const receiver = userAddress;
     const orderlyBridgeFee = depositFee;
     const info = {
@@ -4159,7 +4159,7 @@ var useSwapDeposit = (options2) => {
       data: swapData["1inch"].data
     };
     const perpAccountInfo = {
-      accountId: account2.accountIdHashStr,
+      accountId: account.accountIdHashStr,
       brokerHash: core.utils.parseBrokerHash(brokerId),
       tokenHash: core.utils.parseTokenHash(targetToken.symbol)
     };
@@ -4172,7 +4172,7 @@ var useSwapDeposit = (options2) => {
     };
     console.info("swap deposit payload", payload);
     try {
-      const result = await account2.walletAdapter.sendTransaction(
+      const result = await account.walletAdapter.sendTransaction(
         SWAP_CONTRACT_ADDRESS,
         "deposit",
         payload,
@@ -4187,7 +4187,7 @@ var useSwapDeposit = (options2) => {
       ui.toast.error(err.message || t("common.somethingWentWrong"));
       throw err;
     }
-  }, [account2, brokerId, depositFee, sourceToken, swapData, t, targetToken]);
+  }, [account, brokerId, depositFee, sourceToken, swapData, t, targetToken]);
   return {
     swapPrice,
     swapQuantity,
@@ -4204,7 +4204,7 @@ var useSwapDeposit = (options2) => {
 var useDepositFormScript = (options2) => {
   const { wrongNetwork } = reactApp.useAppContext();
   const { enableSwapDeposit } = hooks.useOrderlyContext();
-  const { account: account2 } = hooks.useAccount();
+  const { account } = hooks.useAccount();
   const networkId = hooks.useConfig("networkId");
   const { chains, currentChain, settingChain, onChainChange } = useChainSelect();
   const swapTokens = useSwapTokens(currentChain?.id, enableSwapDeposit);
@@ -4347,7 +4347,7 @@ var useDepositFormScript = (options2) => {
     dstGasFee: fee.dstGasFee,
     nativeSymbol,
     nativeBalance,
-    account: account2,
+    account,
     currentChain,
     depositError,
     needSwap
@@ -4378,7 +4378,7 @@ var useDepositFormScript = (options2) => {
   const targetQuantityLoading = swapPriceRevalidating;
   const warningMessage = validationMessage || swapErrorMessage;
   const [activeSubTab, setActiveSubTab] = react.useState("web3");
-  const showExclusiveDeposit = account2.walletAdapter?.chainNamespace !== types.ChainNamespace.solana;
+  const showExclusiveDeposit = account.walletAdapter?.chainNamespace !== types.ChainNamespace.solana;
   return {
     sourceToken,
     targetToken,
@@ -4606,9 +4606,9 @@ var TextAreaInput = (props) => {
                 item: accountInfo,
                 disabled: props.disabled,
                 selected: !!selectedAccount && selectedAccount.accountId === accountInfo.accountId,
-                onSelect: (account2) => {
-                  onChange?.(account2.accountId);
-                  setSelectedAccount(account2);
+                onSelect: (account) => {
+                  onChange?.(account.accountId);
+                  setSelectedAccount(account);
                   setAccountDropdownOpen?.(false);
                 }
               }
@@ -4966,7 +4966,7 @@ var useSettlePnl = (options2) => {
   const { accountId } = options2 || {};
   const { t } = i18n.useTranslation();
   const ee = hooks.useEventEmitter();
-  const { account: account2, state } = hooks.useAccount();
+  const { account, state } = hooks.useAccount();
   const [positionData] = hooks.usePositionStream();
   const hasPositions = react.useMemo(
     () => !!positionData?.rows?.length,
@@ -4974,7 +4974,7 @@ var useSettlePnl = (options2) => {
   );
   const onSettlePnl = async () => {
     const isSubAccount = accountId && state.mainAccountId !== accountId;
-    const settleFn = isSubAccount ? account2.settleSubAccount({ subAccountId: accountId }) : account2.settle({ accountId });
+    const settleFn = isSubAccount ? account.settleSubAccount({ subAccountId: accountId }) : account.settle({ accountId });
     return settleFn.then((res) => {
       ui.toast.success(t("settle.settlement.requested"));
       return Promise.resolve(res);
@@ -4986,7 +4986,7 @@ var useSettlePnl = (options2) => {
       ) !== -1) {
         ee.emit("wallet:sign-message-with-ledger-error", {
           message: e.message,
-          userAddress: account2.address
+          userAddress: account.address
         });
       } else if (e.message.indexOf("user rejected") !== -1) {
         ui.toast.error(t("transfer.rejectTransaction"));
@@ -5536,7 +5536,7 @@ var useWithdrawFormScript = (options2) => {
   const [hintMessage, setHintMessage] = react.useState();
   const [withdrawTo, setWithdrawTo] = react.useState("wallet" /* Wallet */);
   const { wrongNetwork, widgetConfigs } = reactApp.useAppContext();
-  const { account: account2, state } = hooks.useAccount();
+  const { account, state } = hooks.useAccount();
   const [chains, { findByChainId }] = hooks.useChains(networkId, {
     filter: (chain) => chain.network_infos?.bridge_enable || chain.network_infos?.bridgeless
   });
@@ -5755,7 +5755,7 @@ var useWithdrawFormScript = (options2) => {
       ) !== -1) {
         ee.emit("wallet:sign-message-with-ledger-error", {
           message: e.message,
-          userAddress: account2.address
+          userAddress: account.address
         });
         return;
       }
@@ -7022,22 +7022,22 @@ var useTransferFormScript = (options2) => {
     }
   }, [tokensInfo, options2.token]);
   const onFromAccountChange = react.useCallback(
-    (account2) => {
-      setFromAccount(account2);
+    (account) => {
+      setFromAccount(account);
       const firstSubAccount = subAccounts?.[0];
-      if (account2?.id === mainAccountId) {
+      if (account?.id === mainAccountId) {
         setToAccount(firstSubAccount);
         return;
       }
-      if (account2?.id && account2?.id !== mainAccountId) {
+      if (account?.id && account?.id !== mainAccountId) {
         setToAccount(mainAccount);
         return;
       }
     },
     [mainAccountId, mainAccount, subAccounts]
   );
-  const onToAccountChange = react.useCallback((account2) => {
-    setToAccount(account2);
+  const onToAccountChange = react.useCallback((account) => {
+    setToAccount(account);
   }, []);
   const onExchange = react.useCallback(() => {
     setFromAccount(toAccount);
@@ -7184,7 +7184,102 @@ var SwapCoin = (props) => {
     }
   );
 };
-var nativeTokenAddress2 = "0x0000000000000000000000000000000000000000";
+var ConvertFormUI = (props) => {
+  const {
+    loading,
+    disabled,
+    quantity,
+    onQuantityChange,
+    maxQuantity,
+    token,
+    targetToken,
+    sourceTokens,
+    onSourceTokenChange,
+    onConvert,
+    slippage,
+    onSlippageChange,
+    convertRate,
+    outAmounts,
+    minimumReceived,
+    isQuoteLoading,
+    currentLTV,
+    nextLTV,
+    networkId,
+    balanceRevalidating
+  } = props;
+  return /* @__PURE__ */ jsxRuntime.jsxs(ui.Box, { className: ui.textVariants({ weight: "semibold" }), children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(ui.Box, { className: "oui-mb-6 lg:oui-mb-8", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Box, { mt: 3, mb: 1, children: /* @__PURE__ */ jsxRuntime.jsx(
+        QuantityInput,
+        {
+          value: quantity,
+          onValueChange: onQuantityChange,
+          token,
+          tokens: sourceTokens,
+          onTokenChange: onSourceTokenChange
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        AvailableQuantity,
+        {
+          token,
+          quantity,
+          maxQuantity: maxQuantity.toString(),
+          loading: balanceRevalidating,
+          onClick: () => {
+            onQuantityChange(maxQuantity.toString());
+          }
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(ExchangeDivider, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        QuantityInput,
+        {
+          readOnly: true,
+          loading: isQuoteLoading,
+          token: targetToken,
+          value: isQuoteLoading || !quantity || Number.isNaN(Number(outAmounts)) ? "" : outAmounts
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "column", itemAlign: "start", mt: 2, gap: 1, children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          SwapCoin,
+          {
+            indexPrice: isQuoteLoading || !quantity || Number.isNaN(Number(convertRate)) ? "-" : convertRate,
+            sourceSymbol: token?.token,
+            targetSymbol: targetToken?.token
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(Slippage, { value: slippage, onValueChange: onSlippageChange }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          MinimumReceived,
+          {
+            symbol: targetToken?.token || "",
+            precision: targetToken?.precision ?? 6,
+            value: isQuoteLoading || !quantity || Number.isNaN(Number(minimumReceived)) ? "-" : minimumReceived.toString()
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          LtvWidget,
+          {
+            showDiff: typeof quantity !== "undefined" && Number(quantity) > 0,
+            currentLtv: currentLTV,
+            nextLTV
+          }
+        )
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { itemAlign: "center", justify: "center", children: /* @__PURE__ */ jsxRuntime.jsx(
+      ConvertAction,
+      {
+        networkId,
+        disabled,
+        loading,
+        onConvert
+      }
+    ) })
+  ] });
+};
 var splitTokenBySymbol = (items) => {
   return items.reduce(
     (result, item) => {
@@ -7198,58 +7293,11 @@ var splitTokenBySymbol = (items) => {
     { usdc: [], others: [] }
   );
 };
-var findMainnetQuoteChainInfo = (tokenInfo) => {
-  const arbitrumChainInfo = tokenInfo.chain_details.find(
-    (item) => parseInt(item.chain_id) === types.Arbitrum.id
-  );
-  const nativeTokenChainInfo = tokenInfo.chain_details.find(
-    (item) => !item.contract_address
-  );
-  if (arbitrumChainInfo) {
-    return {
-      contract_address: arbitrumChainInfo.contract_address || nativeTokenAddress2,
-      quoteChainId: arbitrumChainInfo.chain_id,
-      decimals: arbitrumChainInfo.decimals
-    };
-  }
-  if (nativeTokenChainInfo) {
-    return {
-      contract_address: nativeTokenAddress2,
-      quoteChainId: nativeTokenChainInfo.chain_id,
-      decimals: nativeTokenChainInfo.decimals
-    };
-  }
-  return {
-    contract_address: tokenInfo.chain_details[0]?.contract_address,
-    quoteChainId: tokenInfo.chain_details[0]?.chain_id,
-    decimals: tokenInfo.chain_details[0]?.decimals
-  };
-};
-var getMainnetConvertTokenInfo = (tokenInfo) => {
-  const chainInfo = findMainnetQuoteChainInfo(tokenInfo);
-  if (!chainInfo) {
-    return void 0;
-  }
-  return {
-    ...tokenInfo,
-    symbol: tokenInfo.token,
-    precision: tokenInfo.decimals ?? 6,
-    ...chainInfo
-  };
-};
-var findQuoteTargetChainInfo = (targetToken, quoteChainId) => {
-  const info = targetToken?.chain_details?.find(
-    (item) => item.chain_id === quoteChainId
-  );
-  if (!info) {
-    return void 0;
-  }
-  return {
-    ...info,
-    contract_address: info.contract_address || nativeTokenAddress2,
-    precision: targetToken?.precision
-  };
-};
+var getConvertTokenInfo = (tokenInfo) => ({
+  ...tokenInfo,
+  symbol: tokenInfo.token,
+  precision: tokenInfo.decimals ?? 6
+});
 var useToken3 = (options2) => {
   const { defaultValue } = options2;
   const [sourceToken, setSourceToken] = react.useState();
@@ -7261,11 +7309,7 @@ var useToken3 = (options2) => {
       (item) => item.on_chain_swap
     );
     return filteredTokensInfo.reduce((result, item) => {
-      const tokenInfo = getMainnetConvertTokenInfo(item);
-      if (!tokenInfo) {
-        return result;
-      }
-      result.push(tokenInfo);
+      result.push(getConvertTokenInfo(item));
       return result;
     }, []);
   }, [tokensInfo]);
@@ -7281,28 +7325,20 @@ var useToken3 = (options2) => {
     setSourceTokens(others);
     setTargetToken(usdc[0]);
   }, [defaultValue, newTokensInfo]);
-  const targetChainInfo = react.useMemo(() => {
-    return findQuoteTargetChainInfo(targetToken, sourceToken?.quoteChainId);
-  }, [sourceToken, targetToken]);
   return {
     sourceToken,
     sourceTokens,
     onSourceTokenChange: setSourceToken,
-    targetToken,
-    targetChainInfo
+    targetToken
   };
 };
+var calculateQuoteRate = (inputAmount, estimatedUsdcValue) => new utils.Decimal(estimatedUsdcValue).div(inputAmount).toString();
+var calculateMinimumReceived = (estimatedUsdcValue, slippageLimitPercent) => new utils.Decimal(estimatedUsdcValue).mul(new utils.Decimal(1).minus(new utils.Decimal(slippageLimitPercent).div(100))).toString();
 
 // src/components/convertForm/convertForm.script.tsx
-var { calcMinimumReceived } = perp.account;
 var ORDERLY_CONVERT_SLIPPAGE_KEY = "orderly_convert_slippage";
-var ODOS_QUOTE_DEBOUNCE_MS = 300;
-var normalizeAmount = (amount, decimals) => {
-  return new utils.Decimal(amount).mul(new utils.Decimal(10).pow(decimals)).toFixed(0);
-};
-var unnormalizeAmount = (amount, decimals) => {
-  return new utils.Decimal(amount).div(new utils.Decimal(10).pow(decimals)).toString();
-};
+var SWAP_QUOTE_DEBOUNCE_MS = 300;
+var getQuoteErrorMessage = (error) => error instanceof Error ? error.message : String(error);
 var useConvertFormScript = (options2) => {
   const { token: defaultToken, close } = options2;
   const { t } = i18n.useTranslation();
@@ -7310,15 +7346,9 @@ var useConvertFormScript = (options2) => {
   const config = hooks.useConfig();
   const networkId = config.get("networkId");
   const [quantity, setQuantity] = react.useState("");
-  const { wrongNetwork } = reactApp.useAppContext();
+  const { wrongNetwork, connectWallet } = reactApp.useAppContext();
   const { wallet } = hooks.useWalletConnector();
-  const {
-    sourceToken,
-    sourceTokens,
-    onSourceTokenChange,
-    targetToken,
-    targetChainInfo
-  } = useToken3({ defaultValue: defaultToken });
+  const { sourceToken, sourceTokens, onSourceTokenChange, targetToken } = useToken3({ defaultValue: defaultToken });
   const { walletName, address } = react.useMemo(
     () => ({
       walletName: wallet?.label,
@@ -7331,7 +7361,7 @@ var useConvertFormScript = (options2) => {
   };
   const [slippage, setSlippage] = hooks.useLocalStorage(
     ORDERLY_CONVERT_SLIPPAGE_KEY,
-    1
+    0.5
   );
   const { maxAmount, convert } = hooks.useConvert({ token: sourceToken?.token });
   const onConvert = async () => {
@@ -7357,45 +7387,18 @@ var useConvertFormScript = (options2) => {
   const [
     postQuote,
     { data: quoteData, reset: resetQuote, isMutating: isQuoteLoading }
-  ] = hooks.useOdosQuote();
+  ] = hooks.useSwapQuote();
   const quoteRequest = react.useMemo(() => {
-    const { quoteChainId, contract_address, decimals } = sourceToken || {};
-    const targetAddress = targetChainInfo?.contract_address;
-    if (!quantity || new utils.Decimal(quantity).lte(0) || !quoteChainId || !contract_address || typeof decimals === "undefined" || !targetAddress || !address) {
+    if (!quantity || new utils.Decimal(quantity).lte(0) || !sourceToken?.token || !targetToken?.token) {
       return null;
     }
-    const inputAmount = normalizeAmount(quantity, decimals);
     return {
-      inputAmount,
-      inputTokenAddress: contract_address.toLowerCase(),
-      outputTokenAddress: targetAddress.toLowerCase(),
-      body: {
-        chainId: parseInt(quoteChainId),
-        inputTokens: [
-          {
-            amount: inputAmount,
-            tokenAddress: contract_address
-          }
-        ],
-        outputTokens: [
-          {
-            proportion: 1,
-            tokenAddress: targetAddress
-          }
-        ],
-        userAddr: address
-        // simple: true,
-      }
+      fromToken: sourceToken.token,
+      toToken: targetToken.token,
+      amount: new utils.Decimal(quantity).toNumber(),
+      slippage: new utils.Decimal(slippage).div(100).toNumber()
     };
-  }, [
-    quantity,
-    sourceToken?.quoteChainId,
-    sourceToken?.contract_address,
-    sourceToken?.decimals,
-    targetChainInfo?.contract_address,
-    targetChainInfo?.decimals,
-    address
-  ]);
+  }, [quantity, slippage, sourceToken?.token, targetToken?.token]);
   react.useEffect(() => {
     resetQuote();
     if (!quoteRequest) {
@@ -7403,37 +7406,39 @@ var useConvertFormScript = (options2) => {
     }
     let active = true;
     const timer = window.setTimeout(() => {
-      postQuote(quoteRequest.body).catch((error) => {
+      postQuote(quoteRequest).catch((error) => {
         if (!active) {
           return;
         }
-        let message = t("transfer.convert.failed");
-        if (error instanceof Error) {
-          message = error.message;
-        } else if (error) {
-          message = String(error);
-        }
-        if (message === "Failed to fetch") {
-          message = t("transfer.convert.failed");
+        const code = Number(error?.code);
+        console.error("[convertForm] Swap quote failed:", error);
+        ui.toast.error(getQuoteErrorMessage(error));
+        if (code === -1002) {
+          void Promise.resolve(connectWallet()).catch((connectError) => {
+            console.error(
+              "[convertForm] Account recovery failed:",
+              connectError
+            );
+          });
         }
-        console.error("[convertForm] Odos quote failed:", error);
-        ui.toast.error(message);
         resetQuote();
       });
-    }, ODOS_QUOTE_DEBOUNCE_MS);
+    }, SWAP_QUOTE_DEBOUNCE_MS);
     return () => {
       active = false;
       window.clearTimeout(timer);
     };
-  }, [postQuote, quoteRequest, resetQuote, t]);
+  }, [connectWallet, postQuote, quoteRequest, resetQuote]);
   const isQuoteDataMatched = react.useMemo(() => {
     if (!quoteData || !quoteRequest) {
       return false;
     }
-    const inAmount = quoteData?.inAmounts?.[0]?.toString();
-    const inToken = quoteData?.inTokens?.[0]?.toLowerCase();
-    const outToken = quoteData?.outTokens?.[0]?.toLowerCase();
-    return inAmount === quoteRequest.inputAmount && inToken === quoteRequest.inputTokenAddress && outToken === quoteRequest.outputTokenAddress;
+    const fromToken = quoteData.fromToken;
+    const toToken = quoteData.toToken;
+    if (!fromToken || !toToken || !fromToken.tokenAddress || !toToken.tokenAddress || !fromToken.amount || !toToken.estimatedAmount || !toToken.estimatedValue || !quoteData.gasEstimate || typeof quoteData.expiresAt !== "number") {
+      return false;
+    }
+    return quoteData.expiresAt > Date.now();
   }, [quoteData, quoteRequest]);
   react.useEffect(() => {
     if (quoteData && !isQuoteDataMatched) {
@@ -7442,38 +7447,57 @@ var useConvertFormScript = (options2) => {
   }, [isQuoteDataMatched, quoteData, resetQuote]);
   const memoizedOutAmounts = react.useMemo(() => {
     if (quoteData && !isQuoteLoading && isQuoteDataMatched) {
-      return quoteData?.outAmounts[0];
+      return quoteData.toToken.estimatedValue;
     }
     return "-";
   }, [quoteData, isQuoteDataMatched, isQuoteLoading]);
   const memoizedConvertRate = react.useMemo(() => {
-    if (quoteData && !isQuoteLoading && isQuoteDataMatched) {
-      return new utils.Decimal(
-        unnormalizeAmount(
-          quoteData.outAmounts[0],
-          targetChainInfo?.decimals ?? 6
-        )
-      ).div(
-        unnormalizeAmount(quoteData.inAmounts[0], sourceToken?.decimals ?? 6)
-      ).toString();
+    if (quoteData && quoteRequest && !isQuoteLoading && isQuoteDataMatched) {
+      return calculateQuoteRate(
+        quoteRequest.amount,
+        quoteData.toToken.estimatedValue
+      );
     }
     return "-";
-  }, [
-    isQuoteDataMatched,
-    isQuoteLoading,
-    quoteData,
-    sourceToken,
-    targetChainInfo
-  ]);
+  }, [isQuoteDataMatched, isQuoteLoading, quoteData, quoteRequest]);
   const memoizedMinimumReceived = react.useMemo(() => {
     if (!quoteData || isQuoteLoading || !isQuoteDataMatched) {
-      return 0;
+      return "0";
     }
-    return calcMinimumReceived({
-      amount: quoteData?.outAmounts[0],
-      slippage: Number(slippage)
-    });
-  }, [quoteData, isQuoteDataMatched, isQuoteLoading, slippage]);
+    const effectiveSlippage = Number(quoteData.slippageLimitPercent);
+    if (!Number.isFinite(effectiveSlippage)) {
+      return "0";
+    }
+    return calculateMinimumReceived(
+      quoteData.toToken.estimatedValue,
+      effectiveSlippage.toString()
+    );
+  }, [quoteData, isQuoteDataMatched, isQuoteLoading]);
+  react.useEffect(() => {
+    if (!quoteData || !quoteRequest || !isQuoteDataMatched) {
+      return;
+    }
+    const delay = Math.max(0, quoteData.expiresAt - Date.now());
+    let active = true;
+    const timer = window.setTimeout(() => {
+      resetQuote();
+      postQuote(quoteRequest).catch((error) => {
+        if (!active) {
+          return;
+        }
+        console.error(
+          "[convertForm] Expired swap quote refresh failed:",
+          error
+        );
+        ui.toast.error(getQuoteErrorMessage(error));
+        resetQuote();
+      });
+    }, delay);
+    return () => {
+      active = false;
+      window.clearTimeout(timer);
+    };
+  }, [isQuoteDataMatched, postQuote, quoteData, quoteRequest, resetQuote]);
   const currentLtv = hooks.useComputedLTV();
   const nextLTV = hooks.useComputedLTV({
     input: Number(quantity),
@@ -7506,110 +7530,9 @@ var useConvertFormScript = (options2) => {
     outAmounts: memoizedOutAmounts,
     isQuoteLoading,
     currentLTV: currentLtv,
-    nextLTV,
-    targetChainInfo
+    nextLTV
   };
 };
-var ConvertFormUI = (props) => {
-  const {
-    loading,
-    disabled,
-    quantity,
-    onQuantityChange,
-    maxQuantity,
-    token,
-    targetToken,
-    sourceTokens,
-    onSourceTokenChange,
-    onConvert,
-    slippage,
-    onSlippageChange,
-    convertRate,
-    outAmounts,
-    minimumReceived,
-    isQuoteLoading,
-    currentLTV,
-    nextLTV,
-    networkId,
-    balanceRevalidating,
-    targetChainInfo
-  } = props;
-  return /* @__PURE__ */ jsxRuntime.jsxs(ui.Box, { className: ui.textVariants({ weight: "semibold" }), children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(ui.Box, { className: "oui-mb-6 lg:oui-mb-8", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Box, { mt: 3, mb: 1, children: /* @__PURE__ */ jsxRuntime.jsx(
-        QuantityInput,
-        {
-          value: quantity,
-          onValueChange: onQuantityChange,
-          token,
-          tokens: sourceTokens,
-          onTokenChange: onSourceTokenChange
-        }
-      ) }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        AvailableQuantity,
-        {
-          token,
-          quantity,
-          maxQuantity: maxQuantity.toString(),
-          loading: balanceRevalidating,
-          onClick: () => {
-            onQuantityChange(maxQuantity.toString());
-          }
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx(ExchangeDivider, {}),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        QuantityInput,
-        {
-          readOnly: true,
-          loading: isQuoteLoading,
-          token: targetToken,
-          value: isQuoteLoading || !quantity || Number.isNaN(Number(outAmounts)) ? "" : unnormalizeAmount(outAmounts, targetChainInfo?.decimals ?? 6)
-        }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "column", itemAlign: "start", mt: 2, gap: 1, children: [
-        /* @__PURE__ */ jsxRuntime.jsx(
-          SwapCoin,
-          {
-            indexPrice: isQuoteLoading || !quantity || Number.isNaN(Number(convertRate)) ? "-" : convertRate,
-            sourceSymbol: token?.token,
-            targetSymbol: targetToken?.token
-          }
-        ),
-        /* @__PURE__ */ jsxRuntime.jsx(Slippage, { value: slippage, onValueChange: onSlippageChange }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          MinimumReceived,
-          {
-            symbol: targetToken?.token || "",
-            precision: targetChainInfo?.precision ?? 6,
-            value: isQuoteLoading || !quantity || Number.isNaN(Number(minimumReceived)) ? "-" : unnormalizeAmount(
-              minimumReceived.toString(),
-              targetChainInfo?.decimals ?? 6
-            )
-          }
-        ),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          LtvWidget,
-          {
-            showDiff: typeof quantity !== "undefined" && Number(quantity) > 0,
-            currentLtv: currentLTV,
-            nextLTV
-          }
-        )
-      ] })
-    ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { itemAlign: "center", justify: "center", children: /* @__PURE__ */ jsxRuntime.jsx(
-      ConvertAction,
-      {
-        networkId,
-        disabled,
-        loading,
-        onConvert
-      }
-    ) })
-  ] });
-};
 var ConvertDialogId = "ConvertDialogId";
 var ConvertSheetId = "ConvertSheetId";
 var ConvertFormWidget = (props) => {