diff --git a/src/modules/reader/screens/Reader.tsx b/src/modules/reader/screens/Reader.tsx index 0dc05ffb..248d7071 100644 --- a/src/modules/reader/screens/Reader.tsx +++ b/src/modules/reader/screens/Reader.tsx @@ -127,6 +127,8 @@ const BaseReader = ({ const scrollElementRef = useRef(null); + const [areSettingsSet, setAreSettingsSet] = useState(false); + const { chapterIndex: paramChapterIndex, mangaId: paramMangaId } = useParams<{ chapterIndex: string; mangaId: string; @@ -164,6 +166,7 @@ const BaseReader = ({ chapterIndex <= chapters.length - 1; const isLoading = + !areSettingsSet || mangaResponse.loading || chaptersResponse.loading || defaultSettingsResponse.loading || @@ -248,7 +251,6 @@ const BaseReader = ({ }, [pagesResponse.data?.fetchChapterPages?.pages]); // set settings state - const [areSettingsSet, setAreSettingsSet] = useState(false); useEffect(() => { const mangaFromResponse = mangaResponse.data?.manga; if (!mangaFromResponse || defaultSettingsResponse.loading || defaultSettingsResponse.error) { @@ -389,21 +391,6 @@ const BaseReader = ({ return () => setOverride({ status: false, value: null }); }, [isOverlayVisible, setIsOverlayVisible, scrollElementRef.current]); - if (isLoading) { - return ( - - - - ); - } - if (error) { return ( + + + ); + } + if (currentChapter === null) { return ; }