Get infuraBlocked from network state

.storybook/test-data.js

@@ -1137,7 +1137,6 @@ const state = {
     lostIdentities: {},
     forgottenPassword: false,
     ipfsGateway: 'dweb.link',
-    infuraBlocked: false,
     migratedPrivacyMode: false,
     selectedAddress: '0x9d0ba4ddac06032527b140912ec808ab9451b788',
     metaMetricsId:

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

@@ -231,8 +231,6 @@ describe('DetectTokensController', function () {
       network,
       provider,
       tokenListController,
-      onInfuraIsBlocked: sinon.stub(),
-      onInfuraIsUnblocked: sinon.stub(),
       networkConfigurations: {},
       onAccountRemoved: sinon.stub(),
     });

app/scripts/controllers/mmi-controller.test.js

@@ -56,8 +56,6 @@ describe('MMIController', function () {
       }),
       preferencesController: new PreferencesController({
         initState: {},
-        onInfuraIsBlocked: jest.fn(),
-        onInfuraIsUnblocked: jest.fn(),
         onAccountRemoved: jest.fn(),
         provider: {},
         networkConfigurations: {},

app/scripts/controllers/preferences.js

@@ -93,7 +93,6 @@ export default class PreferencesController {
       // ENS decentralized website resolution
       ipfsGateway: IPFS_DEFAULT_GATEWAY_URL,
       useAddressBarEnsResolution: true,
-      infuraBlocked: null,
       ledgerTransportType: window.navigator.hid
         ? LedgerTransportTypes.webhid
         : LedgerTransportTypes.u2f,
@@ -109,14 +108,10 @@ export default class PreferencesController {
 
     this.network = opts.network;
 
-    this._onInfuraIsBlocked = opts.onInfuraIsBlocked;
-    this._onInfuraIsUnblocked = opts.onInfuraIsUnblocked;
     this.store = new ObservableStore(initState);
     this.store.setMaxListeners(13);
     this.tokenListController = opts.tokenListController;
 
-    this._subscribeToInfuraAvailability();
-
     // subscribe to account removal
     opts.onAccountRemoved((address) => this.removeAddress(address));
 
@@ -621,36 +616,6 @@ export default class PreferencesController {
 
   ///: END:ONLY_INCLUDE_IN
 
-  //
-  // PRIVATE METHODS
-  //
-
-  _subscribeToInfuraAvailability() {
-    this._onInfuraIsBlocked(() => {
-      this._setInfuraBlocked(true);
-    });
-
-    this._onInfuraIsUnblocked(() => {
-      this._setInfuraBlocked(false);
-    });
-  }
-
-  /**
-   *
-   * A setter for the `infuraBlocked` property
-   *
-   * @param {boolean} isBlocked - Bool indicating whether Infura is blocked
-   */
-  _setInfuraBlocked(isBlocked) {
-    const { infuraBlocked } = this.store.getState();
-
-    if (infuraBlocked === isBlocked) {
-      return;
-    }
-
-    this.store.updateState({ infuraBlocked: isBlocked });
-  }
-
   /**
    * A method to check is the linea mainnet network should be displayed
    */

app/scripts/controllers/preferences.test.js

@@ -40,8 +40,6 @@ describe('preferences controller', () => {
     preferencesController = new PreferencesController({
       initLangCode: 'en_US',
       tokenListController,
-      onInfuraIsBlocked: jest.fn(),
-      onInfuraIsUnblocked: jest.fn(),
       onAccountRemoved: jest.fn(),
       networkConfigurations: NETWORK_CONFIGURATION_DATA,
     });
@@ -120,8 +118,6 @@ describe('preferences controller', () => {
       preferencesController = new PreferencesController({
         initLangCode: 'en_US',
         tokenListController,
-        onInfuraIsBlocked: jest.fn(),
-        onInfuraIsUnblocked: jest.fn(),
         initState: {
           identities: {
             [testAddress]: {
@@ -150,8 +146,6 @@ describe('preferences controller', () => {
       preferencesController = new PreferencesController({
         initLangCode: 'en_US',
         tokenListController,
-        onInfuraIsBlocked: jest.fn(),
-        onInfuraIsUnblocked: jest.fn(),
         initState: {
           identities: {
             '0x7e57e2': {

app/scripts/lib/backup.test.js

@@ -142,7 +142,6 @@ const jsonData = JSON.stringify({
       useNativeCurrencyAsPrimaryCurrency: true,
     },
     ipfsGateway: 'dweb.link',
-    infuraBlocked: false,
     ledgerTransportType: 'webhid',
     theme: 'light',
     customNetworkListEnabled: false,

app/scripts/lib/setupSentry.js

@@ -170,7 +170,6 @@ export const SENTRY_BACKGROUND_STATE = {
     forgottenPassword: true,
     identities: false,
     incomingTransactionsPreferences: true,
-    infuraBlocked: true,
     ipfsGateway: false,
     isLineaMainnetReleased: true,
     knownMethodData: false,

app/scripts/metamask-controller.js

@@ -434,14 +434,6 @@ export default class MetamaskController extends EventEmitter {
     this.preferencesController = new PreferencesController({
       initState: initState.PreferencesController,
       initLangCode: opts.initLangCode,
-      onInfuraIsBlocked: networkControllerMessenger.subscribe.bind(
-        networkControllerMessenger,
-        'NetworkController:infuraIsBlocked',
-      ),
-      onInfuraIsUnblocked: networkControllerMessenger.subscribe.bind(
-        networkControllerMessenger,
-        'NetworkController:infuraIsUnblocked',
-      ),
       onAccountRemoved: this.controllerMessenger.subscribe.bind(
         this.controllerMessenger,
         'KeyringController:accountRemoved',

package.json

@@ -103,6 +103,7 @@
     "audit": "yarn npm audit --recursive --environment production --severity moderate"
   },
   "resolutions": {
+    "@metamask/network-controller@^12.0.0": "npm:@metamask-previews/[email protected]",
     "simple-update-notifier@^1.0.0": "^2.0.0",
     "@babel/core": "patch:@babel/core@npm%3A7.21.5#./.yarn/patches/@babel-core-npm-7.21.5-c72c337956.patch",
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.18.9#./.yarn/patches/@babel-runtime-npm-7.18.9-28ca6b5f61.patch",

test/e2e/fixture-builder.js

@@ -259,7 +259,6 @@ function defaultFixture() {
             name: 'Account 1',
           },
         },
-        infuraBlocked: false,
         ipfsGateway: 'dweb.link',
         knownMethodData: {},
         ledgerTransportType: 'webhid',
@@ -382,7 +381,6 @@ function onboardingFixture() {
         featureFlags: {},
         forgottenPassword: false,
         identities: {},
-        infuraBlocked: false,
         ipfsGateway: 'dweb.link',
         knownMethodData: {},
         ledgerTransportType: 'webhid',

test/e2e/restore/MetaMaskUserData.json

@@ -27,7 +27,6 @@
         "ticker": "ETH"
       }
     ],
-    "infuraBlocked": false,
     "ipfsGateway": "dweb.link",
     "knownMethodData": {},
     "ledgerTransportType": "webhid",

test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json

@@ -145,7 +145,6 @@
     },
     "ipfsGateway": "string",
     "useAddressBarEnsResolution": true,
-    "infuraBlocked": false,
     "ledgerTransportType": "webhid",
     "snapRegistryList": "object",
     "transactionSecurityCheckEnabled": false,

test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json

@@ -96,7 +96,6 @@
     "forgottenPassword": false,
     "ipfsGateway": "string",
     "useAddressBarEnsResolution": true,
-    "infuraBlocked": false,
     "ledgerTransportType": "webhid",
     "snapRegistryList": "object",
     "transactionSecurityCheckEnabled": false,

test/e2e/tests/state-snapshots/errors-before-init-opt-in-background-state.json

@@ -80,7 +80,6 @@
       "featureFlags": {},
       "forgottenPassword": false,
       "identities": "object",
-      "infuraBlocked": false,
       "ipfsGateway": "string",
       "knownMethodData": "object",
       "ledgerTransportType": "webhid",

test/e2e/tests/state-snapshots/errors-before-init-opt-in-ui-state.json

@@ -80,7 +80,6 @@
       "featureFlags": {},
       "forgottenPassword": false,
       "identities": "object",
-      "infuraBlocked": false,
       "ipfsGateway": "string",
       "knownMethodData": "object",
       "ledgerTransportType": "webhid",

ui/selectors/selectors.js

@@ -751,7 +751,10 @@ export function getIpfsGateway(state) {
 }
 
 export function getInfuraBlocked(state) {
-  return Boolean(state.metamask.infuraBlocked);
+  return (
+    state.metamask.networksMetadata[getSelectedNetworkClientId(state)]
+      .status === NetworkStatus.Blocked
+  );
 }
 
 export function getUSDConversionRate(state) {

yarn.lock

@@ -3029,12 +3029,12 @@ __metadata:
   linkType: hard
 
 "@jest/expect@npm:^29.1.2":
-  version: 29.6.2
-  resolution: "@jest/expect@npm:29.6.2"
+  version: 29.1.2
+  resolution: "@jest/expect@npm:29.1.2"
   dependencies:
-    expect: "npm:^29.6.2"
-    jest-snapshot: "npm:^29.6.2"
-  checksum: 2beed96e3d24945a72aa2ae4843c99f4c631564569258fdde6746fae3efcbfbff96dbf92ed28d6531299bd12b2766075bacaaae88ebf84b99316e77151b43a9f
+    expect: "npm:^29.1.2"
+    jest-snapshot: "npm:^29.1.2"
+  checksum: 7bb80bf176f39becdbd2ef54be615c3e7010f3230ccc419f22c97fa5b66e0fa14bb6b05019840d01cd1892e42be8158bea4c94487f05da1dd2b85a4ac097dd15
   languageName: node
   linkType: hard
 
@@ -16623,7 +16623,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expect@npm:^29.0.0, expect@npm:^29.6.2":
+"expect@npm:^29.0.0, expect@npm:^29.1.2, expect@npm:^29.6.2":
   version: 29.6.2
   resolution: "expect@npm:29.6.2"
   dependencies:
@@ -21710,7 +21710,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^29.1.2, jest-snapshot@npm:^29.6.2":
+"jest-snapshot@npm:^29.1.2":
   version: 29.6.2
   resolution: "jest-snapshot@npm:29.6.2"
   dependencies: