status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hide deleted messages in activity center 

Signed-off-by: Brian Sztamfater <brian@status.im>
This commit is contained in:
Brian Sztamfater 2021-08-17 20:01:04 -03:00
parent 2882085d2e
commit 5cd57254c9
No known key found for this signature in database
GPG Key ID: 59EB921E0706B48F
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,8 @@
(let [mcids (message-ids->message-id-chat-id-map db removed-messages)] (let [mcids (message-ids->message-id-chat-id-map db removed-messages)]
{:db (reduce (fn [acc current] {:db (reduce (fn [acc current]
(update-in acc [:messages (:chat-id current)] dissoc (:message-id current))) (update-in acc [:messages (:chat-id current)] dissoc (:message-id current)))
db mcids)})) db mcids)
:dispatch [:get-activity-center-notifications]}))
(comment (comment
(handle-removed-messages (handle-removed-messages

9
src/status_im/subs.cljs
View File

@ -1833,12 +1833,13 @@
:<- [:activity.center/notifications] :<- [:activity.center/notifications]
:<- [::chats] :<- [::chats]
(fn [[{:keys [notifications]} chats]] (fn [[{:keys [notifications]} chats]]
(let [supported-notifications (filter (fn [{:keys [type chat-id]}] (let [supported-notifications (filter (fn [{:keys [type chat-id last-message]}]
(and (and
(or (= constants/activity-center-notification-type-mention type) (or (and (= constants/activity-center-notification-type-one-to-one-chat type)
(= constants/activity-center-notification-type-one-to-one-chat type) (not (nil? last-message)))
(= constants/activity-center-notification-type-private-group-chat type) (= constants/activity-center-notification-type-private-group-chat type)
(= constants/activity-center-notification-type-reply type)) (= constants/activity-center-notification-type-reply type)
(= constants/activity-center-notification-type-mention type))
(get chats chat-id))) notifications)] (get chats chat-id))) notifications)]
(group-notifications-by-date (map #(assoc % :timestamp (or (:timestamp %) (:timestamp (or (:message %) (:last-message %))))) supported-notifications))))) (group-notifications-by-date (map #(assoc % :timestamp (or (:timestamp %) (:timestamp (or (:message %) (:last-message %))))) supported-notifications)))))

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.83.16", "version": "v0.83.18",
"commit-sha1": "ab08042f214bb4473eb677949643b18e46824a15", "commit-sha1": "0e54d04e67fee94276b69a9b20338cf4e7624cc5",
"src-sha256": "0cas8fmllqbkllicypwbjjpdjn7jp3asl4jzwrnr3y8c5y9mbxy0" "src-sha256": "091g3xqsswvfi58jnr9xcwx8xhzcch7d5yky00gjxmw70hyxwigw"
} }