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

package/src/components/Chat/hooks/handleEventToSyncDB.ts

@@ -14,15 +14,8 @@ import { upsertReads } from '../../../store/apis/upsertReads';
 import { createSelectQuery } from '../../../store/sqlite-utils/createSelectQuery';
 import { SqliteClient } from '../../../store/SqliteClient';
 import { PreparedQueries } from '../../../store/types';
-import { DefaultStreamChatGenerics } from '../../../types/types';
 
-export const handleEventToSyncDB = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  event: Event,
-  client: StreamChat<StreamChatGenerics>,
-  flush?: boolean,
-) => {
+export const handleEventToSyncDB = async (event: Event, client: StreamChat, flush?: boolean) => {
   const { type } = event;
 
   // This function is used to guard the queries that require channel to be present in the db first

package/src/components/Chat/hooks/useAppSettings.ts

@@ -4,12 +4,9 @@ import type { AppSettingsAPIResponse, StreamChat } from 'stream-chat';
 
 import { useIsMountedRef } from '../../../hooks/useIsMountedRef';
 import * as dbApi from '../../../store/apis';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 
-export const useAppSettings = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  client: StreamChat<StreamChatGenerics>,
+export const useAppSettings = (
+  client: StreamChat,
   isOnline: boolean | null,
   enableOfflineSupport: boolean,
   initialisedDatabase: boolean,

package/src/components/Chat/hooks/useCreateChatClient.ts

@@ -3,8 +3,6 @@ import { useEffect, useState } from 'react';
 import { StreamChat } from 'stream-chat';
 
 import type {
-  DefaultGenerics,
-  ExtendableGenerics,
   OwnUserResponse,
   StreamChatOptions,
   TokenOrProvider,
@@ -14,7 +12,7 @@ import type {
 /**
  * React hook to create, connect and return `StreamChat` client.
  */
-export const useCreateChatClient = <SCG extends ExtendableGenerics = DefaultGenerics>({
+export const useCreateChatClient = ({
   apiKey,
   options,
   tokenOrProvider,
@@ -22,10 +20,10 @@ export const useCreateChatClient = <SCG extends ExtendableGenerics = DefaultGene
 }: {
   apiKey: string;
   tokenOrProvider: TokenOrProvider;
-  userData: OwnUserResponse<SCG> | UserResponse<SCG>;
+  userData: OwnUserResponse | UserResponse;
   options?: StreamChatOptions;
 }) => {
-  const [chatClient, setChatClient] = useState<StreamChat<SCG> | null>(null);
+  const [chatClient, setChatClient] = useState<StreamChat | null>(null);
   const [cachedUserData, setCachedUserData] = useState(userData);
 
   if (userData.id !== cachedUserData.id) {
@@ -35,7 +33,7 @@ export const useCreateChatClient = <SCG extends ExtendableGenerics = DefaultGene
   const [cachedOptions] = useState(options);
 
   useEffect(() => {
-    const client = new StreamChat<SCG>(apiKey, undefined, cachedOptions);
+    const client = new StreamChat(apiKey, undefined, cachedOptions);
     let didUserConnectInterrupt = false;
 
     const connectionPromise = client.connectUser(cachedUserData, tokenOrProvider).then(() => {

package/src/components/Chat/hooks/useCreateChatContext.ts

@@ -1,11 +1,8 @@
 import { useMemo } from 'react';
 
 import type { ChatContextValue } from '../../../contexts/chatContext/ChatContext';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 
-export const useCreateChatContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const useCreateChatContext = ({
   appSettings,
   channel,
   client,
@@ -16,7 +13,7 @@ export const useCreateChatContext = <
   isOnline,
   mutedUsers,
   setActiveChannel,
-}: ChatContextValue<StreamChatGenerics>) => {
+}: ChatContextValue) => {
   const channelId = channel?.id;
   const clientValues = client
     ? `${client.clientID}${Object.keys(client.activeChannels).length}${
@@ -25,7 +22,7 @@ export const useCreateChatContext = <
     : 'Offline';
   const mutedUsersLength = mutedUsers.length;
 
-  const chatContext: ChatContextValue<StreamChatGenerics> = useMemo(
+  const chatContext: ChatContextValue = useMemo(
     () => ({
       appSettings,
       channel,

package/src/components/Chat/hooks/useIsOnline.ts

@@ -7,20 +7,13 @@ import type { StreamChat, Event as StreamEvent } from 'stream-chat';
 import { useAppStateListener } from '../../../hooks/useAppStateListener';
 import { useIsMountedRef } from '../../../hooks/useIsMountedRef';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
 /**
  * Disconnect the websocket connection when app goes to background,
  * and reconnect when app comes to foreground.
  * We do this to make sure the user receives push notifications when app is in the background.
  * You can't receive push notification until you have active websocket connection.
  */
-export const useIsOnline = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  client: StreamChat<StreamChatGenerics>,
-  closeConnectionOnBackground = true,
-) => {
+export const useIsOnline = (client: StreamChat, closeConnectionOnBackground = true) => {
   const [isOnline, setIsOnline] = useState<boolean | null>(null);
   const [connectionRecovering, setConnectionRecovering] = useState(false);
   const isMounted = useIsMountedRef();
@@ -47,7 +40,7 @@ export const useIsOnline = <
   useAppStateListener(onForeground, onBackground);
 
   useEffect(() => {
-    const handleChangedEvent = (event: StreamEvent<StreamChatGenerics>) => {
+    const handleChangedEvent = (event: StreamEvent) => {
       setConnectionRecovering(!event.online);
       setIsOnline(event.online || false);
     };

package/src/components/Chat/hooks/useMutedUsers.ts

@@ -2,19 +2,11 @@ import { useEffect, useState } from 'react';
 
 import type { Event, Mute, StreamChat } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
-export const useMutedUsers = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  client: StreamChat<StreamChatGenerics>,
-) => {
-  const [mutedUsers, setMutedUsers] = useState<Mute<StreamChatGenerics>[]>(
-    client?.mutedUsers || [],
-  );
+export const useMutedUsers = (client: StreamChat) => {
+  const [mutedUsers, setMutedUsers] = useState<Mute[]>(client?.mutedUsers || []);
 
   useEffect(() => {
-    const handleEvent = (event: Event<StreamChatGenerics>) => {
+    const handleEvent = (event: Event) => {
       setMutedUsers((mutes) => event.me?.mutes || mutes || []);
     };
 

package/src/components/Chat/hooks/useSyncDatabase.ts

@@ -4,20 +4,12 @@ import type { StreamChat } from 'stream-chat';
 
 import { handleEventToSyncDB } from './handleEventToSyncDB';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
-type Params<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> = {
-  client: StreamChat<StreamChatGenerics>;
+type Params = {
+  client: StreamChat;
   enableOfflineSupport: boolean;
   initialisedDatabase: boolean;
 };
-export const useSyncDatabase = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
-  client,
-  enableOfflineSupport,
-  initialisedDatabase,
-}: Params<StreamChatGenerics>) => {
+export const useSyncDatabase = ({ client, enableOfflineSupport, initialisedDatabase }: Params) => {
   useEffect(() => {
     let listener: ReturnType<StreamChat['on']> | undefined;
 

package/src/components/ImageGallery/ImageGallery.tsx

@@ -42,7 +42,7 @@ import { OverlayProviderProps } from '../../contexts/overlayContext/OverlayConte
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useViewport } from '../../hooks/useViewport';
 import { isVideoPlayerAvailable, VideoType } from '../../native';
-import { DefaultStreamChatGenerics, FileTypes } from '../../types/types';
+import { FileTypes } from '../../types/types';
 import { getResizedImageUrl } from '../../utils/getResizedImageUrl';
 import { getUrlOfImageAttachment } from '../../utils/getUrlOfImageAttachment';
 import { getGiphyMimeType } from '../Attachment/utils/getGiphyMimeType';
@@ -64,9 +64,7 @@ export enum IsSwiping {
   FALSE,
 }
 
-export type ImageGalleryCustomComponents<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type ImageGalleryCustomComponents = {
   /**
    * Override props for following UI components, which are part of [image gallery](https://github.com/GetStream/stream-chat-react-native/wiki/Cookbook-v3.0#gallery-components).
    *
@@ -99,30 +97,25 @@ export type ImageGalleryCustomComponents<
    * @overrideType object
    */
   imageGalleryCustomComponents?: {
-    footer?: ImageGalleryFooterCustomComponentProps<StreamChatGenerics>;
-    grid?: ImageGalleryGridImageComponents<StreamChatGenerics>;
+    footer?: ImageGalleryFooterCustomComponentProps;
+    grid?: ImageGalleryGridImageComponents;
     gridHandle?: ImageGalleryGridHandleCustomComponentProps;
-    header?: ImageGalleryHeaderCustomComponentProps<StreamChatGenerics>;
+    header?: ImageGalleryHeaderCustomComponentProps;
   };
 };
 
-type Props<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =
-  ImageGalleryCustomComponents<StreamChatGenerics> & {
-    overlayOpacity: SharedValue<number>;
-  } & Pick<
-      OverlayProviderProps<StreamChatGenerics>,
-      | 'giphyVersion'
-      | 'imageGalleryGridSnapPoints'
-      | 'imageGalleryGridHandleHeight'
-      | 'numberOfImageGalleryGridColumns'
-      | 'autoPlayVideo'
-    >;
-
-export const ImageGallery = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: Props<StreamChatGenerics>,
-) => {
+type Props = ImageGalleryCustomComponents & {
+  overlayOpacity: SharedValue<number>;
+} & Pick<
+    OverlayProviderProps,
+    | 'giphyVersion'
+    | 'imageGalleryGridSnapPoints'
+    | 'imageGalleryGridHandleHeight'
+    | 'numberOfImageGalleryGridColumns'
+    | 'autoPlayVideo'
+  >;
+
+export const ImageGallery = (props: Props) => {
   const {
     autoPlayVideo = false,
     giphyVersion = 'fixed_height',
@@ -132,9 +125,7 @@ export const ImageGallery = <
     numberOfImageGalleryGridColumns,
     overlayOpacity,
   } = props;
-  const [imageGalleryAttachments, setImageGalleryAttachments] = useState<
-    Photo<StreamChatGenerics>[]
-  >([]);
+  const [imageGalleryAttachments, setImageGalleryAttachments] = useState<Photo[]>([]);
   const { resizableCDNHosts } = useChatConfigContext();
   const {
     theme: {
@@ -142,9 +133,8 @@ export const ImageGallery = <
       imageGallery: { backgroundColor, pager, slide },
     },
   } = useTheme();
-  const [gridPhotos, setGridPhotos] = useState<Photo<StreamChatGenerics>[]>([]);
-  const { messages, selectedMessage, setSelectedMessage } =
-    useImageGalleryContext<StreamChatGenerics>();
+  const [gridPhotos, setGridPhotos] = useState<Photo[]>([]);
+  const { messages, selectedMessage, setSelectedMessage } = useImageGalleryContext();
 
   const { vh, vw } = useViewport();
 
@@ -224,7 +214,7 @@ export const ImageGallery = <
    * photo attachments
    */
 
-  const photos = messages.reduce((acc: Photo<StreamChatGenerics>[], cur) => {
+  const photos = messages.reduce((acc: Photo[], cur) => {
     const attachmentImages =
       cur.attachments
         ?.filter(
@@ -273,7 +263,7 @@ export const ImageGallery = <
       };
     });
 
-    return [...attachmentPhotos, ...acc] as Photo<StreamChatGenerics>[];
+    return [...attachmentPhotos, ...acc] as Photo[];
   }, []);
 
   /**
@@ -583,7 +573,7 @@ export const ImageGallery = <
           </Animated.View>
         </Animated.View>
       </GestureDetector>
-      <ImageGalleryHeader<StreamChatGenerics>
+      <ImageGalleryHeader
         opacity={headerFooterOpacity}
         photo={imageGalleryAttachments[selectedIndex]}
         visible={headerFooterVisible}
@@ -591,7 +581,7 @@ export const ImageGallery = <
       />
 
       {imageGalleryAttachments[selectedIndex] && (
-        <ImageGalleryFooter<StreamChatGenerics>
+        <ImageGalleryFooter
           accessibilityLabel={'Image Gallery Footer'}
           duration={imageGalleryAttachments[selectedIndex].duration || 0}
           onPlayPause={onPlayPause}
@@ -653,9 +643,7 @@ const styles = StyleSheet.create({
   },
 });
 
-export type Photo<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type Photo = {
   id: string;
   uri: string;
   channelId?: string;
@@ -669,7 +657,7 @@ export type Photo<
   progress?: number;
   thumb_url?: string;
   type?: string;
-  user?: UserResponse<StreamChatGenerics> | null;
+  user?: UserResponse | null;
   user_id?: string;
 };
 

package/src/components/ImageGallery/__tests__/ImageGallery.test.tsx

@@ -17,7 +17,7 @@ import {
   generateVideoAttachment,
 } from '../../../mock-builders/generator/attachment';
 import { generateMessage } from '../../../mock-builders/generator/message';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import type { MessageType } from '../../MessageList/hooks/useMessageList';
 import { ImageGallery } from '../ImageGallery';
 

package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx

@@ -20,7 +20,7 @@ import {
 import { generateMessage } from '../../../mock-builders/generator/message';
 import { getTestClientWithUser } from '../../../mock-builders/mock';
 import * as NativeUtils from '../../../native';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import type { MessageType } from '../../MessageList/hooks/useMessageList';
 import { ImageGallery, ImageGalleryCustomComponents } from '../ImageGallery';
 

package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx

@@ -23,7 +23,7 @@ import {
 } from '../../../mock-builders/generator/attachment';
 import { generateMessage } from '../../../mock-builders/generator/message';
 import { getTestClientWithUser } from '../../../mock-builders/mock';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import type { MessageType } from '../../MessageList/hooks/useMessageList';
 import { ImageGallery, ImageGalleryCustomComponents } from '../ImageGallery';
 

package/src/components/ImageGallery/__tests__/ImageGalleryOverlay.test.tsx

@@ -19,7 +19,7 @@ import {
 import { generateImageAttachment } from '../../../mock-builders/generator/attachment';
 import { generateMessage } from '../../../mock-builders/generator/message';
 import { getTestClientWithUser } from '../../../mock-builders/mock';
-import type { DefaultStreamChatGenerics } from '../../../types/types';
+
 import type { MessageType } from '../../MessageList/hooks/useMessageList';
 import { ImageGalleryOverlay } from '../components/ImageGalleryOverlay';
 

package/src/components/ImageGallery/components/ImageGalleryFooter.tsx

@@ -25,12 +25,10 @@ const ReanimatedSafeAreaView = Animated.createAnimatedComponent
   ? Animated.createAnimatedComponent(SafeAreaView)
   : SafeAreaView;
 
-import { DefaultStreamChatGenerics, FileTypes } from '../../../types/types';
+import { FileTypes } from '../../../types/types';
 import type { Photo } from '../ImageGallery';
 
-export type ImageGalleryFooterCustomComponent<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = ({
+export type ImageGalleryFooterCustomComponent = ({
   openGridView,
   photo,
   share,
@@ -39,7 +37,7 @@ export type ImageGalleryFooterCustomComponent<
   openGridView: () => void;
   share: () => Promise<void>;
   shareMenuOpen: boolean;
-  photo?: Photo<StreamChatGenerics>;
+  photo?: Photo;
 }) => React.ReactElement | null;
 
 export type ImageGalleryFooterVideoControlProps = {
@@ -57,27 +55,23 @@ export type ImageGalleryFooterVideoControlComponent = ({
   progress,
 }: ImageGalleryFooterVideoControlProps) => React.ReactElement | null;
 
-export type ImageGalleryFooterCustomComponentProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  centerElement?: ImageGalleryFooterCustomComponent<StreamChatGenerics>;
+export type ImageGalleryFooterCustomComponentProps = {
+  centerElement?: ImageGalleryFooterCustomComponent;
   GridIcon?: React.ReactElement;
-  leftElement?: ImageGalleryFooterCustomComponent<StreamChatGenerics>;
-  rightElement?: ImageGalleryFooterCustomComponent<StreamChatGenerics>;
+  leftElement?: ImageGalleryFooterCustomComponent;
+  rightElement?: ImageGalleryFooterCustomComponent;
   ShareIcon?: React.ReactElement;
   videoControlElement?: ImageGalleryFooterVideoControlComponent;
 };
 
-type ImageGalleryFooterPropsWithContext<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = ImageGalleryFooterCustomComponentProps<StreamChatGenerics> & {
+type ImageGalleryFooterPropsWithContext = ImageGalleryFooterCustomComponentProps & {
   accessibilityLabel: string;
   duration: number;
   onPlayPause: () => void;
   opacity: SharedValue<number>;
   openGridView: () => void;
   paused: boolean;
-  photo: Photo<StreamChatGenerics>;
+  photo: Photo;
   photoLength: number;
   progress: number;
   selectedIndex: number;
@@ -85,11 +79,7 @@ type ImageGalleryFooterPropsWithContext<
   visible: SharedValue<number>;
 };
 
-export const ImageGalleryFooterWithContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ImageGalleryFooterPropsWithContext<StreamChatGenerics>,
-) => {
+export const ImageGalleryFooterWithContext = (props: ImageGalleryFooterPropsWithContext) => {
   const {
     accessibilityLabel,
     centerElement,
@@ -241,9 +231,9 @@ const ShareButton = ({ share, ShareIcon, shareMenuOpen }: ShareButtonProps) => {
   );
 };
 
-const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
-  prevProps: ImageGalleryFooterPropsWithContext<StreamChatGenerics>,
-  nextProps: ImageGalleryFooterPropsWithContext<StreamChatGenerics>,
+const areEqual = (
+  prevProps: ImageGalleryFooterPropsWithContext,
+  nextProps: ImageGalleryFooterPropsWithContext,
 ) => {
   const {
     duration: prevDuration,
@@ -286,15 +276,11 @@ const MemoizedImageGalleryFooter = React.memo(
   areEqual,
 ) as typeof ImageGalleryFooterWithContext;
 
-export type ImageGalleryFooterProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = ImageGalleryFooterPropsWithContext<StreamChatGenerics>;
+export type ImageGalleryFooterProps = ImageGalleryFooterPropsWithContext;
 
-export const ImageGalleryFooter = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ImageGalleryFooterProps<StreamChatGenerics>,
-) => <MemoizedImageGalleryFooter {...props} />;
+export const ImageGalleryFooter = (props: ImageGalleryFooterProps) => (
+  <MemoizedImageGalleryFooter {...props} />
+);
 
 ImageGalleryFooter.displayName = 'ImageGalleryFooter{imageGallery{footer}}';
 

package/src/components/ImageGallery/components/ImageGalleryHeader.tsx

@@ -12,7 +12,6 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
 import { Close } from '../../../icons';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { getDateString } from '../../../utils/i18n/getDateString';
 import type { Photo } from '../ImageGallery';
 
@@ -20,38 +19,29 @@ const ReanimatedSafeAreaView = Animated.createAnimatedComponent
   ? Animated.createAnimatedComponent(SafeAreaView)
   : SafeAreaView;
 
-export type ImageGalleryHeaderCustomComponent<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = ({
+export type ImageGalleryHeaderCustomComponent = ({
   hideOverlay,
   photo,
 }: {
   hideOverlay: () => void;
-  photo?: Photo<StreamChatGenerics>;
+  photo?: Photo;
 }) => React.ReactElement | null;
 
-export type ImageGalleryHeaderCustomComponentProps<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  centerElement?: ImageGalleryHeaderCustomComponent<StreamChatGenerics>;
+export type ImageGalleryHeaderCustomComponentProps = {
+  centerElement?: ImageGalleryHeaderCustomComponent;
   CloseIcon?: React.ReactElement;
-  leftElement?: ImageGalleryHeaderCustomComponent<StreamChatGenerics>;
-  rightElement?: ImageGalleryHeaderCustomComponent<StreamChatGenerics>;
+  leftElement?: ImageGalleryHeaderCustomComponent;
+  rightElement?: ImageGalleryHeaderCustomComponent;
 };
 
-type Props<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =
-  ImageGalleryHeaderCustomComponentProps<StreamChatGenerics> & {
-    opacity: SharedValue<number>;
-    visible: SharedValue<number>;
-    photo?: Photo<StreamChatGenerics>;
-    /* Lookup key in the language corresponding translations sheet to perform date formatting */
-  };
+type Props = ImageGalleryHeaderCustomComponentProps & {
+  opacity: SharedValue<number>;
+  visible: SharedValue<number>;
+  photo?: Photo;
+  /* Lookup key in the language corresponding translations sheet to perform date formatting */
+};
 
-export const ImageGalleryHeader = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: Props<StreamChatGenerics>,
-) => {
+export const ImageGalleryHeader = (props: Props) => {
   const { centerElement, CloseIcon, leftElement, opacity, photo, rightElement, visible } = props;
   const [height, setHeight] = useState(200);
   const {

package/src/components/ImageGallery/components/ImageGrid.tsx

@@ -4,7 +4,7 @@ import { Image, StyleSheet, View } from 'react-native';
 import { VideoThumbnail } from '../../../components/Attachment/VideoThumbnail';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useViewport } from '../../../hooks/useViewport';
-import { DefaultStreamChatGenerics, FileTypes } from '../../../types/types';
+import { FileTypes } from '../../../types/types';
 import { BottomSheetFlatList } from '../../BottomSheetCompatibility/BottomSheetFlatList';
 import { BottomSheetTouchableOpacity } from '../../BottomSheetCompatibility/BottomSheetTouchableOpacity';
 
@@ -31,39 +31,27 @@ const styles = StyleSheet.create({
   },
 });
 
-export type ImageGalleryGridImageComponent<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = ({
+export type ImageGalleryGridImageComponent = ({
   item,
 }: {
-  item: Photo<StreamChatGenerics> & {
+  item: Photo & {
     selectAndClose: () => void;
     numberOfImageGalleryGridColumns?: number;
   };
 }) => React.ReactElement | null;
 
-export type ImageGalleryGridImageComponents<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  avatarComponent?: ImageGalleryGridImageComponent<StreamChatGenerics>;
-  imageComponent?: ImageGalleryGridImageComponent<StreamChatGenerics>;
+export type ImageGalleryGridImageComponents = {
+  avatarComponent?: ImageGalleryGridImageComponent;
+  imageComponent?: ImageGalleryGridImageComponent;
 };
 
-export type GridImageItem<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Photo<StreamChatGenerics> &
-  ImageGalleryGridImageComponents<StreamChatGenerics> & {
+export type GridImageItem = Photo &
+  ImageGalleryGridImageComponents & {
     selectAndClose: () => void;
     numberOfImageGalleryGridColumns?: number;
   };
 
-const GridImage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
-  item,
-}: {
-  item: GridImageItem<StreamChatGenerics>;
-}) => {
+const GridImage = ({ item }: { item: GridImageItem }) => {
   const {
     theme: {
       imageGallery: {
@@ -95,19 +83,11 @@ const GridImage = <
   );
 };
 
-const renderItem = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
-  item,
-}: {
-  item: GridImageItem<StreamChatGenerics>;
-}) => <GridImage item={item} />;
+const renderItem = ({ item }: { item: GridImageItem }) => <GridImage item={item} />;
 
-export type ImageGridType<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = ImageGalleryGridImageComponents<StreamChatGenerics> & {
+export type ImageGridType = ImageGalleryGridImageComponents & {
   closeGridView: () => void;
-  photos: Photo<StreamChatGenerics>[];
+  photos: Photo[];
   setSelectedMessage: React.Dispatch<
     React.SetStateAction<
       | {
@@ -120,11 +100,7 @@ export type ImageGridType<
   numberOfImageGalleryGridColumns?: number;
 };
 
-export const ImageGrid = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: ImageGridType<StreamChatGenerics>,
-) => {
+export const ImageGrid = (props: ImageGridType) => {
   const {
     avatarComponent,
     closeGridView,
@@ -155,14 +131,14 @@ export const ImageGrid = <
   }));
 
   return (
-    <BottomSheetFlatList<GridImageItem<StreamChatGenerics>>
+    <BottomSheetFlatList<GridImageItem>
       accessibilityLabel='Image Grid'
       contentContainerStyle={[
         styles.contentContainer,
         { backgroundColor: white },
         contentContainer,
       ]}
-      data={imageGridItems as GridImageItem<StreamChatGenerics>[]}
+      data={imageGridItems as GridImageItem[]}
       keyExtractor={(item, index) => `${item.uri}-${index}`}
       numColumns={numberOfImageGalleryGridColumns || 3}
       renderItem={renderItem}