From e05d5000b1743374e73ce24552e0f69435262a7b Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Mon, 1 Apr 2024 16:05:14 +0530 Subject: [PATCH] fix jump-to community card animation (#19437) --- .../contexts/communities/events.cljs | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/status_im/contexts/communities/events.cljs b/src/status_im/contexts/communities/events.cljs index 1a0b8aedd5..c9020ff410 100644 --- a/src/status_im/contexts/communities/events.cljs +++ b/src/status_im/contexts/communities/events.cljs @@ -304,18 +304,21 @@ (rf/reg-event-fx :communities/navigate-to-community-overview (fn [{:keys [db] :as cofx} [deserialized-key]] - (if (string/starts-with? deserialized-key constants/serialization-key) - (navigate-to-serialized-community cofx deserialized-key) - (rf/merge - cofx - {:fx [[:dispatch - [:communities/fetch-community - {:community-id deserialized-key - :update-last-opened-at? true}]] - [:dispatch [:navigate-to :community-overview deserialized-key]] - (when (get-in db [:communities deserialized-key :joined]) - [:dispatch [:activity-center.notifications/dismiss-community-overview deserialized-key]])]} - (navigation/pop-to-root :shell-stack))))) + (let [current-view-id (:view-id db)] + (if (string/starts-with? deserialized-key constants/serialization-key) + (navigate-to-serialized-community cofx deserialized-key) + (rf/merge + cofx + {:fx [[:dispatch + [:communities/fetch-community + {:community-id deserialized-key + :update-last-opened-at? true}]] + [:dispatch [:navigate-to :community-overview deserialized-key]] + (when (get-in db [:communities deserialized-key :joined]) + [:dispatch + [:activity-center.notifications/dismiss-community-overview deserialized-key]])]} + (when-not (or (= current-view-id :shell) (= current-view-id :communities-stack)) + (navigation/pop-to-root :shell-stack))))))) (rf/reg-event-fx :communities/navigate-to-community-chat (fn [{:keys [db]} [chat-id pop-to-root?]]