stream-chat-react-native-core 5.26.0 → 5.26.1-beta.2

package/lib/typescript/i18n/pt-BR.json

@@ -3,77 +3,77 @@
     "1 Thread Reply": "1 Resposta de Thread",
     "Allow access to your Gallery": "Permitir acesso à sua Galeria",
     "Allow camera access in device settings": "Permitir acesso à câmera nas configurações do dispositivo",
-    "Also send to channel": "Também enviar para o canal",
-    "Are you sure you want to permanently delete this message?": "Tem certeza de que deseja excluir esta mensagem permanentemente?",
-    "Are you sure?": "Tem certeza?",
-    "Block User": "Bloquear Usuário",
-    "Cancel": "Cancelar",
-    "Cannot Flag Message": "Não é possível reportar a mensagem",
-    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Considere como seu comentário pode fazer os outros se sentirem e certifique-se de seguir nossas Diretrizes da Comunidade",
-    "Copy Message": "Copiar Mensagem",
-    "Delete": "Excluir",
-    "Delete Message": "Excluir Mensagem",
+    "Also send to channel": "",
+    "Are you sure you want to permanently delete this message?": "",
+    "Are you sure?": "",
+    "Block User": "",
+    "Cancel": "",
+    "Cannot Flag Message": "",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "",
+    "Copy Message": "",
+    "Delete": "",
+    "Delete Message": "",
     "Device camera is used to take photos or videos.": "A câmera do dispositivo é usada para tirar fotos ou vídeos.",
-    "Do you want to send a copy of this message to a moderator for further investigation?": "Deseja enviar uma cópia desta mensagem para um moderador para investigação adicional?",
-    "Edit Message": "Editar Mensagem",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
     "Editing Message": "Editando Mensagem",
-    "Emoji matching": "Correspondência de Emoji",
-    "Empty message...": "Mensagem vazia...",
+    "Emoji matching": "",
+    "Empty message...": "",
     "Error loading": "Erro ao carregar",
-    "Error loading channel list...": "Erro ao carregar lista de canais...",
-    "Error loading messages for this channel...": "Erro ao carregar mensagens para este canal...",
-    "Error while loading, please reload/refresh": "Erro ao carregar, por favor recarregue/atualize",
-    "File type not supported": "Tipo de arquivo não suportado",
-    "Flag": "Reportar",
-    "Flag Message": "Reportar Mensagem",
-    "Flag action failed either due to a network issue or the message is already flagged": "A ação para reportar a mensagem falhou devido a um problema de rede ou a mensagem já foi reportada.",
-    "How about sending your first message to a friend?": "Que tal enviar sua primeira mensagem para um amigo?",
-    "Instant Commands": "Comandos Instantâneos",
-    "Let's start chatting!": "Vamos começar a conversar!",
-    "Links are disabled": "Links estão desabilitados",
-    "Loading channels...": "Carregando canais...",
-    "Loading messages...": "Carregando mensagens...",
-    "Loading...": "Carregando...",
-    "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "Limite máximo de tamanho de arquivo atingido. Por favor, faça o upload de um arquivo abaixo de {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.",
-    "Message Reactions": "Reações à Mensagem",
-    "Message deleted": "Mensagem excluída",
-    "Message flagged": "Mensagem sinalizada",
-    "Mute User": "Silenciar Usuário",
+    "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": "",
+    "How about sending your first message to a friend?": "",
+    "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.": "",
+    "Message Reactions": "",
+    "Message deleted": "",
+    "Message flagged": "",
+    "Mute User": "",
     "Not supported": "Não suportado",
-    "Nothing yet...": "Nada ainda...",
-    "Ok": "Ok",
+    "Nothing yet...": "",
+    "Ok": "",
     "Only visible to you": "Apenas visível para você",
     "Open Settings": "Abrir Configurações",
-    "Photo": "Foto",
+    "Photo": "",
     "Photos and Videos": "Fotos e Vídeos",
-    "Pin to Conversation": "Fixar na Conversa",
+    "Pin to Conversation": "",
     "Pinned by": "Fixado por",
     "Please enable access to your photos and videos so you can share them.": "Por favor, habilite o acesso às suas fotos e vídeos para poder compartilhá-los.",
-    "Please select a channel first": "Por favor, selecione um canal primeiro",
-    "Reconnecting...": "Reconectando...",
-    "Reply": "Responder",
+    "Please select a channel first": "",
+    "Reconnecting...": "",
+    "Reply": "",
     "Reply to Message": "Responder à Mensagem",
-    "Resend": "Reenviar",
+    "Resend": "",
     "Search GIFs": "Pesquisar GIFs",
     "Select More Photos": "Selecionar Mais Fotos",
-    "Send Anyway": "Enviar de qualquer maneira",
+    "Send Anyway": "",
     "Send a message": "Enviar uma mensagem",
-    "Sending links is not allowed in this conversation": "Não é permitido enviar links nesta conversa",
+    "Sending links is not allowed in this conversation": "",
     "Slow mode ON": "Modo Lento ATIVADO",
-    "The message has been reported to a moderator.": "A mensagem foi relatada a um moderador.",
-    "Thread Reply": "Respostas de Tópico",
-    "Unblock User": "Desbloquear Usuário",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
     "Unknown User": "Usuário Desconhecido",
-    "Unmute User": "Remover usuário do modo silencioso",
-    "Unpin from Conversation": "Desmarcar como fixado na conversa",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "Mensagens não lidas",
-    "Video": "Vídeo",
-    "You": "Você",
+    "Video": "",
+    "You": "",
     "You can't send messages in this channel": "Você não pode enviar mensagens neste canal",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} e mais {{ nonSelfUserLength }} pessoa(s) estão digitando",
     "{{ index }} of {{ photoLength }}": "{{ index }} de {{ photoLength }}",
     "{{ replyCount }} Replies": "{{ replyCount }} Respostas",
     "{{ replyCount }} Thread Replies": "{{ replyCount }} Respostas de Thread",
     "{{ user }} is typing": "{{ user }} está digitando",
