From d07c9c6613551a6b68ff1087276f08aa64f61a71 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Fri, 6 Sep 2019 10:35:57 +0200 Subject: [PATCH] fixed :background-color on Android crash Signed-off-by: Andrey Shovkoplyas --- src/status_im/ui/components/button.cljs | 6 +-- .../ui/screens/wallet/components/styles.cljs | 1 - .../ui/screens/wallet/send/styles.cljs | 46 +------------------ 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/src/status_im/ui/components/button.cljs b/src/status_im/ui/components/button.cljs index 81a1259a7e..555f305d53 100644 --- a/src/status_im/ui/components/button.cljs +++ b/src/status_im/ui/components/button.cljs @@ -20,13 +20,13 @@ :align-items :center :justify-content :center :background-color (cond (#{:secondary :next :previous} type) - nil + "" disabled? colors/gray-transparent-10 (= type :main) colors/blue-transparent-10 :else - nil)})) + "")})) (defn button @@ -61,7 +61,7 @@ (#{:main :secondary :next :previous} type) colors/blue :else - nil)}} + "")}} label] (when (= type :next) [vector-icons/icon :main-icons/next {:container-style {:width 24 :height 24 :margin-left 4} diff --git a/src/status_im/ui/screens/wallet/components/styles.cljs b/src/status_im/ui/screens/wallet/components/styles.cljs index d7056ded71..24f7d77a7f 100644 --- a/src/status_im/ui/screens/wallet/components/styles.cljs +++ b/src/status_im/ui/screens/wallet/components/styles.cljs @@ -104,7 +104,6 @@ (defstyle container-disabled {:border-width 1 :border-color colors/white-transparent-10 - :background-color nil :border-radius 8}) (def wallet-container diff --git a/src/status_im/ui/screens/wallet/send/styles.cljs b/src/status_im/ui/screens/wallet/send/styles.cljs index 34e1690f93..5b022a2fdd 100644 --- a/src/status_im/ui/screens/wallet/send/styles.cljs +++ b/src/status_im/ui/screens/wallet/send/styles.cljs @@ -7,26 +7,6 @@ {:flex 1 :padding-bottom 60}) -(defn animated-sign-panel [bottom-value] - {:position :absolute - :left 12 - :right 12 - :bottom bottom-value}) - -(defn sign-panel [opacity-value] - {:opacity opacity-value - :border-radius 8 - :background-color colors/white - :padding-top 12 - :padding-horizontal 12}) - -(def signing-phrase-container - {:border-radius 8 - :height 36 - :align-items :center - :justify-content :center - :background-color colors/gray-lighter}) - (def signing-phrase-description {:padding-top 8}) @@ -68,34 +48,10 @@ {:flex-direction :row :margin 15}) -(def transaction-fee-info-icon - {:border-radius 25 - :width 25 - :height 25 - :margin-right 15 - :align-items :center - :justify-content :center - :background-color colors/black-transparent}) - -(def transaction-fee-info-icon-text - {:color colors/white - :font-size 14}) - (def transaction-fee-input {:keyboard-type :numeric :auto-capitalize "none" :placeholder "0.000" :placeholder-text-color colors/white-transparent :selection-color colors/white - :style wallet.components.styles/text-input}) - -(def sign-buttons - {:background-color colors/blue - :padding-vertical 8}) - -(def password-error-tooltip - {:bottom-value 15 - :color colors/red-light}) - -(defstyle gas-input-error-tooltip - {:android {:bottom-value -38}}) \ No newline at end of file + :style wallet.components.styles/text-input}) \ No newline at end of file