@asaleh37/ui-base 25.8.1-5.1 → 25.8.1-5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.8.15.1",
+  "version": "25.8.15.3",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/BaseApp.tsx

@@ -18,33 +18,40 @@ import i18n from "../locales/i18n";
 import { initReactI18next } from "react-i18next";
 import { ENGLISH_TRANS } from "../locales/english";
 import { ARABIC_TRANS } from "../locales/arabic";
+import { useEffect } from "react";
 
 library.add(fab);
 library.add(far);
 library.add(fas);
 
 export const BaseApp: React.FC<AppInfo> = (props) => {
-  const systemReducers = {
-    AppLayout: AppLayoutReducer,
-    UserSession: UserSessionReducer,
-    loadingMask: LoadingMaskReducer,
-    commonStores: CommonStoreReducer,
-    SideBar: SideBarReducer,
-    AppInfo: AppInfoReducer,
-    ...props?.businessReduxReducers,
+  let store = configureStore({ reducer: {} });
+  const initializeApp = () => {
+    const systemReducers = {
+      AppLayout: AppLayoutReducer,
+      UserSession: UserSessionReducer,
+      loadingMask: LoadingMaskReducer,
+      commonStores: CommonStoreReducer,
+      SideBar: SideBarReducer,
+      AppInfo: AppInfoReducer,
+      ...props?.businessReduxReducers,
+    };
+    store = configureStore({
+      reducer: systemReducers,
+    });
+    const resources = {
+      en: { translation: { ...ENGLISH_TRANS, ...props?.businessLocals?.en } },
+      ar: { translation: { ...ARABIC_TRANS, ...props?.businessLocals?.ar } },
+    };
+    i18n.use(initReactI18next).init({
+      resources: resources, // Where we're gonna put translations' files
+      lng: localStorage.getItem("language") || "en", // Set the initial language of the App
+      fallbackLng: "en",
+    });
   };
-  const store = configureStore({
-    reducer: systemReducers,
-  });
-  const resources = {
-    en: { translation: { ...ENGLISH_TRANS, ...props?.businessLocals?.en } },
-    ar: { translation: { ...ARABIC_TRANS, ...props?.businessLocals?.ar } },
-  };
-  i18n.use(initReactI18next).init({
-    resources: resources, // Where we're gonna put translations' files
-    lng: localStorage.getItem("language") || "en", // Set the initial language of the App
-    fallbackLng: "en",
-  });
+  useEffect(() => {
+    initializeApp();
+  }, [props]);
   return (
     <Provider store={store}>
       <App {...props} />

package/src/components/common/Login.tsx

@@ -124,15 +124,11 @@ const Login: React.FC = () => {
     }
   };
   useEffect(() => {
+    console.log("checking usersession on reload", userSession);
+    console.log("checking usersession app info", appInfo);
     checkUserSession();
-  }, [appInfo]);
+  }, [appInfo, userSession.isAuthenticated]);
 
-  useEffect(() => {
-    if (userSession.isAuthenticated === null) {
-      console.log("checking usersession on reload", userSession);
-      checkUserSession();
-    }
-  }, [userSession.isAuthenticated]);
   return (
     <ThemeProvider theme={loginTheme}>
       <Paper