diff --git a/src/components/NetworkSwitcher/hooks/useRefreshNativeAuthTokenForNetwork.ts b/src/components/NetworkSwitcher/hooks/useRefreshNativeAuthTokenForNetwork.ts index b10913b..f9aed36 100644 --- a/src/components/NetworkSwitcher/hooks/useRefreshNativeAuthTokenForNetwork.ts +++ b/src/components/NetworkSwitcher/hooks/useRefreshNativeAuthTokenForNetwork.ts @@ -50,7 +50,7 @@ export const useRefreshNativeAuthTokenForNetwork = () => { if (!preventPageReload) { setTimeout(() => { window.location.reload(); - }, 10); + }); } }; }; diff --git a/src/helpers/validation/getFormHasError.ts b/src/helpers/validation/getFormHasError.ts index 9b0c18b..ca8a0c1 100644 --- a/src/helpers/validation/getFormHasError.ts +++ b/src/helpers/validation/getFormHasError.ts @@ -1,7 +1,8 @@ -export const getFormHasError = ({ - form, - fieldName -}: { - form: { touched: Record; errors: Record }; - fieldName: string; -}) => form.touched[fieldName] && form.errors[fieldName]; +interface FormHasErrorType { + touched: Record; + errors: Record; +} + +export const getFormHasError = + (form: FormHasErrorType) => (fieldName: string) => + form.touched[fieldName] && form.errors[fieldName]; diff --git a/src/pages/CreateRecover/components/CreateRecoverPassword/components/CreateRecoverPasswodFormFields.tsx b/src/pages/CreateRecover/components/CreateRecoverPassword/components/CreateRecoverPasswodFormFields.tsx index 06ecd20..e5d492e 100644 --- a/src/pages/CreateRecover/components/CreateRecoverPassword/components/CreateRecoverPasswodFormFields.tsx +++ b/src/pages/CreateRecover/components/CreateRecoverPassword/components/CreateRecoverPasswodFormFields.tsx @@ -38,59 +38,56 @@ export const CreateRecoverPasswordFormFields = ({ {infoSection}
- {fields.map((field, index) => ( -
- - - {field.name.startsWith(CreateRecoverFieldNamesEnum.password) && ( - - )} - {getFormHasError({ - form: formikProps, - fieldName: field.name - }) && ( -
{ + const checkFormHasError = getFormHasError(formikProps); + const hasError = checkFormHasError(field.name); + + return ( +
+
- )} + {field.label} + + + {field.name.startsWith(CreateRecoverFieldNamesEnum.password) && ( + + )} + {hasError && ( +
+ {formikProps.errors[field.name]} +
+ )} - {!getFormHasError({ - form: formikProps, - fieldName: field.name - }) && ( - - At least 8 characters, an uppercase letter, a symbol & a number. - - )} -
- ))} + {!hasError && ( + + At least 8 characters, an uppercase letter, a symbol & a + number. + + )} +
+ ); + })}