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

Decline pending group invitations from user, when user is banned (#12835)

This commit is contained in:
Parvesh Monu 2021-11-25 21:09:10 +05:30 committed by GitHub
parent b4b39e5088
commit 751b30688d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/status_im/chat/models.cljs
View File

@ -129,11 +129,13 @@
(map (map-chats cofx) chats))] (map (map-chats cofx) chats))]
(fx/merge (fx/merge
cofx cofx
{:db (-> db (merge {:db (-> db
(update :chats merge all-chats) (update :chats merge all-chats)
(update :chats-home-list set/union chats-home-list) (update :chats-home-list set/union chats-home-list)
(update :chats #(apply dissoc % removed-chats)) (update :chats #(apply dissoc % removed-chats))
(update :chats-home-list set/difference removed-chats))} (update :chats-home-list set/difference removed-chats))}
(when (not-empty removed-chats)
{:clear-multiple-message-notifications removed-chats}))
leave-removed-chat))) leave-removed-chat)))
(fx/defn clear-history (fx/defn clear-history

6
src/status_im/communities/core.cljs
View File

@ -14,7 +14,8 @@
[quo.design-system.colors :as colors] [quo.design-system.colors :as colors]
[status-im.navigation :as navigation] [status-im.navigation :as navigation]
[status-im.utils.handlers :refer [>evt]] [status-im.utils.handlers :refer [>evt]]
[status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles])) [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles]
[status-im.notifications-center.core :as notification-center]))
(def crop-size 1000) (def crop-size 1000)
@ -447,7 +448,8 @@
[cofx response-js] [cofx response-js]
(fx/merge cofx (fx/merge cofx
(bottom-sheet/hide-bottom-sheet) (bottom-sheet/hide-bottom-sheet)
(handle-response response-js))) (handle-response response-js)
(notification-center/get-activity-center-notifications-count)))
(fx/defn member-ban (fx/defn member-ban
{:events [::member-ban]} {:events [::member-ban]}

7
src/status_im/notifications/core.cljs
View File

@ -92,6 +92,13 @@
(when platform/android? (when platform/android?
(pn-android/clear-message-notifications chat-id)))) (pn-android/clear-message-notifications chat-id))))
(re-frame/reg-fx
:clear-multiple-message-notifications
(fn [chat-ids]
(when platform/android?
(doseq [chat-id chat-ids]
(pn-android/clear-message-notifications chat-id)))))
(fx/defn handle-enable-notifications-event (fx/defn handle-enable-notifications-event
{:events [::registered-for-push-notifications]} {:events [::registered-for-push-notifications]}
[cofx token] [cofx token]

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.91.5", "version": "v0.91.8",
"commit-sha1": "1d752c087f34f44bb8ad5dd477e398567d991be8", "commit-sha1": "a65c873b8f2633c05a0f108a84ccbc3b8456378a",
"src-sha256": "18rfvsfg5hl326rcdwigdx7ssaq57d8ajgjjgsk214b1wbxaa26v" "src-sha256": "16c8nphz7jkfsgcp2gcv91lhky2ykkz0mrazg03pqdrcnjb2y774"
} }