Merge branch 'develop' into fix/poll-offline-fixes

# Conflicts:
#	package/expo-package/yarn.lock
#	package/native-package/package.json
#	package/native-package/yarn.lock
#	package/src/components/Message/MessageSimple/MessageContent.tsx
#	package/src/components/MessageOverlay/MessageOverlay.tsx
#	package/src/components/Reply/Reply.tsx
#	package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
#	package/src/store/QuickSqliteClient.ts
#	package/src/store/apis/getChannelMessages.ts
#	package/src/store/apis/updatePollMessage.ts

Author: isekovanic

examples/SampleApp/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
+
+
+### Workspaces
+
+* Following linked packages updated: [stream-chat-react-native]
+
+### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.4) (2024-11-07)
+
+
+### Workspaces
+
+* Following linked packages updated: [stream-chat-react-native]
+
 ### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
 
 

examples/SampleApp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sampleapp",
-  "version": "1.31.3",
+  "version": "1.31.5",
   "private": true,
   "repository": {
     "type": "git",

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+### [5.41.4](https://github.com/GetStream/stream-chat-react-native/compare/v5.41.3...v5.41.4) (2024-11-08)
+
+
+### Bug Fixes
+
+* poll edge cases ([#2768](https://github.com/GetStream/stream-chat-react-native/issues/2768)) ([b26b98c](https://github.com/GetStream/stream-chat-react-native/commit/b26b98c5cb34e5446c1600026fbaa1f442d8dbcb))
+* theme for the message bubble and replies ([#2766](https://github.com/GetStream/stream-chat-react-native/issues/2766)) ([980c383](https://github.com/GetStream/stream-chat-react-native/commit/980c3832a4a59ebab07c67f1d24a50ebe587e8fe))
+
+### [5.41.3](https://github.com/GetStream/stream-chat-react-native/compare/v5.41.2...v5.41.3) (2024-11-07)
+
+
+### Bug Fixes
+
+* check for channel validity before consuming config ([#2760](https://github.com/GetStream/stream-chat-react-native/issues/2760)) ([ff53399](https://github.com/GetStream/stream-chat-react-native/commit/ff5339982914051b6e8f941a4799fc772ce409aa))
+* message disallowed indicator display ([#2754](https://github.com/GetStream/stream-chat-react-native/issues/2754)) ([fe08bd7](https://github.com/GetStream/stream-chat-react-native/commit/fe08bd75ea1d7d3041b86b1e8519f2f04b9c19bc))
+* native image picker poll control ([#2762](https://github.com/GetStream/stream-chat-react-native/issues/2762)) ([b9c49be](https://github.com/GetStream/stream-chat-react-native/commit/b9c49be85b8d7927dc64f55d7e9ba01b11737016))
+* receiverMessageBackgroundColor hotfix ([#2763](https://github.com/GetStream/stream-chat-react-native/issues/2763)) ([5258a18](https://github.com/GetStream/stream-chat-react-native/commit/5258a18468fe9716918ec9e663ae5e0861b17df5))
+
 ### [5.41.2](https://github.com/GetStream/stream-chat-react-native/compare/v5.41.1...v5.41.2) (2024-11-04)
 
 

package/expo-package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-expo",
   "description": "The official Expo SDK for Stream Chat, a service for building chat applications",
-  "version": "5.41.2",
+  "version": "5.41.4",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -10,7 +10,7 @@
   "main": "src/index.js",
   "types": "types/index.d.ts",
   "dependencies": {
-    "stream-chat-react-native-core": "5.41.2"
+    "stream-chat-react-native-core": "5.41.4"
   },
   "peerDependencies": {
     "expo": ">=51.0.0",

package/native-package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native",
   "description": "The official React Native SDK for Stream Chat, a service for building chat applications",
-  "version": "5.41.2",
+  "version": "5.41.4",
   "homepage": "https://www.npmjs.com/package/stream-chat-react-native",
   "author": {
     "company": "Stream.io Inc",
@@ -20,7 +20,7 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "es6-symbol": "^3.1.3",
-    "stream-chat-react-native-core": "5.41.2"
+    "stream-chat-react-native-core": "5.41.4"
   },
   "peerDependencies": {
     "@react-native-camera-roll/camera-roll": ">=7.8.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "5.41.2",
+  "version": "5.41.4",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Channel/Channel.tsx

@@ -881,13 +881,7 @@ const ChannelWithContext = <
             setThreadMessages(updatedThreadMessages);
           }
 
-          if (
-            channel &&
-            thread?.id &&
-            event.message?.id === thread.id &&
-            !threadInstance &&
-            !thread.poll_id
-          ) {
+          if (channel && thread?.id && event.message?.id === thread.id && !threadInstance) {
             const updatedThread = channel.state.formatMessage(event.message);
             setThread(updatedThread);
           }

package/src/components/ChannelPreview/hooks/useLatestMessagePreview.ts

@@ -40,13 +40,15 @@ export type LatestMessagePreview<
 export type LatestMessagePreviewSelectorReturnType = {
   createdBy?: UserResponse | null;
   latestVotesByOption?: Record<string, PollVote[]>;
+  name?: string;
 };
 
 const selector = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
   nextValue: PollState<StreamChatGenerics>,
 ): LatestMessagePreviewSelectorReturnType => ({
   createdBy: nextValue.created_by,
   latestVotesByOption: nextValue.latest_votes_by_option,
+  name: nextValue.name,
 });
 
 const getMessageSenderName = <
@@ -145,8 +147,8 @@ const getLatestMessageDisplayText = <
       { bold: false, text: t('🏙 Attachment...') },
     ];
   }
-  if (message.poll && pollState) {
-    const { createdBy, latestVotesByOption } = pollState;
+  if (message.poll_id && pollState) {
+    const { createdBy, latestVotesByOption, name } = pollState;
     let latestVotes;
     if (latestVotesByOption) {
       latestVotes = Object.values(latestVotesByOption)
@@ -161,7 +163,7 @@ const getLatestMessageDisplayText = <
     }
     const previewMessage = `${
       client.userID === previewUser?.id ? 'You' : previewUser?.name
-    } ${previewAction}: ${message.poll.name}`;
+    } ${previewAction}: ${name}`;
     return [
       { bold: false, text: '📊 ' },
       { bold: false, text: previewMessage },
@@ -298,7 +300,8 @@ export const useLatestMessagePreview = <
 
   useEffect(() => {
     if (channelConfigExists) {
-      const read_events = channel.getConfig()?.read_events;
+      const read_events =
+        !channel.disconnected && !!channel?.id && channel.getConfig()?.read_events;
       if (typeof read_events === 'boolean') {
         setReadEvents(read_events);
       }
@@ -310,7 +313,7 @@ export const useLatestMessagePreview = <
   const poll = client.polls.fromState(pollId);
   const pollState: LatestMessagePreviewSelectorReturnType =
     useStateStore(poll?.state, selector) ?? {};
-  const { createdBy, latestVotesByOption } = pollState;
+  const { createdBy, latestVotesByOption, name } = pollState;
 
   useEffect(
     () =>
@@ -325,7 +328,15 @@ export const useLatestMessagePreview = <
         }),
       ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [channelLastMessageString, forceUpdate, readEvents, readStatus, latestVotesByOption, createdBy],
+    [
+      channelLastMessageString,
+      forceUpdate,
+      readEvents,
+      readStatus,
+      latestVotesByOption,
+      createdBy,
+      name,
+    ],
   );
 
   return latestMessagePreview;

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

@@ -235,11 +235,14 @@ export const handleEventToSyncDB = async <
       'poll.vote_removed',
     ].includes(type)
   ) {
-    const poll = event.poll;
+    const { poll, poll_vote, type } = event;
     if (poll) {
       return updatePollMessage({
+        eventType: type,
         flush,
         poll,
+        poll_vote,
+        userID: client?.userID || '',
       });
     }
   }

package/src/components/Message/MessageSimple/MessageContent.tsx

@@ -139,7 +139,7 @@ const MessageContentWithContext = <
 
   const {
     theme: {
-      colors: { grey_gainsboro, grey_whisper },
+      colors: { light_gray, grey_whisper },
       messageSimple: {
         content: {
           container: {
@@ -171,7 +171,7 @@ const MessageContentWithContext = <
 
   const { hasThreadReplies, isMessageErrorType, isMessageReceivedOrErrorType } = useMessageData({});
 
-  const repliesCurveColor = !isMessageReceivedOrErrorType ? backgroundColor : grey_gainsboro;
+  const repliesCurveColor = !isMessageReceivedOrErrorType ? backgroundColor : light_gray;
 
   const getBorderRadius = () => {
     // enum('top', 'middle', 'bottom', 'single')