stream-chat-react-native-core 5.22.1 → 5.22.2-beta.2

package/lib/typescript/i18n/nl.json

@@ -1,76 +1,76 @@
 {
     "1 Reply": "1 Antwoord",
-    "1 Thread Reply": "1 thread 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": "Stuur ook naar kanaal",
-    "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",
+    "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?": "Wil je een kopie van dit bericht naar een moderator sturen voor verder onderzoek?",
-    "Edit Message": "Pas bericht aan",
-    "Editing Message": "Bericht aanpassen",
-    "Emoji matching": "Emoji-overeenkomsten",
-    "Empty message...": "Leeg bericht...",
-    "Error loading": "Probleem bij het laden",
-    "Error loading channel list...": "Probleem bij het laden van de kanalen...",
-    "Error loading messages for this channel...": "Probleem bij het laden van de berichten in dit kanaal...",
-    "Error while loading, please reload/refresh": "Probleem bij het laden, probeer opnieuw",
-    "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",
-    "How about sending your first message to a friend?": "Wat dacht je ervan om je eerste bericht naar een vriend te sturen?",
-    "Instant Commands": "Directe Opdrachten",
-    "Let's start chatting!": "Laten we beginnen met chatten!",
-    "Links are disabled": "Het versturen van links staat uit",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
+    "Editing 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...": "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.": "Maximale uploadlimiet voor bestandsgrootte bereikt. Upload een bestand van minder dan {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.",
-    "Message Reactions": "Bericht Reacties",
-    "Message deleted": "Bericht verwijderd",
-    "Message flagged": "Bericht gemarkeerd",
-    "Mute User": "Gebruiker dempen",
-    "Not supported": "niet ondersteund",
-    "Nothing yet...": "Nog niets...",
-    "Ok": "Oké",
-    "Only visible to you": "Alleen zichtbaar voor jou",
+    "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": "",
+    "Only visible to you": "",
     "Open Settings": "Open instellingen",
     "Photo": "Foto",
     "Photos and Videos": "Foto's en video's",
-    "Pin to Conversation": "Vastmaken aan gesprek",
-    "Pinned by": "Vastgemaakt door",
+    "Pin to Conversation": "",
+    "Pinned by": "",
     "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": "Selecteer eerst een kanaal",
-    "Reconnecting...": "Opnieuw Verbinding Maken...",
-    "Reply": "Antwoord",
+    "Reconnecting...": "",
+    "Reply": "",
     "Reply to Message": "Beantwoord bericht",
-    "Resend": "Opnieuw versturen",
+    "Resend": "",
     "Search GIFs": "Zoek GIF's",
     "Select More Photos": "Selecteer Meer foto's",
     "Send a message": "Stuur een bericht",
-    "Sending links is not allowed in this conversation": "In dit gesprek is het niet toegestaan links te versturen",
+    "Sending links is not allowed in this conversation": "",
     "Slow mode ON": "Langzame modus aan",
-    "The message has been reported to a moderator.": "Het bericht is gerapporteerd aan een moderator.",
-    "Thread Reply": "Discussie beantwoorden",
-    "Unblock User": "Deblokkeer gebruiker",
+    "The message has been reported to a moderator.": "",
+    "Thread Reply": "",
+    "Unblock User": "",
     "Unknown User": "Onbekende gebruiker",
-    "Unmute User": "Dempen van gebruiker opheffen",
-    "Unpin from Conversation": "Losmaken van gesprek",
+    "Unmute User": "",
+    "Unpin from Conversation": "",
     "Unread Messages": "Ongelezen Berichten",
     "Video": "Video",
-    "You": "U",
+    "You": "",
     "You can't send messages in this channel": "Je kan geen berichten sturen in dit kanaal",
     "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} en {{ nonSelfUserLength }} anderen zijn aan het typen",
     "{{ index }} of {{ photoLength }}": "{{ index }} van {{ photoLength }}",
     "{{ replyCount }} Replies": "{{ replyCount }} Antwoorden",
-    "{{ replyCount }} Thread Replies": "{{replyCount}} Discussiereacties",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "{{ user }} is aan het typen",
-    "🏙 Attachment...": "🏙 Bijlage..."
+    "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/ru.json

@@ -1,76 +1,76 @@
 {
     "1 Reply": "1 Ответ",
-    "1 Thread 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": "Удалить сообщение",
+    "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": "Соответствие эмодзи",
-    "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": "Ссылки отключены",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
+    "Editing 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": "Отключить пользователя",
-    "Not supported": "не поддерживается",
-    "Nothing yet...": "Пока ничего нет...",
-    "Ok": "Oк",
-    "Only visible to you": "Видно только вам",
+    "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": "",
+    "Only visible to you": "",
     "Open Settings": "Открыть настройки",
     "Photo": "Фото",
     "Photos and Videos": "Фото и видео",
-    "Pin to Conversation": "Закрепить к беседе",
-    "Pinned by": "Закреплено пользователем",
+    "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": "Ответить",
+    "Reconnecting...": "",
+    "Reply": "",
     "Reply to Message": "Ответить на сообщение",
-    "Resend": "Отправить",
+    "Resend": "",
     "Search GIFs": "Поиск GIF",
     "Select More Photos": "Выбрать больше фотографий",
     "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": "Вы",
+    "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}} Ответы в темах",
+    "{{ replyCount }} Thread Replies": "",
     "{{ user }} is typing": "{{ user }} пишет",
-    "🏙 Attachment...": "🏙 Вложение..."
+    "🏙 Attachment...": ""
 }

package/lib/typescript/i18n/tr.json

@@ -1,76 +1,76 @@
 {
     "1 Reply": "1 Cevap",
-    "1 Thread Reply": "1 Konu Yanıtı",
+    "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": "Kanala da gönder",
-    "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",
+    "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?": "Detaylı inceleme için bu mesajın kopyasını moderatöre göndermek istiyor musunuz?",
-    "Edit Message": "Mesajı Düzenle",
-    "Editing Message": "Mesaj Düzenleniyor",
-    "Emoji matching": "Emoji eşleştirme",
-    "Empty message...": "Boş mesaj...",
-    "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ışı",
+    "Do you want to send a copy of this message to a moderator for further investigation?": "",
+    "Edit Message": "",
+    "Editing 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...": "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",
-    "Not supported": "Desteklenmiyor",
-    "Nothing yet...": "Henüz değil...",
-    "Ok": "Tamam",
-    "Only visible to you": "Sadece siz görebilirsiniz",
+    "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": "",
+    "Only visible to you": "",
     "Open Settings": "Ayarları aç",
     "Photo": "Fotoğraf",
     "Photos and Videos": "Fotoğraflar ve Videolar",
-    "Pin to Conversation": "Konuşmaya sabitle",
-    "Pinned by": "Tarafından sabitlendi",
+    "Pin to Conversation": "",
+    "Pinned by": "",
     "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",
+    "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 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",
+    "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ı",
+    "{{ replyCount }} Thread Replies": "",
     "{{ 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.22.1",
+  "version": "5.22.2-beta.2",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Channel/Channel.tsx

@@ -588,6 +588,13 @@ const ChannelWithContext = <
    */
   const [hasNoMoreRecentMessagesToLoad, setHasNoMoreRecentMessagesToLoad] = useState(true);
 
+  /**
+   * messages array is tracked in ref so that
+   * functions can be passed to message list context without any change due to dependency
+   */
+  const messagesRef = useRef(messages);
+  messagesRef.current = messages;
+
   const { setTargetedMessage, targetedMessage } = useTargetedMessage();
 
   /**
@@ -879,13 +886,14 @@ const ChannelWithContext = <
    * @param messageId If undefined, channel will be loaded at most recent message.
    */
   const loadChannelAroundMessage: ChannelContextValue<StreamChatGenerics>['loadChannelAroundMessage'] =
-    ({ messageId }) =>
+    ({ messageId: messageIdToLoadAround }) =>
       channelQueryCallRef.current(
         async () => {
-          setHasNoMoreRecentMessagesToLoad(false); // we are jumping to a message, hence we do not know for sure anymore if there are no more recent messages
           setLoading(true);
-          if (messageId) {
-            await channel.state.loadMessageIntoState(messageId);
+          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);
@@ -893,8 +901,8 @@ const ChannelWithContext = <
           setLoading(false);
         },
         () => {
-          if (messageId) {
-            setTargetedMessage(messageId);
+          if (messageIdToLoadAround) {
+            setTargetedMessage(messageIdToLoadAround);
           }
         },
       );
@@ -1509,55 +1517,70 @@ const ChannelWithContext = <
     ),
   ).current;
 
-  const loadMore: PaginatedMessageListContextValue<StreamChatGenerics>['loadMore'] = async (
-    limit = 20,
-  ) => {
-    if (loadingMore || hasMore === false) {
-      return;
-    }
-    setLoadingMore(true);
+  /**
+   * This function loads more messages before the first message in current channel state.
+   */
+  const loadMore = useCallback<PaginatedMessageListContextValue<StreamChatGenerics>['loadMore']>(
+    async (limit = 20) => {
+      if (loadingMore || hasMore === false) {
+        return;
+      }
+      setLoadingMore(true);
 
-    if (!messages.length) {
-      return setLoadingMore(false);
-    }
+      const currentMessages = messagesRef.current;
 
-    const oldestMessage = messages && messages[0];
+      if (!currentMessages.length) {
+        return setLoadingMore(false);
+      }
 
-    if (oldestMessage && oldestMessage.status !== MessageStatusTypes.RECEIVED) {
-      return setLoadingMore(false);
-    }
+      const oldestMessage = currentMessages && currentMessages[0];
 
-    const oldestID = oldestMessage && oldestMessage.id;
+      if (oldestMessage && oldestMessage.status !== MessageStatusTypes.RECEIVED) {
+        return setLoadingMore(false);
+      }
 
-    try {
-      if (channel) {
-        const queryResponse = await channel.query({
-          messages: { id_lt: oldestID, limit },
-        });
+      const oldestID = oldestMessage && oldestMessage.id;
 
-        const updatedHasMore = queryResponse.messages.length === limit;
-        loadMoreFinished(updatedHasMore, channel.state.messages);
-      }
-    } catch (err) {
-      if (err instanceof Error) {
-        setError(err);
-      } else {
-        setError(true);
+      try {
+        if (channel) {
+          const queryResponse = await channel.query({
+            messages: { id_lt: oldestID, limit },
+          });
+
+          const updatedHasMore = queryResponse.messages.length === limit;
+          loadMoreFinished(updatedHasMore, channel.state.messages);
+        }
+      } catch (err) {
+        if (err instanceof Error) {
+          setError(err);
+        } else {
+          setError(true);
+        }
+        setLoadingMore(false);
+        throw err;
       }
-      setLoadingMore(false);
-      throw err;
-    }
-  };
+    },
+    /*
+     * This function is passed to useCreatePaginatedMessageListContext
+     * Where the deps are [channelId, hasMore, loadingMoreRecent, loadingMore]
+     * and only those deps should be used here because of that
+     */
+    [channelId, hasMore, loadingMore],
+  );
 
-  const loadMoreRecent: PaginatedMessageListContextValue<StreamChatGenerics>['loadMoreRecent'] =
+  /**
+   * This function loads more messages after the most recent message in current channel state.
+   */
+  const loadMoreRecent = useCallback<
+    PaginatedMessageListContextValue<StreamChatGenerics>['loadMoreRecent']
+  >(
     async (limit = 5) => {
       if (hasNoMoreRecentMessagesToLoad) {
         return;
       }
-
       setLoadingMoreRecent(true);
-
-      const recentMessage = messages[messages.length - 1];
+      const currentMessages = messagesRef.current;
+      const recentMessage = currentMessages[currentMessages.length - 1];
 
       if (recentMessage?.status !== MessageStatusTypes.RECEIVED) {
         setLoadingMoreRecent(false);
@@ -1566,14 +1589,14 @@ const ChannelWithContext = <
 
       try {
         if (channel) {
-          const state = await channel.query({
+          const queryResponse = await channel.query({
             messages: {
               id_gte: recentMessage.id,
               limit,
             },
             watch: true,
           });
-          setHasNoMoreRecentMessagesToLoad(state.messages.length < limit);
+          setHasNoMoreRecentMessagesToLoad(queryResponse.messages.length < limit);
           loadMoreRecentFinished(channel.state.messages);
         }
       } catch (err) {
@@ -1586,7 +1609,14 @@ const ChannelWithContext = <
         setLoadingMoreRecent(false);
         throw err;
       }
-    };
+    },
+    /*
+     * This function is passed to useCreatePaginatedMessageListContext
+     * Where the deps are [channelId, hasMore, loadingMoreRecent, loadingMore, hasNoMoreRecentMessagesToLoad]
+     * and and only those deps should be used here because of that
+     */
+    [channelId, hasNoMoreRecentMessagesToLoad],
+  );
 
   // hard limit to prevent you from scrolling faster than 1 page per 2 seconds
   const loadMoreRecentFinished = useRef(

package/src/components/Channel/hooks/useCreatePaginatedMessageListContext.ts

@@ -34,7 +34,14 @@ export const useCreatePaginatedMessageListContext = <
       setLoadingMore,
       setLoadingMoreRecent,
     }),
-    [channelId, hasMore, loadingMoreRecent, loadingMore, messagesStr],
+    [
+      channelId,
+      hasMore,
+      loadingMoreRecent,
+      loadingMore,
+      hasNoMoreRecentMessagesToLoad,
+      messagesStr,
+    ],
   );
 
   return paginatedMessagesContext;

package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts

@@ -24,13 +24,13 @@ export const generateMarkdownText = (text?: string) => {
     // Convert raw links/emails in the text to respective markdown syntax.
     // Eg: Hi @getstream.io -> Hi @[getstream.io](getstream.io).
     const normalRegEx = new RegExp(escapeRegExp(linkInfo.raw), 'g');
-    const markdown = `[${displayLink}](${linkInfo.encodedUrl})`;
+    const markdown = `[${displayLink}](${linkInfo.url})`;
     resultText = text.replace(normalRegEx, markdown);
 
     // After previous step, in some cases, the mentioned user after `@` might have a link/email so we convert it back to normal raw text.
     // Eg: Hi, @[test.user@gmail.com](mailto:test.user@gmail.com) to @test.user@gmail.com.
     const mentionsRegex = new RegExp(
-      `@\\[${escapeRegExp(displayLink)}\\]\\(${escapeRegExp(linkInfo.encodedUrl)}\\)`,
+      `@\\[${escapeRegExp(displayLink)}\\]\\(${escapeRegExp(linkInfo.url)}\\)`,
       'g',
     );
     resultText = resultText.replace(mentionsRegex, `@${displayLink}`);