Merge branch 'develop' into fix_redux_persist_error_spew

package.json

@@ -143,7 +143,6 @@
     "embla-carousel-autoplay": "^7.0.5",
     "embla-carousel-react": "^7.0.5",
     "envalid": "^7.3.1",
-    "eslint-plugin-react-memo": "^0.0.3",
     "eth-url-parser": "^1.0.4",
     "ethers": "^6.11.1",
     "ethers5": "npm:[email protected]",
@@ -155,7 +154,6 @@
     "html5-qrcode": "^2.3.8",
     "https-browserify": "^1.0.0",
     "js-file-download": "^0.4.12",
-    "js-pixel-fonts": "^1.6.0",
     "lightweight-charts": "^4.1.3",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
@@ -173,7 +171,6 @@
     "qs": "^6.10.5",
     "re-reselect": "^4.0.0",
     "react": "^18.2.0",
-    "react-countdown-circle-timer": "^3.0.9",
     "react-datepicker": "^4.8.0",
     "react-device-detect": "^2.2.2",
     "react-dom": "^18.2.0",
@@ -201,7 +198,6 @@
     "resize-observer-polyfill": "^1.5.1",
     "retry-axios": "^2.6.0",
     "scroll-into-view-if-needed": "^3.0.10",
-    "simplex-noise": "^3.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "styled-components": "^6.0.7",
@@ -266,6 +262,7 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.28.0",
     "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react-memo": "^0.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "fast-json-stable-stringify": "^2.1.0",
     "happy-dom": "^12.10.3",
@@ -296,7 +293,6 @@
     "val-loader": "^4.0.0",
     "vite-tsconfig-paths": "^4.2.3",
     "vitest": "1.1.1",
-    "web3-types": "^0.1.0-alpha.0",
     "webpack": "5.94.0",
     "webpack-subresource-integrity": "^5.0.0",
     "workbox-webpack-plugin": "^7.1.0"

packages/swapper/src/swappers/LifiSwapper/getTradeQuote/getTradeQuote.ts

