Merge branch 'develop' into 240213-apply-token-detection-controller

MetaMask · Mar 13, 2024 · d038ff9 · d038ff9
2 parents 5f7ae9d + 4fdbdb7
commit d038ff9
Show file tree

Hide file tree

Showing 61 changed files with 1,552 additions and 1,116 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ executors:
     resource_class: small
     environment:
       FONTCONFIG_PATH: /etc/fonts
-      NODE_OPTIONS: --max_old_space_size=1024
+      NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-medium:
     docker:
       - image: cimg/node:20.11-browsers
@@ -377,7 +377,7 @@ jobs:
           command: .circleci/scripts/release-create-release-pr.sh
 
   prep-deps:
-    executor: node-browsers-small
+    executor: node-browsers-medium
     steps:
       - run: *shallow-git-clone
       - run:

diff --git a/.github/workflows/validate-conventional-commits.yml b/.github/workflows/validate-conventional-commits.yml
@@ -1,6 +1,8 @@
 name: Validate Conventional Commit Title
 on:
   pull_request:
+    branches:
+      - develop
     types: [opened, edited, reopened]
 
 jobs:

diff --git a/.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch b/.yarn/patches/ethereumjs-util-npm-5.2.1-72b39f4e7e.patch
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/images/portfolio-v2-whatsnew-banner.png b/app/images/portfolio-v2-whatsnew-banner.png
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
@@ -1,5 +1,5 @@
 import { ObservableStore } from '@metamask/obs-store';
-import { normalize as normalizeAddress } from 'eth-sig-util';
+import { normalize as normalizeAddress } from '@metamask/eth-sig-util';
 import {
   CHAIN_IDS,
   IPFS_DEFAULT_GATEWAY_URL,

diff --git a/app/scripts/lib/ppom/ppom-middleware.ts b/app/scripts/lib/ppom/ppom-middleware.ts
@@ -23,6 +23,7 @@ const CONFIRMATION_METHODS = Object.freeze([
 export const SUPPORTED_CHAIN_IDS: string[] = [
   CHAIN_IDS.ARBITRUM,
   CHAIN_IDS.AVALANCHE,
+  CHAIN_IDS.BASE,
   CHAIN_IDS.BSC,
   CHAIN_IDS.LINEA_MAINNET,
   CHAIN_IDS.MAINNET,

diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
@@ -271,6 +271,7 @@ export const SENTRY_BACKGROUND_STATE = {
   SnapsRegistry: {
     database: false,
     lastUpdated: false,
+    databaseUnavailable: false,
   },
   SubjectMetadataController: {
     subjectMetadata: false,

diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
@@ -716,12 +716,11 @@ function getUniqueId(
   eventName: TransactionMetaMetricsEvent,
   transactionId: string,
 ) {
-  const isSubmitted = [
-    TransactionMetaMetricsEvent.finalized,
-    TransactionMetaMetricsEvent.submitted,
-  ].includes(eventName);
+  const isFinalizedOrSubmitted =
+    eventName === TransactionMetaMetricsEvent.finalized ||
+    eventName === TransactionMetaMetricsEvent.submitted;
   const uniqueIdentifier = `transaction-${
-    isSubmitted ? 'submitted' : 'added'
+    isFinalizedOrSubmitted ? 'submitted' : 'added'
   }-${transactionId}`;
 
   return uniqueIdentifier;

diff --git a/builds.yml b/builds.yml
@@ -27,7 +27,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.2/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
     # Main build uses the default browser manifest
     manifestOverrides: false
@@ -65,7 +65,7 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.2/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
@@ -86,7 +86,7 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.2/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
@@ -107,7 +107,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.2/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/5.0.3/index.html
       - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
       - SUPPORT_LINK: https://mmi-support.zendesk.com/hc/en-us
       - SUPPORT_REQUEST_LINK: https://mmi-support.zendesk.com/hc/en-us/requests/new

diff --git a/docs/assets/approval_template.png b/docs/assets/approval_template.png
diff --git a/docs/assets/confirmation.png b/docs/assets/confirmation.png
diff --git a/docs/assets/success_approval.png b/docs/assets/success_approval.png
diff --git a/docs/assets/success_approval_templates.png b/docs/assets/success_approval_templates.png