Merge pull request #260 from status-im/bug/#252

Chats list: new messages counter for group chat (fixes #252)

Former-commit-id: 87bb818866

src/status_im/chat/handlers.cljs

@@ -417,11 +417,8 @@
   (fn [db [_ h]]
     (assoc db :layout-height h)))
 
-(register-handler :send-seen!
+(defn send-seen!
-  (after (fn [_ [_ options]]
+  [{:keys [web3 current-public-key chats]}
-           (dispatch [:message-seen options])))
-  (u/side-effect!
-    (fn [{:keys [web3 current-public-key chats]}
    [_ {:keys [from chat-id message-id]}]]
   (when-not (console? chat-id)
     (let [{:keys [group-chat]} (chats chat-id)]
@@ -429,7 +426,14 @@
                             :message {:from       current-public-key
                                       :to         from
                                       :group-id   (when group-chat chat-id)
-                                          :message-id message-id}}))))))
+                                      :message-id message-id}}))))
+(register-handler :send-seen!
+  [(after (fn [_ [_ {:keys [message-id]}]]
+            (messages/update-message! {:message-id     message-id
+                                       :message-status :seen})))
+   (after (fn [_ [_ {:keys [chat-id]}]]
+            (dispatch [:remove-unviewed-messages chat-id])))]
+  (u/side-effect! send-seen!))
 
 (register-handler :set-web-view-url
   (fn [{:keys [current-chat-id] :as db} [_ url]]

src/status_im/chats_list/screen.cljs

@@ -41,8 +41,6 @@
 
 (defview chats-list []
   [chats [:get :chats]]
-  ;; todo what is this?!
-  #_(dispatch [:set :chats-scrolled? false])
   [view st/chats-container
    [chats-list-toolbar]
    [list-view {:dataSource (to-datasource chats)

src/status_im/protocol/handlers.cljs

@@ -234,11 +234,7 @@
   (update-message-status :sent))
 
 (register-handler :message-seen
-  [(after (save-message-status! :seen))
+  [(after (save-message-status! :seen))]
-   (after (fn [_ [_ {:keys              [from]
-                     {:keys [group-id]} :payload}]]
-            (when-not group-id
-              (dispatch [:remove-unviewed-messages from]))))]
   (update-message-status :seen))
 
 (register-handler :pending-message-upsert