stream-chat-react-native-core 5.27.0-beta.8 → 5.27.0

package/lib/typescript/i18n/nl.json

@@ -1,8 +1,8 @@
 {
     "1 Reply": "1 Antwoord",
-    "1 Thread Reply": "",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "1 Thread Reply": "1 thread antwoord",
+    "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?",
     "Are you sure?": "Weet je het zeker?",
@@ -13,10 +13,10 @@
     "Copy Message": "Bericht kopiëren",
     "Delete": "Verwijderen",
     "Delete Message": "Verwijder bericht",
-    "Device camera is used to take photos or videos.": "",
+    "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": "",
+    "Editing Message": "Bericht aanpassen",
     "Emoji matching": "Emoji-overeenkomsten",
     "Empty message...": "Leeg bericht...",
     "Error loading": "Probleem bij het laden",
@@ -39,23 +39,23 @@
     "Message deleted": "Bericht verwijderd",
     "Message flagged": "Bericht gemarkeerd",
     "Mute User": "Gebruiker dempen",
-    "Not supported": "",
+    "Not supported": "niet ondersteund",
     "Nothing yet...": "Nog niets...",
     "Ok": "Oké",
-    "Only visible to you": "",
-    "Open Settings": "",
+    "Only visible to you": "Alleen zichtbaar voor jou",
+    "Open Settings": "Open instellingen",
     "Photo": "Foto",
-    "Photos and Videos": "",
+    "Photos and Videos": "Foto's en video's",
     "Pin to Conversation": "Vastmaken aan gesprek",
-    "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
+    "Pinned by": "Vastgemaakt door",
+    "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",
     "Reply to Message": "Beantwoord bericht",
     "Resend": "Opnieuw versturen",
     "Search GIFs": "Zoek GIF's",
-    "Select More Photos": "",
+    "Select More Photos": "Selecteer Meer foto's",
     "Send Anyway": "Toch verzenden",
     "Send a message": "Stuur een bericht",
     "Sending links is not allowed in this conversation": "In dit gesprek is het niet toegestaan links te versturen",
@@ -63,17 +63,17 @@
     "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": "",
+    "Unknown User": "Onbekende gebruiker",
     "Unmute User": "Dempen van gebruiker opheffen",
     "Unpin from Conversation": "Losmaken van gesprek",
     "Unread Messages": "Ongelezen Berichten",
     "Video": "Video",
     "You": "U",
     "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 }}": "",
+    "{{ 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": "",
-    "{{ user }} is typing": "",
+    "{{ replyCount }} Thread Replies": "{{replyCount}} Discussiereacties",
+    "{{ user }} is typing": "{{ user }} is aan het typen",
     "🏙 Attachment...": "🏙 Bijlage..."
 }

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

@@ -1,8 +1,8 @@
 {
     "1 Reply": "1 Resposta",
-    "1 Thread Reply": "",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "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?",
@@ -13,10 +13,10 @@
     "Copy Message": "Copiar Mensagem",
     "Delete": "Excluir",
     "Delete Message": "Excluir Mensagem",
-    "Device camera is used to take photos or videos.": "",
+    "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",
-    "Editing Message": "",
+    "Editing Message": "Editando Mensagem",
     "Emoji matching": "Correspondência de Emoji",
     "Empty message...": "Mensagem vazia...",
     "Error loading": "Erro ao carregar",
@@ -39,23 +39,23 @@
     "Message deleted": "Mensagem excluída",
     "Message flagged": "Mensagem sinalizada",
     "Mute User": "Silenciar Usuário",
-    "Not supported": "",
+    "Not supported": "Não suportado",
     "Nothing yet...": "Nada ainda...",
     "Ok": "Ok",
-    "Only visible to you": "",
-    "Open Settings": "",
+    "Only visible to you": "Apenas visível para você",
+    "Open Settings": "Abrir Configurações",
     "Photo": "Foto",
-    "Photos and Videos": "",
+    "Photos and Videos": "Fotos e Vídeos",
     "Pin to Conversation": "Fixar na Conversa",
-    "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
+    "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",
     "Reply to Message": "Responder à Mensagem",
     "Resend": "Reenviar",
     "Search GIFs": "Pesquisar GIFs",
-    "Select More Photos": "",
+    "Select More Photos": "Selecionar Mais Fotos",
     "Send Anyway": "Enviar de qualquer maneira",
     "Send a message": "Enviar uma mensagem",
     "Sending links is not allowed in this conversation": "Não é permitido enviar links nesta conversa",
@@ -63,17 +63,17 @@
     "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",
-    "Unknown User": "",
+    "Unknown User": "Usuário Desconhecido",
     "Unmute User": "Remover usuário do modo silencioso",
     "Unpin from Conversation": "Desmarcar como fixado na conversa",
     "Unread Messages": "Mensagens não lidas",
     "Video": "Vídeo",
     "You": "Você",
     "You can't send messages in this channel": "Você não pode enviar mensagens neste canal",
-    "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "",
+    "{{ 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": "",
-    "{{ user }} is typing": "",
+    "{{ replyCount }} Thread Replies": "{{ replyCount }} Respostas de Thread",
+    "{{ user }} is typing": "{{ user }} está digitando",
     "🏙 Attachment...": "🏙 Anexo..."
 }

