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

fix #526

This commit is contained in:
Roman Volosovskyi 2016-12-02 10:53:40 +02:00
parent fe1850589d
commit 0af4f8e7d1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/accounts/handlers.cljs
View File

@ -67,7 +67,7 @@
(get accounts current-account-id) (get accounts current-account-id)
account' (assoc account :network (or acc-network network))] account' (assoc account :network (or acc-network network))]
(accounts-store/save (get accounts current-account-id) true))) (accounts-store/save account' true)))
(defn send-account-update (defn send-account-update
[{:keys [current-account-id current-public-key web3 accounts]} _] [{:keys [current-account-id current-public-key web3 accounts]} _]

6
src/status_im/accounts/login/handlers.cljs
View File

@ -5,8 +5,12 @@
[status-im.utils.types :refer [json->clj]] [status-im.utils.types :refer [json->clj]]
[status-im.data-store.core :as data-store] [status-im.data-store.core :as data-store]
[status-im.components.status :as status] [status-im.components.status :as status]
[status-im.constants :refer [console-chat-id]])) [status-im.constants :refer [console-chat-id]]
[status-im.navigation.handlers :as nav]))
(defmethod nav/preload-data! :login
[db]
(update db :login dissoc :error :password))
(defn set-login-from-qr (defn set-login-from-qr
[{:keys [login] :as db} [_ _ login-info]] [{:keys [login] :as db} [_ _ login-info]]

6
src/status_im/chat/handlers.cljs
View File

@ -201,8 +201,7 @@
(set-message-shown db chat-id message-id))) (set-message-shown db chat-id message-id)))
(defn init-console-chat (defn init-console-chat
([existing-account?] (init-console-chat {} existing-account?)) ([{:keys [chats current-account-id] :as db} existing-account?]
([{:keys [chats] :as db} existing-account?]
(let [new-chat sign-up-service/console-chat] (let [new-chat sign-up-service/console-chat]
(if (chats console-chat-id) (if (chats console-chat-id)
db db
@ -210,7 +209,8 @@
(dispatch [:add-contacts [sign-up-service/console-contact]]) (dispatch [:add-contacts [sign-up-service/console-contact]])
(chats/save new-chat) (chats/save new-chat)
(contacts/save-all [sign-up-service/console-contact]) (contacts/save-all [sign-up-service/console-contact])
(sign-up-service/intro) (when-not current-account-id
(sign-up-service/intro))
(when existing-account? (when existing-account?
(sign-up-service/start-signup)) (sign-up-service/start-signup))
(-> db (-> db