fix: sign out an expired session only if signed in

0xflair · Dec 19, 2022 · 38c0d38 · 38c0d38
1 parent ef8dd6e
commit 38c0d38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/react/src/core/ui/components/elements/ButtonWithDialog.tsx b/packages/react/src/core/ui/components/elements/ButtonWithDialog.tsx
@@ -42,7 +42,7 @@ export function ButtonWithDialog<T extends HTMLElement = HTMLElement>({
 }: ButtonWithDialogProps<T>) {
   const [dialogOpen, setDialogOpen] = useState(false);
 
-  const Component = as || (attributes.className ? 'div' : Fragment);
+  const Component = as || (attributes.className ? 'button' : Fragment);
 
   return (
     <>

diff --git a/packages/react/src/core/wallet/providers/sign-in.tsx b/packages/react/src/core/wallet/providers/sign-in.tsx
@@ -138,14 +138,18 @@ export const SignInProvider = ({
     }));
   }, [setSignInState]);
   const checkExpiration = useCallback(() => {
-    if (signInState?.siweMessage?.expirationTime) {
+    if (signInState.signedIn && signInState?.siweMessage?.expirationTime) {
       const expirationTime = new Date(signInState.siweMessage.expirationTime);
       const now = Date.now();
       if (+expirationTime < +now) {
-        setSignInState((p) => ({ ...p, signedIn: false }));
+        signOut();
       }
     }
-  }, [signInState, setSignInState]);
+  }, [
+    signInState?.signedIn,
+    signInState?.siweMessage?.expirationTime,
+    signOut,
+  ]);
 
   useEffect(checkExpiration, [checkExpiration]);
   useInterval(checkExpiration, 60_000);