From 3ff941259efd430516f822db589b00b06b9d6224 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 26 Nov 2024 14:20:59 +0800
Subject: [PATCH] Integrate into SetNewPassword

---
 Client/src/Pages/Auth/Login.jsx          |  1 -
 Client/src/Pages/Auth/SetNewPassword.jsx | 15 +++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Client/src/Pages/Auth/Login.jsx b/Client/src/Pages/Auth/Login.jsx
index 05bf6d0b9..eb9b8fd0e 100644
--- a/Client/src/Pages/Auth/Login.jsx
+++ b/Client/src/Pages/Auth/Login.jsx
@@ -9,7 +9,6 @@ import { createToast } from "../../Utils/toastUtils";
 import { networkService } from "../../main";
 import TextInput from "../../Components/Inputs/TextInput";
 import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
-import Field from "../../Components/Inputs/Field";
 import Background from "../../assets/Images/background-grid.svg?react";
 import Logo from "../../assets/icons/bwu-icon.svg?react";
 import Mail from "../../assets/icons/mail.svg?react";
diff --git a/Client/src/Pages/Auth/SetNewPassword.jsx b/Client/src/Pages/Auth/SetNewPassword.jsx
index 77e621acd..ed165720d 100644
--- a/Client/src/Pages/Auth/SetNewPassword.jsx
+++ b/Client/src/Pages/Auth/SetNewPassword.jsx
@@ -10,6 +10,9 @@ import { createToast } from "../../Utils/toastUtils";
 import { credentials } from "../../Validation/validation";
 import Check from "../../Components/Check/Check";
 import Field from "../../Components/Inputs/Field";
+import TextInput from "../../Components/Inputs/TextInput";
+import { PasswordEndAdornment } from "../../Components/Inputs/TextInput/Adornments";
+
 import { IconBox } from "./styled";
 import LockIcon from "../../assets/icons/lock.svg?react";
 import Logo from "../../assets/icons/bwu-icon.svg?react";
@@ -147,7 +150,7 @@ const SetNewPassword = () => {
 							spellCheck={false}
 							onSubmit={handleSubmit}
 						>
-							<Field
+							<TextInput
 								id={passwordId}
 								type="password"
 								name="password"
@@ -156,7 +159,9 @@ const SetNewPassword = () => {
 								placeholder="••••••••"
 								value={form.password}
 								onChange={handleChange}
-								error={errors.password}
+								error={errors.password ? true : false}
+								helperText={errors.password}
+								endAdornment={<PasswordEndAdornment />}
 							/>
 						</Box>
 						<Box
@@ -165,7 +170,7 @@ const SetNewPassword = () => {
 							spellCheck={false}
 							onSubmit={handleSubmit}
 						>
-							<Field
+							<TextInput
 								id={confirmPasswordId}
 								type="password"
 								name="confirm"
@@ -174,7 +179,9 @@ const SetNewPassword = () => {
 								placeholder="••••••••"
 								value={form.confirm}
 								onChange={handleChange}
-								error={errors.confirm}
+								error={errors.confirm ? true : false}
+								helperText={errors.confirm}
+								endAdornment={<PasswordEndAdornment />}
 							/>
 						</Box>
 						<Stack