From 8d721ab0bd767e6d12f9940605d9f5f6083984a8 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 12 Jun 2024 09:21:10 -0230 Subject: [PATCH 1/4] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66d512f898c1..e196574c55e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "11.16.9", + "version": "11.16.10", "private": true, "repository": { "type": "git", From 46a141eeaf51472272d792e46d7d80be3c65fd87 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 12 Jun 2024 09:17:34 -0230 Subject: [PATCH 2/4] fix: Capture Segment errors during initialization We were submitting Segment events in the MetaMetrics constructor without cathing errors. This was the sole place where we failed to catch errors resulting from Segment calls. Fixes #25244 --- app/scripts/controllers/metametrics.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js index 73e9fd9609df..c79733e0b0bd 100644 --- a/app/scripts/controllers/metametrics.js +++ b/app/scripts/controllers/metametrics.js @@ -188,7 +188,11 @@ export default class MetaMetricsController { // Code below submits any pending segmentApiCalls to Segment if/when the controller is re-instantiated if (isManifestV3) { Object.values(segmentApiCalls).forEach(({ eventType, payload }) => { - this._submitSegmentAPICall(eventType, payload); + try { + this._submitSegmentAPICall(eventType, payload); + } catch (error) { + this._captureException(error); + } }); } From ee0b90df12824f63dc0f909a7e6cecd865dafed6 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 12 Jun 2024 09:22:20 -0230 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9674ade44ef2..bded30067fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [11.16.10] +### Fixed +- Capture Segment errors during initialization ([#25253](https://github.com/MetaMask/metamask-extension/pull/25253)) + ## [11.16.9] ### Fixed - Fix an issue where Snaps would be unable to decrypt older state ([#25172](https://github.com/MetaMask/metamask-extension/pull/25172)) @@ -4804,7 +4808,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...HEAD +[11.16.10]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...v11.16.10 [11.16.9]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...v11.16.9 [11.16.8]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v11.16.8 [11.16.7]: https://github.com/MetaMask/metamask-extension/compare/v11.16.6...v11.16.7 From 87d2795a7cb33e0d917f384f41c4190bebcc7b3d Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 11 Jun 2024 13:45:26 +0200 Subject: [PATCH 4/4] fix: Disable MV3 for MV2 Flask production build (#25209) ## **Description** Disables MV3 for the MV2 Flask production build. This was seemingly missed when setting up the CI to build for production and caused problems with the latest build submitted to Firefox. Also updates the release script to use MV2 builds for Firefox. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25209?quickstart=1) --- .circleci/config.yml | 2 +- .circleci/scripts/release-create-gh-release.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f4b824285a19..a4d8905f9fe5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -749,7 +749,7 @@ jobs: steps: - run: name: build:prod - command: yarn build --build-type flask prod + command: ENABLE_MV3=false yarn build --build-type flask prod - run: name: build:debug command: find dist/ -type f -exec md5sum {} \; | sort -k 2 diff --git a/.circleci/scripts/release-create-gh-release.sh b/.circleci/scripts/release-create-gh-release.sh index e138e20c5b59..37a654798b9f 100755 --- a/.circleci/scripts/release-create-gh-release.sh +++ b/.circleci/scripts/release-create-gh-release.sh @@ -69,9 +69,9 @@ then release_body="$(awk -v version="${tag##v}" -f .circleci/scripts/show-changelog.awk CHANGELOG.md)" hub release create \ --attach builds/metamask-chrome-*.zip \ - --attach builds/metamask-firefox-*.zip \ + --attach builds-mv2/metamask-firefox-*.zip \ --attach builds-flask/metamask-flask-chrome-*.zip \ - --attach builds-flask/metamask-flask-firefox-*.zip \ + --attach builds-flask-mv2/metamask-flask-firefox-*.zip \ --attach builds-mmi/metamask-mmi-chrome-*.zip \ --attach builds-mmi/metamask-mmi-firefox-*.zip \ --message "Version ${tag##v}" \