Merge pull request #18 from enyalabs/dev_exit

Fixed input error
omgnetwork · May 1, 2021 · 0d2eb5a · 0d2eb5a
2 parents 39fe034 + 9774abc
commit 0d2eb5a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/wallet/src/components/walletpicker/WalletPicker.js b/wallet/src/components/walletpicker/WalletPicker.js
@@ -32,9 +32,6 @@ import { setWalletMethod, setNetwork } from 'actions/setupAction';
 import { getAllNetworks } from 'util/networkName';
 
 import logo from 'images/omgx.png';
-import vp1 from 'images/vp_1.svg';
-import vp2 from 'images/vp_2.svg';
-import vp3 from 'images/vp_3.svg';
 import chevron from 'images/chevron.svg';
 
 import * as styles from './WalletPicker.module.scss';

diff --git a/wallet/src/containers/modals/exit/steps/DoExitStep.js b/wallet/src/containers/modals/exit/steps/DoExitStep.js
@@ -41,6 +41,7 @@ function DoExitStep ({
   const [ value, setValue ] = useState('');
   const [ LPBalance, setLPBalance ] = useState(0);
   const [ feeRate, setFeeRate ] = useState(0);
+  const [ disabledSubmit, setDisabledSubmit ] = useState(true);
 
   const balances = useSelector(selectChildchainBalance, isEqual);
 
@@ -100,14 +101,24 @@ function DoExitStep ({
   }
 
   function getMaxTransferValue () {
-
     const transferingBalanceObject = balances.find(i => i.currency === currency);
     if (!transferingBalanceObject) {
       return;
     }
     return logAmount(transferingBalanceObject.amount, transferingBalanceObject.decimals);
   }
 
+  function setExitAmount(value) {
+    const transferingBalanceObject = balances.find(i => i.currency === currency);
+    const maxTransferValue = Number(logAmount(transferingBalanceObject.amount, transferingBalanceObject.decimals));
+    if (value > 0 && (fast ? value < LPBalance : true) && value < maxTransferValue) {
+      setDisabledSubmit(false);
+    } else {
+      setDisabledSubmit(true);
+    }
+    setValue(value);
+  }
+
   return (
     <>
 
@@ -123,7 +134,7 @@ function DoExitStep ({
         placeholder={0}
         value={value}
         onChange={i => {
-          setValue(i.target.value);
+          setExitAmount(i.target.value);
         }}
         selectOptions={selectOptions}
         onSelect={i => {
@@ -175,6 +186,7 @@ function DoExitStep ({
           loading={submitLoading}
           className={styles.button}
           tooltip='Your exit is still pending. Please wait for confirmation.'
+          disabled={disabledSubmit}
         >
           EXIT
         </Button>