Skip to content

Commit

Permalink
Release merge conflicts (#1142)
Browse files Browse the repository at this point in the history
* Fix leaderboard table issue (#1094)

Co-authored-by: Oluwakorede Fashokun <[email protected]>

* Hotfix: Throwing errors (#1096)

* Fix leaderboard table issue

* Error fixes (#1095)

* check that synthetix exists

* fix skew

* fix missing wallet

Co-authored-by: Oluwakorede Fashokun <[email protected]>

* V2 Release #18 (#1126)

* Integrate synthswap

* Remove dependency

* Remove useless conditional

* Update package lock for swc

* Remove uniswap widget, fix synth icons, add gas estimation for 1inch

* Skip slippage calc when no base price

* Add optimism option to coingecko price query

* Fix decimals on 1inch quote

* Feedback when insufficient liquidity, update slippage label

* Update slippage label color

* Update currency selction header label

* Fix formatCryptoCurrency

* Update synthswap contract address and only enable on optimism mainnet

* Fix leaderboard table issue

* Error fixes (#1095)

* check that synthetix exists

* fix skew

* fix missing wallet

* Fix "no result" on Table component (#1098)

* fix table no results

* check if price exists

* add default page size

* remove page size

* change loading

* Update SynthSwap package

* remove balancer code (#1072)

* remove balancer code

* Removed the balancer code for after market trades

Co-authored-by: Leifu Chen <[email protected]>

* Add atomic swap check back and remove the duplicated redeem button (#1111)

* Bug: Locale error (#1116)

* remove locale console error

* remove break

* IPFS File Hook (#1100)

* shell of ipfs hook

* add file hook

* rename to files

* remove log

* Fix eth swaps failing with 1inch (#1122)

* Exchange mobile (#1108)

* Init exchange

* More UI things

* Remove components from useExchange hook

* Move things back into hook

* Remove .tsx extension on useExchange hook

* Remove all JSX code

* Good layout changes

* Changes to SectionHeader instances

* Connect ratio stuff

* Put button on mobile

Onto InfoBox and currency select

* Synth selection

* Hacky fee box

* Swapping works?

* Fix issue with exchangeParams

* Make sure approveAddress is set

* Fix issue with rewardAddress

* Strip out possible undefined synth events

* Specify 1inch txProvider condition

* Redeem synths button?

* Fix conditional

* Fix isAtomic

* Remove fixed height

* Add modal margin-top

* Fix scroll

* Re-add the InfiniteScroll

* Add @avclarke's change back

* Add connect wallet button for swap

* Disable into input on synthswap mobile

* Final change

Co-authored-by: avclarke <[email protected]>
Co-authored-by: Oluwakorede Fashokun <[email protected]>
Co-authored-by: platschi <[email protected]>
Co-authored-by: Leifu Chen <[email protected]>

* remove gas price specification (#1128)

* package lock

Co-authored-by: platschi <[email protected]>
Co-authored-by: Oluwakorede Fashokun <[email protected]>
Co-authored-by: avclarke <[email protected]>
Co-authored-by: Leifu Chen <[email protected]>
  • Loading branch information
5 people authored Jul 19, 2022
1 parent 63b413b commit d01c0b2
Showing 1 changed file with 30,038 additions and 31,220 deletions.
Loading

0 comments on commit d01c0b2

Please sign in to comment.