Version v10.21.0 RC

.circleci/config.yml

@@ -837,6 +837,8 @@ jobs:
             - .nyc_output
             - coverage
             - jest-coverage
+      - store_test_results:
+          path: test/test-results/junit.xml
   test-unit-global:
     executor: node-browsers
     steps:

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

@@ -40,25 +40,21 @@ git config --global user.name "MetaMask Bot"
 
 git clone [email protected]:MetaMask/extension_bundlesize_stats.git temp
 
-if [[ -f "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json" ]]
-then
-    printf 'Bundle size of the commit is already recorded'
-    cd ..
-    rm -rf temp
-    exit 0
-fi
-
-cp -R test-artifacts/chrome/mv3/bundle_size_stats.json temp/stats
+{
+    echo " '${CIRCLE_SHA1}': ";
+    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    echo ", ";
+} >> temp/stats/bundle_size_data.temp.js
 
-echo " bundle_size_stats-${CIRCLE_SHA1}.json" >> temp/stats/fileList.txt
+cp temp/stats/bundle_size_data.temp.js temp/stats/bundle_size_data.js
 
-mv temp/stats/bundle_size_stats.json "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json"
+echo " }" >> temp/stats/bundle_size_data.js
 
 cd temp
 
 git add .
 
-git commit --message "Bundle size at commit: ${CIRCLE_SHA1}"
+git commit --message "Adding bundle size at commit: ${CIRCLE_SHA1}"
 
 repo_slug="$CIRCLE_PROJECT_USERNAME/extension_bundlesize_stats"
 git push "https://$GITHUB_TOKEN_USER:[email protected]/$repo_slug" main

.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='103.0.5060.53-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='36f4e79f46cb71c1431dccf1489f5f8e89d35204a717a4618c7f6f638123ddc2b37bd5cbd00498be8f84c7713149f2faa447cb6da3518be1cb9703e99d110e1a'
+CHROME_BINARY_SHA512SUM='3a1f2267ae009424ee8c623c3f78760d969dc1f3acb490e103e667d11e52cf0d955f201aeb3892dd41f33e68625af77ca5a20244b5be718f794eccb07a4c0413'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 

.eslintrc.js

@@ -1,8 +1,11 @@
 const path = require('path');
