l-min-components 1.0.741 → 1.0.747

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -35,7 +35,6 @@ const AppMainLayout = () => {
   const [rightLayout, setRightLayout] = useState(true);
   const [rightComponent, setRightComponent] = useState();
   const [generalData, setGeneralData] = useState({});
-  const [deleteAccount, setDeleteAccount] = useState(false)
   const [coming, setComing] = useState();
   const [activePage, setActivePage] = useState("reports");
   const [page, setPage] = useState("index");
@@ -160,8 +159,6 @@ const AppMainLayout = () => {
         setRightLayout,
         generalData,
         setGeneralData,
-        deleteAccount, 
-        setDeleteAccount,
         coming,
         hasLayoutBackgroundImage,
         setHasLayoutBackgroundImage,

package/src/components/header/index.jsx

@@ -61,7 +61,7 @@ const HeaderComponent = (props) => {
     handleGetNotification,
   } = useHeader();
   const { pathname } = useLocation();
-  const { setGeneralData, generalData, deleteAccount, notificationMarkReadData } =
+  const { setGeneralData, generalData, notificationMarkReadData } =
     useContext(OutletContext);
   const [selectedAccount, setSelectedAccount] = useState();
   const { setDefaultAccount, handleSetDefaultAccount } = useHeader();
@@ -157,46 +157,26 @@ const HeaderComponent = (props) => {
 
   // Checking for delete account
   useEffect(() => {
-    if (userAccountsDetail?.data && deleteAccount) {
-      let validAccountFound = false;
+    if (userAccountsDetail?.data) {
       const validAccounts = userAccountsDetail.data.results.filter(account => !account.pending_delete);
-  
-      if (selectedAccount && selectedAccount.pending_delete) {
-        // If the selected account is pending delete, find an alternative
-        const nextValidAccount = validAccounts[0]; // Automatically take the first valid account
+
+      if (generalData?.selectedAccount && generalData?.selectedAccount?.pending_delete) {
+        const nextValidAccount = validAccounts[0]; 
         if (nextValidAccount) {
           setSelectedAccount(nextValidAccount);
-          validAccountFound = true;
-        }
-      }
-  
-      if (!validAccountFound) {
-        // If no valid account is found or no specific logic has been triggered yet
-        if (validAccounts.length > 0) {
-          setSelectedAccount(validAccounts[0]); // Set to first valid account by default
-        } else {
-          // Fallback to personal account or some default setting
-          setSelectedAccount(personalAccountData[0]);
-        }
+        }  else {
+            // Fallback to personal account or some default setting
+            setSelectedAccount(personalAccountData[0]);
+          }
       }
   
-      setGeneralData((generalData) => ({
-        ...generalData,
-        accounts: userAccountsDetail.data,
-        user: userDetails.data,
-        selectedAccount,
-        defaultAccount: getDefaultAccount.data,
-        accountDelete: false, 
-      }));
     }
   }, [
-    userAccountsDetail.data,
-    selectedAccount,
-    personalAccountData,
-    deleteAccount,
+    generalData?.selectedAccount,
+    userAccountsDetail?.data,
+
   ]);
   
-
   const containerRef = useRef(null);
   const secondContainerRef = useRef(null);
   const acctDropdownContainerRef = useRef(null);