Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NEP5 #364

Merged
merged 84 commits into from
Nov 29, 2017
Merged

NEP5 #364

merged 84 commits into from
Nov 29, 2017

Conversation

evgenyboxer
Copy link
Collaborator

@evgenyboxer evgenyboxer commented Nov 29, 2017 •
edited
Loading

  1. Change the text in receive modal to include tokens.
  2. Rework number formatting.
  3. Fix sending NEO/GAS.
  4. Token info is dispatched in the getTokenBalance method if the token does not have the token info.

slipo and others added 30 commits November 23, 2017 09:23
@slipo @evgenyboxer
Fix for: Password is displayed as visible text when creating wallet C…
d7e25f8 
…ityOfZion#342 (CityOfZion#347)
@slipo @evgenyboxer
Fix for: Give warning when API is down or wallet lacks connectivity C…
5bbd312 
…ityOfZion#265 (CityOfZion#346)
@evgenyboxer
Fix lint errors and refactor
3882ff5
@evgenyboxer
Remove RPX from reducers
2dce865
@evgenyboxer
Move loading indicator to the top
f0bcfc6
@evgenyboxer
hide scrollbars
76eef8d
@evgenyboxer
finetune the buttons
3aec2de
@evgenyboxer
Move the refresh button code to Dashboard.scss
c816882
@evgenyboxer
Remove unused styles
fbe3619
@evgenyboxer
Split token balances into its own component
5a7cf69
@evgenyboxer
Add info icon
b6f8764
@evgenyboxer
add tokens balance to initiateGetBalance
2b55120
@evgenyboxer
Remove unused methods
352495d
@evgenyboxer
POC tokenInfo
f624e8c
@slipo @evgenyboxer
Use PasswordField for WIF key in secret token sale screen (CityOfZion…
332422f 
…#351)
@evgenyboxer
Add token info modal and refactor the tokens state
4d2a023
@evgenyboxer
Update snapshots
b3b0d73
@evgenyboxer
Remove uneeded code
83c6277
@slipo @dvdschwrtz
Better formatting (CityOfZion#350)
8ffc0a5 
* Better formatting for bigger numbers

* Formating formatters file

* Removing mime requirement. Not needed.
@slipo @dvdschwrtz
Remove exclamation that's not needed in UI (CityOfZion#353)
e90dbde
@slipo @dvdschwrtz
Enter in textfields submits alt (CityOfZion#354)
e308653 
* Enter button submits forms, simple solution

* Code style fixes
@evgenyboxer
Merge with dev
e0f7677
@evgenyboxer
Use tight version
b89cba2
@evgenyboxer
Remove unused function
ff5f20a
@evgenyboxer
Remove comment
2aaa996
@evgenyboxer
Remove ToggleAsset
1286029
@evgenyboxer
Rename Gas -> GAS / Neo -> NEO
fe0df7b
@evgenyboxer
Add isToken method
0149f82
@evgenyboxer
WIP
710aaf1
@evgenyboxer
Use tight versioning
b2ea451
@evgenyboxer
Fix typo
03b4e43
@evgenyboxer
Revert back to local consts for ASSETS
acde320
@evgenyboxer
Load info when modal loads
fc92c62
@evgenyboxer
Rename to openExplorerTx
3d6d85f
@evgenyboxer
Pass retrieveTokenInfo to the token info modal
eea5ede
@evgenyboxer
WIP
93589cf
@evgenyboxer
Change token to symbol
ba8527b
@evgenyboxer
Add flow-typed for npm modules
10f270f
@evgenyboxer
Move declarations upper level
5f932ea
@evgenyboxer
Correct GAS decimal length
923646e
@evgenyboxer
Fix token info modal
3a4c4cb
@evgenyboxer
Symbol > Asset
de0db4c
@evgenyboxer
Add a border to the dashboard
91dfd34
@evgenyboxer
Disable claim when claim amount is 0
cb9604f
@evgenyboxer
Fix lint errors
0210c28
@evgenyboxer
Resolve conflicts
0514e49
@evgenyboxer
Merge and resolve conflicts
0ffae15
@evgenyboxer
Fix recieve modal height
1ba7723
@evgenyboxer
format balance
d63a335
@evgenyboxer
Preload token info when getting token balance (if it doesn't exist)
1cc41e0
@evgenyboxer
Refactor formatters
4497edb
@evgenyboxer
Drop the state and grab the info from the token props
57bb7ac
@evgenyboxer
Add number formatting
e11bb3b
@evgenyboxer
Use truncateToken
e6aa708
@evgenyboxer
Rename formatNumber to formatBalance
fccd770
@evgenyboxer
Fix obtainTokenBalance
84751ed
@evgenyboxer
Increase modal size to show full address
930ae05
@evgenyboxer
Fix sending NEO/GAS
b3b058a
@dvdschwrtz-zz dvdschwrtz-zz merged commit 2dcb537 into CityOfZion:NEP5 Nov 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvdschwrtz-zz dvdschwrtz-zz dvdschwrtz-zz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@evgenyboxer @dvdschwrtz-zz @slipo