fix: CR-832 edit order (#2487)

* fix: CR-832 edit order * fix: invalid input * chore: add goplus tooltip
KyberNetwork · Apr 4, 2024 · 4373893 · 4373893
1 parent 5bef6ba
commit 4373893
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/components/swapv2/LimitOrder/EditOrderModal.tsx b/src/components/swapv2/LimitOrder/EditOrderModal.tsx
@@ -196,7 +196,6 @@ export default function EditOrderModal({
             note={note}
             orderInfo={order}
             defaultExpire={defaultExpire}
-            useUrlParams
           />
         )}
       </Wrapper>

diff --git a/src/components/swapv2/LimitOrder/LimitOrderForm.tsx b/src/components/swapv2/LimitOrder/LimitOrderForm.tsx
@@ -382,7 +382,10 @@ const LimitOrderForm = forwardRef<LimitOrderFormHandle, Props>(function LimitOrd
       if (currencyIn && activeOrderMakingAmount) {
         const value = TokenAmount.fromRawAmount(currencyIn, JSBI.BigInt(activeOrderMakingAmount))
         if (isEdit && orderInfo) {
-          return value.subtract(TokenAmount.fromRawAmount(currencyIn, JSBI.BigInt(orderInfo.makingAmount)))
+          const makingAmount = TokenAmount.fromRawAmount(currencyIn, JSBI.BigInt(orderInfo.makingAmount))
+          return value.greaterThan(makingAmount)
+            ? value.subtract(makingAmount)
+            : TokenAmount.fromRawAmount(currencyIn, 0)
         }
         return value
       }
@@ -615,11 +618,11 @@ const LimitOrderForm = forwardRef<LimitOrderFormHandle, Props>(function LimitOrd
 
   const autoFillMarketPrice = useRef(false)
   useEffect(() => {
-    if (tradeInfo && !autoFillMarketPrice.current && !loadingTrade) {
+    if (tradeInfo && !autoFillMarketPrice.current && !loadingTrade && !defaultRate?.rate) {
       autoFillMarketPrice.current = true
       setPriceRateMarket(true)
     }
-  }, [tradeInfo, setPriceRateMarket, loadingTrade])
+  }, [tradeInfo, setPriceRateMarket, loadingTrade, defaultRate?.rate])
 
   const trackingTouchInput = useCallback(() => {
     mixpanelHandler(MIXPANEL_TYPE.LO_ENTER_DETAIL, 'touch enter amount box')

diff --git a/src/components/swapv2/LimitOrder/useValidateInputError.tsx b/src/components/swapv2/LimitOrder/useValidateInputError.tsx
@@ -37,7 +37,7 @@ const useValidateInputError = ({
   const { setInputValue } = useLimitActionHandlers()
   const inputError = useMemo(() => {
     try {
-      if (!inputAmount || !account) return
+      if (!account) return
       if (parseFloat(inputAmount) === 0 && (parseFloat(outputAmount) === 0 || parseFloat(displayRate) === 0)) {
         return t`Invalid input amount`
       }

diff --git a/src/components/swapv2/TokenInfo/index.tsx b/src/components/swapv2/TokenInfo/index.tsx
@@ -12,6 +12,7 @@ import { ReactComponent as SecurityInfoIcon } from 'assets/svg/security_info.svg
 import { ReactComponent as ZiczacIcon } from 'assets/svg/ziczac.svg'
 import { ButtonEmpty } from 'components/Button'
 import CurrencyLogo from 'components/CurrencyLogo'
+import { MouseoverTooltip, TextDashed } from 'components/Tooltip'
 import MarketInfo from 'components/swapv2/TokenInfo/MarketInfo'
 import SecurityInfo from 'components/swapv2/TokenInfo/SecurityInfo'
 import { useActiveWeb3React } from 'hooks'
@@ -158,7 +159,14 @@ const TokenInfoTab = ({ currencies, onBack }: { currencies: { [field in Field]?:
       <HeaderPanel>
         <LabelHeaderPanel>
           <SecurityInfoIcon />
-          <Trans>Security Info</Trans>
+
+          <TextDashed underlineColor={theme.text}>
+            <MouseoverTooltip
+              text={t`Token security info provided by Goplus. Please conduct your own research before trading`}
+            >
+              <Trans>Security Info</Trans>
+            </MouseoverTooltip>
+          </TextDashed>
         </LabelHeaderPanel>
         <PoweredByWrapper>
           <PoweredByText>