Merge pull request #236 from eoscostarica/fix/you-give-calculation

fix: wrong value for asset input
eoscostarica · Oct 16, 2020 · 6bd74b2 · 6bd74b2
2 parents 3713ad6 + f481b42
commit 6bd74b2
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 89 deletions.
diff --git a/src/components/InputTextAndSelect/InputTextAndSelect.js b/src/components/InputTextAndSelect/InputTextAndSelect.js
@@ -89,6 +89,9 @@ const useStyles = makeStyles((theme) => ({
     lineHeight: 1.48,
     letterSpacing: '0.15px',
     color: '#ffffff',
+    '& ::before, & ::after': {
+      display: 'none'
+    },
     '& input': {
       color: '#ffffff',
       '&::placeholder': {

diff --git a/src/language/en/en.json b/src/language/en/en.json
@@ -76,7 +76,8 @@
     "noAmountAdd": "Please enter the amount to add",
     "noAmountRemove": "Please enter the amount to remove",
     "successTransaction": "Transaction successful",
-    "help": "Help"
+    "help": "Help",
+    "errorNumberIsTooBig": "The number is too big"
   },
   "fee": {
     "title": "Vote Your Fee",
@@ -120,7 +121,8 @@
     "pool": "Pool",
     "help": "Help",
     "valueOverWalletBalance": "Value is over your wallet balance",
-    "valueOverPoolBalance": "Value is over pool balance"
+    "valueOverPoolBalance": "Value is over pool balance",
+    "errorNumberIsTooBig": "The number is too big"
   },
   "about": {
     "title": "About evodex"

diff --git a/src/language/es/es.json b/src/language/es/es.json
@@ -77,7 +77,8 @@
     "noAmountAdd": "Por favor ingrese el monto a enviar",
     "noAmountRemove": "Por favor ingrese el monto a retirar",
     "successTransaction": "Transacción realizada",
-    "help": "Ayuda"
+    "help": "Ayuda",
+    "errorNumberIsTooBig": "El numero ingresado es muy grande"
   },
   "fee": {
     "title": "Votar Valor de la Comisión",
@@ -121,7 +122,8 @@
     "pool": "Pool",
     "help": "Ayuda",
     "valueOverWalletBalance": "El valor supera el balance de su billetera",
-    "valueOverPoolBalance": "El valor supera el balance del pool"
+    "valueOverPoolBalance": "El valor supera el balance del pool",
+    "errorNumberIsTooBig": "El numero ingresado es muy grande"
   },
   "about": {
     "title": "Acerca de evodex"

diff --git a/src/language/ru/ru.json b/src/language/ru/ru.json
@@ -76,7 +76,8 @@
     "noAmountAdd": "Пожалуйста, введите сумму, которую нужно добавить",
     "noAmountRemove": "Введите сумму, которую нужно удалить",
     "successTransaction": "Транзакция успешна",
-    "help": "Помощь"
+    "help": "Помощь",
+    "errorNumberIsTooBig": "Номер слишком большой"
   },
   "fee": {
     "title": "Проголосуйте за комиссию",
@@ -118,7 +119,8 @@
     "pool": "Пул",
     "help": "Помощь",
     "valueOverWalletBalance": "Ценность над балансом вашего кошелька",
-    "valueOverPoolBalance": "Ценность над балансом пула"
+    "valueOverPoolBalance": "Ценность над балансом пула",
+    "errorNumberIsTooBig": "Номер слишком большой"
   },
   "about": {
     "title": "О evodex"

diff --git a/src/language/zh/zh.json b/src/language/zh/zh.json
@@ -76,7 +76,8 @@
     "noAmountAdd": "请填写一个数量 添加",
     "noAmountRemove": "请填写一个数量 移除",
     "successTransaction": "交易成功",
-    "help": "帮帮我"
+    "help": "帮帮我",
+    "errorNumberIsTooBig": "这个数字太大"
   },
   "fee": {
     "title": "费率投票",

diff --git a/src/routes/Evodex/BackLayer/Exchange/ExchangeBackLayer.js b/src/routes/Evodex/BackLayer/Exchange/ExchangeBackLayer.js
@@ -239,23 +239,37 @@ const ExchangeBackLayer = ({ onReload, ual, isLightMode, showMessage }) => {
       return
     }
 
-    const assets = getExchangeAssets(value.inputValue, pair)
-    setAssets(assets)
-    setInputsData((prevState) => {
-      const data = {
-        ...prevState[secondField],
-        inputValue: assets[assetTo].toString().split(' ')[0]
-      }
-      validate(data)
-
-      return {
-        [mainField]: {
-          ...prevState[mainField],
-          ...value
-        },
-        [secondField]: data
-      }
-    })
+    try {
+      const assets = getExchangeAssets(value.inputValue, pair)
+      setAssets(assets)
+      setInputsData((prevState) => {
+        const data = {
+          ...prevState[secondField],
+          inputValue: assets[assetTo].toString().split(' ')[0]
+        }
+        validate(data)
+
+        return {
+          [mainField]: {
+            ...prevState[mainField],
+            ...value
+          },
+          [secondField]: data
+        }
+      })
+    } catch (error) {
+      // TODO: improve error handler
+      console.log(error.message)
+      setInputsData((prevState) => ({
+        ...prevState,
+        [mainField]: value,
+        [secondField]: {
+          ...prevState[secondField],
+          inputValue: ''
+        }
+      }))
+      setInputError((prev) => ({ ...prev, [mainField]: 'errorNumberIsTooBig' }))
+    }
   }
 
   const validateYouGive = (value) => {
@@ -491,23 +505,27 @@ const ExchangeBackLayer = ({ onReload, ual, isLightMode, showMessage }) => {
         return
       }
 
-      const pool1 =
-        (await evolutiondex.getUserTokenBalance(ual, pair.pool1)) ||
-        `0 ${pair.pool1.asset.symbol.code().toString()}`
-      const pool2 =
-        (await evolutiondex.getUserTokenBalance(ual, pair.pool2)) ||
-        `0 ${pair.pool2.asset.symbol.code().toString()}`
-      balance = {
-        [pair.pool1.asset.symbol.code().toString()]: {
-          ...balance[pair.pool1.asset.symbol.code().toString()],
-          userAsset: pool1,
-          userAmount: parseFloat(pool1.split(' ')[0] || 0)
-        },
-        [pair.pool2.asset.symbol.code().toString()]: {
-          ...balance[pair.pool2.asset.symbol.code().toString()],
-          userAsset: pool2,
-          userAmount: parseFloat(pool2.split(' ')[0] || 0)
+      try {
+        const pool1 =
+          (await evolutiondex.getUserTokenBalance(ual, pair.pool1)) ||
+          `0 ${pair.pool1.asset.symbol.code().toString()}`
+        const pool2 =
+          (await evolutiondex.getUserTokenBalance(ual, pair.pool2)) ||
+          `0 ${pair.pool2.asset.symbol.code().toString()}`
+        balance = {
+          [pair.pool1.asset.symbol.code().toString()]: {
+            ...balance[pair.pool1.asset.symbol.code().toString()],
+            userAsset: pool1,
+            userAmount: parseFloat(pool1.split(' ')[0] || 0)
+          },
+          [pair.pool2.asset.symbol.code().toString()]: {
+            ...balance[pair.pool2.asset.symbol.code().toString()],
+            userAsset: pool2,
+            userAmount: parseFloat(pool2.split(' ')[0] || 0)
+          }
         }
+      } catch (error) {
+        console.log(error.message)
       }
       setBalance(balance)
     }

diff --git a/src/routes/Evodex/BackLayer/Fee/FeeBackLayer.js b/src/routes/Evodex/BackLayer/Fee/FeeBackLayer.js
@@ -261,6 +261,12 @@ const FeeBackLayer = ({
                 return false
               }
 
+              const [, floatSection = ''] = value.split('.')
+
+              if (floatSection.length > 2) {
+                return false
+              }
+
               const floatValue = parseFloat(value)
 
               if (floatValue < 0 || value === '00') return false