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

[Fixes #8604] Integrate status-go protocol library 

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2019-07-23 08:59:32 +02:00
parent f7bb0d3648
commit cb5768000a
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/multiaccounts/login/core.cljs
View File

@ -121,6 +121,7 @@
(fx/defn multiaccount-and-db-password-do-not-match (fx/defn multiaccount-and-db-password-do-not-match
[{:keys [db] :as cofx} error] [{:keys [db] :as cofx} error]
(log/error "failed to login" error)
(fx/merge (fx/merge
cofx cofx
{:db {:db

1
src/status_im/pairing/core.cljs
View File

@ -393,6 +393,7 @@
(fx/defn update-installation [{:keys [db]} installation-id metadata] (fx/defn update-installation [{:keys [db]} installation-id metadata]
{:db (update-in db [:pairing/installations installation-id] {:db (update-in db [:pairing/installations installation-id]
assoc assoc
:installation-id installation-id
:name (:name metadata) :name (:name metadata)
:device-type (:deviceType metadata) :device-type (:deviceType metadata)
:fcmToken (:fcmToken metadata)) :fcmToken (:fcmToken metadata))

2
src/status_im/ui/screens/pairing/views.cljs
View File

@ -198,7 +198,7 @@
toolbar/default-nav-back toolbar/default-nav-back
[toolbar/content-title (i18n/label :t/devices)]] [toolbar/content-title (i18n/label :t/devices)]]
[react/scroll-view {:style {:background-color :white}} [react/scroll-view {:style {:background-color :white}}
(if (and false (string/blank? (-> installations first :name))) (if (string/blank? (-> installations first :name))
[edit-installation-name] [edit-installation-name]
[react/view [react/view
[pair-this-device] [pair-this-device]

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.30.0-beta.3", "version": "v0.30.1-beta.0",
"commit-sha1": "9a0502fa8ffe8cb63676212dd6868f3683b2c725", "commit-sha1": "e93d994460fdbb8c10cb2f417eabe72559a2c517",
"src-sha256": "1w1x5ws8fr2cjx53y9p3w9kb4ssd2lfljfgv28rksz1jm4pk4dg1" "src-sha256": "13y3rwjpqw2mmwc9ngjc2wawnl2myyf3wxm5vk49dgvh14dv6y61"
} }