Merge branch 'develop' into MMASSETS-42

.yarn/patches/@metamask-eth-keyring-controller-npm-13.0.1-06ff83faad.patch

@@ -0,0 +1,20 @@
+# The `removeAccount` method of some keyrings is async (e.g. `SnapKeyring`), so
+# this patch makes the `KeyringController` await the account removal.
+#
+# In the future, we must make sure that all keyrings implement the same
+# interface.
+#
+# See: https://github.com/MetaMask/KeyringController/pull/280
+diff --git a/dist/KeyringController.js b/dist/KeyringController.js
+index 3644209391f2cdf7ff5e2bd8f94517bff13b0f47..ed63d0ba4cb56df9fe3eb6b0a274f696375dd9dc 100644
+--- a/dist/KeyringController.js
++++ b/dist/KeyringController.js
+@@ -259,7 +259,7 @@ class KeyringController extends events_1.EventEmitter {
+         if (!keyring.removeAccount) {
+             throw new Error(constants_1.KeyringControllerError.UnsupportedRemoveAccount);
+         }
+-        keyring.removeAccount(address);
++        await keyring.removeAccount(address);
+         this.emit('removedAccount', address);
+         const accounts = await keyring.getAccounts();
+         // Check if this was the last/only account

.yarnrc.yml

@@ -94,6 +94,10 @@ npmAuditIgnoreAdvisories:
   # @types/webextension-polyfill
   - 'webextension-polyfill-ts (deprecation)'
 
+  # Imported in @trezor/blockchain-link@npm:2.1.8, but not actually depended on
+  # by MetaMask
+  - 'ripple-lib (deprecation)'
+
 npmRegistries:
   'https://npm.pkg.github.com':
     npmAlwaysAuth: true

app/scripts/controllers/detect-tokens.test.js

@@ -217,6 +217,7 @@ describe('DetectTokensController', function () {
 
     const tokenListMessenger = new ControllerMessenger().getRestricted({
       name: 'TokenListController',
+      allowedEvents: ['TokenListController:stateChange'],
     });
     tokenListController = new TokenListController({
       chainId: toHex(1),
@@ -249,6 +250,11 @@ describe('DetectTokensController', function () {
         networkControllerMessenger,
         'NetworkController:stateChange',
       ),
+      onTokenListStateChange: (listener) =>
+        tokenListMessenger.subscribe(
+          `${tokenListController.name}:stateChange`,
+          listener,
+        ),
     });
 
     assetsContractController = new AssetsContractController({
@@ -363,6 +369,7 @@ describe('DetectTokensController', function () {
         aggregators: undefined,
         image: undefined,
         isERC721: undefined,
+        name: undefined,
       },
     ]);
 
@@ -384,6 +391,7 @@ describe('DetectTokensController', function () {
         aggregators: undefined,
         image: undefined,
         isERC721: undefined,
+        name: undefined,
       },
     ]);
   });
@@ -417,6 +425,7 @@ describe('DetectTokensController', function () {
         aggregators: undefined,
         image: undefined,
         isERC721: undefined,
+        name: undefined,
       },
     ]);
     const tokenAddressToAdd = erc20ContractAddresses[1];
@@ -435,6 +444,7 @@ describe('DetectTokensController', function () {
         aggregators: undefined,
         image: undefined,
         isERC721: undefined,
+        name: undefined,
       },
       {
         address: toChecksumHexAddress(tokenAddressToAdd),
@@ -443,6 +453,7 @@ describe('DetectTokensController', function () {
         aggregators: undefined,
         image: undefined,
         isERC721: undefined,
+        name: undefined,
       },
     ]);
   });