From e4c227d8876eea959936b50b4a4827c98159ab36 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 3 Oct 2016 16:05:56 +0300 Subject: [PATCH] fixes #289 Former-commit-id: 275f5799c2da7cbb8d90daaa839b4692e4ce72c7 --- src/status_im/accounts/handlers.cljs | 1 + src/status_im/accounts/login/handlers.cljs | 10 +++++++--- src/status_im/contacts/handlers.cljs | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/status_im/accounts/handlers.cljs b/src/status_im/accounts/handlers.cljs index dbb72461fa..c51f875511 100644 --- a/src/status_im/accounts/handlers.cljs +++ b/src/status_im/accounts/handlers.cljs @@ -36,6 +36,7 @@ account {:public-key public-key :address address :name address + :signed-up? true :updates-public-key public :updates-private-key private :photo-path (identicon public-key)}] diff --git a/src/status_im/accounts/login/handlers.cljs b/src/status_im/accounts/login/handlers.cljs index 889d5cf896..9fb7dc550f 100644 --- a/src/status_im/accounts/login/handlers.cljs +++ b/src/status_im/accounts/login/handlers.cljs @@ -5,7 +5,8 @@ [status-im.utils.types :refer [json->clj]] [status-im.db :refer [default-view]] [status-im.persistence.realm.core :as realm] - [status-im.components.status :as status])) + [status-im.components.status :as status] + [status-im.constants :refer [console-chat-id]])) (defn set-login-from-qr @@ -19,7 +20,10 @@ (dispatch [:set :login {}]) (dispatch [:set-current-account address]) (dispatch [:initialize-account address]) - (when new-account? + (if new-account? + (do + (dispatch [:navigate-to-clean :chat-list]) + (dispatch [:navigate-to :chat console-chat-id])) (do (dispatch [:navigate-to-clean :accounts]) (dispatch [:navigate-to default-view])))) @@ -34,7 +38,7 @@ (defn on-account-changed [error address new-account?] (if (nil? error) - (initialize-account address true) + (initialize-account address new-account?) (log/debug "Error changing acount realm: " error))) (defn logged-in diff --git a/src/status_im/contacts/handlers.cljs b/src/status_im/contacts/handlers.cljs index 25c4e85918..3bdaeae4af 100644 --- a/src/status_im/contacts/handlers.cljs +++ b/src/status_im/contacts/handlers.cljs @@ -10,7 +10,8 @@ [status-im.utils.handlers :as u] [status-im.utils.utils :refer [require]] [status-im.navigation.handlers :as nav] - [status-im.utils.random :as random])) + [status-im.utils.random :as random] + [taoensso.timbre :as log])) (defmethod nav/preload-data! :group-contacts @@ -94,7 +95,7 @@ (.getAll react-native-contacts (fn [error contacts] (if error - (dispatch [:error-on-fetching-loading error]) + (log/debug :error-on-fetching-loading error) (let [contacts' (normalize-phone-contacts contacts)] (dispatch [:get-contacts-identities contacts']))))))