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(pinning): fix warnings

This commit is contained in:
Lukáš Tinkl 2022-09-12 18:35:20 +02:00 committed by Lukáš Tinkl
parent eaed074957
commit 5e0d5a9f8c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/views/ChatContentView.qml
View File

@ -90,7 +90,7 @@ ColumnLayout {
onPinnedMessagesLimitReached: { onPinnedMessagesLimitReached: {
if(!chatContentModule) { if(!chatContentModule) {
console.debug("error on open pinned messages limit reached from message context menu - chat content module is not set") console.warn("error on open pinned messages limit reached from message context menu - chat content module is not set")
return return
} }
Global.openPopup(Global.pinnedMessagesPopup, { Global.openPopup(Global.pinnedMessagesPopup, {

5
ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml
View File

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
import StatusQ.Core 0.1 import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1 import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1 import StatusQ.Controls 0.1
import StatusQ.Core.Utils 0.1 as SQUtils
import utils 1.0 import utils 1.0
@ -262,7 +263,7 @@ RowLayout {
case Constants.chatType.privateGroupChat: case Constants.chatType.privateGroupChat:
return qsTr("%n member(s)", "", chatContentModule.usersModule.model.count) return qsTr("%n member(s)", "", chatContentModule.usersModule.model.count)
case Constants.chatType.communityChat: case Constants.chatType.communityChat:
return Utils.linkifyAndXSS(chatContentModule.chatDetails.description).trim() return SQUtils.Utils.linkifyAndXSS(chatContentModule.chatDetails.description).trim()
default: default:
return "" return ""
} }
@ -288,7 +289,7 @@ RowLayout {
console.debug("error on open pinned messages - chat content module is not set") console.debug("error on open pinned messages - chat content module is not set")
return return
} }
Global.openPopup(pinnedMessagesPopupComponent, { Global.openPopup(Global.pinnedMessagesPopup, {
store: rootStore, store: rootStore,
messageStore: root.rootStore.messageStore, messageStore: root.rootStore.messageStore,
pinnedMessagesModel: chatContentModule.pinnedMessagesModel, pinnedMessagesModel: chatContentModule.pinnedMessagesModel,

2
ui/imports/shared/views/chat/MessageContextMenuView.qml
View File

@ -193,7 +193,7 @@ StatusPopupMenu {
icon: root.selectedUserIcon icon: root.selectedUserIcon
trustStatus: d.contactDetails && d.contactDetails.trustStatus ? d.contactDetails.trustStatus trustStatus: d.contactDetails && d.contactDetails.trustStatus ? d.contactDetails.trustStatus
: Constants.trustStatus.unknown : Constants.trustStatus.unknown
isContact: root.isMyMutualContact isContact: root.isContact
isCurrentUser: root.isMe isCurrentUser: root.isMe
} }