stream-chat-react-native-core 6.7.5-beta.1 → 7.0.0-beta.1

package/src/components/Message/Message.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo, useState } from 'react';
 import { GestureResponderEvent, Keyboard, StyleProp, View, ViewStyle } from 'react-native';
 
-import type { Attachment, UserResponse } from 'stream-chat';
+import type { Attachment, LocalMessage, UserResponse } from 'stream-chat';
 
 import { useCreateMessageContext } from './hooks/useCreateMessageContext';
 import { useMessageActionHandlers } from './hooks/useMessageActionHandlers';
@@ -32,7 +32,7 @@ import {
 } from '../../contexts/translationContext/TranslationContext';
 
 import { isVideoPlayerAvailable, NativeHandlers } from '../../native';
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 import {
   hasOnlyEmojis,
   isBlockedMessage,
@@ -41,11 +41,7 @@ import {
   MessageStatusTypes,
 } from '../../utils/utils';
 import type { Thumbnail } from '../Attachment/utils/buildGallery/types';
-
-import {
-  isMessageWithStylesReadByAndDateSeparator,
-  MessageType,
-} from '../MessageList/hooks/useMessageList';
+import { getReadState } from '../MessageList/utils/getReadState';
 
 export type TouchableEmitter =
   | 'fileAttachment'
@@ -56,15 +52,11 @@ export type TouchableEmitter =
   | 'messageReplies'
   | 'reactionList';
 
-export type TextMentionTouchableHandlerAdditionalInfo<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = { user?: UserResponse<StreamChatGenerics> };
+export type TextMentionTouchableHandlerAdditionalInfo = { user?: UserResponse };
 
-export type TextMentionTouchableHandlerPayload<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type TextMentionTouchableHandlerPayload = {
   emitter: 'textMention';
-  additionalInfo?: TextMentionTouchableHandlerAdditionalInfo<StreamChatGenerics>;
+  additionalInfo?: TextMentionTouchableHandlerAdditionalInfo;
 };
 
 export type UrlTouchableHandlerAdditionalInfo = { url?: string };
@@ -74,15 +66,13 @@ export type UrlTouchableHandlerPayload = {
   additionalInfo?: UrlTouchableHandlerAdditionalInfo;
 };
 
-export type FileAttachmentTouchableHandlerAdditionalInfo<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = { attachment?: Attachment<StreamChatGenerics> };
+export type FileAttachmentTouchableHandlerAdditionalInfo = {
+  attachment?: Attachment;
+};
 
-export type FileAttachmentTouchableHandlerPayload<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type FileAttachmentTouchableHandlerPayload = {
   emitter: 'fileAttachment';
-  additionalInfo?: FileAttachmentTouchableHandlerAdditionalInfo<StreamChatGenerics>;
+  additionalInfo?: FileAttachmentTouchableHandlerAdditionalInfo;
 };
 
 export type GalleryThumbnailTouchableHandlerAdditionalInfo = { thumbnail?: Thumbnail };
@@ -108,13 +98,11 @@ export type PressableHandlerPayload = {
   | GalleryThumbnailTouchableHandlerPayload
 );
 
-export type MessagePressableHandlerPayload<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = PressableHandlerPayload & {
+export type MessagePressableHandlerPayload = PressableHandlerPayload & {
   /**
    * Set of action handler functions for various message actions. You can use these functions to perform any action when give interaction occurs.
    */
-  actionHandlers?: MessageActionHandlers<StreamChatGenerics>;
+  actionHandlers?: MessageActionHandlers;
   /**
    * Additional message touchable handler info.
    */
@@ -122,12 +110,10 @@ export type MessagePressableHandlerPayload<
   /**
    * Message object, on which interaction occurred.
    */
-  message?: MessageType<StreamChatGenerics>;
+  message?: LocalMessage;
 };
 
-export type MessageActionHandlers<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type MessageActionHandlers = {
   copyMessage: () => void;
   deleteMessage: () => void;
   editMessage: () => void;
@@ -140,25 +126,20 @@ export type MessageActionHandlers<
   toggleMuteUser: () => Promise<void>;
   toggleReaction: (reactionType: string) => Promise<void>;
   unpinMessage: () => Promise<void>;
-  threadReply?: (message: MessageType<StreamChatGenerics>) => Promise<void>;
+  threadReply?: (message: LocalMessage) => Promise<void>;
 };
 
-export type MessagePropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ChannelContextValue<StreamChatGenerics>, 'channel' | 'enforceUniqueReaction' | 'members'> &
+export type MessagePropsWithContext = Pick<
+  ChannelContextValue,
+  'channel' | 'enforceUniqueReaction' | 'members'
+> &
   Pick<KeyboardContextValue, 'dismissKeyboard'> &
   Partial<
-    Omit<
-      MessageContextValue<StreamChatGenerics>,
-      'groupStyles' | 'handleReaction' | 'message' | 'isMessageAIGenerated'
-    >
-  > &
-  Pick<
-    MessageContextValue<StreamChatGenerics>,
-    'groupStyles' | 'message' | 'isMessageAIGenerated'
+    Omit<MessageContextValue, 'groupStyles' | 'handleReaction' | 'message' | 'isMessageAIGenerated'>
   > &
+  Pick<MessageContextValue, 'groupStyles' | 'message' | 'isMessageAIGenerated'> &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'sendReaction'
     | 'deleteMessage'
     | 'dismissKeyboardOnMessageTouch'
@@ -194,10 +175,10 @@ export type MessagePropsWithContext<
     | 'updateMessage'
     | 'PollContent'
   > &
-  Pick<ThreadContextValue<StreamChatGenerics>, 'openThread'> &
+  Pick<ThreadContextValue, 'openThread'> &
   Pick<TranslationContextValue, 't'> & {
-    chatContext: ChatContextValue<StreamChatGenerics>;
-    messagesContext: MessagesContextValue<StreamChatGenerics>;
+    chatContext: ChatContextValue;
+    messagesContext: MessagesContextValue;
     /**
      * Whether or not users are able to long press messages.
      */
@@ -209,7 +190,7 @@ export type MessagePropsWithContext<
      *
      * @param message A message object to open the thread upon.
      */
-    onThreadSelect?: (message: MessageType<StreamChatGenerics>) => void;
+    onThreadSelect?: (message: LocalMessage) => void;
     showUnreadUnderlay?: boolean;
     style?: StyleProp<ViewStyle>;
   };
@@ -219,11 +200,7 @@ export type MessagePropsWithContext<
  * we memoized and broke it up to prevent new messages from re-rendering
  * each individual Message component.
  */
-const MessageWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessagePropsWithContext<StreamChatGenerics>,
-) => {
+const MessageWithContext = (props: MessagePropsWithContext) => {
   const [messageOverlayVisible, setMessageOverlayVisible] = useState(false);
   const [isErrorInMessage, setIsErrorInMessage] = useState(false);
   const [showMessageReactions, setShowMessageReactions] = useState(true);
@@ -286,6 +263,7 @@ const MessageWithContext = <
     threadList = false,
     updateMessage,
   } = props;
+  const { read } = useChannelContext();
   const isMessageAIGenerated = messagesContext.isMessageAIGenerated;
   const isAIGenerated = useMemo(
     () => isMessageAIGenerated(message),
@@ -300,6 +278,7 @@ const MessageWithContext = <
       screenPadding,
     },
   } = useTheme();
+  const readBy = useMemo(() => getReadState(message, read), [message, read]);
 
   const showMessageOverlay = async (showMessageReactions = false, selectedReaction?: string) => {
     await dismissKeyboard();
@@ -331,7 +310,7 @@ const MessageWithContext = <
     }
   };
 