package/lib/typescript/i18n/ru.json

@@ -1,8 +1,8 @@
 {
     "1 Reply": "1 Ответ",
-    "1 Thread Reply": "",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "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?": "Вы уверены?",
@@ -13,10 +13,10 @@
     "Copy Message": "Копировать сообщение",
     "Delete": "удалять",
     "Delete Message": "Удалить сообщение",
-    "Device camera is used to take photos or videos.": "",
+    "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": "",
+    "Editing Message": "Редактирование сообщения",
     "Emoji matching": "Соответствие эмодзи",
     "Empty message...": "Пустое сообщение...",
     "Error loading": "Ошибка при загрузке",
@@ -39,23 +39,23 @@
     "Message deleted": "Сообщение удалено",
     "Message flagged": "Сообщение отмечено",
     "Mute User": "Отключить пользователя",
-    "Not supported": "",
+    "Not supported": "не поддерживается",
     "Nothing yet...": "Пока ничего нет...",
     "Ok": "Oк",
-    "Only visible to you": "",
-    "Open Settings": "",
+    "Only visible to you": "Видно только вам",
+    "Open Settings": "Открыть настройки",
     "Photo": "Фото",
-    "Photos and Videos": "",
+    "Photos and Videos": "Фото и видео",
     "Pin to Conversation": "Закрепить к беседе",
-    "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
+    "Pinned by": "Закреплено пользователем",
+    "Please enable access to your photos and videos so you can share them.": "Разрешите доступ к своим фотографиям и видео, чтобы вы могли ими поделиться.",
     "Please select a channel first": "Пожалуйста, сначала выберите канал",
     "Reconnecting...": "Переподключение...",
     "Reply": "Ответить",
     "Reply to Message": "Ответить на сообщение",
     "Resend": "Отправить",
     "Search GIFs": "Поиск GIF",
-    "Select More Photos": "",
+    "Select More Photos": "Выбрать больше фотографий",
     "Send Anyway": "Всё равно отправить",
     "Send a message": "Отправить сообщение",
     "Sending links is not allowed in this conversation": "Отправка ссылок недоступна в этом чате",
@@ -63,17 +63,17 @@
     "The message has been reported to a moderator.": "Сообщение отправлено модератору.",
     "Thread Reply": "Тема Ответить",
     "Unblock User": "Разблокировать пользователя",
-    "Unknown User": "",
+    "Unknown User": "Неизвестный пользователь",
     "Unmute User": "Включить микрофон",
     "Unpin from Conversation": "Открепить от беседы",
     "Unread Messages": "Непрочитанные Сообщения",
     "Video": "видео",
     "You": "Вы",
     "You can't send messages in this channel": "Вы не можете отправлять сообщения в этот канал",
-    "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "",
+    "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} и еще {{ nonSelfUserLength }} пишут",
+    "{{ index }} of {{ photoLength }}": "{{ index }} из {{ photoLength }}",
     "{{ replyCount }} Replies": "{{ replyCount }} Ответов",
-    "{{ replyCount }} Thread Replies": "",
-    "{{ user }} is typing": "",
+    "{{ replyCount }} Thread Replies": "{{replyCount}} Ответы в темах",
+    "{{ user }} is typing": "{{ user }} пишет",
     "🏙 Attachment...": "🏙 Вложение..."
 }

package/lib/typescript/i18n/tr.json

