Skip to content

fix: prevented 'no message' screen on first narrow load #5639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevented 'no message' screen on first narrow load #5639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/chat/ChatScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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(() => {
Expand Down