l-min-components 1.7.1292 → 1.7.1294

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -130,8 +130,9 @@ const AppMainLayout = ({ children }) => {
     handleCurrentSubscription,
     getDefaultAccount,
     handleGetDefaultAccount,
-  } = useHeader();
-
+    user,
+    userDetails,
+  } = useHeader({ default: true });
   // get current default account and store in cookie (from api)
 
   useEffect(() => {
@@ -304,8 +305,10 @@ const AppMainLayout = ({ children }) => {
       value={{
         messageKit,
         affiliateAccount,
+        userDetails,
         findAccountNames,
         accountName,
+        user,
         setRightComponent,
         setRightLayout,
         generalData,

package/src/components/header/getHeaderDetails.js

@@ -1,9 +1,17 @@
 import useAxios from "axios-hooks";
 import { useEffect } from "react";
 
-const useHeader = () => {
+const useHeader = (props = { default: false }) => {
   // get user details
-  const [{ ...userDetails }, getUserDetails] = useAxios();
+  const [userDetails, getUserDetails] = useAxios(
+    {
+      method: "get",
+      url: "/iam/v1/users/me/",
+    },
+    {
+      manual: !props.default,
+    }
+  );
 
   const handleGetUserDetails = async () => {
     await getUserDetails({
@@ -369,15 +377,11 @@ const useHeader = () => {
     }
   };
 
-  //defaults
-  // get user info
-  useEffect(() => {
-    handleGetUserDetails();
-  }, []);
-
   return {
     handleGetUserDetails,
     userDetails,
+    user: userDetails.data,
+    getUserDetails,
     handleGetUserAccountsDetail,
     userAccountsDetail,
     handleGetDefaultAccount,
@@ -398,7 +402,7 @@ const useHeader = () => {
     handleGetAllAffiliate,
     handleSetDefaultAffiliate,
     setDefaultAffiliateData,
-
+    plan: userPlanData?.data,
     userPlanData,
     handleGetUserPlan,
     getCurrentSubscriptionData,

package/src/components/header/index.jsx

@@ -56,9 +56,7 @@ const HeaderComponent = (props) => {
   // in general data find user info and replace where user details is being used
   const {
     handleGetUserAccountsDetail,
-    handleGetUserDetails,
     userAccountsDetail,
-    userDetails,
     // getDefaultAccount,
     // handleGetDefaultAccount,
     unreadNotificationData,
@@ -75,8 +73,13 @@ const HeaderComponent = (props) => {
     handleSetDefaultAccount,
   } = useHeader();
   const { pathname } = useLocation();
-  const { setGeneralData, generalData, notificationMarkReadData, accountName } =
-    useContext(OutletContext);
+  const {
+    setGeneralData,
+    generalData,
+    notificationMarkReadData,
+    accountName,
+    userDetails,
+  } = useContext(OutletContext);
   const [accountType, setAccountType] = useState("");
   const currentAccountType = props?.selectedAccount?.type
     ? props?.selectedAccount?.type?.toLowerCase()
@@ -91,7 +94,6 @@ const HeaderComponent = (props) => {
   useEffect(() => {
     setIsOpen(false);
     handleGetUserAccountsDetail();
-    handleGetUserDetails();
     props?.handleGetDefaultAccount();
   }, []);
 

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

@@ -12,14 +12,12 @@ import Loader from "../../loader";
 import avatar from "../../../assets/images/avatar.png";
 import { OutletContext } from "../../AppMainLayout";
 
-const UserCard = ({ user, isOpen, findText }) => {
-  const { handleGetUserDetails, userDetails, handleSetDefaultAccount } =
-    useHeader();
+const UserCard = ({ isOpen, findText }) => {
+  const { handleSetDefaultAccount } = useHeader();
   const [organizationName, setOrganizationName] = useState();
-  const { generalData, accountName } = useContext(OutletContext);
+  const { generalData, accountName, userDetails } = useContext(OutletContext);
 
   useEffect(() => {
-    handleGetUserDetails();
     if (generalData?.selectedAccount) {
       const date = new Date();
       date.setDate(date.getDate() + 28);