Merge pull request #1614 from GetStream/develop

Next Release

Author: santhoshvai

docusaurus/docs/reactnative/guides/push_notifications_v2.mdx

@@ -279,10 +279,15 @@ messaging().setBackgroundMessageHandler(async remoteMessage => {
   });
 
   // display the notification
+  const { stream, ...rest } = remoteMessage.data ?? {};
+  const data = {
+    ...rest,
+    ...((stream as unknown as Record<string, string> | undefined) ?? {}), // extract and merge stream object if present
+  };
   await notifee.displayNotification({
     title: 'New message from ' + message.message.user.name,
     body: message.message.text,
-    data: remoteMessage.data,
+    data,
     android: {
       channelId,
       // add a press action to open the app on press
@@ -546,10 +551,15 @@ useEffect(() => {
     });
 
     // display the notification
+    const { stream, ...rest } = remoteMessage.data ?? {};
+    const data = {
+      ...rest,
+      ...((stream as unknown as Record<string, string> | undefined) ?? {}), // extract and merge stream object if present
+    };
     await notifee.displayNotification({
       title: 'New message from ' + message.message.user.name,
       body: message.message.text,
-      data: remoteMessage.data,
+      data,
       android: {
         channelId,
         pressAction: {

examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj

@@ -514,7 +514,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppDebug.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 148;
+				CURRENT_PROJECT_VERSION = 150;
 				DEVELOPMENT_TEAM = EHV7XZLAHA;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SampleApp/Info.plist;
@@ -545,7 +545,7 @@
 				CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppRelease.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 148;
+				CURRENT_PROJECT_VERSION = 150;
 				DEVELOPMENT_TEAM = EHV7XZLAHA;
 				INFOPLIST_FILE = SampleApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

examples/SampleApp/ios/SampleApp/Info.plist

@@ -17,11 +17,11 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.10.0</string>
+		<string>1.10.1</string>
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>148</string>
+		<string>150</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true />
 		<key>NSAppTransportSecurity</key>

examples/SampleApp/ios/SampleAppTests/Info.plist

@@ -15,10 +15,10 @@
 		<key>CFBundlePackageType</key>
 		<string>BNDL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.10.0</string>
+		<string>1.10.1</string>
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>148</string>
+		<string>150</string>
 	</dict>
 </plist>

examples/SampleApp/src/hooks/useChatClient.ts

@@ -45,6 +45,11 @@ messaging().setBackgroundMessageHandler(async (remoteMessage) => {
   });
 
   if (message.message.user?.name && message.message.text) {
+    const { stream, ...rest } = remoteMessage.data ?? {};
+    const data = {
+      ...rest,
+      ...((stream as unknown as Record<string, string> | undefined) ?? {}), // extract and merge stream object if present
+    };
     await notifee.displayNotification({
       android: {
         channelId,
@@ -53,7 +58,7 @@ messaging().setBackgroundMessageHandler(async (remoteMessage) => {
         },
       },
       body: message.message.text,
-      data: remoteMessage.data,
+      data,
       title: 'New message from ' + message.message.user.name,
     });
   }
@@ -111,6 +116,11 @@ export const useChatClient = () => {
             name: 'Foreground Messages',
           });
           // display the notification on foreground
+          const { stream, ...rest } = remoteMessage.data ?? {};
+          const data = {
+            ...rest,
+            ...((stream as unknown as Record<string, string> | undefined) ?? {}), // extract and merge stream object if present
+          };
           await notifee.displayNotification({
             android: {
               channelId,
@@ -119,7 +129,7 @@ export const useChatClient = () => {
               },
             },
             body: message.message.text,
-            data: remoteMessage.data,
+            data,
             title: 'New message from ' + message.message.user.name,
           });
         }

package/src/components/Attachment/Card.tsx

@@ -309,6 +309,7 @@ export const Card = <
 
   return (
     <MemoizedCard
+      key={`${message?.id}${message?.updated_at}`} // press listeners must change on message update, updating key ensures this
       {...{
         additionalTouchableProps,
         CardCover,

package/src/components/Attachment/Gallery.tsx

@@ -525,7 +525,9 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
     videos: nextVideos,
   } = nextProps;
 
-  const messageEqual = prevMessage?.id === nextMessage?.id;
+  const messageEqual =
+    prevMessage?.id === nextMessage?.id &&
+    `${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
   if (!messageEqual) return false;
 
   const groupStylesEqual =

package/src/components/Attachment/Giphy.tsx

@@ -392,11 +392,13 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
     attachment: { actions: prevActions, image_url: prevImageUrl, thumb_url: prevThumbUrl },
     giphyVersion: prevGiphyVersion,
     isMyMessage: prevIsMyMessage,
+    message: prevMessage,
   } = prevProps;
   const {
     attachment: { actions: nextActions, image_url: nextImageUrl, thumb_url: nextThumbUrl },
     giphyVersion: nextGiphyVersion,
     isMyMessage: nextIsMyMessage,
+    message: nextMessage,
   } = nextProps;
 
   const imageUrlEqual = prevImageUrl === nextImageUrl;
@@ -419,6 +421,11 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
   const isMyMessageEqual = prevIsMyMessage === nextIsMyMessage;
   if (!isMyMessageEqual) return false;
 
+  const messageEqual =
+    prevMessage?.id === nextMessage?.id &&
+    `${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
+
+  if (!messageEqual) return false;
   return true;
 };
 

package/src/components/Message/Message.tsx

@@ -763,7 +763,7 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
     prevMessage.type === nextMessage.type &&
     prevMessage.text === nextMessage.text &&
     prevMessage.pinned === nextMessage.pinned &&
-    prevMessage.updated_at === nextMessage.updated_at;
+    `${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
 
   if (!messageEqual) return false;