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

1941 Commits

Author SHA1 Message Date
Noah Zinsmeister
141e605c17
v2 slippage fix (#763) 
* appropriately discount for multi-hop fee slippage

* fix comment

* make calculation more explicit with a ternary
 2020-05-13 17:58:22 -04:00
Moody Salem
3a426fa36b
Fix token balance fetching in the position card 2020-05-13 16:55:14 -04:00
Moody Salem
52d40949a6
Missed a spot 2020-05-13 16:45:08 -04:00
Moody Salem
685bb1745a
Improve rendering of failed transactions 2020-05-13 16:42:47 -04:00
Moody Salem
9006acb4c5
Balances rewrite (#761) 
* Create the wallet store

* Get the updater completed

* Code complete

* Fix token balance bug

* Fix another bug in the hooks

* Final bug fix, blockNumber can be undefined

* Formalize the fact that block number can be undefined

* Woops add package

* Add more info to errors

* Replace balances in the v1 methods with the new ones

* Only return a balance value if it's present

* Address comments

* Trigger updateVersion before anything else
 2020-05-13 16:36:45 -04:00
Moody Salem
1e1a049990
Add more unit tests to utils 2020-05-13 14:24:03 -04:00
Ian Lapham
3a2566b4e7
Changes to useReserves, escapreRegex moved to utils, code cleanup (#762) 
* bug fixes on non-existent vs no reserves, fix scanning on pair search, small ui tweaks

* remove unused vars

* remove mainnet in injected connector

* code cleanup for pr

* update pair value check
 2020-05-13 14:16:52 -04:00
Moody Salem
c9db5fb276
Change slippage calculation in trade page as discussed (#756) 
* Change slippage calculation in trade page as discussed

* Revert test change

* Fix the missing import
 2020-05-13 13:59:54 -04:00
Moody Salem
1cbf67872b
Remove pair that is no longer used from the exchange page 2020-05-13 13:37:06 -04:00
Moody Salem
38947fe760
Remove trade errors about insufficient liquidity that only show up if there's a route (best trade will not return a trade if there is insufficient liquidity) 2020-05-13 13:24:55 -04:00
Moody Salem
31f72a541b
Clean up transaction modal behavior with new store 2020-05-13 12:58:20 -04:00
Moody Salem
287f64cf5c
Fix a redux error from passing a BigNumber to the store 2020-05-13 10:59:51 -04:00
Moody Salem
822f9e5fe2
Connect integration tests (#757) 
* Connect a testing wallet

* Replace with a funded address

* Fix the balance checking and adding logging
 2020-05-13 08:29:54 -04:00
Moody Salem
6781fce58e
Fix linting error again! 2020-05-12 18:17:26 -04:00
Moody Salem
ef65943659
Rewrite tx store (#754) 
* Rewrite the transaction store

* Working state

* Fix lint errors

* Just always call getSigner
 2020-05-12 18:11:10 -04:00
Moody Salem
19a53cd999
Rewrite localstorage context (#749) 
* Rewrite the local storage context into a redux store for user data

* Separate out the mega methods

* Fix infinite loop

* Missing dependency

* Missing dependency, rename version field
 2020-05-12 14:46:58 -04:00
Noah Zinsmeister
b28ad2865d
add v1 slippage checks (only for mainnet) (#746) 
* add v1 slippage checks (only for mainnet)

* Add v1 trade notification UI

* Design tweaks

* add minimum delta

* remove dark theme toggle from menu

* only render view on etherscan if an address exists

* fix weird spacing on logged-in header

* lint error

* remove mainnet

Co-authored-by: Callil Capuozzo <callil.capuozzo@gmail.com>
 2020-05-12 12:20:05 -04:00
Ian Lapham
0d4108937f
Ui changes (#747) 
* copy changes

* remove unused input on toggle

* comparison fix
 2020-05-12 11:48:42 -04:00
Moody Salem
6da8e2c84d
Introduce redux for one of the state stores (#742) 
* Introduce redux for one of the state stores

* Remove unused state

* Clean up hooks

* Add types for react-redux and fix error from any type on useSelector

* Strongly type the web3 provider

* Make the popup content into a POJO

* Lint errors

* Clean up method call

* Fix lint error

* Fix lint error

* Lint
 2020-05-11 18:23:01 -04:00
Moody Salem
ea015d16f2
Stop reloading fonts when light mode/dark mode switch 2020-05-11 17:02:10 -04:00
Noah Zinsmeister
d40d81ca6a
noah changes (#739) 
* remove duplicated prettier from dependencies

* use swr for allowances

* slight improvements to error cascading

* fetch totalsupply with SWR

fetch pairs with SWR (except persistent pairs, will be refactored later)

* fix lint error

* stop using pair context, instead store per-user pairs in local storage

* add more pairs to the default list

remove unnecessary isWETH

fix lint error

* add more bases to trade consideration

* fix lint warnings

* get SWR data on same schedule

* don't pass value if it's 0

fix WETH equality checks

* clean up fixed/significant formatting

* fix slippage calculation bug in swap

add slippage to remove

* fix token logos

* show fewer sig figs

* lint error

* remove unused signer

* add calculateSlippageAmount safety check and tests

* fix useAllBalances type

stop spuriously sorting token amounts of different tokens

use slightly better comparisons for slippage calculations

* improve priceSlippage comparison logic

* useReserves -> usePair

* use checksum for DAI logo address
 2020-05-11 16:39:05 -04:00
Callil Capuozzo
dba6abadf5
UI/UX tweaks (#740) 
* Prepare for V2 testing

* Bug fixes and tweaks

* Add form link

* Design tweaks

* higher quality favicon

* Favicon... again.

* Start dark mode

* Add dark toggle

* New dark theme unicorn

* fix connect wallet ui

* Titles for fields && small UI/UX tweaks

* Fix ts linter errors

* UI/UX tweaks

* rebass and change color names

* v1/v2 toggle and color tweaks

* Small header tweaks

* fix account input mobile padding

* remove unused imports

* Fix header link

* Theme toggle for mobile & fix

* no acount? hide maxes

* Use system theme unless toggled

* Remove unused styles

* Fix missing hooks dependencies

* Fix linting errors

* improve system dark mode listener

* add listener

* fix hook dependency

Co-authored-by: Ian Lapham <ianlapham@gmail.com>
Co-authored-by: Noah Zinsmeister <noahwz@gmail.com>
 2020-05-11 15:12:38 -04:00
Moody Salem
c365a5ec33
Add some integration tests (#743) 2020-05-11 09:03:44 -04:00
Moody Salem
ee92df1554
Handle insufficient reserves/input errors without crashing 2020-05-09 12:41:21 -04:00
Moody Salem
f1ccd7a166
Fix horizontal scrolling on small screens & add some small padding 2020-05-09 10:55:41 -04:00
Ian Lapham
7c43023860
fix DOM warnings (#741) 
* fix DOM warnings

* Update index.tsx

Co-authored-by: Noah Zinsmeister <noahwz@gmail.com>
 2020-05-08 23:58:40 -04:00
Moody Salem
843d5e790a
Done with linter errors! 2020-05-08 18:32:36 -04:00
Ian Lapham
40a7cea6f6
Bug fixes, UI tweaks (#738) 
* linking bug fixes, search UI tweaks

* search style tweaks

* organize imports
 2020-05-08 17:22:19 -04:00
Moody Salem
7add2a916c
remove a couple more state constants 2020-05-08 16:13:08 -04:00
Moody Salem
5f36437c3f
Turn linting errors off so CI passes 2020-05-08 15:57:51 -04:00
Moody Salem
152e84bc25
Fix more linting errors 2020-05-08 15:46:42 -04:00
Moody Salem
3b3f281319
Use eslint/prettier for typescript files 2020-05-08 14:50:27 -04:00
Moody Salem
17eceebcf5
Final typescript migration push 2020-05-08 14:15:47 -04:00
Moody Salem
2adb0a3dfb
Ts almost everywhere (#736) 
* First 2

* More typescript

* More and more

* Almost there

* More

* More typescript

* Fix remove liquidity button

* Make the error chain more readable

* Slippage tabs
 2020-05-08 13:48:05 -04:00
Moody Salem
86fa969d6b
Types for react-router-dom, stop lazy loading each route (#735) 
* Types for react-router-dom, stop lazy loading each route

* Couple small fixes to README.md
 2020-05-08 12:05:52 -04:00
Moody Salem
28b24036c6
Cypress (#734) 
* Add some basic integration tests and CI in GitHub

* Add push trigger

* Add badge for tests to readme

* Unit tests

* Just use the development infura URL in the tests

* Remove unused webpack config

* Make integration test run on the same port as yarn start

* make test a little bit better

* rename describe
 2020-05-08 11:38:33 -04:00
Moody Salem
a1a9d9f041
Type safety for styled components (#733) 2020-05-08 11:24:47 -04:00
Moody Salem
9b2fe0bdca
Use best trade to get the best route (#731) 2020-05-08 11:13:16 -04:00
Noah Zinsmeister
cb00e0baa5
migrate full away from ethers v4 to v5 (#728) 
move some pacakges from dependencies to dev dependencies

bump versions
 2020-05-07 19:53:08 -04:00
Moody Salem
4ccbd0c3ba
Fix the crash by importing text 2020-05-07 19:50:12 -04:00
Moody Salem
7fcecc22d9
TS migrations and commit hash in code link (#730) 
* TypeScript in the utils directory, README fixes

* Remove unused methods

* Added unnecessary space

* Some env variable cleanup

* Bug in change

* Another file to ts

* App.tsx

* Header and Footer to tsx

* Few more TS migrations and add a commit hash title to the uni icon

* Few more TS migrations and put commit hash in code link

* Splitting up files

* Splitting up files (merged dark mode changes)
 2020-05-07 18:52:26 -04:00
Ian Lapham
404d7a60e5
bug fixes, style updates dark mode (#729) 
* Prepare for V2 testing

* Bug fixes and tweaks

* Add form link

* Design tweaks

* higher quality favicon

* Favicon... again.

* Start dark mode

* Add dark toggle

* New dark theme unicorn

* header style changes

Co-authored-by: Callil Capuozzo <callil.capuozzo@gmail.com>
 2020-05-07 16:46:45 -04:00
Moody Salem
b6b094acb3
remove unused functions, typescript (#725) 
* TypeScript in the utils directory, README fixes

* Remove unused methods

* Added unnecessary space

* Some env variable cleanup

* Bug in change

* Another file to ts
 2020-05-07 14:36:26 -04:00
Ian Lapham
49462fdb3b
bug fixes (#727) 2020-05-07 14:01:34 -04:00
Ian Lapham
3c112b5746
bug fixes (#722) 2020-05-06 22:16:00 -04:00
Ian Lapham
e5c5bad7ab
reset WETH on network change (#720) 
* reset WETH on network change

* cleaner version

* undo typo

* fix indexing
 2020-05-06 19:03:13 -04:00
Ian Lapham
9eee45a8f1
copy updates (#719) 2020-05-06 17:34:53 -04:00
Callil Capuozzo
e5ced44d75
Design tweaks (#717) 
* Prepare for V2 testing

* Bug fixes and tweaks

* Add form link

* Design tweaks

* higher quality favicon

* Favicon... again.

Co-authored-by: Ian Lapham <ianlapham@gmail.com>
 2020-05-06 15:34:06 -04:00
Ian Lapham
cdbf440e9c
add slider, big fixes (#715) 2020-05-05 23:20:31 -04:00
Ian Lapham
5426e48872
popup styles, slippage language and amounts, min max copy (#714) 
* Prepare for V2 testing

* popup styles, slippage language and amounts, min max copy

* Bug fixes and tweaks

* Add form link

* remove other imports

Co-authored-by: Callil Capuozzo <callil.capuozzo@gmail.com>
 2020-05-05 20:40:59 -04:00
Noah Zinsmeister
64dd09f2cc
update to latest deploy (#712) 2020-05-05 16:36:22 -04:00
Ian Lapham
6fd9808e7d
Style updates merge with storage updates (#710) 
* Add advanced user toggle

* UX stuff

* Remove unused imported checks

* Design tweaks and selection card

* remove unused imports

* Cleanup

* fix merge

Co-authored-by: Callil Capuozzo <callil.capuozzo@gmail.com>
 2020-05-04 20:21:55 -04:00
Noah Zinsmeister
c3d8bc7ed5
Localstorage and routing improvements (#704) 
* remove tokens context in favor of localstorage

refactor localstorage

improve adding custom token flow

* drop exchange language

* ensure url tokens are added to localstorage

clean up routing

remove unnecessary output approval checks

* fix bad import

* Remove unused imported checks

* remove unused imports

Co-authored-by: Ian Lapham <ianlapham@gmail.com>
 2020-05-04 17:56:10 -04:00
Ian Lapham
3f1d7ab310
add basic structure for advanced mode (#703) 
* add basic structure for advanced mode

* auto dismiss popup

* Remove test code

* remove shadow

* Update advanced section, ui tweaks, balances back inline

* fix memory leak

Co-authored-by: Callil Capuozzo <callil.capuozzo@gmail.com>
 2020-04-30 21:14:29 -04:00
Ian Lapham
60d7bc4532
bug fix on local storage balance reference (#702) 2020-04-29 14:26:35 -04:00
Ian Lapham
76dbc9fa18
Multiple UI changes (#700) 
* small layout and text changes, bug fixes

* UI changes, add summary to txns

* Remove updates, small changes on send, common bases
 2020-04-28 18:46:55 -04:00
Ian Lapham
006fe9b325
Updated context keys, remove logs (#680) 
* updated keys in pair context

* fix bug on imported liquidity

* Add price bar and spacing tweaks

* Header tweaks

* Base for token import, query params, styling updates

* remove unused imports

* query params, create flow

* set ETH as default for create

* Style tweaks and price bar location

* add mobile popups, mobile styling on header

* updated mobile styles

* style updates mobile, fix build

Co-authored-by: Callil Capuozzo <callil.capuozzo@gmail.com>
 2020-04-22 17:22:13 -04:00
Ian Lapham
50c9d9973a
UI Updates, Route Context Updates (#679) 
* UI updates, big fixes on route hook

* fix bug on all pair list

* logout fix and  add mainnet WETH
 2020-04-15 20:56:59 -04:00
Ian Lapham
af6add09a0
Radio button edits, theme updates (#668) 2020-03-30 17:07:12 -04:00
Ian Lapham
cf5c67ec88
fix rerender bugs (#666) 2020-03-26 12:58:45 -04:00
Ian Lapham
eaf8d5a39c
Add routes through ETH (#665) 
* add fix for ETH balance fetching

* add tokens to other testnets

* update with Exchange -> Pair

* routes throuh ETH

* fix logs

* fix conflict
 2020-03-26 12:42:06 -04:00
Ian Lapham
02dedcbc6e
Update message for testnet, bug fixes (#663) 2020-03-24 16:46:56 -04:00
Ian Lapham
d8c4ebc243
add fix for ETH balance fetching (#662) 2020-03-23 16:01:26 -04:00
Ian Lapham
2b15979e93
Hide dark and advanced, fix bug on empty balances (#660) 
* Hide dark and advanced, fix bug on empty balances

* remove unused imports

* change default dark mode

* add warning on main net

* remove unused imports
 2020-03-23 15:20:03 -04:00
ianlapham
6211dff044 typed pages 2020-03-20 16:03:23 -04:00
ianlapham
655b79569b basic send added 2020-03-17 16:23:27 -04:00
ianlapham
4e2c5c1e84 slippage without micro warnings on swap 2020-03-13 16:26:29 -04:00
ianlapham
e43d9e03f1 add popups to context 2020-03-11 10:44:39 -04:00
ianlapham
35d398406d add import to token search 2020-03-10 15:55:31 -04:00
ianlapham
217a700832 error warnings on remove and pool finder added 2020-03-10 14:55:33 -04:00
ianlapham
55eb03c237 remove version with derived percent 2020-03-09 17:20:41 -04:00
ianlapham
a6d8613bdd updated position cards 2020-03-06 14:45:11 -05:00
ianlapham
2ca3bf8da3 add slider to remove 2020-03-05 22:57:41 -05:00
ianlapham
236c3030e1 stable state for swaps, add, and remove eth (no remove token token yet) 2020-03-04 13:48:43 -05:00
ianlapham
753e5f3423 stable version with updated balances, add liquidity using SDK, pair menu search 2020-02-26 12:00:59 -05:00
ianlapham
3091ebc158 update comments 2020-02-13 11:31:12 -05:00
ianlapham
912a19d66d fix imports 2020-02-13 11:04:17 -05:00
ianlapham
4890ad1172 update logic for txn eth value on GA 2020-02-13 00:12:58 -05:00
Ian Lapham
7786537c43
add txn hash to analytics (#632) 2020-02-12 15:23:27 -05:00
Noah Zinsmeister
80da62e1bd
add ANJ (#630) 2020-02-10 12:45:12 -05:00
Noah Zinsmeister
c48a7f26cc
improve network env stuff (#621) 
* improve network env setup
 2020-01-29 18:48:33 -05:00
Ian Lapham
b21a6e3917 Token warning updates (#614) 
* update for token routing

* fix imports
 2020-01-27 10:53:47 -05:00
Noah Zinsmeister
26c82401ea
fix value / token display (#615) 2020-01-27 10:47:23 -05:00
Ian Lapham
e05be71ea5
Token check (#610) 
* update market rate calculation and input parsing for 0 decimal tokens

* remove style bump and revert tokens

* add custom warning for pasted tokens

* update centering

* upload dark theme

* update copy and loading state

* copy edits

* update color

* multiple cards
 2020-01-24 17:24:53 -05:00
Ian Lapham
8290cf565f update market rate calculation and input parsing for 0 decimal tokens (#601) 
* update market rate calculation and input parsing for 0 decimal tokens

* remove style bump and revert tokens
 2020-01-21 17:54:17 -05:00
Noah Zinsmeister
895f4cd89f
Add tokens (#606) 
* add DONUT

* close #600

* add aDAI close #602
 2020-01-21 12:24:55 -05:00
ChristophSiegenthaler
a512e618f0 Renamed iDai to iSai and added iDai proper (#604) 2020-01-21 11:09:59 -05:00
Ian Lapham
8eeb169094 update search on token input (#596) 
* update search on token input

* remove comments
 2020-01-13 13:46:18 -05:00
Ian Lapham
a6b9de3ec1 add warnign for broken ERC20 (#589) 2020-01-08 12:28:00 -05:00
Jeff Reiner
4abb607f73 Update WalletConnect naming (#591) 2020-01-08 12:25:31 -05:00
Noah Zinsmeister
61ae7119a9
address spam (#587) 2020-01-06 19:47:23 -05:00
Ian Lapham
8b2b6aba6a Token pasting fix (#584) 
* fix for null value

* remove logs
 2020-01-03 11:16:36 -05:00
Ian Lapham
008be5dcda fix linking bug (#583) 2020-01-02 13:13:20 -05:00
Noah Zinsmeister
9810e62054
add tokens (#582) 
* add XIO

* add TRST

* add imBTC closes #547

* add GST2 closes #580

* add 0xBTC closes #499

* add USDS closes #506

* add PAXG closes #520
 2020-01-02 11:27:04 -05:00
Noah Zinsmeister
e92c8ed5e8 web3-react improvement (#581) 
* fix SC errors

* improve unsupported chain id error

* bump yarn.lock
 2019-12-31 15:30:43 -05:00
Ian Lapham
64296d8229 Update GA (#577) 
* add updated GA

* update swap/send events

* add custom variable for device type

* cleanup
 2019-12-31 15:27:51 -05:00
Paul Razvan Berg
701cbde274 Fix "useENSName" Hook (#578) 
* Fix "useENSName" Hook

* Check for "stale" in "useENSName" Hook
 2019-12-31 15:17:10 -05:00
Tom French
55fa030a88 fix ordering of tokens (#574) 2019-12-23 16:22:04 -05:00
Ian Lapham
103ad864a6 update default slippage to 50 bips (#569) 2019-12-18 18:06:03 -05:00
Noah Zinsmeister
d400ff62d0 add null value checks (#568) 2019-12-18 10:53:05 -05:00
Noah Zinsmeister
38bb32504d
add FAME 2019-12-17 10:29:50 -05:00
Paul Razvan Berg
91da96e710 Add dependency array to "Identicon" side effect (#561) 2019-12-16 10:47:15 -05:00
Ian Lapham
52849a8e20 Bug fix (#557) 
* gate usd parsing on null balances

* remove logs
 2019-12-13 11:30:41 -05:00
Noah Zinsmeister
31499ee2b1
Merge branch 'beta' into production 2019-12-12 12:01:21 -05:00
Noah Zinsmeister
a1143aeab1
add OXT and remove rhoc (#553) 
* add OXT

* remove RHOC
 2019-12-11 16:07:01 -05:00
Kirill Goncharov
8bf95ebfd5 Allow to set custom deadline (#543) 2019-12-10 11:04:34 -05:00
Ian Lapham
38625d24e9 Balance and USD Refactor (#544) 
* update injected loading state

* basic setup

* add contexts

* minor changes

* refactor balances and USd price

* small tweaks

* clean up balances context code

don't store usd price except in hook

refactor getUSDPrice to make clear it's sync

* add small memo
 2019-12-10 10:33:35 -05:00
Noah Zinsmeister
fb4b4fd3e2
fix dapp browsers hanging 2019-12-05 16:58:30 -05:00
Noah Zinsmeister
790fe3f327
hot fix for dapp browsers 2019-12-05 16:29:53 -05:00
Noah Zinsmeister
4ef30cc8fd
merge prod into beta (#535) 
* block some countries (#534)

* Adds min-width to custom slippage input. (#533)

On Firefox (maybe other browsers as well) the lack of min-width results in the default `input` element min-width which is ~92px.  This results in the flex container overflowing the bounding element.  By setting min-width to 20px, the box will instead grow to fill the available space, which is defined by its parent that has the pink border.  This avoids the overflow issue (as long as the parent doesn't get too small, which it won't at the moment since it is fixed size).
 2019-12-05 15:39:35 -05:00
Ian Lapham
794bbd88b2 Update to loading state for injected desktop browsers (#532) 
* update injected loading state

* update styles

* update injected connector

* center spinner
 2019-12-05 14:58:22 -05:00
Ian Lapham
fe82dcf2e1 Hosted wallets (#531) 2019-12-04 18:48:43 -05:00
Noah Zinsmeister
28672100d0
merge prod into beta (#530) 
* add CHAI

* update compound tokens (#527)

* update compound tokens

* Update Tokens.js

* add fortmatic metatag

* add TRYB (#529)
 2019-12-04 17:43:14 -05:00
Ian Lapham
015c9f8598 Hosted wallets (#528) 
* formnatic setup

* stable with new hosted

* stable version, fortmatic and portis

* fix safari bug

* cleanup

* add white version of arrow

* update options to tabbable buttons

* update injected version

* style tweaks

* style tweaks, remove portis connector
 2019-12-04 17:31:56 -05:00
Noah Zinsmeister
a11dc4cd1c
add chai (#526) 2019-12-02 14:55:48 -05:00
Paul Razvan Berg
bcf480e758 Import useWeb3React from the hooks folder (#522) 2019-11-27 10:01:47 -05:00
Paul Razvan Berg
7d9ff637ef Replace networkId with chainId (#521) 2019-11-27 09:33:11 -05:00
Ian Lapham
795caac4fd Wallet Support with web3-react v6 (#514) 
* basic support for desktop and mobile, with or without web3

* stable before mobile view update

* mobile modal views

* remove unused modules

* create global context for wallet modal, update to click button to connect

* first pass

* drag with react pose

* try without pose

* replace context with new syntax, basic setup

* stable version on all browser types

* remove dev flags

* fix swap broken

* update to clickable connect button if logged out

* stable, good entry

* fix bugs, exit animations

* prep for merge

* stable version with updated application context

* update animations with correct gesture package

* refactor wallet logic to multi-root

* small fixes

* Style Updates

* remove unused imports

* refactor wallet page
 2019-11-25 17:56:31 -05:00
Ian Lapham
116a7f3833 fix bug with a try catch on approval (#516) 2019-11-21 14:10:59 -05:00
Micah Zoltu
04a918eda2 Removes scrollbars when there is nothing to scroll. (#513) 2019-11-20 10:20:23 -05:00
Noah Zinsmeister
b44fc03eb9
add SAN/QSP/SHUF/IOTX/RING (#509) 
* add SAN

* add QSP

* add SHUF

* add IOTX

* add RING
 2019-11-18 12:47:12 -05:00
Ian Lapham
645484853a Dai Migration - UI Updates (#503) 
* skeleton for migration - still need links and adrdess of new contract

* update render conditions

* fix close on click

* updated warning logic

* add mcd to token list

* changes before merge

* remove unused imports

* add checksums
 2019-11-18 11:52:27 -05:00
Ian Lapham
5f8c350d86 fix big on linking to add liquidity (#505) 2019-11-15 16:02:16 -05:00
Agustin Aguilar
2c1c076d59 hotfix/trust-icons-change (#501) 
* Trust URI scheme, replaced by checksum address

* Run prettier
 2019-11-09 11:15:15 -05:00
Noah Zinsmeister
bb4d035012
add tokens (#495) 
* reorder LQD, add LEND

* add MBC

* add ENJ

* add AMN

* add SOCKS
 2019-11-05 11:37:32 -05:00
Ian Lapham
c2f51f3b3e create warning and disable add liquidity button for broken tokens (#491) 
* create warning and disable add liquidity button for broken tokens

* fix mobile styles
 2019-10-29 15:56:53 -04:00
Paul Cowgill
2c856d279a Typo fix (#482) 2019-10-21 18:30:47 -04:00
Ian Lapham
829a968008 allow for ETH in output command, zupdate to 6 digits on exchange rate (#464) 2019-10-17 07:39:43 -07:00
Noah Zinsmeister
862958d015
add iDAI 
closes #416
 2019-10-01 14:41:54 -04:00
Ian Lapham
a33a2d90e1 make balances clickable on add liquidity page (#449) 
* make balances clickable on add liquidity page

* update formatting logic

* fix max slippage calculation
 2019-09-30 15:24:40 -04:00
CLINT
ea327ff810 New sUSD exchange and removed old sETH exchange (#451) 
* New sUSD exchange and removed old sETH exchange

* checksummed sUSD
 2019-09-30 10:01:47 -04:00
Noah Zinsmeister
28e449887a
add PAN 
closes #443
 2019-09-25 16:42:03 -04:00
Noah Zinsmeister
5ffa4baefa
add DATA 
closes #415
 2019-09-25 16:39:58 -04:00
Noah Zinsmeister
748a817057
add AMPL 
closes #401
 2019-09-25 16:36:45 -04:00
William Morriss
0693b92e5e True Currencies (TrueAUD, TrueGBP, TrueHKD) (#447) 
* Add other TrueCurrencies

* reorder based on ticker
 2019-09-18 10:45:01 -04:00
CLINT
6f3ba2ebf8 Migration from old to new sETH exchange (#444) 
* Migration from old to new sETH exchange

* checksum addresses
 2019-09-17 18:49:19 -04:00
Noah Zinsmeister
1fe266025e
add better testnet support (#446) 
* add rinkeby support

* add client-side routing link
 2019-09-17 18:47:55 -04:00
William Morriss
1349085cc1 Update TUSD address and add TCAD (#442) 
* add TCAD and update TUSD address

* update TUSD uniswap exchange address
 2019-09-17 18:47:45 -04:00
Ian Lapham
4f566ab0c2 Add Custom url parameters (#423) 
* query params for input and output currencies

* add slippage option

* add slippage cusytom param

* updated for sender address

* add field and amount support

* update params for pool page

* finish basic url support

* update app format

* update error checking to top level

* update for all pages

* fix build

* param updates

* fix slippage to basis points, update theme text, refactor to minimize lookups

* fix code styles

* update theme logic, remove extra setting, update rounding

* remove eslint comment errors

* remove logs, ignore lock

* remove lock
 2019-09-17 18:47:32 -04:00
Noah Zinsmeister
61d6556a0d
fix rounding issue (#445) 2019-09-17 18:47:14 -04:00
Noah Zinsmeister
ecd7175315
improve network connectivity (#441) 2019-09-06 19:15:22 -04:00
Ian Lapham
0f20788c78
Merge pull request #432 from ianlapham/ui-updates 
Ui updates
 2019-08-29 17:47:39 -04:00
ian-jh
cdc0b4070f fix loading issues 2019-08-29 17:44:33 -04:00
Noah Zinsmeister
65e96296ab
refresh bug v2 (#430) 2019-08-27 01:21:22 +02:00
Noah Zinsmeister
35d650e02b
fix refresh error (#429) 2019-08-27 01:02:25 +02:00
Ian Lapham
d18ee78ee7 Fix firefox bugs (#427) 2019-08-24 08:50:43 +02:00
Ian Lapham
de8c9189ce Fix firefox bugs (#424) 2019-08-21 20:22:28 +02:00
Noah Zinsmeister
45a0e93d98
make web3 connection logic more robust 2019-08-20 17:15:13 +02:00
Noah Zinsmeister
9796c04d4f
slow down polling interval (#420) 2019-08-19 11:04:31 -04: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
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
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
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 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
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
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
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
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
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
c36a319982
fix 0 decimals bug (#318) 2019-05-30 17:54:32 -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
Noah Zinsmeister
f2f960f6fa
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
 2019-05-28 14:10:02 -04:00
Noah Zinsmeister
6579e17f7f
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
 2019-05-24 16:53:01 -04:00
CLINT
6541f3582f update SNX exchange and token address (#301) 
* update SNX exchange and token address

* checksum exchange address
 2019-05-22 11:10:09 -04:00
Noah Zinsmeister
25692792fa
fix liquidityMinted bug 2019-05-16 17:03:10 -04:00
Noah Zinsmeister
39312ab8c0
final bug fixes (#293) 
* make jazzicon same as metamask

* fix token-token market rate

fix transactions bugs

add new contextual info to send

* fix .1 balance check on add liquidity

fix double click max balance bug
 2019-05-16 16:54:15 -04:00
Noah Zinsmeister
e27cd92cd2
Slippage warning (#292) 
* add rudimentary slippage warning

fix address checksum bug

debounce address input

alway show tx details if valid trade

* fix estimated copy
 2019-05-16 13:21:14 -04:00
Noah Zinsmeister
c6e165eaf7
token search improvement, token addition (#288) 
* add lqd

* only search valid keys
 2019-05-14 12:05:57 -04:00
Noah Zinsmeister
2f0e2fb234
Beta cleanup (#285) 
* improve context logic

* fix font-variant

* add dependencies for later

* fix icon
 2019-05-14 10:19:09 -04:00
Noah Zinsmeister
c27cd98b33
fix 0 decimals bug 2019-05-09 20:48:34 -04:00
Noah Zinsmeister
78cdf11b37
Liquidity migration (#279) 
* finalize initial migration

* remove redux

* fix token to token rate bug

* finalize initial migration

* fix test
 2019-05-07 22:25:55 -04:00
Noah Zinsmeister
eb394ee88e
fix exchange address logic 2019-05-03 20:18:06 -04:00
Noah Zinsmeister
44d77ce948
Swap Migration (#277) 
* migrate core logic

* finalize swap migration

* upgrade react-scripts and fix errors/warnings

* finalize swap, modularize currency input

* remove console.logs

* copy swap logic for send

* remove unnecessary variable

* tighten caching logic

* snappier ens integration
 2019-05-03 16:37:59 -04:00
Noah Zinsmeister
4e413915f8
web3-react migration (#269) 
* put suspense below redux

* don't mount qr

* properly format .json's

* remove useless Web3Connect component

* remove react-responsive header logic

* finalize initial web3-react migration

* add rudimentary network support

* address ci/cd issues

* fix syntax

* add infura support

rewrite create-exchange

closes #173

* remove CI flag, lazy loaded disabled for now

* roll back /pool

* fix currency input errors

fix valid state of buttons

* fix nav

* obscure env variables

* fix mobile header bug
 2019-04-25 12:12:47 -04:00
Noah Zinsmeister
f855706f0d
update i18n; kinda fix tests; remove stale dependencies (#266) 2019-04-15 20:06:39 -04:00
Noah Zinsmeister
b2d753d6bb
bug fixes 2019-04-15 14:09:46 -04:00
Noah Zinsmeister
fff0718404
add travis support; clean up public/ 2019-04-15 14:05:54 -04:00
Noah Zinsmeister
71376cf7db
set up eslint and prettier; run prettier 2019-04-15 12:56:40 -04:00
Noah Zinsmeister
9c93c1a95b
fix lint errors 2019-04-15 12:07:16 -04:00
haydenadams
b3d7918806 add BLT to default list 2019-04-02 13:16:24 -04:00
Hayden Adams
e9b40cd5b3
Merge pull request #249 from brianmcmichael/feature/add_c20 
Add C20 Token to dropdown
 2019-04-02 13:02:46 -04:00
Hayden Adams
dccfcebdcd
Merge pull request #251 from pascalvanhecke/add-lpt-branch 
Adding LPT, token of grass-roots Livepeer open source video-encoding …
 2019-04-02 12:57:58 -04:00
Pascal Van Hecke
398020a88d Adding LPT, token of grass-roots Livepeer open source video-encoding project - no ETH pair at regular exchanges https://coinmarketcap.com/currencies/livepeer/#markets 2019-03-30 17:58:25 +01:00
Pascal Van Hecke
cbbf6dce6b Adding NMR, token of long-running Numerair project (since mid 2017) - no ETH pair at regular exchanges https://coinmarketcap.com/currencies/numeraire/#markets 2019-03-30 17:44:24 +01:00
Brian McMichael
39e5f54cf5 Fix exchange address 2019-03-27 19:11:25 -04:00
Brian McMichael
df45b8c281 Add C20 Token to dropdown 2019-03-27 18:29:23 -04:00
Hayden Adams
f99205f3ed
Merge pull request #238 from hav-noms/patch-1 
Add SNX and sUSD to the token list
 2019-03-19 13:58:52 -04:00
haydenadams
8cea3768d6 update 2019-03-01 23:06:55 -05:00
CLINT
3ae565d92b
Add SNX and sUSD to the token list 
These are bypassing the synthetic proxy contracts and connecting direct so they work
 2019-03-01 10:45:15 +11:00
haydenadams
d2df574848 update address 2019-02-22 01:01:38 -05:00
haydenadams
2c873a9cbd change deadline to 10 mins 2019-02-20 22:39:17 -05:00
haydenadams
e1d0addd71 change warning color 2019-02-20 22:35:00 -05:00
Hayden Adams
8c6e7e93cc
Merge pull request #234 from pascalvanhecke/add-bnt-patch 
Update addresses.js
 2019-02-20 21:54:54 -05:00
Pascal Van Hecke
63464ea9de Update addresses.js 
Adding BNT, token address https://etherscan.io/token/0x1f573d6fb3f13d689ff844b4ce37794d79a7ff1c
 exchange address https://etherscan.io/address/0x87d80dbd37e551f58680b4217b23af6a752da83f#tokentxns
 2019-02-21 01:31:58 +01:00
Pascal Van Hecke
0145c675b0 Update addresses.js 
Adding DGX, token address https://etherscan.io/token/0x4f3afec4e5a3f2a6a1a411def7d7dfe50ee057bf  exchange address https://etherscan.io/address/0xb92de8b30584392af27726d5ce04ef3c4e5c9924#tokentxns
 2019-02-21 01:23:19 +01:00
haydenadams
cbb6e587d6 update 2019-02-19 22:32:34 -05:00
haydenadams
5392c5e1e2 remove space 2019-02-17 20:58:08 -05:00
Hayden Adams
0888812431
Merge pull request #186 from rossbulat/remove-animated-switch 
Replaced AnimatedSwitch with Switch. Added CSS Animation
 2019-02-17 17:54:09 -08:00
haydenadams
44ef944539 Merge branch 'master' into dev 2019-02-06 01:04:03 -05:00
haydenadams
fcd6019f0a add wbtc 2019-02-06 01:03:12 -05:00
Hayden Adams
51ff66dd11
Merge pull request #225 from pascalvanhecke/patch_add_rlc 
Adding RLC to default
 2019-02-06 00:59:16 -05:00
Pascal Van Hecke
886e42d02f Adding RDN to default 
RDN should be in default:
- important project: main implementation of payment channels
https://coinmarketcap.com/currencies/raiden-network-token/
- nr 11 in volume and top 10 liquidity
https://mailchi.mp/blocklytics/uniswap-report-2019-02-05
 2019-02-06 01:42:46 +01:00
Pascal Van Hecke
1f5ab47125 Adding RLC to default 
RLC should be in default:
- old project: since early 2017
https://coinmarketcap.com/currencies/rlc/
- nr 4 in volume and top 10 liquidity
https://mailchi.mp/blocklytics/uniswap-report-2019-02-05
 2019-02-06 01:33:29 +01:00
maggie-5miles
832220b0a5 fix several missing translations 2019-01-23 16:15:32 +08:00
Hayden Adams
5532c6855d update Trust logo link 2019-01-16 14:28:52 -05:00
Ross Bulat
b38b41a1f5
Merge branch 'master' into remove-animated-switch 2019-01-12 15:19:35 +07:00
Ross
60eab0ebec conflicts 2019-01-12 15:16:03 +07:00
Ross
097a6afdc4 conflicts 2019-01-12 15:14:06 +07:00
Ross
c98591eb9c remove animation 2019-01-12 15:10:36 +07:00
Hayden Adams
09d3a7ce7b fix rebase error 2019-01-11 20:18:54 -05:00
maggie-5miles
520b9a58d6 i18n support 2019-01-11 19:24:20 -05:00
Jeff Reiner
e761cd6f8a 🐛 fix bug w/ wrapper width 
no more breakpoints, just max width #183
 2019-01-11 19:21:19 -05:00
Ross
9ce24cd9ac png->svg 2019-01-09 17:15:41 +07:00
Ross
43637b0fcb - top 2019-01-09 12:46:28 +07:00
Ross
61605ce2a9 png -> svg 2019-01-09 12:37:48 +07:00
Ross
fa61db21b2 subtle 2019-01-09 11:57:26 +07:00
Ross
5bf978e49e tidy up, additional ani wrap 2019-01-07 23:12:42 +07:00
Ross
10dc4e2df9 added ani 2019-01-07 22:35:00 +07:00
Hayden Adams
33124d6f0f update 2019-01-06 22:54:11 -05:00
Jeff Reiner
38f13c4ef7 🎨 cleaning up old modal css declarations 
improving classnames for transaction details items
 2019-01-06 17:14:02 +01:00
Jeff Reiner
d5679be56a ♻️ refactor transaction details modal into expanding panel 2019-01-06 17:07:10 +01:00
Hayden Adams
ff6284459e
Merge pull request #179 from mirshko/fix-thin-panel-text 
fix too thin font-weight in currency-panel
 2019-01-04 02:21:46 -05:00
Jeff Reiner
b96db4ef96 🐛 fix issue w/ responsiveness due to media querie 
device-width is deprecated and only works in chrome it seems. reworked to use regular min/max-width queries for both scss & react-responsive. submitted a ticket to react-responsive to fix
 2019-01-03 10:04:27 +01:00
Jeff Reiner
31a8b112c7 💄 fix too thin font-weight in currency-panel 2019-01-02 21:43:56 +01:00
Hayden Adams
df3f8e98ed fix rounding error 2018-12-24 15:14:47 +08:00
Kenny Tran
89290c5bcf Middle arrow flips input/output for swap/send (#151) 2018-12-24 15:14:47 +08:00
Kenny Tran
d63a73aed0 Use decimals instead of label (#152) 2018-12-24 15:14:47 +08:00
Timothy McCallum
2ba6ee5485 Removing duplicate line (#146) 
Noticed duplicate code 

```
  if (tokenAddresses.addresses.filter(([ symbol ]) => symbol === label).length) {
    return;
  }
```
 2018-12-24 15:14:47 +08:00
Kenny Tran
4b4df7ed3d Don’t render numbers if decimals is 0 (#135) 2018-12-24 15:14:47 +08:00
Kenny Tran
7608485fdb Retry deadline if undefined (#134) 
* Retry deadline if undefined

* Remove console logs
 2018-12-24 15:14:47 +08:00
Kenny Tran
6c57d78240 Add different transaction details for 1st liquidity (#133) 2018-12-24 15:14:47 +08:00
Michael Demarais
80158cac11 Improve scroll performance of Token List 
Fixes https://github.com/Uniswap/uniswap-frontend/issues/139
 2018-12-16 19:51:10 -05:00
Hayden Adams
459687c16f add Trust deeplink 2018-12-14 14:05:33 -05:00
Hayden Adams
77b50a4d88 update list 2018-12-14 05:14:23 -05:00
Hayden Adams
fbc17f2ea9 remove BNB token 2018-12-10 19:08:25 -05:00
Hayden Adams
7b8252f9ca update 2018-12-05 14:56:29 -05:00
Kenny Tran
03ecca1b5e Don’t render exchange if no label (#124) 2018-11-15 01:37:42 +08:00
Kenny Tran
9091910e0c Create ContextualInfo component and refactor pages (#107) 
* Add contextual info to Remove Liquidity page

* Create ContextualInfo component and refactor pages

* Add contextual info to remove liq and refactor

* Add modalClass attribute to ContextualInfo

* Mirror add liquidity text
 2018-11-15 01:37:42 +08:00
Kenny Tran
ab1e68f5da Fix instant removal of pending (#123) 2018-11-15 01:37:42 +08:00
Kenny Tran
f308632cee Add pending to approvals (#122) 2018-11-15 01:37:42 +08:00
Kenny Tran
c848f59d4b Add loading state for getExchange (#115) 2018-11-15 01:37:42 +08:00
Kenny Tran
05e7f9a022 Update output calc for remove liquidity 2018-11-12 13:18:04 -08:00
Kenny Tran
207df31154 Normalize remove liquidity exchange rate 2018-11-12 12:55:46 -08:00
Chi Kei Chan
f87aa671a3
Normalize token decimals before calculating exchange rate (#129) 2018-11-12 11:29:26 +08:00
Hayden Adams
142320269a merge master into ha-dev 2018-11-11 14:43:24 -05:00
Hayden Adams
aa3220769a update 2018-11-11 14:37:39 -05:00
Chi Kei Chan
4dbade526c
Add Documentation; Remove Pending Tx on reject (#114) 2018-11-02 09:30:09 +01:00
Kenny Tran
ddd988ea0a Change arrows/plus blue if valid, grey if not (#103) 2018-11-02 08:41:41 +01:00
Hayden Adams
87ccc16a00 update addresses (#110) 2018-11-02 08:29:47 +01:00
Hayden Adams
a97fd1fb39 update addresses 2018-11-02 08:15:58 +01:00
Chi Kei Chan
7a2afc9a9a
Update Add Liquidity detail message (#109) 2018-11-01 17:50:51 +01:00
Chi Kei Chan
9c0cef8f8c Restyle beta message 2018-11-01 16:14:19 +01:00
Chi Kei Chan
a57d21429e Update Warning Message 2018-11-01 16:14:19 +01:00
Chi Kei Chan
93a771bdd3 Update warning message 2018-11-01 16:14:19 +01:00
Chi Kei Chan
1c83a87f88 Add Pending Tx to Pool functions 2018-11-01 16:14:19 +01:00
Chi Kei Chan
75ea2d3da2 Add Pending Tx to Send 2018-11-01 16:14:19 +01:00
Chi Kei Chan
0a5509e92c Add Pending Tx for Swap 2018-11-01 16:14:19 +01:00
Chi Kei Chan
95008950ef Audit tx detail ranges 2018-11-01 16:14:19 +01:00
Chi Kei Chan
ac87a161b9 Do not reset selected token on success 2018-11-01 16:14:19 +01:00
Hayden Adams
e26b601f59
Merge pull request #105 from Uniswap/ha-dev 
update addresses and various text changes
 2018-10-31 08:00:08 +01:00
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