@bytebrand/fe-ui-core 4.1.69 → 4.1.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.1.69",
+  "version": "4.1.71",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",

package/source/components/_common/Modal/modals/ManageCookieModal/ManageCookieModal.tsx

@@ -11,7 +11,7 @@ import { updateCookieList } from '../../../../../framework/utils/CommonUtils';
 
 import styles from './ManageCookieModal.styl';
 
-const ManageCookieModal = ({ onClearModalState }) => {
+const ManageCookieModal = ({ toggleModal }) => {
   const [analytcisMasterSwitch, setAnalyticsMasterSwitch] = useState(true);
   const [marketingMasterSwitch, setMarketingMasterSwitch] = useState(true);
   const [analyticsSwitches, setAnalyticsSwitches] = useState({});
@@ -62,7 +62,7 @@ const ManageCookieModal = ({ onClearModalState }) => {
     };
     localStorage.setItem('cookieConfig', JSON.stringify(cookieConfig));
     updateCookieList();
-    onClearModalState();
+    toggleModal();
   };
 
   return (

package/source/components/_common/UserMenu/MaterialMenu.tsx

@@ -82,6 +82,7 @@ const MaterialMenu = ({ menuItems, headerComponent, onChange, isLang, containerC
                 }}
                 isSelect={isSelect}
                 Link={Link}
+                handleClose={handleClose}
                 { ...listItemProps }
               />;
           })}

package/source/components/_common/UserMenu/MaterialMenuItem.tsx

@@ -17,7 +17,7 @@ interface IListItem {
   Link?: any;
 }
 
-const ListItem = ({ icon, label, amount, divider, onClick, href, isComponent, Link }: IListItem) => {
+const ListItem = ({ icon, label, amount, divider, onClick, href, isComponent, Link, handleClose }: IListItem) => {
   return !!href ? (
     <Link color='#4C4E64DE' variant='caption' to={href} underline='none' onClick={onClick}>
       <MenuItem
@@ -34,7 +34,10 @@ const ListItem = ({ icon, label, amount, divider, onClick, href, isComponent, Li
     </Link>
   ) : (
     <MenuItem
-      onClick={onClick}
+      onClick={() => {
+        onClick();
+        handleClose();
+      }}
       divider={divider}
       disableRipple={isComponent ? true : false}
       isComponent={isComponent}

package/source/framework/utils/CommonUtils.ts

@@ -528,14 +528,19 @@ export function setUtmParameters() {
   const expiresDate = new Date();
   expiresDate.setDate(expiresDate.getDate() + 1);
 
-  document.cookie = `marketing=${JSON.stringify(marketing)};expires=${expiresDate};domain=.${config.DOMAIN};path=/`;
+  const parsedUrl = new URL(window.location.href);
+  const domain = parsedUrl.hostname.split('.').slice(-2).join('.');
+
+  document.cookie = `marketing=${JSON.stringify(marketing)};expires=${expiresDate};domain=.${domain};path=/`;
 };
 
 export const updateCookieList = () => {
   const cookieConfig = JSON.parse(localStorage.getItem('cookieConfig')) || {};
+  const parsedUrl = new URL(window.location.href);
+  const domain = parsedUrl.hostname.split('.').slice(-2).join('.');
   Object.keys(cookieConfig).forEach((group: string) => {
     cookieConfig[group].forEach((cookie: string) => {
-      Cookies.remove(cookie, { path: '/', domain: config[process.env.NODE_ENV].DOMAIN });
+      Cookies.remove(cookie, { path: '/', domain });
     })
   });
 };