status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-11 14:54:48 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat)

Browse Source 
Fixed #2430: Add members window shown when accessing 1x1 chat within group chat
This commit is contained in:
Andrei Smirnov 2021-07-06 18:25:14 +03:00 committed by Iuri Matias
parent 35198cb448
commit a5806aaf5a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
View File

@ -303,7 +303,7 @@ ModalPopup {
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
const userProfileImage = appMain.getProfileImage(model.pubKey) const userProfileImage = appMain.getProfileImage(model.pubKey)
openProfilePopup(model.userName, model.pubKey, userProfileImage || model.identicon, '', contactRow.nickname) openProfilePopup(model.userName, model.pubKey, userProfileImage || model.identicon, '', contactRow.nickname, popup)
} }
} }
} }

7
ui/app/AppLayouts/Chat/components/ProfilePopup.qml
View File

@ -341,8 +341,13 @@ ModalPopup {
width: visible ? implicitWidth : 0 width: visible ? implicitWidth : 0
onClicked: { onClicked: {
appMain.changeAppSection(Constants.chat) appMain.changeAppSection(Constants.chat)
chatsModel.channelView.joinPrivateChat(fromAuthor, ""); chatsModel.channelView.joinPrivateChat(fromAuthor, "")
popup.close() popup.close()
let pp = parentPopup
while (pp) {
pp.close()
pp = pp.parentPopup
}
} }
} }