Merged PR 1688: 17143 removed pref from myportal page rely on link for lang

17143 removed pref from myportal page rely on link for lang

Related work items: #17143

components/account/personaldetailsComplete.js

@@ -28,6 +28,8 @@ const PersonalDetailsComplete = (props) => {
     const formValues = props.props?.props?.form?.personalDetailsForm?.values;
     const prefLang = formValues?.pinswg_preferredlanguage;
 
+    const userLang = prefLang === "846040000" ? "cy" : "en"; // Move this outside useEffect
+
     useEffect(() => {
         // let contactid = props.accountDetails.loggedinUserId;
         // let updateBody = props.props.props.form.personalDetailsForm.values;
@@ -37,7 +39,6 @@ const PersonalDetailsComplete = (props) => {
         if (!loggedinUserId || !formValues) return;
 
         console.log("=============== pref lang", prefLang);
-        const userLang = prefLang == "846040000" ? "cy" : "en";
         setCookie(null, "pedw_locale", userLang, {
             path: "/",
             maxAge: 60 * 60 * 24 * 365,
@@ -59,7 +60,11 @@ const PersonalDetailsComplete = (props) => {
             {/* <p className="govuk-body">{t("account:account-complete-para-2")}</p> */}
 
             <p className="govuk-body">
-                <Link href={"/"} className="govuk-link">
+                <Link
+                    locale={userLang}
+                    href={userLang === "cy" ? "/cy/fymhorth" : "/myportal"}
+                    className="govuk-link"
+                >
                     {" "}
                     {t("account:account-complete-return-to-portal-link")}
                 </Link>

pages/myportal/index.js

@@ -231,14 +231,14 @@ export const getServerSideProps = wrapper.getServerSideProps(
         const pathWithoutLocale = ctx.resolvedUrl.replace(/^\/(cy|en)/, "");
         //console.log("==============================", pathWithoutLocale);
 
-        if (preferredLocale !== locale) {
+        // if (preferredLocale !== locale) {
-            return {
+        //     return {
-                redirect: {
+        //         redirect: {
-                    destination: `/${preferredLocale}${pathWithoutLocale}`,
+        //             destination: `/${preferredLocale}${pathWithoutLocale}`,
-                    permanent: false,
+        //             permanent: false,
-                },
+        //         },
-            };
+        //     };
-        }
+        // }
 
         const showLoginCheck = Boolean(process.env.SHOWLOGIN);
         const showReps = Boolean(process.env.SHOWREPRESENTATIONS);