l-min-components 1.7.1500 → 1.7.1501

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -125,51 +125,7 @@ const AppMainLayout = ({ children }) => {
     }
   }, [generalData]);
 
-  useEffect(() => {
-    if (generalData?.selectedAccount?.type) {
-      // when we get the default account type (getDefaultAccount?.data?.type),
-      // if url is not containing settings, notifications or help,
-      // check if url contains default account type and if it doesn't
-      // navigate the user using href to /default account type in lower case
-      const currentUrl = window.location.pathname;
-      const defaultAccountType = getDefaultAccount?.data?.type?.toLowerCase();
-
-      const excludedPaths = ["settings", "notifications", "help"];
-      const shouldSkipNavigation = excludedPaths.some((path) =>
-        currentUrl.includes(path)
-      );
-
-      if (!shouldSkipNavigation) {
-        const urlContainsAccountType = currentUrl.includes(defaultAccountType);
-
-        console.log(
-          {
-            currentUrl,
-            defaultAccountType,
-            urlContainsAccountType,
-            shouldSkipNavigation,
-            hostname: window.location.hostname,
-          },
-          "Navigation Debug"
-        );
-
-        if (!urlContainsAccountType) {
-          // Use setTimeout to ensure navigation happens after React Router is ready
-          setTimeout(() => {
-            const targetUrl = `/${defaultAccountType}`;
-            console.log(`Navigating to: ${targetUrl}`);
-
-            // Try using window.location.replace for staging compatibility
-            if (window.location.hostname.includes("staging")) {
-              window.location.replace(targetUrl);
-            } else {
-              window.location.href = targetUrl;
-            }
-          }, 100);
-        }
-      }
-    }
-  }, [generalData?.selectedAccount?.type]);
+  // This useEffect was for other logic, navigation moved to correct useEffect below
 
   //find account name
 

package/src/components/header/index.jsx

@@ -202,6 +202,50 @@ const HeaderComponent = (props) => {
         }
       }
     }
+    // when we get the default account type (getDefaultAccount?.data?.type),
+    // if url is not containing settings, notifications or help,
+    // check if url contains default account type and if it doesn't
+    // navigate the user using href to /default account type in lower case
+    const currentUrl = window.location.pathname;
+    const defaultAccountType =
+      generalData?.selectedAccount?.type?.toLowerCase();
+
+    const excludedPaths = ["settings", "notifications", "help"];
+    const shouldSkipNavigation = excludedPaths.some((path) =>
+      currentUrl.includes(path)
+    );
+
+    console.log("getDefaultAccount?.data received:", {
+      currentUrl,
+      defaultAccountType,
+      shouldSkipNavigation,
+      hostname: window.location.hostname,
+      data: generalData?.selectedAccount,
+    });
+
+    if (!shouldSkipNavigation && defaultAccountType) {
+      const urlContainsAccountType = currentUrl.includes(defaultAccountType);
+
+      console.log("Navigation check:", {
+        urlContainsAccountType,
+        willNavigate: !urlContainsAccountType,
+      });
+
+      if (!urlContainsAccountType) {
+        // Use setTimeout to ensure navigation happens after React Router is ready
+        setTimeout(() => {
+          const targetUrl = `/${defaultAccountType}`;
+          console.log(`Navigating to: ${targetUrl}`);
+
+          // Try using window.location.replace for staging compatibility
+          if (window.location.hostname.includes("staging")) {
+            window.location.replace(targetUrl);
+          } else {
+            window.location.href = targetUrl;
+          }
+        }, 100);
+      }
+    }
   }, [generalData?.selectedAccount, userAccountsDetail?.data]);
 
   //console.log("Accounts===", userAccountsDetail?.data?.results)
@@ -472,7 +516,7 @@ const HeaderComponent = (props) => {
               window.location.pathname.includes("help") ? "active" : ""
             }
           >
-            <QuestionMark /> {props?.findText("Helps")}
+            <QuestionMark /> {props?.findText("Helpx")}
           </a>
         </li>
       </Nav>