fix: bring the CR flow in accordance with the requirements

Close #11121
status-im · Jul 6, 2023 · 5b6c64f · 5b6c64f
1 parent 7499182
commit 5b6c64f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 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/vendor/status-go b/vendor/status-go
+90 −77		protocol/messenger_contact_requests_test.go
+28 −95		protocol/messenger_contacts.go
+28 −38		protocol/messenger_handler.go