hot fixes for decimal and liquidity bugs (Uniswap#309)

rupiah-token · May 27, 2019 · 8649ddc · 8649ddc
1 parent eb09660
commit 8649ddc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/src/pages/Pool/AddLiquidity.js b/src/pages/Pool/AddLiquidity.js
@@ -340,7 +340,7 @@ export default function AddLiquidity() {
 
   // parse input value
   useEffect(() => {
-    if (isNewExchange === false && inputValue && marketRate && lastEditedField === INPUT) {
+    if (isNewExchange === false && inputValue && marketRate && lastEditedField === INPUT && decimals) {
       try {
         const parsedValue = ethers.utils.parseUnits(inputValue, 18)
 
@@ -353,10 +353,12 @@ export default function AddLiquidity() {
         const currencyAmount = marketRate
           .mul(parsedValue)
           .div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18)))
+          .div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18 - decimals)))
+
         setOutputValueParsed(currencyAmount)
         dispatchAddLiquidityState({
           type: 'UPDATE_DEPENDENT_VALUE',
-          payload: { field: OUTPUT, value: amountFormatter(currencyAmount, 18, 4, false) }
+          payload: { field: OUTPUT, value: amountFormatter(currencyAmount, decimals, 4, false) }
         })
 
         return () => {
@@ -372,13 +374,13 @@ export default function AddLiquidity() {
         setOutputError(t('inputNotValid'))
       }
     }
-  }, [inputValue, isNewExchange, lastEditedField, marketRate, t])
+  }, [inputValue, isNewExchange, lastEditedField, marketRate, decimals, t])
 
   // parse output value
   useEffect(() => {
-    if (isNewExchange === false && outputValue && marketRateInverted && lastEditedField === OUTPUT) {
+    if (isNewExchange === false && outputValue && marketRateInverted && lastEditedField === OUTPUT && decimals) {
       try {
-        const parsedValue = ethers.utils.parseUnits(outputValue, 18)
+        const parsedValue = ethers.utils.parseUnits(outputValue, decimals)
 
         if (parsedValue.lte(ethers.constants.Zero) || parsedValue.gte(ethers.constants.MaxUint256)) {
           throw Error()
@@ -388,7 +390,8 @@ export default function AddLiquidity() {
 
         const currencyAmount = marketRateInverted
           .mul(parsedValue)
-          .div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18)))
+          .div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(decimals)))
+
         setInputValueParsed(currencyAmount)
         dispatchAddLiquidityState({
           type: 'UPDATE_DEPENDENT_VALUE',
@@ -408,7 +411,7 @@ export default function AddLiquidity() {
         setInputError(t('inputNotValid'))
       }
     }
-  }, [outputValue, isNewExchange, lastEditedField, marketRateInverted, t])
+  }, [outputValue, isNewExchange, lastEditedField, marketRateInverted, decimals, t])
 
   // input validation
   useEffect(() => {
@@ -420,14 +423,14 @@ export default function AddLiquidity() {
       }
     }
 
-    if (outputValueParsed && outputBalance) {
-      if (outputValueParsed.gt(outputBalance)) {
+    if (outputValueMax && outputBalance) {
+      if (outputValueMax.gt(outputBalance)) {
         setOutputError(t('insufficientBalance'))
       } else {
         setOutputError(null)
       }
     }
-  }, [inputValueParsed, inputBalance, outputValueParsed, outputBalance, t])
+  }, [inputValueParsed, inputBalance, outputValueMax, outputBalance, t])
 
   const allowance = useAddressAllowance(account, outputCurrency, exchangeAddress)
   const [showUnlock, setShowUnlock] = useState(false)

diff --git a/src/pages/Pool/RemoveLiquidity.js b/src/pages/Pool/RemoveLiquidity.js
@@ -142,13 +142,13 @@ export default function RemoveLiquidity() {
       : undefined
 
   const ethWithdrawn =
-    ETHPer &&
-    valueParsed &&
-    ETHPer.mul(valueParsed).div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18)))
+    ETHPer && valueParsed
+      ? ETHPer.mul(valueParsed).div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18)))
+      : undefined
   const tokenWithdrawn =
-    tokenPer &&
-    valueParsed &&
-    tokenPer.mul(valueParsed).div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18)))
+    tokenPer && valueParsed
+      ? tokenPer.mul(valueParsed).div(ethers.utils.bigNumberify(10).pow(ethers.utils.bigNumberify(18)))
+      : undefined
 
   const ethWithdrawnMin = ethWithdrawn ? calculateSlippageBounds(ethWithdrawn).minimum : undefined
   const tokenWithdrawnMin = tokenWithdrawn ? calculateSlippageBounds(tokenWithdrawn).minimum : undefined
@@ -284,20 +284,20 @@ export default function RemoveLiquidity() {
       </OversizedPanel>
       <CurrencyInputPanel
         title={t('output')}
-        description={ethWithdrawn && tokenWithdrawn ? `(${t('estimated')})` : ''}
+        description={ethWithdrawnMin && tokenWithdrawnMin ? `(${t('estimated')})` : ''}
         key="remove-liquidity-input"
         renderInput={() =>
-          ethWithdrawn && tokenWithdrawn ? (
+          ethWithdrawnMin && tokenWithdrawnMin ? (
             <div className="remove-liquidity__output">
               <div className="remove-liquidity__output-text">{`${amountFormatter(
-                ethWithdrawn,
+                ethWithdrawnMin,
                 18,
                 4,
                 false
               )} ETH`}</div>
               <div className="remove-liquidity__output-plus"> + </div>
               <div className="remove-liquidity__output-text">{`${amountFormatter(
-                tokenWithdrawn,
+                tokenWithdrawnMin,
                 decimals,
                 Math.min(4, decimals)
               )} ${symbol}`}</div>