chore: resolve conflicts from develop

Author: khushal87

examples/SampleApp/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+### [1.30.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.3) (2024-10-15)
+
+
+### Workspaces
+
+* Following linked packages updated: [stream-chat-react-native]
+
 ### [1.30.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.2) (2024-10-14)
 
 ### Workspaces

examples/SampleApp/package.json

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

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+### [5.39.3](https://github.com/GetStream/stream-chat-react-native/compare/v5.39.2...v5.39.3) (2024-10-15)
+
+
+### Bug Fixes
+
+* ChannelAvatar crash when used outside of ChannelList ([#2708](https://github.com/GetStream/stream-chat-react-native/issues/2708)) ([85f4ab2](https://github.com/GetStream/stream-chat-react-native/commit/85f4ab21adf4b0da636475f0285e3360d9b1309b))
+
 ### [5.39.2](https://github.com/GetStream/stream-chat-react-native/compare/v5.39.1...v5.39.2) (2024-10-14)
 
 ### Bug Fixes

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.39.2",
+  "version": "5.39.3",
   "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.39.2"
+    "stream-chat-react-native-core": "5.39.3"
   },
   "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.39.2",
+  "version": "5.39.3",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -11,7 +11,7 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "es6-symbol": "^3.1.3",
-    "stream-chat-react-native-core": "5.39.2"
+    "stream-chat-react-native-core": "5.39.3"
   },
   "peerDependencies": {
     "@bam.tech/react-native-image-resizer": ">=3.0.10",

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.39.2",
+  "version": "5.39.3",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/ChannelPreview/ChannelPreviewMessenger.tsx

@@ -212,6 +212,7 @@ export const ChannelPreviewMessenger = <
   props: ChannelPreviewMessengerProps<StreamChatGenerics>,
 ) => {
   const {
+    forceUpdate,
     maxUnreadCount,
     onSelect,
     PreviewAvatar,
@@ -224,6 +225,7 @@ export const ChannelPreviewMessenger = <
   return (
     <MemoizedChannelPreviewMessengerWithContext
       {...{
+        forceUpdate,
         maxUnreadCount,
         onSelect,
         PreviewAvatar,

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

@@ -2,7 +2,6 @@ import { useEffect, useState } from 'react';
 
 import type { Channel, StreamChat } from 'stream-chat';
 
-import { useChannelsContext } from '../../../contexts';
 import { useChatContext } from '../../../contexts/chatContext/ChatContext';
 
 import type { DefaultStreamChatGenerics } from '../../../types/types';
@@ -38,7 +37,6 @@ export const useChannelPreviewDisplayPresence = <
   channel: Channel<StreamChatGenerics>,
 ) => {
   const { client } = useChatContext<StreamChatGenerics>();
-  const { forceUpdate } = useChannelsContext<StreamChatGenerics>();
 
   const currentUserId = client.userID;
   const members = Object.values(channel.state.members).filter(
@@ -50,7 +48,7 @@ export const useChannelPreviewDisplayPresence = <
 
   useEffect(() => {
     setDisplayPresence(getChannelPreviewDisplayPresence(channel, client));
-  }, [channel, channelMemberOnline, client, forceUpdate]);
+  }, [channel, channelMemberOnline, client]);
 
   return displayPresence;
 };

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.39.2"
+  "version": "5.39.3"
 }