From 4ac840003859beff902f42c58d6f608cdca61737 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 12 Nov 2020 15:17:29 +0100 Subject: [PATCH] fix: ensure `sending` message state isn't shown when message is expired --- .../Chat/ChatColumn/MessageComponents/CompactMessage.qml | 2 +- .../Chat/ChatColumn/MessageComponents/NormalMessage.qml | 2 +- .../Chat/ChatColumn/MessageComponents/SentMessage.qml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml index 168eb3e9d1..abcb70ef86 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml @@ -114,7 +114,7 @@ Item { SentMessage { id: sentMessage - visible: isCurrentUser && !timeout && isMessage && outgoingStatus !== "sent" + visible: isCurrentUser && !timeout && !isExpired && isMessage && outgoingStatus !== "sent" anchors.verticalCenter: chatTime.verticalCenter anchors.left: chatTime.right anchors.leftMargin: 8 diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml index f2bedc5af3..2c894a9df5 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml @@ -180,7 +180,7 @@ Item { SentMessage { id: sentMessage - visible: isCurrentUser && !timeout && isMessage && outgoingStatus !== "sent" + visible: isCurrentUser && !timeout && !isExpired && isMessage && outgoingStatus !== "sent" anchors.top: chatTime.top anchors.bottomMargin: Style.current.padding anchors.right: chatTime.left diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/SentMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/SentMessage.qml index 0a82c3f6ba..e77079022e 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/SentMessage.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/SentMessage.qml @@ -4,7 +4,6 @@ import "../../../../../imports" StyledText { id: sentMessage - visible: isCurrentUser && !timeout && !isExpired && isMessage color: Style.current.darkGrey //% "Sending..." text: qsTrId("sending")