Merge branch 'dev2' into feature/remove-apollo-client

# Conflicts:
#	package-lock.json

package.json

@@ -4,8 +4,6 @@
   "private": true,
   "devDependencies": {
     "@ethersproject/experimental": "^5.4.0",
-    "@orbs-network/twap-ui": "0.6.x",
-    "@orbs-network/twap-ui-quickswap": "0.6.x",
     "@reduxjs/toolkit": "^1.3.5",
     "@types/d3": "^6.7.1",
     "@types/jest": "^25.2.1",
@@ -72,7 +70,9 @@
     "serve": "^11.3.2",
     "source-map-explorer": "^2.5.2",
     "start-server-and-test": "^1.11.0",
-    "typescript": "^4.1.2"
+    "typescript": "^4.1.2",
+    "@orbs-network/twap-ui": "0.7.x",
+    "@orbs-network/twap-ui-quickswap": "0.7.x"
   },
   "resolutions": {
     "yargs-parser": "^13.1.2",
@@ -109,7 +109,8 @@
     "format": "prettier --write \"**/*.{ts,js,tsx,json,md}\"",
     "eject": "react-scripts eject",
     "integration-test": "start-server-and-test 'serve build -l 3000' http://localhost:3000 'cypress run'",
-    "ipfs-deploy": "ipfs-deploy build"
+    "ipfs-deploy": "ipfs-deploy build",
+    "sitemap": "NODE_PATH=./src npx ts-node --project tsconfig.node.json ./src/sitemap-builder.ts"
   },
   "eslintConfig": {
     "extends": "react-app",

public/index.html

@@ -26,7 +26,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>QuickSwap</title>
+    <title>Quickswap - Leading DEX on Polygon</title>
     <script type="text/javascript" src="https://app.web3ads.net/main.js" async></script>
     <script>
       const script = document.createElement('script');

public/robots.txt

@@ -1,3 +1,5 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
 Disallow:
+
+Sitemap: https://quickswap.exchange/sitemap.xml