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
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