-    "🏙 Attachment...": "🏙 Anexo..."
+    "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/ru.json

@@ -3,77 +3,77 @@
     "1 Thread Reply": "1 тема Ответить",
     "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?": "Вы действительно хотите удалить это сообщение без возможности восстановления?",
-    "Are you sure?": "Вы уверены?",
-    "Block User": "Заблокировать пользователя",
-    "Cancel": "Отмена",
-    "Cannot Flag Message": "Невозможно пожаловаться на сообщение",
-    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Обдумайте, как ваш комментарий может повлиять на других, и убедитесь, что вы следуете нашим правилам сообщества",
-    "Copy Message": "Копировать сообщение",
-    "Delete": "удалять",
-    "Delete Message": "Удалить сообщение",
+    "Also send to channel": "",
+    "Are you sure you want to permanently delete this message?": "",
+    "Are you sure?": "",
+    "Block User": "",
+    "Cancel": "",
+    "Cannot Flag Message": "",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "",
+    "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": "Редактировать сообщение",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
     "Editing Message": "Редактирование сообщения",
-    "Emoji matching": "Соответствие эмодзи",
-    "Empty message...": "Пустое сообщение...",
+    "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": "Не удалось отправить жалобу. Возможные причины: проблема с подключением к интернету или ваша жалоба уже была принята.",
-    "How about sending your first message to a friend?": "Как насчет отправки первого сообщения другу?",
-    "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": "Сообщения Реакции",
-    "Message deleted": "Сообщение удалено",
-    "Message flagged": "Сообщение отмечено",
-    "Mute User": "Отключить пользователя",
+    "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": "",
+    "How about sending your first message to a friend?": "",
+    "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.": "",
+    "Message Reactions": "",
+    "Message deleted": "",
+    "Message flagged": "",
+    "Mute User": "",
     "Not supported": "не поддерживается",
-    "Nothing yet...": "Пока ничего нет...",
-    "Ok": "Oк",
+    "Nothing yet...": "",
+    "Ok": "",
     "Only visible to you": "Видно только вам",
     "Open Settings": "Открыть настройки",
