From 1b40ccbe86f2f5a4b7e27b27d28c5df5288d0463 Mon Sep 17 00:00:00 2001 From: Dmitry Novotochinov Date: Wed, 12 Sep 2018 19:24:15 +0300 Subject: [PATCH] [#5798] change balance tilde color, remove it when 0 balance Signed-off-by: Dmitry Novotochinov --- src/status_im/ui/screens/wallet/main/styles.cljs | 3 +++ src/status_im/ui/screens/wallet/main/views.cljs | 5 +++++ src/status_im/ui/screens/wallet/subs.cljs | 11 ++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/status_im/ui/screens/wallet/main/styles.cljs b/src/status_im/ui/screens/wallet/main/styles.cljs index 4bcb42a365..cf66b066d9 100644 --- a/src/status_im/ui/screens/wallet/main/styles.cljs +++ b/src/status_im/ui/screens/wallet/main/styles.cljs @@ -58,6 +58,9 @@ (def total-value {:color colors/white-transparent}) +(def total-balance-tilde + {:color colors/white-transparent}) + (defstyle total-balance-currency {:font-size 37 :margin-left 9 diff --git a/src/status_im/ui/screens/wallet/main/views.cljs b/src/status_im/ui/screens/wallet/main/views.cljs index 4b0e8a72e8..ee111216ba 100644 --- a/src/status_im/ui/screens/wallet/main/views.cljs +++ b/src/status_im/ui/screens/wallet/main/views.cljs @@ -51,6 +51,11 @@ [react/view {:style styles/total-balance} [react/text {:style styles/total-balance-value :accessibility-label :total-amount-value-text} + (when (and + (not= "0" value) + (not= "..." value)) + [react/text {:style styles/total-balance-tilde} + "~"]) value] [react/text {:style styles/total-balance-currency :accessibility-label :total-amount-currency-text} diff --git a/src/status_im/ui/screens/wallet/subs.cljs b/src/status_im/ui/screens/wallet/subs.cljs index 5073ebd2e9..d58a7aac6b 100644 --- a/src/status_im/ui/screens/wallet/subs.cljs +++ b/src/status_im/ui/screens/wallet/subs.cljs @@ -65,11 +65,12 @@ (or currency-code (-> currency :code keyword)) token->decimals)] - (-> balance-total-value - (money/with-precision 2) - str - (i18n/format-currency (:code currency) false) - (->> (str "~")))) + (if (pos? balance-total-value) + (-> balance-total-value + (money/with-precision 2) + str + (i18n/format-currency (:code currency) false)) + "0")) "..."))) (re-frame/reg-sub :prices-loading?