refactor: getErrorMsg() to pure functions

This commit is contained in:
Sérgio Salgado 2021-04-20 22:07:57 +01:00 committed by Josh Harvey
parent 26a051ff07
commit 86a245f6ba
4 changed files with 64 additions and 47 deletions

View file

@ -49,6 +49,16 @@ const initialValues = {
confirmPassword: ''
}
const getErrorMsg = (formikErrors, formikTouched, mutationError) => {
if (!formikErrors || !formikTouched) return null
if (mutationError) return 'Internal server error'
if (formikErrors.password && formikTouched.password)
return formikErrors.password
if (formikErrors.confirmPassword && formikTouched.confirmPassword)
return formikErrors.confirmPassword
return null
}
const ResetPassword = () => {
const classes = useStyles()
const history = useHistory()
@ -81,16 +91,6 @@ const ResetPassword = () => {
}
})
const getErrorMsg = (formikErrors, formikTouched) => {
if (!formikErrors || !formikTouched) return null
if (error) return 'Internal server error'
if (formikErrors.password && formikTouched.password)
return formikErrors.password
if (formikErrors.confirmPassword && formikTouched.confirmPassword)
return formikErrors.confirmPassword
return null
}
return (
<Grid
container
@ -139,9 +139,9 @@ const ResetPassword = () => {
fullWidth
/>
<div className={classes.footer}>
{getErrorMsg(errors, touched) && (
{getErrorMsg(errors, touched, error) && (
<P className={classes.errorMessage}>
{getErrorMsg(errors, touched)}
{getErrorMsg(errors, touched, error)}
</P>
)}
<Button