verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into chore.try-flashlist

This commit is contained in:
Diego Mello 2022-11-29 15:13:07 -03:00
parent a73a535221 7def88a7e2
commit 79be07072c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/containers/message/index.tsx
View File

@ -186,7 +186,9 @@ class MessageContainer extends React.Component<IMessageContainerProps, TAnyMessa
!(previousItem.groupable === false || item.groupable === false || broadcast === true) && !(previousItem.groupable === false || item.groupable === false || broadcast === true) &&
// @ts-ignore TODO: TAnyMessage vs TAnyMessageFromServer non-sense // @ts-ignore TODO: TAnyMessage vs TAnyMessageFromServer non-sense
item.ts - previousItem.ts < Message_GroupingPeriod * 1000 && item.ts - previousItem.ts < Message_GroupingPeriod * 1000 &&
previousItem.tmid === item.tmid previousItem.tmid === item.tmid &&
item.t !== 'rm' &&
previousItem.t !== 'rm'
) { ) {
return false; return false;
} }

1
app/containers/message/utils.ts
View File

@ -65,6 +65,7 @@ const messagesWithAuthorName: MessageTypesValues[] = [
'room_changed_avatar', 'room_changed_avatar',
'room_e2e_disabled', 'room_e2e_disabled',
'room_e2e_enabled', 'room_e2e_enabled',
'room-allowed-reacting',
'room-disallowed-reacting', 'room-disallowed-reacting',
'room-set-read-only', 'room-set-read-only',
'room-removed-read-only', 'room-removed-read-only',