From da192dcdb339efafc320df3ad74a1beb0788a7b7 Mon Sep 17 00:00:00 2001 From: Ibrahem Khalil Date: Mon, 12 Feb 2024 13:05:56 +0200 Subject: [PATCH] Dismiss keyboard when opening mute chat drawer (#18486) --- .../contexts/chat/messenger/messages/list/view.cljs | 1 - src/status_im/navigation/events.cljs | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/status_im/contexts/chat/messenger/messages/list/view.cljs b/src/status_im/contexts/chat/messenger/messages/list/view.cljs index 41664e04b6..e75f86dbab 100644 --- a/src/status_im/contexts/chat/messenger/messages/list/view.cljs +++ b/src/status_im/contexts/chat/messenger/messages/list/view.cljs @@ -151,7 +151,6 @@ :icon :i/pin :counter-value pins-count :on-press (fn [] - (rf/dispatch [:dismiss-keyboard]) (rf/dispatch [:pin-message/show-pins-bottom-sheet chat-id]))} {:accessibility-label :action-button-mute diff --git a/src/status_im/navigation/events.cljs b/src/status_im/navigation/events.cljs index efcca5347a..b2bbebac6c 100644 --- a/src/status_im/navigation/events.cljs +++ b/src/status_im/navigation/events.cljs @@ -147,13 +147,13 @@ (rf/defn show-bottom-sheet {:events [:show-bottom-sheet]} - [{:keys [db]} content] + [{:keys [db] :as cofx} content] (let [{:keys [sheets hide?]} (:bottom-sheet db)] - (rf/merge {:db (update-in db [:bottom-sheet :sheets] #(conj % content))} + (rf/merge cofx + {:db (update-in db [:bottom-sheet :sheets] #(conj % content)) + :dismiss-keyboard nil} #(when-not hide? - (if (seq sheets) - (hide-bottom-sheet %) - {:show-bottom-sheet nil}))))) + (if (seq sheets) (hide-bottom-sheet %) {:show-bottom-sheet nil}))))) ;; LEGACY (should be removed in status 2.0) (rf/defn hide-signing-sheet