Merge branch 'develop' into 17191-onboarding-unit-tests-privacy-settings

MetaMask · Mar 30, 2023 · 1e6d9f8 · 1e6d9f8
2 parents 81f4621 + 06fba70
commit 1e6d9f8
Show file tree

Hide file tree

Showing 47 changed files with 1,452 additions and 390 deletions.
diff --git 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.27.0]
+### Added
+- feat: add the ConsenSys zkEVM (Linea) as a default network ([#17875](https://github.com/MetaMask/metamask-extension/pull/17875))
+
 ## [10.26.2]
 ### Changed
 - Sign in with Ethereum: re-enable warning UI for mismatched domains / disable domain binding ([#18200](https://github.com/MetaMask/metamask-extension/pull/18200))
@@ -3536,7 +3540,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.26.2...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.27.0...HEAD
+[10.27.0]: https://github.com/MetaMask/metamask-extension/compare/v10.26.2...v10.27.0
 [10.26.2]: https://github.com/MetaMask/metamask-extension/compare/v10.26.1...v10.26.2
 [10.26.1]: https://github.com/MetaMask/metamask-extension/compare/v10.26.0...v10.26.1
 [10.26.0]: https://github.com/MetaMask/metamask-extension/compare/v10.25.0...v10.26.0

diff --git a/README.md b/README.md
@@ -142,6 +142,7 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
 - [How to use the TREZOR emulator](./docs/trezor-emulator.md)
 - [Developing on MetaMask](./development/README.md)
 - [How to generate a visualization of this repository's development](./development/gource-viz.sh)
+- [How to add new confirmations](./docs/confirmations.md)
 
 ## Dapp Developer Resources
 

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/manifest/v2/_base.json b/app/manifest/v2/_base.json
@@ -60,5 +60,19 @@
   },
   "manifest_version": 2,
   "name": "__MSG_appName__",
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://*.codefi.network/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "activeTab",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ],
   "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/v2/chrome.json b/app/manifest/v2/chrome.json
@@ -4,19 +4,5 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  "minimum_chrome_version": "80"
 }
diff --git a/app/manifest/v2/firefox.json b/app/manifest/v2/firefox.json
@@ -4,20 +4,5 @@
       "id": "[email protected]",
       "strict_min_version": "78.0"
     }
-  },
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "tabs",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  }
 }
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
@@ -65,5 +65,15 @@
   },
   "manifest_version": 3,
   "name": "__MSG_appName__",
+  "permissions": [
+    "activeTab",
+    "alarms",
+    "clipboardWrite",
+    "notifications",
+    "scripting",
+    "storage",
+    "unlimitedStorage",
+    "webRequest"
+  ],
   "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
@@ -6,19 +6,5 @@
     "matches": ["https://metamask.io/*"],
     "ids": ["*"]
   },
-  "minimum_chrome_version": "80",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  "minimum_chrome_version": "80"
 }
diff --git a/app/manifest/v3/firefox.json b/app/manifest/v3/firefox.json
@@ -22,20 +22,5 @@
     "default_title": "MetaMask",
     "default_popup": "popup.html"
   },
-  "manifest_version": 2,
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://*.codefi.network/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "tabs",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ]
+  "manifest_version": 2
 }