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

refactor(@desktop/chat): username is misplaced when sending messages in the channel 

A reason why this issue was happening is that prev and next message
were set in a wrong way. An important thing is that list of messages is set
in descending order in terms of `timestamp` of a message, that means a
message with the most recent time is added at index 0.

That further means that getting an index of the previous message from the
current one is defined as `currentIndex + 1` and getting an index of the next
one is defined as `currentIndex - 1`.

Fixes #4417
This commit is contained in:
Sale Djenic 2022-01-14 12:38:45 +01:00
parent 7439b79039
commit 9938ea672d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,10 +341,13 @@ Item {
// This is possible since we have all data loaded before we load qml.
// When we fetch messages to fulfill a gap we have to set them at once.
prevMessageIndex: index - 1
prevMessageAsJsonObj: messageStore.getMessageByIndexAsJson(index - 1)
nextMessageIndex: index + 1
nextMessageAsJsonObj: messageStore.getMessageByIndexAsJson(index + 1)
// Also one important thing here is that messages are set in descending order
// in terms of `timestamp` of a message, that means a message with the most
// recent time is added at index 0.
prevMessageIndex: index + 1
prevMessageAsJsonObj: messageStore.getMessageByIndexAsJson(index + 1)
nextMessageIndex: index - 1
nextMessageAsJsonObj: messageStore.getMessageByIndexAsJson(index - 1)
onOpenStickerPackPopup: {
root.openStickerPackPopup(stickerPackId);
}

6
ui/imports/shared/views/chat/CompactMessageView.qml
View File

@ -449,10 +449,10 @@ Item {
anchors.top: chatName.visible ? chatName.bottom :
chatReply.active ? chatReply.bottom :
pinnedRectangleLoader.active ? pinnedRectangleLoader.bottom : parent.top
anchors.left: chatImage.right
anchors.leftMargin: chatHorizontalPadding
anchors.left: parent.left
anchors.leftMargin: chatImage.imageWidth + Style.current.padding + root.chatHorizontalPadding
anchors.right: parent.right
anchors.rightMargin: chatHorizontalPadding
anchors.rightMargin: root.chatHorizontalPadding
visible: !isEdit
ChatTextView {
id: chatText