fix: logged in state checks

memori-ai · Mar 14, 2024 · 6e20c90 · 6e20c90
1 parent 66464e2
commit 6e20c90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/LoginDrawer/LoginDrawer.tsx b/src/components/LoginDrawer/LoginDrawer.tsx
@@ -60,7 +60,7 @@ const LoginDrawer = ({
     setRedirectTo(window.location.href);
   }, []);
 
-  const isUserLoggedIn = user && loginToken;
+  const isUserLoggedIn = user?.userID && loginToken;
 
   const login = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();

diff --git a/src/components/MemoriWidget/MemoriWidget.tsx b/src/components/MemoriWidget/MemoriWidget.tsx
@@ -427,7 +427,7 @@ const MemoriWidget = ({
     avatarURL: typeof userAvatar === 'string' ? userAvatar : undefined,
   } as User);
   useEffect(() => {
-    if (loginToken && !user?.userID) {
+    if (loginToken && !user?.userID && showLogin) {
       client.backend.getCurrentUser(loginToken).then(({ user, resultCode }) => {
         if (user && resultCode === 0) {
           setUser(user);
@@ -2674,7 +2674,7 @@ const MemoriWidget = ({
     clickedStart: clickedStart,
     onClickStart: onClickStart,
     initializeTTS: initializeTTS,
-    isUserLoggedIn: !!loginToken,
+    isUserLoggedIn: !!loginToken && !!user?.userID,
     showLogin,
     setShowLoginDrawer,
     user,