From d204b980d7febe8267ef802dd1079b11cdb0f745 Mon Sep 17 00:00:00 2001
From: saml33 <slam.uke@gmail.com>
Date: Fri, 8 Dec 2023 14:52:18 +1100
Subject: [PATCH] add more trade form validation

---
 components/trade/AdvancedTradeForm.tsx | 32 ++++++++++++++++++++++----
 hooks/useSelectedMarket.ts             |  1 +
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/components/trade/AdvancedTradeForm.tsx b/components/trade/AdvancedTradeForm.tsx
index 7d4e5776..9d2b27f8 100644
--- a/components/trade/AdvancedTradeForm.tsx
+++ b/components/trade/AdvancedTradeForm.tsx
@@ -52,6 +52,7 @@ import useSelectedMarket from 'hooks/useSelectedMarket'
 import {
   floorToDecimal,
   formatCurrencyValue,
+  formatNumericValue,
   getDecimalCount,
 } from 'utils/numbers'
 import LogoWithFallback from '@components/shared/LogoWithFallback'
@@ -134,6 +135,7 @@ const AdvancedTradeForm = () => {
     quoteLogoURI,
     quoteSymbol,
     serumOrPerpMarket,
+    marketAddress,
   } = useSelectedMarket()
   const { remainingBorrowsInPeriod, timeToNextPeriod } =
     useRemainingBorrowsInPeriod()
@@ -215,7 +217,6 @@ const AdvancedTradeForm = () => {
           s.tradeForm.quoteSize = ''
         }
       })
-      setFormErrors({})
     },
     [oraclePrice],
   )
@@ -236,7 +237,6 @@ const AdvancedTradeForm = () => {
           s.tradeForm.baseSize = ''
         }
       })
-      setFormErrors({})
     },
     [oraclePrice],
   )
@@ -398,6 +398,13 @@ const AdvancedTradeForm = () => {
     }
   }, [baseBank, quoteBank, selectedMarket])
 
+  // clear form errors on base size change or new market
+  useEffect(() => {
+    if (Object.keys(formErrors).length) {
+      setFormErrors({})
+    }
+  }, [tradeForm.baseSize, marketAddress])
+
   /*
    * Updates the limit price on page load
    */
@@ -506,7 +513,15 @@ const AdvancedTradeForm = () => {
           tradeForm.side,
         )
       }
-
+      const invalidFields = isFormValid({
+        baseSize: baseSize,
+        price: tradeForm.price,
+        orderType: tradeForm.tradeType,
+        side: tradeForm.side,
+      })
+      if (Object.keys(invalidFields).length) {
+        return
+      }
       if (selectedMarket instanceof Serum3Market) {
         const spotOrderType = tradeForm.ioc
           ? Serum3OrderType.immediateOrCancel
@@ -732,7 +747,7 @@ const AdvancedTradeForm = () => {
       }
       if (baseSize < minOrderSize) {
         invalidFields.baseSize = t('trade:min-order-size-error', {
-          minSize: minOrderSize,
+          minSize: formatNumericValue(minOrderSize, minOrderDecimals),
           symbol: baseSymbol,
         })
       }
@@ -741,7 +756,14 @@ const AdvancedTradeForm = () => {
       }
       return invalidFields
     },
-    [baseBank, isTriggerOrder, minOrderSize, oraclePrice, setFormErrors],
+    [
+      baseBank,
+      isTriggerOrder,
+      minOrderDecimals,
+      minOrderSize,
+      oraclePrice,
+      setFormErrors,
+    ],
   )
 
   const tooMuchSize = useMemo(() => {
diff --git a/hooks/useSelectedMarket.ts b/hooks/useSelectedMarket.ts
index c89e2758..eab8d9ed 100644
--- a/hooks/useSelectedMarket.ts
+++ b/hooks/useSelectedMarket.ts
@@ -112,5 +112,6 @@ export default function useSelectedMarket() {
     quoteSymbol,
     baseLogoURI,
     quoteLogoURI,
+    marketAddress,
   }
 }