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: fix qml warnings caused by rebases

This commit is contained in:
Jonathan Rainville 2021-06-23 13:30:57 -04:00 committed by Iuri Matias
parent ba01d6ad75
commit 1bcfd9df14
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
View File

@ -168,6 +168,14 @@ ScrollView {
return true return true
} }
Connections {
target: chatsModel
onAppReady: {
chatLogView.scrollToBottom(true)
}
}
Connections { Connections {
target: chatsModel.messageView target: chatsModel.messageView
onMessagesLoaded: { onMessagesLoaded: {
@ -188,10 +196,6 @@ ScrollView {
} }
} }
onAppReady: {
chatLogView.scrollToBottom(true)
}
onMessageNotificationPushed: function(chatId, msg, messageType, chatType, timestamp, identicon, username, hasMention, isAddedContact, channelName) { onMessageNotificationPushed: function(chatId, msg, messageType, chatType, timestamp, identicon, username, hasMention, isAddedContact, channelName) {
if (appSettings.notificationSetting == Constants.notifyAllMessages || if (appSettings.notificationSetting == Constants.notifyAllMessages ||
(appSettings.notificationSetting == Constants.notifyJustMentions && hasMention)) { (appSettings.notificationSetting == Constants.notifyJustMentions && hasMention)) {