Merge branch 'develop' into 17191/onboarding-unit-tests-create-new-vault

MetaMask · Apr 12, 2023 · 2e96067 · 2e96067
2 parents c54c3ec + 6ebef43
commit 2e96067
Show file tree

Hide file tree

Showing 41 changed files with 1,868 additions and 839 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -80,7 +80,6 @@ log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'info');
 
 const platform = new ExtensionPlatform();
 const notificationManager = new NotificationManager();
-global.METAMASK_NOTIFIER = notificationManager;
 
 let popupIsOpen = false;
 let notificationIsOpen = false;
@@ -727,7 +726,6 @@ export function setupController(
   }
 
   function getUnapprovedTransactionCount() {
-    const unapprovedTxCount = controller.txController.getUnapprovedTxCount();
     const { unapprovedDecryptMsgCount } = controller.decryptMessageManager;
     const { unapprovedEncryptionPublicKeyMsgCount } =
       controller.encryptionPublicKeyManager;
@@ -736,7 +734,6 @@ export function setupController(
     const waitingForUnlockCount =
       controller.appStateController.waitingForUnlock.length;
     return (
-      unapprovedTxCount +
       unapprovedDecryptMsgCount +
       unapprovedEncryptionPublicKeyMsgCount +
       pendingApprovalCount +

diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js
@@ -13,7 +13,7 @@ import { convertHexToDecimal } from '@metamask/controller-utils';
 import { NETWORK_TYPES } from '../../../shared/constants/network';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 import DetectTokensController from './detect-tokens';
-import NetworkController, { NetworkControllerEventTypes } from './network';
+import { NetworkController, NetworkControllerEventType } from './network';
 import PreferencesController from './preferences';
 
 describe('DetectTokensController', function () {
@@ -248,7 +248,7 @@ describe('DetectTokensController', function () {
       ),
       onNetworkStateChange: (cb) =>
         networkControllerMessenger.subscribe(
-          NetworkControllerEventTypes.NetworkDidChange,
+          NetworkControllerEventType.NetworkDidChange,
           () => {
             const networkState = network.store.getState();
             const modifiedNetworkState = {

diff --git a/app/scripts/controllers/network/index.js b/app/scripts/controllers/network/index.js
diff --git a/app/scripts/controllers/network/index.ts b/app/scripts/controllers/network/index.ts
@@ -0,0 +1 @@
+export * from './network-controller';