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

package/src/components/Channel/Channel.tsx

@@ -600,7 +600,7 @@ const ChannelWithContext = <
    */
   const [hasNoMoreRecentMessagesToLoad, setHasNoMoreRecentMessagesToLoad] = useState(true);
 
-  const { setTargetedMessage, targetedMessage } = useTargetedMessage();
+  const { prevTargetedMessage, setTargetedMessage, targetedMessage } = useTargetedMessage();
 
   /**
    * If we loaded a channel around message
@@ -718,7 +718,7 @@ const ChannelWithContext = <
       () => {
         if (channel) {
           clearInterval(mergeSetsIntervalRef.current);
-          setMessages([...channel.state.messages]);
+          setMessages(channel.state.messages);
           restartSetsMergeFuncRef.current();
         }
       },
@@ -753,7 +753,7 @@ const ChannelWithContext = <
 
   const copyChannelState = useRef(
     throttle(
-      (onComplete: (() => void) | undefined = undefined) => {
+      () => {
         setLoading(false);
         if (channel) {
           setMembers({ ...channel.state.members });
@@ -762,7 +762,6 @@ const ChannelWithContext = <
           setTyping({ ...channel.state.typing });
           setWatcherCount(channel.state.watcher_count);
           setWatchers({ ...channel.state.watchers });
-          onComplete?.();
         }
       },
       stateUpdateThrottleInterval,
@@ -787,6 +786,8 @@ const ChannelWithContext = <
   // subscribe to the generic all channel event
   useEffect(() => {
     const handleEvent: EventHandler<StreamChatGenerics> = (event) => {
+      const ignorableEvents = ['user.watching.start', 'user.watching.stop'];
+      if (ignorableEvents.includes(event.type)) return;
       if (shouldSyncChannel) {
         const isTypingEvent = event.type === 'typing.start' || event.type === 'typing.stop';
         if (!isTypingEvent) {
@@ -805,6 +806,7 @@ const ChannelWithContext = <
         // only update channel state if the events are not the previously subscribed useEffect's subscription events
         if (
           channel &&
+          channel.initialized &&
           event.type !== 'message.new' &&
           event.type !== 'message.read' &&
           event.type !== 'typing.start' &&
@@ -861,8 +863,8 @@ const ChannelWithContext = <
         const scrollToMessageIndex = scrollToMessageId
           ? currentMessages.findIndex(({ id }) => id === scrollToMessageId)
           : -1;
-
         if (channel && scrollToMessageIndex !== -1) {
+          copyChannelState.cancel();
           // We assume that on average user sees 5 messages on screen
           // We dont want new renders to happen while scrolling to the targeted message
           // hence we limit the number of messages to be rendered after the targeted message to 5 - 1 = 4
@@ -870,21 +872,19 @@ const ChannelWithContext = <
           // the previous latest message set will be thrown away as we cannot merge it with the current message set after the target message is set
           const limitAfter = 4;
           const currentLength = currentMessages.length;
-          if (scrollToMessageIndex !== -1) {
-            const noOfMessagesAfter = currentLength - scrollToMessageIndex - 1;
-            // number of messages are over the limit, limit the length of messages
-            if (noOfMessagesAfter > limitAfter) {
-              const endIndex = scrollToMessageIndex + limitAfter;
-              channel.state.clearMessages();
-              channel.state.messages = currentMessages.slice(0, endIndex + 1);
-              splitLatestCurrentMessageSetRef.current();
-              const restOfMessages = currentMessages.slice(endIndex + 1);
-              if (hadCurrentLatestMessages) {
-                const latestSet = channel.state.messageSets.find((set) => set.isLatest);
-                if (latestSet) {
-                  latestSet.messages = restOfMessages;
-                  hasOverlappingRecentMessagesRef.current = true;
-                }
+          const noOfMessagesAfter = currentLength - scrollToMessageIndex - 1;
+          // number of messages are over the limit, limit the length of messages
+          if (noOfMessagesAfter > limitAfter) {
+            const endIndex = scrollToMessageIndex + limitAfter;
+            channel.state.clearMessages();
+            channel.state.messages = currentMessages.slice(0, endIndex + 1);
+            splitLatestCurrentMessageSetRef.current();
+            const restOfMessages = currentMessages.slice(endIndex + 1);
+            if (hadCurrentLatestMessages) {
+              const latestSet = channel.state.messageSets.find((set) => set.isLatest);
+              if (latestSet) {
+                latestSet.messages = restOfMessages;
+                hasOverlappingRecentMessagesRef.current = true;
               }
             }
           }
@@ -892,11 +892,12 @@ const ChannelWithContext = <
         const hasLatestMessages = channel.state.latestMessages.length > 0;
         channel.state.setIsUpToDate(hasLatestMessages);
         setHasNoMoreRecentMessagesToLoad(hasLatestMessages);
-        copyChannelState(() => {
-          // only after the debounce interval completes, we will merge the sets and set any other states
-          restartSetsMergeFuncRef.current();
-          onAfterQueryCall?.();
-        });
+        copyChannelState();
+        if (scrollToMessageIndex !== -1) {
+          // since we need to scroll after immediately do this without throttle
+          copyChannelState.flush();
+        }
+        onAfterQueryCall?.();
       } catch (err) {
         if (err instanceof Error) {
           setError(err);
@@ -956,7 +957,11 @@ const ChannelWithContext = <
           await loadLatestMessagesRef.current();
         }
       },
-      undefined,
+      () => {
+        if (unreadMessageIdToScrollTo) {
+          restartSetsMergeFuncRef.current();
+        }
+      },
       () => unreadMessageIdToScrollTo,
     );
   };
@@ -997,12 +1002,21 @@ const ChannelWithContext = <
         },
         () => {
           if (messageIdToLoadAround) {
+            clearInterval(mergeSetsIntervalRef.current); // do not merge sets as we will scroll/highlight to the message
             setTargetedMessage(messageIdToLoadAround);
           }
         },
         messageIdToLoadAround,
       );
 
+  useEffect(() => {
+    if (!targetedMessage && prevTargetedMessage) {
+      // we cleared the merge sets interval to wait for the targeted message to be set
+      // now restart it since its done
+      restartSetsMergeFuncRef.current();
+    }
+  }, [targetedMessage]);
+
   /**
    * @deprecated use loadChannelAroundMessage instead
    *
@@ -1091,7 +1105,7 @@ const ChannelWithContext = <
       const currentLength = channel.state.messages.length || 0;
       const didMerge = mergeOverlappingMessageSetsRef.current(true);
       if (didMerge && channel.state.messages.length !== currentLength) {
-        setMessages([...channel.state.messages]);
+        setMessages(channel.state.messages);
       }
     }, 1000);
   });

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

@@ -3,6 +3,11 @@ import { useEffect, useRef, useState } from 'react';
 export const useTargetedMessage = (messageId?: string) => {
   const clearTargetedMessageCall = useRef<ReturnType<typeof setTimeout>>();
   const [targetedMessage, setTargetedMessage] = useState(messageId);
+  const prevTargetedMessageRef = useRef<string>();
+
+  useEffect(() => {
+    prevTargetedMessageRef.current = targetedMessage;
+  }, [targetedMessage]);
 
   useEffect(() => {
     clearTargetedMessageCall.current = setTimeout(() => {
@@ -25,6 +30,7 @@ export const useTargetedMessage = (messageId?: string) => {
   });
 
   return {
+    prevTargetedMessage: prevTargetedMessageRef.current,
     setTargetedMessage: setTargetedMessageTimeoutRef.current,
     targetedMessage,
   };

package/src/components/ChannelPreview/ChannelPreviewMessenger.tsx

@@ -165,10 +165,10 @@ const ChannelPreviewMessengerWithContext = <
         testID={`channel-preview-content-${channel.id}`}
       >
         <View style={[styles.row, row]}>
-          <PreviewTitle displayName={displayName} />
+          <PreviewTitle channel={channel} displayName={displayName} />
           <View style={[styles.statusContainer, row]}>
             {isChannelMuted && <PreviewMutedStatus />}
-            <PreviewUnreadCount maxUnreadCount={maxUnreadCount} unread={unread} />
+            <PreviewUnreadCount channel={channel} maxUnreadCount={maxUnreadCount} unread={unread} />
           </View>
         </View>
         <View style={[styles.row, row]}>

package/src/components/ChannelPreview/ChannelPreviewTitle.tsx

@@ -1,20 +1,29 @@
 import React from 'react';
 import { StyleSheet, Text } from 'react-native';
 
+import type { ChannelPreviewProps } from './ChannelPreview';
+
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
+import type { DefaultStreamChatGenerics } from '../../types/types';
 
 const styles = StyleSheet.create({
   title: { fontSize: 14, fontWeight: '700' },
 });
 
-export type ChannelPreviewTitleProps = {
+export type ChannelPreviewTitleProps<
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+> = Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'> & {
   /**
    * Formatted name for the previewed channel.
    */
   displayName: string;
 };
 
