status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-08 20:56:39 +00:00
Code Issues Projects Releases Wiki Activity

fix: ensure sending message state isn't shown when message is expired

Browse Source
This commit is contained in:
Pascal Precht 2020-11-12 15:17:29 +01:00 committed by Iuri Matias
parent cecaa292ba
commit 4ac8400038
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/CompactMessage.qml
View File

@ -114,7 +114,7 @@ Item {
SentMessage { SentMessage {
id: sentMessage id: sentMessage
visible: isCurrentUser && !timeout && isMessage && outgoingStatus !== "sent" visible: isCurrentUser && !timeout && !isExpired && isMessage && outgoingStatus !== "sent"
anchors.verticalCenter: chatTime.verticalCenter anchors.verticalCenter: chatTime.verticalCenter
anchors.left: chatTime.right anchors.left: chatTime.right
anchors.leftMargin: 8 anchors.leftMargin: 8

2
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
View File

@ -180,7 +180,7 @@ Item {
SentMessage { SentMessage {
id: sentMessage id: sentMessage
visible: isCurrentUser && !timeout && isMessage && outgoingStatus !== "sent" visible: isCurrentUser && !timeout && !isExpired && isMessage && outgoingStatus !== "sent"
anchors.top: chatTime.top anchors.top: chatTime.top
anchors.bottomMargin: Style.current.padding anchors.bottomMargin: Style.current.padding
anchors.right: chatTime.left anchors.right: chatTime.left

1
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/SentMessage.qml
View File

@ -4,7 +4,6 @@ import "../../../../../imports"
StyledText { StyledText {
id: sentMessage id: sentMessage
visible: isCurrentUser && !timeout && !isExpired && isMessage
color: Style.current.darkGrey color: Style.current.darkGrey
//% "Sending..." //% "Sending..."
text: qsTrId("sending") text: qsTrId("sending")