Fix error screen

- Clear loaders after error.
gov4git · Feb 24, 2024 · d5401fd · d5401fd
1 parent 00dfd32
commit d5401fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.changeset/tender-countries-lie.md b/.changeset/tender-countries-lie.md
@@ -0,0 +1,7 @@
+---
+'gov4git-desktop-app': patch
+---
+
+Fix error screen
+
+- Clear loaders after error.
diff --git a/src/renderer/src/pages/layout/Layout.tsx b/src/renderer/src/pages/layout/Layout.tsx
@@ -21,13 +21,6 @@ export const Layout = function Layout() {
   const navigate = useNavigate()
   const settingsError = useGlobalSettingsErrors()
   const userLoaded = useDataStore((s) => s.userInfo.userLoaded)
-  const communitiesLoaded = useDataStore(
-    (s) => s.communityInfo.communitiesLoaded,
-  )
-
-  const loading = useMemo(() => {
-    return !userLoaded || !communitiesLoaded
-  }, [userLoaded, communitiesLoaded])
 
   useEffect(() => {
     if (exceptionMessage !== '') {
@@ -60,7 +53,7 @@ export const Layout = function Layout() {
         <main className={classes.main} ref={mainRef}>
           <ErrorPanel />
           <ExceptionPanel />
-          <Loader isLoading={loading}>
+          <Loader isLoading={!userLoaded}>
             <Outlet />
           </Loader>
         </main>

diff --git a/src/renderer/src/store/errorStore.ts b/src/renderer/src/store/errorStore.ts
@@ -60,6 +60,12 @@ export const createErrorStore: StateCreator<
           s.exception = `${msg} ${ex}`
         })
       }
+      set((s) => {
+        s.motionInfo.loading = false
+        s.communityInfo.loading = false
+        s.userInfo.loading = false
+        s.userInfo.userLoaded = true
+      })
     }
   },
 })