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

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/AudioAttachment.tsx

@@ -15,7 +15,7 @@ import {
   VideoProgressData,
   VideoSeekResponse,
 } from '../../native';
-import { FileTypes, type FileUpload } from '../../types/types';
+import { AudioUpload, FileTypes } from '../../types/types';
 import { getTrimmedAttachmentTitle } from '../../utils/getTrimmedAttachmentTitle';
 import { ProgressControl } from '../ProgressControl/ProgressControl';
 import { WaveProgressBar } from '../ProgressControl/WaveProgressBar';
@@ -23,7 +23,7 @@ import { WaveProgressBar } from '../ProgressControl/WaveProgressBar';
 dayjs.extend(duration);
 
 export type AudioAttachmentProps = {
-  item: Omit<FileUpload, 'state'>;
+  item: Omit<AudioUpload, 'state'>;
   onLoad: (index: string, duration: number) => void;
   onPlayPause: (index: string, pausedStatus?: boolean) => void;
   onProgress: (index: string, progress: number) => void;

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,
@@ -122,7 +114,9 @@ const FileAttachmentGroupWithContext = <
                 duration: file.duration,
                 file: {
                   name: file.title as string,
-                  uri: file.asset_url,
+                  size: file.file_size || 0,
+                  type: file.mime_type || '',
+                  uri: file.asset_url || '',
                   waveform_data: file.waveform_data,
                 },
                 id: index.toString(),
@@ -144,9 +138,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 +153,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;
 

package/src/components/Attachment/Gallery.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { Pressable, StyleSheet, Text, View } from 'react-native';
 
-import type { Attachment } from 'stream-chat';
+import type { Attachment, LocalMessage } from 'stream-chat';
 
 import { GalleryImage } from './GalleryImage';
 import { buildGallery } from './utils/buildGallery/buildGallery';
@@ -11,7 +11,6 @@ import { getGalleryImageBorderRadius } from './utils/getGalleryImageBorderRadius
 
 import { openUrlSafely } from './utils/openUrlSafely';
 
-import type { MessageType } from '../../components/MessageList/hooks/useMessageList';
 import { useTranslationContext } from '../../contexts';
 import { useChatConfigContext } from '../../contexts/chatConfigContext/ChatConfigContext';
 import {
@@ -33,14 +32,15 @@ import {
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useLoadingImage } from '../../hooks/useLoadingImage';
 import { isVideoPlayerAvailable } from '../../native';
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 import { getUrlWithoutParams } from '../../utils/utils';
 
-export type GalleryPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setSelectedMessage' | 'setMessages'> &
+export type GalleryPropsWithContext = Pick<
+  ImageGalleryContextValue,
+  'setSelectedMessage' | 'setMessages'
+> &
   Pick<
-    MessageContextValue<StreamChatGenerics>,
+    MessageContextValue,
     | 'alignment'
     | 'groupStyles'
     | 'images'
@@ -52,7 +52,7 @@ export type GalleryPropsWithContext<
     | 'threadList'
   > &
   Pick<
-    MessagesContextValue<StreamChatGenerics>,
+    MessagesContextValue,
     | 'additionalPressableProps'
     | 'legacyImageViewerSwipeBehaviour'
     | 'VideoThumbnail'
@@ -76,14 +76,10 @@ export type GalleryPropsWithContext<
      *
      * TODO: Fix circular dependencies of imports
      */
-    message?: MessageType<StreamChatGenerics>;
+    message?: LocalMessage;
   };
 
-const GalleryWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GalleryPropsWithContext<StreamChatGenerics>,
-) => {
+const GalleryWithContext = (props: GalleryPropsWithContext) => {
   const {
     additionalPressableProps,
     alignment,
@@ -237,9 +233,7 @@ const GalleryWithContext = <
   );
 };
 
-type GalleryThumbnailProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+type GalleryThumbnailProps = {
   borderRadius: {
     borderBottomLeftRadius: number;
     borderBottomRightRadius: number;
@@ -247,15 +241,15 @@ type GalleryThumbnailProps<
     borderTopRightRadius: number;
   };
   colIndex: number;
-  imagesAndVideos: Attachment<StreamChatGenerics>[];
+  imagesAndVideos: Attachment[];
   invertedDirections: boolean;
-  message: MessageType<StreamChatGenerics>;
+  message: LocalMessage;
   numOfColumns: number;
   numOfRows: number;
   rowIndex: number;
   thumbnail: Thumbnail;
 } & Pick<
-  MessagesContextValue<StreamChatGenerics>,
+  MessagesContextValue,
   | 'additionalPressableProps'
   | 'legacyImageViewerSwipeBehaviour'
   | 'VideoThumbnail'
@@ -263,16 +257,11 @@ type GalleryThumbnailProps<
   | 'ImageLoadingFailedIndicator'
   | 'ImageReloadIndicator'
 > &
-  Pick<ImageGalleryContextValue<StreamChatGenerics>, 'setSelectedMessage' | 'setMessages'> &
-  Pick<
-    MessageContextValue<StreamChatGenerics>,
-    'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
-  > &
+  Pick<ImageGalleryContextValue, 'setSelectedMessage' | 'setMessages'> &
+  Pick<MessageContextValue, 'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'> &
   Pick<OverlayContextValue, 'setOverlay'>;
 
-const GalleryThumbnail = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+const GalleryThumbnail = ({
   additionalPressableProps,
   borderRadius,
   colIndex,
@@ -295,7 +284,7 @@ const GalleryThumbnail = <
   setSelectedMessage,
   thumbnail,
   VideoThumbnail,
-}: GalleryThumbnailProps<StreamChatGenerics>) => {
+}: GalleryThumbnailProps) => {
   const {
     theme: {
       colors: { overlay },
@@ -426,16 +415,14 @@ const GalleryThumbnail = <
   );
 };
 
-const GalleryImageThumbnail = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+const GalleryImageThumbnail = ({
   borderRadius,
   ImageLoadingFailedIndicator,
   ImageLoadingIndicator,
   ImageReloadIndicator,
   thumbnail,
 }: Pick<
-  GalleryThumbnailProps<StreamChatGenerics>,
+  GalleryThumbnailProps,
   | 'ImageLoadingFailedIndicator'
   | 'ImageLoadingIndicator'
   | 'ImageReloadIndicator'
@@ -506,10 +493,7 @@ const GalleryImageThumbnail = <
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: GalleryPropsWithContext<StreamChatGenerics>,
-  nextProps: GalleryPropsWithContext<StreamChatGenerics>,
-) => {
+const areEqual = (prevProps: GalleryPropsWithContext, nextProps: GalleryPropsWithContext) => {
   const {
     groupStyles: prevGroupStyles,
     hasThreadReplies: prevHasThreadReplies,
@@ -578,18 +562,12 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
 
 const MemoizedGallery = React.memo(GalleryWithContext, areEqual) as typeof GalleryWithContext;
 
-export type GalleryProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Partial<GalleryPropsWithContext<StreamChatGenerics>>;
+export type GalleryProps = Partial<GalleryPropsWithContext>;
 
 /**
  * UI component for card in attachments.
  */
-export const Gallery = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: GalleryProps<StreamChatGenerics>,
-) => {
+export const Gallery = (props: GalleryProps) => {
   const {
     additionalPressableProps: propAdditionalPressableProps,
     alignment: propAlignment,
@@ -612,8 +590,7 @@ export const Gallery = <
     VideoThumbnail: PropVideoThumbnail,
   } = props;
 
-  const { setMessages, setSelectedMessage: contextSetSelectedMessage } =
-    useImageGalleryContext<StreamChatGenerics>();
+  const { setMessages, setSelectedMessage: contextSetSelectedMessage } = useImageGalleryContext();
   const {
     alignment: contextAlignment,
     groupStyles: contextGroupStyles,
@@ -625,7 +602,7 @@ export const Gallery = <
     preventPress: contextPreventPress,
     threadList: contextThreadList,
     videos: contextVideos,
-  } = useMessageContext<StreamChatGenerics>();
+  } = useMessageContext();
   const {
     additionalPressableProps: contextAdditionalPressableProps,
     ImageLoadingFailedIndicator: ContextImageLoadingFailedIndicator,
@@ -634,7 +611,7 @@ export const Gallery = <
     legacyImageViewerSwipeBehaviour,
     myMessageTheme: contextMyMessageTheme,
     VideoThumbnail: ContextVideoThumnbnail,
-  } = useMessagesContext<StreamChatGenerics>();
+  } = useMessagesContext();
   const { setOverlay: contextSetOverlay } = useOverlayContext();
 
   const images = propImages || contextImages;