fix: bring the CR flow in accordance with the requirements

Close #11121
status-im · Jul 7, 2023 · 54057cb · 54057cb
1 parent 7499182
commit 54057cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
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/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -342,7 +342,7 @@ Item {
             }
         }
         header: {
-            if (!root.isContactBlocked && root.isOneToOne && root.rootStore.oneToOneChatContact) {
+            if ((!root.isContactBlocked || !root.isChatBlocked) && root.isOneToOne && root.rootStore.oneToOneChatContact) {
                 switch (root.rootStore.oneToOneChatContact.contactRequestState) {
                 case Constants.ContactRequestState.None: // no break
                 case Constants.ContactRequestState.Dismissed:

diff --git a/vendor/status-go b/vendor/status-go
+90 −77		protocol/messenger_contact_requests_test.go
+25 −95		protocol/messenger_contacts.go
+28 −38		protocol/messenger_handler.go