stream-chat-react-native-core 5.40.0-rc.2 → 5.41.0-beta.1

package/src/components/Channel/__tests__/ownCapabilities.test.js

@@ -68,249 +68,249 @@ describe('Own capabilities', () => {
   };
 
   const renderChannelAndOpenMessageActionsList = async (targetMessage, props = {}) => {
-    const { findByTestId, queryByLabelText, queryByText, unmount } = render(getComponent(props));
+    const { findByTestId, queryByTestId, queryByText, unmount } = render(getComponent(props));
     await waitFor(() => queryByText(targetMessage.text));
 
     act(() => {
       fireEvent(queryByText(targetMessage.text), 'onLongPress');
     });
 
-    await waitFor(() => expect(!!queryByLabelText('Message action list')).toBeTruthy());
+    await waitFor(() => expect(!!queryByTestId('message-action-list')).toBeTruthy());
 
-    return { findByTestId, queryByLabelText, queryByText, unmount };
+    return { findByTestId, queryByTestId, queryByText, unmount };
   };
 
   describe(`${allOwnCapabilities.sendReply} capability`, () => {
     it(`should render "Thread Reply" message action when ${allOwnCapabilities.sendReply} capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.sendReply]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(sentMessage);
-      expect(!!queryByLabelText('threadReply action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(sentMessage);
+      expect(!!queryByTestId('threadReply-list-item')).toBeTruthy();
     });
 
     it('should not render "Thread Reply" message action when "send-reply" capability is disabled', async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(sentMessage);
-      expect(!!queryByLabelText('threadReply action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(sentMessage);
+      expect(!!queryByTestId('threadReply-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.sendReply" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.sendReply]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(sentMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(sentMessage, {
         overrideOwnCapabilities: {
           sendReply: false,
         },
       });
-      expect(!!queryByLabelText('threadReply action list item')).toBeFalsy();
+      expect(!!queryByTestId('threadReply-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.banChannelMembers} capability`, () => {
     it(`should render "Ban User" message action when ${allOwnCapabilities.banChannelMembers} capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.banChannelMembers]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('banUser action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('banUser-list-item')).toBeTruthy();
     });
 
     it(`should not render "Ban User" message action when ${allOwnCapabilities.banChannelMembers} capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('banUser action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('banUser-list-item')).toBeFalsy();
     });
 
     it(`should override capability from "overrideOwnCapability.banChannelMembers" prop`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.banChannelMembers]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           banChannelMembers: false,
         },
       });
-      expect(!!queryByLabelText('banUser action list item')).toBeFalsy();
+      expect(!!queryByTestId('banUser-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.deleteAnyMessage} capability`, () => {
     it(`should render "Delete Message" action for received message when "${allOwnCapabilities.deleteAnyMessage}" capability is enabled`, async () => {
       await generateChannelWithCapabilities(['delete-any-message']);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('deleteMessage action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('deleteMessage-list-item')).toBeTruthy();
     });
 
     it(`should not render "Delete Message" action for received message when "${allOwnCapabilities.deleteAnyMessage}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('deleteMessage action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('deleteMessage-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.deleteAnyMessage" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.deleteAnyMessage]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           deleteAnyMessage: false,
         },
       });
-      expect(!!queryByLabelText('deleteMessage action list item')).toBeFalsy();
+      expect(!!queryByTestId('deleteMessage-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.deleteOwnMessage} capability`, () => {
     it(`should render "Delete Message" action for sent message when "${allOwnCapabilities.deleteOwnMessage}" capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.deleteOwnMessage]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(sentMessage);
-      expect(!!queryByLabelText('deleteMessage action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(sentMessage);
+      expect(!!queryByTestId('deleteMessage-list-item')).toBeTruthy();
     });
 
     it(`should not render "Delete Message" action for sent message when "${allOwnCapabilities.deleteOwnMessage}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(sentMessage);
-      expect(!!queryByLabelText('deleteMessage action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(sentMessage);
+      expect(!!queryByTestId('deleteMessage-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.deleteOwnMessage" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.deleteOwnMessage]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(sentMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(sentMessage, {
         overrideOwnCapabilities: {
           deleteOwnMessage: false,
         },
       });
-      expect(!!queryByLabelText('deleteMessage action list item')).toBeFalsy();
+      expect(!!queryByTestId('deleteMessage-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.updateAnyMessage} capability`, () => {
     it(`should render "Edit Message" action for received message when "${allOwnCapabilities.updateAnyMessage}" capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.updateAnyMessage]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('editMessage action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('editMessage-list-item')).toBeTruthy();
     });
 
     it(`should not render "Edit Message" action for received message when "${allOwnCapabilities.updateAnyMessage}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('editMessage action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('editMessage-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.updateAnyMessage" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.updateAnyMessage]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           updateAnyMessage: false,
         },
       });
-      expect(!!queryByLabelText('editMessage action list item')).toBeFalsy();
+      expect(!!queryByTestId('editMessage-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.flagMessage} capability`, () => {
     it(`should render "Flag Message" action for sent message when "${allOwnCapabilities.flagMessage}" capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.flagMessage]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('flagMessage action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('flagMessage-list-item')).toBeTruthy();
     });
 
     it(`should not render "Flag Message" action for sent message when "${allOwnCapabilities.flagMessage}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('flagMessage action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('flagMessage-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.deleteOwnMessage" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.flagMessage]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           flagMessage: false,
         },
       });
-      expect(!!queryByLabelText('flagMessage action list item')).toBeFalsy();
+      expect(!!queryByTestId('flagMessage-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.pinMessage} capability`, () => {
     it(`should render "Pin Message" action for sent message when "${allOwnCapabilities.pinMessage}" capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.pinMessage]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('pinMessage action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('pinMessage-list-item')).toBeTruthy();
     });
 
     it(`should not render "Pin Message" action for sent message when "${allOwnCapabilities.pinMessage}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('pinMessage action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('pinMessage-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.pinMessage" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.pinMessage]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           pinMessage: false,
         },
       });
-      expect(!!queryByLabelText('pinMessage action list item')).toBeFalsy();
+      expect(!!queryByTestId('pinMessage-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.quoteMessage} capability`, () => {
     it(`should render "Reply" action for sent message when "${allOwnCapabilities.quoteMessage}" capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.quoteMessage]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('quotedReply action list item')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('quotedReply-list-item')).toBeTruthy();
     });
 
     it(`should not render "Reply" action for sent message when "${allOwnCapabilities.quoteMessage}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('quotedReply action list item')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('quotedReply-list-item')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.quoteMessage" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.quoteMessage]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           quoteMessage: false,
         },
       });
-      expect(!!queryByLabelText('quotedReply action list item')).toBeFalsy();
+      expect(!!queryByTestId('quotedReply-list-item')).toBeFalsy();
     });
   });
 
   describe(`${allOwnCapabilities.sendReaction} capability`, () => {
     it(`should render reaction selector when "${allOwnCapabilities.sendReaction}" capability is enabled`, async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.sendReaction]);
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('Reaction Selector on long pressing message')).toBeTruthy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('overlay-reaction-list')).toBeTruthy();
     });
 
     it(`should not render reaction selector when "${allOwnCapabilities.sendReaction}" capability is disabled`, async () => {
       await generateChannelWithCapabilities();
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage);
-      expect(!!queryByLabelText('Reaction Selector on long pressing message')).toBeFalsy();
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage);
+      expect(!!queryByTestId('overlay-reaction-list')).toBeFalsy();
     });
 
     it('should override capability from "overrideOwnCapability.sendReaction" prop', async () => {
       await generateChannelWithCapabilities([allOwnCapabilities.sendReaction]);
 
-      const { queryByLabelText } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
+      const { queryByTestId } = await renderChannelAndOpenMessageActionsList(receivedMessage, {
         overrideOwnCapabilities: {
           sendReaction: false,
         },
       });
-      expect(!!queryByLabelText('Reaction Selector on long pressing message')).toBeFalsy();
+      expect(!!queryByTestId('overlay-reaction-list')).toBeFalsy();
     });
   });
 