-    "Photo": "Фото",
+    "Photo": "",
     "Photos and Videos": "Фото и видео",
-    "Pin to Conversation": "Закрепить к беседе",
+    "Pin to Conversation": "",
     "Pinned by": "Закреплено пользователем",
     "Please enable access to your photos and videos so you can share them.": "Разрешите доступ к своим фотографиям и видео, чтобы вы могли ими поделиться.",
-    "Please select a channel first": "Пожалуйста, сначала выберите канал",
-    "Reconnecting...": "Переподключение...",
-    "Reply": "Ответить",
+    "Please select a channel first": "",
+    "Reconnecting...": "",
+    "Reply": "",
     "Reply to Message": "Ответить на сообщение",
-    "Resend": "Отправить",
+    "Resend": "",
     "Search GIFs": "Поиск GIF",
     "Select More Photos": "Выбрать больше фотографий",
-    "Send Anyway": "Всё равно отправить",
+    "Send Anyway": "",
     "Send a message": "Отправить сообщение",
-    "Sending links is not allowed in this conversation": "Отправка ссылок недоступна в этом чате",
+    "Sending links is not allowed in this conversation": "",
     "Slow mode ON": "Медленный режим включен",
-    "The message has been reported to a moderator.": "Сообщение отправлено модератору.",
-    "Thread Reply": "Тема Ответить",
-    "Unblock User": "Разблокировать пользователя",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
     "Unknown User": "Неизвестный пользователь",
-    "Unmute User": "Включить микрофон",
-    "Unpin from Conversation": "Открепить от беседы",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "Непрочитанные Сообщения",
-    "Video": "видео",
-    "You": "Вы",
+    "Video": "",
+    "You": "",
     "You can't send messages in this channel": "Вы не можете отправлять сообщения в этот канал",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} и еще {{ nonSelfUserLength }} пишут",
     "{{ index }} of {{ photoLength }}": "{{ index }} из {{ photoLength }}",
     "{{ replyCount }} Replies": "{{ replyCount }} Ответов",
     "{{ replyCount }} Thread Replies": "{{replyCount}} Ответы в темах",
     "{{ user }} is typing": "{{ user }} пишет",
-    "🏙 Attachment...": "🏙 Вложение..."
+    "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/tr.json

@@ -3,77 +3,77 @@
     "1 Thread Reply": "1 Konu Yanıtı",
     "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": "Kanala da gönder",
-    "Are you sure you want to permanently delete this message?": "Bu mesajı kalıcı olarak silmek istediğinizden emin misiniz?",
-    "Are you sure?": "Emin misiniz?",
-    "Block User": "Kullanıcıyı engelle",
-    "Cancel": "İptal",
-    "Cannot Flag Message": "Raporlama Başarısız",
-    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Yorumunuzun diğerlerini nasıl hissettirebileceğini düşünün ve topluluk kurallarımızı takip ettiğinizden emin olun",
-    "Copy Message": "Mesajı Kopyala",
-    "Delete": "Sil",
-    "Delete Message": "Mesajı Sil",
+    "Also send to channel": "",
+    "Are you sure you want to permanently delete this message?": "",
+    "Are you sure?": "",
+    "Block User": "",
+    "Cancel": "",
+    "Cannot Flag Message": "",
+    "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "",
+    "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?": "Detaylı inceleme için bu mesajın kopyasını moderatöre göndermek istiyor musunuz?",
-    "Edit Message": "Mesajı Düzenle",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
     "Editing Message": "Mesaj Düzenleniyor",
-    "Emoji matching": "Emoji eşleştirme",
-    "Empty message...": "Boş mesaj...",
+    "Emoji matching": "",
+    "Empty message...": "",
     "Error loading": "Yükleme hatası",
