status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/chats): Always show message header in the private group chats after sestem message

This commit is contained in:
mprakhov 2023-03-14 01:37:22 +01:00 committed by Mykhailo Prakhov
parent 3a737f97a7
commit 494ab84fe1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
View File

@ -213,7 +213,6 @@ Item {
id: msgDelegate id: msgDelegate
width: ListView.view.width width: ListView.view.width
height: implicitHeight
objectName: "chatMessageViewDelegate" objectName: "chatMessageViewDelegate"
rootStore: root.rootStore rootStore: root.rootStore

4
ui/imports/shared/views/chat/MessageView.qml
View File

@ -55,6 +55,7 @@ Loader {
property string messageOutgoingStatus: "" property string messageOutgoingStatus: ""
property string resendError: "" property string resendError: ""
property int messageContentType: Constants.messageContentType.messageType property int messageContentType: Constants.messageContentType.messageType
property bool pinnedMessage: false property bool pinnedMessage: false
property string messagePinnedBy: "" property string messagePinnedBy: ""
property var reactionsModel: [] property var reactionsModel: []
@ -443,7 +444,8 @@ Loader {
reactionsModel: root.reactionsModel reactionsModel: root.reactionsModel
showHeader: root.shouldRepeatHeader || dateGroupLabel.visible || isAReply || showHeader: root.shouldRepeatHeader || dateGroupLabel.visible || isAReply ||
(root.prevMessageContentType !== Constants.messageContentType.systemMessagePrivateGroupType && root.senderId !== root.prevMessageSenderId) root.prevMessageContentType === Constants.messageContentType.systemMessagePrivateGroupType ||
root.senderId !== root.prevMessageSenderId
isActiveMessage: d.isMessageActive isActiveMessage: d.isMessageActive
topPadding: showHeader ? Style.current.halfPadding : 0 topPadding: showHeader ? Style.current.halfPadding : 0
bottomPadding: showHeader && d.nextMessageHasHeader() ? Style.current.halfPadding : 2 bottomPadding: showHeader && d.nextMessageHasHeader() ? Style.current.halfPadding : 2