package/src/components/Channel/hooks/useCreateChannelContext.ts

@@ -21,6 +21,7 @@ export const useCreateChannelContext = <
   isOwner,
   lastRead,
   loadChannelAroundMessage,
+  loadChannelAtMessage,
   loading,
   LoadingIndicator,
   markRead,
@@ -64,6 +65,7 @@ export const useCreateChannelContext = <
       isOwner,
       lastRead,
       loadChannelAroundMessage,
+      loadChannelAtMessage,
       loading,
       LoadingIndicator,
       markRead,

package/src/components/Channel/hooks/useCreateInputMessageInputContext.ts

@@ -27,6 +27,7 @@ export const useCreateInputMessageInputContext = <
   CommandsButton,
   compressImageQuality,
   CooldownTimer,
+  CreatePollContent,
   doDocUploadRequest,
   doImageUploadRequest,
   editing,
@@ -52,6 +53,7 @@ export const useCreateInputMessageInputContext = <
   MoreOptionsButton,
   numberOfLines,
   onChangeText,
+  openPollCreationDialog,
   quotedMessage,
   SendButton,
   sendImageAsync,
@@ -59,6 +61,7 @@ export const useCreateInputMessageInputContext = <
   SendMessageDisallowedIndicator,
   setInputRef,
   setQuotedMessageState,
