l-min-components 1.0.1025 → 1.0.1029

package/package.json

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

package/src/components/instructorAccountSwitcher/index.jsx

@@ -44,21 +44,26 @@ const InstructorAccountSwitcher = ({
   const [dropdown, setDropdown] = useState(false);
 
   const getCookie = () => {
-    let cookieValue = null;
-    const cookieName = "affiliateAccount";
+    const cookies = document.cookie;
+    const cookieArray = cookies.split(";");
 
-    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);
-        break;
+    let affiliateAccount = null;
+
+    cookieArray?.forEach((cookieValue) => {
+      const cookie = cookieValue?.trim();
+      if (cookie.startsWith("affiliateAccount=")) {
+        affiliateAccount = cookie.substring(
+          "affiliateAccount=".length,
+          cookie.length
+        );
       }
-    }
+    });
 
-    return cookieValue;
+    return affiliateAccount;
   };
 
+  const cookieValue = getCookie();
+
   const setCookie = (id) => {
     const date = new Date();
     date.setDate(date.getDate() + 20);
@@ -73,53 +78,40 @@ const InstructorAccountSwitcher = ({
 
   const handleSwitch = (value) => {
     if (value === 2) {
-      setSwitchValue("affiliates");
       if (selectedValue) {
         setCookie(selectedValue?.id);
       }
     } else {
-      setSwitchValue(false);
-      let cookieValue = getCookie();
-      if (cookieValue) deleteCookies("affiliateAccount");
+      if (cookieValue) {
+        deleteCookies("affiliateAccount");
+      }
     }
     window.location.href = "/instructor/dashboard";
   };
 
   useEffect(() => {
-    let cookieValue = getCookie();
     if (cookieValue) {
       setSwitchValue("affiliates");
+      onChange({ id: selectedValue?.id });
     } else {
       setSwitchValue(null);
+      onChange(null);
     }
   }, []);
 
   useEffect(() => {
-    handleGetDefaultAffiliate()
-      .then((res) => {
-        if (res?.data) {
-          const value = res?.data;
-          const image = value?.profile_photo?.url;
-          setSelectedValue(() => ({
-            name: value?.display_name,
-            image,
-            id: value?.id,
-          }));
-        }
-      })
-      .catch(() => {
-        deleteCookies("affiliateAccount");
-      });
-  }, [setDefaultAffiliateData?.data, switchValue]);
-
-  useEffect(() => {
-    const value = JSON.parse(localStorage.getItem("affiliates"));
-    if (value) {
-      setAccountType && setAccountType(switchValue);
-    } else {
-      setAccountType && setAccountType(switchValue);
-    }
-  }, [switchValue]);
+    handleGetDefaultAffiliate().then((res) => {
+      if (res?.data) {
+        const value = res?.data;
+        const image = value?.profile_photo?.url;
+        setSelectedValue(() => ({
+          name: value?.display_name,
+          image,
+          id: value?.id,
+        }));
+      }
+    });
+  }, []);
 
   const handleSelection = async (item) => {
     const res = await handleSetDefaultAffiliate({
@@ -127,19 +119,10 @@ const InstructorAccountSwitcher = ({
     });
     if (res?.data) {
       setCookie(item?.id);
-      setSelectedValue(item);
-      setDropdown(false);
       window.location.href = "/instructor/dashboard";
     }
   };
 
-  useEffect(() => {
-    if (onChange) {
-      let cookieValue = getCookie();
-      if (cookieValue) onChange({ id: selectedValue?.id });
-      else onChange(null);
-    }
-  }, [selectedValue]);
   return getAllAffiliateData?.data?.count && !search ? (
     <>
       {(setDefaultAffiliateData?.loading ||