stream-chat-react-native-core 6.7.3 → 7.0.0-rc.10

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

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
-import type { Attachment } from 'stream-chat';
+import type { Attachment, LocalMessage } from 'stream-chat';
 
 import type { MessageStatusProps } from './MessageStatus';
 
@@ -20,9 +20,7 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
 import { Eye } from '../../../icons';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { isEditedMessage, MessageStatusTypes } from '../../../utils/utils';
-import type { MessageType } from '../../MessageList/hooks/useMessageList';
 
 type MessageFooterComponentProps = {
   date?: string | Date;
@@ -30,10 +28,8 @@ type MessageFooterComponentProps = {
   isDeleted?: boolean;
 };
 
-type MessageFooterPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+type MessageFooterPropsWithContext = Pick<
+  MessageContextValue,
   | 'alignment'
   | 'isEditedMessageOpen'
   | 'members'
@@ -44,7 +40,7 @@ type MessageFooterPropsWithContext<
   | 'isMessageAIGenerated'
 > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'deletedMessagesVisibilityType'
     | 'MessageEditedTimestamp'
     | 'MessageStatus'
@@ -83,11 +79,7 @@ const OnlyVisibleToYouComponent = ({ alignment }: { alignment: Alignment }) => {
   );
 };
 
-const MessageFooterWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageFooterPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageFooterWithContext = (props: MessageFooterPropsWithContext) => {
   const {
     alignment,
     date,
@@ -177,9 +169,9 @@ const MessageFooterWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageFooterPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageFooterPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageFooterPropsWithContext,
+  nextProps: MessageFooterPropsWithContext,
 ) => {
   const {
     alignment: prevAlignment,
@@ -274,23 +266,17 @@ const MemoizedMessageFooter = React.memo(
   areEqual,
 ) as typeof MessageFooterWithContext;
 
-export type MessageFooterProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Pick<ChannelContextValue<StreamChatGenerics>, 'members'>> &
+export type MessageFooterProps = Partial<Pick<ChannelContextValue, 'members'>> &
   MessageFooterComponentProps & {
     alignment?: Alignment;
     lastGroupMessage?: boolean;
-    message?: MessageType<StreamChatGenerics>;
-    MessageStatus?: React.ComponentType<MessageStatusProps<StreamChatGenerics>>;
-    otherAttachments?: Attachment<StreamChatGenerics>[];
+    message?: LocalMessage;
+    MessageStatus?: React.ComponentType<MessageStatusProps>;
+    otherAttachments?: Attachment[];
     showMessageStatus?: boolean;
   };
 
-export const MessageFooter = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageFooterProps<StreamChatGenerics>,
-) => {
+export const MessageFooter = (props: MessageFooterProps) => {
   const {
     alignment,
     isEditedMessageOpen,
@@ -300,10 +286,10 @@ export const MessageFooter = <
     message,
     otherAttachments,
     showMessageStatus,
-  } = useMessageContext<StreamChatGenerics>();
+  } = useMessageContext();
 
   const { deletedMessagesVisibilityType, MessageEditedTimestamp, MessageStatus, MessageTimestamp } =
-    useMessagesContext<StreamChatGenerics>();
+    useMessagesContext();
 
   return (
     <MemoizedMessageFooter

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

@@ -10,19 +10,11 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
 import { PinHeader } from '../../../icons';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+export type MessagePinnedHeaderProps = Partial<Pick<MessageContextValue, 'message'>>;
 
-export type MessagePinnedHeaderProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Pick<MessageContextValue<StreamChatGenerics>, 'message'>>;
-
-export const MessagePinnedHeader = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessagePinnedHeaderProps<StreamChatGenerics>,
-) => {
+export const MessagePinnedHeader = (props: MessagePinnedHeaderProps) => {
   const { message: propMessage } = props;
-  const { message: contextMessage } = useMessageContext<StreamChatGenerics>();
+  const { message: contextMessage } = useMessageContext();
   const message = propMessage || contextMessage;
   const {
     theme: {

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

@@ -15,8 +15,6 @@ import {
   useTranslationContext,
 } from '../../../contexts/translationContext/TranslationContext';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
@@ -48,10 +46,8 @@ const styles = StyleSheet.create({
   },
 });
 
-export type MessageRepliesPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+export type MessageRepliesPropsWithContext = Pick<
+  MessageContextValue,
   | 'alignment'
   | 'message'
   | 'onLongPress'
@@ -61,17 +57,13 @@ export type MessageRepliesPropsWithContext<
   | 'preventPress'
   | 'threadList'
 > &
-  Pick<MessagesContextValue<StreamChatGenerics>, 'MessageRepliesAvatars'> &
+  Pick<MessagesContextValue, 'MessageRepliesAvatars'> &
   Pick<TranslationContextValue, 't'> & {
     noBorder?: boolean;
     repliesCurveColor?: ColorValue;
   };
 
-const MessageRepliesWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageRepliesPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageRepliesWithContext = (props: MessageRepliesPropsWithContext) => {
   const {
     alignment,
     message,
@@ -175,9 +167,9 @@ const MessageRepliesWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageRepliesPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageRepliesPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageRepliesPropsWithContext,
+  nextProps: MessageRepliesPropsWithContext,
 ) => {
   const {
     message: prevMessage,
@@ -234,15 +226,9 @@ const MemoizedMessageReplies = React.memo(
   areEqual,
 ) as typeof MessageRepliesWithContext;
 
-export type MessageRepliesProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageRepliesPropsWithContext<StreamChatGenerics>>;
+export type MessageRepliesProps = Partial<MessageRepliesPropsWithContext>;
 
-export const MessageReplies = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageRepliesProps<StreamChatGenerics>,
-) => {
+export const MessageReplies = (props: MessageRepliesProps) => {
   const {
     alignment,
     message,
@@ -252,8 +238,8 @@ export const MessageReplies = <
     onPressIn,
     preventPress,
     threadList,
-  } = useMessageContext<StreamChatGenerics>();
-  const { MessageRepliesAvatars } = useMessagesContext<StreamChatGenerics>();
+  } = useMessageContext();
+  const { MessageRepliesAvatars } = useMessagesContext();
   const { t } = useTranslationContext();
 
   return (

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

@@ -5,7 +5,6 @@ import { ChatContextValue, useChatContext } from '../../../contexts/chatContext/
 import type { MessageContextValue } from '../../../contexts/messageContext/MessageContext';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { Avatar } from '../../Avatar/Avatar';
 
 const styles = StyleSheet.create({
@@ -20,14 +19,10 @@ const styles = StyleSheet.create({
   },
 });
 
-export type MessageRepliesAvatarsProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessageContextValue<StreamChatGenerics>, 'alignment' | 'message'>;
+export type MessageRepliesAvatarsProps = Pick<MessageContextValue, 'alignment' | 'message'>;
 
-export const MessageRepliesAvatarsWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageRepliesAvatarsProps<StreamChatGenerics> & Pick<ChatContextValue, 'ImageComponent'>,
+export const MessageRepliesAvatarsWithContext = (
+  props: MessageRepliesAvatarsProps & Pick<ChatContextValue, 'ImageComponent'>,
 ) => {
   const { alignment, ImageComponent, message } = props;
 
@@ -88,11 +83,7 @@ export const MessageRepliesAvatarsWithContext = <
   );
 };
 
-export const MessageRepliesAvatars = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageRepliesAvatarsProps<StreamChatGenerics>,
-) => {
+export const MessageRepliesAvatars = (props: MessageRepliesAvatarsProps) => {
   const { ImageComponent } = useChatContext();
 
   return <MessageRepliesAvatarsWithContext {...props} ImageComponent={ImageComponent} />;

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

@@ -25,7 +25,7 @@ import {
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 
 import { NativeHandlers } from '../../../native';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import { useMessageData } from '../hooks/useMessageData';
 
 const styles = StyleSheet.create({
@@ -56,10 +56,8 @@ const styles = StyleSheet.create({
   },
 });
 
-export type MessageSimplePropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+export type MessageSimplePropsWithContext = Pick<
+  MessageContextValue,
   | 'alignment'
   | 'channel'
   | 'groupStyles'
@@ -73,7 +71,7 @@ export type MessageSimplePropsWithContext<
   | 'showMessageStatus'
 > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'clearQuotedMessageState'
     | 'enableMessageGroupingByUser'
     | 'enableSwipeToReply'
@@ -94,11 +92,7 @@ export type MessageSimplePropsWithContext<
     | 'setQuotedMessageState'
   >;
 
-const MessageSimpleWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageSimplePropsWithContext<StreamChatGenerics>,
-) => {
+const MessageSimpleWithContext = (props: MessageSimplePropsWithContext) => {
   const [messageContentWidth, setMessageContentWidth] = useState(0);
   const { width } = Dimensions.get('screen');
   const {
@@ -440,9 +434,9 @@ const MessageSimpleWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageSimplePropsWithContext<StreamChatGenerics>,
-  nextProps: MessageSimplePropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageSimplePropsWithContext,
+  nextProps: MessageSimplePropsWithContext,
 ) => {
   const {
     channel: prevChannel,
@@ -579,19 +573,13 @@ const MemoizedMessageSimple = React.memo(
   areEqual,
 ) as typeof MessageSimpleWithContext;
 
-export type MessageSimpleProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageSimplePropsWithContext<StreamChatGenerics>>;
+export type MessageSimpleProps = Partial<MessageSimplePropsWithContext>;
 
 /**
  *
  * Message UI component
  */
-export const MessageSimple = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageSimpleProps<StreamChatGenerics>,
-) => {
+export const MessageSimple = (props: MessageSimpleProps) => {
   const {
     alignment,
     channel,
@@ -604,7 +592,7 @@ export const MessageSimple = <
     onlyEmojis,
     otherAttachments,
     showMessageStatus,
-  } = useMessageContext<StreamChatGenerics>();
+  } = useMessageContext();
   const {
     clearQuotedMessageState,
     enableMessageGroupingByUser,
@@ -624,10 +612,10 @@ export const MessageSimple = <
     reactionListPosition,
     ReactionListTop,
     setQuotedMessageState,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
 
   return (
-    <MemoizedMessageSimple<StreamChatGenerics>
+    <MemoizedMessageSimple
       {...{
         alignment,
         channel,

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

@@ -10,22 +10,16 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { Check } from '../../../icons/Check';
 import { CheckAll } from '../../../icons/CheckAll';
 import { Time } from '../../../icons/Time';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { MessageStatusTypes } from '../../../utils/utils';
 
-import { isMessageWithStylesReadByAndDateSeparator } from '../../MessageList/hooks/useMessageList';
-
-export type MessageStatusPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessageContextValue<StreamChatGenerics>, 'message' | 'threadList'>;
+export type MessageStatusPropsWithContext = Pick<
+  MessageContextValue,
+  'message' | 'readBy' | 'threadList'
+>;
 
-const MessageStatusWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageStatusPropsWithContext<StreamChatGenerics>,
-) => {
-  const { channel } = useChannelContext<StreamChatGenerics>();
-  const { message, threadList } = props;
+const MessageStatusWithContext = (props: MessageStatusPropsWithContext) => {
+  const { channel } = useChannelContext();
+  const { message, readBy, threadList } = props;
 
   const {
     theme: {
@@ -48,17 +42,17 @@ const MessageStatusWithContext = <
     return null;
   }
 
-  if (isMessageWithStylesReadByAndDateSeparator(message)) {
+  if (readBy) {
     const members = channel?.state.members;
     const otherMembers = Object.values(members).filter(
       (member) => member.user_id !== message.user?.id,
     );
     const hasOtherMembersGreaterThanOne = otherMembers.length > 1;
-    const hasReadByGreaterThanOne = typeof message.readBy === 'number' && message.readBy > 1;
+    const hasReadByGreaterThanOne = typeof readBy === 'number' && readBy > 1;
     const shouldDisplayReadByCount = hasOtherMembersGreaterThanOne && hasReadByGreaterThanOne;
     const countOfReadBy =
-      typeof message.readBy === 'number' && hasOtherMembersGreaterThanOne ? message.readBy - 1 : 0;
-    const showDoubleCheck = hasReadByGreaterThanOne || message.readBy === true;
+      typeof readBy === 'number' && hasOtherMembersGreaterThanOne ? readBy - 1 : 0;
+    const showDoubleCheck = hasReadByGreaterThanOne || readBy === true;
 
     return (
       <View style={[styles.statusContainer, statusContainer]}>
@@ -92,23 +86,25 @@ const MessageStatusWithContext = <
   return null;
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageStatusPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageStatusPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageStatusPropsWithContext,
+  nextProps: MessageStatusPropsWithContext,
 ) => {
-  const { message: prevMessage, threadList: prevThreadList } = prevProps;
-  const { message: nextMessage, threadList: nextThreadList } = nextProps;
+  const { message: prevMessage, readBy: prevReadBy, threadList: prevThreadList } = prevProps;
+  const { message: nextMessage, readBy: nextReadBy, threadList: nextThreadList } = nextProps;
 
   const threadListEqual = prevThreadList === nextThreadList;
   if (!threadListEqual) {
     return false;
   }
 
+  const readByEqual = prevReadBy === nextReadBy;
+  if (!readByEqual) {
+    return false;
+  }
+
   const messageEqual =
-    prevMessage.status === nextMessage.status &&
-    prevMessage.type === nextMessage.type &&
-    (isMessageWithStylesReadByAndDateSeparator(prevMessage) && prevMessage.readBy) ===
-      (isMessageWithStylesReadByAndDateSeparator(nextMessage) && nextMessage.readBy);
+    prevMessage.status === nextMessage.status && prevMessage.type === nextMessage.type;
   if (!messageEqual) {
     return false;
   }
@@ -121,18 +117,12 @@ const MemoizedMessageStatus = React.memo(
   areEqual,
 ) as typeof MessageStatusWithContext;
 
-export type MessageStatusProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageStatusPropsWithContext<StreamChatGenerics>>;
+export type MessageStatusProps = Partial<MessageStatusPropsWithContext>;
 
-export const MessageStatus = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageStatusProps<StreamChatGenerics>,
-) => {
-  const { message, threadList } = useMessageContext<StreamChatGenerics>();
+export const MessageStatus = (props: MessageStatusProps) => {
+  const { message, readBy, threadList } = useMessageContext();
 
-  return <MemoizedMessageStatus {...{ message, threadList }} {...props} />;
+  return <MemoizedMessageStatus {...{ message, readBy, threadList }} {...props} />;
 };
 
 MessageStatus.displayName = 'MessageStatus{messageSimple{status}}';

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

@@ -1,6 +1,8 @@
 import React from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 
+import { LocalMessage } from 'stream-chat';
+
 import { renderText, RenderTextParams } from './utils/renderText';
 
 import {
@@ -15,28 +17,22 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 
 import type { MarkdownStyle, Theme } from '../../../contexts/themeContext/utils/theme';
 import { useTranslatedMessage } from '../../../hooks/useTranslatedMessage';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-import type { MessageType } from '../../MessageList/hooks/useMessageList';
 
 const styles = StyleSheet.create({
   textContainer: { maxWidth: 250, paddingHorizontal: 16 },
 });
 
-export type MessageTextProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = MessageTextContainerProps<StreamChatGenerics> & {
-  renderText: (params: RenderTextParams<StreamChatGenerics>) => React.ReactNode | null;
+export type MessageTextProps = MessageTextContainerProps & {
+  renderText: (params: RenderTextParams) => React.ReactNode | null;
   theme: { theme: Theme };
 };
 
-export type MessageTextContainerPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+export type MessageTextContainerPropsWithContext = Pick<
+  MessageContextValue,
   'message' | 'onLongPress' | 'onlyEmojis' | 'onPress' | 'preventPress'
 > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     'markdownRules' | 'MessageText' | 'myMessageTheme' | 'messageTextNumberOfLines'
   > & {
     markdownStyles?: MarkdownStyle;
@@ -46,11 +42,7 @@ export type MessageTextContainerPropsWithContext<
     }>;
   };
 
-const MessageTextContainerWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageTextContainerPropsWithContext<StreamChatGenerics>,
-) => {
+const MessageTextContainerWithContext = (props: MessageTextContainerPropsWithContext) => {
   const theme = useTheme();
 
   const {
@@ -79,9 +71,7 @@ const MessageTextContainerWithContext = <
     },
   } = theme;
 
-  const translatedMessage = useTranslatedMessage<StreamChatGenerics>(
-    message,
-  ) as MessageType<StreamChatGenerics>;
+  const translatedMessage = useTranslatedMessage(message) as LocalMessage;
 
   if (!message.text) {
     return null;
@@ -97,7 +87,7 @@ const MessageTextContainerWithContext = <
       {MessageText ? (
         <MessageText {...props} renderText={renderText} theme={theme} />
       ) : (
-        renderText<StreamChatGenerics>({
+        renderText({
           colors,
           markdownRules,
           markdownStyles: {
@@ -117,9 +107,9 @@ const MessageTextContainerWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: MessageTextContainerPropsWithContext<StreamChatGenerics>,
-  nextProps: MessageTextContainerPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: MessageTextContainerPropsWithContext,
+  nextProps: MessageTextContainerPropsWithContext,
 ) => {
   const {
     markdownStyles: prevMarkdownStyles,
@@ -188,19 +178,12 @@ const MemoizedMessageTextContainer = React.memo(
   areEqual,
 ) as typeof MessageTextContainerWithContext;
 
-export type MessageTextContainerProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<MessageTextContainerPropsWithContext<StreamChatGenerics>>;
+export type MessageTextContainerProps = Partial<MessageTextContainerPropsWithContext>;
 
-export const MessageTextContainer = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: MessageTextContainerProps<StreamChatGenerics>,
-) => {
-  const { message, onLongPress, onlyEmojis, onPress, preventPress } =
-    useMessageContext<StreamChatGenerics>();
+export const MessageTextContainer = (props: MessageTextContainerProps) => {
+  const { message, onLongPress, onlyEmojis, onPress, preventPress } = useMessageContext();
   const { markdownRules, MessageText, messageTextNumberOfLines, myMessageTheme } =
-    useMessagesContext<StreamChatGenerics>();
+    useMessagesContext();
 
   return (
     <MemoizedMessageTextContainer

package/src/components/Message/MessageSimple/ReactionList/ReactionListBottom.tsx

@@ -14,7 +14,7 @@ import { useTheme } from '../../../../contexts/themeContext/ThemeContext';
 import { Unknown } from '../../../../icons/Unknown';
 
 import type { IconProps } from '../../../../icons/utils/base';
-import type { DefaultStreamChatGenerics } from '../../../../types/types';
+
 import type { ReactionData } from '../../../../utils/utils';
 import { ReactionSummary } from '../../hooks/useProcessReactions';
 
@@ -31,11 +31,9 @@ const Icon = ({ pathFill, size, style, supportedReactions, type }: Props) => {
   return <ReactionIcon height={size} pathFill={pathFill} style={style} width={size} />;
 };
 
-export type ReactionListBottomItemProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<
+export type ReactionListBottomItemProps = Partial<
   Pick<
-    MessageContextValue<StreamChatGenerics>,
+    MessageContextValue,
     | 'handleReaction'
     | 'onLongPress'
     | 'onPress'
@@ -44,15 +42,11 @@ export type ReactionListBottomItemProps<
     | 'showMessageOverlay'
   >
 > &
-  Partial<Pick<MessagesContextValue<StreamChatGenerics>, 'supportedReactions'>> & {
+  Partial<Pick<MessagesContextValue, 'supportedReactions'>> & {
     reaction: ReactionSummary;
   };
 
-export const ReactionListBottomItem = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ReactionListBottomItemProps<StreamChatGenerics>,
-) => {
+export const ReactionListBottomItem = (props: ReactionListBottomItemProps) => {
   const {
     handleReaction,
     onLongPress,
@@ -174,11 +168,9 @@ const renderItem = ({ index, item }: { index: number; item: ReactionListBottomIt
   />
 );
 
-export type ReactionListBottomProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<
+export type ReactionListBottomProps = Partial<
   Pick<
-    MessageContextValue<StreamChatGenerics>,
+    MessageContextValue,
     | 'handleReaction'
     | 'hasReactions'
     | 'onLongPress'
@@ -189,13 +181,9 @@ export type ReactionListBottomProps<
     | 'showMessageOverlay'
   >
 > &
-  Partial<Pick<MessagesContextValue<StreamChatGenerics>, 'supportedReactions'>>;
+  Partial<Pick<MessagesContextValue, 'supportedReactions'>>;
 
-export const ReactionListBottom = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ReactionListBottomProps<StreamChatGenerics>,
-) => {
+export const ReactionListBottom = (props: ReactionListBottomProps) => {
   const {
     handleReaction: propHandlerReaction,
     hasReactions: propHasReactions,
@@ -217,10 +205,9 @@ export const ReactionListBottom = <
     preventPress: contextPreventPress,
     reactions: contextReactions,
     showMessageOverlay: contextShowMessageOverlay,
-  } = useMessageContext<StreamChatGenerics>();
+  } = useMessageContext();
 
-  const { supportedReactions: contextSupportedReactions } =
-    useMessagesContext<StreamChatGenerics>();
+  const { supportedReactions: contextSupportedReactions } = useMessagesContext();
 
   const handleReaction = propHandlerReaction || contextHandleReaction;
   const hasReactions = propHasReactions || contextHasReactions;