+
 const { version: reactVersion } = require('react/package.json');
 
 module.exports = {
   root: true,
+  // Suggested addition from the storybook 6.5 update
+  extends: ['plugin:storybook/recommended'],
   // Ignore files which are also in .prettierignore
   ignorePatterns: [
     'app/vendor/**',
@@ -12,6 +15,7 @@ module.exports = {
     'development/ts-migration-dashboard/build/**',
     'dist/**/*',
     'node_modules/**/*',
+    'jest-coverage/**/*',
   ],
   overrides: [
     /**
@@ -22,7 +26,6 @@ module.exports = {
      * because we do not allow a file to use two different styles for specifying
      * imports and exports (however theoretically possible it may be).
      */
-
     {
       /**
        * Modules (CommonJS module syntax)
@@ -128,11 +131,9 @@ module.exports = {
         'import/namespace': 'off',
         'import/default': 'off',
         'import/no-named-as-default-member': 'off',
-
         // Disabled due to incompatibility with Record<string, unknown>.
         // See: <https://github.com/Microsoft/TypeScript/issues/15300#issuecomment-702872440>
         '@typescript-eslint/consistent-type-definitions': 'off',
-
         // Modified to include the 'ignoreRestSiblings' option.
         // TODO: Migrate this rule change back into `@metamask/eslint-config`
         '@typescript-eslint/no-unused-vars': [
@@ -165,7 +166,6 @@ module.exports = {
         sourceType: 'script',
       },
     },
-
     /**
      * == Everything else ==
      *
@@ -198,7 +198,10 @@ module.exports = {
         'react/jsx-boolean-value': 'error',
         'react/jsx-curly-brace-presence': [
           'error',
-          { props: 'never', children: 'never' },
+          {
+            props: 'never',
+            children: 'never',
+          },
         ],
         'react/no-deprecated': 'error',
         'react/default-props-match-prop-types': 'error',
@@ -256,16 +259,18 @@ module.exports = {
       files: [
         '**/__snapshots__/*.snap',
         'app/scripts/controllers/network/**/*.test.js',
+        'app/scripts/controllers/network/provider-api-tests/*.js',
         'app/scripts/controllers/permissions/**/*.test.js',
         'app/scripts/lib/**/*.test.js',
         'app/scripts/migrations/*.test.js',
         'app/scripts/platforms/*.test.js',
         'development/**/*.test.js',
         'shared/**/*.test.js',
-        'test/jest/*.js',
         'test/helpers/*.js',
+        'test/jest/*.js',
         'ui/**/*.test.js',
         'ui/__mocks__/*.js',
+        'shared/lib/error-utils.test.js',
       ],
       extends: ['@metamask/eslint-config-jest'],
       parserOptions: {
@@ -276,23 +281,33 @@ module.exports = {
         'import/named': 'off',
         'jest/no-large-snapshots': [
           'error',
-          { maxSize: 50, inlineMaxSize: 50 },
+          {
+            maxSize: 50,
+            inlineMaxSize: 50,
+          },
         ],
         'jest/no-restricted-matchers': 'off',
+
         /**
          * jest/prefer-to-be is a new rule that was disabled to reduce churn
          * when upgrading eslint. It should be considered for use and enabled
          * in a future PR if agreeable.
          */
         'jest/prefer-to-be': 'off',
+
         /**
          * jest/lowercase-name was renamed to jest/prefer-lowercase-title this
          * change was made to essentially retain the same state as the original
          * eslint-config-jest until it is updated. At which point the following
          * two lines can be deleted.
          */
         'jest/lowercase-name': 'off',
-        'jest/prefer-lowercase-title': ['error', { ignore: ['describe'] }],
+        'jest/prefer-lowercase-title': [
+          'error',
+          {
+            ignore: ['describe'],
+          },
+        ],
       },
     },
     /**
@@ -301,7 +316,12 @@ module.exports = {
     {
       files: ['app/scripts/migrations/*.js', '**/*.stories.js'],
       rules: {
-        'import/no-anonymous-default-export': ['error', { allowObject: true }],
+        'import/no-anonymous-default-export': [
+          'error',
+          {
+            allowObject: true,
+          },
+        ],
       },
     },
     /**
@@ -347,7 +367,13 @@ module.exports = {
     {
       files: ['ui/pages/settings/*.js'],
       rules: {
-        'sort-keys': ['error', 'asc', { natural: true }],
+        'sort-keys': [
+          'error',
+          'asc',
+          {
+            natural: true,
+          },
+        ],
       },
     },
   ],

.gitignore

@@ -53,3 +53,6 @@ notes.txt
 
 # TypeScript
 tsout/
+
+# Test results
+test-results/

.mocharc.js

@@ -7,6 +7,7 @@ module.exports = {
     './app/scripts/platforms/*.test.js',
     './app/scripts/controllers/network/**/*.test.js',
     './app/scripts/controllers/permissions/**/*.test.js',
+    './app/scripts/constants/error-utils.test.js',
   ],
   recursive: true,
   require: ['test/env.js', 'test/setup.js'],

.storybook/__mocks__/webextension-polyfill.js

@@ -1,4 +1,8 @@
 module.exports = {
-    runtime: {},
-  };
+  runtime: {
+    getManifest: () => {
+      return { manifest_version: 2 };
+    }
+  },
+};
 

.storybook/main.js

@@ -2,6 +2,8 @@ const path = require('path');
 
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
+const { generateIconNames } = require('../development/generate-icon-names');
+
 module.exports = {
   stories: [
     '../ui/**/*.stories.js',
@@ -16,14 +18,25 @@ module.exports = {
     './i18n-party-addon/register.js',
     'storybook-dark-mode',
   ],
+  staticDirs: ['../app', './images'],
   // Uses babel.config.js settings and prevents "Missing class properties transform" error
   babel: async (options) => ({ overrides: options.overrides }),
+  // Sets env variables https://storybook.js.org/docs/react/configure/environment-variables/
+  env: async (config) => {
+    return {
+      ...config,
+      // Creates the icon names environment variable for the component-library/icon/icon.js component
+      ICON_NAMES: await generateIconNames(),
+    };
+  },
   webpackFinal: async (config) => {
     config.context = process.cwd();
     config.node = {
       __filename: true,
     };
-    config.resolve.alias['webextension-polyfill'] = require.resolve('./__mocks__/webextension-polyfill.js')
+    config.resolve.alias['webextension-polyfill'] = require.resolve(
+      './__mocks__/webextension-polyfill.js',
+    );
     config.module.strictExportPresence = true;
     config.module.rules.push({
       test: /\.scss$/,

CHANGELOG.md

@@ -6,6 +6,57 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.21.0]
+### Added
+- Add functionality for buying native currency and tokens on Optimism and Arbitrum, using Transak ([#16031](https://github.com/MetaMask/metamask-extension/pull/16031))
+- Add functionality for buying tokens with Wyre ([#15992](https://github.com/MetaMask/metamask-extension/pull/15992))
+- Add functionality for buying tokens with Moonpay ([#15924](https://github.com/MetaMask/metamask-extension/pull/15924))
+- Add functionality for buying tokens with Coinbase Pay and Transak ([#15551](https://github.com/MetaMask/metamask-extension/pull/15551))
+- Add new translations for DE, EL, ES, FR, HI, ID, JA, KO, PT, RU, TL TR, VI and ZH_CN ([#15411](https://github.com/MetaMask/metamask-extension/pull/15411))
+- Add Hardware wallet Buy and Tutorial buttons and update copies ([#14738](https://github.com/MetaMask/metamask-extension/pull/14738))
+- [FLASK] Add support for blocking Snaps by source shasum ([#15830](https://github.com/MetaMask/metamask-extension/pull/15830))
+- [FLASK] Add transaction insights via Snaps ([#15814](https://github.com/MetaMask/metamask-extension/pull/15814))
+
+### Changed
+- Dark Mode: elevate the Theme functionality from Experimental to General Settings ([#15865](https://github.com/MetaMask/metamask-extension/pull/15865))
+- Update Arbitrum symbol from `AETH` to `ETH` ([#15747](https://github.com/MetaMask/metamask-extension/pull/15747))
+- Update warning dialog copy on SetApprovalForAll Confirmation page ([#15744](https://github.com/MetaMask/metamask-extension/pull/15744))
+- Update header display on NFT Approval and SetApprovalForAll Confirmation pages ([#15727](https://github.com/MetaMask/metamask-extension/pull/15727))
+- Bump `@metamask/contract-metadata` from `1.35.0` to `1.36.0` ([#15597](https://github.com/MetaMask/metamask-extension/pull/15597))
+  - Add tokens: ZKP, GTON, PRVG, XCHF, XHT, OGV, veOFV, wOUSD and SUSHI
+  - Fix SVG icons for sETH and sUSD tokens
+  - Add the top NFT contracts on Opensea
+- Enable Add Popular Networks by default for all users ([#16172](https://github.com/MetaMask/metamask-extension/pull/16172))
+- Update `@metamask/controllers` to v31.2.0 ([#16033](https://github.com/MetaMask/metamask-extension/pull/16033))
+- Swaps: replace Rinkeby with Goerli for performing swaps on a testnet ([#15781](https://github.com/MetaMask/metamask-extension/pull/15781))
+- Swaps: only render tooltip component if swap network is disabled ([#15733](https://github.com/MetaMask/metamask-extension/pull/15733))
+- Swaps: use `gasEstimateWithRefund` instead of `gasEstimate` for more precise estimations ([#15968](https://github.com/MetaMask/metamask-extension/pull/15968))
+- Swaps: improve Build Quote page ([#15758](https://github.com/MetaMask/metamask-extension/pull/15758))
+  - Preserve search query for the `Swap from` and `Swap to` form fields
+  - Update placeholder text on `Swap to` and `Swap from` search fields
+  - Update copy on slippage tolerance tooltip
+- [FLASK] `Add snap_getBip32PublicKey` RPC method ([#15889](https://github.com/MetaMask/metamask-extension/pull/15889))
+- **[FLASK] BREAKING:** Remove deprecated snap_getBip44Entropy_* method ([#15889](https://github.com/MetaMask/metamask-extension/pull/15889))
+- [FLASK] Miscellaneous fixes to the Snaps platform ([#15889](https://github.com/MetaMask/metamask-extension/pull/15889))
+
+### Fixed
+- Fix double account creation when using keyboard controls on New Account page ([#15077](https://github.com/MetaMask/metamask-extension/pull/15077))
+- Fix error message getting cut when introducing wrong private key format on Import Account page ([#15940](https://github.com/MetaMask/metamask-extension/pull/15940))
+- Fix edit button not being displayed when sending tx with hex data to a contract on Confirm tx page ([#15812](https://github.com/MetaMask/metamask-extension/pull/15812))
+- Fix incorrect balance asset on Encrypt and Decrypt Request pages ([#15885](https://github.com/MetaMask/metamask-extension/pull/15885))
+- Fix spelling errors and improve grammar for German translation ([#15592](https://github.com/MetaMask/metamask-extension/pull/15592))
+- Fix typos for French translation ([#15735](https://github.com/MetaMask/metamask-extension/pull/15735))
+- Fix incorrect identicon type for Account, by ensuring Blockies is displayed everywhere when enabled instead of Jazzicon ([#15768](https://github.com/MetaMask/metamask-extension/pull/15768))
+- Fix query verification for signatures, by ensuring we skip searching 4byte directory if we don't have a full 4 bytes of data ([#15473](https://github.com/MetaMask/metamask-extension/pull/15473))
+- Fix address resolution to Account name, when editing a tx instead of displaying the hex address ([#15873](https://github.com/MetaMask/metamask-extension/pull/15873))
+- Fix "Get ether from faucet" message, by including the end of the sentence and a full stop ([#15875](https://github.com/MetaMask/metamask-extension/pull/15875))
+- Fix font weight of the `<b>` element, by restoring the `b` style ([#15784](https://github.com/MetaMask/metamask-extension/pull/15784))
+- Fix ETH badge being displayed to networks where ETH is not the primary currency ([#16102](https://github.com/MetaMask/metamask-extension/pull/16102))
+- Fix overlapping Portfolio tooltip with Network popup, when a custom network is added ([#16090](https://github.com/MetaMask/metamask-extension/pull/16090))
+- Fix typo in French translation for "removeAccount" ([#16095](https://github.com/MetaMask/metamask-extension/pull/16095))
+- Fix What's New notification not displayed to users who created a new wallet ([#16042](https://github.com/MetaMask/metamask-extension/pull/16042))
+- [FLASK] Fix an issue with installing snaps that request the `eth_accounts` permission ([#16161](https://github.com/MetaMask/metamask-extension/pull/16161))
+
 ## [10.20.0]
 ### Changed
 - Deprecate Rinkeby, Ropsten and Kovan test networks and define Goerli as the default network in test mode ([#15989](https://github.com/MetaMask/metamask-extension/pull/15989))
@@ -698,7 +749,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#12230](https://github.com/MetaMask/metamask-extension/pull/12230): Fix gas control flicker on send screen when switching between EIP-1559 networks
 - [#12186](https://github.com/MetaMask/metamask-extension/pull/12186): Fix grammatical issue with "Not connected to this site" message
 - [#12381](https://github.com/MetaMask/metamask-extension/pull/12381): Fix width and padding of the hide token modal while in the popup view
-- [#12339](https://github.com/MetaMask/metamask-extension/pull/11996): Fix 'BigNumber' app error when '0x' is supplied as the transaction value
+- [#11996](https://github.com/MetaMask/metamask-extension/pull/11996): Fix 'BigNumber' app error when '0x' is supplied as the transaction value
 - [#12339](https://github.com/MetaMask/metamask-extension/pull/12339): Correctly notify the inpage provider of current selected account on "unlock" events
 - [#12405](https://github.com/MetaMask/metamask-extension/pull/12405): Fix allowance issue with WETH -> ETH Swaps
 
@@ -1759,7 +1810,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [7.0.0] - 2019-08-07
 ### Uncategorized
 - Capitalized speed up label to match rest of UI ([#6828](https://github.com/MetaMask/metamask-extension/pull/6828))
-- Allows skipping of seed phrase challenge during onboarding, and completing it at a later time ([#6874](https://github.com/MetaMask/metamask-extension/pull/6928))
+- Allows skipping of seed phrase challenge during onboarding, and completing it at a later time ([#6874](https://github.com/MetaMask/metamask-extension/pull/6874))
 - Prevent opening of asset dropdown if no tokens in account ([#6900](https://github.com/MetaMask/metamask-extension/pull/6900))
 - Set privacy mode as default ([#6904](https://github.com/MetaMask/metamask-extension/pull/6904))
 - Adds Address Book feature ([#6914](https://github.com/MetaMask/metamask-extension/pull/6914))
@@ -1945,7 +1996,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [5.3.5] - 2019-02-04
 ### Uncategorized
-- Privacy mode fixes ([#6084](https://github.com/MetaMask/metamask-extension/pull/6087))
+- Privacy mode fixes ([#6087](https://github.com/MetaMask/metamask-extension/pull/6087))
 
 ## [5.3.4] - 2019-01-31
 ### Uncategorized
@@ -3198,7 +3249,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.20.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.21.0...HEAD
+[10.21.0]: https://github.com/MetaMask/metamask-extension/compare/v10.20.0...v10.21.0
 [10.20.0]: https://github.com/MetaMask/metamask-extension/compare/v10.19.0...v10.20.0
 [10.19.0]: https://github.com/MetaMask/metamask-extension/compare/v10.18.4...v10.19.0
 [10.18.4]: https://github.com/MetaMask/metamask-extension/compare/v10.18.3...v10.18.4

LICENSE

@@ -15,4 +15,4 @@ You are granted a non-exclusive, non-transferable, non-sublicensable license to
 
 You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
 
-If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.[email protected].
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at communications@metamask.io.

README.md

@@ -107,7 +107,7 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
 
 ## Architecture
 
-- [Visual of the controller heirarchy and dependencies as of summer 2022.](https://gist.github.com/rekmarks/8dba6306695dcd44967cce4b6a94ae33)
+- [Visual of the controller hierarchy and dependencies as of summer 2022.](https://gist.github.com/rekmarks/8dba6306695dcd44967cce4b6a94ae33)
 - [Visual of the entire codebase.](https://mango-dune-07a8b7110.1.azurestaticapps.net/?repo=metamask%2Fmetamask-extension)
 
 [![Architecture Diagram](./docs/architecture.png)][1]