Merge branch 'feature/JC-725-authorization' into feature/JC-738-avata…

…r-adding
saritasa-nest · Sep 10, 2024 · fd2f16c · fd2f16c
2 parents 2069107 + ec5ddc2
commit fd2f16c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/apps/react/src/features/auth/components/LoginForm/LoginForm.tsx b/apps/react/src/features/auth/components/LoginForm/LoginForm.tsx
@@ -68,15 +68,15 @@ const LoginFormComponent: FC = () => {
 						{...register('email')}
 						required
 						label="Email"
-						error={!!errors.email}
+						error={errors.email != null}
 						helperText={errors.email?.message?.toString()}
 					/>
 					<TextField
 						{...register('password')}
 						required
 						label="Password"
 						type="password"
-						error={!!errors.password}
+						error={errors.password != null}
 						helperText={errors.password?.message?.toString()}
 					/>
 				</Stack>

diff --git a/apps/react/src/features/auth/components/RegisterForm/RegisterForm.tsx b/apps/react/src/features/auth/components/RegisterForm/RegisterForm.tsx
@@ -70,37 +70,35 @@ const RegisterFormComponent: FC = () => {
 						{...register('email')}
 						required
 						label="Email"
-						error={!!errors.email}
+						error={errors.email != null}
 						helperText={errors.email?.message?.toString()}
 					/>
 					<TextField
 						{...register('firstName')}
 						required
 						label="First name"
-						error={!!errors.firstName}
-						helperText={errors.firstName?.message?.toString()}
+						error={errors.firstName != null}
 					/>
 					<TextField
-						{...register('lastName')}
 						required
 						label="Last name"
-						error={!!errors.lastName}
+						error={errors.lastName != null}
 						helperText={errors.lastName?.message?.toString()}
 					/>
 					<TextField
 						{...register('password')}
 						required
 						label="Password"
 						type="password"
-						error={!!errors.password}
+						error={errors.password != null}
 						helperText={errors.password?.message?.toString()}
 					/>
 					<TextField
 						{...register('confirmPassword')}
 						required
 						label="Confirm password"
 						type="password"
-						error={!!errors.confirmPassword}
+						error={errors.confirmPassword != null}
 						helperText={errors.confirmPassword?.message?.toString()}
 					/>
 					<AvatarUploader />