From cdad34ed3deee32ee924e7af59d9d42ac2815d87 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Mon, 4 May 2020 14:54:59 +0200 Subject: [PATCH] fixed keycard crash on message signing and fixed height of bottom sheet Signed-off-by: Andrey Shovkoplyas --- src/status_im/signing/keycard.cljs | 6 +++--- src/status_im/ui/screens/signing/views.cljs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/status_im/signing/keycard.cljs b/src/status_im/signing/keycard.cljs index 7f3d46abb0..ad60496f04 100644 --- a/src/status_im/signing/keycard.cljs +++ b/src/status_im/signing/keycard.cljs @@ -85,6 +85,6 @@ (assoc-in [:hardwallet :pin :enter-step] :sign) (assoc-in [:signing/sign :type] :keycard) (assoc-in [:signing/sign :keycard-step] :pin))} - (if message - (hash-message message nil) - (hash-transaction))))) + #(if message + (hash-message % message) + (hash-transaction %))))) diff --git a/src/status_im/ui/screens/signing/views.cljs b/src/status_im/ui/screens/signing/views.cljs index 55b65282c7..cc9d8dc51d 100644 --- a/src/status_im/ui/screens/signing/views.cljs +++ b/src/status_im/ui/screens/signing/views.cljs @@ -126,7 +126,7 @@ (defn- keycard-view [{:keys [keycard-step]} phrase] - [react/view {:height 520} + [react/view [signing-phrase-view phrase] (case keycard-step :pin [keycard-pin-view]