Clear new identity from search

status-im · Jul 27, 2020 · 9209083 · 9209083
1 parent b84e37a
commit 9209083
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -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
@@ -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)