-    "Error loading channel list...": "Kanal listesi yüklenirken hata oluştu...",
-    "Error loading messages for this channel...": "Bu kanal için mesajlar yüklenirken hata oluştu...",
-    "Error while loading, please reload/refresh": "Yüklenirken hata oluştu, lütfen tekrar deneyiniz",
-    "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.",
-    "How about sending your first message to a friend?": "İlk mesajınızı bir arkadaşınıza göndermeye ne dersiniz?",
-    "Instant Commands": "Anlık Komutlar",
-    "Let's start chatting!": "Haydi sohbete başlayalım!",
-    "Links are disabled": "Bağlantılar devre dışı",
-    "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.": "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": "Mesaj Tepkileri",
-    "Message deleted": "Mesaj silindi",
-    "Message flagged": "Mesaj işaretlendi",
-    "Mute User": "Kullanıcıyı sessize al",
+    "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": "",
+    "How about sending your first message to a friend?": "",
+    "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.": "",
+    "Message Reactions": "",
+    "Message deleted": "",
+    "Message flagged": "",
+    "Mute User": "",
     "Not supported": "Desteklenmiyor",
-    "Nothing yet...": "Henüz değil...",
-    "Ok": "Tamam",
+    "Nothing yet...": "",
+    "Ok": "",
     "Only visible to you": "Sadece siz görebilirsiniz",
     "Open Settings": "Ayarları aç",
-    "Photo": "Fotoğraf",
+    "Photo": "",
     "Photos and Videos": "Fotoğraflar ve Videolar",
-    "Pin to Conversation": "Konuşmaya sabitle",
+    "Pin to Conversation": "",
     "Pinned by": "Tarafından sabitlendi",
     "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": "Lütfen önce bir kanal seçiniz",
-    "Reconnecting...": "Yeniden Bağlanılıyor...",
-    "Reply": "Yanıtla",
+    "Please select a channel first": "",
+    "Reconnecting...": "",
+    "Reply": "",
     "Reply to Message": "Mesajı Yanıtla",
-    "Resend": "Yeniden gönder",
+    "Resend": "",
     "Search GIFs": "GIF Ara",
     "Select More Photos": "Daha Fazla Fotoğraf Seçin",
-    "Send Anyway": "Yine de Gönder",
+    "Send Anyway": "",
     "Send a message": "Mesaj gönder",
-    "Sending links is not allowed in this conversation": "Bu konuşmada bağlantı göndermek desteklenmiyor",
+    "Sending links is not allowed in this conversation": "",
     "Slow mode ON": "Yavaş Mod Açık",
-    "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",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
     "Unknown User": "Bilinmeyen kullanıcı",
-    "Unmute User": "Kullanıcının sesini aç",
-    "Unpin from Conversation": "Sabitlemeyi kaldır",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "Okunmamış Mesajlar",
-    "Video": "Video",
-    "You": "Sen",
+    "Video": "",
+    "You": "",
     "You can't send messages in this channel": "Bu konuşmaya mesaj gönderemezsiniz",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} ve {{ nonSelfUserLength }} kişi daha yazıyor",
     "{{ index }} of {{ photoLength }}": "{{ index }} / {{ photoLength }}",
     "{{ replyCount }} Replies": "{{ replyCount }} Cevap",
     "{{ replyCount }} Thread Replies": "{{responseCount}} Konu Cevapı",
     "{{ user }} is typing": "{{ user }} yazıyor",
-    "🏙 Attachment...": "🏙 Ek..."
+    "🏙 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.26.0",
+  "version": "5.26.1-beta.2",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Channel/Channel.tsx

@@ -972,42 +972,60 @@ const ChannelWithContext = <
    * @param messageId If undefined, channel will be loaded at most recent message.
    */
   const loadChannelAroundMessage: ChannelContextValue<StreamChatGenerics>['loadChannelAroundMessage'] =
