status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-10 19:16:59 +00:00
Code Issues Projects Releases Wiki Activity

[#10798] Fix unviewed counter on receiving response

Browse Source
This commit is contained in:
Roman Volosovskyi 2020-11-10 18:12:31 +02:00
parent ae3936eff2
commit fac4f0c871
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/chat/models/message.cljs
View File

@ -128,7 +128,7 @@
(= constants/message-type-one-to-one message-type) from)) (= constants/message-type-one-to-one message-type) from))
(fx/defn update-unviewed-count (fx/defn update-unviewed-count
[{:keys [db] :as cofx} {:keys [chat-id from message-type message-id]}] [{:keys [db] :as cofx} {:keys [chat-id from message-type message-id new?]}]
(when-not (= message-type constants/message-type-private-group-system-message) (when-not (= message-type constants/message-type-private-group-system-message)
(let [{:keys [current-chat-id view-id]} db (let [{:keys [current-chat-id view-id]} db
chat-view? (= :chat view-id) chat-view? (= :chat view-id)
@ -142,7 +142,7 @@
(fx/merge cofx (fx/merge cofx
(data-store.messages/mark-messages-seen current-chat-id [message-id] nil)) (data-store.messages/mark-messages-seen current-chat-id [message-id] nil))
:else new?
{:db (update-in db [:chats chat-id] {:db (update-in db [:chats chat-id]
assoc assoc
:unviewed-messages-count (inc current-count))})))) :unviewed-messages-count (inc current-count))}))))

3
src/status_im/data_store/messages.cljs
View File

@ -24,7 +24,8 @@
:clock :clock-value :clock :clock-value
:quotedMessage :quoted-message :quotedMessage :quoted-message
:outgoingStatus :outgoing-status :outgoingStatus :outgoing-status
:audioDurationMs :audio-duration-ms}) :audioDurationMs :audio-duration-ms
:new :new?})
(update :quoted-message clojure.set/rename-keys {:parsedText :parsed-text}) (update :quoted-message clojure.set/rename-keys {:parsedText :parsed-text})
(update :outgoing-status keyword) (update :outgoing-status keyword)

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.63.6", "version": "v0.63.7",
"commit-sha1": "d20cf2583f0721d809c2efe71450259c88981b4e", "commit-sha1": "4026841dc1516865f385e0a6c2b57fead2aad773",
"src-sha256": "1dbiwbfw109ns4czpfqzmnll92xlqzyyc2swl693hrn67nzwymgp" "src-sha256": "1sr9aaf9by2lzfphakqqpcir101zfgxa59wag2grsb2077k0gxj5"
} }