From 9209083184c091af4c4d893d1495777033c1d6d3 Mon Sep 17 00:00:00 2001 From: Gheorghe Pinzaru Date: Mon, 27 Jul 2020 11:45:50 +0300 Subject: [PATCH] Clear new identity from search --- src/status_im/ui/screens/add_new/new_chat/events.cljs | 8 ++++---- src/status_im/ui/screens/home/views.cljs | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/status_im/ui/screens/add_new/new_chat/events.cljs b/src/status_im/ui/screens/add_new/new_chat/events.cljs index 27de3f18c5e4..ab6891e7cd81 100644 --- a/src/status_im/ui/screens/add_new/new_chat/events.cljs +++ b/src/status_im/ui/screens/add_new/new_chat/events.cljs @@ -67,10 +67,10 @@ new-identity @resolve-last-id])}}))))))) -(handlers/register-handler-fx - ::new-chat-focus - (fn [{:keys [db]}] - {:db (dissoc db :contacts/new-identity)})) +(fx/defn clear-new-identity + {:events [::clear-new-identity ::new-chat-focus]} + [{:keys [db]}] + {:db (dissoc db :contacts/new-identity)}) (defn- get-validation-label [value] (case value diff --git a/src/status_im/ui/screens/home/views.cljs b/src/status_im/ui/screens/home/views.cljs index 8370f3e95dc3..63ca7b396d7c 100644 --- a/src/status_im/ui/screens/home/views.cljs +++ b/src/status_im/ui/screens/home/views.cljs @@ -13,6 +13,7 @@ [status-im.ui.components.colors :as colors] [status-im.ui.screens.add-new.new-public-chat.view :as new-public-chat] [quo.core :as quo] + [status-im.ui.screens.add-new.new-chat.events :as new-chat] [status-im.ui.components.search-input.view :as search-input] [status-im.ui.screens.add-new.new-public-chat.db :as db] [status-im.utils.debounce :as debounce] @@ -94,10 +95,12 @@ :search-filter search-filter :on-cancel #(re-frame/dispatch [:search/home-filter-changed nil]) :on-blur #(when-not (seq chats) - (re-frame/dispatch [:search/home-filter-changed nil])) + (re-frame/dispatch [:search/home-filter-changed nil]) + (re-frame/dispatch [::new-chat/clear-new-identity])) :on-focus (fn [search-filter] (when-not search-filter - (re-frame/dispatch [:search/home-filter-changed ""]))) + (re-frame/dispatch [:search/home-filter-changed ""]) + (re-frame/dispatch [::new-chat/clear-new-identity]))) :on-change (fn [text] (re-frame/dispatch [:search/home-filter-changed text]) (when-not (seq chats)