[#12531 pairing] Sync read messages

status-im · Oct 20, 2021 · bb7c61d · bb7c61d
1 parent 6591611
commit bb7c61d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs
@@ -65,12 +65,16 @@
         (js-delete response-js "chats")
         (fx/merge cofx
                   (process-next response-js sync-handler)
-                  (models.chat/ensure-chats (map #(-> %
-                                                      (data-store.chats/<-rpc)
+                  (models.chat/ensure-chats (map #(let [chat (data-store.chats/<-rpc %)]
+                                                    (cond-> chat
                                                       ;; We dissoc this fields as they are handled by status-react and
                                                       ;; not status-go, as there might be requests in-flight that change
                                                       ;; this value
-                                                      (dissoc :unviewed-messages-count :unviewed-mentions-count))
+                                                      (not (zero? (:unviewed-messages-count chat)))
+                                                      (dissoc :unviewed-messages-count)
+
+                                                      (not (zero? (:unviewed-mentions-count chat)))
+                                                      (dissoc :unviewed-mentions-count)))
                                                  (types/js->clj chats)))))
 
       (seq messages)

diff --git 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.89.11",
-    "commit-sha1": "23308d7e8c4b7f5c85bffe870ba92010a3784dcb",
-    "src-sha256": "0zlbzys7g1v3sr67l7fq85mhsk58gkplx8ci7lr5imk9cbciarlx"
+    "version": "feat/#12531-sync-read-messages",
+    "commit-sha1": "46e3765f31dbb4284fd8ca82259a8d8f1522d11a",
+    "src-sha256": "1jgp963anmfs6kbv43i51cmpg7v3izwwiifggihk0fdml38kflln"
 }