get keycard-key-uid from multiaccount

status-im · Sep 27, 2019 · fbb8710 · fbb8710
1 parent 8f59944
commit fbb8710
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs
@@ -201,12 +201,12 @@
                           preferred-name
                           seed-backed-up?
                           mnemonic
+                          keycard-key-uid
                           address]
                    :as   multiaccount}         [:multiaccount]
                   active-contacts-count        [:contacts/active-count]
                   tribute-to-talk              [:tribute-to-talk/profile]
-                  registrar                    [:ens.stateofus/registrar]
-                  multiaccounts                [:multiaccounts/multiaccounts]]
+                  registrar                    [:ens.stateofus/registrar]]
     (let [show-backup-seed? (and (not seed-backed-up?)
                                  (not (string/blank? mnemonic)))
 
@@ -216,7 +216,7 @@
 
           ;; flatlist contents
           header               (header multiaccount)
-          keycard-account?   (boolean (get-in multiaccounts [address :keycard-key-uid]))
+          keycard-account?   (boolean keycard-key-uid)
           content           (flat-list-content
                              preferred-name registrar tribute-to-talk
                              active-contacts-count show-backup-seed?

diff --git a/src/status_im/ui/screens/wallet/accounts/views.cljs b/src/status_im/ui/screens/wallet/accounts/views.cljs
@@ -149,9 +149,8 @@
        [icons/icon :main-icons/more {:accessibility-label :accounts-more-options}]]]]))
 
 (views/defview accounts []
-  (views/letsubs [{:keys [accounts address]} [:multiaccount]
-                  multiaccounts [:multiaccounts/multiaccounts]]
-    (let [keycard-account? (boolean (get-in multiaccounts [address :keycard-key-uid]))]
+  (views/letsubs [{:keys [accounts address keycard-key-uid]} [:multiaccount]]
+    (let [keycard-account? (boolean keycard-key-uid)]
       [react/scroll-view {:horizontal true}
        [react/view {:flex-direction :row :padding-top 11 :padding-bottom 12}
         (for [account accounts]