diff --git a/src/screens/Messages/Conversation/MessagesList.tsx b/src/screens/Messages/Conversation/MessagesList.tsx index b0723c0201..986f838ae5 100644 --- a/src/screens/Messages/Conversation/MessagesList.tsx +++ b/src/screens/Messages/Conversation/MessagesList.tsx @@ -30,6 +30,8 @@ import {NewMessagesPill} from '#/components/dms/NewMessagesPill' import {Loader} from '#/components/Loader' import {Text} from '#/components/Typography' +const MAX_TO_RENDER = isNative ? 30 : 60 + function MaybeLoader({isLoading}: {isLoading: boolean}) { return ( { - if (hasScrolled) { + if (hasScrolled && convoState.items.length >= MAX_TO_RENDER) { convoState.fetchMessageHistory() } }, [convoState, hasScrolled])