2020-06-17 19:18:31 +00:00
|
|
|
import QtQuick 2.13
|
|
|
|
import QtQuick.Controls 2.13
|
|
|
|
import QtQuick.Layouts 1.13
|
2020-05-27 21:59:34 +00:00
|
|
|
import "../../../../shared"
|
2020-09-22 14:45:09 +00:00
|
|
|
import "../../../../shared/status"
|
2020-05-27 21:59:34 +00:00
|
|
|
import "../../../../imports"
|
2020-06-02 09:54:46 +00:00
|
|
|
import "../components"
|
2020-05-27 21:59:34 +00:00
|
|
|
|
2021-04-28 15:30:41 +00:00
|
|
|
Item {
|
2020-08-14 12:08:09 +00:00
|
|
|
property int iconSize: 16
|
2020-05-27 21:59:34 +00:00
|
|
|
id: chatTopBarContent
|
|
|
|
height: 56
|
|
|
|
|
2020-09-22 14:50:14 +00:00
|
|
|
Loader {
|
2021-06-11 17:59:03 +00:00
|
|
|
property bool isGroupChatOrOneToOne: (chatsModel.activeChannel.chatType === Constants.chatTypePrivateGroupChat ||
|
|
|
|
chatsModel.activeChannel.chatType === Constants.chatTypeOneToOne)
|
|
|
|
anchors.left: parent.left
|
|
|
|
anchors.leftMargin: this.isGroupChatOrOneToOne ? Style.current.padding : Style.current.padding + 4
|
|
|
|
anchors.top: parent.top
|
|
|
|
anchors.topMargin: 4
|
|
|
|
sourceComponent: this.isGroupChatOrOneToOne ? chatInfoButton : chatInfo
|
2020-05-27 21:59:34 +00:00
|
|
|
}
|
|
|
|
|
2020-09-22 14:50:14 +00:00
|
|
|
Component {
|
|
|
|
id: chatInfoButton
|
|
|
|
StatusChatInfoButton {
|
2020-10-02 19:25:33 +00:00
|
|
|
chatId: chatsModel.activeChannel.id
|
2021-02-17 20:48:12 +00:00
|
|
|
chatName: {
|
|
|
|
if (chatsModel.activeChannel.chatType === Constants.chatTypePrivateGroupChat) {
|
|
|
|
return chatsModel.activeChannel.name
|
|
|
|
}
|
|
|
|
chatsModel.userNameOrAlias(chatsModel.activeChannel.id)
|
|
|
|
}
|
2020-09-22 14:50:14 +00:00
|
|
|
chatType: chatsModel.activeChannel.chatType
|
|
|
|
identicon: chatsModel.activeChannel.identicon
|
2021-01-15 18:36:42 +00:00
|
|
|
muted: chatsModel.activeChannel.muted
|
2020-09-22 14:50:14 +00:00
|
|
|
identiconSize: 36
|
|
|
|
|
|
|
|
onClicked: {
|
|
|
|
switch (chatsModel.activeChannel.chatType) {
|
2021-06-11 17:59:03 +00:00
|
|
|
case Constants.chatTypePrivateGroupChat:
|
|
|
|
openPopup(groupInfoPopupComponent, {channelType: GroupInfoPopup.ChannelType.ActiveChannel})
|
|
|
|
break;
|
|
|
|
case Constants.chatTypeOneToOne:
|
|
|
|
const profileImage = appMain.getProfileImage(chatsModel.activeChannel.id)
|
|
|
|
openProfilePopup(chatsModel.userNameOrAlias(chatsModel.activeChannel.id),
|
|
|
|
chatsModel.activeChannel.id, profileImage || chatsModel.activeChannel.identicon,
|
|
|
|
"", chatsModel.activeChannel.nickname)
|
|
|
|
break;
|
2020-09-22 14:50:14 +00:00
|
|
|
}
|
2020-08-07 19:26:51 +00:00
|
|
|
}
|
|
|
|
}
|
2020-05-27 21:59:34 +00:00
|
|
|
}
|
|
|
|
|
2020-09-22 14:50:14 +00:00
|
|
|
Component {
|
|
|
|
id: chatInfo
|
|
|
|
StatusChatInfo {
|
|
|
|
identiconSize: 36
|
2021-03-02 20:43:32 +00:00
|
|
|
chatId: chatsModel.activeChannel.id
|
2020-09-22 14:50:14 +00:00
|
|
|
chatName: chatsModel.activeChannel.name
|
|
|
|
chatType: chatsModel.activeChannel.chatType
|
|
|
|
identicon: chatsModel.activeChannel.identicon
|
2021-01-15 18:36:42 +00:00
|
|
|
muted: chatsModel.activeChannel.muted
|
2020-06-09 15:48:17 +00:00
|
|
|
}
|
2020-05-27 21:59:34 +00:00
|
|
|
}
|
|
|
|
|
2021-06-11 17:59:03 +00:00
|
|
|
Row {
|
|
|
|
height: parent.height
|
2020-05-27 21:59:34 +00:00
|
|
|
anchors.right: parent.right
|
2020-07-09 17:56:31 +00:00
|
|
|
anchors.rightMargin: Style.current.smallPadding
|
2021-06-11 17:59:03 +00:00
|
|
|
spacing: 12
|
2020-07-09 17:56:31 +00:00
|
|
|
|
2021-06-11 17:59:03 +00:00
|
|
|
StatusContextMenuButton {
|
|
|
|
id: moreActionsBtn
|
|
|
|
anchors.verticalCenter: parent.verticalCenter
|
2021-05-28 17:35:21 +00:00
|
|
|
|
2021-06-11 17:59:03 +00:00
|
|
|
onClicked: {
|
|
|
|
var menu = chatContextMenu;
|
|
|
|
var isPrivateGroupChat = chatsModel.activeChannel.chatType === Constants.chatTypePrivateGroupChat
|
|
|
|
if(isPrivateGroupChat){
|
|
|
|
menu = groupContextMenu
|
|
|
|
}
|
2020-06-10 19:41:03 +00:00
|
|
|
|
2021-06-11 17:59:03 +00:00
|
|
|
if (menu.opened) {
|
|
|
|
return menu.close()
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isPrivateGroupChat) {
|
|
|
|
menu.popup(moreActionsBtn.x, moreActionsBtn.height)
|
|
|
|
} else {
|
|
|
|
menu.openMenu(chatsModel.activeChannel, chatsModel.getActiveChannelIdx(),
|
|
|
|
moreActionsBtn.x - chatContextMenu.width + moreActionsBtn.width + 4,
|
|
|
|
moreActionsBtn.height - 4)
|
|
|
|
}
|
2021-03-17 09:22:35 +00:00
|
|
|
}
|
2021-01-11 20:08:35 +00:00
|
|
|
|
2021-06-11 17:59:03 +00:00
|
|
|
ChannelContextMenu {
|
|
|
|
id: chatContextMenu
|
|
|
|
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
|
|
|
|
}
|
2021-05-28 02:55:50 +00:00
|
|
|
|
2021-06-11 17:59:03 +00:00
|
|
|
PopupMenu {
|
|
|
|
id: groupContextMenu
|
|
|
|
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
|
|
|
|
Action {
|
|
|
|
icon.source: "../../../img/group_chat.svg"
|
|
|
|
icon.width: chatTopBarContent.iconSize
|
|
|
|
icon.height: chatTopBarContent.iconSize
|
|
|
|
//% "Group Information"
|
|
|
|
text: qsTrId("group-information")
|
fix: kick and re-invite user to group chat
Fixes: #2601.
Kicking a user and re-inviting them now correctly redisplays the join/decline options. Other combinations of User B leaving or declining an invitation are not handled. Please see the notes below for clarification.
Additionally, the group invite popup (that shows the list of members belonging to the group) correctly shows when a user is kicked or when a user leaves the group in real time. Previously, the popup needed to be reopened to display this.
fix: decline invitation crash
Declining a group invitation was crashing the app. This has been fixed.
### NOTES
1. In the case where User A invites User B to a group, but User B declines (or User B joins, then leaves), then from a status-go standpoint, User B is still part of the group, but the chat is marked as `active: false` for User B. This creates a situation where User B cannot re-join the group once s/he has declined the invitation. @cammellos mentioned there possibly will need to be a refactor of https://github.com/status-im/status-go/blob/cab6281dc520c24912de5b5226b42a2f8415aa40/protocol/messenger.go#L1710 (which, by retaining User B as a member, effectively prevents the re-invitation) once “swipe to delete” is implemented on mobile. There is an activity center notification received for User B that is meant to allow re-joining of the group when the notification is accepted. The activity center notification received from status-go looks like the following:
```json
"activityCenterNotifications": [
{
"id": "0x0e342d33",
"chatId": "e342d33f-dd05-4d7b-b14e-b5335e1a3ee9-0x043bf46aa874c377a34946eab67a32cf36c15907b328216dfce375d169fed7d81c21cada3229db1fd37c762d2c02702111a646657feca6621e2e948febcf378fb4",
"name": "test-22",
"type": 2,
"lastMessage": null,
"message": null,
"timestamp": 1623305612000,
"read": false,
"dismissed": false,
"accepted": false
}
]
```
2021-06-10 07:29:05 +00:00
|
|
|
onTriggered: openPopup(groupInfoPopupComponent, {channelType: GroupInfoPopup.ChannelType.ActiveChannel })
|
2021-06-11 17:59:03 +00:00
|
|
|
}
|
|
|
|
Action {
|
|
|
|
icon.source: "../../../img/close.svg"
|
|
|
|
icon.width: chatTopBarContent.iconSize
|
|
|
|
icon.height: chatTopBarContent.iconSize
|
|
|
|
//% "Clear History"
|
|
|
|
text: qsTrId("clear-history")
|
|
|
|
onTriggered: chatsModel.clearChatHistory(chatsModel.activeChannel.id)
|
|
|
|
}
|
|
|
|
Action {
|
|
|
|
icon.source: "../../../img/leave_chat.svg"
|
|
|
|
icon.width: chatTopBarContent.iconSize
|
|
|
|
icon.height: chatTopBarContent.iconSize
|
2021-05-28 17:35:21 +00:00
|
|
|
//% "Leave group"
|
2021-06-11 17:59:03 +00:00
|
|
|
text: qsTrId("leave-group")
|
|
|
|
onTriggered: {
|
|
|
|
//% "Leave group"
|
|
|
|
deleteChatConfirmationDialog.title = qsTrId("leave-group")
|
|
|
|
//% "Leave group"
|
|
|
|
deleteChatConfirmationDialog.confirmButtonLabel = qsTrId("leave-group")
|
|
|
|
//% "Are you sure you want to leave this chat?"
|
|
|
|
deleteChatConfirmationDialog.confirmationText = qsTrId("are-you-sure-you-want-to-leave-this-chat-")
|
|
|
|
deleteChatConfirmationDialog.open()
|
|
|
|
}
|
2021-05-28 17:35:21 +00:00
|
|
|
}
|
2020-05-27 21:59:34 +00:00
|
|
|
}
|
2021-03-17 09:22:35 +00:00
|
|
|
}
|
2020-05-27 21:59:34 +00:00
|
|
|
|
2021-06-11 17:41:59 +00:00
|
|
|
Rectangle {
|
2021-06-11 17:59:03 +00:00
|
|
|
id: separator
|
|
|
|
width: 1
|
|
|
|
height: 24
|
|
|
|
color: Style.current.separator
|
|
|
|
anchors.verticalCenter: parent.verticalCenter
|
2021-06-11 17:41:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
StatusIconButton {
|
|
|
|
id: activityCenterBtn
|
|
|
|
icon.name: "bell"
|
|
|
|
iconColor: Style.current.contextMenuButtonForegroundColor
|
|
|
|
hoveredIconColor: Style.current.contextMenuButtonForegroundColor
|
|
|
|
highlightedBackgroundColor: Style.current.contextMenuButtonBackgroundHoverColor
|
|
|
|
anchors.verticalCenter: parent.verticalCenter
|
|
|
|
|
|
|
|
onClicked: activityCenter.open()
|
|
|
|
|
|
|
|
Rectangle {
|
|
|
|
property int nbUnseenNotifs: chatsModel.activityNotificationList.unreadCount
|
|
|
|
|
|
|
|
id: badge
|
|
|
|
visible: nbUnseenNotifs > 0
|
|
|
|
anchors.top: parent.top
|
|
|
|
anchors.topMargin: -2
|
|
|
|
anchors.left: parent.right
|
|
|
|
anchors.leftMargin: -17
|
|
|
|
radius: height / 2
|
|
|
|
color: Style.current.blue
|
|
|
|
border.color: activityCenterBtn.hovered ? Style.current.secondaryBackground : Style.current.background
|
|
|
|
border.width: 2
|
|
|
|
width: badge.nbUnseenNotifs < 10 ? 18 : badgeText.width + 14
|
|
|
|
height: 18
|
|
|
|
|
|
|
|
Text {
|
|
|
|
id: badgeText
|
|
|
|
font.pixelSize: 12
|
|
|
|
color: Style.current.white
|
|
|
|
anchors.centerIn: parent
|
|
|
|
text: badge.nbUnseenNotifs
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-08-10 13:06:46 +00:00
|
|
|
|
2021-05-28 17:35:21 +00:00
|
|
|
ActivityCenter {
|
|
|
|
id: activityCenter
|
|
|
|
}
|
|
|
|
|
2020-08-10 13:06:46 +00:00
|
|
|
ConfirmationDialog {
|
|
|
|
id: deleteChatConfirmationDialog
|
2021-01-13 20:26:30 +00:00
|
|
|
btnType: "warn"
|
2020-08-10 13:06:46 +00:00
|
|
|
onConfirmButtonClicked: {
|
|
|
|
chatsModel.leaveActiveChat()
|
|
|
|
deleteChatConfirmationDialog.close()
|
|
|
|
}
|
|
|
|
}
|
2020-06-02 09:54:46 +00:00
|
|
|
}
|