-export const ChannelPreviewTitle = (props: ChannelPreviewTitleProps) => {
+export const ChannelPreviewTitle = <
+  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
+>(
+  props: ChannelPreviewTitleProps<StreamChatGenerics>,
+) => {
   const { displayName } = props;
   const {
     theme: {

package/src/components/ChannelPreview/ChannelPreviewUnreadCount.tsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
+import { ChannelPreviewProps } from './ChannelPreview';
+
 import type { ChannelsContextValue } from '../../contexts/channelsContext/ChannelsContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
@@ -8,12 +10,13 @@ import type { DefaultStreamChatGenerics } from '../../types/types';
 
 export type ChannelPreviewUnreadCountProps<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelsContextValue<StreamChatGenerics>, 'maxUnreadCount'> & {
-  /**
-   * Number of unread messages on the channel
-   */
-  unread?: number;
-};
+> = Pick<ChannelsContextValue<StreamChatGenerics>, 'maxUnreadCount'> &
+  Pick<ChannelPreviewProps<StreamChatGenerics>, 'channel'> & {
+    /**
+     * Number of unread messages on the channel
+     */
+    unread?: number;
+  };
 
 export const ChannelPreviewUnreadCount = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,

package/src/contexts/channelsContext/ChannelsContext.tsx

@@ -199,7 +199,7 @@ export type ChannelsContextValue<
    *
    * **Default** [ChannelPreviewTitle](https://github.com/GetStream/stream-chat-react-native/blob/main/package/src/components/ChannelPreview/ChannelPreviewTitle.tsx)
    */
-  PreviewTitle?: React.ComponentType<ChannelPreviewTitleProps>;
+  PreviewTitle?: React.ComponentType<ChannelPreviewTitleProps<StreamChatGenerics>>;
   /**
    * Custom UI component to render preview avatar.
    *

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!",

package/src/i18n/es.json

@@ -1,34 +1,34 @@
 {
   "1 Reply": "",
-  "1 Thread Reply": "1 respuesta de hilo",
+  "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?": "¿Estás seguro de que deseas eliminar permanentemente este mensaje?",
-  "Are you sure?": "¿Estás seguro?",
-  "Block User": "Bloquear usuario",
-  "Cancel": "Cancelar",
-  "Cannot Flag Message": "No se puede reportar el mensaje",
-  "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Considera cómo tu comentario podría hacer sentir a los demás y asegúrate de seguir nuestras Normas de la Comunidad",
-  "Copy Message": "Copiar mensaje",
-  "Delete": "Eliminar",
-  "Delete Message": "Eliminar mensaje",
+  "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?": "¿Deseas enviar una copia de este mensaje a un moderador para una investigación adicional?",
-  "Edit Message": "Editar mensaje",
+  "Do you want to send a copy of this message to a moderator for further investigation?": "",
+  "Edit Message": "",
   "Editing Message": "",
-  "Emoji matching": "",
+  "Emoji matching": "Coincidencia de emoji",
   "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": "Reportar",
-  "Flag Message": "Reportar mensaje",
-  "Flag action failed either due to a network issue or the message is already flagged": "El reporte falló debido a un problema de red o el mensaje ya fue reportado.",
+  "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": "Comandos instantáneos",
   "Let's start chatting!": "",
   "Links are disabled": "",
   "Loading channels...": "",
@@ -37,43 +37,43 @@
   "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "",
   "Message Reactions": "Reacciones al mensaje",
   "Message deleted": "",
-  "Message flagged": "Mensaje reportado",
-  "Mute User": "Silenciar usuario",
+  "Message flagged": "",
+  "Mute User": "",
   "Not supported": "",
   "Nothing yet...": "",
-  "Ok": "Aceptar",
+  "Ok": "",
   "Only visible to you": "Solo visible para ti",
   "Open Settings": "",
   "Photo": "",
   "Photos and Videos": "",
-  "Pin to Conversation": "Fijar a la conversación",
-  "Pinned by": "",
+  "Pin to Conversation": "",
+  "Pinned by": "Fijado por",
   "Please enable access to your photos and videos so you can share them.": "",
   "Please select a channel first": "",
   "Reconnecting...": "",
-  "Reply": "Responder",
+  "Reply": "",
   "Reply to Message": "",
-  "Resend": "Reenviar",
+  "Resend": "",
   "Search GIFs": "",
   "Select More Photos": "",
-  "Send Anyway": "Enviar de todos modos",
+  "Send Anyway": "",
   "Send a message": "",
   "Sending links is not allowed in this conversation": "",
   "Slow mode ON": "",
-  "The message has been reported to a moderator.": "El mensaje ha sido reportado a un moderador.",
-  "Thread Reply": "Respuesta de hilo",
-  "Unblock User": "Desbloquear usuario",
+  "The message has been reported to a moderator.": "",
+  "Thread Reply": "",
+  "Unblock User": "",
   "Unknown User": "",
-  "Unmute User": "Activar sonido del usuario",
-  "Unpin from Conversation": "Desmarcar de la conversación",
+  "Unmute User": "",
+  "Unpin from Conversation": "",
   "Unread Messages": "",
   "Video": "",
   "You": "",
   "You can't send messages in this channel": "",
-  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
+  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} y {{ nonSelfUserLength }} más están escribiendo",
   "{{ index }} of {{ photoLength }}": "",
   "{{ replyCount }} Replies": "",
-  "{{ replyCount }} Thread Replies": "{{ replyCount }} respuestas de hilo",
-  "{{ user }} is typing": "",
+  "{{ replyCount }} Thread Replies": "",
+  "{{ user }} is typing": "{{ user }} está escribiendo",
   "🏙 Attachment...": ""
 }

package/src/i18n/fr.json

@@ -1,34 +1,34 @@
 {
   "1 Reply": "",
-  "1 Thread Reply": "Réponse à 1 fil",
+  "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?": "Êtes-vous sûr de vouloir supprimer définitivement ce message?",
-  "Are you sure?": "Es-tu sûr ?",
-  "Block User": "Bloquer un utilisateur",
-  "Cancel": "Annuler",
-  "Cannot Flag Message": "Impossible de signaler le message",
-  "Consider how your comment might make others feel and be sure to follow our Community Guidelines": "Considérez comment votre commentaire pourrait faire sentir les autres et assurez-vous de suivre nos directives communautaires",
-  "Copy Message": "Copier le message",
-  "Delete": "Supprimer",
-  "Delete Message": "Supprimer un message",
+  "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?": "Voulez-vous envoyer une copie de ce message à un modérateur pour une enquête plus approfondie?",
-  "Edit Message": "Éditer un message",
+  "Do you want to send a copy of this message to a moderator for further investigation?": "",
+  "Edit Message": "",
   "Editing Message": "",
-  "Emoji matching": "",
+  "Emoji matching": "Correspondance Emoji",
   "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": "Signaler",
-  "Flag Message": "Signaler le message",
-  "Flag action failed either due to a network issue or the message is already flagged": "L'action de signalisation a échoué en raison d'un problème de réseau ou le message est déjà signalé.",
+  "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": "Commandes Instantanées",
   "Let's start chatting!": "",
   "Links are disabled": "",
   "Loading channels...": "",
@@ -37,43 +37,43 @@
   "Maximum file size upload limit reached. Please upload a file below {{MAX_FILE_SIZE_TO_UPLOAD_IN_MB}} MB.": "",
   "Message Reactions": "Réactions aux messages",
   "Message deleted": "",
-  "Message flagged": "Message signalé",
-  "Mute User": "Utilisateur muet",
+  "Message flagged": "",
+  "Mute User": "",
   "Not supported": "",
   "Nothing yet...": "",
-  "Ok": "Ok",
+  "Ok": "",
   "Only visible to you": "Seulement visible par vous",
   "Open Settings": "",
   "Photo": "",
   "Photos and Videos": "",
-  "Pin to Conversation": "Épingler à la conversation",
-  "Pinned by": "",
+  "Pin to Conversation": "",
+  "Pinned by": "Épinglé par",
   "Please enable access to your photos and videos so you can share them.": "",
   "Please select a channel first": "",
   "Reconnecting...": "",
-  "Reply": "Répondre",
+  "Reply": "",
   "Reply to Message": "",
-  "Resend": "Renvoyer",
+  "Resend": "",
   "Search GIFs": "",
   "Select More Photos": "",
-  "Send Anyway": "Envoyer quand même",
+  "Send Anyway": "",
   "Send a message": "",
   "Sending links is not allowed in this conversation": "",
   "Slow mode ON": "",
-  "The message has been reported to a moderator.": "Le message a été signalé à un modérateur.",
-  "Thread Reply": "Réponse à la discussion",
-  "Unblock User": "Débloquer Utilisateur",
+  "The message has been reported to a moderator.": "",
+  "Thread Reply": "",
+  "Unblock User": "",
   "Unknown User": "",
-  "Unmute User": "Activer le son de Utilisateur",
-  "Unpin from Conversation": "Décrocher de la conversation",
+  "Unmute User": "",
+  "Unpin from Conversation": "",
   "Unread Messages": "",
   "Video": "",
   "You": "",
   "You can't send messages in this channel": "",
-  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
+  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} et {{ nonSelfUserLength }} autres sont en train d'écrire",
   "{{ index }} of {{ photoLength }}": "",
   "{{ replyCount }} Replies": "",
-  "{{ replyCount }} Thread Replies": "{{replyCount}} Réponses à la discussion",
-  "{{ user }} is typing": "",
+  "{{ replyCount }} Thread Replies": "",
+  "{{ user }} is typing": "{{ user }} est en train d'écrire",
   "🏙 Attachment...": ""
 }

package/src/i18n/he.json

@@ -1,34 +1,34 @@
 {
   "1 Reply": "",
-  "1 Thread Reply": "תגובה אחת לשרשור",
+  "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?": "האם את/ה בטוח/ה שאת/ה רוצה למחוק את ההודעה הזו לצמיתות?",
-  "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": "מחק/י הודעה",
+  "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": "",
+  "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...": "",
@@ -37,43 +37,43 @@
   "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": "אוקיי",
+  "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": "השב/י",
+  "Reply": "",
   "Reply to Message": "",
-  "Resend": "שלח/י שוב",
+  "Resend": "",
   "Search GIFs": "",
   "Select More Photos": "",
-  "Send Anyway": "שלח בכל זאת",
+  "Send Anyway": "",
   "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": "בטל/י חסימת משתמש",
+  "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 can't send messages in this channel": "",
-  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "",
+  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} ו-{{ nonSelfUserLength }} משתמש/ים אחר/ים מקלידים",
   "{{ index }} of {{ photoLength }}": "",
   "{{ replyCount }} Replies": "",
-  "{{ replyCount }} Thread Replies": "{{ replyCount }} תגובות שרשור",
-  "{{ user }} is typing": "",
+  "{{ replyCount }} Thread Replies": "",
+  "{{ user }} is typing": "{{ user }} מקליד/ה",
   "🏙 Attachment...": ""
 }