status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-21 19:18:53 +00:00
Code Issues Projects Releases Wiki Activity

fix: missing expired/timeout attributes in Resend button

Browse Source
This commit is contained in:
Richard Ramos 2021-11-18 12:18:37 -04:00
parent 0597fab1ac
commit c06c9dbc6d
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/AppLayouts/Chat/views/CompactMessageView.qml
View File

@ -21,6 +21,8 @@ Item {
property int contentType: 2 property int contentType: 2
property var container property var container
property bool isCurrentUser: false property bool isCurrentUser: false
property bool isExpired: false
property bool timeout: false
property bool isHovered: typeof root.messageStore.hoveredMessage !== "undefined" && root.messageStore.hoveredMessage === messageId property bool isHovered: typeof root.messageStore.hoveredMessage !== "undefined" && root.messageStore.hoveredMessage === messageId
property bool isMessageActive: typeof root.messageStore.activeMessage !== "undefined" && root.messageStore.activeMessage === messageId property bool isMessageActive: typeof root.messageStore.activeMessage !== "undefined" && root.messageStore.activeMessage === messageId
property bool headerRepeatCondition: (authorCurrentMsg !== authorPrevMsg || shouldRepeatHeader || dateGroupLbl.visible || chatReply.active) property bool headerRepeatCondition: (authorCurrentMsg !== authorPrevMsg || shouldRepeatHeader || dateGroupLbl.visible || chatReply.active)
@ -596,6 +598,8 @@ Item {
anchors.topMargin: chatTime.visible ? 0 : -4 anchors.topMargin: chatTime.visible ? 0 : -4
anchors.bottom: chatTime.visible ? chatTime.bottom : undefined anchors.bottom: chatTime.visible ? chatTime.bottom : undefined
isCurrentUser: root.isCurrentUser isCurrentUser: root.isCurrentUser
isExpired: root.isExpired
timeout: root.timeout
onClicked: { onClicked: {
root.store.chatsModelInst.messageView.resendMessage(chatId, messageId) root.store.chatsModelInst.messageView.resendMessage(chatId, messageId)
} }

4
ui/app/AppLayouts/Chat/views/MessageView.qml
View File

@ -319,6 +319,8 @@ Column {
NormalMessageView { NormalMessageView {
linkUrls: root.linkUrls linkUrls: root.linkUrls
isCurrentUser: root.isCurrentUser isCurrentUser: root.isCurrentUser
isExpired: root.isExpired
timeout: root.timeout
contentType: root.contentType contentType: root.contentType
container: root container: root
store: root.rootStore store: root.rootStore
@ -359,6 +361,8 @@ Column {
CompactMessageView { CompactMessageView {
linkUrls: root.linkUrls linkUrls: root.linkUrls
isCurrentUser: root.isCurrentUser isCurrentUser: root.isCurrentUser
isExpired: root.isExpired
timeout: root.timeout
contentType: root.contentType contentType: root.contentType
showEdit: root.showEdit showEdit: root.showEdit
container: root container: root

4
ui/app/AppLayouts/Chat/views/NormalMessageView.qml
View File

@ -19,6 +19,8 @@ Item {
property var messageStore property var messageStore
property string linkUrls: "" property string linkUrls: ""
property bool isCurrentUser: false property bool isCurrentUser: false
property bool isExpired: false
property bool timeout: false
property int contentType: 2 property int contentType: 2
property var container property var container
property bool headerRepeatCondition: (authorCurrentMsg !== authorPrevMsg property bool headerRepeatCondition: (authorCurrentMsg !== authorPrevMsg
@ -335,6 +337,8 @@ Item {
anchors.right: chatTime.left anchors.right: chatTime.left
anchors.rightMargin: 5 anchors.rightMargin: 5
isCurrentUser: root.isCurrentUser isCurrentUser: root.isCurrentUser
isExpired: root.isExpired
timeout: root.timeout
onClicked: { onClicked: {
root.store.chatsModelInst.messageView.resendMessage(chatId, messageId) root.store.chatsModelInst.messageView.resendMessage(chatId, messageId)
} }