@@ -1,8 +1,8 @@
 {
     "1 Reply": "1 Cevap",
-    "1 Thread Reply": "",
-    "Allow access to your Gallery": "",
-    "Allow camera access in device settings": "",
+    "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?",
@@ -13,10 +13,10 @@
     "Copy Message": "Mesajı Kopyala",
     "Delete": "Sil",
     "Delete Message": "Mesajı Sil",
-    "Device camera is used to take photos or videos.": "",
+    "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": "",
+    "Editing Message": "Mesaj Düzenleniyor",
     "Emoji matching": "Emoji eşleştirme",
     "Empty message...": "Boş mesaj...",
     "Error loading": "Yükleme hatası",
@@ -39,23 +39,23 @@
     "Message deleted": "Mesaj silindi",
     "Message flagged": "Mesaj işaretlendi",
     "Mute User": "Kullanıcıyı sessize al",
-    "Not supported": "",
+    "Not supported": "Desteklenmiyor",
     "Nothing yet...": "Henüz değil...",
     "Ok": "Tamam",
-    "Only visible to you": "",
-    "Open Settings": "",
+    "Only visible to you": "Sadece siz görebilirsiniz",
+    "Open Settings": "Ayarları aç",
     "Photo": "Fotoğraf",
-    "Photos and Videos": "",
+    "Photos and Videos": "Fotoğraflar ve Videolar",
     "Pin to Conversation": "Konuşmaya sabitle",
-    "Pinned by": "",
-    "Please enable access to your photos and videos so you can share them.": "",
+    "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",
     "Reply to Message": "Mesajı Yanıtla",
     "Resend": "Yeniden gönder",
     "Search GIFs": "GIF Ara",
-    "Select More Photos": "",
+    "Select More Photos": "Daha Fazla Fotoğraf Seçin",
     "Send Anyway": "Yine de Gönder",
     "Send a message": "Mesaj gönder",
     "Sending links is not allowed in this conversation": "Bu konuşmada bağlantı göndermek desteklenmiyor",
@@ -63,17 +63,17 @@
     "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": "",
+    "Unknown User": "Bilinmeyen kullanıcı",
     "Unmute User": "Kullanıcının sesini aç",
     "Unpin from Conversation": "Sabitlemeyi kaldır",
     "Unread Messages": "Okunmamış Mesajlar",
     "Video": "Video",
     "You": "Sen",
     "You can't send messages in this channel": "Bu konuşmaya mesaj gönderemezsiniz",
-    "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
-    "{{ index }} of {{ photoLength }}": "",
+    "{{ 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": "",
-    "{{ user }} is typing": "",
+    "{{ replyCount }} Thread Replies": "{{responseCount}} Konu Cevapı",
+    "{{ user }} is typing": "{{ user }} yazıyor",
     "🏙 Attachment...": "🏙 Ek..."
 }

package/lib/typescript/store/apis/upsertChannelDataFromChannel.d.ts

@@ -0,0 +1,6 @@
+import { DefaultStreamChatGenerics } from 'src/types/types';
+import type { Channel } from 'stream-chat';
+export declare const upsertChannelDataFromChannel: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>({ channel, flush, }: {
+    channel: Channel<StreamChatGenerics>;
+    flush?: boolean | undefined;
+}) => import("../types").PreparedQueries[] | undefined;

package/lib/typescript/store/mappers/mapChannelToStorable.d.ts

@@ -0,0 +1,4 @@
+import type { Channel } from 'stream-chat';
+import type { DefaultStreamChatGenerics } from '../../types/types';
+import type { TableRow } from '../types';
+export declare const mapChannelToStorable: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(channel: Channel<StreamChatGenerics>) => TableRow<'channels'> | undefined;

package/lib/typescript/utils/DBSyncManager.d.ts

@@ -26,7 +26,7 @@ export declare class DBSyncManager {
     static onSyncStatusChange: (listener: (status: boolean) => void) => {
         unsubscribe: () => void;
     };
-    static sync: () => Promise<void>;
+    static sync: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(client: StreamChat<StreamChatGenerics>) => Promise<void>;
     static syncAndExecutePendingTasks: () => Promise<void>;
     static queueTask: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>({ client, task, }: {
         client: StreamChat<StreamChatGenerics>;

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.27.0-beta.8",
+  "version": "5.27.0",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Attachment/Gallery.tsx

@@ -309,14 +309,14 @@ const GalleryThumbnail = <
   };
 
   const defaultOnPress = () => {
-    // If file type is video and the url is defined then try to open the file.
-    if (thumbnail.type === 'video' && thumbnail.url) {
-      if (isVideoPackageAvailable()) {
-        openImageViewer();
-      } else {
+    // If the url is defined then only try to open the file.
+    if (thumbnail.url) {
+      if (thumbnail.type === 'video' && !isVideoPackageAvailable()) {
         // This condition is kinda unreachable, since we render videos as file attachment if the video
         // library is not installed. But doesn't hurt to have extra safeguard, in case of some customizations.
         openUrlSafely(thumbnail.url);
+      } else {
+        openImageViewer();
       }
     }
   };

package/src/components/AttachmentPicker/AttachmentPicker.tsx

@@ -292,7 +292,7 @@ export const AttachmentPicker = React.forwardRef(
      * this is an issue if you are calling close on the bottom sheet.
      */
     const snapPoints = useMemo(
-      () => [initialSnapPoint, finalSnapPoint],
+      () => [Math.max(0, initialSnapPoint), Math.max(0, finalSnapPoint)],
       [initialSnapPoint, finalSnapPoint],
     );
 

package/src/components/Chat/hooks/handleEventToSyncDB.ts

@@ -1,74 +1,152 @@
-import type { Event } from 'stream-chat';
+import { DefaultStreamChatGenerics } from 'src/types/types';
+import type { Event, StreamChat } from 'stream-chat';
 
 import { deleteChannel } from '../../../store/apis/deleteChannel';
 import { deleteMember } from '../../../store/apis/deleteMember';
 import { deleteMessagesForChannel } from '../../../store/apis/deleteMessagesForChannel';
 import { updateMessage } from '../../../store/apis/updateMessage';
 import { upsertChannelData } from '../../../store/apis/upsertChannelData';
+import { upsertChannelDataFromChannel } from '../../../store/apis/upsertChannelDataFromChannel';
 import { upsertChannels } from '../../../store/apis/upsertChannels';
 import { upsertMembers } from '../../../store/apis/upsertMembers';
 import { upsertMessages } from '../../../store/apis/upsertMessages';
 import { upsertReads } from '../../../store/apis/upsertReads';
+import { QuickSqliteClient } from '../../../store/QuickSqliteClient';
+import { createSelectQuery } from '../../../store/sqlite-utils/createSelectQuery';
+import { PreparedQueries } from '../../../store/types';
 
-export const handleEventToSyncDB = (event: Event, flush?: boolean) => {
+export const handleEventToSyncDB = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  event: Event,
+  client: StreamChat<StreamChatGenerics>,
+  flush?: boolean,
+) => {
   const { type } = event;
 
+  // This function is used to guard the queries that require channel to be present in the db first
+  // If channel is not present in the db, we first fetch the channel data from the channel object
+  // and then add the queries with a channel create query first
+  const queriesWithChannelGuard = (
+    createQueries: (flushOverride?: boolean) => PreparedQueries[],
+  ) => {
+    const cid = event.cid || event.channel?.cid;
+
+    if (!cid) return createQueries(flush);
+    const channels = QuickSqliteClient.executeSql.apply(
+      null,
+      createSelectQuery('channels', ['cid'], {
+        cid,
+      }),
+    );
+    // a channel is not present in the db, we first fetch the channel data from the channel object.
+    // this can happen for example when a message.new event is received for a channel that is not in the db due to a channel being hidden.
+    if (channels.length === 0) {
+      const channel =
+        event.channel_type && event.channel_id
+          ? client.channel(event.channel_type, event.channel_id)
+          : undefined;
+      if (channel && channel.initialized && !channel.disconnected) {
+        const channelQuery = upsertChannelDataFromChannel({
+          channel,
+          flush,
+        });
+        if (channelQuery) {
+          const newQueries = [...channelQuery, ...createQueries(false)];
+          if (flush !== false) {
+            QuickSqliteClient.executeSqlBatch(newQueries);
+          }
+          return newQueries;
+        } else {
+          console.warn(
+            `Couldnt create channel queries on ${type} event for an initialized channel that is not in DB, skipping event`,
+            { event },
+          );
+          return [];
+        }
+      } else {
+        console.warn(
+          `Received ${type} event for a non initialized channel that is not in DB, skipping event`,
+          { event },
+        );
+        return [];
+      }
+    }
+    return createQueries(flush);
+  };
+
   if (type === 'message.read') {
-    if (event.user?.id && event.cid) {
-      return upsertReads({
-        cid: event.cid,
-        flush,
-        reads: [
-          {
-            last_read: event.received_at as string,
-            unread_messages: 0,
-            user: event.user,
-          },
-        ],
-      });
+    const cid = event.cid;
+    const user = event.user;
+    if (user?.id && cid) {
+      return queriesWithChannelGuard((flushOverride) =>
+        upsertReads({
+          cid,
+          flush: flushOverride,
+          reads: [
+            {
+              last_read: event.received_at as string,
+              unread_messages: 0,
+              user,
+            },
+          ],
+        }),
+      );
     }
   }
 
   if (type === 'message.new') {
-    if (event.message && (!event.message.parent_id || event.message.show_in_channel)) {
-      return upsertMessages({
-        flush,
-        messages: [event.message],
-      });
+    const message = event.message;
+    if (message && (!message.parent_id || message.show_in_channel)) {
+      return queriesWithChannelGuard((flushOverride) =>
+        upsertMessages({
+          flush: flushOverride,
+          messages: [message],
+        }),
+      );
     }
   }
 
   if (type === 'message.updated' || type === 'message.deleted') {
-    if (event.message && !event.message.parent_id) {
+    const message = event.message;
+    if (message && !message.parent_id) {
       // Update only if it exists, otherwise event could be related
       // to a message which is not in database.
-      return updateMessage({
-        flush,
-        message: event.message,
-      });
+      return queriesWithChannelGuard((flushOverride) =>
+        updateMessage({
+          flush: flushOverride,
+          message,
+        }),
+      );
     }
   }
 
   if (type === 'reaction.updated') {
-    if (event.message && event.reaction) {
+    const message = event.message;
+    if (message && event.reaction) {
       // We update the entire message to make sure we also update
       // reaction_counts.
-      return updateMessage({
-        flush,
-        message: event.message,
-      });
+      return queriesWithChannelGuard((flushOverride) =>
+        updateMessage({
+          flush: flushOverride,
+          message,
+        }),
+      );
     }
   }
 
   if (type === 'reaction.new' || type === 'reaction.deleted') {
-    if (event.message && !event.message.parent_id) {
+    const message = event.message;
+    if (message && !message.parent_id) {
       // Here we are relying on the fact message.latest_reactions always includes
       // the new reaction. So we first delete all the existing reactions and populate
       // the reactions table with message.latest_reactions
-      return updateMessage({
-        flush,
-        message: event.message,
-      });
+      return queriesWithChannelGuard((flushOverride) =>
+        updateMessage({
+          flush: flushOverride,
+          message,
+        }),
+      );
     }
   }
 
@@ -119,22 +197,30 @@ export const handleEventToSyncDB = (event: Event, flush?: boolean) => {
   }
 
   if (type === 'member.added' || type === 'member.updated') {
-    if (event.member && event.cid) {
-      return upsertMembers({
-        cid: event.cid,
-        flush,
-        members: [event.member],
-      });
+    const member = event.member;
+    const cid = event.cid;
+    if (member && cid) {
+      return queriesWithChannelGuard((flushOverride) =>
+        upsertMembers({
+          cid,
+          flush: flushOverride,
+          members: [member],
+        }),
+      );
     }
   }
 
   if (type === 'member.removed') {
-    if (event.member && event.cid) {
-      return deleteMember({
-        cid: event.cid,
-        flush,
-        member: event.member,
-      });
+    const member = event.member;
+    const cid = event.cid;
+    if (member && cid) {
+      return queriesWithChannelGuard((flushOverride) =>
+        deleteMember({
+          cid,
+          flush: flushOverride,
+          member,
+        }),
+      );
     }
   }
 

package/src/components/Chat/hooks/useSyncDatabase.ts

@@ -22,7 +22,7 @@ export const useSyncDatabase = <
     let listener: ReturnType<StreamChat['on']> | undefined;
 
     if (enableOfflineSupport && initialisedDatabase) {
-      listener = client?.on(handleEventToSyncDB);
+      listener = client?.on((event) => handleEventToSyncDB(event, client));
     }
 
     return () => {