fix merge conflicts

Author: mindofmar

.eslintrc.js

@@ -533,11 +533,7 @@ module.exports = {
      * `process.exit` to exit).
      */
     {
-      files: [
-        'development/**/*.js',
-        'test/e2e/benchmark.js',
-        'test/helpers/setup-helper.js',
-      ],
+      files: ['development/**/*.js', 'test/helpers/setup-helper.js'],
       rules: {
         'node/no-process-exit': 'off',
         'node/shebang': 'off',

.github/CODEOWNERS

@@ -97,11 +97,14 @@ app/scripts/constants/snaps.ts       @MetaMask/core-platform
 ui/components/app/metamask-template-renderer @MetaMask/confirmations @MetaMask/core-platform
 
 # Core Extension UX
-ui/components/app/whats-new-popup     @MetaMask/core-extension-ux
-ui/css                                @MetaMask/core-extension-ux
-ui/pages/home                         @MetaMask/core-extension-ux
-ui/pages/core                         @MetaMask/core-extension-ux
-ui/components/multichain/             @MetaMask/core-extension-ux
+ui/components/app/whats-new-popup               @MetaMask/core-extension-ux
+ui/css                                          @MetaMask/core-extension-ux
+ui/pages/home                                   @MetaMask/core-extension-ux
+ui/pages/core                                   @MetaMask/core-extension-ux
+ui/components/multichain/                       @MetaMask/core-extension-ux
+ui/components/app/transaction-list              @MetaMask/core-extension-ux
+ui/components/app/transaction-list-item-details @MetaMask/core-extension-ux
+ui/components/app/transaction-list-item         @MetaMask/core-extension-ux
 
 # Co-owned by accounts and core-extension-ux
 ui/components/multichain/multi-srp/              @MetaMask/accounts-engineers @MetaMask/core-extension-ux

.github/scripts/bundle.sh

@@ -4,6 +4,7 @@
 # * The environment variables used by the `run-build` step in `.github/workflows/run-build.yml`.
 # * The environment variables used by the `publish-release` step in `.github/workflows/publish-release.yml`.
 export APPLE_BETA_CLIENT_ID=""
+export APPLE_EXPERIMENTAL_CLIENT_ID=""
 export APPLE_FLASK_CLIENT_ID=""
 export APPLE_PROD_CLIENT_ID=""
 export CONTENTFUL_ACCESS_SPACE_ID=""
@@ -17,9 +18,11 @@ export FIREBASE_MESSAGING_SENDER_ID=""
 export FIREBASE_PROJECT_ID=""
 export FIREBASE_STORAGE_BUCKET=""
 export GOOGLE_BETA_CLIENT_ID=""
+export GOOGLE_EXPERIMENTAL_CLIENT_ID=""
 export GOOGLE_FLASK_CLIENT_ID=""
 export GOOGLE_PROD_CLIENT_ID=""
 export INFURA_BETA_PROJECT_ID=""
+export INFURA_EXPERIMENTAL_PROJECT_ID=""
 export INFURA_FLASK_PROJECT_ID=""
 export INFURA_PROD_PROJECT_ID=""
 export QUICKNODE_ARBITRUM_URL=""
@@ -30,6 +33,7 @@ export QUICKNODE_MAINNET_URL=""
 export QUICKNODE_OPTIMISM_URL=""
 export QUICKNODE_POLYGON_URL=""
 export SEGMENT_BETA_WRITE_KEY=""
+export SEGMENT_EXPERIMENTAL_WRITE_KEY=""
 export SEGMENT_FLASK_WRITE_KEY=""
 export SEGMENT_PROD_WRITE_KEY=""
 export ANALYTICS_DATA_DELETION_SOURCE_ID=""

.github/scripts/close-release-bug-report-issue.ts

@@ -33,7 +33,7 @@ async function main(): Promise<void> {
 
   // Extract semver version number from the branch name
   const releaseVersionNumberMatch = branchName.match(
-    /^(?:Version-v|release\/)(\d+\.\d+\.\d+)$/,
+    /^release\/(\d+\.\d+\.\d+)$/,
   );
 
   if (!releaseVersionNumberMatch) {

.github/scripts/extract-semver.sh

@@ -4,13 +4,11 @@ set -euo pipefail
 
 ref_name="${GITHUB_REF#refs/heads/}"
 
-# Extract semver based on prefix
-if [[ "$ref_name" == Version-v* ]]; then
-  semver="${ref_name#Version-v}"
-elif [[ "$ref_name" == release/* ]]; then
+# Extract semver
+if [[ "$ref_name" == release/* ]]; then
   semver="${ref_name#release/}"
 else
-  echo "Error: Branch name must be Version-vX.Y.Z or release/X.Y.Z where X, Y, Z are numbers. Got: $ref_name" >&2
+  echo "Error: Branch name must be release/X.Y.Z where X, Y, Z are numbers. Got: $ref_name" >&2
   exit 1
 fi
 

.github/scripts/get-next-semver-version.sh

@@ -9,14 +9,11 @@ then
   exit 0
 fi
 
-# Pattern for Version-vX.Y.Z branches
-VERSION_BRANCHES_VERSION_V=$(git branch -r | grep -o 'Version-v[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
-# Default pattern for release/x.y.z branches
-VERSION_BRANCHES_RELEASE=$(git branch -r | grep -o 'release/[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
+# Get the highest version from release branches
+VERSION_BRANCHES=$(git branch -r | grep -o 'release/[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sort --version-sort | tail -n 1)
 
 # Compare versions and keep the highest one
-HIGHEST_VERSION=$(printf "%s\n%s" "$VERSION_BRANCHES_VERSION_V" "$VERSION_BRANCHES_RELEASE" | sort --version-sort | tail -n 1)
-echo "HIGHEST_VERSION=${HIGHEST_VERSION}, VERSION_BRANCHES_VERSION_V=${VERSION_BRANCHES_VERSION_V}, VERSION_BRANCHES_RELEASE=${VERSION_BRANCHES_RELEASE}"
+HIGHEST_VERSION=$(printf "%s" "$VERSION_BRANCHES" | sort --version-sort | tail -n 1)
 
 # Increment the minor version of the highest version found and reset the patch version to 0
 NEXT_VERSION=$(echo "$HIGHEST_VERSION" | awk -F. -v OFS=. '{$2++; $3=0; print}')

.github/scripts/post-nightly-builds.ts

@@ -12,6 +12,7 @@ async function main() {
     SLACK_NIGHTLY_BUILDS_WEBHOOK_URL:
       process.env.SLACK_NIGHTLY_BUILDS_WEBHOOK_URL || '',
     BUILD_STATUS: process.env.BUILD_STATUS || 'unknown',
+    BUILD_VERSION: process.env.BUILD_VERSION || '0',
   };
 
   if (!env.RUN_ID) throw new Error('RUN_ID not found');
@@ -41,7 +42,9 @@ async function main() {
   // Handle unknown or invalid status
   console.log(`❓ Unknown build status: ${env.BUILD_STATUS}`);
   console.log('⚠️ Skipping Slack notification due to unknown status');
-  throw new Error(`Invalid BUILD_STATUS: ${env.BUILD_STATUS}. Expected 'success' or 'failure'.`);
+  throw new Error(
+    `Invalid BUILD_STATUS: ${env.BUILD_STATUS}. Expected 'success' or 'failure'.`,
+  );
 }
 
 async function postFailureNotification(env: any, version: string) {
@@ -182,14 +185,16 @@ async function postFailureNotification(env: any, version: string) {
 }
 
 async function postSuccessNotification(env: any, version: string) {
+  const experimentalVersion = `${version}-experimental.${env.BUILD_VERSION}`;
+
   const buildMap = {
     builds: {
       chrome: `${env.HOST_URL}/build-dist-browserify/builds/metamask-chrome-${version}.zip`,
       firefox: `${env.HOST_URL}/build-dist-mv2-browserify/builds/metamask-firefox-${version}.zip`,
     },
     'builds (experimental)': {
-      chrome: `${env.HOST_URL}/build-experimental-browserify/builds/metamask-experimental-chrome-${version}.zip`,
-      firefox: `${env.HOST_URL}/build-experimental-mv2-browserify/builds/metamask-experimental-firefox-${version}.zip`,
+      chrome: `${env.HOST_URL}/build-experimental-browserify/builds/metamask-experimental-chrome-${experimentalVersion}.zip`,
+      firefox: `${env.HOST_URL}/build-experimental-mv2-browserify/builds/metamask-experimental-firefox-${experimentalVersion}.zip`,
     },
   };
 

.github/workflows/auto-create-release-pr.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   extract:
-    if: ${{ github.ref_type == 'branch' && (startsWith(github.ref, 'refs/heads/Version-v') || startsWith(github.ref, 'refs/heads/release/')) }}
+    if: ${{ github.ref_type == 'branch' && startsWith(github.ref, 'refs/heads/release/') }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
     outputs:

.github/workflows/auto-update-pr-targeting-release.yml

@@ -3,7 +3,6 @@ name: Auto-update for PR targeting release branch
 on:
   pull_request:
     branches:
-      - Version-v*
       - release/*
 
 jobs:

.github/workflows/check-attributions.yml

@@ -3,7 +3,6 @@ name: Check Attributions
 on:
   push:
     branches:
-      - Version-v*
       - release/*
 
 jobs: