From 539fe8b310bf8055eeed1e18de19050f9a2c1159 Mon Sep 17 00:00:00 2001 From: Anshuman Date: Fri, 13 Jan 2023 16:20:22 +0530 Subject: [PATCH] fix[ChatScreen]: prevented 'no message' screen on first narrow load --- src/chat/ChatScreen.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chat/ChatScreen.js b/src/chat/ChatScreen.js index 7e6af9438b0..e7fe0f9813b 100644 --- a/src/chat/ChatScreen.js +++ b/src/chat/ChatScreen.js @@ -61,8 +61,6 @@ const useMessagesWithFetch = args => { const eventQueueId = useSelector(state => getSession(state).eventQueueId); const loading = useSelector(getLoading); - const fetching = useSelector(state => getFetchingForNarrow(state, narrow)); - const isFetching = fetching.older || fetching.newer || loading; const caughtUp = useSelector(state => getCaughtUpForNarrow(state, narrow)); const messages = useSelector(state => getShownMessagesForNarrow(state, narrow)); const firstUnreadIdInNarrow = useSelector(state => getFirstUnreadIdInNarrow(state, narrow)); @@ -107,6 +105,9 @@ const useMessagesWithFetch = args => { const nothingKnown = messages.length === 0 && !caughtUp.older && !caughtUp.newer; useConditionalEffect(scheduleFetch, nothingKnown); + const fetching = useSelector(state => getFetchingForNarrow(state, narrow)); + const isFetching = fetching.older || fetching.newer || loading || nothingKnown; + // On first mount, fetch. (This also makes a fetch no longer scheduled, // so the if-scheduled fetch below doesn't also fire.) React.useEffect(() => {