From 05218800d24e72f30a35e387dbc6f186a663ac77 Mon Sep 17 00:00:00 2001
From: orangecoding <christian.kellner.privat@gmail.com>
Date: Tue, 17 Feb 2026 14:28:08 +0100
Subject: [PATCH] fixing app init

---
 package.json   |  2 +-
 ui/src/App.jsx | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 0c8f954..7842f14 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fredy",
-  "version": "19.4.1",
+  "version": "19.4.2",
   "description": "[F]ind [R]eal [E]states [d]amn eas[y].",
   "scripts": {
     "prepare": "husky",
diff --git a/ui/src/App.jsx b/ui/src/App.jsx
index 3825866..7d7888c 100644
--- a/ui/src/App.jsx
+++ b/ui/src/App.jsx
@@ -11,7 +11,7 @@ import GeneralSettings from './views/generalSettings/GeneralSettings';
 import UserSettings from './views/userSettings/UserSettings';
 import JobMutation from './views/jobs/mutation/JobMutation';
 import UserMutator from './views/user/mutation/UserMutator';
-import { useActions, useSelector, useFredyState } from './services/state/store';
+import { useActions, useSelector } from './services/state/store';
 import { Routes, Route, Navigate } from 'react-router-dom';
 import Login from './views/login/Login';
 import Users from './views/user/Users';
@@ -41,24 +41,21 @@ export default function FredyApp() {
   useEffect(() => {
     async function init() {
       await actions.user.getCurrentUser();
-      const user = useFredyState.getState().user.currentUser;
-      if (!user || Object.keys(user).length === 0) {
-        setLoading(false);
-        return;
+      if (!needsLogin()) {
+        await actions.provider.getProvider();
+        await actions.jobsData.getJobs();
+        await actions.jobsData.getSharableUserList();
+        await actions.notificationAdapter.getAdapter();
+        await actions.generalSettings.getGeneralSettings();
+        await actions.userSettings.getUserSettings();
+        await actions.versionUpdate.getVersionUpdate();
+        await actions.tracking.getTrackingPois();
       }
-      await actions.provider.getProvider();
-      await actions.jobsData.getJobs();
-      await actions.jobsData.getSharableUserList();
-      await actions.notificationAdapter.getAdapter();
-      await actions.generalSettings.getGeneralSettings();
-      await actions.userSettings.getUserSettings();
-      await actions.versionUpdate.getVersionUpdate();
-      await actions.tracking.getTrackingPois();
       setLoading(false);
     }
 
     init();
-  }, []);
+  }, [currentUser?.userId]);
 
   const needsLogin = () => {
     return currentUser == null || Object.keys(currentUser).length === 0;
@@ -68,7 +65,10 @@ export default function FredyApp() {
   const { Sider, Content } = Layout;
 
   return loading ? null : needsLogin() ? (
-    <Login />
+    <Routes>
+      <Route path="/login" element={<Login />} />
+      <Route path="*" element={<Navigate to="/login" replace />} />
+    </Routes>
   ) : (
     <Layout className="app">
       <Sider>
@@ -137,7 +137,6 @@ export default function FredyApp() {
               }
             />
 
-            {/* Authenticated fallbacks */}
             <Route path="/" element={<Navigate to="/dashboard" replace />} />
           </Routes>
         </Content>