Merge pull request #1062 from poanetwork/issue#1051

(Bug) Dutch: Deployment is failed if minRate=maxRate in Step2
poanetwork · Jul 25, 2018 · 12b87a7 · 12b87a7
2 parents 7ce53ca + f7e1fc3
commit 12b87a7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/src/components/Common/DutchAuctionBlock.js b/src/components/Common/DutchAuctionBlock.js
@@ -10,8 +10,9 @@ import {
   isDatePreviousThan,
   isDateSameOrLaterThan,
   isDateSameOrPreviousThan,
-  isGreaterOrEqualThan,
   isInteger,
+  isLessThan,
+  isGreaterThan,
   isLessOrEqualThan,
   isPositive,
   isRequired
@@ -104,7 +105,7 @@ export const DutchAuctionBlock = inject('tierStore', 'tokenStore')(
                     const errors = composeValidators(
                       isPositive(),
                       isInteger(),
-                      isLessOrEqualThan('Should be less than or equal to Max Rate')(allValues.tiers[index].maxRate),
+                      isLessThan('Should be less than Max Rate')(allValues.tiers[index].maxRate),
                       isLessOrEqualThan('Should be less than or equal to 1 quintillion (10^18)')('1e18')
                     )(value)
 
@@ -123,9 +124,7 @@ export const DutchAuctionBlock = inject('tierStore', 'tokenStore')(
                     const errors = composeValidators(
                       isPositive(),
                       isInteger(),
-                      isGreaterOrEqualThan('Should be greater than or equal to Min Rate')(
-                        allValues.tiers[index].minRate
-                      ),
+                      isGreaterThan('Should be greater than Min Rate')(allValues.tiers[index].minRate),
                       isLessOrEqualThan('Should less than or equal to 1 quintillion (10^18)')('1e18')
                     )(value)
 

diff --git a/src/utils/constants.js b/src/utils/constants.js
@@ -135,7 +135,9 @@ export const VALIDATION_MESSAGES = {
   ADDRESS: 'Please enter a valid address',
   REQUIRED: 'This field is required',
   DECIMAL_PLACES: 'Decimals should not exceed the amount of decimals specified',
+  LESS: 'Should be less than the specified value',
   LESS_OR_EQUAL: 'Should be less or equal than the specified value',
+  GREATER: 'Should be greater than the specified value',
   GREATER_OR_EQUAL: 'Should be greater or equal than the specified value',
   INTEGER: 'Should be integer',
   DATE_IN_FUTURE: 'Should be set in the future',

diff --git a/src/utils/validations.js b/src/utils/validations.js
@@ -61,6 +61,16 @@ export const isDecimalPlacesNotGreaterThan = (
   return isValid ? undefined : errorMsg
 }
 
+export const isLessThan = (errorMsg = VALIDATION_MESSAGES.LESS) => (maxValue = Infinity) => value => {
+  try {
+    const max = toBigNumber(String(maxValue), false)
+    const isValid = max && max.gt(value)
+    return isValid ? undefined : errorMsg
+  } catch (e) {
+    return errorMsg
+  }
+}
+
 export const isLessOrEqualThan = (errorMsg = VALIDATION_MESSAGES.LESS_OR_EQUAL) => (maxValue = Infinity) => value => {
   try {
     const max = toBigNumber(String(maxValue), false)
@@ -71,6 +81,16 @@ export const isLessOrEqualThan = (errorMsg = VALIDATION_MESSAGES.LESS_OR_EQUAL)
   }
 }
 
+export const isGreaterThan = (errorMsg = VALIDATION_MESSAGES.GREATER) => (minValue = Number.MIN_VALUE) => value => {
+  try {
+    const min = toBigNumber(String(minValue), false)
+    const isValid = min && min.lt(value)
+    return isValid ? undefined : errorMsg
+  } catch (e) {
+    return errorMsg
+  }
+}
+
 export const isGreaterOrEqualThan = (errorMsg = VALIDATION_MESSAGES.GREATER_OR_EQUAL) => (
   minValue = Number.MIN_VALUE
 ) => value => {