web: fix app stuck on splash screen after logout

streetwriters · Nov 19, 2024 · d3e2fcc · d3e2fcc
1 parent dafc2de
commit d3e2fcc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/apps/web/src/app-effects.tsx b/apps/web/src/app-effects.tsx
@@ -240,9 +240,6 @@ export default function AppEffects({ setShow }: AppEffectsProps) {
 
   useEffect(() => {
     introduceFeatures();
-    return () => {
-      EV.unsubscribeAll();
-    };
   }, []);
 
   useEffect(() => {

diff --git a/apps/web/src/root.tsx b/apps/web/src/root.tsx
@@ -34,7 +34,7 @@ import { loadDatabase } from "./hooks/use-database";
 import AppLock from "./views/app-lock";
 import { Text } from "@theme-ui/components";
 import { EV, EVENTS } from "@notesnook/core";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 export async function startApp() {
   const rootElement = document.getElementById("root");
@@ -98,10 +98,16 @@ function RouteWrapper(props: {
 }) {
   const [isMigrating, setIsMigrating] = useState(false);
   const { Component, path, routeProps } = props;
-  const result = usePromise(async () => {
-    EV.subscribe(EVENTS.migrationStarted, () => setIsMigrating(true), true);
-    EV.subscribe(EVENTS.migrationFinished, () => setIsMigrating(false), true);
 
+  useEffect(() => {
+    EV.subscribe(EVENTS.migrationStarted, () => setIsMigrating(true));
+    EV.subscribe(EVENTS.migrationFinished, () => setIsMigrating(false));
+    return () => {
+      EV.unsubscribeAll();
+    };
+  }, []);
+
+  const result = usePromise(async () => {
     performance.mark("load:database");
     await loadDatabase(
       path !== "/sessionexpired" || Config.get("sessionExpired", false)