-  const onPressQuotedMessage = (quotedMessage: MessageType<StreamChatGenerics>) => {
+  const onPressQuotedMessage = (quotedMessage: LocalMessage) => {
     if (!goToMessage) {
       return;
     }
@@ -348,7 +327,7 @@ const MessageWithContext = <
     if (isEditedMessage(message)) {
       setIsEditedMessageOpen((prevState) => !prevState);
     }
-    const quotedMessage = message.quoted_message as MessageType<StreamChatGenerics>;
+    const quotedMessage = message.quoted_message;
     if (error) {
       setIsErrorInMessage(true);
       /**
@@ -424,17 +403,17 @@ const MessageWithContext = <
             return acc;
           },
           {
-            files: [] as Attachment<StreamChatGenerics>[],
-            images: [] as Attachment<StreamChatGenerics>[],
-            other: [] as Attachment<StreamChatGenerics>[],
-            videos: [] as Attachment<StreamChatGenerics>[],
+            files: [] as Attachment[],
+            images: [] as Attachment[],
+            other: [] as Attachment[],
+            videos: [] as Attachment[],
           },
         )
       : {
-          files: [] as Attachment<StreamChatGenerics>[],
-          images: [] as Attachment<StreamChatGenerics>[],
-          other: [] as Attachment<StreamChatGenerics>[],
-          videos: [] as Attachment<StreamChatGenerics>[],
+          files: [] as Attachment[],
+          images: [] as Attachment[],
+          other: [] as Attachment[],
+          videos: [] as Attachment[],
         };
   /**
    * Check if any actions to prevent long press
@@ -598,7 +577,7 @@ const MessageWithContext = <
           unpinMessage,
         });
 
-  const actionHandlers: MessageActionHandlers<StreamChatGenerics> = {
+  const actionHandlers: MessageActionHandlers = {
     copyMessage: handleCopyMessage,
     deleteMessage: handleDeleteMessage,
     editMessage: handleEditMessage,
@@ -712,6 +691,7 @@ const MessageWithContext = <
     otherAttachments: attachments.other,
     preventPress,
     reactions,
+    readBy,
     setIsEditedMessageOpen,
     showAvatar,
     showMessageOverlay,
@@ -767,10 +747,7 @@ const MessageWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessagePropsWithContext<StreamChatGenerics>,
-  nextProps: MessagePropsWithContext<StreamChatGenerics>,
-) => {
+const areEqual = (prevProps: MessagePropsWithContext, nextProps: MessagePropsWithContext) => {
   const {
     chatContext: { mutedUsers: prevMutedUsers },
     goToMessage: prevGoToMessage,
@@ -836,8 +813,6 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 
   const messageEqual =
     isPrevMessageTypeDeleted === isNextMessageTypeDeleted &&
-    (isMessageWithStylesReadByAndDateSeparator(prevMessage) && prevMessage.readBy) ===
-      (isMessageWithStylesReadByAndDateSeparator(nextMessage) && nextMessage.readBy) &&
     prevMessage.status === nextMessage.status &&
     prevMessage.type === nextMessage.type &&
     prevMessage.text === nextMessage.text &&
@@ -938,12 +913,10 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 
 const MemoizedMessage = React.memo(MessageWithContext, areEqual) as typeof MessageWithContext;
 
-export type MessageProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<
-  Omit<MessagePropsWithContext<StreamChatGenerics>, 'groupStyles' | 'handleReaction' | 'message'>
+export type MessageProps = Partial<
+  Omit<MessagePropsWithContext, 'groupStyles' | 'handleReaction' | 'message'>
 > &
-  Pick<MessagePropsWithContext<StreamChatGenerics>, 'groupStyles' | 'message'>;
+  Pick<MessagePropsWithContext, 'groupStyles' | 'message'>;
 
 /**
  * Message - A high level component which implements all the logic required for a message.
@@ -951,20 +924,16 @@ export type MessageProps<
  *
  * @example ./Message.md
  */
-export const Message = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageProps<StreamChatGenerics>,
-) => {
-  const { channel, enforceUniqueReaction, members } = useChannelContext<StreamChatGenerics>();
-  const chatContext = useChatContext<StreamChatGenerics>();
+export const Message = (props: MessageProps) => {
+  const { channel, enforceUniqueReaction, members } = useChannelContext();
+  const chatContext = useChatContext();
   const { dismissKeyboard } = useKeyboardContext();
-  const messagesContext = useMessagesContext<StreamChatGenerics>();
-  const { openThread } = useThreadContext<StreamChatGenerics>();
+  const messagesContext = useMessagesContext();
+  const { openThread } = useThreadContext();
   const { t } = useTranslationContext();
 
   return (
-    <MemoizedMessage<StreamChatGenerics>
+    <MemoizedMessage
       {...messagesContext}
       {...{
         channel,

package/src/components/Message/MessageSimple/MessageAvatar.tsx

@@ -8,23 +8,16 @@ import {
 } from '../../../contexts/messageContext/MessageContext';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { Avatar, AvatarProps } from '../../Avatar/Avatar';
 
-export type MessageAvatarPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+export type MessageAvatarPropsWithContext = Pick<
+  MessageContextValue,
   'alignment' | 'lastGroupMessage' | 'message' | 'showAvatar'
 > &
-  Pick<ChatContextValue<StreamChatGenerics>, 'ImageComponent'> &
+  Pick<ChatContextValue, 'ImageComponent'> &
   Partial<Pick<AvatarProps, 'size'>>;
 
-const MessageAvatarWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageAvatarPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageAvatarWithContext = (props: MessageAvatarPropsWithContext) => {
   const { alignment, ImageComponent, lastGroupMessage, message, showAvatar, size } = props;
   const {
     theme: {
@@ -56,9 +49,9 @@ const MessageAvatarWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageAvatarPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageAvatarPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageAvatarPropsWithContext,
+  nextProps: MessageAvatarPropsWithContext,
 ) => {
   const { lastGroupMessage: prevLastGroupMessage, message: prevMessage } = prevProps;
   const { lastGroupMessage: nextLastGroupMessage, message: nextMessage } = nextProps;
@@ -84,18 +77,11 @@ const MemoizedMessageAvatar = React.memo(
   areEqual,
 ) as typeof MessageAvatarWithContext;
 
-export type MessageAvatarProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageAvatarPropsWithContext<StreamChatGenerics>>;
+export type MessageAvatarProps = Partial<MessageAvatarPropsWithContext>;
 
-export const MessageAvatar = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageAvatarProps<StreamChatGenerics>,
-) => {
-  const { alignment, lastGroupMessage, message, showAvatar } =
-    useMessageContext<StreamChatGenerics>();
-  const { ImageComponent } = useChatContext<StreamChatGenerics>();
+export const MessageAvatar = (props: MessageAvatarProps) => {
+  const { alignment, lastGroupMessage, message, showAvatar } = useMessageContext();
+  const { ImageComponent } = useChatContext();
 
   return (
     <MemoizedMessageAvatar

package/src/components/Message/MessageSimple/MessageBounce.tsx

@@ -11,23 +11,15 @@ import {
 } from '../../../contexts/messagesContext/MessagesContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
-export type MessageBouncePropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessagesContextValue<StreamChatGenerics>,
+export type MessageBouncePropsWithContext = Pick<
+  MessagesContextValue,
   'setEditingState' | 'removeMessage' | 'retrySendMessage'
 > &
-  Pick<MessageContextValue<StreamChatGenerics>, 'message'> & {
+  Pick<MessageContextValue, 'message'> & {
     setIsBounceDialogOpen: React.Dispatch<React.SetStateAction<boolean>>;
   };
 
-export const MessageBounceWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageBouncePropsWithContext<StreamChatGenerics>,
-) => {
+export const MessageBounceWithContext = (props: MessageBouncePropsWithContext) => {
   const { t } = useTranslationContext();
   const { message, removeMessage, retrySendMessage, setEditingState, setIsBounceDialogOpen } =
     props;
@@ -71,9 +63,9 @@ export const MessageBounceWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageBouncePropsWithContext<StreamChatGenerics>,
-  nextProps: MessageBouncePropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageBouncePropsWithContext,
+  nextProps: MessageBouncePropsWithContext,
 ) => {
   const { message: prevMessage } = prevProps;
   const { message: nextMessage } = nextProps;
@@ -93,22 +85,15 @@ const MemoizedMessageBounce = React.memo(
   areEqual,
 ) as typeof MessageBounceWithContext;
 
-export type MessageBounceProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageBouncePropsWithContext<StreamChatGenerics>> & {
+export type MessageBounceProps = Partial<MessageBouncePropsWithContext> & {
   setIsBounceDialogOpen: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
-export const MessageBounce = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageBounceProps<StreamChatGenerics>,
-) => {
-  const { message } = useMessageContext<StreamChatGenerics>();
-  const { removeMessage, retrySendMessage, setEditingState } =
-    useMessagesContext<StreamChatGenerics>();
+export const MessageBounce = (props: MessageBounceProps) => {
+  const { message } = useMessageContext();
+  const { removeMessage, retrySendMessage, setEditingState } = useMessagesContext();
   return (
-    <MemoizedMessageBounce<StreamChatGenerics>
+    <MemoizedMessageBounce
       {...{
         message,
         removeMessage,

package/src/components/Message/MessageSimple/MessageContent.tsx

@@ -27,7 +27,7 @@ import {
 } from '../../../contexts/translationContext/TranslationContext';
 
 import { useViewport } from '../../../hooks/useViewport';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import { Poll } from '../../Poll/Poll';
 import { useMessageData } from '../hooks/useMessageData';
 
@@ -65,10 +65,8 @@ const styles = StyleSheet.create({
   },
 });
 
-export type MessageContentPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+export type MessageContentPropsWithContext = Pick<
+  MessageContextValue,
   | 'alignment'
   | 'goToMessage'
   | 'groupStyles'
@@ -85,7 +83,7 @@ export type MessageContentPropsWithContext<
   | 'isMessageAIGenerated'
 > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'additionalPressableProps'
     | 'Attachment'
     | 'enableMessageGroupingByUser'
@@ -120,11 +118,7 @@ export type MessageContentPropsWithContext<
 /**
  * Child of MessageSimple that displays a message's content
  */
-const MessageContentWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageContentPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
   const {
     additionalPressableProps,
     alignment,
@@ -354,7 +348,7 @@ const MessageContentWithContext = <
               default:
                 return (otherAttachments.length && otherAttachments[0].actions) ||
                   isAIGenerated ? null : (
-                  <MessageTextContainer<StreamChatGenerics>
+                  <MessageTextContainer
                     key={`message_text_container_${messageContentOrderIndex}`}
                   />
                 );
@@ -367,9 +361,9 @@ const MessageContentWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageContentPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageContentPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageContentPropsWithContext,
+  nextProps: MessageContentPropsWithContext,
 ) => {
   const {
     goToMessage: prevGoToMessage,
@@ -507,19 +501,15 @@ const MemoizedMessageContent = React.memo(
   areEqual,
 ) as typeof MessageContentWithContext;
 
-export type MessageContentProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Omit<MessageContentPropsWithContext<StreamChatGenerics>, 'setMessageContentWidth'>> &
-  Pick<MessageContentPropsWithContext<StreamChatGenerics>, 'setMessageContentWidth'>;
+export type MessageContentProps = Partial<
+  Omit<MessageContentPropsWithContext, 'setMessageContentWidth'>
+> &
+  Pick<MessageContentPropsWithContext, 'setMessageContentWidth'>;
 
 /**
  * Child of MessageSimple that displays a message's content
  */
-export const MessageContent = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageContentProps<StreamChatGenerics>,
-) => {
+export const MessageContent = (props: MessageContentProps) => {
   const {
     alignment,
     goToMessage,
@@ -536,7 +526,7 @@ export const MessageContent = <
     otherAttachments,
     preventPress,
     threadList,
-  } = useMessageContext<StreamChatGenerics>();
+  } = useMessageContext();
   const {
     additionalPressableProps,
     Attachment,
@@ -548,11 +538,11 @@ export const MessageContent = <
     myMessageTheme,
     Reply,
     StreamingMessageView,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
   const { t } = useTranslationContext();
 
   return (
-    <MemoizedMessageContent<StreamChatGenerics>
+    <MemoizedMessageContent
       {...{
         additionalPressableProps,
         alignment,

package/src/components/Message/MessageSimple/MessageDeleted.tsx

@@ -16,8 +16,6 @@ import {
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
 const styles = StyleSheet.create({
   containerInner: {
     borderTopLeftRadius: 16,
@@ -40,17 +38,11 @@ type MessageDeletedComponentProps = {
   date?: string | Date;
 };
 
-type MessageDeletedPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessageContextValue<StreamChatGenerics>, 'alignment' | 'message'> &
-  Pick<MessagesContextValue<StreamChatGenerics>, 'MessageFooter'> &
+type MessageDeletedPropsWithContext = Pick<MessageContextValue, 'alignment' | 'message'> &
+  Pick<MessagesContextValue, 'MessageFooter'> &
   MessageDeletedComponentProps;
 
-const MessageDeletedWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageDeletedPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageDeletedWithContext = (props: MessageDeletedPropsWithContext) => {
   const { alignment, date, groupStyle, message, MessageFooter, noBorder, onLayout } = props;
 
   const {
@@ -96,7 +88,7 @@ const MessageDeletedWithContext = <
           deletedContainerInner,
         ]}
       >
-        <MessageTextContainer<StreamChatGenerics>
+        <MessageTextContainer
           markdownStyles={merge({ em: { color: grey } }, deletedText)}
           message={{ ...message, text: `_${t('Message deleted')}_` }}
         />
@@ -106,9 +98,9 @@ const MessageDeletedWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageDeletedPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageDeletedPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageDeletedPropsWithContext,
+  nextProps: MessageDeletedPropsWithContext,
 ) => {
   const { alignment: prevAlignment, date: prevDate, message: prevMessage } = prevProps;
   const { alignment: nextAlignment, date: nextDate, message: nextMessage } = nextProps;
@@ -144,22 +136,16 @@ const MemoizedMessageDeleted = React.memo(
   areEqual,
 ) as typeof MessageDeletedWithContext;
 
-export type MessageDeletedProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageDeletedPropsWithContext<StreamChatGenerics>> & {
+export type MessageDeletedProps = Partial<MessageDeletedPropsWithContext> & {
   groupStyle: string;
   noBorder: boolean;
   onLayout: (event: LayoutChangeEvent) => void;
 };
 
-export const MessageDeleted = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageDeletedProps<StreamChatGenerics>,
-) => {
-  const { alignment, message } = useMessageContext<StreamChatGenerics>();
+export const MessageDeleted = (props: MessageDeletedProps) => {
+  const { alignment, message } = useMessageContext();
 
-  const { MessageFooter } = useMessagesContext<StreamChatGenerics>();
+  const { MessageFooter } = useMessagesContext();
 
   return (
     <MemoizedMessageDeleted

package/src/components/Message/MessageSimple/MessageEditedTimestamp.tsx

@@ -8,19 +8,12 @@ import {
 import { MessagesContextValue } from '../../../contexts/messagesContext/MessagesContext';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
-import { DefaultStreamChatGenerics } from '../../../types/types';
 import { isEditedMessage } from '../../../utils/utils';
 
-export type MessageEditedTimestampProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Pick<MessageContextValue<StreamChatGenerics>, 'message'>> &
-  Partial<Pick<MessagesContextValue<StreamChatGenerics>, 'MessageTimestamp'>>;
+export type MessageEditedTimestampProps = Partial<Pick<MessageContextValue, 'message'>> &
+  Partial<Pick<MessagesContextValue, 'MessageTimestamp'>>;
 
-export const MessageEditedTimestamp = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageEditedTimestampProps<StreamChatGenerics>,
-) => {
+export const MessageEditedTimestamp = (props: MessageEditedTimestampProps) => {
   const { message: propMessage, MessageTimestamp } = props;
   const {
     theme: {
@@ -31,7 +24,7 @@ export const MessageEditedTimestamp = <
     },
   } = useTheme();
   const { t } = useTranslationContext();
-  const { message: contextMessage } = useMessageContext<StreamChatGenerics>();
+  const { message: contextMessage } = useMessageContext();
   const message = propMessage || contextMessage;
 
   if (!isEditedMessage(message)) {