fix: promo code modal allowing white spaces
This commit is contained in:
parent
48eb658c20
commit
e57b40776c
1 changed files with 14 additions and 8 deletions
|
|
@ -21,7 +21,7 @@ const initialValues = {
|
||||||
}
|
}
|
||||||
|
|
||||||
const validationSchema = Yup.object().shape({
|
const validationSchema = Yup.object().shape({
|
||||||
code: Yup.string().required().trim().max(25),
|
code: Yup.string().required().trim().max(25).matches(/^\S*$/, 'No whitespace allowed'),
|
||||||
discount: Yup.number().required().min(0).max(100)
|
discount: Yup.number().required().min(0).max(100)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -50,6 +50,7 @@ const PromoCodesModal = ({ showModal, onClose, errorMsg, addCode }) => {
|
||||||
onSubmit={({ code, discount }) => {
|
onSubmit={({ code, discount }) => {
|
||||||
handleAddCode(code, discount)
|
handleAddCode(code, discount)
|
||||||
}}>
|
}}>
|
||||||
|
{({ errors }) => (
|
||||||
<Form id="promo-form" className={classes.form}>
|
<Form id="promo-form" className={classes.form}>
|
||||||
<H3 className={classes.modalLabel1}>Promo code name</H3>
|
<H3 className={classes.modalLabel1}>Promo code name</H3>
|
||||||
<Field
|
<Field
|
||||||
|
|
@ -91,7 +92,11 @@ const PromoCodesModal = ({ showModal, onClose, errorMsg, addCode }) => {
|
||||||
</TL1>
|
</TL1>
|
||||||
</div>
|
</div>
|
||||||
<div className={classes.footer}>
|
<div className={classes.footer}>
|
||||||
{errorMsg && <ErrorMessage>{errorMsg}</ErrorMessage>}
|
{(errorMsg || !R.isEmpty(errors)) && (
|
||||||
|
<ErrorMessage>
|
||||||
|
{errorMsg || R.head(R.values(errors))}
|
||||||
|
</ErrorMessage>
|
||||||
|
)}
|
||||||
<Button
|
<Button
|
||||||
type="submit"
|
type="submit"
|
||||||
form="promo-form"
|
form="promo-form"
|
||||||
|
|
@ -100,6 +105,7 @@ const PromoCodesModal = ({ showModal, onClose, errorMsg, addCode }) => {
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
|
)}
|
||||||
</Formik>
|
</Formik>
|
||||||
</Modal>
|
</Modal>
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue