fix: merge issues

Author: isekovanic

package/src/components/ChannelList/ChannelList.tsx

@@ -1,15 +1,8 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 
 import type { FlatList } from 'react-native-gesture-handler';
 
-import {
-  Channel,
-  ChannelFilters,
-  ChannelManager,
-  ChannelOptions,
-  ChannelSort,
-  Event,
-} from 'stream-chat';
+import { Channel, ChannelFilters, ChannelOptions, ChannelSort, Event } from 'stream-chat';
 
 import { ChannelListFooterLoadingIndicator } from './ChannelListFooterLoadingIndicator';
 import { ChannelListHeaderErrorIndicator } from './ChannelListHeaderErrorIndicator';

package/src/components/ChannelList/hooks/listeners/useChannelMemberUpdated.ts

@@ -20,10 +20,10 @@ import {
 type Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =
   {
     lockChannelOrder: boolean;
-    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>;
+    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>;
     onChannelMemberUpdated?: (
       lockChannelOrder: boolean,
-      setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
+      setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[]>>,
       event: Event<StreamChatGenerics>,
       options?: ChannelListEventListenerOptions<StreamChatGenerics>,
     ) => void;