stream-chat-react-native-core 6.6.7 → 7.0.0-rc.1

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

@@ -1,5 +1,4 @@
 import type { MessageResponse } from 'stream-chat';
 import type { MessageType } from '../components/MessageList/hooks/useMessageList';
-import type { DefaultStreamChatGenerics } from '../types/types';
-export declare const removeReservedFields: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>) => MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>;
+export declare const removeReservedFields: (message: MessageType | MessageResponse) => MessageType | MessageResponse;
 //# sourceMappingURL=removeReservedFields.d.ts.map

package/lib/typescript/utils/removeReservedFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeReservedFields.d.ts","sourceRoot":"","sources":["../../../src/utils/removeReservedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,eAAO,MAAM,oBAAoB,GAC/B,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,EAEhF,SAAS,WAAW,CAAC,kBAAkB,CAAC,GAAG,eAAe,CAAC,kBAAkB,CAAC,KAC7E,WAAW,CAAC,kBAAkB,CAAC,GAAG,eAAe,CAAC,kBAAkB,CAyBtE,CAAC"}
+{"version":3,"file":"removeReservedFields.d.ts","sourceRoot":"","sources":["../../../src/utils/removeReservedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAC;AAElF,eAAO,MAAM,oBAAoB,GAC/B,SAAS,WAAW,GAAG,eAAe,KACrC,WAAW,GAAG,eA0BhB,CAAC"}

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

@@ -4,7 +4,7 @@ import { IconProps } from '../../src/icons/utils/base';
 import { MessageType } from '../components/MessageList/hooks/useMessageList';
 import type { EmojiSearchIndex } from '../contexts/messageInputContext/MessageInputContext';
 import type { TableRowJoinedUser } from '../store/types';
-import type { DefaultStreamChatGenerics, ValueOf } from '../types/types';
+import type { ValueOf } from '../types/types';
 export type ReactionData = {
     Icon: React.ComponentType<IconProps>;
     type: string;
@@ -35,19 +35,19 @@ export declare const getIndicatorTypeForFileState: (fileState: FileStateValue, e
  * @param message
  * @returns boolean
  */
-export declare const isBlockedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics> | TableRowJoinedUser<"messages">) => boolean | "" | undefined;
+export declare const isBlockedMessage: (message: MessageType | TableRowJoinedUser<"messages">) => boolean | "" | undefined;
 /**
  *  Utility to check if the message is a Bounced message.
  * @param message
  * @returns boolean
  */
-export declare const isBouncedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics>) => boolean;
+export declare const isBouncedMessage: (message: MessageType) => boolean;
 /**
  * Utility to check if the message is a edited message.
  * @param message
  * @returns boolean
  */
-export declare const isEditedMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(message: MessageType<StreamChatGenerics>) => boolean;
+export declare const isEditedMessage: (message: MessageType) => boolean;
 /**
  * Default emoji search index for auto complete text input
  */
@@ -59,16 +59,16 @@ export declare const generateRandomId: (a?: string) => string;
 export declare const hasOnlyEmojis: (text: string) => boolean;
 /**
  * Stringifies a message object
- * @param {FormatMessageResponse<StreamChatGenerics>} message - the message object to be stringified
+ * @param {FormatMessageResponse} message - the message object to be stringified
  * @returns {string} The stringified message
  */
-export declare const stringifyMessage: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>({ deleted_at, i18n, latest_reactions, reaction_groups, readBy, reply_count, status, text, type, updated_at, }: MessageResponse<StreamChatGenerics> | FormatMessageResponse<StreamChatGenerics> | MessageType<StreamChatGenerics>) => string;
+export declare const stringifyMessage: (message: MessageResponse | FormatMessageResponse | MessageType) => string;
 /**
  * Reduces a list of messages to strings that are used in useEffect & useMemo
  * @param {messages} messages - the array of messages to be compared
  * @returns {string} The mapped message string
  */
-export declare const reduceMessagesToString: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(messages: FormatMessageResponse<StreamChatGenerics>[]) => string;
+export declare const reduceMessagesToString: (messages: FormatMessageResponse[]) => string;
 /**
  * Utility to get the file name from the path using regex.
  * `[^/]+` matches one or more characters that are not a slash (/), ensuring we capture the filename part.
@@ -96,16 +96,16 @@ export declare function escapeRegExp(text: string): string;
  * @param targetId
  * @returns number
  */
-export declare const findInMessagesById: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(messages: ChannelState<StreamChatGenerics>["messages"], targetId: string) => number;
+export declare const findInMessagesById: (messages: ChannelState["messages"], targetId: string) => number;
 /**
  * Utility to find the index of a message in the messages array by date.
  * @param messages
  * @param targetDate
  * @returns an object with the index and the message object
  */
-export declare const findInMessagesByDate: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(messages: MessageResponse<StreamChatGenerics>[] | ChannelState<StreamChatGenerics>["messages"], targetDate: Date) => {
+export declare const findInMessagesByDate: (messages: MessageResponse[] | ChannelState["messages"], targetDate: Date) => {
     index: number;
-    message: MessageResponse<StreamChatGenerics> | FormatMessageResponse<StreamChatGenerics>;
+    message: MessageResponse | FormatMessageResponse;
 } | {
     index: number;
     message?: undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAExF,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAEL,WAAW,EACZ,MAAM,gDAAgD,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAE5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;EASpB,CAAC;AAEH,eAAO,MAAM,sBAAsB,EAAE;IACnC,WAAW,EAAE,aAAa,CAAC;IAC3B,QAAQ,EAAE,UAAU,CAAC;IACrB,aAAa,EAAE,eAAe,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;CAMf,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;CAI9B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAExE,KAAK,QAAQ,GAAG,OAAO,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAGvD,eAAO,MAAM,4BAA4B,GACvC,WAAW,cAAc,EACzB,sBAAsB,OAAO,KAC5B,QAAQ,GAAG,IAeb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,GAAG,kBAAkB,CAAC,UAAU,CAAC,6BAIrF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,YAGX,CAAC;AAE3C;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,SAAS,WAAW,YAAsC,CAAC;AAE3F;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,gBAqCrC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,KAAK,MAAM,WACO,CAAC;AAE1D,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,uBAW/C,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,YAA8B,CAAC;AAErE,eAAO,MAAM,gBAAgB,GAAI,UAAM,KAAG,MAIqC,CAAC;AAKhF,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,YAazC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAC3B,SAAS,eAAe,GAAG,qBAAqB,GAAG,WAAW,KAC7D,MAyBF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,UAAU,qBAAqB,EAAE,KAAG,MACpC,CAAC;AAExC;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,WAI/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,GAAI,UAAU,MAAM,WAY5D,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,YAAY,CAAC,UAAU,CAAC,EAAE,UAAU,MAAM,WAGtF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,UAAU,eAAe,EAAE,GAAG,YAAY,CAAC,UAAU,CAAC,EACtD,YAAY,IAAI;;;;;;CAgCjB,CAAC"}

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": "6.6.7",
+  "version": "7.0.0-rc.1",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -77,7 +77,7 @@
     "path": "0.12.7",
     "react-native-markdown-package": "1.8.2",
     "react-native-url-polyfill": "^1.3.0",
-    "stream-chat": "^8.57.6",
+    "stream-chat": "9.0.0-rc.4",
     "use-sync-external-store": "^1.4.0"
   },
   "peerDependencies": {

package/src/components/AITypingIndicatorView/AITypingIndicatorView.tsx

@@ -7,21 +7,16 @@ import { Channel } from 'stream-chat';
 import { AIStates, useAIState } from './hooks/useAIState';
 
 import { useChannelContext, useTheme, useTranslationContext } from '../../contexts';
-import type { DefaultStreamChatGenerics } from '../../types/types';
 
-export type AITypingIndicatorViewProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  channel?: Channel<StreamChatGenerics>;
+export type AITypingIndicatorViewProps = {
+  channel?: Channel;
 };
 
-export const AITypingIndicatorView = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const AITypingIndicatorView = ({
   channel: channelFromProps,
-}: AITypingIndicatorViewProps<StreamChatGenerics>) => {
+}: AITypingIndicatorViewProps) => {
   const { t } = useTranslationContext();
-  const { channel: channelFromContext } = useChannelContext<StreamChatGenerics>();
+  const { channel: channelFromContext } = useChannelContext();
   const channel = channelFromProps || channelFromContext;
   const { aiState } = useAIState(channel);
   const allowedStates = {

package/src/components/AITypingIndicatorView/hooks/useAIState.ts

@@ -3,7 +3,6 @@ import { useEffect, useState } from 'react';
 import { AIState, Channel, Event } from 'stream-chat';
 
 import { useChatContext } from '../../../contexts';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 
 export const AIStates = {
   Error: 'AI_STATE_ERROR',
@@ -18,12 +17,8 @@ export const AIStates = {
  * @param {Channel} channel - The channel for which we want to know the AI state.
  * @returns {{ aiState: AIState }} The current AI state for the given channel.
  */
-export const useAIState = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel?: Channel<StreamChatGenerics>,
-): { aiState: AIState } => {
-  const { isOnline } = useChatContext<StreamChatGenerics>();
+export const useAIState = (channel?: Channel): { aiState: AIState } => {
+  const { isOnline } = useChatContext();
 
   const [aiState, setAiState] = useState<AIState>(AIStates.Idle);
 
@@ -38,16 +33,13 @@ export const useAIState = <
       return;
     }
 
-    const indicatorChangedListener = channel.on(
-      'ai_indicator.update',
-      (event: Event<StreamChatGenerics>) => {
-        const { cid } = event;
-        const state = event.ai_state as AIState;
-        if (channel.cid === cid) {
-          setAiState(state);
-        }
-      },
-    );
+    const indicatorChangedListener = channel.on('ai_indicator.update', (event: Event) => {
+      const { cid } = event;
+      const state = event.ai_state as AIState;
+      if (channel.cid === cid) {
+        setAiState(state);
+      }
+    });
 
     const indicatorClearedListener = channel.on('ai_indicator.clear', (event) => {
       const { cid } = event;

package/src/components/Attachment/Attachment.tsx

@@ -13,14 +13,12 @@ import {
 } from '../../contexts/messagesContext/MessagesContext';
 import { isVideoPlayerAvailable } from '../../native';
 
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 
 export type ActionHandler = (name: string, value: string) => void;
 
-export type AttachmentPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessagesContextValue<StreamChatGenerics>,
+export type AttachmentPropsWithContext = Pick<
+  MessagesContextValue,
   | 'AttachmentActions'
   | 'Card'
   | 'FileAttachment'
@@ -34,14 +32,10 @@ export type AttachmentPropsWithContext<
   /**
    * The attachment to render
    */
-  attachment: AttachmentType<StreamChatGenerics>;
+  attachment: AttachmentType;
 };
 
-const AttachmentWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: AttachmentPropsWithContext<StreamChatGenerics>,
-) => {
+const AttachmentWithContext = (props: AttachmentPropsWithContext) => {
   const {
     attachment,
     AttachmentActions,
@@ -68,7 +62,7 @@ const AttachmentWithContext = <
       <>
         <Gallery images={[attachment]} />
         {hasAttachmentActions && (
-          <AttachmentActions key={`key-actions-${attachment.id}`} {...attachment} />
+          <AttachmentActions key={`key-actions-${attachment.image_url}`} {...attachment} />
         )}
       </>
     );
@@ -79,7 +73,7 @@ const AttachmentWithContext = <
       <>
         <Gallery videos={[attachment]} />
         {hasAttachmentActions && (
-          <AttachmentActions key={`key-actions-${attachment.id}`} {...attachment} />
+          <AttachmentActions key={`key-actions-${attachment.thumb_url}`} {...attachment} />
         )}
       </>
     ) : (
@@ -99,7 +93,8 @@ const AttachmentWithContext = <
     return (
       <>
         <Card {...attachment} />
-        <AttachmentActions key={`key-actions-${attachment.id}`} {...attachment} />
+        {/** TODO: Please rethink this, the fix is temporary. */}
+        <AttachmentActions key={`key-actions-${attachment.image_url}`} {...attachment} />
       </>
     );
   } else {
@@ -107,10 +102,7 @@ const AttachmentWithContext = <
   }
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: AttachmentPropsWithContext<StreamChatGenerics>,
-  nextProps: AttachmentPropsWithContext<StreamChatGenerics>,
-) => {
+const areEqual = (prevProps: AttachmentPropsWithContext, nextProps: AttachmentPropsWithContext) => {
   const {
     attachment: prevAttachment,
     isAttachmentEqual,
@@ -145,11 +137,9 @@ const MemoizedAttachment = React.memo(
   areEqual,
 ) as typeof AttachmentWithContext;
 
-export type AttachmentProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<
+export type AttachmentProps = Partial<
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'AttachmentActions'
     | 'Card'
     | 'FileAttachment'
@@ -161,16 +151,12 @@ export type AttachmentProps<
     | 'isAttachmentEqual'
   >
 > &
-  Pick<AttachmentPropsWithContext<StreamChatGenerics>, 'attachment'>;
+  Pick<AttachmentPropsWithContext, 'attachment'>;
 
 /**
  * Attachment - The message attachment
  */
-export const Attachment = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: AttachmentProps<StreamChatGenerics>,
-) => {
+export const Attachment = (props: AttachmentProps) => {
   const {
     attachment,
     AttachmentActions: PropAttachmentActions,
@@ -193,7 +179,7 @@ export const Attachment = <
     isAttachmentEqual,
     myMessageTheme: ContextMyMessageTheme,
     UrlPreview: ContextUrlPreview,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
 
   if (!attachment) {
     return null;

package/src/components/Attachment/AttachmentActions.tsx

@@ -17,8 +17,6 @@ import {
 } from '../../contexts/messageContext/MessageContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const styles = StyleSheet.create({
   actionButton: {
     borderRadius: 20,
@@ -33,10 +31,8 @@ const styles = StyleSheet.create({
   },
 });
 
-export type AttachmentActionsPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<Attachment<StreamChatGenerics>, 'actions'> &
-  Pick<MessageContextValue<StreamChatGenerics>, 'handleAction'> & {
+export type AttachmentActionsPropsWithContext = Pick<Attachment, 'actions'> &
+  Pick<MessageContextValue, 'handleAction'> & {
     styles?: Partial<{
       actionButton: StyleProp<ViewStyle>;
       buttonText: StyleProp<TextStyle>;
@@ -44,11 +40,7 @@ export type AttachmentActionsPropsWithContext<
     }>;
   };
 
-const AttachmentActionsWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: AttachmentActionsPropsWithContext<StreamChatGenerics>,
-) => {
+const AttachmentActionsWithContext = (props: AttachmentActionsPropsWithContext) => {
   const { actions, handleAction, styles: stylesProp = {} } = props;
 
   const {
@@ -116,9 +108,9 @@ const AttachmentActionsWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: AttachmentActionsPropsWithContext<StreamChatGenerics>,
-  nextProps: AttachmentActionsPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: AttachmentActionsPropsWithContext,
+  nextProps: AttachmentActionsPropsWithContext,
 ) => {
   const { actions: prevActions } = prevProps;
   const { actions: nextActions } = nextProps;
@@ -133,21 +125,15 @@ const MemoizedAttachmentActions = React.memo(
   areEqual,
 ) as typeof AttachmentActionsWithContext;
 
-export type AttachmentActionsProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Attachment<StreamChatGenerics> &
-  Partial<Pick<MessageContextValue<StreamChatGenerics>, 'handleAction'>>;
+export type AttachmentActionsProps = Attachment &
+  Partial<Pick<MessageContextValue, 'handleAction'>>;
 
 /**
  * AttachmentActions - The actions you can take on an attachment.
  * Actions in combination with attachments can be used to build [commands](https://getstream.io/chat/docs/#channel_commands).
  */
-export const AttachmentActions = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: AttachmentActionsProps<StreamChatGenerics>,
-) => {
-  const { handleAction } = useMessageContext<StreamChatGenerics>();
+export const AttachmentActions = (props: AttachmentActionsProps) => {
+  const { handleAction } = useMessageContext();
   return <MemoizedAttachmentActions {...{ handleAction }} {...props} />;
 };
 

package/src/components/Attachment/Card.tsx

@@ -27,7 +27,7 @@ import {
 } from '../../contexts/messagesContext/MessagesContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { Play } from '../../icons/Play';
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 import { makeImageCompatibleUrl } from '../../utils/utils';
 import { ImageBackground } from '../UIComponents/ImageBackground';
 
@@ -82,16 +82,11 @@ const styles = StyleSheet.create({
   },
 });
 
-export type CardPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Attachment<StreamChatGenerics> &
+export type CardPropsWithContext = Attachment &
   Pick<ChatContextValue, 'ImageComponent'> &
+  Pick<MessageContextValue, 'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'> &
   Pick<
-    MessageContextValue<StreamChatGenerics>,
-    'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
-  > &
-  Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     'additionalPressableProps' | 'CardCover' | 'CardFooter' | 'CardHeader' | 'myMessageTheme'
   > & {
     channelId: string | undefined;
@@ -110,11 +105,7 @@ export type CardPropsWithContext<
     }>;
   };
 
-const CardWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: CardPropsWithContext<StreamChatGenerics>,
-) => {
+const CardWithContext = (props: CardPropsWithContext) => {
   const {
     additionalPressableProps,
     author_name,
@@ -289,10 +280,7 @@ const CardWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: CardPropsWithContext<StreamChatGenerics>,
-  nextProps: CardPropsWithContext<StreamChatGenerics>,
-) => {
+const areEqual = (prevProps: CardPropsWithContext, nextProps: CardPropsWithContext) => {
   const { myMessageTheme: prevMyMessageTheme } = prevProps;
   const { myMessageTheme: nextMyMessageTheme } = nextProps;
 
@@ -307,17 +295,12 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 
 const MemoizedCard = React.memo(CardWithContext, areEqual) as typeof CardWithContext;
 
-export type CardProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Attachment<StreamChatGenerics> &
+export type CardProps = Attachment &
   Partial<
-    Pick<ChatContextValue<StreamChatGenerics>, 'ImageComponent'> &
-      Pick<
-        MessageContextValue<StreamChatGenerics>,
-        'onLongPress' | 'onPress' | 'onPressIn' | 'myMessageTheme'
-      > &
+    Pick<ChatContextValue, 'ImageComponent'> &
+      Pick<MessageContextValue, 'onLongPress' | 'onPress' | 'onPressIn' | 'myMessageTheme'> &
       Pick<
-        MessagesContextValue<StreamChatGenerics>,
+        MessagesContextValue,
         'additionalPressableProps' | 'CardCover' | 'CardFooter' | 'CardHeader'
       >
   >;
@@ -325,16 +308,11 @@ export type CardProps<
 /**
  * UI component for card in attachments.
  */
-export const Card = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: CardProps<StreamChatGenerics>,
-) => {
-  const { ImageComponent } = useChatContext<StreamChatGenerics>();
-  const { message, onLongPress, onPress, onPressIn, preventPress } =
-    useMessageContext<StreamChatGenerics>();
+export const Card = (props: CardProps) => {
+  const { ImageComponent } = useChatContext();
+  const { message, onLongPress, onPress, onPressIn, preventPress } = useMessageContext();
   const { additionalPressableProps, CardCover, CardFooter, CardHeader, myMessageTheme } =
-    useMessagesContext<StreamChatGenerics>();
+    useMessagesContext();
 
   return (
     <MemoizedCard

package/src/components/Attachment/FileAttachment.tsx

@@ -17,7 +17,6 @@ import {
 } from '../../contexts/messagesContext/MessagesContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useViewport } from '../../hooks/useViewport';
-import type { DefaultStreamChatGenerics } from '../../types/types';
 
 const styles = StyleSheet.create({
   container: {
@@ -38,18 +37,16 @@ const styles = StyleSheet.create({
   },
 });
 
-export type FileAttachmentPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<
-  MessageContextValue<StreamChatGenerics>,
+export type FileAttachmentPropsWithContext = Pick<
+  MessageContextValue,
   'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
 > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     'additionalPressableProps' | 'AttachmentActions' | 'FileAttachmentIcon'
   > & {
     /** The attachment to render */
-    attachment: Attachment<StreamChatGenerics>;
+    attachment: Attachment;
     attachmentSize?: number;
     styles?: Partial<{
       container: StyleProp<ViewStyle>;
@@ -59,11 +56,7 @@ export type FileAttachmentPropsWithContext<
     }>;
   };
 
-const FileAttachmentWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: FileAttachmentPropsWithContext<StreamChatGenerics>,
-) => {
+const FileAttachmentWithContext = (props: FileAttachmentPropsWithContext) => {
   const {
     additionalPressableProps,
     attachment,
@@ -149,22 +142,16 @@ const FileAttachmentWithContext = <
   );
 };
 
-export type FileAttachmentProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Omit<FileAttachmentPropsWithContext<StreamChatGenerics>, 'attachment'>> &
-  Pick<FileAttachmentPropsWithContext<StreamChatGenerics>, 'attachment'>;
-
-export const FileAttachment = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: FileAttachmentProps<StreamChatGenerics>,
-) => {
-  const { onLongPress, onPress, onPressIn, preventPress } = useMessageContext<StreamChatGenerics>();
+export type FileAttachmentProps = Partial<Omit<FileAttachmentPropsWithContext, 'attachment'>> &
+  Pick<FileAttachmentPropsWithContext, 'attachment'>;
+
+export const FileAttachment = (props: FileAttachmentProps) => {
+  const { onLongPress, onPress, onPressIn, preventPress } = useMessageContext();
   const {
     additionalPressableProps,
     AttachmentActions = AttachmentActionsDefault,
     FileAttachmentIcon = FileIconDefault,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
 
   return (
     <FileAttachmentWithContext

package/src/components/Attachment/FileAttachmentGroup.tsx

@@ -17,12 +17,10 @@ import {
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { isSoundPackageAvailable } from '../../native';
 
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 
-export type FileAttachmentGroupPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<MessageContextValue<StreamChatGenerics>, 'files'> &
-  Pick<MessagesContextValue<StreamChatGenerics>, 'Attachment' | 'AudioAttachment'> & {
+export type FileAttachmentGroupPropsWithContext = Pick<MessageContextValue, 'files'> &
+  Pick<MessagesContextValue, 'Attachment' | 'AudioAttachment'> & {
     /**
      * The unique id for the message with file attachments
      */
@@ -33,19 +31,13 @@ export type FileAttachmentGroupPropsWithContext<
     }>;
   };
 
-type FilesToDisplayType<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Attachment<StreamChatGenerics> & {
+type FilesToDisplayType = Attachment & {
   duration: number;
   paused: boolean;
   progress: number;
 };
 
-const FileAttachmentGroupWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: FileAttachmentGroupPropsWithContext<StreamChatGenerics>,
-) => {
+const FileAttachmentGroupWithContext = (props: FileAttachmentGroupPropsWithContext) => {
   const { Attachment, AudioAttachment, files, messageId, styles: stylesProp = {} } = props;
   const [filesToDisplay, setFilesToDisplay] = useState<FilesToDisplayType[]>([]);
 
@@ -108,7 +100,7 @@ const FileAttachmentGroupWithContext = <
     <View style={[styles.container, container, stylesProp.container]}>
       {filesToDisplay.map((file, index) => (
         <View
-          key={`${messageId}-${index}`}
+          key={`file-by-attachment-group-${messageId}-${index}`}
           style={[
             { paddingBottom: index !== files.length - 1 ? 4 : 0 },
             stylesProp.attachmentContainer,
@@ -144,9 +136,9 @@ const FileAttachmentGroupWithContext = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: FileAttachmentGroupPropsWithContext<StreamChatGenerics>,
-  nextProps: FileAttachmentGroupPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: FileAttachmentGroupPropsWithContext,
+  nextProps: FileAttachmentGroupPropsWithContext,
 ) => {
   const { files: prevFiles } = prevProps;
   const { files: nextFiles } = nextProps;
@@ -159,22 +151,17 @@ const MemoizedFileAttachmentGroup = React.memo(
   areEqual,
 ) as typeof FileAttachmentGroupWithContext;
 
-export type FileAttachmentGroupProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<Omit<FileAttachmentGroupPropsWithContext<StreamChatGenerics>, 'messageId'>> &
-  Pick<FileAttachmentGroupPropsWithContext<StreamChatGenerics>, 'messageId'>;
+export type FileAttachmentGroupProps = Partial<
+  Omit<FileAttachmentGroupPropsWithContext, 'messageId'>
+> &
+  Pick<FileAttachmentGroupPropsWithContext, 'messageId'>;
 
-export const FileAttachmentGroup = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: FileAttachmentGroupProps<StreamChatGenerics>,
-) => {
+export const FileAttachmentGroup = (props: FileAttachmentGroupProps) => {
   const { files: propFiles, messageId } = props;
 
-  const { files: contextFiles } = useMessageContext<StreamChatGenerics>();
+  const { files: contextFiles } = useMessageContext();
 
-  const { Attachment = AttachmentDefault, AudioAttachment } =
-    useMessagesContext<StreamChatGenerics>();
+  const { Attachment = AttachmentDefault, AudioAttachment } = useMessagesContext();
 
   const files = propFiles || contextFiles;