From 6b9095d2358a004bb97cb98847a429a240d9b307 Mon Sep 17 00:00:00 2001
From: Andrey Shovkoplyas <motor4ik@gmail.com>
Date: Thu, 12 Oct 2017 14:22:17 +0300
Subject: [PATCH] removed messages to wallet

---
 src/status_im/chat/events/receive_message.cljs |  9 +--------
 src/status_im/chat/handlers/send_message.cljs  | 11 +----------
 src/status_im/ui/screens/contacts/events.cljs  |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/status_im/chat/events/receive_message.cljs b/src/status_im/chat/events/receive_message.cljs
index 6f8815b134..74445b6676 100644
--- a/src/status_im/chat/events/receive_message.cljs
+++ b/src/status_im/chat/events/receive_message.cljs
@@ -82,14 +82,7 @@
           (update :dispatch-n conj [:request-command-preview enriched-message])
 
           (= (:content-type enriched-message) const/content-type-command-request)
-          (update :dispatch-n conj [:add-request chat-identifier enriched-message])
-          ;; TODO(janherich) refactor this ugly special treatment of wallet send commands for logged in user
-          (and (= (get-in message [:content :params :bot-db :public :recipient :whisper-identity])
-                  current-identity)
-               (= content-type const/content-type-command)
-               (not= chat-identifier const/wallet-chat-id)
-               (= "send" (get-in message [:content :command])))
-          (update :dispatch-n conj [:received-message (wallet-message (assoc message :message-id random-id))])))
+          (update :dispatch-n conj [:add-request chat-identifier enriched-message])))
       {:db db})))
 
 (def ^:private receive-interceptors
diff --git a/src/status_im/chat/handlers/send_message.cljs b/src/status_im/chat/handlers/send_message.cljs
index 30a6444b5a..0fc518a0d7 100644
--- a/src/status_im/chat/handlers/send_message.cljs
+++ b/src/status_im/chat/handlers/send_message.cljs
@@ -96,16 +96,7 @@
         (dispatch [:set-chat-ui-props {:sending-in-progress? false}])
         (dispatch [::send-command! add-to-chat-id (assoc params :command command') hidden-params])
         (when (cu/console? chat-id)
-          (dispatch [:console-respond-command params]))
-        (when (and (= "send" (:name command))
-                   (not= add-to-chat-id wallet-chat-id))
-          (let [ct       (if request
-                           c/content-type-wallet-request
-                           c/content-type-wallet-command)
-                content' (assoc content :id (random/id)
-                                        :content-type ct)
-                params'  (assoc params :command content')]
-            (dispatch [:prepare-command! wallet-chat-id params'])))))))
+          (dispatch [:console-respond-command params]))))))
 
 (register-handler ::send-command!
   (u/side-effect!
diff --git a/src/status_im/ui/screens/contacts/events.cljs b/src/status_im/ui/screens/contacts/events.cljs
index 7fb898d388..176eb5f33b 100644
--- a/src/status_im/ui/screens/contacts/events.cljs
+++ b/src/status_im/ui/screens/contacts/events.cljs
@@ -280,7 +280,7 @@
                                (into {}))
           contacts (into {} contacts-list)
           ;;TODO temporary hide wallet contact, this code should be deleted after wallet contact will be deleted
-          contacts' (if (get-in contacts "wallet")
+          contacts' (if (get contacts "wallet")
                       (assoc-in contacts ["wallet" :pending?] true)
                       contacts)]
       {:db         (assoc db :contacts/contacts contacts'