ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,797 Commits 1 Branch 671 Tags 826 MiB
b15f2a2bb6
Commit Graph

2345 Commits

Author SHA1 Message Date
Chi Kei Chan
b57f133a8d Return when web3 is found 2018-10-30 13:07:00 +01:00
Hayden Adams
72364ec5f1 update header warning message 2018-10-30 05:46:18 +01:00
Hayden Adams
97e9c169c2 update addresses and various text changes 2018-10-30 05:18:03 +01:00
Kenny Tran
3bcecfd01c
Merge pull request #104 from kennyt/check-for-web3 
Check for web3 because accessing utils
 2018-10-29 20:38:20 -07:00
Kenny Tran
c4ff87cd19 Check for web3 because accessing utils 2018-10-29 20:37:29 -07:00
Daniel Tsui
4fb916a72d Fix max_tokens for first liquidity provider case (#101) 2018-10-29 13:01:35 -07:00
Chi Kei Chan
3709139466 Check web3 for existence 2018-10-28 13:26:29 -07:00
Chi Kei Chan
d5643469bb Fix exchange rate calc 2018-10-28 13:07:40 -07:00
Chi Kei Chan
22b6c0b0d1 Copy changes and add Create Exchange button 2018-10-28 12:32:21 -07:00
Chi Kei Chan
bbe6410a7d Check web3 for existence 2018-10-28 04:54:31 -07:00
Chi Kei Chan
f0ddff5326 Check web3 for existence 2018-10-28 04:50:40 -07:00
Chi Kei Chan
2189ac926c Fix networkId default value 2018-10-28 04:37:38 -07:00
Chi Kei Chan
d69acdcb93 Turn off GA in dev 2018-10-28 04:12:59 -07:00
Chi Kei Chan
7db118e841 Add GA 2018-10-28 04:05:08 -07:00
Chi Kei Chan
c33adf5158 Fix header 2018-10-28 03:16:05 -07:00
Chi Kei Chan
bd28ef8dd8
Add Warning Messages and various fixes (#100) 
* Fix summary panel in Remove Liquidity

* Add warning message

* Add wrong network warning and env vars
 2018-10-28 03:06:53 -07:00
Chi Kei Chan
c798045590
Add Remove Liquidity (#98) 2018-10-27 19:32:11 -07:00
Chi Kei Chan
14b70eebeb Fix routes for assets path 2018-10-27 16:57:16 -07:00
Chi Kei Chan
6b5621fe29 Remove Drizzle; Header MediaQuery 2018-10-27 16:43:16 -07:00
Callil Capuozzo
a8b3fda0cf CSS design adjustments (#92) 
* CSS design adjustments

* Desktop CSS (layouts and modals)
 2018-10-27 15:44:04 -07:00
Chi Kei Chan
f86f1948aa
Add Create Exchange (#94) 
* MinLiquidity to zero in new exchange

* Add Create Exchange; Fix Generic Logo size

* Fix pool page routing
 2018-10-27 15:40:31 -07:00
Chi Kei Chan
2be295d1fd Remove ZRX from Rinkeby 2018-10-27 12:34:59 -07:00
Chi Kei Chan
5ee3c90ba3
Add Arbitrary Token (#90) 2018-10-27 12:34:03 -07:00
Chi Kei Chan
39248a0f6b
Handle first liquidity deposit and add warning message (#88) 2018-10-27 11:46:58 -07:00
Kenny Tran
112a5b07ec Fix approvals 2018-10-27 07:12:36 -07:00
Chi Kei Chan
63440fd83f
Update Addresses for Main Net; Update TokenLogo; Connect Web3Status (#86) 2018-10-27 00:54:52 -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
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
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
Chi Kei Chan
e0cc2b59d1 Add Header 2018-10-10 03:16:57 -07:00
Chi Kei Chan
6b894511c4 Add React Router to home page 2018-10-10 03:16:57 -07:00
Chi Kei Chan
f97155d6b3 Add Sass and create pages directory 2018-10-10 03:16:57 -07:00
Chi Kei Chan
2d423267f8 Refactor to ducks-modular-redux pattern for reducers/actions 2018-10-10 03:16:57 -07:00
Hayden Adams
c41926dbb1 fix min value bug 2018-07-24 22:09:59 -04:00
Hayden Adams
64710cae0d
Merge pull request #9 from akhila-raju/patch-1 
Minor fix
 2018-06-30 15:06:31 -04:00
Hayden Adams
2e3b8b6e7a minor fixes 2018-06-30 15:04:58 -04:00
Akhila Raju
c41b821e08
Minor fix 
Found a typo :)
 2018-06-30 13:06:28 -04:00
Hayden Adams
005538b6a6 improvements 2018-05-27 01:34:24 -04:00
Hayden Adams
309bd109f7 remove invariants 2018-05-18 21:40:07 -04:00
Hayden Adams
5e7ae40c3a small improvements 2018-05-09 13:13:40 -04:00
Hayden Adams
0a5042e07e random fixes and temporarily remove price graph 2018-05-09 11:15:45 -04:00
Hayden Adams
4389c23242 minor refactor 2018-04-16 21:35:58 -04:00
Uciel Vilchis
b791e2aa09 polish line graph 2018-04-03 00:27:21 -04:00
Hayden Adams
955d5bab2e add divest, minor improvements 2018-04-03 10:08:27 +09:00
Hayden Adams
1a73cdfa58 first deployment w/ visualization and investment 2018-04-01 11:32:41 +09:00
Uciel
5441faeddd polish data visualization 2018-03-31 21:44:48 -04:00
Uciel
a02f0cdcea Merge branch 'dev' of https://github.com/haydenadams/uniswap-frontend into dev 2018-03-31 20:32:30 -04:00
Hayden Adams
03c376152b add liquidity investment 2018-03-31 17:08:04 +09:00
Uciel
4a3bd37da8 render primitive line graph 2018-03-29 20:00:16 -04:00
Hayden Adams
72b968778b display user balances, minor changes 2018-03-26 23:18:15 -04:00
Hayden Adams
93ab10c95e add MKR, DAI, ZRX 2018-03-25 11:29:25 -04:00
Uciel
13a0aee684 BAT and OMG tokens live 2018-03-24 21:16:07 -04:00
Uciel
f7c493a727 refactor functions to be more dynamic 2018-03-24 18:30:01 -04:00
Uciel
20538d34ed renamed web3 reducer 2018-03-23 14:24:45 -04:00
Uciel
fe19f9ea19 major code refactor and cleanup 2018-03-21 21:06:18 -04:00
Uciel
22845601b9 major render refactor, minor logout error 2018-03-20 00:11:30 -04:00
Uciel
9f2d5ee958 globalWeb3 redux logic ready 2018-03-15 20:29:55 -04:00
Hayden Adams
fbd78a5a0b rename web to web3Store, remove getBlock interval 2018-03-15 19:16:53 -04:00
Hayden Adams
37d82f97d2 minor function refactor 2018-03-13 22:40:46 -04:00
Uciel
3000f70ebf redux refactor complete 2018-03-11 20:24:38 -04:00
Uciel
67f3234828 first chunk of redux refactor complete 2018-03-11 00:50:54 -05:00
Hayden Adams
79b8421316 Merge branch 'simple' of https://github.com/haydenadams/uniswap into simple 2018-01-29 00:43:45 -05:00
Callil Capuozzo
8bbd2fc915 Metamask link broken 2018-01-26 15:38:52 -05:00
Hayden Adams
11259b351b update about text 2018-01-23 14:28:39 -05:00
Callil Capuozzo
c9253206e9 Add CTA on swap prompt 2018-01-22 17:40:48 -05:00
Hayden Adams
20f4a66377 links show pointers 2018-01-22 17:39:11 -05:00
Hayden Adams
aa1f2e5721 get Account balance at start 2018-01-22 17:32:20 -05:00
Hayden Adams
e90423d5af fixed decimal values, fixed bug related to error1 not showing for token to token 2018-01-22 16:40:04 -05:00
Hayden Adams
d9e181b229 Merge branch 'simple' of https://github.com/haydenadams/uniswap into simple 2018-01-22 16:09:32 -05:00
Hayden Adams
ec426129af get market info at start 2018-01-22 16:09:16 -05:00
Callil Capuozzo
f915101865 Better bad network message 2018-01-22 16:08:12 -05:00
Callil Capuozzo
5da82f376a fixes 
React dev errors
 2018-01-22 16:05:18 -05:00
Callil Capuozzo
b0c4f2dab0 Small fixes 2018-01-22 15:53:59 -05:00
Callil Capuozzo
7858f41e30 Fix testate check and balance warning 2018-01-22 15:36:20 -05:00
Callil Capuozzo
93c627be9d Fixes 2018-01-22 15:09:32 -05:00
Callil Capuozzo
c6457bbfb8 Add cookies to store app state 
also store transaction history to review. Next step - listing
transaction status.
 2018-01-22 15:08:19 -05:00
Callil Capuozzo
21e3057e58 Add 'add token' UX 
Connection helped included add token prompt and link
Font now included in CSS (needs testing)
 2018-01-22 14:27:53 -05:00
Callil Capuozzo
f570c4686a Add UX features 
Detect all metamask states
UX for approve transactions
UX for getting more ETH from faucet
UX for submitted transactions
Toggle about
 2018-01-22 14:05:22 -05:00
Hayden Adams
d00d4c0b26 add approve, allowance, and get market data periodically 2018-01-21 03:21:50 -05:00
Hayden Adams
65ea8cdabf web3 improvements 2018-01-20 21:29:47 -05:00
Hayden Adams
cbc2b2e1f6 add web3 block confirmations to transactions 2018-01-20 17:55:12 -05:00
Hayden Adams
7d49acec44 web3 calls return errors and receipts, add factory 2018-01-20 16:43:19 -05:00
Hayden Adams
c22503bb61 small changes 2018-01-20 16:42:14 -05:00
Hayden Adams
6c6aff7c1f fix exchangeType initial state 2018-01-20 14:27:31 -05:00
Hayden Adams
97131bd8bd working token to token purchases 2018-01-20 02:02:49 -05:00
Hayden Adams
dcbc65e94d fix merge conflicts 2018-01-19 17:14:59 -05:00
Hayden Adams
9099c7390f update web3 2018-01-19 17:01:35 -05:00
Callil Capuozzo
0a7c668dc6 Token name from state 2018-01-19 12:55:52 -05:00
Callil Capuozzo
a9b8740734 Initial design & interactions 
Began porting some function and state names to more generic descriptors
like inputToken & outputToken thats align more closely with the
proposed UX model in this design. Needs discussion.
 2018-01-18 14:11:51 -05:00
Hayden Adams
d0c9ec58d7 prompt metamask install 2017-12-01 17:54:41 -05:00
Hayden Adams
6218720e34 add Lovelo Line Bold font 2017-11-27 20:17:52 -05:00
Hayden Adams
1ecf1ea7f0 remove react-web3 library 2017-11-27 20:16:41 -05:00
Hayden Adams
bc71ac3fbb improve website resizing 2017-11-27 20:03:17 -05:00
Hayden Adams
9ea789bb08 fix minEth to wei bug 2017-11-27 20:02:14 -05:00
Hayden Adams
29620e5fb6 add scrollable instructions and new logo 2017-11-27 02:23:55 -05:00
Hayden Adams
edf709551b update to web3@1.0 2017-11-23 22:05:02 -05:00
Hayden Adams
731b31682e fix min prices 2017-11-15 19:48:48 -05:00
Hayden Adams
24eb01db95 add CNAME 2017-11-03 18:27:56 -04:00
Hayden Adams
ab891d1b2c first demo release 2017-11-02 16:43:27 -04:00
Hayden Adams
bb8c483746 site improvements and smart contracts 2017-10-29 00:35:01 -04:00
Hayden Adams
fa98ce4dd0 first commit 2017-10-28 03:55:27 -04:00