From e0a0c6331fc565fc617d772d51a479656dfffac9 Mon Sep 17 00:00:00 2001
From: Ibrahem Khalil <vampirekid017@gmail.com>
Date: Tue, 27 Jun 2023 18:44:28 +0300
Subject: [PATCH] [16352] [Bugfix] New message indicator not showing on bottom
 navigation for unmuted chats and another bug (#16380)

---
 src/quo2/components/list_items/channel.cljs |  6 ++++--
 src/status_im2/subs/communities.cljs        | 11 +++++-----
 src/status_im2/subs/shell.cljs              | 24 ++++++++++-----------
 status-go-version.json                      |  6 +++---
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/quo2/components/list_items/channel.cljs b/src/quo2/components/list_items/channel.cljs
index f22ebc53f7..bf2521f8d5 100644
--- a/src/quo2/components/list_items/channel.cljs
+++ b/src/quo2/components/list_items/channel.cljs
@@ -56,8 +56,10 @@
        (when (and (not locked?)
                   muted?)
          [quo2.icons/icon :i/muted
-          {:size  20
-           :color colors/neutral-40}])
+          {:size            20
+           :color           colors/neutral-40
+           :container-style {:margin-right 1
+                             :margin-top   2}}])
        (when (and (not locked?)
                   (not muted?)
                   (pos? (int mentions-count)))
diff --git a/src/status_im2/subs/communities.cljs b/src/status_im2/subs/communities.cljs
index 73adb99cbd..df1aa973ab 100644
--- a/src/status_im2/subs/communities.cljs
+++ b/src/status_im2/subs/communities.cljs
@@ -166,12 +166,11 @@
 (defn calculate-unviewed-counts
   [chats]
   (reduce (fn [acc {:keys [unviewed-mentions-count unviewed-messages-count muted]}]
-            {:unviewed-messages-count (if-not muted
-                                        (+ (:unviewed-messages-count acc) (or unviewed-messages-count 0))
-                                        0)
-             :unviewed-mentions-count (if-not muted
-                                        (+ (:unviewed-mentions-count acc) (or unviewed-mentions-count 0))
-                                        0)})
+            (if-not muted
+              (-> acc
+                  (update :unviewed-messages-count + unviewed-messages-count)
+                  (update :unviewed-mentions-count + unviewed-mentions-count))
+              acc))
           {:unviewed-messages-count 0
            :unviewed-mentions-count 0}
           chats))
diff --git a/src/status_im2/subs/shell.cljs b/src/status_im2/subs/shell.cljs
index 809141f289..c4eff842f7 100644
--- a/src/status_im2/subs/shell.cljs
+++ b/src/status_im2/subs/shell.cljs
@@ -190,19 +190,19 @@
    (let [{:keys [chats-stack community-stack]}
          (reduce
           (fn [acc [_ {:keys [unviewed-messages-count unviewed-mentions-count chat-type muted]}]]
-            (case chat-type
-              constants/community-chat-type
-              (when-not muted
-                (-> acc
-                    (update-in [:community-stack :unviewed-messages-count] + unviewed-messages-count)
-                    (update-in [:community-stack :unviewed-mentions-count] + unviewed-mentions-count)))
-
-              (constants/private-group-chat-type constants/one-to-one-chat-type)
-              (when-not muted
-                (-> acc
-                    (update-in [:chats-stack :unviewed-messages-count] + unviewed-messages-count)
-                    (update-in [:chats-stack :unviewed-mentions-count] + unviewed-mentions-count)))
+            (cond
+              (and (not muted)
+                   (= chat-type constants/community-chat-type))
+              (-> acc
+                  (update-in [:community-stack :unviewed-messages-count] + unviewed-messages-count)
+                  (update-in [:community-stack :unviewed-mentions-count] + unviewed-mentions-count))
 
+              (and (not muted)
+                   (#{constants/private-group-chat-type constants/one-to-one-chat-type} chat-type))
+              (-> acc
+                  (update-in [:chats-stack :unviewed-messages-count] + unviewed-messages-count)
+                  (update-in [:chats-stack :unviewed-mentions-count] + unviewed-mentions-count))
+              :else
               acc))
           {:chats-stack     {:unviewed-messages-count 0 :unviewed-mentions-count 0}
            :community-stack {:unviewed-messages-count 0 :unviewed-mentions-count 0}}
diff --git a/status-go-version.json b/status-go-version.json
index 361fcce682..6b84cf28f1 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.159.6",
-    "commit-sha1": "f23cb4065bce9cff3cb8174a10bf9d8d49a4789f",
-    "src-sha256": "1yv24cqj2gnf2rgws39vc0j54l0dfxa6vc74iqcxgm50gd73gf6s"
+    "version": "v0.159.7",
+    "commit-sha1": "323e02eb1708a30cb0c566b876f511001e3e2c0e",
+    "src-sha256": "1kxpv05kkdvlnb2n0abd6wmxk3f3cw3a4pspsvsbwyn5jparvbkq"
 }