status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove automatic sending of contact request

This commit is contained in:
Andrea Maria Piana 2019-02-05 08:35:47 +01:00
parent becb32d5e7
commit dac323a3de
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/status_im/contact/core.cljs
View File

@ -260,10 +260,9 @@
(def receive-contact-request-confirmation handle-contact-update) (def receive-contact-request-confirmation handle-contact-update)
(def receive-contact-update handle-contact-update) (def receive-contact-update handle-contact-update)
(fx/defn add-contact-and-open-chat (fx/defn open-chat
[cofx public-key] [cofx public-key]
(fx/merge cofx (fx/merge cofx
(add-contact public-key)
(chat.models/start-chat public-key {:navigation-reset? true}))) (chat.models/start-chat public-key {:navigation-reset? true})))
(fx/defn hide-contact (fx/defn hide-contact
@ -283,8 +282,8 @@
(fx/merge cofx (fx/merge cofx
fx fx
(if config/partitioned-topic-enabled? (if config/partitioned-topic-enabled?
(add-contacts-filter contact-identity :add-contact-and-open-chat) (add-contacts-filter contact-identity :open-chat)
(add-contact-and-open-chat contact-identity)))))) (open-chat contact-identity))))))
(fx/defn open-contact-toggle-list (fx/defn open-contact-toggle-list
[{:keys [db :as cofx]}] [{:keys [db :as cofx]}]
@ -297,4 +296,4 @@
(fx/defn add-new-identity-to-contacts (fx/defn add-new-identity-to-contacts
[{{:contacts/keys [new-identity]} :db :as cofx}] [{{:contacts/keys [new-identity]} :db :as cofx}]
(when (seq new-identity) (when (seq new-identity)
(add-contact-and-open-chat cofx new-identity))) (open-chat cofx new-identity)))

4
src/status_im/events.cljs
View File

@ -1542,7 +1542,7 @@
(handlers/register-handler-fx (handlers/register-handler-fx
:contact/filters-added :contact/filters-added
(fn [cofx [_ contact-identity]] (fn [cofx [_ contact-identity]]
(contact/add-contact-and-open-chat cofx contact-identity))) (contact/open-chat cofx contact-identity)))
(handlers/register-handler-fx (handlers/register-handler-fx
:contact.ui/start-group-chat-pressed :contact.ui/start-group-chat-pressed
@ -1553,7 +1553,7 @@
:contact.ui/send-message-pressed :contact.ui/send-message-pressed
[(re-frame/inject-cofx :random-id-generator)] [(re-frame/inject-cofx :random-id-generator)]
(fn [cofx [_ {:keys [public-key]}]] (fn [cofx [_ {:keys [public-key]}]]
(contact/add-contact-and-open-chat cofx public-key))) (contact/open-chat cofx public-key)))
(handlers/register-handler-fx (handlers/register-handler-fx
:contact.ui/contact-code-submitted :contact.ui/contact-code-submitted

4
src/status_im/transport/filters.cljs
View File

@ -96,8 +96,8 @@
:add-contact :add-contact
(contact/add-contact public-key) (contact/add-contact public-key)
:add-contact-and-open-chat :open-chat
(contact/add-contact-and-open-chat public-key)))] (contact/open-chat public-key)))]
filters-fx-fns filters-fx-fns
[(mailserver/process-next-messages-request)]))))) [(mailserver/process-next-messages-request)])))))