Merge pull request #16504 from MetaMask/Version-v10.22.1

Version v10.22.1 RC

.circleci/config.yml

@@ -90,9 +90,6 @@ workflows:
       - test-e2e-firefox-snaps:
           requires:
             - prep-build-test-flask
-      - test-e2e-chrome-mv3:
-          requires:
-            - prep-build-test-mv3
       - test-unit:
           requires:
             - prep-deps
@@ -389,7 +386,7 @@ jobs:
             - builds-test
 
   prep-build-storybook:
-    executor: node-browsers-medium-plus
+    executor: node-browsers
     steps:
       - checkout
       - attach_workspace:
@@ -540,33 +537,6 @@ jobs:
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
-
-  test-e2e-chrome-mv3:
-    executor: node-browsers
-    steps:
-      - checkout
-      - run:
-          name: Re-Install Chrome
-          command: ./.circleci/scripts/chrome-install.sh
-      - attach_workspace:
-          at: .
-      - run:
-          name: Move test build to dist
-          command: mv ./dist-test-mv3 ./dist
-      - run:
-          name: Move test zips to builds
-          command: mv ./builds-test-mv3 ./builds
-      - run:
-          name: test:e2e:chrome
-          command: |
-            if .circleci/scripts/test-run-e2e.sh
-            then
-              yarn test:e2e:chrome --retries 2 || echo "Temporarily suppressing MV3 e2e test failures"
-            fi
-          no_output_timeout: 20m
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
 
   test-e2e-firefox-snaps:
     executor: node-browsers
@@ -674,7 +644,7 @@ jobs:
           root: .
           paths:
             - test-artifacts
-
+    
   user-actions-benchmark:
     executor: node-browsers-medium-plus
     steps:
@@ -727,9 +697,6 @@ jobs:
       - run:
           name: Run page load benchmark
           command: yarn mv3:stats:chrome --out test-artifacts/chrome/mv3
-      - run:
-          name: Install jq
-          command: sudo apt install jq -y
       - run:
           name: Record bundle size at commit
           command: ./.circleci/scripts/bundle-stats-commit.sh

.circleci/scripts/bundle-stats-commit.sh

@@ -50,28 +50,6 @@ cp temp/stats/bundle_size_data.temp.js temp/stats/bundle_size_data.js
 
 echo " }" >> temp/stats/bundle_size_data.js
 
-if [ -f temp/stats/bundle_size_data.json ]; then
-  # copy bundle_size_data.json in bundle_size_data.temp.json without last 2 lines
-  head -$(($(wc -l < temp/stats/bundle_size_data.json) - 2)) temp/stats/bundle_size_data.json > bundle_size_stats.temp.json
-
-  {
-    echo "},";
-    echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
-    echo "}";
-  } >> bundle_size_stats.temp.json
-else
-  {
-    echo "{";
-    echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
-    echo "}";
-  } > bundle_size_stats.temp.json
-fi
-
-jq . bundle_size_stats.temp.json > temp/stats/bundle_size_data.json
-rm bundle_size_stats.temp.json
-
 cd temp
 
 git add .

.circleci/scripts/chrome-install.sh

@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
-CHROME_VERSION='107.0.5304.87-1'
+CHROME_VERSION='105.0.5195.102-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='07b443bc1382431da84f6812b7e19f1149aa195fb8b3d28834630cc5964fb9d12124abbf4ec1c98d5c0513cdf16c2a3f16a74518c984aaf57ca418b3cd36a4e2'
+CHROME_BINARY_SHA512SUM='3a1f2267ae009424ee8c623c3f78760d969dc1f3acb490e103e667d11e52cf0d955f201aeb3892dd41f33e68625af77ca5a20244b5be718f794eccb07a4c0413'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 

.github/workflows/cla.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   CLABot:
     if: github.event_name == 'pull_request_target' || contains(github.event.comment.html_url, '/pull/')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: write

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read

.github/workflows/crowdin_action.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   synchronize-with-crowdin:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
 

.iyarc

@@ -1,2 +1,6 @@
 # improved-yarn-audit advisory exclusions
+GHSA-93q8-gq69-wqmw
 GHSA-257v-vj4p-3w2h
+GHSA-wm7h-9275-46v2
+GHSA-pfrx-2q88-qq97
+GHSA-qm95-pgcg-qqfq

.storybook/test-data.js

@@ -1383,6 +1383,12 @@ const state = {
         },
       },
     },
+    threeBoxSyncingAllowed: false,
+    showRestorePrompt: true,
+    threeBoxLastUpdated: 0,
+    threeBoxAddress: null,
+    threeBoxSynced: false,
+    threeBoxDisabled: false,
     swapsState: {
       quotes: {},
       fetchParams: null,
@@ -1473,6 +1479,8 @@ const state = {
     },
     networksTabSelectedRpcUrl: '',
     loadingMethodData: false,
+    show3BoxModalAfterImport: false,
+    threeBoxLastUpdated: null,
     requestAccountTabs: {},
     openMetaMaskTabs: {},
     currentWindowTab: {},

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.22.1]
+### Changed
+- Temporarily revert v10.22.0
+
+### Fixed
+- Prevent user from editing a contract interaction initiated by a dapp ([#16498](https://github.com/MetaMask/metamask-extension/pull/16498))
+
 ## [10.22.0]
 ### Added
 - Add Aurora network to the Popular Custom Network list ([#16039](https://github.com/MetaMask/metamask-extension/pull/16039))
@@ -3289,7 +3296,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.22.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.22.1...HEAD
+[10.22.1]: https://github.com/MetaMask/metamask-extension/compare/v10.22.0...v10.22.1
 [10.22.0]: https://github.com/MetaMask/metamask-extension/compare/v10.21.2...v10.22.0
 [10.21.2]: https://github.com/MetaMask/metamask-extension/compare/v10.21.1...v10.21.2
 [10.21.1]: https://github.com/MetaMask/metamask-extension/compare/v10.21.0...v10.21.1