From 88d539b2a4e34622ac1d8c3959f68ab5be84a61a Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Wed, 4 Feb 2026 23:32:14 +0000
Subject: [PATCH] Hard coded strings to avoid en.json conflicts

---
 client/src/Pages/Account/components/PasswordPanel.jsx | 9 +++------
 client/src/Pages/Auth/CheckEmail.jsx                  | 2 +-
 client/src/Pages/Auth/ForgotPassword.jsx              | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index 841dca628..b2a7d8ee0 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -87,10 +87,7 @@ const PasswordPanel = () => {
 		// Check for expired/invalid token before submitting
 		if (!authToken) {
 			createToast({
-				body: t(
-					"passwordPanel.sessionExpired",
-					"Your session has expired. Please log in again."
-				),
+				body: "Your session has expired. Please log in again.",
 			});
 			dispatch(clearAuthState());
 			navigate("/login");
@@ -271,8 +268,8 @@ const PasswordPanel = () => {
 					alignItems="center"
 				>
 					<TextLink
-						text={t("passwordPanel.forgotPasswordText", "Forgot password?")}
-						linkText={t("passwordPanel.resetPasswordText", "Reset password")}
+						text={"Forgot password?"}
+						linkText={"Reset password"}
 						state={{ from: location.pathname }}
 						href={"/forgot-password"}
 					/>
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index 3667810b2..10cc2ecc6 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -224,7 +224,7 @@ const CheckEmail = () => {
 					<Trans
 						i18nKey={
 							location.state?.from === "/account/password"
-								? "auth.forgotPassword.links.accountPassword"
+								? "Go back to <a>Account Password</a>"
 								: "auth.forgotPassword.links.login"
 						}
 						components={{
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 1ebe67a58..1dee3b125 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -219,7 +219,7 @@ const ForgotPassword = () => {
 					<Trans
 						i18nKey={
 							location.state?.from
-								? "auth.forgotPassword.links.accountPassword"
+								? "Go back to <a>Account Password</a>"
 								: "auth.forgotPassword.links.login"
 						}
 						components={{