merge main (#1272)

* fix bug params currency (#1244)

* feat(campaign): enter now go to swap with first eligible token (#1240)

* Change Banner to Polygon Campaign (#1245)

* feat(farm): elastic (#1247)

* fix: staked amount (#1248)

* fix: farm apr (#1249)

* improve: farm ux (#1250)

* Do minor UI improvement (#1246)

* chore: increase gap in TransactionConfirmationModal

* chore: gap in TransactionPopup

* chore: adjust spacing in EnterNow in Campaign page

* chore: add a hyper link to Elastic pools from Farm

* feat(pools): add button to hide pools with low TVL

* refactor(about): update to new style/texts

* fix: apr farm (#1252)

* fix(trending-token-banner): avoid words from breaking at white spaces (#1251)

* Support Brave wallet (#1221)

* feat: support Brave wallet

* refactor(PendingView): simplify props

* simplify checkForBraveBrowser

* chore: update return type of onClickTryAgain

* fix: display Brave wallet identicon

* fix: display wallet options on Brave

In Brave, window.ethereum is not undefined, so a condition fails and there are no wallet options to choose.

* chore(wallet-modal): show hover effect on supported devices only

* fix: display correct wallet name by detecting connector

* fix bug popup noti overlap + import token(#1255)

* fix bug popup noti overlap 

* fix bug import token

* feat: add banner for polygon lido farming (#1256)

* fix: hide ATH pro live chart

* redact wallet address and tx_hash

* switch basic chart to priorities coingecko api

* revert debug

* hide ATH pro live chart

Co-authored-by: nguyenhuudungz <[email protected]>

* fix: ath price chart and reward price (#1258)

* fix(farm): get reward token price from market (#1259)

* feat: tutorial swap page  (#1192)

* refactor(tx-modal): show correct wallet to add token to (#1260)

* chore: update .env.dev (#1262)

* feat: support emergency withdraw (#1263)

* add top banner (#1264)

* update blog link

* fix(farm): mistake in withdraw condition

* fix: update text (#1265)

* fix: can not withdraw on ended tab (#1266)

* feat: switch banner position (#1267)

* fix: can not withdraw on ended tab (#1268)

* Update nginx.conf

* refactor: remove unused constant (#1269)

* fix: revert to public rpc for bsc

Co-authored-by: Nguyễn Hoài Danh <[email protected]>
Co-authored-by: nguyenhuudungz <[email protected]>
Co-authored-by: Kami Ho <[email protected]>
Co-authored-by: Hung Doan <[email protected]>
Co-authored-by: XiaoYhun <[email protected]>
Co-authored-by: Viet-Anh Duong <[email protected]>

.env.dev

@@ -2,7 +2,7 @@ REACT_APP_PORTIS_ID=78552035-b1c5-4927-8d2f-4eeea42a795c
 REACT_APP_FORTMATIC_KEY=pk_live_EF523DF5F8AC3058
 REACT_APP_MAINNET_ENV=staging
 
-REACT_APP_AGGREGATOR_API=https://aggregator-api.dev.kyberengineering.io
+REACT_APP_AGGREGATOR_API=https://meta-aggregator.dev.kyberengineering.io
 REACT_APP_AGGREGATOR_STATS_API=https://aggregator-stats.kyberswap.com
 REACT_APP_SENTRY_DNS=https://[email protected]/4
 

etc/nginx.conf

@@ -19,6 +19,9 @@ server {
     index index.html index.htm;
 
     location / {
+        if ( $uri = '/index.html' ) {
+            add_header Cache-Control no-store always;   
+        }
         try_files $uri $uri/ /index.html;
     }
 

package.json

@@ -12,6 +12,7 @@
     "@reach/dialog": "^0.17.0",
     "@reach/portal": "^0.17.0",
     "@reduxjs/toolkit": "^1.7.1",
+    "@trivago/prettier-plugin-sort-imports": "^3.3.0",
     "@types/aos": "^3.0.4",
     "@types/big.js": "^6.0.0",
     "@types/d3": "^7.1.0",
@@ -38,6 +39,7 @@
     "@types/rebass": "^4.0.5",
     "@types/recharts": "^1.8.23",
     "@types/styled-components": "^5.1.25",
+    "@types/ua-parser-js": "^0.7.36",
     "@types/wcag-contrast": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^4",
     "@typescript-eslint/parser": "^4",
@@ -57,6 +59,7 @@
     "copy-to-clipboard": "^3.2.0",
     "eslint": "^7.11.0",
     "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-better-styled-components": "^1.1.2",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -114,35 +117,24 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "lint": "yarn eslint ."
   },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not op_mini all"
+  ],
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "@apollo/client": "^3.3.11",
     "@kyberswap/ks-sdk-classic": "^0.0.13",
     "@kyberswap/ks-sdk-core": "^0.0.13",
     "@kyberswap/ks-sdk-elastic": "^0.0.43",
-    "@lingui/detect-locale": "^3.10.4",
     "@lingui/react": "^3.14.0",
     "@sentry/react": "^6.16.1",
-    "@trivago/prettier-plugin-sort-imports": "^3.3.0",
     "@typeform/embed-react": "^1.2.4",
-    "@types/ua-parser-js": "^0.7.36",
     "aos": "^2.3.4",
     "d3": "^7.3.0",
     "dayjs": "^1.10.7",
     "env-cmd": "^10.1.0",
-    "eslint-plugin-better-styled-components": "^1.1.2",
     "eslint-plugin-unused-imports": "^2.0.0",
     "firebase": "^9.8.2",
     "graphql": "^15.5.0",
@@ -163,6 +155,7 @@
     "swiper": "^8.0.7",
     "swr": "^1.0.1",
     "ua-parser-js": "^1.0.2",
-    "uuidv4": "^6.2.12"
+    "uuidv4": "^6.2.12",
+    "walktour": "^5.1.1"
   }
 }