From b310efe098ef6ad5edf2491023010aa5609e8f7e Mon Sep 17 00:00:00 2001 From: Florian Maul Date: Sun, 13 Aug 2023 11:15:20 +0200 Subject: [PATCH] fix: Fixed auto login --- src/components/GridView/index.tsx | 2 +- src/components/SlideShow.tsx | 2 +- src/utils/useAutoLogin.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/GridView/index.tsx b/src/components/GridView/index.tsx index fd51dc5..c35d96f 100644 --- a/src/components/GridView/index.tsx +++ b/src/components/GridView/index.tsx @@ -21,7 +21,7 @@ const GridView = ({ settings, images }: GridViewProps) => { images .filter(i => !isVideo(i.url)) // TODO: filter out video for now, since we don't have a good way to display them .sort((a, b) => (b.timestamp && a.timestamp ? b.timestamp - a.timestamp : 0)), // sort by timestamp descending - [images] + [images, settings] // settings is not used here, but we need to include it to trigger a re-render when it changes ); const onKeyDown = (event: KeyboardEvent) => { diff --git a/src/components/SlideShow.tsx b/src/components/SlideShow.tsx index a71eca4..9127931 100644 --- a/src/components/SlideShow.tsx +++ b/src/components/SlideShow.tsx @@ -183,7 +183,7 @@ const SlideShow = () => { // auto login when alby is available onLogin(); } - }, 500); + }, 100); document.body.addEventListener('keydown', onKeyDown); return () => { diff --git a/src/utils/useAutoLogin.ts b/src/utils/useAutoLogin.ts index 5d79d33..8163f8f 100644 --- a/src/utils/useAutoLogin.ts +++ b/src/utils/useAutoLogin.ts @@ -7,11 +7,11 @@ declare global { } const useAutoLogin = () => { - const [autoLogin, setAutoLogin] = useState(false); + const [autoLogin, setAutoLogin] = useState(JSON.parse(localStorage.getItem('autoLogin') as string) as boolean | undefined); useEffect(() => { - const disclaimerAcceptedPreviously = JSON.parse(localStorage.getItem('autoLogin') as string); - if (disclaimerAcceptedPreviously === true) { + const autoLogin = JSON.parse(localStorage.getItem('autoLogin') as string) as boolean | undefined; + if (autoLogin === true) { setAutoLogin(true); } }, []);