@@ -92,7 +92,7 @@ export async function getTradeQuote(
       // used for analytics and affiliate fee - do not change this without considering impact
       integrator: LIFI_INTEGRATOR_ID,
       slippage: Number(slippageTolerancePercentageDecimal),
-      bridges: { deny: ['stargate', 'amarok', 'arbitrum'] },
+      bridges: { deny: ['stargate', 'stargateV2', 'amarok', 'arbitrum'] },
       allowSwitchChain: true,
       fee: affiliateBpsDecimalPercentage.isZero()
         ? undefined

src/pages/ConnectWallet/ConnectWallet.tsx

@@ -18,6 +18,7 @@ import { useTranslate } from 'react-polyglot'
 import { generatePath, matchPath, useHistory } from 'react-router-dom'
 import SplashSidebar from 'assets/splash-sidebar.jpg'
 import { AssetIcon } from 'components/AssetIcon'
+import { FoxIcon } from 'components/Icons/FoxIcon'
 import { MetaMaskIcon } from 'components/Icons/MetaMaskIcon'
 import { LanguageSelector } from 'components/LanguageSelector'
 import { Page } from 'components/Layout/Page'
@@ -252,10 +253,13 @@ export const ConnectWallet = () => {
         >
           <Center
             flexDir='column'
+            p={6}
+            justifyContent='flex-start'
             // Full height with "-webkit-fill-available" polyfill, see https://chakra-ui.com/changelog/v2.3.1#styled-system-231
             height='$100vh'
-            px={6}
-          />
+          >
+            <FoxIcon boxSize='4rem' />
+          </Center>
         </Flex>
       </Flex>
     </Page>

yarn.lock

@@ -6338,13 +6338,13 @@ __metadata:
   linkType: hard
 
 "@emotion/react@npm:^11.13.0":
-  version: 11.13.0
-  resolution: "@emotion/react@npm:11.13.0"
+  version: 11.13.3
+  resolution: "@emotion/react@npm:11.13.3"
   dependencies:
     "@babel/runtime": ^7.18.3
     "@emotion/babel-plugin": ^11.12.0
     "@emotion/cache": ^11.13.0
-    "@emotion/serialize": ^1.3.0
+    "@emotion/serialize": ^1.3.1
     "@emotion/use-insertion-effect-with-fallbacks": ^1.1.0
     "@emotion/utils": ^1.4.0
     "@emotion/weak-memoize": ^0.4.0
@@ -6354,7 +6354,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: aa6bff49ac0c15a97cc310a36e89146c4851dcb84ba25bc284d68e19a9b9d5d78235b74915a58404d59cfa369ddaf33dc280d881ca089e4ad70310dce87e0853
+  checksum: 0b58374bf28de914b49881f0060acfb908989869ebab63a2287773fc5e91a39f15552632b03d376c3e9835c5b4f23a5ebac8b0963b29af164d46c0a77ac928f0
   languageName: node
   linkType: hard
 
@@ -6371,6 +6371,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/serialize@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "@emotion/serialize@npm:1.3.2"
+  dependencies:
+    "@emotion/hash": ^0.9.2
+    "@emotion/memoize": ^0.9.0
+    "@emotion/unitless": ^0.10.0
+    "@emotion/utils": ^1.4.1
+    csstype: ^3.0.2
+  checksum: 8051bafe32459e1aecf716cdb66a22b090060806104cca89d4e664893b56878d3e9bb94a4657df9b7b3fd183700a9be72f7144c959ddcbd3cf7b330206919237
+  languageName: node
+  linkType: hard
+
 "@emotion/sheet@npm:^1.4.0":
   version: 1.4.0
   resolution: "@emotion/sheet@npm:1.4.0"
@@ -6398,6 +6411,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/unitless@npm:^0.10.0":
+  version: 0.10.0
+  resolution: "@emotion/unitless@npm:0.10.0"
+  checksum: d79346df31a933e6d33518e92636afeb603ce043f3857d0a39a2ac78a09ef0be8bedff40130930cb25df1beeee12d96ee38613963886fa377c681a89970b787c
+  languageName: node
+  linkType: hard
+
 "@emotion/unitless@npm:^0.8.0":
   version: 0.8.1
   resolution: "@emotion/unitless@npm:0.8.1"
@@ -6428,6 +6448,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emotion/utils@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@emotion/utils@npm:1.4.1"
+  checksum: 088f6844c735981f53c84a76101cf261422301e7895cb37fea6a47e7950247ffa8ca174ca2a15d9b29a47f0fa831b432017ca7683bccbb5cfd78dda82743d856
+  languageName: node
+  linkType: hard
+
 "@emotion/weak-memoize@npm:^0.4.0":
   version: 0.4.0
   resolution: "@emotion/weak-memoize@npm:0.4.0"
@@ -11863,7 +11890,6 @@ __metadata:
     https-browserify: ^1.0.0
     inquirer: 8.2.4
     js-file-download: ^0.4.12
-    js-pixel-fonts: ^1.6.0
     jscodeshift: ^0.15.2
     lightweight-charts: ^4.1.3
     limiter: ^2.1.0
@@ -11892,7 +11918,6 @@ __metadata:
     re-reselect: ^4.0.0
     react: ^18.2.0
     react-app-rewired: ^2.2.1
-    react-countdown-circle-timer: ^3.0.9
     react-datepicker: ^4.8.0
     react-dev-utils: ^12.0.1
     react-device-detect: ^2.2.2
@@ -11925,7 +11950,6 @@ __metadata:
     retry-axios: ^2.6.0
     scroll-into-view-if-needed: ^3.0.10
     simple-git: ^3.16.0
-    simplex-noise: ^3.0.1
     ssri: ^8.0.1
     stream-browserify: ^3.0.0
     stream-http: ^3.2.0
@@ -11943,7 +11967,6 @@ __metadata:
     vitest: 1.1.1
     wagmi: ^2.9.2
     web-vitals: ^2.1.4
-    web3-types: ^0.1.0-alpha.0
     webpack: 5.94.0
     webpack-subresource-integrity: ^5.0.0
     workbox-webpack-plugin: ^7.1.0
@@ -13655,15 +13678,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/pngjs@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "@types/pngjs@npm:6.0.1"
-  dependencies:
-    "@types/node": "*"
-  checksum: 5673a301c81edc6cfcf5c969d743c2e4f79c28e85d24c261be36273d557b131a98b35d9c79a00dc968f206cc7f73b603e261c6a6f7066c99ed98874299f369b9
-  languageName: node
-  linkType: hard
-
 "@types/prettier@npm:^2.1.1, @types/prettier@npm:^2.1.5":
   version: 2.7.1
   resolution: "@types/prettier@npm:2.7.1"
@@ -27605,17 +27619,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-pixel-fonts@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "js-pixel-fonts@npm:1.6.0"
-  dependencies:
-    "@types/pngjs": ^6.0.1
-    loglevel: ^1.6.1
-    pngjs: ^3.3.3
-  checksum: d619d21e09c8d7769812099a72a2b9037f9ba4e26a06744f8814db1bed637bda20a186e1b87b6cde963bacd2e452e9ccc362fa9f47c2248260285dc56dbaa6f3
-  languageName: node
-  linkType: hard
-
 "js-sha256@npm:^0.9.0":
   version: 0.9.0
   resolution: "js-sha256@npm:0.9.0"
@@ -28747,13 +28750,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loglevel@npm:^1.6.1":
-  version: 1.8.1
-  resolution: "loglevel@npm:1.8.1"
-  checksum: a1a62db40291aaeaef2f612334c49e531bff71cc1d01a2acab689ab80d59e092f852ab164a5aedc1a752fdc46b7b162cb097d8a9eb2cf0b299511106c29af61d
-  languageName: node
-  linkType: hard
-
 "long@npm:4.0.0, long@npm:^4.0.0":
   version: 4.0.0
   resolution: "long@npm:4.0.0"
@@ -33005,15 +33001,6 @@ pvutils@latest:
   languageName: node
   linkType: hard
 
-"react-countdown-circle-timer@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "react-countdown-circle-timer@npm:3.0.9"
-  peerDependencies:
-    react: ">=16.8.0"
-  checksum: 1fc3895965b41e2cd3663fe637db9e9bdeea8ae9458ea893985f4da5f0bdaf2ce7ae580baa69411190eb02762d1e07d7254aacffa9e9ef57db58a2c072fc6582
-  languageName: node
-  linkType: hard
-
 "react-datepicker@npm:^4.8.0":
   version: 4.8.0
   resolution: "react-datepicker@npm:4.8.0"
@@ -35593,13 +35580,6 @@ pvutils@latest:
   languageName: node
   linkType: hard
 
-"simplex-noise@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "simplex-noise@npm:3.0.1"
-  checksum: 9691c295d020b224560b2a6429213bfbfcbb649946e0b325beb6ab4e7ca341a99ac021033d87d69c0df1428f07c2e727773d0cdbd759ca1f525de874f013c741
-  languageName: node
-  linkType: hard
-
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -39241,13 +39221,6 @@ pvutils@latest:
   languageName: node
   linkType: hard
 
-"web3-types@npm:^0.1.0-alpha.0":
-  version: 0.1.0-alpha.0
-  resolution: "web3-types@npm:0.1.0-alpha.0"
-  checksum: 122a7b679c76350f26a29bdb8a8734834f2d06c084ab361ef7042bc4c2760dfc933cd3340e473095e422b8ed29ff03e81d095bf3dc07cdc202dff08e514783ba
-  languageName: node
-  linkType: hard
-
 "web3-utils@npm:1.3.6":
   version: 1.3.6
   resolution: "web3-utils@npm:1.3.6"