From 7674cb9c10ecea05ddf1aa71fdaeabd639594e43 Mon Sep 17 00:00:00 2001 From: Ajay Sivan Date: Fri, 16 May 2025 15:29:10 +0530 Subject: [PATCH 1/2] fix: remove unsupported notifications from ac notification data --- src/status_im/contexts/shell/activity_center/view.cljs | 2 +- src/status_im/subs/activity_center.cljs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/status_im/contexts/shell/activity_center/view.cljs b/src/status_im/contexts/shell/activity_center/view.cljs index bc5fd777730..2e26ff2ddb1 100644 --- a/src/status_im/contexts/shell/activity_center/view.cljs +++ b/src/status_im/contexts/shell/activity_center/view.cljs @@ -68,7 +68,7 @@ (defn view [] - (let [notifications (rf/sub [:activity-center/notifications]) + (let [notifications (rf/sub [:activity-center/supported-notifications]) ;; We globally control the active swipeable for all notifications ;; because when a swipe left/right gesture initiates, the previously diff --git a/src/status_im/subs/activity_center.cljs b/src/status_im/subs/activity_center.cljs index e72dc7414cb..fadc19176c9 100644 --- a/src/status_im/subs/activity_center.cljs +++ b/src/status_im/subs/activity_center.cljs @@ -9,6 +9,13 @@ (fn [activity-center] (:notifications activity-center))) +(re-frame/reg-sub + :activity-center/supported-notifications + :<- [:activity-center/notifications] + (fn [notifications] + (->> notifications + (filter #(types/all-supported (:type %)))))) + (re-frame/reg-sub :activity-center/unread-counts-by-type :<- [:activity-center] From 7fcf83df9751329e2a776f5d64e505be36038178 Mon Sep 17 00:00:00 2001 From: Ajay Sivan Date: Mon, 19 May 2025 18:18:18 +0530 Subject: [PATCH 2/2] remove threaded marco --- src/status_im/subs/activity_center.cljs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/status_im/subs/activity_center.cljs b/src/status_im/subs/activity_center.cljs index fadc19176c9..54468b026c2 100644 --- a/src/status_im/subs/activity_center.cljs +++ b/src/status_im/subs/activity_center.cljs @@ -9,12 +9,15 @@ (fn [activity-center] (:notifications activity-center))) +(defn supported-notification? + [notification] + (types/all-supported (:type notification))) + (re-frame/reg-sub :activity-center/supported-notifications :<- [:activity-center/notifications] (fn [notifications] - (->> notifications - (filter #(types/all-supported (:type %)))))) + (filter supported-notification? notifications))) (re-frame/reg-sub :activity-center/unread-counts-by-type