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

[#9686] Fix brief change of identiocon on keycard login

This commit is contained in:
Roman Volosovskyi 2020-03-20 17:28:14 +02:00
parent 2272fafc05
commit b6e0bb0a0e
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/status_im/ui/screens/keycard/views.cljs
View File

@ -13,7 +13,8 @@
[status-im.utils.core :as utils.core] [status-im.utils.core :as utils.core]
[status-im.ui.components.list-item.views :as list-item] [status-im.ui.components.list-item.views :as list-item]
[status-im.ui.screens.chat.photos :as photos] [status-im.ui.screens.chat.photos :as photos]
[status-im.ui.components.topbar :as topbar])) [status-im.ui.components.topbar :as topbar]
[reagent.core :as reagent]))
(defn welcome [] (defn welcome []
[react/view {:flex 1 [react/view {:flex 1
@ -217,6 +218,20 @@
[react/text {:style {:color colors/blue}} [react/text {:style {:color colors/blue}}
(i18n/label :t/ok-got-it)]]]]]]) (i18n/label :t/ok-got-it)]]]]]])
(defn photo [_ _]
(reagent/create-class
{:should-component-update
(fn [_ [_ old-account] [_ new-account]]
(and (not (nil? new-account))
(and (not (:photo-path old-account))
(nil? (:photo-path new-account)))))
:reagent-render
(fn [account small-screen?]
;;TODO this should be done in a subscription
[photos/photo (multiaccounts/displayed-photo account)
{:size (if small-screen? 45 61)}])}))
(defview login-pin [] (defview login-pin []
(letsubs [pin [:hardwallet/pin] (letsubs [pin [:hardwallet/pin]
enter-step [:hardwallet/pin-enter-step] enter-step [:hardwallet/pin-enter-step]
@ -251,8 +266,7 @@
:height (if small-screen? 50 69) :height (if small-screen? 50 69)
:justify-content :center :justify-content :center
:align-items :center} :align-items :center}
;;TODO this should be done in a subscription [photo account small-screen?]
[photos/photo (multiaccounts/displayed-photo account) {:size (if small-screen? 45 61)}]
[react/view {:justify-content :center [react/view {:justify-content :center
:align-items :center :align-items :center
:width (if small-screen? 18 24) :width (if small-screen? 18 24)