Improved legal screen

apps/web/src/features/legal/screen.tsx

@@ -51,16 +51,14 @@ export default function Screen(props: { children: React.ReactNode }) {
   useEffect(() => {
     let active = true;
 
-    const shouldBlockRender = userId === undefined || userId === 0;
-
-    if (shouldBlockRender) {
     setLoading(true);
-    }
 
     setError("");
     setErrorDescription("");
 
-    void load("user_id").then(async (id) => {
+    void (async () => {
+      try {
+        const id = await load("user_id");
         if (!active) {
           return;
         }
@@ -68,9 +66,6 @@ export default function Screen(props: { children: React.ReactNode }) {
         setUserId(id);
 
         if (id === 0) {
-        if (shouldBlockRender) {
-          setLoading(false);
-        }
           return;
         }
 
@@ -123,32 +118,27 @@ export default function Screen(props: { children: React.ReactNode }) {
           return;
         }
 
-      acceptPP(loadedAcceptedPP);
+        acceptPP(
-      acceptTOS(loadedAcceptedTOS);
+          loadedAcceptedPP &&
-
+            !!currentLocalDocs &&
-      if (
+            currentLocalDocs.pp.hash === safeCurrent.data.pp.hash,
-        !currentLocalDocs ||
+        );
-        currentLocalDocs.pp.hash !== safeCurrent.data.pp.hash
+        acceptTOS(
-      ) {
+          loadedAcceptedTOS &&
-        acceptPP(false);
+            !!currentLocalDocs &&
-      }
+            currentLocalDocs.tos.hash === safeCurrent.data.tos.hash,
-
+        );
-      if (
+      } finally {
-        !currentLocalDocs ||
+        if (active) {
-        currentLocalDocs.tos.hash !== safeCurrent.data.tos.hash
-      ) {
-        acceptTOS(false);
-      }
-
-      if (shouldBlockRender) {
           setLoading(false);
         }
-    });
+      }
+    })();
 
     return () => {
       active = false;
     };
-  }, [load, location.pathname, userId]);
+  }, [load, location.pathname]);
 
   if (error !== "" && errorDescription !== "") {
     return <ErrorScreen error={error} description={errorDescription} />;