From bf8b31d22dd20a997e03c176497bc08391d9e60d Mon Sep 17 00:00:00 2001
From: flexsurfer <flexsurfer@users.noreply.github.com>
Date: Sat, 12 Aug 2023 06:39:26 +0200
Subject: [PATCH] Add preview and counters for CR system messages #16898
 (#16969)

---
 src/status_im2/contexts/chat/home/chat_list_item/view.cljs | 4 +++-
 src/status_im2/contexts/chat/messages/list/view.cljs       | 4 +---
 src/status_im2/subs/shell.cljs                             | 5 ++++-
 status-go-version.json                                     | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs b/src/status_im2/contexts/chat/home/chat_list_item/view.cljs
index 451c8d81f3..e9a251af23 100644
--- a/src/status_im2/contexts/chat/home/chat_list_item/view.cljs
+++ b/src/status_im2/contexts/chat/home/chat_list_item/view.cljs
@@ -88,7 +88,9 @@
             :dont-show    (i18n/label :t/Pinned-a-message)
             (i18n/label :t/Pinned-a-message))
 
-          constants/content-type-contact-request
+          (constants/content-type-contact-request
+           constants/content-type-system-message-mutual-event-removed
+           constants/content-type-system-message-mutual-event-accepted)
           (i18n/label :t/contact-request)
 
           constants/content-type-sticker
diff --git a/src/status_im2/contexts/chat/messages/list/view.cljs b/src/status_im2/contexts/chat/messages/list/view.cljs
index 842762fc1f..8e8babcbea 100644
--- a/src/status_im2/contexts/chat/messages/list/view.cljs
+++ b/src/status_im2/contexts/chat/messages/list/view.cljs
@@ -254,9 +254,7 @@
 (defn render-fn
   [{:keys [type value content-type] :as message-data} _ _
    {:keys [context keyboard-shown?]}]
-  ;;TODO temporary hide mutual-state-updates https://github.com/status-im/status-mobile/issues/16254
-  (when-not (#{constants/content-type-contact-request}
-             content-type)
+  (when (not= content-type constants/content-type-contact-request)
     [rn/view
      (add-inverted-y-android {:background-color (colors/theme-colors colors/white colors/neutral-95)})
      (cond
diff --git a/src/status_im2/subs/shell.cljs b/src/status_im2/subs/shell.cljs
index 6809d11b87..309d564dee 100644
--- a/src/status_im2/subs/shell.cljs
+++ b/src/status_im2/subs/shell.cljs
@@ -66,7 +66,10 @@
             :data         {:avatar         (community-avatar community)
                            :community-name (:name community)}})
 
-         (= content-type constants/content-type-contact-request)
+         (#{constants/content-type-contact-request
+            constants/content-type-system-message-mutual-event-removed
+            constants/content-type-system-message-mutual-event-accepted}
+          content-type)
          {:content-type constants/content-type-contact-request}))
 
      {:new-notifications?     (pos? (:unviewed-messages-count chat))
diff --git a/status-go-version.json b/status-go-version.json
index c94699e9ad..cfe1a25251 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.163.6",
-    "commit-sha1": "52fb1cd60589691f3fae61c84720eacd2b02ae6e",
-    "src-sha256": "0si6dy45cjgrdaj9zgw2f6k1slhnl734g0xr6q31yabigp3qq9ng"
+    "version": "v0.163.7",
+    "commit-sha1": "1ca165c5863f1000b2604f4b6c47bcadb2c7db0e",
+    "src-sha256": "018x6qsknnamblvv4afy8ndr8ck2aiz2nna7ir8q53kl2d9lsk7j"
 }