From f0d2c57035679805b804a28c65956f51106acb3d Mon Sep 17 00:00:00 2001
From: sonvir249 <choudharysonvir@gmail.com>
Date: Sun, 11 May 2025 06:21:12 +0530
Subject: [PATCH] Issue-2238: Fixes the error messages on various forms.

---
 client/src/Pages/Auth/ForgotPassword.jsx         |  2 +-
 client/src/Pages/Auth/Register/StepTwo/index.jsx |  2 +-
 client/src/Validation/validation.js              | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index a67f67c14..e41debd4e 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -185,7 +185,7 @@ const ForgotPassword = () => {
 							value={form.email}
 							onChange={handleChange}
 							error={errors.email ? true : false}
-							helperText={errors.email}
+							helperText={t(errors.email)}
 						/>
 						<Button
 							variant="contained"
diff --git a/client/src/Pages/Auth/Register/StepTwo/index.jsx b/client/src/Pages/Auth/Register/StepTwo/index.jsx
index 5f563b303..a53e21575 100644
--- a/client/src/Pages/Auth/Register/StepTwo/index.jsx
+++ b/client/src/Pages/Auth/Register/StepTwo/index.jsx
@@ -71,7 +71,7 @@ function StepTwo({ form, errors, onSubmit, onChange, onBack }) {
 						helperText={errors.email && (
 						errors.email.includes("required") ? t("authRegisterEmailRequired") :
 						errors.email.includes("valid email") ? t("authRegisterEmailInvalid") :
-						errors.email
+						t(errors.email)
 					)}
 						ref={inputRef}
 					/>
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index 0ace7b02c..3d030f84e 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -14,6 +14,17 @@ const nameSchema = joi
 		"string.pattern.base": "Name must contain only letters, spaces, apostrophes, or hyphens"
 	});
 
+const lastnameSchema = joi
+	.string()
+	.max(50)
+	.trim()
+	.pattern(/^[\p{L}\p{M}''\- ]+$/u)
+	.messages({
+		"string.empty": "Surname is required",
+		"string.max": "Surname must be less than 50 characters",
+		"string.pattern.base": "Surname must contain only letters, spaces, apostrophes, or hyphens"
+	});
+
 const passwordSchema = joi
 	.string()
 	.trim()
@@ -53,7 +64,7 @@ const passwordSchema = joi
 
 const credentials = joi.object({
 	firstName: nameSchema,
-	lastName: nameSchema,
+	lastName: lastnameSchema,
 	email: joi
 		.string()
 		.trim()