Merge branch 'develop' into feature/new-user-profile

Author: Wixzi

.github/workflows/chromatic.yml

@@ -9,7 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     if: (!github.event.pull_request.draft && github.actor != 'dependabot[bot]')
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Install dependencies
         run: yarn
 

.github/workflows/ci.yml

@@ -40,6 +40,9 @@ jobs:
       - name: Generate open-api
         run: yarn codegen:socket
 
+      - name: Generate graphql
+        run: yarn codegen:graphql
+
       - name: Compress workspace artifact
         run: tar --create --use-compress-program='zstd -T0' --file=/tmp/workspace.tar.zst .
 

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/ct.yml

@@ -22,7 +22,7 @@ jobs:
         node_version: [16]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
         with:
           node-version: '16'

graphql-codegen.yml

@@ -0,0 +1,9 @@
+overwrite: true
+schema: 'https://api.thegraph.com/subgraphs/name/dxgraphs/swapr-mainnet-v2'
+documents: 'src/**/*.{gql,graphql}'
+generates:
+  src/graphql/generated/schema.ts:
+    plugins:
+      - 'typescript'
+      - 'typescript-operations'
+      - 'typescript-react-apollo'

package.json

@@ -1,12 +1,12 @@
 {
   "name": "@swapr/frontend",
-  "version": "1.0.0-beta.14.2",
+  "version": "1.0.0-beta.15",
   "private": true,
   "description": "DXswap Decentralized Application",
   "license": "GPL-3.0-or-later",
   "scripts": {
-    "start": "yarn codegen:socket && react-app-rewired start",
-    "build": "yarn codegen:socket && cross-env GENERATE_SOURCEMAP=false react-app-rewired build",
+    "start": "yarn codegen:socket && yarn codegen:graphql && react-app-rewired start",
+    "build": "yarn codegen:socket && yarn codegen:graphql && cross-env GENERATE_SOURCEMAP=false react-app-rewired build",
     "build:serve": "yarn build && serve -s ./build -l 5000",
     "ipfs-build": "cross-env PUBLIC_URL=\".\" GENERATE_SOURCEMAP=false react-app-rewired build",
     "lint": "eslint src --ext js,jsx,ts,tsx",
@@ -25,7 +25,8 @@
     "prepare": "husky install",
     "storybook": "start-storybook -p 6006 -s public",
     "build-storybook": "build-storybook -s public",
-    "chromatic": "chromatic --exit-zero-on-changes"
+    "chromatic": "chromatic --exit-zero-on-changes",
+    "codegen:graphql": "graphql-codegen --config graphql-codegen.yml"
   },
   "resolutions": {
     "@uniswap/smart-order-router": "2.5.26"
@@ -38,9 +39,9 @@
     "@reach/portal": "^0.17.0",
     "@react-spring/web": "^9.2.4",
     "@reduxjs/toolkit": "^1.8.3",
-    "@swapr/core": "^0.3.18",
-    "@swapr/periphery": "^0.3.20",
-    "@swapr/sdk": "1.5.1",
+    "@swapr/core": "^0.3.19",
+    "@swapr/periphery": "^0.3.22",
+    "@swapr/sdk": "1.6.0-rc.3",
     "@uniswap/token-lists": "^1.0.0-beta.27",
     "@web3-react/core": "^6.1.9",
     "@web3-react/injected-connector": "^6.0.7",
@@ -57,15 +58,15 @@
     "date-fns": "^2.28.0",
     "decimal.js-light": "^2.5.1",
     "ethers": "^5.4.4",
-    "etherscan-api": "10.1.0",
+    "etherscan-api": "10.2.0",
     "git-revision-webpack-plugin": "^3.0.6",
     "graphql": "^16.5.0",
     "graphql-request": "^4.3.0",
     "i18next": "^21.8.16",
     "i18next-browser-languagedetector": "^6.1.4",
     "i18next-http-backend": "^1.4.1",
     "lodash": "^4.17.21",
-    "luxon": "^2.4.0",
+    "luxon": "^3.0.1",
     "merkletreejs": "^0.2.32",
     "multicodec": "^3.2.1",
     "multiformats": "^9.7.1",
@@ -77,29 +78,34 @@
     "rc-texty": "^0.2.0",
     "react": "^18.2.0",
     "react-app-rewired": "^2.2.1",
-    "react-datepicker": "^3.4.1",
+    "react-datepicker": "^4.8.0",
     "react-device-detect": "^2.2.2",
     "react-dom": "^18.2.0",
     "react-fast-marquee": "^1.3.4",
     "react-feather": "^2.0.8",
-    "react-i18next": "^11.17.3",
+    "react-i18next": "^11.18.3",
     "react-loading-skeleton": "3.1.0",
     "react-popper": "^2.2.5",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
-    "react-toastify": "9.0.3",
+    "react-toastify": "9.0.7",
     "react-use": "^17.4.0",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.5",
     "rebass": "^4.0.7",
     "redux-localstorage-simple": "^2.4.1",
     "start-server-and-test": "^1.14.0",
-    "styled-components": "5.3.3",
+    "styled-components": "5.3.5",
     "toformat": "^2.0.0",
     "wcag-contrast": "^3.0.0"
   },
   "devDependencies": {
     "@connext/nxtp-sdk": "^0.1.36",
+    "@graphql-codegen/cli": "2.11.3",
+    "@graphql-codegen/introspection": "2.2.0",
+    "@graphql-codegen/typescript": "2.7.2",
+    "@graphql-codegen/typescript-operations": "^2.5.2",
+    "@graphql-codegen/typescript-react-apollo": "^3.3.2",
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@react-theming/storybook-addon": "^1.1.6",
     "@simbathesailor/use-what-changed": "^2.0.0",
@@ -117,14 +123,14 @@
     "@synthetixio/synpress": "^1.1.1",
     "@testing-library/cypress": "^8.0.2",
     "@types/aos": "^3.0.4",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^28.1.6",
     "@types/lodash": "^4.14.182",
-    "@types/luxon": "^2.3.2",
-    "@types/multicodec": "^1.0.0",
+    "@types/luxon": "^3.0.0",
+    "@types/multicodec": "^2.1.0",
     "@types/node": "^18.0.1",
     "@types/numeral": "^2.0.2",
     "@types/react": "^18.0.15",
-    "@types/react-datepicker": "^3.1.8",
+    "@types/react-datepicker": "^4.4.2",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-dom": "^5.1.8",
     "@types/react-virtualized-auto-sizer": "^1.0.1",
@@ -138,13 +144,13 @@
     "assert": "^2.0.0",
     "browserslist": "^4.21.1",
     "buffer": "^6.0.3",
-    "chromatic": "^6.6.3",
+    "chromatic": "^6.7.2",
     "cross-env": "^7.0.2",
     "crypto-browserify": "^3.12.0",
-    "cypress": "^10.2.0",
+    "cypress": "^10.3.1",
     "cypress-localstorage-commands": "^2.1.0",
     "cypress-mochawesome-reporter": "^3.1.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-import": "^2.26.0",
@@ -162,7 +168,7 @@
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "prettier": "^2.7.1",
-    "react-error-overlay": "6.0.9",
+    "react-error-overlay": "6.0.11",
     "react-scripts": "5.0.1",
     "serve": "^14.0.1",
     "stream-browserify": "^3.0.0",

public/locales/de/pool.json

@@ -14,7 +14,7 @@
   "userLiquidity.yourLiquidity": "Your liquidity",
   "userLiquidity.pooledToken": "Pooled {{ token }}",
   "userLiquidity.poolShare": "Pool share",
-  "userLiquidity.poolTokens": "Pool Tokens",
+  "userLiquidity.lpTokens": "LP Tokens",
   "addLiquidity": "Add Liquidity",
   "userLiquidity.removeLiquidity": "Remove Liquidity",
   "pairsList.pair": "Pair",

public/locales/en-US/pool.json

@@ -14,7 +14,7 @@
   "userLiquidity.yourLiquidity": "Your liquidity",
   "userLiquidity.pooledToken": "Pooled {{ token }}",
   "userLiquidity.poolShare": "Pool share",
-  "userLiquidity.poolTokens": "Pool Tokens",
+  "userLiquidity.lpTokens": "LP Tokens",
   "addLiquidity": "Add Liquidity",
   "userLiquidity.removeLiquidity": "Remove Liquidity",
   "pairsList.pair": "Pair",

public/locales/en/pool.json

@@ -14,7 +14,7 @@
   "userLiquidity.yourLiquidity": "Your liquidity",
   "userLiquidity.pooledToken": "Pooled {{ token }}",
   "userLiquidity.poolShare": "Pool share",
-  "userLiquidity.poolTokens": "Pool Tokens",
+  "userLiquidity.lpTokens": "LP Tokens",
   "addLiquidity": "Add Liquidity",
   "userLiquidity.removeLiquidity": "Remove Liquidity",
   "pairsList.pair": "Pair",

public/locales/es-AR/pool.json

@@ -14,7 +14,7 @@
   "userLiquidity.yourLiquidity": "Your liquidity",
   "userLiquidity.pooledToken": "Pooled {{ token }}",
   "userLiquidity.poolShare": "Pool share",
-  "userLiquidity.poolTokens": "Pool Tokens",
+  "userLiquidity.lpTokens": "LP Tokens",
   "addLiquidity": "Add Liquidity",
   "userLiquidity.removeLiquidity": "Remove Liquidity",
   "pairsList.pair": "Pair",