diff --git a/new-lamassu-admin/src/pages/Services/schemas/binanceus.js b/new-lamassu-admin/src/pages/Services/schemas/binanceus.js index d0622457..61090700 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/binanceus.js +++ b/new-lamassu-admin/src/pages/Services/schemas/binanceus.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'binanceus', diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js index 974cdbc9..f810a728 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js +++ b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js @@ -6,7 +6,7 @@ import { Autocomplete } from 'src/components/inputs/formik' -import secretTest from './helper' +import { secretTest } from './helper' const isDefined = it => it && it.length diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js b/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js index 82817853..18676b29 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js +++ b/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'bitstamp', diff --git a/new-lamassu-admin/src/pages/Services/schemas/cex.js b/new-lamassu-admin/src/pages/Services/schemas/cex.js index 07102df4..e56d1f23 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/cex.js +++ b/new-lamassu-admin/src/pages/Services/schemas/cex.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'cex', diff --git a/new-lamassu-admin/src/pages/Services/schemas/ciphertrace.js b/new-lamassu-admin/src/pages/Services/schemas/ciphertrace.js index b5b6d22f..cc88d805 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/ciphertrace.js +++ b/new-lamassu-admin/src/pages/Services/schemas/ciphertrace.js @@ -4,7 +4,7 @@ import CheckboxFormik from 'src/components/inputs/formik/Checkbox' import NumberInputFormik from 'src/components/inputs/formik/NumberInput' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' -import secretTest from './helper' +import { secretTest, leadingZerosTest } from './helper' export default { code: 'ciphertrace', @@ -37,15 +37,19 @@ export default { ], getValidationSchema: account => { return Yup.object().shape({ - authorizationValue: Yup.string('The score threshold must be a string') - .required('The authorization value is required') + authorizationValue: Yup.string('The authorization value must be a string') .max(100, 'Too long') .test(secretTest(account?.authorizationValue)), scoreThreshold: Yup.number('The score threshold must be a number') .required('A score threshold is required') - .min(1, 'The number should be between 1 and 10') - .max(10, 'The number should be between 1 and 10') - .test(secretTest(account?.scoreThreshold)) + .min(1, 'The score threshold must be between 1 and 10') + .max(10, 'The score threshold must be between 1 and 10') + .integer('The score threshold must be an integer') + .test( + 'no-leading-zeros', + 'The score threshold must not have leading zeros', + leadingZerosTest + ) }) } } diff --git a/new-lamassu-admin/src/pages/Services/schemas/ftx.js b/new-lamassu-admin/src/pages/Services/schemas/ftx.js index 48b130f1..264ff801 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/ftx.js +++ b/new-lamassu-admin/src/pages/Services/schemas/ftx.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'ftx', diff --git a/new-lamassu-admin/src/pages/Services/schemas/helper.js b/new-lamassu-admin/src/pages/Services/schemas/helper.js index fbd67bb8..e1d1ff3f 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/helper.js +++ b/new-lamassu-admin/src/pages/Services/schemas/helper.js @@ -9,4 +9,14 @@ const secretTest = secret => ({ } }) -export default secretTest +const leadingZerosTest = (value, context) => { + if ( + R.startsWith('0', context.originalValue) && + R.length(context.originalValue) > 1 + ) { + return context.createError() + } + return true +} + +export { secretTest, leadingZerosTest } diff --git a/new-lamassu-admin/src/pages/Services/schemas/infura.js b/new-lamassu-admin/src/pages/Services/schemas/infura.js index c2669ba0..ee9d0d84 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/infura.js +++ b/new-lamassu-admin/src/pages/Services/schemas/infura.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'infura', diff --git a/new-lamassu-admin/src/pages/Services/schemas/itbit.js b/new-lamassu-admin/src/pages/Services/schemas/itbit.js index 22e48c57..dc9a9645 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/itbit.js +++ b/new-lamassu-admin/src/pages/Services/schemas/itbit.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'itbit', diff --git a/new-lamassu-admin/src/pages/Services/schemas/kraken.js b/new-lamassu-admin/src/pages/Services/schemas/kraken.js index dc7b090c..6848b05d 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/kraken.js +++ b/new-lamassu-admin/src/pages/Services/schemas/kraken.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'kraken', diff --git a/new-lamassu-admin/src/pages/Services/schemas/twilio.js b/new-lamassu-admin/src/pages/Services/schemas/twilio.js index a38aafa0..cf5a0174 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/twilio.js +++ b/new-lamassu-admin/src/pages/Services/schemas/twilio.js @@ -3,7 +3,7 @@ import * as Yup from 'yup' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' -import secretTest from './helper' +import { secretTest } from './helper' export default { code: 'twilio',