diff --git a/src/components/SendTransaction/CreateDataRequestForm.vue b/src/components/SendTransaction/CreateDataRequestForm.vue index 5ae1da284..83f6ffc3e 100644 --- a/src/components/SendTransaction/CreateDataRequestForm.vue +++ b/src/components/SendTransaction/CreateDataRequestForm.vue @@ -103,6 +103,9 @@ export default { const isGrtThanBalance = (rule, value, callback) => { return formValidation().isGrtThanBalance(rule, value, callback) } + const isDecimalAmountValid = (rule, value, callback) => { + return formValidation.isDecimalAmountValid(rule, value, callback) + } const maxNumber = (rule, value, callback) => { return formValidation().maxNumber(rule, value, callback) } @@ -140,6 +143,10 @@ export default { message: this.$t('create_dr_form_error_required_field'), trigger: 'blur', }, + { + validator: isDecimalAmountValid, + trigger: 'blur', + }, { validator: isNumber, trigger: 'blur' }, { validator: maxNumber, trigger: 'blur' }, { validator: minAmount, trigger: 'submit' }, @@ -152,6 +159,10 @@ export default { message: this.$t('create_dr_form_error_required_field'), trigger: 'blur', }, + { + validator: isDecimalAmountValid, + trigger: 'blur', + }, { validator: isNumber, trigger: 'blur' }, { validator: minCollateralAmount, trigger: 'submit' }, { validator: maxNumber, trigger: 'blur' }, @@ -184,6 +195,10 @@ export default { message: this.$t('create_dr_form_error_required_field'), trigger: 'blur', }, + { + validator: isDecimalAmountValid, + trigger: 'blur', + }, { validator: isGrtThanBalance, trigger: 'blur' }, { validator: isNumber, trigger: 'blur' }, { validator: minAmount, trigger: 'submit' }, diff --git a/src/components/SendTransaction/SelectEstimatedFee.vue b/src/components/SendTransaction/SelectEstimatedFee.vue index 84895f6ba..b44085583 100644 --- a/src/components/SendTransaction/SelectEstimatedFee.vue +++ b/src/components/SendTransaction/SelectEstimatedFee.vue @@ -26,15 +26,6 @@ isDrTx ? option.transaction.fee : option.transaction.metadata.fee " /> -

- {{ feeEstimationReportError.message }} -

-

- {{ option.transaction.error }} -

{{ getTimeDuration(option.report.time_to_block, locale) }}

@@ -199,7 +190,7 @@ export default { } &.disabled { - border: var(--select-box-error-border); + opacity: 0.6; cursor: not-allowed; } } diff --git a/src/components/SendTransaction/SendValueTransferForm.vue b/src/components/SendTransaction/SendValueTransferForm.vue index 750542c12..b3355623c 100644 --- a/src/components/SendTransaction/SendValueTransferForm.vue +++ b/src/components/SendTransaction/SendValueTransferForm.vue @@ -1,6 +1,6 @@