defect fix for language and login - crm precedence then current session
This commit is contained in:
@@ -64,7 +64,7 @@ const Header = (props) => {
|
||||
"/myportal/contactus",
|
||||
"/unsubscribe/[watchlistid]",
|
||||
"/unsubscribeall/[watchlistid]",
|
||||
"/status",
|
||||
"/status"
|
||||
];
|
||||
|
||||
const hasContactLink = [
|
||||
@@ -72,7 +72,7 @@ const Header = (props) => {
|
||||
"/dns/help",
|
||||
"/dns/contact-us",
|
||||
"/dns/applications",
|
||||
"/dns/application-view",
|
||||
"/dns/application-view"
|
||||
];
|
||||
|
||||
let domainSwitch;
|
||||
@@ -91,7 +91,7 @@ const Header = (props) => {
|
||||
destroyCookie(null, "pedw_locale", { path: "/" }),
|
||||
destroyCookie(null, "pinsUser", { path: "/" }),
|
||||
signOut({
|
||||
callbackUrl: locale == "cy" ? "/cy/allgofnodi" : "/logout",
|
||||
callbackUrl: locale == "cy" ? "/cy/allgofnodi" : "/logout"
|
||||
}));
|
||||
};
|
||||
|
||||
@@ -136,8 +136,7 @@ const Header = (props) => {
|
||||
|
||||
// Set cookie first
|
||||
setCookie(null, "pedw_locale", newLocale, {
|
||||
path: "/",
|
||||
maxAge: 60 * 60 * 24 * 365, // 1 year
|
||||
path: "/"
|
||||
});
|
||||
|
||||
// Then navigate with the new locale
|
||||
@@ -270,7 +269,7 @@ const mapDispatchToProps = (dispatch) => {
|
||||
return {
|
||||
setLogout: () => {
|
||||
dispatch(setLogout());
|
||||
},
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user