Bug/improved wallet styles #2053
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
angusiguess
approved these changes
Oct 9, 2017
yenda
approved these changes
Oct 9, 2017
| :letter-spacing 0.2} | ||
| {:font-size 14 | ||
| :padding-vertical 10 | ||
| :letter-spacing 0.5} |
There was a problem hiding this comment.
last time I checked letter-spacing doesn't work with react-native on Android
There was a problem hiding this comment.
Right, see #2045. But it might at some point so better add it now.
rasom
approved these changes
Oct 9, 2017
oskarth
reviewed
Oct 9, 2017
| @@ -24,12 +24,9 @@ | |||
| (let [amount' (string/replace amount #"," ".") | |||
| amount-splited (string/split amount' #"[.]")] | |||
| (cond | |||
| (or (nil? amount) (= amount "") (re-matches #"0[,.]0*$" amount)) | |||
| (or (nil? amount) (= amount "") (= amount "0") (re-matches #"0[,.]0*$" amount)) | |||
There was a problem hiding this comment.
Can we name whatever this condition is? Looks like something like no-amount-present?, could be in let or if we re-use it.
Not part of PR, but I also noticed there is some weird parse float / try-catch with money just under this piece of code, it seems like that belongs in money.cljs?
oskarth
approved these changes
Oct 9, 2017
| (ns status-im.ui.screens.wallet.wallet-list.subs | ||
| (:require [re-frame.core :as re-frame])) | ||
|
|
||
| ;; TODO update when adding multiple wallet support. This will probably require changes to app-db |
| @@ -36,16 +36,17 @@ | |||
| (border position))) | |||
|
|
|||
| (defnstyle button-text [disabled?] | |||
| {:font-size 15 | |||
| :font-weight "normal" | |||
| {:font-weight "normal" | |||
jeluard
force-pushed
the
bug/improved-wallet-styles
branch
from
964b32c to
efbc32c
Compare
|
@jeluard please resolve conflicts |
|
Agreed to change the long wallet title. It will be like 'Основной кош..' instead of |
jeluard
force-pushed
the
bug/improved-wallet-styles
branch
from
efbc32c to
80f9f8c
Compare
Make wallet list show correct amount Wallet name should be cut if too long
jeluard
force-pushed
the
bug/improved-wallet-styles
branch
from
80f9f8c to
a189163
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
Steps to test:
status: ready