Merge pull request #571 from status-im/bug/#570

Fix for "Add to contacts" request (#570)
status-im · Dec 21, 2016 · 7fb7b60 · 7fb7b60
2 parents 4a54a2f + 5547fd6
commit 7fb7b60
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs
@@ -438,11 +438,6 @@
           (dispatch [::start-chat! contact-id options navigation-type]))))))
 
 (register-handler :add-chat
-  (u/side-effect!
-    (fn [_ [_ chat-id chat]]
-      (dispatch [::add-chat chat-id chat]))))
-
-(register-handler ::add-chat
   (-> add-new-chat
       ((enrich add-chat))
       ((after save-new-chat!))))

diff --git a/src/status_im/protocol/handlers.cljs b/src/status_im/protocol/handlers.cljs
@@ -385,19 +385,19 @@
         (let [{{:keys [name profile-image address status]} :contact
                {:keys [public private]}                    :keypair} payload
 
-              contact        {:whisper-identity from
-                              :public-key       public
-                              :private-key      private
-                              :address          address
-                              :status           status
-                              :photo-path       profile-image
-                              :name             name}
-              contact-exist? (get contacts from)
-              chat           {:name             name
-                              :chat-id          from
-                              :contact-info     (prn-str contact)
-                              :pending-contact? true}]
-          (if contact-exist?
+              contact         {:whisper-identity from
+                               :public-key       public
+                               :private-key      private
+                               :address          address
+                               :status           status
+                               :photo-path       profile-image
+                               :name             name}
+              contact-exists? (get contacts from)
+              chat            {:name             name
+                               :chat-id          from
+                               :contact-info     (prn-str contact)
+                               :pending-contact? true}]
+          (if contact-exists?
             (do
               (dispatch [:update-contact! contact])
               (dispatch [:watch-contact contact]))