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

Do not use signer arg for keycard_signTypedData 

Signed-off-by: Vitaliy Vlasov <siphiuel@gmail.com>
This commit is contained in:
Vitaliy Vlasov 2020-05-18 16:17:21 +03:00
parent 288c28df75
commit e26f5452b9
No known key found for this signature in database
GPG Key ID: A7D57C347F2B2964
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/browser/core.cljs
View File

@ -325,7 +325,11 @@
(let [message? (constants/web3-sign-message? method) (let [message? (constants/web3-sign-message? method)
dapps-address (get-in cofx [:db :multiaccount :dapps-address])] dapps-address (get-in cofx [:db :multiaccount :dapps-address])]
(if (or message? (= constants/web3-send-transaction method)) (if (or message? (= constants/web3-send-transaction method))
(let [[address data] (when message? (normalize-sign-message-params params))] (let [[address data] (cond (= method constants/web3-keycard-sign-typed-data)
;; We don't use signer argument for keycard sign-typed-data
["0x0" params]
message? (normalize-sign-message-params params)
:else [nil nil])]
(when (or (not message?) (and address data)) (when (or (not message?) (and address data))
(signing/sign cofx (merge (signing/sign cofx (merge
(if message? (if message?

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

@ -148,7 +148,7 @@
:signing :t/try-keeping-the-card-still :signing :t/try-keeping-the-card-still
:error :t/tap-card-again :error :t/tap-card-again
:success :t/transaction-signed)] :success :t/transaction-signed)]
[react/view (assoc styles/message :padding-vertical 16 :align-items :center) [react/view (assoc (styles/message) :padding-vertical 16 :align-items :center)
[react/view {:style {:align-self :flex-start :padding-left 16 :margin-bottom 24}} [react/view {:style {:align-self :flex-start :padding-left 16 :margin-bottom 24}}
[react/text {:style {:font-size (if small-screen? 15 17) :font-weight "700"}} [react/text {:style {:font-size (if small-screen? 15 17) :font-weight "700"}}
(i18n/label :t/confirmation-request)]] (i18n/label :t/confirmation-request)]]