l-min-components 1.0.647 → 1.0.650

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.647",
+  "version": "1.0.650",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/AppMainLayout/index.jsx

@@ -25,6 +25,7 @@ import InstructorAccountSwitcher from "../instructorAccountSwitcher";
 import InstructorRightBar from "../fileRightBar/instructorRightBar";
 import EnterpriseRightBar from "../fileRightBar/enterpriseRightBar";
 import PersonalRightBar from "../fileRightBar/personalRightBar";
+import useHeader from "../header/getHeaderDetails";
 
 const AppMainLayout = () => {
   const [isOpen, setIsOpen] = useState(true);
@@ -46,6 +47,7 @@ const AppMainLayout = () => {
   const [affiliatesActive, setAffiliatesActive] = useState(false);
   const [accessToken, setAccessToken] = useState("");
   const [envType, setEnvType] = useState("");
+  const { setDefaultAccount, handleSetDefaultAccount } = useHeader();
 
   useEffect(() => {
     if (window.location.host.includes("coming")) {
@@ -71,21 +73,42 @@ const AppMainLayout = () => {
   }, [defaultAcct]);
 
   // set access token from cookie to context
+
   useEffect(() => {
     let cookieValue = null;
     const cookieName = "access";
+
     // Retrieve the value of the cookie
+
     const cookies = document.cookie.split(";");
     for (let i = 0; i < cookies.length; i++) {
       const cookie = cookies[i].trim();
       if (cookie.startsWith(cookieName + "=")) {
         cookieValue = cookie.substring(cookieName.length + 1);
-        setDefaultAcct(cookieValue);
+        setAccessToken(cookieValue);
         break;
       }
     }
-    setAccessToken(cookieValue);
-  }, [defaultAcct]);
+  }, []);
+
+  // get current account and set as default acct on page load.
+
+  useEffect(() => {
+    let cookieValue = null;
+    const cookieName = "defaultAccountID";
+
+    // Retrieve the value of the cookie
+
+    const cookies = document.cookie.split(";");
+    for (let i = 0; i < cookies.length; i++) {
+      const cookie = cookies[i].trim();
+      if (cookie.startsWith(cookieName + "=")) {
+        cookieValue = cookie.substring(cookieName.length + 1);
+        handleSetDefaultAccount(cookieValue);
+        break;
+      }
+    }
+  }, []);
 
   // setting current environment type
   useEffect(() => {
@@ -97,7 +120,7 @@ const AppMainLayout = () => {
       setEnvType("live");
     }
   }, []);
-  console.log("envType", envType)
+  console.log("envType", envType);
 
   return (
     <OutletContext.Provider
@@ -124,7 +147,7 @@ const AppMainLayout = () => {
         setHideAffilicates,
         affiliatesActive,
         accessToken,
-        envType
+        envType,
       }}
     >
       <Layout
@@ -149,7 +172,8 @@ const AppMainLayout = () => {
                         ? "personal"
                         : window.location.pathname.includes("instructor")
                         ? "instructor"
-                        : window.location.pathname.includes("developer") || window.location.hostname.includes("developer")
+                        : window.location.pathname.includes("developer") ||
+                          window.location.hostname.includes("developer")
                         ? "developer"
                         : defaultAcct
                     }
@@ -187,7 +211,7 @@ const AppMainLayout = () => {
                 ) : window.location.pathname.includes("personal/courses") ? (
                   <InstructorRightBar personal />
                 ) : window.location.pathname.includes(
-                    "personal/library/selectlanguage",
+                    "personal/library/selectlanguage"
                   ) ? (
                   <InstructorRightBar personal />
                 ) : window.location.pathname.includes("personal/library") ? (