Merge branch 'main' into salim/integrate-mutichain-assets-rates-controller

Author: salimtb

.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) {

.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/_locales/de/messages.json

@@ -1,3 +1,4 @@
+import { noop } from 'lodash';
 import {
   getPPOMControllerMessenger,
   getPPOMControllerInitMessenger,
@@ -28,18 +29,23 @@ import { noop } from 'lodash';
 export const CONTROLLER_MESSENGERS = {
   CronjobController: {
     getMessenger: getCronjobControllerMessenger,
+    getInitMessenger: noop,
   },
   ExecutionService: {
     getMessenger: getExecutionServiceMessenger,
+    getInitMessenger: noop,
   },
   MultichainAssetsController: {
     getMessenger: getMultichainAssetsControllerMessenger,
+    getInitMessenger: noop,
   },
   MultichainBalancesController: {
     getMessenger: getMultichainBalancesControllerMessenger,
+    getInitMessenger: noop,
   },
   MultichainTransactionsController: {
     getMessenger: getMultichainTransactionsControllerMessenger,
+    getInitMessenger: noop,
   },
   MultiChainAssetsRatesController: {
     getMessenger: getMultiChainAssetsRatesControllerMessenger,
@@ -51,16 +57,19 @@ export const CONTROLLER_MESSENGERS = {
   },
   SnapsRegistry: {
     getMessenger: getSnapsRegistryMessenger,
+    getInitMessenger: noop,
   },
   SnapController: {
     getMessenger: getSnapControllerMessenger,
     getInitMessenger: getSnapControllerInitMessenger,
   },
   SnapInsightsController: {
     getMessenger: getSnapInsightsControllerMessenger,
+    getInitMessenger: noop,
   },
   SnapInterfaceController: {
     getMessenger: getSnapInterfaceControllerMessenger,
+    getInitMessenger: noop,
   },
   PPOMController: {
     getMessenger: getPPOMControllerMessenger,

app/_locales/el/messages.json

@@ -20,6 +20,7 @@ function buildInitRequestMock(): jest.Mocked<
     controllerMessenger: getMultichainAssetsControllerMessenger(
       baseControllerMessenger,
     ),
+    initMessenger: undefined,
   };
 }
 

app/_locales/en/messages.json

@@ -20,6 +20,7 @@ function buildInitRequestMock(): jest.Mocked<
     controllerMessenger: getMultichainBalancesControllerMessenger(
       baseControllerMessenger,
     ),
+    initMessenger: undefined,
   };
 }
 

app/_locales/en_GB/messages.json

@@ -20,6 +20,7 @@ function buildInitRequestMock(): jest.Mocked<
     controllerMessenger: getMultichainTransactionsControllerMessenger(
       baseControllerMessenger,
     ),
+    initMessenger: undefined,
   };
 }
 

app/_locales/es/messages.json

@@ -21,6 +21,7 @@ function getInitRequestMock(): jest.Mocked<
   const requestMock = {
     ...buildControllerInitRequestMock(),
     controllerMessenger: getCronjobControllerMessenger(baseMessenger),
+    initMessenger: undefined,
   };
 
   return requestMock;

app/_locales/fr/messages.json

@@ -24,6 +24,7 @@ function getInitRequestMock(): jest.Mocked<
   const requestMock = {
     ...buildControllerInitRequestMock(),
     controllerMessenger: getExecutionServiceMessenger(baseMessenger),
+    initMessenger: undefined,
   };
 
   return requestMock;

app/_locales/hi/messages.json

@@ -18,6 +18,7 @@ function getInitRequestMock(): jest.Mocked<
   const requestMock = {
     ...buildControllerInitRequestMock(),
     controllerMessenger: getSnapInsightsControllerMessenger(baseMessenger),
+    initMessenger: undefined,
   };
 
   return requestMock;

app/_locales/id/messages.json

@@ -18,6 +18,7 @@ function getInitRequestMock(): jest.Mocked<
   const requestMock = {
     ...buildControllerInitRequestMock(),
     controllerMessenger: getSnapInterfaceControllerMessenger(baseMessenger),
+    initMessenger: undefined,
   };
 
   return requestMock;

app/_locales/ja/messages.json

@@ -18,6 +18,7 @@ function getInitRequestMock(): jest.Mocked<
   const requestMock = {
     ...buildControllerInitRequestMock(),
     controllerMessenger: getSnapsRegistryMessenger(baseMessenger),
+    initMessenger: undefined,
   };
 
   return requestMock;

app/_locales/ko/messages.json

@@ -161,15 +161,13 @@ export type ControllerInitRequest<
     message: string,
     url?: string,
   ) => Promise<void>;
-} & (InitMessengerType extends BaseRestrictedControllerMessenger
-  ? {
-      /**
-       * Required initialization messenger instance.
-       * Generated using the callback specified in `getInitMessengerCallback`.
-       */
-      initMessenger: InitMessengerType;
-    }
-  : unknown);
+
+  /**
+   * Required initialization messenger instance.
+   * Generated using the callback specified in `getInitMessengerCallback`.
+   */
+  initMessenger: InitMessengerType;
+};
 
 /**
  * A single background API method available to the UI.