fix: Fix behaviour issues with CRs and mutual update events

Close #11121
status-im · Jul 11, 2023 · 56b6634 · 56b6634
1 parent 9629a14
commit 56b6634
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 16 deletions.
diff --git a/src/app_service/common/types.nim b/src/app_service/common/types.nim
@@ -19,7 +19,9 @@ type
     ContactIdentityVerification = 13
     # Local only
     SystemMessagePinnedMessage = 14
-    SystemMessageMutualStateUpdate = 15
+    SystemMessageMutualEventSent = 15
+    SystemMessageMutualEventAccepted = 16
+    SystemMessageMutualEventRemoved = 17
 
 proc toContentType*(value: int): ContentType =
   try:

diff --git a/src/app_service/service/message/service.nim b/src/app_service/service/message/service.nim
@@ -260,11 +260,8 @@ QtObject:
       error "error: received `chats` array for handling messages update is empty"
       return
 
-    # Temporary commented until we provide appropriate flags on the `status-go` side to cover all sections.
-    # blocking contact deletes the chat on the `status-go` side, after unblocking it, `active` prop is still false
-    # that's the reason why the following check is commented out here.
-    # if (not chats[0].active):
-    #   return
+    if (not chats[0].active):
+      return
 
     self.bulkReplacePubKeysWithDisplayNames(messages)
 

diff --git a/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml b/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
@@ -23,7 +23,9 @@ Control {
         Invitation = 7,
         DiscordMessage = 8,
         SystemMessagePinnedMessage = 14,
-        SystemMessageMutualStateUpdate = 15
+        SystemMessageMutualEventSent = 15,
+        SystemMessageMutualEventAccepted = 16,
+        SystemMessageMutualEventRemoved = 17
     }
 
     property list<Item> quickActions
@@ -191,7 +193,9 @@ Control {
                 Layout.fillWidth: true
                 active: isAReply &&
                     root.messageDetails.contentType !== StatusMessage.ContentType.SystemMessagePinnedMessage &&
-                    root.messageDetails.contentType !== StatusMessage.ContentType.SystemMessageMutualStateUpdate
+                    root.messageDetails.contentType !== StatusMessage.ContentType.SystemMessageMutualEventSent &&
+                    root.messageDetails.contentType !== StatusMessage.ContentType.SystemMessageMutualEventAccepted &&
+                    root.messageDetails.contentType !== StatusMessage.ContentType.SystemMessageMutualEventRemoved
 
                 visible: active
                 sourceComponent: StatusMessageReply {

diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
@@ -195,8 +195,11 @@ Loader {
         case Constants.messageContentType.fetchMoreMessagesButton:
             return fetchMoreMessagesButtonComponent
         case Constants.messageContentType.systemMessagePrivateGroupType: // no break
-        case Constants.messageContentType.systemMessageMutualStateUpdate:
-            return systemMessageComponent
+            return systemMessageGroupComponent
+        case Constants.messageContentType.systemMessageMutualEventSent:
+        case Constants.messageContentType.systemMessageMutualEventAccepted:
+        case Constants.messageContentType.systemMessageMutualEventRemoved:
+            return systemMessageMutualEventComponent
         case Constants.messageContentType.systemMessagePinnedMessage:
             return systemMessagePinnedMessageComponent
         case Constants.messageContentType.gapType:
@@ -271,8 +274,12 @@ Loader {
                 return StatusMessage.ContentType.DiscordMessage;
             case Constants.messageContentType.systemMessagePinnedMessage:
                 return StatusMessage.ContentType.SystemMessagePinnedMessage;
-            case Constants.messageContentType.systemMessageMutualStateUpdate:
-                return StatusMessage.ContentType.SystemMessageMutualStateUpdate;
+            case Constants.messageContentType.systemMessageMutualEventSent:
+                return StatusMessage.ContentType.SystemMessageMutualEventSent;
+            case Constants.messageContentType.systemMessageMutualEventAccepted:
+                return StatusMessage.ContentType.SystemMessageMutualEventAccepted;
+            case Constants.messageContentType.systemMessageMutualEventRemoved:
+                return StatusMessage.ContentType.SystemMessageMutualEventRemoved;
             case Constants.messageContentType.fetchMoreMessagesButton:
             case Constants.messageContentType.chatIdentifier:
             case Constants.messageContentType.unknownContentType:
@@ -348,7 +355,7 @@ Loader {
     }
 
     Component {
-        id: systemMessageComponent
+        id: systemMessageGroupComponent
 
         StyledText {
             wrapMode: Text.Wrap
@@ -379,6 +386,38 @@ Loader {
         }
     }
 
+    Component{
+        id: systemMessageMutualEventComponent
+
+        StyledText {
+            text: {
+                switch (root.messageContentType) {
+                    case Constants.messageContentType.systemMessageMutualEventSent:
+                        return root.amISender ?
+                            qsTr("You sent a contact request to %1").arg(root.senderDisplayName) :
+                            qsTr("%1 sent you a contact request").arg(root.senderDisplayName)
+                    case Constants.messageContentType.systemMessageMutualEventAccepted:
+                        return root.amISender ?
+                            qsTr("You accepted %1's contact request").arg(root.senderDisplayName) :
+                            qsTr("%1 accepted your contact request").arg(root.senderDisplayName)
+                    case Constants.messageContentType.systemMessageMutualEventRemoved:
+                        return root.amISender ?
+                            qsTr("You removed %1 as a contact").arg(root.senderDisplayName) :
+                            qsTr("%1 removed you as a contact").arg(root.senderDisplayName)
+                    default:
+                        return root.messageText
+                }
+            }
+            font.pixelSize: 14
+            color: Style.current.secondaryText
+            width: parent.width - 120
+            horizontalAlignment: Text.AlignHCenter
+            anchors.horizontalCenter: parent.horizontalCenter
+            textFormat: Text.RichText
+            topPadding: root.prevMessageIndex === 1 ? Style.current.bigPadding : 0
+        }
+    }
+
     Component {
         id: systemMessagePinnedMessageComponent
 
@@ -481,7 +520,9 @@ Loader {
                 showHeader: root.shouldRepeatHeader || dateGroupLabel.visible || isAReply ||
                             root.prevMessageContentType === Constants.messageContentType.systemMessagePrivateGroupType ||
                             root.prevMessageContentType === Constants.messageContentType.systemMessagePinnedMessage ||
-                            root.prevMessageContentType === Constants.messageContentType.systemMessageMutualStateUpdate ||
+                            root.prevMessageContentType === Constants.messageContentType.systemMessageMutualEventSent ||
+                            root.prevMessageContentType === Constants.messageContentType.systemMessageMutualEventAccepted ||
+                            root.prevMessageContentType === Constants.messageContentType.systemMessageMutualEventRemoved ||
                             root.senderId !== root.prevMessageSenderId
                 isActiveMessage: d.isMessageActive
                 topPadding: showHeader ? Style.current.halfPadding : 0

diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml
@@ -430,7 +430,9 @@ QtObject {
         readonly property int contactRequestType: 11
         readonly property int discordMessageType: 12
         readonly property int systemMessagePinnedMessage: 14
-        readonly property int systemMessageMutualStateUpdate: 15
+        readonly property int systemMessageMutualEventSent: 15
+        readonly property int systemMessageMutualEventAccepted: 16
+        readonly property int systemMessageMutualEventRemoved: 17
     }
 
     readonly property QtObject messageModelRoles: QtObject {

diff --git a/vendor/status-go b/vendor/status-go