l-min-components 1.0.1033 → 1.0.1040

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -68,10 +68,6 @@ const AppMainLayout = () => {
     handleGetUserPlan,
     getCurrentSubscriptionData,
     handleCurrentSubscription,
-    handleGetDefaultAffiliate,
-    handleGetAllAffiliate,
-    getAllAffiliateData,
-    getDefaultAffiliateData,
   } = useHeader();
 
   useEffect(() => {
@@ -303,8 +299,6 @@ const AppMainLayout = () => {
                     !window.location.pathname.includes("manage-teams") && (
                       <InstructorAccountSwitcher
                         setAccountType={setAffiliatesActive}
-                        data={getAllAffiliateData?.data?.results}
-                        loading={getAllAffiliateData?.loading}
                         generalData={generalData}
                         onChange={(v) => setAffiliateAccount(v)}
                       />

package/src/components/instructorAccountSwitcher/index.jsx

@@ -10,12 +10,7 @@ import OutsideAlerter from "../outsideEventChecker";
 import FullPageLoader from "../fullPageLoader";
 import deleteCookies from "./deleteCookies";
 
-const InstructorAccountSwitcher = ({
-  setAccountType,
-  data,
-  generalData,
-  onChange,
-}) => {
+const InstructorAccountSwitcher = ({ generalData, onChange }) => {
   const [expiryFlow, setExpiryFlow] = useState();
   const [switchValue, setSwitchValue] = useState(null);
   const [selectedValue, setSelectedValue] = useState(null);
@@ -30,15 +25,13 @@ const InstructorAccountSwitcher = ({
   } = useHeader();
 
   useEffect(() => {
-    if (getAllAffiliateData?.data?.count) {
-      const account = generalData?.selectedAccount;
-      if (account?.type?.toLocaleLowerCase() === "instructor") {
-        handleGetAllAffiliate({ search });
-      }
+    const account = generalData?.selectedAccount;
+    if (account?.type?.toLocaleLowerCase() === "instructor") {
+      handleGetAllAffiliate({ search });
     }
-  }, [generalData?.selectedAccount, search, getAllAffiliateData?.data]);
+  }, [generalData?.selectedAccount, search]);
 
-  const dropdownList = data?.map((item) => {
+  const dropdownList = getAllAffiliateData?.data?.results?.map((item) => {
     const image = item?.profile_photo?.url;
     return { name: item?.display_name, image, id: item?.id };
   });
@@ -102,18 +95,20 @@ const InstructorAccountSwitcher = ({
   }, []);
 
   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,
-        }));
-      }
-    });
-  }, []);
+    if (getAllAffiliateData?.data?.results?.length > 0) {
+      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,
+          }));
+        }
+      });
+    }
+  }, [getAllAffiliateData?.data]);
 
   const handleSelection = async (item) => {
     const res = await handleSetDefaultAffiliate({
@@ -125,7 +120,7 @@ const InstructorAccountSwitcher = ({
     }
   };
 
-  return getAllAffiliateData?.data?.count && !search ? (
+  return getAllAffiliateData?.data?.results?.length > 0 && !search ? (
     <>
       {(setDefaultAffiliateData?.loading ||
         getDefaultAffiliateData?.loading ||