Commit Graph

432 Commits

Author SHA1 Message Date
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
Pascal Van Hecke
86c8bef1f2 Adding DGD token tentatively to check on netlify whether the new inte… (#357)
* Adding DGD token
2019-07-09 13:53:12 -04:00
Noah Zinsmeister
e57958bb1e
Merge pull request #352 from NoahZinsmeister/beta
add tokens
2019-07-05 13:48:22 -04:00
Noah Zinsmeister
94a225b3ea
add dai pool tokens 2019-07-05 13:40:31 -04:00
Noah Zinsmeister
b8035fc82f
add RPL + STORJ + WCK
closes #346
2019-07-05 13:28:31 -04:00
Noah Zinsmeister
668a1c80ee
fix various 0 decimal bugs (#342) 2019-06-21 10:25:13 -04:00
Noah Zinsmeister
0a924003d1
Merge pull request #339 from NoahZinsmeister/beta
add MGN
2019-06-17 12:37:17 -04:00
Noah Zinsmeister
54b889794b
add MGN 2019-06-17 12:30:16 -04:00
Noah Zinsmeister
727d289413
modal responsiveness, 1 token addition, token selection (#329)
* improve modal responsiveness

* add MATIC

* fix modal min height reversion

* add token population via route
2019-06-14 10:39:33 -04:00
Matheus Faria de Alencar
58804714be fix: closes #334 (#335) 2019-06-14 10:31:05 -04:00
Noah Zinsmeister
214d12ab85
add pnk and mod (#322)
* add pnk and mod

closes #308 and #321

* checksum
2019-06-04 19:27:21 -04:00
Noah Zinsmeister
cb4e1648d4
bug fixes (#319)
* fix ens name bug

* remove console.log

* add GEN

* fix styling and min display values
2019-05-31 13:39:22 -04:00
Noah Zinsmeister
5c2acb8c4d
Merge branch 'beta' into production 2019-05-30 18:06:20 -04:00
Noah Zinsmeister
c36a319982
fix 0 decimals bug (#318) 2019-05-30 17:54:32 -04:00
Noah Zinsmeister
b7f49672de
merge beta to production (#317)
* update SNX exchange and token address (#301)

* update SNX exchange and token address

* checksum exchange address

* Account improvements (#302)

* begin account migration

* prep for styling

* improve multi-network support

allow deprecated window.web3 providers

* kill old modal

* remove tests

* clean up css

* Style account modal

* kill scss

* bug fixes

* use suspense for code-splitting and i18n

move abis

add ENS support to Web3Status

* Account modal mobile styles

* style tweaks

* finalize migration

* fix account styling

* fix ethereum svg

* fixes

* Split wallet modal into components

* refactor wallet modal and add connect button styles

* removing tap highlights

fix spacing on some mobile browsers

* Styling fixes for account and warning

* clean up injected connector logic

* remove console

* add wrong network copy

* restore border radius

change wallet logo

* various improvements (#313)

* add unchecked signer

* remove focus underline from tabs

* update tokens

* remove console log

* remove snx for now

* make slippage warnings more robust

* memo-ize contexts

* improve slippage styling

* fix warnings + bugs

* clear stale network error

* Feather icons (#314)

* Remove fontawesome

* Update new SNX exchange and new token address (#316)

* Update new SNX exchange and new token address

* remove whitespace

* checksum exchange address
2019-05-30 16:42:25 -04:00
CLINT
788b6f6f01 Update new SNX exchange and new token address (#316)
* Update new SNX exchange and new token address

* remove whitespace

* checksum exchange address
2019-05-30 13:37:36 -04:00
Callil Capuozzo
d206bd40e2 Feather icons (#314)
* Remove fontawesome
2019-05-28 18:44:46 -04:00
Noah Zinsmeister
ad7b647df9
clear stale network error 2019-05-28 16:57:18 -04:00
Noah Zinsmeister
70e9257c49
fix warnings + bugs 2019-05-28 14:53:47 -04:00