diff --git a/components/account/personaldetailsComplete.js b/components/account/personaldetailsComplete.js index 3b7dde4d..14562320 100644 --- a/components/account/personaldetailsComplete.js +++ b/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) => { {/*

{t("account:account-complete-para-2")}

*/}

- + {" "} {t("account:account-complete-return-to-portal-link")} diff --git a/pages/myportal/index.js b/pages/myportal/index.js index 276e4cd9..41ab4218 100644 --- a/pages/myportal/index.js +++ b/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) { - return { - redirect: { - destination: `/${preferredLocale}${pathWithoutLocale}`, - permanent: false, - }, - }; - } + // if (preferredLocale !== locale) { + // return { + // redirect: { + // destination: `/${preferredLocale}${pathWithoutLocale}`, + // permanent: false, + // }, + // }; + // } const showLoginCheck = Boolean(process.env.SHOWLOGIN); const showReps = Boolean(process.env.SHOWREPRESENTATIONS);