Commit Graph

450 Commits

Author SHA1 Message Date
ian-jh
495fb062ec restore to beta 2019-08-14 16:43:29 -07:00
ian-jh
59e3f34ddb ≈ççç≈≈Merge branch 'beta' of https://github.com/Uniswap/uniswap-frontend into beta 2019-08-14 16:27:31 -07:00
ian-jh
cb7dbe79e8 abort rebase fix conflicts 2019-08-14 16:27:08 -07:00
Noah Zinsmeister
54ef651806
fix re-render bug 2019-08-13 15:07:42 -07:00
Callil Capuozzo
da22c6d69a Style token modal and toggle switch (#413) 2019-08-13 14:42:32 -04:00
Ian Lapham
1c6fa1761f set night mode to default (#412) 2019-08-13 13:34:14 -04:00
Noah Zinsmeister
0fb3565cb8
fix pull request template 2019-08-13 10:32:18 -07:00
Noah Zinsmeister
4e834c4cc7
add PR template 2019-08-13 10:09:31 -07:00
Ian Lapham
677537ca31 Updates to Token Modal (#399) 2019-08-12 20:37:32 -04:00
Noah Zinsmeister
be2012cdf5
fix deprecated switch component (#409) 2019-08-12 19:19:03 -04:00
Noah Zinsmeister
f314c75829
update token logo url (#408) 2019-08-12 11:33:31 -04:00
Jackson
8011a02e13 Update SNX to vanity contract address (#405) 2019-08-12 11:04:21 -04:00
Noah Zinsmeister
ae50d269ed
fix ens stuff again (#407) 2019-08-12 11:03:11 -04:00
CLINT
9a1b434568 Update SNX Contract ProxyERC20 Address (#404) 2019-08-08 11:05:13 -04:00
Noah Zinsmeister
cff73c527a
add RCN (#402)
closes #363
2019-08-07 15:45:31 -04:00
Callil Capuozzo
c28884f44b Add theme toggle and footer (#400) 2019-08-07 14:58:29 -04:00
Callil Capuozzo
80da6e0ff6 Dark theme (#380) 2019-07-31 14:11:58 -04:00
Ian Lapham
c8f8d838a0
Merge pull request #376 from ianlapham/combine-swap-send
Combine Swap and Send Into 1 Component
2019-07-30 16:00:00 -04:00
Noah Zinsmeister
3a23d84de0
delete package lock
re-invert rates

make slippage parsing more explicit
2019-07-30 15:48:08 -04:00
Noah Zinsmeister
0235bedae5
Merge branch 'combine-swap-send' of https://github.com/ianlapham/uniswap-frontend into ianlapham-combine-swap-send 2019-07-30 14:05:28 -04:00
ian-jh
d90604dacc update code style for build 2019-07-30 10:53:38 -04:00
Noah Zinsmeister
767ce8646f
allowing leading dot slippage (#381) 2019-07-30 10:45:50 -04:00
ian-jh
eef28cf24c fix build errors; 2019-07-30 10:40:00 -04:00
Noah Zinsmeister
8d0b8e32a4
fix ens name typing bug (#378)
* fix ens typing error handling
2019-07-29 18:34:15 -04:00
ian-jh
7a58ca810f resolve conflicts 2019-07-29 16:46:36 -04:00
ian-jh
7304277735 update appjs component structure 2019-07-29 16:03:35 -04:00
ian-jh
ab3faaa277 fix most conflicts 2019-07-29 16:01:07 -04:00
ian-jh
3c6e11fb12 fix code style on app.js -v2 2019-07-29 15:49:34 -04:00
ian-jh
fe1abe5a76 fix code style on app.js 2019-07-29 15:48:45 -04:00
ian-jh
3d452b70e4 resolve merge conflicts 2019-07-29 15:45:48 -04:00
Ian Lapham
3f3889b9ab
Merge pull request #1 from ianlapham/combine-swap-send
Combine swap send into one component
2019-07-29 15:39:15 -04:00
ian-jh
e19e150f01 combine swap and send pages into one component 2019-07-29 15:35:28 -04:00
Callil Capuozzo
66604cf47e Add focus styles (#375)
* Add focus styles

* remove periods

* Change copy and button hover state
2019-07-29 15:14:53 -04:00
ian-jh
38dcc1baa0 ō
Merge branch 'beta' of https://github.com/ianlapham/uniswap-frontend into combine-swap-send
2019-07-29 11:02:23 -04:00
ian-jh
d265b12085 Merge remote-tracking branch 'upstream/beta' into beta 2019-07-29 10:44:32 -04:00
Ian Lapham
30887ef1fc Add slippage option (#369)
* add custom slippage to /swap
2019-07-26 18:11:35 -04:00
Noah Zinsmeister
12344f74ef
add localstorage support (#374)
* add localstorage support

* remove connect arrow

* invert rates to start
2019-07-26 18:02:48 -04:00
ian-jh
2fef97d0f3 setup initital component merging 2019-07-24 16:33:28 -04:00
ian-jh
1dcec9be38 fix button state bug 2019-07-24 15:00:03 -04:00
ian-jh
8c3b2bff8d update logic for button state 2019-07-24 14:53:36 -04:00
Mounir Benchemled
12ab73d6c9 Feature/ropsten (#370)
* Refactoring AddLiquidity to make gasLimit computation more clear
2019-07-24 10:26:17 -04:00
ian-jh
2ceffda8f9 add error logic and styling 2019-07-23 17:32:26 -04:00
Noah Zinsmeister
2431e26599
add tokens, do some summer cleaning (#368)
* fix suppressClassNameWarning

* remove .md

* update dependencies

* add MLN

closes #367

* add DIP

closes #359
2019-07-23 13:50:31 -04:00
Ian Lapham
eea30fae67 Fix i18n bug (#365)
* fix i18n bug

* fix styles

* update with prettier and include env file
2019-07-22 15:19:15 -04:00
ian-jh
870b3f7e88 update with prettier and include env file 2019-07-22 15:12:09 -04:00
ian-jh
2a6b1e63c4 add initial changes 2019-07-22 15:00:45 -04:00
ian-jh
0bb6bdcd37 fix styles 2019-07-17 10:18:17 -04:00
ian-jh
6be569a2c6 fix i18n bug 2019-07-17 10:10:55 -04:00
Noah Zinsmeister
09c77bef4c
update dependencies 2019-07-11 10:29:56 -04:00
CLINT
9fa28f14a7 Update SNX and added sETH liquidity (#361)
* added Synthetic ETH & Update with new SNX Address
2019-07-11 10:27:38 -04:00