l-min-components 1.7.1501 → 1.7.1503

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -78,8 +78,19 @@ const AppMainLayout = ({ children }) => {
     useState(true);
   const [selectedAccount, setSelectedAccount] = useState();
   const [affilitateSearch, setAffilitateSearch] = useState("");
+  const [showChildren, setShowChildren] = useState(false);
 
   const [loading, setLoading] = useState(true);
+
+  // Add timeout for showing children
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setShowChildren(true);
+    }, 3000);
+
+    return () => clearTimeout(timer);
+  }, []);
+
   // for mobile view
   useEffect(() => {
     const handleResize = () => setDeviceWidth(window.innerWidth);
@@ -190,6 +201,53 @@ const AppMainLayout = ({ children }) => {
       handleSetDefaultAccount(getDefaultAccount?.data?.id);
 
       setSelectedAccount(getDefaultAccount?.data);
+
+      // 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)
+      );
+
+      console.log(
+        "Navigation logic triggered - getDefaultAccount data received:",
+        {
+          currentUrl,
+          defaultAccountType,
+          shouldSkipNavigation,
+          hostname: window.location.hostname,
+          data: getDefaultAccount?.data,
+        }
+      );
+
+      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);
+        }
+      }
     }
   }, [getDefaultAccount?.data]);
 
@@ -249,9 +307,20 @@ const AppMainLayout = ({ children }) => {
         break;
       }
     }
+    console.log("Calling handleGetDefaultAccount on staging/local");
     handleGetDefaultAccount();
   }, [defaultAcct]);
 
+  // Debug the API response
+  useEffect(() => {
+    console.log("getDefaultAccount state changed:", {
+      data: getDefaultAccount?.data,
+      loading: getDefaultAccount?.loading,
+      error: getDefaultAccount?.error,
+      response: getDefaultAccount?.response,
+    });
+  }, [getDefaultAccount]);
+
   // setting current environment type
   useEffect(() => {
     if (window.location.hostname.includes("staging")) {
@@ -566,8 +635,10 @@ const AppMainLayout = ({ children }) => {
                               </div>
                             </div>
                           </div>
-                        ) : (
+                        ) : showChildren ? (
                           <ChildrenWrap>{children ?? <Outlet />}</ChildrenWrap>
+                        ) : (
+                          <FullPageLoader hasBackground fixed={true} />
                         )}
                       </>
                     )}

package/src/components/header/index.jsx

@@ -202,50 +202,6 @@ 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)
@@ -516,7 +472,7 @@ const HeaderComponent = (props) => {
               window.location.pathname.includes("help") ? "active" : ""
             }
           >
-            <QuestionMark /> {props?.findText("Helpx")}
+            <QuestionMark /> {props?.findText("Helpxyz")}
           </a>
         </li>
       </Nav>