PLT-5535 Bug fix - landing on profile after logout + loader after logout

input-output-hk · Aug 10, 2023 · e8a3de5 · e8a3de5
1 parent d4e5ad2
commit e8a3de5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/react-web/src/components/AvatarDropdown/AvatarDropdown.tsx b/react-web/src/components/AvatarDropdown/AvatarDropdown.tsx
@@ -41,8 +41,6 @@ const AvatarDropDown = () => {
     setAnchorEl(null);
     logOut();
     navigate("/");
-    setUserDetails({ dapp: null });
-    setIsLoggedIn(false);
   };
 
   return (

diff --git a/react-web/src/pages/certification/Certification.tsx b/react-web/src/pages/certification/Certification.tsx
@@ -45,7 +45,7 @@ const Certification = () => {
   });
 
   const { uuid } = useAppSelector((state) => state.certification);
-  const { userDetails, subscribedFeatures } = useAppSelector((state) => state.auth);
+  const { isLoggedIn, userDetails, subscribedFeatures } = useAppSelector((state) => state.auth);
   const dispatch = useAppDispatch();
   const confirm = useConfirm();
   const [submitting, setSubmitting] = useState(false);
@@ -248,11 +248,15 @@ const Certification = () => {
       handleErrorScenario
   )
 
+  // if not logged in, prevent loader as well
+  if (!isLoggedIn) {
+    return null;
+  }
   // Show loader until subscribed features is fetched
-  if (!subscribedFeatures) {
+  else if (isLoggedIn && !subscribedFeatures) {
     return <Loader />;
   }
-
+  // else
   return (
     <>
       {subscribedFeatures?.indexOf("l1-run") === -1 ?