From cb5768000a7d7f5f771ed994b74f41ff14f5d942 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Tue, 23 Jul 2019 08:59:32 +0200 Subject: [PATCH] [Fixes #8604] Integrate status-go protocol library Signed-off-by: Andrea Maria Piana --- src/status_im/multiaccounts/login/core.cljs | 1 + src/status_im/pairing/core.cljs | 1 + src/status_im/ui/screens/pairing/views.cljs | 2 +- status-go-version.json | 6 +++--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index 24db0a12f0..76950a9eb5 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -121,6 +121,7 @@ (fx/defn multiaccount-and-db-password-do-not-match [{:keys [db] :as cofx} error] + (log/error "failed to login" error) (fx/merge cofx {:db diff --git a/src/status_im/pairing/core.cljs b/src/status_im/pairing/core.cljs index dfbb30318d..614e3b5d56 100644 --- a/src/status_im/pairing/core.cljs +++ b/src/status_im/pairing/core.cljs @@ -393,6 +393,7 @@ (fx/defn update-installation [{:keys [db]} installation-id metadata] {:db (update-in db [:pairing/installations installation-id] assoc + :installation-id installation-id :name (:name metadata) :device-type (:deviceType metadata) :fcmToken (:fcmToken metadata)) diff --git a/src/status_im/ui/screens/pairing/views.cljs b/src/status_im/ui/screens/pairing/views.cljs index 1ef7342fc9..29fcf2e944 100644 --- a/src/status_im/ui/screens/pairing/views.cljs +++ b/src/status_im/ui/screens/pairing/views.cljs @@ -198,7 +198,7 @@ toolbar/default-nav-back [toolbar/content-title (i18n/label :t/devices)]] [react/scroll-view {:style {:background-color :white}} - (if (and false (string/blank? (-> installations first :name))) + (if (string/blank? (-> installations first :name)) [edit-installation-name] [react/view [pair-this-device] diff --git a/status-go-version.json b/status-go-version.json index 3ae6aa70b3..cbd75da6b6 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -2,7 +2,7 @@ "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh ' instead", "owner": "status-im", "repo": "status-go", - "version": "v0.30.0-beta.3", - "commit-sha1": "9a0502fa8ffe8cb63676212dd6868f3683b2c725", - "src-sha256": "1w1x5ws8fr2cjx53y9p3w9kb4ssd2lfljfgv28rksz1jm4pk4dg1" + "version": "v0.30.1-beta.0", + "commit-sha1": "e93d994460fdbb8c10cb2f417eabe72559a2c517", + "src-sha256": "13y3rwjpqw2mmwc9ngjc2wawnl2myyf3wxm5vk49dgvh14dv6y61" }