Commit Graph

377 Commits

Author SHA1 Message Date
Callil Capuozzo
c28884f44b Add theme toggle and footer (#400) 2019-08-07 14:58:29 -04:00
Callil Capuozzo
80da6e0ff6 Dark theme (#380) 2019-07-31 14:11:58 -04:00
ian-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
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
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
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
668a1c80ee
fix various 0 decimal bugs (#342) 2019-06-21 10:25:13 -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
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
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
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
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
2c873a9cbd change deadline to 10 mins 2019-02-20 22:39:17 -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
maggie-5miles
832220b0a5 fix several missing translations 2019-01-23 16:15:32 +08: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
43637b0fcb - top 2019-01-09 12:46:28 +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
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
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
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
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
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
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
Kenny Tran
ddd988ea0a Change arrows/plus blue if valid, grey if not (#103) 2018-11-02 08:41:41 +01:00
Chi Kei Chan
7a2afc9a9a
Update Add Liquidity detail message (#109) 2018-11-01 17:50:51 +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
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
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
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
7db118e841 Add GA 2018-10-28 04:05:08 -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
39248a0f6b
Handle first liquidity deposit and add warning message (#88) 2018-10-27 11:46:58 -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
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
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
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
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
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
Chi Kei Chan
a0ed20cd09
Add input to output calculation (#36) 2018-10-15 16:30:00 -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
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
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