Skip to content

Commit 5649d77

Browse files
Merge branch 'develop' of https://github.com/GetStream/stream-chat-react-native into v5-release
2 parents bcda9f5 + d3e6770 commit 5649d77

File tree

7 files changed

+18
-8
lines changed

7 files changed

+18
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
CLANG_ENABLE_MODULES = YES;
515515
CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppDebug.entitlements;
516516
CODE_SIGN_IDENTITY = "iPhone Developer";
517-
CURRENT_PROJECT_VERSION = 148;
517+
CURRENT_PROJECT_VERSION = 150;
518518
DEVELOPMENT_TEAM = EHV7XZLAHA;
519519
ENABLE_BITCODE = NO;
520520
INFOPLIST_FILE = SampleApp/Info.plist;
@@ -545,7 +545,7 @@
545545
CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppRelease.entitlements;
546546
CODE_SIGN_IDENTITY = "iPhone Distribution";
547547
CODE_SIGN_STYLE = Manual;
548-
CURRENT_PROJECT_VERSION = 148;
548+
CURRENT_PROJECT_VERSION = 150;
549549
DEVELOPMENT_TEAM = EHV7XZLAHA;
550550
INFOPLIST_FILE = SampleApp/Info.plist;
551551
LD_RUNPATH_SEARCH_PATHS = (

examples/SampleApp/ios/SampleApp/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.10.0</string>
20+
<string>1.10.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>148</string>
24+
<string>150</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true />
2727
<key>NSAppTransportSecurity</key>

examples/SampleApp/ios/SampleAppTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.10.0</string>
18+
<string>1.10.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>148</string>
22+
<string>150</string>
2323
</dict>
2424
</plist>

package/src/components/Attachment/Card.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ export const Card = <
309309

310310
return (
311311
<MemoizedCard
312+
key={`${message?.id}${message?.updated_at}`} // press listeners must change on message update, updating key ensures this
312313
{...{
313314
additionalTouchableProps,
314315
CardCover,

package/src/components/Attachment/Gallery.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,9 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
525525
videos: nextVideos,
526526
} = nextProps;
527527

528-
const messageEqual = prevMessage?.id === nextMessage?.id;
528+
const messageEqual =
529+
prevMessage?.id === nextMessage?.id &&
530+
`${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
529531
if (!messageEqual) return false;
530532

531533
const groupStylesEqual =

package/src/components/Attachment/Giphy.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,13 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
391391
attachment: { actions: prevActions, image_url: prevImageUrl, thumb_url: prevThumbUrl },
392392
giphyVersion: prevGiphyVersion,
393393
isMyMessage: prevIsMyMessage,
394+
message: prevMessage,
394395
} = prevProps;
395396
const {
396397
attachment: { actions: nextActions, image_url: nextImageUrl, thumb_url: nextThumbUrl },
397398
giphyVersion: nextGiphyVersion,
398399
isMyMessage: nextIsMyMessage,
400+
message: nextMessage,
399401
} = nextProps;
400402

401403
const imageUrlEqual = prevImageUrl === nextImageUrl;
@@ -418,6 +420,11 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
418420
const isMyMessageEqual = prevIsMyMessage === nextIsMyMessage;
419421
if (!isMyMessageEqual) return false;
420422

423+
const messageEqual =
424+
prevMessage?.id === nextMessage?.id &&
425+
`${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
426+
427+
if (!messageEqual) return false;
421428
return true;
422429
};
423430

package/src/components/Message/Message.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = Default
763763
prevMessage.type === nextMessage.type &&
764764
prevMessage.text === nextMessage.text &&
765765
prevMessage.pinned === nextMessage.pinned &&
766-
prevMessage.updated_at === nextMessage.updated_at;
766+
`${prevMessage?.updated_at}` === `${nextMessage?.updated_at}`;
767767

768768
if (!messageEqual) return false;
769769

0 commit comments

Comments
 (0)