stream-chat-react-native-core 5.22.2-beta.3 → 5.22.2-beta.5

package/lib/typescript/i18n/nl.json

@@ -1,76 +1,76 @@
 {
-    "1 Reply": "",
-    "1 Thread Reply": "1 thread antwoord",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "1 Reply": "1 Antwoord",
+    "1 Thread Reply": "",
+    "Allow access to your Gallery": "Geef toegang tot uw galerij",
+    "Allow camera access in device settings": "Sta cameratoegang toe in de apparaatinstellingen",
     "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "Weet u zeker dat u dit bericht definitief wilt verwijderen?",
-    "Block User": "Blokkeer Gebruiker",
-    "Cancel": "Annuleer",
-    "Cannot Flag Message": "Kan bericht niet rapporteren",
-    "Copy Message": "Bericht kopiëren",
-    "Delete": "Verwijderen",
-    "Delete Message": "Verwijder bericht",
-    "Device camera is used to take photos or videos.": "",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "Wil je een kopie van dit bericht naar een moderator sturen voor verder onderzoek?",
-    "Edit Message": "Pas bericht aan",
+    "Are you sure you want to permanently delete this message?": "",
+    "Block User": "",
+    "Cancel": "",
+    "Cannot Flag Message": "",
+    "Copy Message": "",
+    "Delete": "",
+    "Delete Message": "",
+    "Device camera is used to take photos or videos.": "De camera van het apparaat wordt gebruikt om foto's of video's te maken.",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
     "Editing Message": "",
-    "Emoji matching": "",
+    "Emoji matching": "Emoji-overeenkomsten",
     "Empty message...": "",
     "Error loading": "",
     "Error loading channel list...": "",
     "Error loading messages for this channel...": "",
     "Error while loading, please reload/refresh": "",
     "File type not supported": "Bestandstype niet ondersteund",
-    "Flag": "Markeer",
-    "Flag Message": "Markeer bericht",
-    "Flag action failed either due to a network issue or the message is already flagged": "Rapporteren mislukt door een netwerk fout of het berich is al gerapporteerd",
+    "Flag": "",
+    "Flag Message": "",
+    "Flag action failed either due to a network issue or the message is already flagged": "",
     "How about sending your first message to a friend?": "",
-    "Instant Commands": "",
+    "Instant Commands": "Directe Opdrachten",
     "Let's start chatting!": "",
     "Links are disabled": "Het versturen van links staat uit",
-    "Loading channels...": "",
-    "Loading messages...": "",
-    "Loading...": "",
-    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Maximale uploadlimiet voor bestandsgrootte bereikt. Upload een bestand van minder dan {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.",
-    "Message Reactions": "",
+    "Loading channels...": "Kanalen aan het laden...",
+    "Loading messages...": "Berichten aan het laden...",
+    "Loading...": "Aan het laden...",
+    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "",
+    "Message Reactions": "Bericht Reacties",
     "Message deleted": "",
-    "Message flagged": "Bericht gemarkeerd",
-    "Mute User": "Gebruiker dempen",
+    "Message flagged": "",
+    "Mute User": "",
     "Not supported": "",
     "Nothing yet...": "",
-    "Ok": "Oké",
-    "Only visible to you": "Alleen zichtbaar voor jou",
-    "Open Settings": "",
+    "Ok": "",
+    "Only visible to you": "",
+    "Open Settings": "Open instellingen",
     "Photo": "Foto",
-    "Photos and Videos": "",
-    "Pin to Conversation": "Vastmaken aan gesprek",
+    "Photos and Videos": "Foto's en video's",
+    "Pin to Conversation": "",
     "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
-    "Please select a channel first": "Selecteer eerst een kanaal",
+    "Please enable access to your photos and videos so you can share them.": "Schakel toegang tot uw foto's en video's in zodat u ze kunt delen.",
+    "Please select a channel first": "",
     "Reconnecting...": "",
-    "Reply": "Antwoord",
+    "Reply": "",
     "Reply to Message": "",
-    "Resend": "Opnieuw versturen",
+    "Resend": "",
     "Search GIFs": "",
-    "Select More Photos": "",
+    "Select More Photos": "Selecteer Meer foto's",
     "Send a message": "",
     "Sending links is not allowed in this conversation": "In dit gesprek is het niet toegestaan links te versturen",
     "Slow mode ON": "",
-    "The message has been reported to a moderator.": "Het bericht is gerapporteerd aan een moderator.",
-    "Thread Reply": "Discussie beantwoorden",
-    "Unblock User": "Deblokkeer gebruiker",
-    "Unknown User": "",
-    "Unmute User": "Dempen van gebruiker opheffen",
-    "Unpin from Conversation": "Losmaken van gesprek",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
+    "Unknown User": "Onbekende gebruiker",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "",
     "Video": "Video",
     "You": "",
-    "You can't send messages in this channel": "",
+    "You can't send messages in this channel": "Je kan geen berichten sturen in dit kanaal",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "",
-    "{{ replyCount }} Replies": "",
-    "{{ replyCount }} Thread Replies": "{{replyCount}} Discussiereacties",
+    "{{ index }} of {{ photoLength }}": "{{ index }} van {{ photoLength }}",
+    "{{ replyCount }} Replies": "{{ replyCount }} Antwoorden",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "",
     "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/ru.json

@@ -1,76 +1,76 @@
 {
-    "1 Reply": "",
-    "1 Thread Reply": "1 тема Ответить",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "1 Reply": "1 Ответ",
+    "1 Thread Reply": "",
+    "Allow access to your Gallery": "Разрешить доступ к вашей галерее",
+    "Allow camera access in device settings": "Разрешите доступ к камере в настройках устройства.",
     "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "Вы действительно хотите удалить это сообщение без возможности восстановления?",
-    "Block User": "Заблокировать пользователя",
-    "Cancel": "Отмена",
-    "Cannot Flag Message": "Невозможно пожаловаться на сообщение",
-    "Copy Message": "Копировать сообщение",
-    "Delete": "удалять",
-    "Delete Message": "Удалить сообщение",
-    "Device camera is used to take photos or videos.": "",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "Вы хотите отправить копию этого сообщения модератору для дальнейшего изучения?",
-    "Edit Message": "Редактировать сообщение",
+    "Are you sure you want to permanently delete this message?": "",
+    "Block User": "",
+    "Cancel": "",
+    "Cannot Flag Message": "",
+    "Copy Message": "",
+    "Delete": "",
+    "Delete Message": "",
+    "Device camera is used to take photos or videos.": "Камера устройства используется для съемки фотографий или видео.",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
     "Editing Message": "",
-    "Emoji matching": "",
+    "Emoji matching": "Соответствие эмодзи",
     "Empty message...": "",
     "Error loading": "",
     "Error loading channel list...": "",
     "Error loading messages for this channel...": "",
     "Error while loading, please reload/refresh": "",
     "File type not supported": "Тип файла не поддерживается",
-    "Flag": "Пометить",
-    "Flag Message": "Пометить сообщение",
-    "Flag action failed either due to a network issue or the message is already flagged": "Не удалось отправить жалобу. Возможные причины: проблема с подключением к интернету или ваша жалоба уже была принята.",
+    "Flag": "",
+    "Flag Message": "",
+    "Flag action failed either due to a network issue or the message is already flagged": "",
     "How about sending your first message to a friend?": "",
-    "Instant Commands": "",
+    "Instant Commands": "Мгновенные Команды",
     "Let's start chatting!": "",
     "Links are disabled": "Ссылки отключены",
-    "Loading channels...": "",
-    "Loading messages...": "",
-    "Loading...": "",
-    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Достигнут предел максимального размера файла для загрузки. Загрузите файл размером менее {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} МБ.",
-    "Message Reactions": "",
+    "Loading channels...": "Загружаю каналы...",
+    "Loading messages...": "Загружаю сообщения...",
+    "Loading...": "Загружаю...",
+    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "",
+    "Message Reactions": "Сообщения Реакции",
     "Message deleted": "",
-    "Message flagged": "Сообщение отмечено",
-    "Mute User": "Отключить пользователя",
+    "Message flagged": "",
+    "Mute User": "",
     "Not supported": "",
     "Nothing yet...": "",
-    "Ok": "Oк",
-    "Only visible to you": "Видно только вам",
-    "Open Settings": "",
+    "Ok": "",
+    "Only visible to you": "",
+    "Open Settings": "Открыть настройки",
     "Photo": "Фото",
-    "Photos and Videos": "",
-    "Pin to Conversation": "Закрепить к беседе",
+    "Photos and Videos": "Фото и видео",
+    "Pin to Conversation": "",
     "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
-    "Please select a channel first": "Пожалуйста, сначала выберите канал",
+    "Please enable access to your photos and videos so you can share them.": "Разрешите доступ к своим фотографиям и видео, чтобы вы могли ими поделиться.",
+    "Please select a channel first": "",
     "Reconnecting...": "",
-    "Reply": "Ответить",
+    "Reply": "",
     "Reply to Message": "",
-    "Resend": "Отправить",
+    "Resend": "",
     "Search GIFs": "",
-    "Select More Photos": "",
+    "Select More Photos": "Выбрать больше фотографий",
     "Send a message": "",
     "Sending links is not allowed in this conversation": "Отправка ссылок недоступна в этом чате",
     "Slow mode ON": "",
-    "The message has been reported to a moderator.": "Сообщение отправлено модератору.",
-    "Thread Reply": "Тема Ответить",
-    "Unblock User": "Разблокировать пользователя",
-    "Unknown User": "",
-    "Unmute User": "Включить микрофон",
-    "Unpin from Conversation": "Открепить от беседы",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
+    "Unknown User": "Неизвестный пользователь",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "",
     "Video": "видео",
     "You": "",
-    "You can't send messages in this channel": "",
+    "You can't send messages in this channel": "Вы не можете отправлять сообщения в этот канал",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "",
-    "{{ replyCount }} Replies": "",
-    "{{ replyCount }} Thread Replies": "{{replyCount}} Ответы в темах",
+    "{{ index }} of {{ photoLength }}": "{{ index }} из {{ photoLength }}",
+    "{{ replyCount }} Replies": "{{ replyCount }} Ответов",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "",
     "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/tr.json

@@ -1,76 +1,76 @@
 {
-    "1 Reply": "",
-    "1 Thread Reply": "1 Konu Yanıtı",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "1 Reply": "1 Cevap",
+    "1 Thread Reply": "",
+    "Allow access to your Gallery": "Galerinize erişime izin verin",
+    "Allow camera access in device settings": "Cihaz ayarlarında kamera erişimine izin ver",
     "Also send to channel": "",
-    "Are you sure you want to permanently delete this message?": "Bu mesajı kalıcı olarak silmek istediğinizden emin misiniz?",
-    "Block User": "Kullanıcıyı engelle",
-    "Cancel": "İptal",
-    "Cannot Flag Message": "Raporlama Başarısız",
-    "Copy Message": "Mesajı Kopyala",
-    "Delete": "Sil",
-    "Delete Message": "Mesajı Sil",
-    "Device camera is used to take photos or videos.": "",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "Detaylı inceleme için bu mesajın kopyasını moderatöre göndermek istiyor musunuz?",
-    "Edit Message": "Mesajı Düzenle",
+    "Are you sure you want to permanently delete this message?": "",
+    "Block User": "",
+    "Cancel": "",
+    "Cannot Flag Message": "",
+    "Copy Message": "",
+    "Delete": "",
+    "Delete Message": "",
+    "Device camera is used to take photos or videos.": "Cihaz kamerası fotoğraf veya video çekmek için kullanılır.",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
     "Editing Message": "",
-    "Emoji matching": "",
+    "Emoji matching": "Emoji eşleştirme",
     "Empty message...": "",
     "Error loading": "",
     "Error loading channel list...": "",
     "Error loading messages for this channel...": "",
     "Error while loading, please reload/refresh": "",
     "File type not supported": "Dosya türü desteklenmiyor",
-    "Flag": "Raporla",
-    "Flag Message": "Mesajı Raporla",
-    "Flag action failed either due to a network issue or the message is already flagged": "Mesajın daha önce raporlanmış olması veya bir ağ bağlantısı sorunu nedeniyle raporlama işlemi başarısız oldu.",
+    "Flag": "",
+    "Flag Message": "",
+    "Flag action failed either due to a network issue or the message is already flagged": "",
     "How about sending your first message to a friend?": "",
-    "Instant Commands": "",
+    "Instant Commands": "Anlık Komutlar",
     "Let's start chatting!": "",
     "Links are disabled": "Bağlantılar devre dışı",
-    "Loading channels...": "",
-    "Loading messages...": "",
-    "Loading...": "",
-    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Maksimum dosya boyutu yükleme sınırına ulaşıldı. Lütfen {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB'ın altında bir dosya yükleyin.",
-    "Message Reactions": "",
+    "Loading channels...": "Kanallar yükleniyor...",
+    "Loading messages...": "Mesajlar yükleniyor...",
+    "Loading...": "Yükleniyor...",
+    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "",
+    "Message Reactions": "Mesaj Tepkileri",
     "Message deleted": "",
-    "Message flagged": "Mesaj işaretlendi",
-    "Mute User": "Kullanıcıyı sessize al",
+    "Message flagged": "",
+    "Mute User": "",
     "Not supported": "",
     "Nothing yet...": "",
-    "Ok": "Tamam",
-    "Only visible to you": "Sadece siz görebilirsiniz",
-    "Open Settings": "",
+    "Ok": "",
+    "Only visible to you": "",
+    "Open Settings": "Ayarları aç",
     "Photo": "Fotoğraf",
-    "Photos and Videos": "",
-    "Pin to Conversation": "Konuşmaya sabitle",
+    "Photos and Videos": "Fotoğraflar ve Videolar",
+    "Pin to Conversation": "",
     "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
-    "Please select a channel first": "Lütfen önce bir kanal seçiniz",
+    "Please enable access to your photos and videos so you can share them.": "Paylaşım yapabilmek için lutfen fotoğraflarınıza ve videolarınıza erişimi etkinleştirin.",
+    "Please select a channel first": "",
     "Reconnecting...": "",
-    "Reply": "Yanıtla",
+    "Reply": "",
     "Reply to Message": "",
-    "Resend": "Yeniden gönder",
+    "Resend": "",
     "Search GIFs": "",
-    "Select More Photos": "",
+    "Select More Photos": "Daha Fazla Fotoğraf Seçin",
     "Send a message": "",
     "Sending links is not allowed in this conversation": "Bu konuşmada bağlantı göndermek desteklenmiyor",
     "Slow mode ON": "",
-    "The message has been reported to a moderator.": "Mesaj moderatöre bildirildi.",
-    "Thread Reply": "Konu Yanıtı",
-    "Unblock User": "Kullanıcının engelini kaldır",
-    "Unknown User": "",
-    "Unmute User": "Kullanıcının sesini aç",
-    "Unpin from Conversation": "Sabitlemeyi kaldır",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
+    "Unknown User": "Bilinmeyen kullanıcı",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "",
     "Video": "Video",
     "You": "",
-    "You can't send messages in this channel": "",
+    "You can't send messages in this channel": "Bu konuşmaya mesaj gönderemezsiniz",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "",
-    "{{ replyCount }} Replies": "",
-    "{{ replyCount }} Thread Replies": "{{responseCount}} Konu Cevapı",
+    "{{ index }} of {{ photoLength }}": "{{ index }} / {{ photoLength }}",
+    "{{ replyCount }} Replies": "{{ replyCount }} Cevap",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "",
     "🏙 Attachment...": ""
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "5.22.2-beta.3",
+  "version": "5.22.2-beta.5",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Channel/Channel.tsx

@@ -817,12 +817,43 @@ const ChannelWithContext = <
     async (
       queryCall: () => Promise<void>,
       onAfterQueryCall: (() => void) | undefined = undefined,
+      // if we are targeting a message after the query, pass it here
+      targetMessageId: string | undefined = undefined,
     ) => {
       setError(false);
       try {
         await queryCall();
         setLastRead(new Date());
         setHasMore(true);
+        if (channel && targetMessageId) {
+          // 30 is the maxToRenderPerBatch in MessageList
+          const limit = 30 * 3; // we allow 3 batches of messages to be rendered
+          const currentMessages = channel.state.messages;
+          // number of messages are over the limit, limit the length of messages
+          if (currentMessages.length > limit) {
+            const targetMessageIndex = currentMessages.findIndex(
+              ({ id }) => id === targetMessageId,
+            );
+            let startIndex = Math.max(targetMessageIndex - Math.floor(limit / 2), 0);
+            const endIndex = targetMessageIndex + Math.floor(limit / 2);
+            if (endIndex > currentMessages.length) {
+              startIndex = Math.max(startIndex - (endIndex - currentMessages.length - 1) - 1, 0);
+            }
+            const hadLatestMessages = channel.state.messages === channel.state.latestMessages;
+            const recentMessage = currentMessages[currentMessages.length - 1];
+            channel.state.clearMessages();
+            channel.state.messages = currentMessages.slice(startIndex, endIndex);
+            const stillHasLatestMessages =
+              hadLatestMessages &&
+              channel.state.messages[channel.state.messages.length - 1] === recentMessage;
+            setHasNoMoreRecentMessagesToLoad(stillHasLatestMessages);
+            channel.state.setIsUpToDate(stillHasLatestMessages);
+          }
+        } else {
+          const areLatestMessages = channel.state.messages === channel.state.latestMessages;
+          setHasNoMoreRecentMessagesToLoad(areLatestMessages);
+          channel.state.setIsUpToDate(areLatestMessages);
+        }
         copyChannelState();
         onAfterQueryCall?.();
       } catch (err) {
@@ -851,7 +882,6 @@ const ChannelWithContext = <
         // if last read date is present we can just fetch messages around that date
         // last read date not being present is an edge case if somewhere the user of SDK deletes the read state (this will usually never happen)
         if (lastReadDate) {
-          setHasNoMoreRecentMessagesToLoad(false); // we are jumping to a message, hence we do not know for sure anymore if there are no more recent messages
           // get totally 30 messages... max 15 before last read date and max 15 after last read date
           // ref: https://github.com/GetStream/chat/pull/2588
           await channel.query(
@@ -870,7 +900,6 @@ const ChannelWithContext = <
           // we just load the latest messages (25 is the default) and we cant scroll to first unread message
           await channel.state.loadMessageIntoState('latest');
         }
-        setLoading(false);
       },
       () => {
         if (unreadMessageIdToScrollTo) {
@@ -891,20 +920,17 @@ const ChannelWithContext = <
         async () => {
           setLoading(true);
           if (messageIdToLoadAround) {
-            setHasNoMoreRecentMessagesToLoad(false); // we are jumping to a message, hence we do not know for sure anymore if there are no more recent messages
-            channel.state.setIsUpToDate(false);
             await channel.state.loadMessageIntoState(messageIdToLoadAround);
           } else {
             await channel.state.loadMessageIntoState('latest');
-            channel.state.setIsUpToDate(true);
           }
-          setLoading(false);
         },
         () => {
           if (messageIdToLoadAround) {
             setTargetedMessage(messageIdToLoadAround);
           }
         },
+        messageIdToLoadAround,
       );
 
   /**

package/src/components/MessageList/MessageList.tsx

@@ -344,6 +344,11 @@ const MessageListWithContext = <
    */
   const initialScrollSettingTimeoutRef = useRef<NodeJS.Timeout>();
 
+  /**
+   * The timeout id used to temporarily load the initial scroll set flag
+   */
+  const tempDisablePaginationTrackersTimeoutRef = useRef<NodeJS.Timeout>();
+
   /**
    * If a messageId was requested to scroll to but was unloaded,
    * this flag keeps track of it to scroll to it after loading the message
@@ -421,6 +426,22 @@ const MessageListWithContext = <
     onEndReachedTracker.current = {};
   });
 
+  /**
+   * Disables the pagination trackers for a second
+   * This is used to prevent the onEndReached and onStartReached from firing
+   * when we scroll to the bottom or top of the list automatically without user interaction
+   * Ex: for targeted message scroll
+   */
+  const tempDisablePaginationTrackersRef = useRef((messageListLength: number) => {
+    clearTimeout(tempDisablePaginationTrackersTimeoutRef.current);
+    onStartReachedTracker.current[messageListLength] = true;
+    onEndReachedTracker.current[messageListLength] = true;
+    tempDisablePaginationTrackersTimeoutRef.current = setTimeout(() => {
+      onStartReachedTracker.current[messageListLength] = false;
+      onEndReachedTracker.current[messageListLength] = false;
+    }, 1000);
+  });
+
   useEffect(() => {
     setScrollToBottomButtonVisible(false);
   }, [disabled]);
@@ -809,6 +830,10 @@ const MessageListWithContext = <
   >((info) => {
     // We got a failure as we tried to scroll to an item that was outside the render length
     if (!flatListRef.current) return;
+    const dataLength = flatListRef.current.props?.data?.length;
+    if (dataLength) {
+      tempDisablePaginationTrackersRef.current(dataLength);
+    }
     // we don't know the actual size of all items but we can see the average, so scroll to the closest offset
     flatListRef.current.scrollToOffset({
       animated: false,
@@ -818,11 +843,16 @@ const MessageListWithContext = <
     // with a little delay to wait for scroll to offset to complete, we can then scroll to the index
     failScrollTimeoutId.current = setTimeout(() => {
       try {
+        if (dataLength) {
+          tempDisablePaginationTrackersRef.current(dataLength);
+        }
         flatListRef.current?.scrollToIndex({
           animated: false,
           index: info.index,
           viewPosition: 0.5, // try to place message in the center of the screen
         });
+        // in case the target message was cleared out
+        // the state being set again will trigger the highlight again
         if (messageIdLastScrolledToRef.current) {
           setTargetedMessage(messageIdLastScrolledToRef.current);
         }
@@ -860,6 +890,10 @@ const MessageListWithContext = <
       if (indexOfParentInMessageList !== -1 && flatListRef.current) {
         clearTimeout(failScrollTimeoutId.current);
         scrollToIndexFailedRetryCountRef.current = 0;
+        // we are scrolling automatically to the message instead of user initiating it,
+        // so we don't need to load more older messages
+        tempDisablePaginationTrackersRef.current(messageList.length);
+        // now scroll to it
         flatListRef.current.scrollToIndex({
           animated: true,
           index: indexOfParentInMessageList,
@@ -884,6 +918,7 @@ const MessageListWithContext = <
   useEffect(() => {
     scrollToDebounceTimeoutRef.current = setTimeout(() => {
       if (initialScrollToFirstUnreadMessage) {
+        clearTimeout(initialScrollSettingTimeoutRef.current);
         initialScrollSettingTimeoutRef.current = setTimeout(() => {
           // small timeout to ensure that handleScroll is called after scrollToIndex to set this flag
           setInitialScrollDone(true);
@@ -902,8 +937,14 @@ const MessageListWithContext = <
       );
       if (indexOfParentInMessageList !== -1 && flatListRef.current) {
         // By a fresh scroll we should clear the retries for the previous failed scroll
+        clearTimeout(scrollToDebounceTimeoutRef.current);
         clearTimeout(failScrollTimeoutId.current);
+        // we are scrolling automatically to the message instead of user initiating it,
+        // so we don't need to load more older messages
+        tempDisablePaginationTrackersRef.current(messageList.length);
+        // reset the retry count
         scrollToIndexFailedRetryCountRef.current = 0;
+        // now scroll to it
         flatListRef.current.scrollToIndex({
           animated: false,
           index: indexOfParentInMessageList,
@@ -915,11 +956,6 @@ const MessageListWithContext = <
         messageIdLastScrolledToRef.current = messageIdToScroll;
       }
     }, 150);
-    return () => {
-      clearTimeout(failScrollTimeoutId.current);
-      clearTimeout(scrollToDebounceTimeoutRef.current);
-      clearTimeout(initialScrollSettingTimeoutRef.current);
-    };
   }, [targetedMessage, initialScrollToFirstUnreadMessage, messageList]);
 
   const messagesWithImages =

package/src/i18n/en.json

@@ -24,7 +24,7 @@
   "File type not supported": "File type not supported",
   "Flag": "Flag",
   "Flag Message": "Flag Message",
-  "Flag action failed either due to a network issue or the message is already flagged": "Flag action failed either due to a network issue or the message is already flagged.",
+  "Flag action failed either due to a network issue or the message is already flagged": "Flag action failed either due to a network issue or the message is already flagged",
   "How about sending your first message to a friend?": "How about sending your first message to a friend?",
   "Instant Commands": "Instant Commands",
   "Let's start chatting!": "Let's start chatting!",