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

[#9256] Remove the "~" from the fiat currency value "~10.4 USD" 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2019-11-07 14:20:19 +01:00
parent 9205a147a2
commit 40de054393
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/subs.cljs
View File

@ -1888,7 +1888,7 @@
:step step :step step
:state (or state (if snt-amount :completed :disabled)) :state (or state (if snt-amount :completed :disabled))
:editing? editing? :editing? editing?
:fiat-value (str "~" fiat-value " " (:code currency))} :fiat-value (str fiat-value " " (:code currency))}
(= step :set-snt-amount) (= step :set-snt-amount)
(assoc :snt-amount (str screen-snt-amount) (assoc :snt-amount (str screen-snt-amount)

2
src/status_im/ui/screens/profile/tribute_to_talk/views.cljs
View File

@ -259,7 +259,7 @@
[{:style {:font-size 22 :color colors/gray}} token]] [{:style {:font-size 22 :color colors/gray}} token]]
[react/nested-text [react/nested-text
{:style {:font-size 12}} {:style {:font-size 12}}
(str "~" fiat-amount) fiat-amount
[{:style {:font-size 12 :color colors/gray}} [{:style {:font-size 12 :color colors/gray}}
(str " " fiat-currency)]] (str " " fiat-currency)]]
(if (or (nil? public-key) (= tribute-status :required)) (if (or (nil? public-key) (= tribute-status :required))

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

@ -221,7 +221,7 @@
" • " " • "
[{:style {:color colors/black}} [{:style {:color colors/black}}
(if converted-value (if converted-value
(str "~" (i18n/format-currency converted-value (:code wallet-currency))) (i18n/format-currency converted-value (:code wallet-currency))
[react/activity-indicator {:color :colors/gray [react/activity-indicator {:color :colors/gray
:ios {:size :small} :ios {:size :small}
:android {:size :16}}])] :android {:size :16}}])]
@ -241,7 +241,7 @@
" • " " • "
[{:style {:color colors/black}} [{:style {:color colors/black}}
(if converted-fee-value (if converted-fee-value
(str "~" (i18n/format-currency converted-fee-value (:code wallet-currency))) (i18n/format-currency converted-fee-value (:code wallet-currency))
[react/activity-indicator {:color :colors/gray [react/activity-indicator {:color :colors/gray
:ios {:size :small} :ios {:size :small}
:android {:size :16}}])] :android {:size :16}}])]

1
src/status_im/ui/screens/wallet/account/views.cljs
View File

@ -49,7 +49,6 @@
[react/view {:padding 16 :padding-bottom 12 :flex 1 :justify-content :space-between} [react/view {:padding 16 :padding-bottom 12 :flex 1 :justify-content :space-between}
[react/nested-text {:style {:color colors/white-transparent :line-height 38 [react/nested-text {:style {:color colors/white-transparent :line-height 38
:font-weight "600" :font-size 32}} :font-weight "600" :font-size 32}}
(accounts/total-tilde portfolio-value)
[{:style {:color colors/white}} portfolio-value] [{:style {:color colors/white}} portfolio-value]
" " " "
(:code currency)] (:code currency)]

5
src/status_im/ui/screens/wallet/accounts/views.cljs
View File

@ -18,9 +18,6 @@
(def state (reagent/atom {:tab :assets})) (def state (reagent/atom {:tab :assets}))
(defn total-tilde [value]
(when (and (not= "0" value) (not= "..." value)) "~"))
(views/defview account-card [{:keys [name color address] :as account}] (views/defview account-card [{:keys [name color address] :as account}]
(views/letsubs [currency [:wallet/currency] (views/letsubs [currency [:wallet/currency]
portfolio-value [:account-portfolio-value address]] portfolio-value [:account-portfolio-value address]]
@ -31,7 +28,6 @@
[react/view {:style (styles/card color)} [react/view {:style (styles/card color)}
[react/view {:flex-direction :row :align-items :center :justify-content :space-between} [react/view {:flex-direction :row :align-items :center :justify-content :space-between}
[react/nested-text {:style {:color colors/white-transparent :font-weight "500"}} [react/nested-text {:style {:color colors/white-transparent :font-weight "500"}}
(total-tilde portfolio-value)
[{:style {:color colors/white}} portfolio-value] [{:style {:color colors/white}} portfolio-value]
" " " "
(:code currency)] (:code currency)]
@ -93,7 +89,6 @@
portfolio-value [:portfolio-value]] portfolio-value [:portfolio-value]]
[react/view [react/view
[react/nested-text {:style {:font-size 32 :color colors/gray :font-weight "600"}} [react/nested-text {:style {:font-size 32 :color colors/gray :font-weight "600"}}
(total-tilde portfolio-value)
[{:style {:color colors/black}} portfolio-value] [{:style {:color colors/black}} portfolio-value]
" " " "
(:code currency)] (:code currency)]