fix: suspension day validation
This commit is contained in:
parent
9094569b83
commit
0069ba8402
2 changed files with 11 additions and 8 deletions
|
|
@ -228,7 +228,7 @@ const Wizard = ({ onClose, save, error, currency }) => {
|
|||
const isSuspend = values?.requirement?.requirement === 'suspend'
|
||||
|
||||
const hasRequirementError =
|
||||
!!errors.requirement?.suspensionDays &&
|
||||
!!errors.requirement &&
|
||||
!!touched.requirement?.suspensionDays &&
|
||||
(!values.requirement?.suspensionDays ||
|
||||
values.requirement?.suspensionDays < 0)
|
||||
|
|
@ -254,8 +254,9 @@ const Wizard = ({ onClose, save, error, currency }) => {
|
|||
)
|
||||
return errors.threshold
|
||||
|
||||
if (isSuspend && hasRequirementError)
|
||||
return errors.requirement?.suspensionDays
|
||||
console.log(errors)
|
||||
|
||||
if (isSuspend && hasRequirementError) return errors.requirement
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -455,8 +455,8 @@ const requirementSchema = Yup.object()
|
|||
suspensionDays: Yup.number().when('requirement', {
|
||||
is: value => value === 'suspend',
|
||||
then: Yup.number()
|
||||
.required()
|
||||
.min(1),
|
||||
.nullable()
|
||||
.transform(transformNumber),
|
||||
otherwise: Yup.number()
|
||||
.nullable()
|
||||
.transform(() => null)
|
||||
|
|
@ -464,6 +464,7 @@ const requirementSchema = Yup.object()
|
|||
}).required()
|
||||
})
|
||||
.test(({ requirement }, context) => {
|
||||
console.log('requirement aaaaa', requirement)
|
||||
const requirementValidator = requirement =>
|
||||
requirement.requirement === 'suspend'
|
||||
? requirement.suspensionDays > 0
|
||||
|
|
@ -494,7 +495,7 @@ const Requirement = () => {
|
|||
const { touched, errors, values } = useFormikContext()
|
||||
|
||||
const hasRequirementError =
|
||||
!!errors.requirement?.suspensionDays &&
|
||||
!!errors.requirement &&
|
||||
!!touched.requirement?.suspensionDays &&
|
||||
(!values.requirement?.suspensionDays ||
|
||||
values.requirement?.suspensionDays < 0)
|
||||
|
|
@ -503,8 +504,9 @@ const Requirement = () => {
|
|||
|
||||
const titleClass = {
|
||||
[classes.error]:
|
||||
!R.isEmpty(R.omit(['suspensionDays'], errors.requirement)) ||
|
||||
(isSuspend && hasRequirementError)
|
||||
(!!errors.requirement && !isSuspend) || (isSuspend && hasRequirementError)
|
||||
// !R.isEmpty(R.omit(['suspensionDays'], errors.requirement)) ||
|
||||
// (isSuspend && hasRequirementError)
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue