From e24997d67c56d29a4766f9a053d9fb17048e059a Mon Sep 17 00:00:00 2001 From: ryanml Date: Wed, 27 Jul 2022 05:35:05 -0700 Subject: [PATCH] Sync `master` with `develop` (#15355) * Version v10.18.1 * Update changelog for v10.18.1 * Metrics adjustments (#15313) * Don't send errors to sentry if users have not opted-in to participate in metametrics * Don't capture opt-out metrics * Move the metrics-opt in screen to immediately after the welcome screen * Ensure that global.getSentryState is set in the background * Fix e2e tests after rearranging onboardin flow * Fix unit tests * More e2e test fixes * Remove unnecessary wrappers around capture exception Co-authored-by: MetaMask Bot Co-authored-by: Dan Miller --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e058fbf..c961f703f 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] +## [10.18.1] +### Changed +- Move the metrics opt-in screen to the second screen of the onboarding flow ([#15313](https://github.com/MetaMask/metamask-extension/pull/15313)) + ## [10.18.0] ### Added - Add setApprovalForAll confirmation view so granted permissions are displayed in a digested manner, instead of a simple contract interaction([#15010](https://github.com/MetaMask/metamask-extension/pull/15010)) @@ -3084,7 +3088,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.18.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.18.1...HEAD +[10.18.1]: https://github.com/MetaMask/metamask-extension/compare/v10.18.0...v10.18.1 [10.18.0]: https://github.com/MetaMask/metamask-extension/compare/v10.17.0...v10.18.0 [10.17.0]: https://github.com/MetaMask/metamask-extension/compare/v10.16.2...v10.17.0 [10.16.2]: https://github.com/MetaMask/metamask-extension/compare/v10.16.1...v10.16.2 diff --git a/package.json b/package.json index 14ba5c74d..819a7d227 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.18.0", + "version": "10.18.1", "private": true, "repository": { "type": "git",