+  showPollCreationDialog,
   ShowThreadMessageInChannelButton,
   StartAudioRecordingButton,
   UploadProgressIndicator,
@@ -68,8 +71,12 @@ export const useCreateInputMessageInputContext = <
    */
   channelId?: string;
 }) => {
-  const editingDep = editing ? editing.id : '';
-  const quotedMessageId = quotedMessage ? quotedMessage.id : '';
+  const editingDep = typeof editing === 'boolean' ? editing : editing?.id;
+  const quotedMessageId = quotedMessage
+    ? typeof quotedMessage === 'boolean'
+      ? ''
+      : quotedMessage.id
+    : '';
 
   const inputMessageInputContext: InputMessageInputContextValue<StreamChatGenerics> = useMemo(
     () => ({
@@ -93,6 +100,7 @@ export const useCreateInputMessageInputContext = <
       CommandsButton,
       compressImageQuality,
       CooldownTimer,
+      CreatePollContent,
       doDocUploadRequest,
       doImageUploadRequest,
       editing,
@@ -118,6 +126,7 @@ export const useCreateInputMessageInputContext = <
       MoreOptionsButton,
       numberOfLines,
       onChangeText,
+      openPollCreationDialog,
       quotedMessage,
       SendButton,
       sendImageAsync,
@@ -125,12 +134,22 @@ export const useCreateInputMessageInputContext = <
       SendMessageDisallowedIndicator,
       setInputRef,
       setQuotedMessageState,
+      showPollCreationDialog,
       ShowThreadMessageInChannelButton,
       StartAudioRecordingButton,
       UploadProgressIndicator,
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [compressImageQuality, channelId, editingDep, initialValue, maxMessageLength, quotedMessageId],
+    [
+      compressImageQuality,
+      channelId,
+      editingDep,
+      initialValue,
+      maxMessageLength,
+      quotedMessageId,
+      CreatePollContent,
+      showPollCreationDialog,
+    ],
   );
 
   return inputMessageInputContext;

package/src/components/Channel/hooks/useCreateMessagesContext.ts

@@ -6,7 +6,7 @@ import type { DefaultStreamChatGenerics } from '../../../types/types';
 export const useCreateMessagesContext = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
-  additionalPressableProps,
+  additionalTouchableProps,
   Attachment,
   AttachmentActions,
   AudioAttachment,
@@ -32,6 +32,7 @@ export const useCreateMessagesContext = <
   Giphy,
   giphyVersion,
   handleBan,
+  handleBlock,
   handleCopy,
   handleDelete,
   handleEdit,
@@ -42,6 +43,7 @@ export const useCreateMessagesContext = <
   handleReaction,
   handleRetry,
   handleThreadReply,
+  hasCreatePoll,
   ImageLoadingFailedIndicator,
   ImageLoadingIndicator,
   initialScrollToFirstUnreadMessage,
@@ -51,8 +53,6 @@ export const useCreateMessagesContext = <
   legacyImageViewerSwipeBehaviour,
   markdownRules,
   Message,
-  MessageActionList,
-  MessageActionListItem,
   messageActions,
   MessageAvatar,
   MessageBounce,
@@ -64,27 +64,21 @@ export const useCreateMessagesContext = <
   MessageFooter,
   MessageHeader,
   MessageList,
-  MessageMenu,
   MessagePinnedHeader,
-  MessageReactionPicker,
   MessageReplies,
   MessageRepliesAvatars,
   MessageSimple,
   MessageStatus,
   MessageSystem,
   MessageText,
-  messageTextNumberOfLines,
   MessageTimestamp,
-  MessageUserReactions,
-  MessageUserReactionsAvatar,
-  MessageUserReactionsItem,
   myMessageTheme,
   onLongPressMessage,
   onPressInMessage,
   onPressMessage,
-  ReactionListBottom,
-  reactionListPosition,
-  ReactionListTop,
+  OverlayReactionList,
+  PollContent,
+  ReactionList,
   removeMessage,
   Reply,
   retrySendMessage,
@@ -107,14 +101,14 @@ export const useCreateMessagesContext = <
    */
   channelId?: string;
 }) => {
-  const additionalTouchablePropsLength = Object.keys(additionalPressableProps || {}).length;
+  const additionalTouchablePropsLength = Object.keys(additionalTouchableProps || {}).length;
   const markdownRulesLength = Object.keys(markdownRules || {}).length;
   const messageContentOrderValue = messageContentOrder.join();
-  const supportedReactionsLength = supportedReactions?.length;
+  const supportedReactionsLength = supportedReactions.length;
 
   const messagesContext: MessagesContextValue<StreamChatGenerics> = useMemo(
     () => ({
-      additionalPressableProps,
+      additionalTouchableProps,
       Attachment,
       AttachmentActions,
       AudioAttachment,
@@ -139,6 +133,7 @@ export const useCreateMessagesContext = <
       Giphy,
       giphyVersion,
       handleBan,
+      handleBlock,
       handleCopy,
       handleDelete,
       handleEdit,
@@ -149,6 +144,7 @@ export const useCreateMessagesContext = <
       handleReaction,
       handleRetry,
       handleThreadReply,
+      hasCreatePoll,
       ImageLoadingFailedIndicator,
       ImageLoadingIndicator,
       initialScrollToFirstUnreadMessage,
@@ -158,8 +154,6 @@ export const useCreateMessagesContext = <
       legacyImageViewerSwipeBehaviour,
       markdownRules,
       Message,
-      MessageActionList,
-      MessageActionListItem,
       messageActions,
       MessageAvatar,
       MessageBounce,
@@ -171,27 +165,21 @@ export const useCreateMessagesContext = <
       MessageFooter,
       MessageHeader,
       MessageList,
-      MessageMenu,
       MessagePinnedHeader,
-      MessageReactionPicker,
       MessageReplies,
       MessageRepliesAvatars,
       MessageSimple,
       MessageStatus,
       MessageSystem,
       MessageText,
-      messageTextNumberOfLines,
       MessageTimestamp,
-      MessageUserReactions,
-      MessageUserReactionsAvatar,
-      MessageUserReactionsItem,
       myMessageTheme,
       onLongPressMessage,
       onPressInMessage,
       onPressMessage,
-      ReactionListBottom,
-      reactionListPosition,
-      ReactionListTop,
+      OverlayReactionList,
+      PollContent,
+      ReactionList,
       removeMessage,
       Reply,
       retrySendMessage,
@@ -221,6 +209,7 @@ export const useCreateMessagesContext = <
       supportedReactionsLength,
       myMessageTheme,
       targetedMessage,
+      hasCreatePoll,
     ],
   );
 

package/src/components/Channel/hooks/useCreateThreadContext.ts

@@ -5,12 +5,11 @@ import { useStateStore } from '../../../hooks';
 import type { DefaultStreamChatGenerics } from '../../../types/types';
 
 const selector = (nextValue: ThreadState) =>
-  [
-    nextValue.replies,
-    nextValue.pagination.isLoadingPrev,
-    nextValue.pagination.isLoadingNext,
-    nextValue.parentMessage,
-  ] as const;
+  ({
+    isLoadingNext: nextValue.pagination.isLoadingNext,
+    isLoadingPrev: nextValue.pagination.isLoadingPrev,
+    latestReplies: nextValue.replies,
+  } as const);
 
 export const useCreateThreadContext = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
@@ -27,8 +26,8 @@ export const useCreateThreadContext = <
   threadLoadingMore,
   threadMessages,
 }: ThreadContextValue<StreamChatGenerics>) => {
-  const [latestReplies, isLoadingPrev, isLoadingNext] =
-    useStateStore(threadInstance?.state, selector) ?? [];
+  const { isLoadingNext, isLoadingPrev, latestReplies } =
+    useStateStore(threadInstance?.state, selector) ?? {};
 
   const contextAdapter = threadInstance
     ? {

package/src/components/ChannelList/ChannelList.tsx

@@ -156,6 +156,21 @@ export type ChannelListProps<
     setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
     event: Event<StreamChatGenerics>,
   ) => void;
+  /**
+   * @deprecated use onNewMessageNotification instead
+   *
+   * Override the default listener/handler for event `notification.message_new`
+   * This event is received on channel, which is not being watched.
+   *
+   * @param setChannels Setter for internal state property - `channels`. It's created from useState() hook.
+   * @param event An [Event object](https://getstream.io/chat/docs/event_object) corresponding to `notification.message_new` event
+   *
+   * @overrideType Function
+   * */
+  onMessageNew?: (
+    setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
+    event: Event<StreamChatGenerics>,
+  ) => void;
   /**
    * Override the default listener/handler for event `message.new`
    * This event is received on channel, when a new message is added on a channel.
@@ -247,6 +262,7 @@ export const ChannelList = <
     onChannelTruncated,
     onChannelUpdated,
     onChannelVisible,
+    onMessageNew,
     onNewMessage,
     onNewMessageNotification,
     onRemovedFromChannel,
@@ -326,6 +342,7 @@ export const ChannelList = <
   });
 
   useNewMessageNotification({
+    onMessageNew,
     onNewMessageNotification,
     setChannels,
   });

package/src/components/ChannelList/ChannelListFooterLoadingIndicator.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, View } from 'react-native';
 
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
-import { Spinner } from '../UIComponents/Spinner';
+import { Spinner } from '../Spinner/Spinner';
 
 const styles = StyleSheet.create({
   container: {

package/src/components/ChannelList/__tests__/ChannelList.test.js

@@ -356,11 +356,11 @@ describe('ChannelList', () => {
         });
       });
 
-      it('should call the `onNewMessage` function prop, if provided', async () => {
-        const onNewMessage = jest.fn();
+      it('should call the `onMessageNew` function prop, if provided', async () => {
+        const onMessageNew = jest.fn();
         render(
           <Chat client={chatClient}>
-            <ChannelList {...props} onNewMessage={onNewMessage} />
+            <ChannelList {...props} onMessageNew={onMessageNew} />
           </Chat>,
         );
 
@@ -368,10 +368,10 @@ describe('ChannelList', () => {
           expect(screen.getByTestId('channel-list')).toBeTruthy();
         });
 
-        act(() => dispatchMessageNewEvent(chatClient, testChannel2.channel));
+        act(() => dispatchNotificationMessageNewEvent(chatClient, testChannel2.channel));
 
         await waitFor(() => {
-          expect(onNewMessage).toHaveBeenCalledTimes(1);
+          expect(onMessageNew).toHaveBeenCalledTimes(1);
         });
       });