l-min-components 1.0.223 → 1.0.228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.223",
+  "version": "1.0.228",
   "type": "module",
   "files": [
     "src/assets",
@@ -17,13 +17,14 @@
     "axios-hooks": "^4.0.0",
     "chart.js": "^4.2.1",
     "classnames": "^2.3.2",
-    "l-min-components": "^1.0.197",
+    "l-min-components": "^1.0.220",
     "moment": "^2.29.4",
     "prop-types": "^15.8.1",
     "rc-slider": "^10.1.1",
     "rc-tooltip": "^6.0.1",
     "react": "^18.2.0",
     "react-chartjs-2": "^5.2.0",
+    "react-cookie": "^4.1.1",
     "react-datepicker": "^4.10.0",
     "react-dom": "^18.2.0",
     "react-flags-select": "^2.2.3",

package/src/components/header/account-dropdown.jsx

@@ -32,6 +32,19 @@ const AccountDropdown = (props) => {
       let developerArray = [];
       let instructorArray = [];
       let enterpriseArray = [];
+      const cookies = document.cookie;
+      const cookieArray = cookies.split(";");
+      let activeDeveloperAccount;
+      for (let i = 0; i < cookieArray.length; i++) {
+        const cookie = cookieArray[i].trim();
+        if (cookie.startsWith("activeDeveloperAccount=")) {
+          activeDeveloperAccount = cookie.substring(
+            "activeDeveloperAccount=".length,
+            cookie.length
+          );
+          break;
+        }
+      }
       props?.data?.data?.results?.map((accountItem, idx) => {
         if (
           accountItem?.type === "PERSONAL" &&
@@ -67,7 +80,10 @@ const AccountDropdown = (props) => {
         props?.setSelectedAccount(personalArray[0]);
       }
       if (window.location.host?.includes("developer")) {
-        props?.setSelectedAccount(developerArray[0]);
+        props?.setSelectedAccount(
+          developerArray.find((item) => item.id === activeDeveloperAccount) ??
+            {}
+        );
       }
       if (pathname?.includes("instructor")) {
         props?.setSelectedAccount(instructorArray[0]);

package/src/components/header/index.jsx

@@ -58,7 +58,19 @@ const HeaderComponent = (props) => {
         accounts: userAccountsDetail?.data,
         user: userDetails?.data,
       }));
-
+      const cookies = document.cookie;
+      const cookieArray = cookies.split(";");
+      let activeDeveloperAccount;
+      for (let i = 0; i < cookieArray.length; i++) {
+        const cookie = cookieArray[i].trim();
+        if (cookie.startsWith("activeDeveloperAccount=")) {
+          activeDeveloperAccount = cookie.substring(
+            "activeDeveloperAccount=".length,
+            cookie.length
+          );
+          break;
+        }
+      }
       let personalArray = [];
       let developerArray = [];
       let instructorArray = [];
@@ -94,7 +106,10 @@ const HeaderComponent = (props) => {
         setSelectedAccount(personalArray[0]);
       }
       if (window.location.host?.includes("developer")) {
-        setSelectedAccount(developerArray[0]);
+        setSelectedAccount(
+          developerArray.find((item) => item.id === activeDeveloperAccount) ??
+            {}
+        );
       }
       if (pathname?.includes("instructor")) {
         setSelectedAccount(instructorArray[0]);
@@ -128,7 +143,7 @@ const HeaderComponent = (props) => {
           <a
             onClick={() => {
               window.location.href =
-                "https://developer-staging-01.learngual.com/settings/payment";
+                "https://developer-staging-01.learngual.com/settings/";
             }}
           >
             <SettingIcon /> Settings

package/src/components/sideBar/sideMenu/index.jsx

@@ -43,14 +43,14 @@ const SideMenu = ({
             window.location.hostname.includes("staging") &&
             window.location.hostname.includes("developer")
           ) {
-            window.location.href = `developer-staging-01.learngual.com/${path}`;
+            window.location.href = `https://developer-staging-01.learngual.com/${path}`;
           } else if (window.location.hostname.includes("localhost")) {
             window.location.href = `http://localhost:${window.location.port}${path}`;
           } else if (
             window.location.hostname.includes("developer") &&
             !window.location.hostname.includes("staging")
           ) {
-            window.location.href = `developer.learngual.com/${path}`;
+            window.location.href = `https://developer.learngual.com/${path}`;
           }
         }}
         // to={route.path}