From 62fe9f3d6a18cff414dc47965410f532a2f80347 Mon Sep 17 00:00:00 2001 From: Gheorghe Pinzaru Date: Tue, 11 Aug 2020 11:19:56 +0300 Subject: [PATCH] Clear home filter when opening chats Fixes #11015 Fixes #11013 Signed-off-by: Gheorghe Pinzaru --- src/status_im/ui/screens/home/views.cljs | 6 ++++-- src/status_im/ui/screens/home/views/inner_item.cljs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/status_im/ui/screens/home/views.cljs b/src/status_im/ui/screens/home/views.cljs index 7063191563..f64e4cd35e 100644 --- a/src/status_im/ui/screens/home/views.cljs +++ b/src/status_im/ui/screens/home/views.cljs @@ -119,7 +119,8 @@ :title (or ens-name (utils/get-shortened-address public-key)) :subtitle (i18n/label :t/join-new-private-chat) :on-press (fn [] - (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted false] 3000))}]) + (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted false] 3000) + (re-frame/dispatch [:search/home-filter-changed nil]))}]) (when valid-public? [quo/list-item {:theme :accent :icon :main-icons/public-chat @@ -127,7 +128,8 @@ :subtitle (i18n/label :t/join-new-public-chat) :on-press (fn [] (re-frame/dispatch [:chat.ui/start-public-chat search-value]) - (re-frame/dispatch [:set :public-group-topic nil]))}])]))) + (re-frame/dispatch [:set :public-group-topic nil]) + (re-frame/dispatch [:search/home-filter-changed nil]))}])]))) (views/defview chats-list [] (views/letsubs [loading? [:chats/loading?] diff --git a/src/status_im/ui/screens/home/views/inner_item.cljs b/src/status_im/ui/screens/home/views/inner_item.cljs index 611c03ea54..649ce0d2e7 100644 --- a/src/status_im/ui/screens/home/views/inner_item.cljs +++ b/src/status_im/ui/screens/home/views/inner_item.cljs @@ -170,6 +170,7 @@ :on-press #(do (re-frame/dispatch [:dismiss-keyboard]) (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id]) + (re-frame/dispatch [:search/home-filter-changed nil]) (if public? (re-frame/dispatch [:chat.ui/mark-public-all-read chat-id]) (re-frame/dispatch [:chat.ui/mark-messages-seen :chat])))