stream-chat-react-native-core 6.6.8-beta.3 → 7.0.0-rc.2

package/src/contexts/overlayContext/OverlayProvider.tsx

@@ -26,7 +26,7 @@ import { useStreami18n } from '../../hooks/useStreami18n';
 
 import { useViewport } from '../../hooks/useViewport';
 import { isImageMediaLibraryAvailable } from '../../native';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { AttachmentPickerProvider } from '../attachmentPickerContext/AttachmentPickerContext';
 import { ImageGalleryProvider } from '../imageGalleryContext/ImageGalleryContext';
 import { ThemeProvider } from '../themeContext/ThemeContext';
@@ -55,11 +55,7 @@ import {
  *
  * @example ./OverlayProvider.md
  */
-export const OverlayProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  props: PropsWithChildren<OverlayProviderProps<StreamChatGenerics>>,
-) => {
+export const OverlayProvider = (props: PropsWithChildren<OverlayProviderProps>) => {
   const { vh } = useViewport();
   const bottomSheetCloseTimeoutRef = useRef<ReturnType<typeof setTimeout>>(undefined);
   const {
@@ -211,7 +207,7 @@ export const OverlayProvider = <
             {children}
             <ThemeProvider style={overlayContext.style}>
               {overlay === 'gallery' && (
-                <ImageGallery<StreamChatGenerics>
+                <ImageGallery
                   autoPlayVideo={autoPlayVideo}
                   giphyVersion={giphyVersion}
                   imageGalleryCustomComponents={imageGalleryCustomComponents}

package/src/contexts/paginatedMessageListContext/PaginatedMessageListContext.tsx

@@ -2,14 +2,11 @@ import React, { PropsWithChildren, useContext } from 'react';
 
 import type { ChannelState } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
-export type PaginatedMessageListContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type PaginatedMessageListContextValue = {
   /**
    * Load latest messages
    * @returns Promise<void>
@@ -26,7 +23,7 @@ export type PaginatedMessageListContextValue<
   /**
    * Messages from client state
    */
-  messages: ChannelState<StreamChatGenerics>['messages'];
+  messages: ChannelState['messages'];
   /**
    * Has more messages to load
    */
@@ -53,13 +50,11 @@ export const PaginatedMessageListContext = React.createContext(
   DEFAULT_BASE_CONTEXT_VALUE as PaginatedMessageListContextValue,
 );
 
-export const PaginatedMessageListProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const PaginatedMessageListProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value?: PaginatedMessageListContextValue<StreamChatGenerics>;
+  value?: PaginatedMessageListContextValue;
 }>) => (
   <PaginatedMessageListContext.Provider
     value={value as unknown as PaginatedMessageListContextValue}
@@ -68,12 +63,10 @@ export const PaginatedMessageListProvider = <
   </PaginatedMessageListContext.Provider>
 );
 
-export const usePaginatedMessageListContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
+export const usePaginatedMessageListContext = () => {
   const contextValue = useContext(
     PaginatedMessageListContext,
-  ) as unknown as PaginatedMessageListContextValue<StreamChatGenerics>;
+  ) as unknown as PaginatedMessageListContextValue;
 
   if (contextValue === DEFAULT_BASE_CONTEXT_VALUE && !isTestEnvironment()) {
     throw new Error(

package/src/contexts/pollContext/pollContext.tsx

@@ -3,27 +3,23 @@ import React, { PropsWithChildren, useContext } from 'react';
 import { Poll } from 'stream-chat';
 
 import { MessageType } from '../../components';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
-export type PollContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  message: MessageType<StreamChatGenerics>;
-  poll: Poll<StreamChatGenerics>;
+export type PollContextValue = {
+  message: MessageType;
+  poll: Poll;
 };
 
 export const PollContext = React.createContext(DEFAULT_BASE_CONTEXT_VALUE as PollContextValue);
 
-export const PollContextProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const PollContextProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: PollContextValue<StreamChatGenerics>;
+  value: PollContextValue;
 }>) => (
   <PollContext.Provider value={value as unknown as PollContextValue}>
     {children}

package/src/contexts/suggestionsContext/SuggestionsContext.tsx

@@ -6,60 +6,37 @@ import type { AutoCompleteSuggestionHeaderProps } from '../../components/AutoCom
 import type { AutoCompleteSuggestionItemProps } from '../../components/AutoCompleteInput/AutoCompleteSuggestionItem';
 import type { AutoCompleteSuggestionListProps } from '../../components/AutoCompleteInput/AutoCompleteSuggestionList';
 import type { Emoji } from '../../emoji-data';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
 export type SuggestionComponentType = 'command' | 'emoji' | 'mention';
 
-export const isSuggestionCommand = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  suggestion: Suggestion<StreamChatGenerics>,
-): suggestion is SuggestionCommand<StreamChatGenerics> => 'args' in suggestion;
-
-export const isSuggestionEmoji = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  suggestion: Suggestion<StreamChatGenerics>,
-): suggestion is Emoji => 'unicode' in suggestion;
-
-export const isSuggestionUser = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  suggestion: Suggestion<StreamChatGenerics>,
-): suggestion is SuggestionUser<StreamChatGenerics> => 'id' in suggestion;
-
-export type Suggestion<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Emoji | SuggestionCommand<StreamChatGenerics> | SuggestionUser<StreamChatGenerics>;
-
-export type SuggestionCommand<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = CommandResponse<StreamChatGenerics>;
-export type SuggestionUser<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = UserResponse<StreamChatGenerics>;
-
-export type Suggestions<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  data: Suggestion<StreamChatGenerics>[];
-  onSelect: (item: Suggestion<StreamChatGenerics>) => void;
+export const isSuggestionCommand = (suggestion: Suggestion): suggestion is SuggestionCommand =>
+  'args' in suggestion;
+
+export const isSuggestionEmoji = (suggestion: Suggestion): suggestion is Emoji =>
+  'unicode' in suggestion;
+
+export const isSuggestionUser = (suggestion: Suggestion): suggestion is SuggestionUser =>
+  'id' in suggestion;
+
+export type Suggestion = Emoji | SuggestionCommand | SuggestionUser;
+
+export type SuggestionCommand = CommandResponse;
+export type SuggestionUser = UserResponse;
+
+export type Suggestions = {
+  data: Suggestion[];
+  onSelect: (item: Suggestion) => void;
   queryText?: string;
 };
 
-export type SuggestionsContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type SuggestionsContextValue = {
   AutoCompleteSuggestionHeader: React.ComponentType<AutoCompleteSuggestionHeaderProps>;
-  AutoCompleteSuggestionItem: React.ComponentType<
-    AutoCompleteSuggestionItemProps<StreamChatGenerics>
-  >;
-  AutoCompleteSuggestionList: React.ComponentType<
-    AutoCompleteSuggestionListProps<StreamChatGenerics>
-  >;
+  AutoCompleteSuggestionItem: React.ComponentType<AutoCompleteSuggestionItemProps>;
+  AutoCompleteSuggestionList: React.ComponentType<AutoCompleteSuggestionListProps>;
   /** Override handler for closing suggestions (mentions, command autocomplete etc) */
   closeSuggestions: () => void;
   /**
@@ -69,7 +46,7 @@ export type SuggestionsContextValue<
    * @overrideType Function
    */
   openSuggestions: (component: SuggestionComponentType) => Promise<void>;
-  suggestions: Suggestions<StreamChatGenerics>;
+  suggestions: Suggestions;
   triggerType: SuggestionComponentType;
   /**
    * Override handler for updating suggestions (mentions, command autocomplete etc)
@@ -77,7 +54,7 @@ export type SuggestionsContextValue<
    * @param newSuggestions {Component|element} UI Component for suggestion item.
    * @overrideType Function
    */
-  updateSuggestions: (newSuggestions: Suggestions<StreamChatGenerics>) => void;
+  updateSuggestions: (newSuggestions: Suggestions) => void;
   queryText?: string;
   suggestionsViewActive?: boolean;
 };
@@ -89,14 +66,12 @@ export const SuggestionsContext = React.createContext(
 /**
  * This provider component exposes the properties stored within the SuggestionsContext.
  */
-export const SuggestionsProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const SuggestionsProvider = ({
   children,
   value,
-}: PropsWithChildren<{ value?: Partial<SuggestionsContextValue<StreamChatGenerics>> }>) => {
+}: PropsWithChildren<{ value?: Partial<SuggestionsContextValue> }>) => {
   const [triggerType, setTriggerType] = useState<SuggestionComponentType | null>(null);
-  const [suggestions, setSuggestions] = useState<Suggestions<StreamChatGenerics>>();
+  const [suggestions, setSuggestions] = useState<Suggestions>();
   const [suggestionsViewActive, setSuggestionsViewActive] = useState(false);
 
   const openSuggestions = (component: SuggestionComponentType) => {
@@ -104,7 +79,7 @@ export const SuggestionsProvider = <
     setSuggestionsViewActive(true);
   };
 
-  const updateSuggestions = (newSuggestions: Suggestions<StreamChatGenerics>) => {
+  const updateSuggestions = (newSuggestions: Suggestions) => {
     setSuggestions(newSuggestions);
     setSuggestionsViewActive(!!triggerType);
   };
@@ -132,12 +107,8 @@ export const SuggestionsProvider = <
   );
 };
 
-export const useSuggestionsContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const contextValue = useContext(
-    SuggestionsContext,
-  ) as unknown as SuggestionsContextValue<StreamChatGenerics>;
+export const useSuggestionsContext = () => {
+  const contextValue = useContext(SuggestionsContext) as unknown as SuggestionsContextValue;
 
   if (contextValue === DEFAULT_BASE_CONTEXT_VALUE && !isTestEnvironment()) {
     throw new Error(

package/src/contexts/threadContext/ThreadContext.tsx

@@ -3,27 +3,23 @@ import React, { PropsWithChildren, useContext } from 'react';
 import { ChannelState, Thread } from 'stream-chat';
 
 import type { MessageType } from '../../components/MessageList/hooks/useMessageList';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
-export type ThreadType<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = { thread: MessageType<StreamChatGenerics>; threadInstance: Thread };
+export type ThreadType = { thread: MessageType; threadInstance: Thread };
 
-export type ThreadContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type ThreadContextValue = {
   allowThreadMessagesInChannel: boolean;
   closeThread: () => void;
   loadMoreThread: () => Promise<void>;
-  openThread: (message: MessageType<StreamChatGenerics>) => void;
+  openThread: (message: MessageType) => void;
   reloadThread: () => void;
   setThreadLoadingMore: React.Dispatch<React.SetStateAction<boolean>>;
-  thread: MessageType<StreamChatGenerics> | null;
+  thread: MessageType | null;
   threadHasMore: boolean;
-  threadMessages: ChannelState<StreamChatGenerics>['threads'][string];
+  threadMessages: ChannelState['threads'][string];
   loadMoreRecentThread?: (opts: { limit?: number }) => Promise<void>;
   /**
    * Boolean to enable/disable parent message press
@@ -36,25 +32,19 @@ export type ThreadContextValue<
 
 export const ThreadContext = React.createContext(DEFAULT_BASE_CONTEXT_VALUE as ThreadContextValue);
 
-export const ThreadProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const ThreadProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: ThreadContextValue<StreamChatGenerics>;
+  value: ThreadContextValue;
 }>) => (
   <ThreadContext.Provider value={value as unknown as ThreadContextValue}>
     {children}
   </ThreadContext.Provider>
 );
 
-export const useThreadContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const contextValue = useContext(
-    ThreadContext,
-  ) as unknown as ThreadContextValue<StreamChatGenerics>;
+export const useThreadContext = () => {
+  const contextValue = useContext(ThreadContext) as unknown as ThreadContextValue;
 
   if (contextValue === DEFAULT_BASE_CONTEXT_VALUE && !isTestEnvironment()) {
     throw new Error(

package/src/contexts/threadsContext/ThreadListItemContext.tsx

@@ -3,39 +3,33 @@ import React, { PropsWithChildren, useContext } from 'react';
 import { Channel, Thread } from 'stream-chat';
 
 import { MessageType } from '../../components';
-import type { DefaultStreamChatGenerics } from '../../types/types';
+
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
-export type ThreadListItemContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  channel: Channel<StreamChatGenerics>;
+export type ThreadListItemContextValue = {
+  channel: Channel;
   dateString: string | number | undefined;
   deletedAtDateString: string | number | undefined;
-  lastReply: MessageType<StreamChatGenerics> | undefined;
+  lastReply: MessageType | undefined;
   ownUnreadMessageCount: number;
-  parentMessage: MessageType<StreamChatGenerics> | undefined;
-  thread: Thread<StreamChatGenerics>;
+  parentMessage: MessageType | undefined;
+  thread: Thread;
 };
 
 export const ThreadListItemContext = React.createContext(
   DEFAULT_BASE_CONTEXT_VALUE as ThreadListItemContextValue,
 );
 
-export const ThreadListItemProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const ThreadListItemProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: ThreadListItemContextValue<StreamChatGenerics>;
+  value: ThreadListItemContextValue;
 }>) => (
   <ThreadListItemContext.Provider value={value as unknown as ThreadListItemContextValue}>
     {children}
   </ThreadListItemContext.Provider>
 );
 
-export const useThreadListItemContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() =>
-  useContext(ThreadListItemContext) as unknown as ThreadListItemContextValue<StreamChatGenerics>;
+export const useThreadListItemContext = () =>
+  useContext(ThreadListItemContext) as unknown as ThreadListItemContextValue;

package/src/contexts/threadsContext/ThreadsContext.tsx

@@ -4,19 +4,16 @@ import { FlatListProps } from 'react-native';
 
 import { Channel, Thread } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { ThreadType } from '../threadContext/ThreadContext';
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
-export type ThreadsContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type ThreadsContextValue = {
   isFocused: boolean;
   isLoading: boolean;
   isLoadingNext: boolean;
-  threads: Thread<StreamChatGenerics>[];
+  threads: Thread[];
   additionalFlatListProps?: Partial<FlatListProps<Thread>>;
   loadMore?: () => Promise<void>;
   onThreadSelect?: (thread: ThreadType, channel: Channel) => void;
@@ -31,30 +28,23 @@ export const ThreadsContext = React.createContext(
   DEFAULT_BASE_CONTEXT_VALUE as ThreadsContextValue,
 );
 
-export const ThreadsProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const ThreadsProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: ThreadsContextValue<StreamChatGenerics>;
+  value: ThreadsContextValue;
 }>) => (
   <ThreadsContext.Provider value={value as unknown as ThreadsContextValue}>
     {children}
   </ThreadsContext.Provider>
 );
 
-export const useThreadsContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const contextValue = useContext(
-    ThreadsContext,
-  ) as unknown as ThreadsContextValue<StreamChatGenerics>;
+export const useThreadsContext = () => {
+  const contextValue = useContext(ThreadsContext) as unknown as ThreadsContextValue;
 
   if (contextValue === DEFAULT_BASE_CONTEXT_VALUE && !isTestEnvironment()) {
     throw new Error(
-      // TODO: Set correct link to docs page, should be the new ThreadList instead of Channel
-      'The useThreadsContext hook was called outside of the ThreadsContext provider. Make sure you have configured the ThreadList component correctly - https://getstream.io/chat/docs/sdk/reactnative/basics/hello_stream_chat/#channel',
+      'The useThreadsContext hook was called outside of the ThreadsContext provider. Make sure you have configured the ThreadList component correctly - https://getstream.io/chat/docs/sdk/react-native/ui-components/thread-list/',
     );
   }
 

package/src/contexts/typingContext/TypingContext.tsx

@@ -2,38 +2,29 @@ import React, { PropsWithChildren, useContext } from 'react';
 
 import type { ChannelState } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
-export type TypingContextValue<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  typing: ChannelState<StreamChatGenerics>['typing'];
+export type TypingContextValue = {
+  typing: ChannelState['typing'];
 };
 
 export const TypingContext = React.createContext(DEFAULT_BASE_CONTEXT_VALUE as TypingContextValue);
 
-export const TypingProvider = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const TypingProvider = ({
   children,
   value,
 }: PropsWithChildren<{
-  value: TypingContextValue<StreamChatGenerics>;
+  value: TypingContextValue;
 }>) => (
   <TypingContext.Provider value={value as unknown as TypingContextValue}>
     {children}
   </TypingContext.Provider>
 );
 
-export const useTypingContext = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->() => {
-  const contextValue = useContext(
-    TypingContext,
-  ) as unknown as TypingContextValue<StreamChatGenerics>;
+export const useTypingContext = () => {
+  const contextValue = useContext(TypingContext) as unknown as TypingContextValue;
 
   if (contextValue === DEFAULT_BASE_CONTEXT_VALUE && !isTestEnvironment()) {
     throw new Error(

package/src/hooks/useTranslatedMessage.ts

@@ -1,15 +1,10 @@
 import type { FormatMessageResponse, MessageResponse, TranslationLanguages } from 'stream-chat';
 
 import { useTranslationContext } from '../contexts/translationContext/TranslationContext';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
 type TranslationKey = `${TranslationLanguages}_text`;
 
-export const useTranslatedMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  message?: MessageResponse<StreamChatGenerics> | FormatMessageResponse<StreamChatGenerics>,
-) => {
+export const useTranslatedMessage = (message?: MessageResponse | FormatMessageResponse) => {
   const { userLanguage: translationContextUserLanguage } = useTranslationContext();
 
   const userLanguage = translationContextUserLanguage;

package/src/mock-builders/api/channelMocks.tsx

@@ -11,8 +11,6 @@ import {
   ONE_MEMBER_WITH_EMPTY_USER_MOCK,
 } from '../../mock-builders/api/queryMembers';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const channelName = 'okechukwu';
 const CHANNEL = {
   data: { name: channelName },

package/src/native.ts

@@ -288,6 +288,9 @@ export type VideoType = {
   seek?: (progress: number) => void;
   setPositionAsync?: (position: number) => void;
   style?: StyleProp<ViewStyle>;
+  play?: () => void;
+  pause?: () => void;
+  replay?: () => void;
 };
 
 export let Video: React.ComponentType<VideoType>;

package/src/store/apis/getChannelMessages.ts

@@ -4,16 +4,13 @@ import { selectMessagesForChannels } from './queries/selectMessagesForChannels';
 
 import { selectReactionsForMessages } from './queries/selectReactionsForMessages';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { isBlockedMessage } from '../../utils/utils';
 import { mapStorableToMessage } from '../mappers/mapStorableToMessage';
 import { createSelectQuery } from '../sqlite-utils/createSelectQuery';
 import { SqliteClient } from '../SqliteClient';
 import type { TableRow, TableRowJoinedUser } from '../types';
 
-export const getChannelMessages = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const getChannelMessages = async ({
   channelIds,
   currentUserId,
 }: {
@@ -53,7 +50,7 @@ export const getChannelMessages = async <
   });
 
   // Populate the messages.
-  const cidVsMessages: Record<string, MessageResponse<StreamChatGenerics>[]> = {};
+  const cidVsMessages: Record<string, MessageResponse[]> = {};
   messageRows.forEach((m) => {
     if (!cidVsMessages[m.cid]) {
       cidVsMessages[m.cid] = [];
@@ -61,7 +58,7 @@ export const getChannelMessages = async <
 
     if (!isBlockedMessage(m)) {
       cidVsMessages[m.cid].push(
-        mapStorableToMessage<StreamChatGenerics>({
+        mapStorableToMessage({
           currentUserId,
           messageRow: m,
           pollRow: messageIdsVsPolls[m.poll_id],

package/src/store/apis/getChannels.ts

@@ -5,7 +5,6 @@ import { getMembers } from './getMembers';
 import { getReads } from './getReads';
 import { selectChannels } from './queries/selectChannels';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { mapStorableToChannel } from '../mappers/mapStorableToChannel';
 import { SqliteClient } from '../SqliteClient';
 
@@ -18,28 +17,26 @@ import { SqliteClient } from '../SqliteClient';
  *
  * @returns {Array} Channels with enriched state.
  */
-export const getChannels = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const getChannels = async ({
   channelIds,
   currentUserId,
 }: {
   channelIds: string[];
   currentUserId: string;
-}): Promise<Omit<ChannelAPIResponse<StreamChatGenerics>, 'duration'>[]> => {
+}): Promise<Omit<ChannelAPIResponse, 'duration'>[]> => {
   SqliteClient.logger?.('info', 'getChannels', { channelIds, currentUserId });
   const channels = await selectChannels({ channelIds });
 
-  const cidVsMembers = await getMembers<StreamChatGenerics>({ channelIds });
-  const cidVsReads = await getReads<StreamChatGenerics>({ channelIds });
-  const cidVsMessages = await getChannelMessages<StreamChatGenerics>({
+  const cidVsMembers = await getMembers({ channelIds });
+  const cidVsReads = await getReads({ channelIds });
+  const cidVsMessages = await getChannelMessages({
     channelIds,
     currentUserId,
   });
 
   // Enrich the channels with state
   return channels.map((c) => ({
-    ...mapStorableToChannel<StreamChatGenerics>(c),
+    ...mapStorableToChannel(c),
     members: cidVsMembers[c.cid] || [],
     messages: cidVsMessages[c.cid] || [],
     pinned_messages: [],

package/src/store/apis/getChannelsForFilterSort.ts

@@ -3,8 +3,6 @@ import type { ChannelAPIResponse, ChannelFilters, ChannelSort } from 'stream-cha
 import { getChannels } from './getChannels';
 import { selectChannelIdsForFilterSort } from './queries/selectChannelIdsForFilterSort';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import { SqliteClient } from '../SqliteClient';
 
 /**
@@ -17,17 +15,15 @@ import { SqliteClient } from '../SqliteClient';
  *
  * @returns Array of channels corresponding to filters & sort. Returns null if filters + sort query doesn't exist in "channelQueries" table.
  */
-export const getChannelsForFilterSort = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const getChannelsForFilterSort = async ({
   currentUserId,
   filters,
   sort,
 }: {
   currentUserId: string;
-  filters?: ChannelFilters<StreamChatGenerics>;
-  sort?: ChannelSort<StreamChatGenerics>;
-}): Promise<Omit<ChannelAPIResponse<StreamChatGenerics>, 'duration'>[] | null> => {
+  filters?: ChannelFilters;
+  sort?: ChannelSort;
+}): Promise<Omit<ChannelAPIResponse, 'duration'>[] | null> => {
   if (!filters && !sort) {
     console.warn('Please provide the query (filters/sort) to fetch channels from DB');
     return null;