diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml index c40bbb3bc4..315dbe15bb 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn.qml @@ -222,7 +222,10 @@ Item { chatInfoButton.onClicked: { switch (chatsModel.channelView.activeChannel.chatType) { case Constants.chatTypePrivateGroupChat: - openPopup(groupInfoPopupComponent, {channelType: GroupInfoPopup.ChannelType.ActiveChannel}) + openPopup(groupInfoPopupComponent, { + channelType: GroupInfoPopup.ChannelType.ActiveChannel, + channel: chatsModel.channelView.activeChannel + }) break; case Constants.chatTypeOneToOne: openProfilePopup(chatsModel.userNameOrAlias(chatsModel.channelView.activeChannel.id), diff --git a/ui/app/AppLayouts/Chat/components/ChatContextMenu.qml b/ui/app/AppLayouts/Chat/components/ChatContextMenu.qml index f3bd2bf943..68cc2c2d00 100644 --- a/ui/app/AppLayouts/Chat/components/ChatContextMenu.qml +++ b/ui/app/AppLayouts/Chat/components/ChatContextMenu.qml @@ -44,7 +44,10 @@ StatusPopupMenu { ) } if (chatItem.chatType === Constants.chatTypePrivateGroupChat) { - return openPopup(groupInfoPopupComponent, {channelType: GroupInfoPopup.ChannelType.ContextChannel}) + return openPopup(groupInfoPopupComponent, { + channel: chatItem, + channelType: GroupInfoPopup.ChannelType.ContextChannel + }) } } } diff --git a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml index b011b91fe0..419d040fd5 100644 --- a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml +++ b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml @@ -18,13 +18,7 @@ ModalPopup { readonly property int maxMembers: 10 property var pubKeys: [] property int channelType: GroupInfoPopup.ChannelType.ActiveChannel - property QtObject channel: { - if (channelType === GroupInfoPopup.ChannelType.ActiveChannel) { - return chatsModel.channelView.activeChannel - } else if (channelType === GroupInfoPopup.ChannelType.ContextChannel) { - return chatsModel.channelView.contextChannel - } - } + property QtObject channel property bool isAdmin: false property Component pinnedMessagesPopupComponent