-    ({ messageId: messageIdToLoadAround }) =>
-      channelQueryCallRef.current(
-        async () => {
-          setLoading(true);
-          if (messageIdToLoadAround) {
-            setMessages([]);
-            await channel.state.loadMessageIntoState(messageIdToLoadAround);
-            const currentMessageSet = channel.state.messageSets.find((set) => set.isCurrent);
-            if (currentMessageSet && !currentMessageSet?.isLatest) {
-              // if the current message set is not the latest, we will throw away the latest messages
-              // in order to attempt to not throw away, will attempt to merge it by loading 25 more messages
-              const recentCurrentSetMsgId =
-                currentMessageSet.messages[currentMessageSet.messages.length - 1].id;
-              await channel.query(
-                {
-                  messages: {
-                    id_gte: recentCurrentSetMsgId,
-                    limit: 25,
-                  },
-                },
-                'current',
-              );
-              // if the gap is more than 25, we will unfortunately have to throw away the latest messages
-            }
-          } else {
-            await loadLatestMessagesRef.current();
-          }
-        },
-        () => {
-          if (messageIdToLoadAround) {
-            clearInterval(mergeSetsIntervalRef.current); // do not merge sets as we will scroll/highlight to the message
+    async ({ messageId: messageIdToLoadAround }) => {
+      if (thread) {
+        if (messageIdToLoadAround) {
+          setThreadLoadingMore(true);
+          try {
+            await channel.state.loadMessageIntoState(messageIdToLoadAround, thread.id);
+            setThreadLoadingMore(false);
+            setThreadMessages(channel.state.threads[thread.id]);
             setTargetedMessage(messageIdToLoadAround);
+          } catch (err) {
+            if (err instanceof Error) {
+              setError(err);
+            } else {
+              setError(true);
+            }
+            setThreadLoadingMore(false);
           }
-        },
-        messageIdToLoadAround,
-      );
+        }
+      } else {
+        await channelQueryCallRef.current(
+          async () => {
+            setLoading(true);
+            if (messageIdToLoadAround) {
+              setMessages([]);
+              await channel.state.loadMessageIntoState(messageIdToLoadAround);
+              const currentMessageSet = channel.state.messageSets.find((set) => set.isCurrent);
+              if (currentMessageSet && !currentMessageSet?.isLatest) {
+                // if the current message set is not the latest, we will throw away the latest messages
+                // in order to attempt to not throw away, will attempt to merge it by loading 25 more messages
+                const recentCurrentSetMsgId =
+                  currentMessageSet.messages[currentMessageSet.messages.length - 1].id;
+                await channel.query(
+                  {
+                    messages: {
+                      id_gte: recentCurrentSetMsgId,
+                      limit: 25,
+                    },
+                  },
+                  'current',
+                );
+                // if the gap is more than 25, we will unfortunately have to throw away the latest messages
+              }
+            }
+          },
+          () => {
+            if (messageIdToLoadAround) {
+              clearInterval(mergeSetsIntervalRef.current); // do not merge sets as we will scroll/highlight to the message
+              setTargetedMessage(messageIdToLoadAround);
+            }
+          },
+          messageIdToLoadAround,
+        );
+      }
+    };
 
   useEffect(() => {
     if (!targetedMessage && prevTargetedMessage) {

package/src/components/ChannelPreview/ChannelPreviewMessenger.tsx

@@ -174,6 +174,7 @@ const ChannelPreviewMessengerWithContext = <
         <View style={[styles.row, row]}>
           <PreviewMessage latestMessagePreview={latestMessagePreview} />
           <PreviewStatus
+            channel={channel}
             formatLatestMessageDate={formatLatestMessageDate}
             latestMessagePreview={latestMessagePreview}
           />

package/src/components/ChannelPreview/ChannelPreviewStatus.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
+import { ChannelPreviewProps } from './ChannelPreview';
 import type { ChannelPreviewMessengerPropsWithContext } from './ChannelPreviewMessenger';
 import { MessageReadStatus } from './hooks/useLatestMessagePreview';
 
@@ -25,7 +26,8 @@ export type ChannelPreviewStatusProps<
 > = Pick<
   ChannelPreviewMessengerPropsWithContext<StreamChatGenerics>,
   'latestMessagePreview' | 'formatLatestMessageDate'
->;
+> &
+  Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'>;
 
 export const ChannelPreviewStatus = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,

package/src/i18n/en.json

@@ -26,7 +26,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!",