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

[FIX #3214] Question mark is missing on Gas details screen 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Daniel Regeci 2018-04-03 14:47:47 +08:00 committed by Andrey Shovkoplyas
parent cb30f4a844
commit f7120184a4
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/ui/components/colors.cljs
View File

@ -14,6 +14,7 @@
(def gray-transparent "rgba(184, 193, 199, 0.5)") ;; Used for tabs (def gray-transparent "rgba(184, 193, 199, 0.5)") ;; Used for tabs
(def gray-border "#ececf0") (def gray-border "#ececf0")
(def blue "#4360df") ;; Used as main wallet color, and ios home add button (def blue "#4360df") ;; Used as main wallet color, and ios home add button
(def blue-dark "#3147ac") ;; Used as secondary wallet color (icon background)
(def red "#ff2d55") ;; Used to highlight errors or "dangerous" actions (def red "#ff2d55") ;; Used to highlight errors or "dangerous" actions
(def red-light "#ffe5ea") ;; error tooltip (def red-light "#ffe5ea") ;; error tooltip
(def text-light-gray "#212121") ;; Used for labels (home items) (def text-light-gray "#212121") ;; Used for labels (home items)

21
src/status_im/ui/screens/wallet/send/styles.cljs
View File

@ -89,7 +89,7 @@
:margin-left 4}) :margin-left 4})
(def advanced-fees-text (def advanced-fees-text
{:color colors/white}) {:color colors/white})
(def advanced-fees-details-text (def advanced-fees-details-text
{:color colors/white-lighter-transparent}) {:color colors/white-lighter-transparent})
@ -98,7 +98,24 @@
{:flex-direction :row}) {:flex-direction :row})
(def transaction-fee-info (def transaction-fee-info
{:margin 15}) {:flex-direction :row
:margin 15})
(def transaction-fee-info-text-wrapper
{:flex-shrink 1})
(def transaction-fee-info-icon
{:border-radius 25
:width 25
:height 25
:margin-right 15
:align-items :center
:justify-content :center
:background-color colors/blue-dark})
(def transaction-fee-info-icon-text
{:color colors/white
:font-size 14})
(def transaction-fee-input (def transaction-fee-input
{:keyboard-type :numeric {:keyboard-type :numeric

7
src/status_im/ui/screens/wallet/send/views.cljs
View File

@ -137,8 +137,11 @@
[wallet.components/cartouche-secondary-text [wallet.components/cartouche-secondary-text
(i18n/label :t/gwei)]]]] (i18n/label :t/gwei)]]]]
[react/view styles/transaction-fee-info [react/view styles/transaction-fee-info
[react/text {:style styles/advanced-fees-text} [react/view styles/transaction-fee-info-icon
(i18n/label :t/wallet-transaction-fee-details)]] [react/text {:style styles/transaction-fee-info-icon-text} "?"]]
[react/view styles/transaction-fee-info-text-wrapper
[react/text {:style styles/advanced-fees-text}
(i18n/label :t/wallet-transaction-fee-details)]]]
[components/separator] [components/separator]
[react/view styles/transaction-fee-block-wrapper [react/view styles/transaction-fee-block-wrapper
[wallet.components/cartouche {:disabled? true} [wallet.components/cartouche {:disabled? true}