Commit Graph

1343 Commits

Author SHA1 Message Date
Kenny Tran
3e299ff243
Merge pull request #85 from kennyt/design-feedback
Design feedback
2018-10-26 18:10:33 -07:00
Kenny Tran
ae9fa92546 Do approvals correctly 2018-10-26 17:24:09 -07:00
Kenny Tran
d15a3ceccc Update summary to react to lastEditedField and add summary modal for all pages 2018-10-26 15:53:47 -07:00
Kenny Tran
9d8c5330b8 Implement feedback 2018-10-26 13:51:36 -07:00
Kenny Tran
5987095eea
Merge pull request #84 from kennyt/refactor-send
Refactor send to use web3connect
2018-10-26 09:07:39 -07:00
Kenny Tran
09e7002152 Check for recipient for isValid 2018-10-26 08:42:43 -07:00
Kenny Tran
9fc59c4ffa Refactor send to use web3connect 2018-10-26 08:41:03 -07:00
Chi Kei Chan
a28d0f0b96
Add Approvals (#81)
* Add Approvals; no watching pending tx yet

* Various fixes

* Basic Desktop mode for now
2018-10-25 06:19:26 -07:00
Chi Kei Chan
dadbc4e441
Refactor Swap (#80)
* Refactor calculateInput for ETH-TOKEN swap

* Refactor Swap Input to not use drizzle

* Refactor Swap Output
2018-10-25 03:46:46 -07:00
Kenny Tran
6464e44310 Create QrCode component and use for recipient (#78) 2018-10-25 03:46:11 -07:00
Kenny Tran
4cb00d9528 Handle errors in send page and add summary (#79)
* Handle errors in send page and add summary

* Remove output balance check

* Remove unused variables and methods
2018-10-25 03:28:43 -07:00
Chi Kei Chan
509ddaeaa0
Implement Add Liquidity (#77)
* CSS fixes

* Add Liquidity UI and Validation

* Finish Add Liquidity
2018-10-23 15:19:49 -07:00
Kenny Tran
a4e0d11cef Connect send page with exchange utils (#75)
* Connect send page with exchange utils

* Add exchangeRate and fix txId
2018-10-23 09:19:21 -07:00
Kenny Tran
b1a5a6c867 Create send/transfer utils (#71) 2018-10-22 13:48:38 -07:00
Kenny Tran
4738629887 Reset after confirmed swap (#70) 2018-10-22 13:47:20 -07:00
Chi Kei Chan
6ea7b6ac0a
Add Web3Connect Watcher to replace drizzle (#74)
* Implement Basic web3connect

* Web3 Connect balance watching

* Partial refactor of Swap; Finish calc for AddLiquidity
2018-10-22 13:42:29 -07:00
Chi Kei Chan
57a05471e5 Refactor CurrencyInputPanel 2018-10-21 18:07:03 -07:00
Chi Kei Chan
f44d074907
Fix Approval and Unlocks integration (#73) 2018-10-20 22:52:55 -07:00
Kenny Tran
ade904d22e Approve / unlock functionality (#66)
* Initial approve / unlock functionality

* Refactor out getdecimal/getbalance. Add in approval limit

* Change validateBalance to shouldValidateBalance

* Add deepEqual and shouldComponentUpdate

* Use web3 toHex util

* Add pending icon and use
2018-10-19 22:53:14 -07:00
Kenny Tran
370d9e1009 Pending transactions modal (#67)
* Create pending transactions modal

* Add pending icon
2018-10-19 22:52:30 -07:00
Kenny Tran
9db8851518 Add focus-within border (#68) 2018-10-19 22:49:42 -07:00
Kenny Tran
204313f6f0 Implement inactive state for Swap CTA (#42)
* Implement inactive state for Swap CTA

* Disable Swap CTA if not valid

* Have isValid return a bool

* Use mercury gray for inactive CTA

* Check for input/output errors in validSwap
2018-10-18 11:42:11 -07:00
Kenny Tran
6c168635ff Create error state for currency input (#43)
* Create error state for currency input

* Create error functionality for redux

* Add proptypes and convert to float before compare

* Use big number for balance comparison
2018-10-17 18:13:48 -07:00
Chi Kei Chan
c691cfabe8
Handle frontend route in Netlify (#46)
* Add Netlify route

* Add route handling to netlify
2018-10-17 03:42:41 -07:00
Chi Kei Chan
c465d2d0d8
Add all smart trade methods to swap (#45)
* wip

* ETH to ERC20 swap input

* ERC20 to ETH swap input

* Add ERC20 to ETH swapInput

* Add ETH to ERC20 swapOutput

* Add ERC20 to ETH swapOutput

* Add ERC20 to ERC20 swapInput

* Add ERC20 to ERC20 swapOutput

* Remove console.log
2018-10-17 01:43:13 -07:00
Kenny Tran
b6ad0dbb3e Redirect to /swap and add (estimated) to last edit (#40) 2018-10-16 18:26:33 -07:00
Kenny Tran
ae4c739152 Style selected token row (#41)
* Style selected token row

* Use black variable
2018-10-16 18:25:53 -07:00
Chi Kei Chan
750a29e967 update exchange addresses 2018-10-16 04:47:27 -07:00
Chi Kei Chan
0b39cbad32
ERC20 to ERC20 calculateInput & calculateOutput (#39) 2018-10-16 04:30:53 -07:00
Chi Kei Chan
fd67c06093
Implements calculateInput ETH to ERC20 (#38)
* Update Rinkeby exchange address

* Implement ETH to ERC20 calculateInput and calculateOutput
2018-10-16 03:10:52 -07:00
Kenny Tran
12445c0076 Show MetaMask/Brave on desktop if web3 not enabled (#35)
* Show Brave/Metamask on non-mobile devices

* Change text to mention MetaMask and Brave

* Conform ternary spacing to app

* Add period
2018-10-15 19:01:27 -07:00
Kenny Tran
756e70a4a8 Change cipher links to coinbase wallet (#34)
* Change cipher links to coinbase wallet

* Add coinbase wallet logo, remove cipher logo, update code
2018-10-15 18:58:13 -07:00
Chi Kei Chan
a0ed20cd09
Add input to output calculation (#36) 2018-10-15 16:30:00 -07:00
Chi Kei Chan
c3123a49e1 Get token balance 2018-10-10 03:16:57 -07:00
Chi Kei Chan
bab0217d6c Add Drizzle to manage web3 and smart contracts call 2018-10-10 03:16:57 -07:00
Chi Kei Chan
e77330ece3 Watch for ETH balance update 2018-10-10 03:16:57 -07:00
Chi Kei Chan
eb18ec2d46 wip 2018-10-10 03:16:57 -07:00
Chi Kei Chan
dee4b7b8a7 wip 2018-10-10 03:16:57 -07:00
Chi Kei Chan
06bb5a954c Add transition to route changes 2018-10-10 03:16:57 -07:00
Chi Kei Chan
c524f613f0 Add dialog for when web3 is not found 2018-10-10 03:16:57 -07:00
Chi Kei Chan
3613054396 Add inactive state to views 2018-10-10 03:16:57 -07:00
Chi Kei Chan
d5e8b7345e Add Navigation to Header 2018-10-10 03:16:57 -07:00
Chi Kei Chan
c51eae9fd3 Connect to Web3 and get current wallet address 2018-10-10 03:16:57 -07:00
Chi Kei Chan
f2c9e5acee Add token logo fallback 2018-10-10 03:16:57 -07:00
Chi Kei Chan
1d86c0d656 Add Token Select Modal 2018-10-10 03:16:57 -07:00
Chi Kei Chan
8847f4e4d2 Add Pool screen 2018-10-10 03:16:57 -07:00
Chi Kei Chan
b9665b3a3d Add Send screen and fixed react-router 2018-10-10 03:16:57 -07:00
Chi Kei Chan
c5d911afde Add Swap screen 2018-10-10 03:16:57 -07:00
Chi Kei Chan
5f6e705680 Add first currency select panel 2018-10-10 03:16:57 -07:00
Chi Kei Chan
7a30c1c827 Add NavigationTabs 2018-10-10 03:16:57 -07:00