Merge branch 'main' into circles-swaps-util

.circleci/scripts/git-diff-default-branch.ts

@@ -105,10 +105,12 @@ async function gitDiff(): Promise<string> {
   return diffResult;
 }
 
-function writePrBodyToFile(prBody: string) {
+function writePrBodyAndInfoToFile(prInfo: PRInfo) {
   const prBodyPath = path.resolve(CHANGED_FILES_DIR, 'pr-body.txt');
-  fs.writeFileSync(prBodyPath, prBody.trim());
-  console.log(`PR body saved to ${prBodyPath}`);
+  const labels = prInfo.labels.map(label => label.name).join(', ');
+  const updatedPrBody = `PR labels: {${labels}}\nPR base: {${prInfo.base.ref}}\n${prInfo.body.trim()}`;
+  fs.writeFileSync(prBodyPath, updatedPrBody);
+  console.log(`PR body and info saved to ${prBodyPath}`);
 }
 
 /**
@@ -135,17 +137,9 @@ async function storeGitDiffOutputAndPrBody() {
     if (!baseRef) {
       console.log('Not a PR, skipping git diff');
       return;
-    } else if (baseRef !== GITHUB_DEFAULT_BRANCH) {
-      console.log(`This is for a PR targeting '${baseRef}', skipping git diff`);
-      writePrBodyToFile(prInfo.body);
-      return;
-    } else if (
-      prInfo.labels.some((label) => label.name === 'skip-e2e-quality-gate')
-    ) {
-      console.log('PR has the skip-e2e-quality-gate label, skipping git diff');
-      return;
     }
-
+    // We perform git diff even if the PR base is not main or skip-e2e-quality-gate label is applied
+    // because we rely on the git diff results for other jobs
     console.log('Attempting to get git diff...');
     const diffOutput = await gitDiff();
     console.log(diffOutput);
@@ -155,7 +149,7 @@ async function storeGitDiffOutputAndPrBody() {
     fs.writeFileSync(outputPath, diffOutput.trim());
     console.log(`Git diff results saved to ${outputPath}`);
 
-    writePrBodyToFile(prInfo.body);
+    writePrBodyAndInfoToFile(prInfo);
 
     process.exit(0);
   } catch (error: any) {

.eslintrc.js

@@ -299,14 +299,8 @@ module.exports = {
       rules: {
         'react/no-unused-prop-types': 'warn',
         'react/no-unused-state': 'warn',
-        'react/jsx-boolean-value': 'warn',
-        'react/jsx-curly-brace-presence': [
-          'warn',
-          {
-            props: 'never',
-            children: 'never',
-          },
-        ],
+        'react/jsx-boolean-value': 'off',
+        'react/jsx-curly-brace-presence': 'off',
         'react/no-deprecated': 'warn',
         'react/default-props-match-prop-types': 'warn',
         'react/jsx-no-duplicate-props': 'warn',

.github/workflows/validate-page-object-usage.yml

@@ -2,6 +2,8 @@ name: Validate E2E Page Object usage on modified files
 
 on:
   pull_request:
+    branches:
+      - main
     types:
       - opened
       - reopened

app/scripts/constants/sentry-state.ts

@@ -105,6 +105,9 @@ export const SENTRY_BACKGROUND_STATE = {
     accountsAssets: false,
     assetsMetadata: false,
   },
+  MultiChainAssetsRatesController: {
+    assetsRates: false,
+  },
   BridgeController: {
     bridgeState: {
       bridgeFeatureFlags: {

app/scripts/controller-init/controller-list.ts

@@ -13,6 +13,7 @@ import { TransactionUpdateController } from '@metamask-institutional/transaction
 import { AccountsController } from '@metamask/accounts-controller';
 import {
   MultichainAssetsController,
+  MultiChainAssetsRatesController,
   MultichainBalancesController,
 } from '@metamask/assets-controllers';
 import { MultichainTransactionsController } from '@metamask/multichain-transactions-controller';
@@ -42,6 +43,7 @@ export type Controller =
   | JsonSnapsRegistry
   | KeyringController
   | MultichainAssetsController
+  | MultiChainAssetsRatesController
   | MultichainBalancesController
   | MultichainTransactionsController
   | NetworkController
@@ -73,6 +75,7 @@ export type ControllerFlatState = AccountsController['state'] &
   JsonSnapsRegistry['state'] &
   KeyringController['state'] &
   MultichainAssetsController['state'] &
+  MultiChainAssetsRatesController['state'] &
   MultichainBalancesController['state'] &
   MultichainTransactionsController['state'] &
   NetworkController['state'] &