Merge branch 'main' into prices-v3-upgrade

Author: bergarces

.depcheckrc.yml

@@ -8,6 +8,7 @@ ignores:
   - '@lavamoat/webpack'
   - '@lavamoat/allow-scripts'
   - '@babel/runtime'
+  - 'react-compiler-runtime'
   - '@fortawesome/fontawesome-free'
   - 'punycode'
   # injected via build system
@@ -83,6 +84,7 @@ ignores:
   - 'core-js-pure' # polyfills
   # babel
   - '@babel/plugin-transform-logical-assignment-operators'
+  - 'babel-plugin-react-compiler'
   # used in image optimization script
   - 'sharp'
   # trezor

.eslintrc.js

@@ -320,8 +320,9 @@ module.exports = {
           jsx: true,
         },
       },
-      plugins: ['react'],
+      plugins: ['react', 'react-compiler'],
       rules: {
+        'react-compiler/react-compiler': 'error',
         'react/no-unused-prop-types': 'error',
         'react/no-unused-state': 'error',
         'react/jsx-boolean-value': 'error',
@@ -362,8 +363,9 @@ module.exports = {
           jsx: true,
         },
       },
-      plugins: ['react'],
+      plugins: ['react', 'react-compiler'],
       rules: {
+        'react-compiler/react-compiler': 'error',
         'react/no-unused-prop-types': 'warn',
         'react/no-unused-state': 'warn',
         'react/jsx-boolean-value': 'off',

app/scripts/background.js

@@ -918,7 +918,8 @@ export async function loadStateFromPersistence(backup) {
     migrations,
     defaultVersion: process.env.WITH_STATE
       ? // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires, node/global-require
-        require('../../test/e2e/default-fixture').FIXTURE_STATE_METADATA_VERSION
+        require('../../test/e2e/fixtures/fixture-builder')
+          .FIXTURE_STATE_METADATA_VERSION
       : null,
   });
 

app/scripts/fixtures/generate-wallet-state.js

@@ -5,8 +5,11 @@ import { cloneDeep } from 'lodash';
 import { hexToDecimal } from '../../../shared/modules/conversion.utils';
 import { UI_NOTIFICATIONS } from '../../../shared/notifications';
 import { WALLET_PASSWORD } from '../../../test/e2e/constants';
-import { E2E_SRP, defaultFixture } from '../../../test/e2e/default-fixture';
-import FixtureBuilder from '../../../test/e2e/fixture-builder';
+import {
+  E2E_SRP,
+  defaultFixture,
+} from '../../../test/e2e/fixtures/default-fixture';
+import FixtureBuilder from '../../../test/e2e/fixtures/fixture-builder';
 import { encryptorFactory } from '../lib/encryptor-factory';
 import { normalizeSafeAddress } from '../lib/multichain/address';
 import { getRootMessenger } from '../lib/messenger';

app/scripts/lib/network-controller/messenger-action-handlers.test.ts

@@ -75,6 +75,7 @@ describe('onRpcEndpointUnavailable', () => {
         event: 'RPC Service Unavailable',
         properties: {
           chain_id_caip: 'eip155:11155111',
+          rpc_domain: 'example.com',
           rpc_endpoint_url: 'example.com',
         },
       });
@@ -104,6 +105,7 @@ describe('onRpcEndpointUnavailable', () => {
         properties: {
           chain_id_caip: 'eip155:11155111',
           http_status: 420,
+          rpc_domain: 'example.com',
           rpc_endpoint_url: 'example.com',
         },
       });
@@ -132,6 +134,7 @@ describe('onRpcEndpointUnavailable', () => {
         event: 'RPC Service Unavailable',
         properties: {
           chain_id_caip: 'eip155:11155111',
+          rpc_domain: 'custom',
           rpc_endpoint_url: 'custom',
         },
       });
@@ -228,6 +231,7 @@ describe('onRpcEndpointDegraded', () => {
         event: 'RPC Service Degraded',
         properties: {
           chain_id_caip: 'eip155:11155111',
+          rpc_domain: 'example.com',
           rpc_endpoint_url: 'example.com',
         },
       });
@@ -257,6 +261,7 @@ describe('onRpcEndpointDegraded', () => {
         properties: {
           chain_id_caip: 'eip155:11155111',
           http_status: 420,
+          rpc_domain: 'example.com',
           rpc_endpoint_url: 'example.com',
         },
       });
@@ -285,6 +290,7 @@ describe('onRpcEndpointDegraded', () => {
         event: 'RPC Service Degraded',
         properties: {
           chain_id_caip: 'eip155:11155111',
+          rpc_domain: 'custom',
           rpc_endpoint_url: 'custom',
         },
       });

app/scripts/lib/network-controller/messenger-action-handlers.ts

@@ -137,13 +137,16 @@ export function trackRpcEndpointEvent(
     return;
   }
 
+  const sanitizedUrl = isPublicEndpointUrl(endpointUrl, infuraProjectId)
+    ? onlyKeepHost(endpointUrl)
+    : 'custom';
+
   // The names of Segment properties have a particular case.
   /* eslint-disable @typescript-eslint/naming-convention */
   const properties = {
     chain_id_caip: `eip155:${hexToNumber(chainId)}`,
-    rpc_endpoint_url: isPublicEndpointUrl(endpointUrl, infuraProjectId)
-      ? onlyKeepHost(endpointUrl)
-      : 'custom',
+    rpc_domain: sanitizedUrl,
+    rpc_endpoint_url: sanitizedUrl, // @deprecated - Will be removed in a future release.
     ...(isObject(error) &&
     'httpStatus' in error &&
     isValidJson(error.httpStatus)

babel.config.js

@@ -2,13 +2,23 @@ const path = require('path');
 
 module.exports = function (api) {
   api.cache(false);
+  const slash = `\\${path.sep}`;
   return {
     parserOpts: {
       strictMode: true,
     },
     targets: {
       browsers: ['chrome >= 89', 'firefox >= 89'],
     },
+    overrides: [
+      {
+        test: new RegExp(
+          `^${path.join(__dirname, 'ui')}${slash}(?:components|contexts|hooks|layouts|pages)${slash}(?:.(?!\\.(?:test|stories|container)))+\\.(?:m?[jt]s|[jt]sx)$`,
+          'u',
+        ),
+        plugins: [['babel-plugin-react-compiler', { target: '17' }]],
+      },
+    ],
     plugins: [
       // `browserify` is old and busted, and doesn't support `??=` (and other
       // logical assignment operators). This plugin lets us target es2020-level