From e5477cd44983ac272ffadf752827b6d9d6e05ac7 Mon Sep 17 00:00:00 2001 From: Brian Sztamfater Date: Thu, 29 Jul 2021 18:07:51 -0300 Subject: [PATCH] Fix Error when opening 1-1 chat in Activity center for blocked user Signed-off-by: Brian Sztamfater --- src/status_im/subs.cljs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index cae868f751..23645bb492 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -1802,12 +1802,15 @@ (re-frame/reg-sub :activity.center/notifications-grouped-by-date :<- [:activity.center/notifications] - (fn [{:keys [notifications]}] - (let [supported-notifications (filter (fn [{:keys [type]}] - (or (= constants/activity-center-notification-type-mention type) - (= constants/activity-center-notification-type-one-to-one-chat type) - (= constants/activity-center-notification-type-private-group-chat type) - (= constants/activity-center-notification-type-reply type))) notifications)] + :<- [::chats] + (fn [[{:keys [notifications]} chats]] + (let [supported-notifications (filter (fn [{:keys [type chat-id]}] + (and + (or (= constants/activity-center-notification-type-mention type) + (= constants/activity-center-notification-type-one-to-one-chat type) + (= constants/activity-center-notification-type-private-group-chat type) + (= constants/activity-center-notification-type-reply type)) + (get chats chat-id))) notifications)] (group-notifications-by-date (map #(assoc % :timestamp (or (:timestamp %) (:timestamp (or (:message %) (:last-message %))))) supported-notifications))))) ;;WALLET TRANSACTIONS ==================================================================================================