Merge branch 'develop' into feat/bug-report-labeling

.github/CODEOWNERS

@@ -24,6 +24,17 @@ lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-c
 # should be brought to the attention of engineering leadership for
 # discussion
 .circleci/                           @MetaMask/library-admins @kumavis @brad-decker
+
+# The privacy-snapshot.json file includes a list of all hosts that the
+# extension communicates with during the E2E test suite runs. It is not a
+# complete list of all hosts that the extension communicates with until the E2E
+# test suite has full coverage. Anytime the privacy-snapshot file changes,
+# extra scrutiny should be applied to the pull request to confirm that it does
+# not broaden the number of hosts the extension communicates with without also
+# providing a path for users to avoid that communication. MetaMask strives to
+# make all such communication opt IN versus opt OUT.
+privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
+
 # The CODEOWNERS file constitutes an agreement amongst organization
 # admins and maintainers to restrict approval capabilities to a subset
 # of contributors. Modifications to this file result in a modification of

.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch

@@ -1,3 +1,16 @@
+diff --git a/src/kernelTemplate.js b/src/kernelTemplate.js
+index de8d73048b7bb7c4e74009b5c85ad919fe197ef0..e5bcb987cff013def8b2e8c767eb75a57ea0bd7a 100644
+--- a/src/kernelTemplate.js
++++ b/src/kernelTemplate.js
+@@ -60,6 +60,8 @@
+       errorTaming: 'unsafe',
+       // shows the full call stack
+       stackFiltering: 'verbose',
++      // prevents most common override mistake cases from tripping up users
++      overrideTaming: 'severe',
+     }
+
+     lockdown(lockdownOptions)
 diff --git a/src/loadPolicy.js b/src/loadPolicy.js
 index ef71923f9282d6a5e9f74e6ec6fa0516f28f508b..0118fda7e1b0fa461ec01ceff8d7112d072f3dfb 100644
 --- a/src/loadPolicy.js

.yarnrc.yml

@@ -98,6 +98,14 @@ npmAuditIgnoreAdvisories:
   # by MetaMask
   - 'ripple-lib (deprecation)'
 
+  # Brought in by ethereumjs-utils, which is used in the extension and in many
+  # other dependencies. At the time of this exclusion, the extension has three
+  # old versions of ethereumjs-utils which should be upgraded to
+  # @ethereumjs/utils throughout our owned repositories. However even doing
+  # that may be insufficient due to dependencies we do not own still relying
+  # upon old versions of ethereumjs-utils.
+  - 'ethereum-cryptography (deprecation)'
+
 npmRegistries:
   'https://npm.pkg.github.com':
     npmAlwaysAuth: true

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.1.2]
+### Fixed
+- Prevent crashes for users that have NFTs without an image and/r limited image data ([#21176](https://github.com/MetaMask/metamask-extension/pull/21176))
+
+## [11.1.1]
+### Fixed
+- Ensure NFT settings notice in the NFT import modal is shown and hidden correctly, and that the modal is hidden when clicking the link to settings ([#21100](https://github.com/MetaMask/metamask-extension/pull/21100))
+- Modify settings toggle copy to more accurately describe behaviour ([#21109](https://github.com/MetaMask/metamask-extension/pull/21109))
+
 ## [11.1.0]
 ### Added
 - What's New popup on dropping of support for Ledger support for firefox ([#19498](https://github.com/MetaMask/metamask-extension/pull/19498))
@@ -4035,7 +4044,9 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.1.2...HEAD
+[11.1.2]: https://github.com/MetaMask/metamask-extension/compare/v11.1.1...v11.1.2
+[11.1.1]: https://github.com/MetaMask/metamask-extension/compare/v11.1.0...v11.1.1
 [11.1.0]: https://github.com/MetaMask/metamask-extension/compare/v11.0.0...v11.1.0
 [11.0.0]: https://github.com/MetaMask/metamask-extension/compare/v10.35.1...v11.0.0
 [10.35.1]: https://github.com/MetaMask/metamask-extension/compare/v10.35.0...v10.35.1