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

[#4068] keep existing device UUID when changing account

This commit is contained in:
Roman Volosovskyi 2018-05-11 08:33:23 +03:00
parent 2d6cb4fd04
commit bd0b447457
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/status_im/ui/screens/events.cljs
View File

@ -263,7 +263,7 @@
(handlers/register-handler-fx (handlers/register-handler-fx
:initialize-db :initialize-db
(fn [{{:keys [status-module-initialized? status-node-started? (fn [{{:keys [status-module-initialized? status-node-started?
network-status network] network-status network device-UUID]
:or {network (get app-db :network)}} :db} :or {network (get app-db :network)}} :db}
[_ encryption-key]] [_ encryption-key]]
{::init-store encryption-key {::init-store encryption-key
@ -272,14 +272,15 @@
:network-status network-status :network-status network-status
:status-module-initialized? (or platform/ios? js/goog.DEBUG status-module-initialized?) :status-module-initialized? (or platform/ios? js/goog.DEBUG status-module-initialized?)
:status-node-started? status-node-started? :status-node-started? status-node-started?
:network network)})) :network network
:device-UUID device-UUID)}))
(handlers/register-handler-db (handlers/register-handler-db
:initialize-account-db :initialize-account-db
(fn [{:keys [accounts/accounts accounts/create contacts/contacts networks/networks (fn [{:keys [accounts/accounts accounts/create contacts/contacts networks/networks
network network-status view-id navigation-stack network network-status view-id navigation-stack
access-scope->commands-responses access-scope->commands-responses
status-module-initialized? status-node-started?] status-module-initialized? status-node-started? device-UUID]
:or [network (get app-db :network)]} [_ address]] :or [network (get app-db :network)]} [_ address]]
(let [console-contact (get contacts constants/console-chat-id) (let [console-contact (get contacts constants/console-chat-id)
current-account (accounts address)] current-account (accounts address)]
@ -294,7 +295,8 @@
:networks/networks networks :networks/networks networks
:account/account current-account :account/account current-account
:network-status network-status :network-status network-status
:network network) :network network
:device-UUID device-UUID)
console-contact console-contact
(assoc :contacts/contacts {constants/console-chat-id console-contact}))))) (assoc :contacts/contacts {constants/console-chat-id console-contact})))))