Merge pull request #12569 from MetaMask/Version-v10.4.1

Version v10.4.1 RC

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.4.1]
+### Changed
+- [#12515](https://github.com/MetaMask/metamask-extension/pull/12515): Updating 'Learn more' link location in dapp connection flow
+
 ## [10.4.0]
 ### Added
 - [#12400](https://github.com/MetaMask/metamask-extension/pull/12400): Add text to Restore Account screen noting current wallet replacement
@@ -2534,7 +2538,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.4.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.4.1...HEAD
+[10.4.1]: https://github.com/MetaMask/metamask-extension/compare/v10.4.0...v10.4.1
 [10.4.0]: https://github.com/MetaMask/metamask-extension/compare/v10.3.0...v10.4.0
 [10.3.0]: https://github.com/MetaMask/metamask-extension/compare/v10.2.2...v10.3.0
 [10.2.2]: https://github.com/MetaMask/metamask-extension/compare/v10.2.1...v10.2.2

app/scripts/lockdown-more.js

@@ -83,7 +83,7 @@ try {
   })();
 } catch (error) {
   console.error('Protecting intrinsics failed:', error);
-  if (globalThis?.sentry.captureException) {
+  if (globalThis.sentry && globalThis.sentry.captureException) {
     globalThis.sentry.captureException(
       new Error(`Protecting intrinsics failed: ${error.message}`),
     );

development/build/README.md

@@ -48,10 +48,10 @@ Options:
                       Defaults to `false` if the entry task is `dev` or
                       `testDev`, and `true` otherwise.
                                                    [boolean] [default: <varies>]
-  --omit-lockdown     Whether to omit SES lockdown files from the extension
+  --lockdown          Whether to include SES lockdown files in the extension
-                      bundle. Useful when linking dependencies that are
+                      bundle. Setting this to `false` is useful e.g. when
-                      incompatible with lockdown.
+                      linking dependencies that are incompatible with lockdown.
-                                                      [boolean] [default: false]
+                                                       [boolean] [default: true]
   --skip-stats        Whether to refrain from logging build progress. Mostly
                       used internally.
                                                       [boolean] [default: false]

development/build/index.js

@@ -137,21 +137,21 @@ function parseArgv() {
   const NamedArgs = {
     BuildType: 'build-type',
     LintFenceFiles: 'lint-fence-files',
-    OmitLockdown: 'omit-lockdown',
+    Lockdown: 'lockdown',
     SkipStats: 'skip-stats',
   };
 
   const argv = minimist(process.argv.slice(2), {
     boolean: [
       NamedArgs.LintFenceFiles,
-      NamedArgs.OmitLockdown,
+      NamedArgs.Lockdown,
       NamedArgs.SkipStats,
     ],
     string: [NamedArgs.BuildType],
     default: {
       [NamedArgs.BuildType]: BuildType.main,
       [NamedArgs.LintFenceFiles]: true,
-      [NamedArgs.OmitLockdown]: false,
+      [NamedArgs.Lockdown]: true,
       [NamedArgs.SkipStats]: false,
     },
   });
@@ -183,7 +183,7 @@ function parseArgv() {
     buildType,
     entryTask,
     isLavaMoat: process.argv[0].includes('lavamoat'),
-    shouldIncludeLockdown: argv[NamedArgs.OmitLockdown],
+    shouldIncludeLockdown: argv[NamedArgs.Lockdown],
     shouldLintFenceFiles,
     skipStats: argv[NamedArgs.SkipStats],
   };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "private": true,
   "repository": {
     "type": "git",

ui/components/app/permissions-connect-footer/permissions-connect-footer.component.js

@@ -17,7 +17,7 @@ export default class PermissionsConnectFooter extends Component {
             onClick={() => {
               global.platform.openTab({
                 url:
-                  'https://medium.com/metamask/privacy-mode-is-now-enabled-by-default-1c1c957f4d57',
+                  'https://metamask.zendesk.com/hc/en-us/articles/4405506066331-User-guide-Dapps',
               });
             }}
           >