l-min-components 1.0.1042 → 1.0.1050

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -294,15 +294,17 @@ const AppMainLayout = () => {
                   }
                 </LeftLayout>
                 <CenterLayout isOpen={isOpen} style={centerLayoutStyle}>
-                  {window.location.pathname.includes("instructor") &&
+                  {
+                    // window.location.pathname.includes("instructor") &&
                     !window.location.pathname.includes("enterprise") &&
-                    !window.location.pathname.includes("manage-teams") && (
-                      <InstructorAccountSwitcher
-                        setAccountType={setAffiliatesActive}
-                        generalData={generalData}
-                        onChange={(v) => setAffiliateAccount(v)}
-                      />
-                    )}
+                      !window.location.pathname.includes("manage-teams") && (
+                        <InstructorAccountSwitcher
+                          setAccountType={setAffiliatesActive}
+                          generalData={generalData}
+                          onChange={(v) => setAffiliateAccount(v)}
+                        />
+                      )
+                  }
 
                   {window.location.pathname.includes("enterprise") &&
                   planState === "GRACE PERIOD" ? (

package/src/components/header/index.jsx

@@ -93,7 +93,7 @@ const HeaderComponent = (props) => {
       handleGetUnreadNotification(accountType);
     }
 
-    if (accountType & accountType === "personal") {
+    if (accountType && accountType === "personal") {
       handleGetUnreadNotificationPersonal()
     }
   }, [accountType]);

package/src/components/instructorAccountSwitcher/index.jsx

@@ -32,10 +32,12 @@ const InstructorAccountSwitcher = ({ generalData, onChange }) => {
   }, [generalData?.selectedAccount, search]);
 
   const dropdownList = getAllAffiliateData?.data?.results?.map((item) => {
-    const image = item?.profile_photo?.url;
+    const image = item?.profile_photo?.url || item?.profile_photo[1][1];
     return { name: item?.display_name, image, id: item?.id };
   });
 
+  console.log(dropdownList, getAllAffiliateData);
+
   const [dropdown, setDropdown] = useState(false);
 
   const getCookie = () => {
@@ -72,16 +74,24 @@ const InstructorAccountSwitcher = ({ generalData, onChange }) => {
   };
 
   const handleSwitch = (value) => {
-    if (value === 2) {
-      if (selectedValue) {
-        setCookie(selectedValue?.id);
+    if (selectedValue) {
+      if (value === 2) {
+        if (selectedValue) {
+          setCookie(selectedValue?.id);
+        }
+      } else {
+        if (cookieValue) {
+          deleteCookies("affiliateAccount");
+        }
       }
+      window.location.href = "/instructor/dashboard";
     } else {
-      if (cookieValue) {
-        deleteCookies("affiliateAccount");
+      if (value === 2) {
+        setSwitchValue("affiliates");
+      } else {
+        setSwitchValue(null);
       }
     }
-    window.location.href = "/instructor/dashboard";
   };
 
   useEffect(() => {
@@ -241,7 +251,7 @@ const Container = styled.div`
   background: #ffffff;
   border-radius: 25px;
   height: 60px;
-  margin-bottom: 24px;
+  margin-bottom: 16px;
 
   .left {
     > p {

package/src/components/messageAddon/InputSection/index.jsx

@@ -43,6 +43,8 @@ const InputSection = ({
   accountType,
   affiliates,
   courseID,
+  handleCreateMessage,
+  createMessageData,
 }) => {
   const [showEmoji, setShowEmoji] = useState();
   const [inputMethod, setInputMethod] = useState("text"); // text | recorder
@@ -56,8 +58,7 @@ const InputSection = ({
 
   const imageRef = useRef();
   const {
-    handleCreateMessage,
-    createMessageData,
+
     handleCreateMessageWithMedia,
     createMessageWithMediaData,
     createMessageAffiliateData,
@@ -94,29 +95,10 @@ const InputSection = ({
     if (inputMethod === "text") {
       // setNewMessages((prev) => [...prev, text]);
       setIsMessageSending(true);
-      if (affiliates && accountType === "instructor") {
-        setTimeout(() => {
-          handleCreateMessageAffiliate(userID, text);
-        }, 1000);
-      }
-
-      if (!affiliates && accountType === "instructor") {
-        setTimeout(() => {
-          handleCreateMessage(userID, accountType, text);
-        }, 1000);
-      }
 
-      if (accountType === "enterprise") {
-        setTimeout(() => {
-          handleCreateMessage(userID, accountType, text, courseID);
-        }, 1000);
-      }
-
-      if (accountType === "personal") {
-        setTimeout(() => {
-          handleCreateMessagePersonal(userID, text, courseID);
-        }, 1000);
-      }
+      setTimeout(() => {
+        handleCreateMessage(userID, accountType, text, courseID, "");
+      }, 1000);
     }
   };
 
@@ -255,12 +237,17 @@ const InputSection = ({
       </div>
       <button
         className={`send-box ${
-          !text.text && (inputMethod === "text" || recording) ? "disabled" : ""
+          (!text.text && inputMethod !== "recorder") ||
+          createMessageData?.loading ||
+          recording
+            ? "disabled"
+            : ""
         }`}
         onClick={handleSendMessage}
         disabled={
-          !text.text &&
-          (inputMethod === "text" || recording || createMessageData?.loading)
+          (!text.text && inputMethod !== "recorder") ||
+          createMessageData?.loading ||
+          recording
         }
       >
         <SendIcon />