Merge branch 'main' into QA-XXX-fixFlakiness

MetaMask · Feb 27, 2025 · 8a3f1f9 · 8a3f1f9
2 parents 6524443 + e1444c9
commit 8a3f1f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -413,6 +413,7 @@ const environmentMappingForRemoteFeatureFlag = {
 const buildTypeMappingForRemoteFeatureFlag = {
   flask: DistributionType.Flask,
   main: DistributionType.Main,
+  beta: 'beta',
 };
 
 export default class MetamaskController extends EventEmitter {

diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
@@ -4204,7 +4204,7 @@ describe('MetaMaskController', () => {
       });
 
       it('returna config when not matching default mapping', async () => {
-        process.env.METAMASK_BUILD_TYPE = 'beta';
+        process.env.METAMASK_BUILD_TYPE = 'non-existent-distribution';
         process.env.METAMASK_ENVIRONMENT = ENVIRONMENT.RELEASE_CANDIDATE;
 
         const result =

diff --git a/builds.yml b/builds.yml
@@ -40,6 +40,9 @@ buildTypes:
     features:
       - build-beta
       - keyring-snaps
+      - multichain
+      - solana
+      - solana-swaps
     env:
       - INFURA_BETA_PROJECT_ID
       - SEGMENT_BETA_WRITE_KEY

diff --git a/test/e2e/snaps/test-snap-uilinks.spec.js b/test/e2e/snaps/test-snap-uilinks.spec.js
@@ -112,7 +112,7 @@ describe('Test Snap UI Links', function () {
 
         // check that the correct page has been opened
         await driver.waitForSelector({
-          text: 'Most Popular',
+          text: 'Most popular',
           tag: 'h2',
         });