Merge branch 'main' into WEB-687-merge-utility-code-in-the-main-inter…

…face-repository
Uniswap · Aug 10, 2022 · d5c9f21 · d5c9f21
2 parents 3d0a55d + 97be3bc
commit d5c9f21
Show file tree

Hide file tree

Showing 187 changed files with 11,565 additions and 3,586 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,2 @@
 REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
 REACT_APP_FORTMATIC_KEY="pk_live_357F77728B8EB880"
-REACT_APP_LOCALES="locales"
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-lts/*
+14
diff --git a/babel-plugin-macros.config.js b/babel-plugin-macros.config.js
@@ -1,4 +1,4 @@
-const isDev = process.env.NODE_ENV !== 'production'
+const isDev = process.env.NODE_ENV === 'development'
 
 module.exports = {
   styledComponents: {

diff --git a/package.json b/package.json
@@ -145,6 +145,12 @@
     "@vanilla-extract/css-utils": "^0.1.2",
     "@vanilla-extract/dynamic": "^2.0.2",
     "@vanilla-extract/sprinkles": "^1.4.1",
+    "@visx/axis": "^2.12.2",
+    "@visx/event": "^2.6.0",
+    "@visx/glyph": "^2.10.0",
+    "@visx/group": "^2.10.0",
+    "@visx/responsive": "^2.10.0",
+    "@visx/shape": "^2.11.1",
     "@walletconnect/ethereum-provider": "1.7.1",
     "@web3-react/coinbase-wallet": "^8.0.34-beta.0",
     "@web3-react/core": "^8.0.35-beta.0",
@@ -162,7 +168,8 @@
     "cids": "^1.0.0",
     "clsx": "^1.1.1",
     "copy-to-clipboard": "^3.2.0",
-    "d3": "^7.0.0",
+    "d3": "^7.6.1",
+    "d3-curve-circlecorners": "^0.1.6",
     "ethers": "^5.1.4",
     "firebase": "^9.1.3",
     "focus-visible": "^5.2.0",
@@ -177,6 +184,7 @@
     "multicodec": "^3.0.1",
     "multihashes": "^4.0.2",
     "node-vibrant": "^3.2.1-alpha.1",
+    "numbro": "^2.3.6",
     "polished": "^3.3.2",
     "polyfill-object.fromentries": "^1.0.1",
     "popper-max-size-modifier": "^0.2.0",

diff --git a/public/nft/arrow_down.png b/public/nft/arrow_down.png
diff --git a/public/nft/banner.png b/public/nft/banner.png
diff --git a/public/nft/bannerIcons.png b/public/nft/bannerIcons.png
diff --git a/public/nft/favicon.png b/public/nft/favicon.png
diff --git a/public/nft/listBullet.svg b/public/nft/listBullet.svg
diff --git a/public/nft/logos/argent.png b/public/nft/logos/argent.png
diff --git a/public/nft/logos/frame.png b/public/nft/logos/frame.png
diff --git a/public/nft/logos/gnosis.png b/public/nft/logos/gnosis.png
diff --git a/public/nft/logos/metamask.png b/public/nft/logos/metamask.png
diff --git a/public/nft/logos/opensea.png b/public/nft/logos/opensea.png
diff --git a/public/nft/logos/poprank.png b/public/nft/logos/poprank.png
diff --git a/public/nft/logos/rainbow.png b/public/nft/logos/rainbow.png
diff --git a/public/nft/logos/rarible.png b/public/nft/logos/rarible.png
diff --git a/public/nft/logos/walletlink.png b/public/nft/logos/walletlink.png
diff --git a/public/nft/logos/wc.png b/public/nft/logos/wc.png
diff --git a/public/nft/svgs/bagFill.svg b/public/nft/svgs/bagFill.svg
diff --git a/public/nft/svgs/checkmark.svg b/public/nft/svgs/checkmark.svg
diff --git a/public/nft/svgs/chevronBackward.svg b/public/nft/svgs/chevronBackward.svg
diff --git a/public/nft/svgs/chevronUp.svg b/public/nft/svgs/chevronUp.svg
diff --git a/public/nft/svgs/clockSpin.svg b/public/nft/svgs/clockSpin.svg
diff --git a/public/nft/svgs/close.svg b/public/nft/svgs/close.svg
diff --git a/public/nft/svgs/down.svg b/public/nft/svgs/down.svg
diff --git a/public/nft/svgs/eth.svg b/public/nft/svgs/eth.svg
diff --git a/public/nft/svgs/eth2.svg b/public/nft/svgs/eth2.svg
diff --git a/public/nft/svgs/eth2Dark.svg b/public/nft/svgs/eth2Dark.svg
diff --git a/public/nft/svgs/eth2Light.svg b/public/nft/svgs/eth2Light.svg
diff --git a/public/nft/svgs/gem.svg b/public/nft/svgs/gem.svg