@metamask-previews/network-connection-banner-controller 0.1.0-preview-bd4161b27 → 0.1.0-preview-6fc64deac

package/README.md

@@ -1,30 +1,22 @@
 # `@metamask/network-connection-banner-controller`
 
 NetworkConnectionBannerController decides when and how to surface the network
-connection banner based on RPC endpoint health. It encapsulates the rule, the
-5s/30s timer state machine, and the eTLD+1 grouping used to decide when a
-wider provider outage is in play.
+connection banner based on RPC endpoint health. It encapsulates the rule and
+the 5s/30s timer state machine.
 
 ## Lifecycle
 
 The controller stays dormant after construction so the 5s / 30s escalation
 timers do not run before a user is actually looking at the wallet (e.g. while
-the app is still on the lock screen). The UI that renders the banner is
-responsible for driving the lifecycle:
-
-```typescript
-// When the wallet UI that shows the banner becomes active
-// (e.g. the home surface mounts after unlock):
-networkConnectionBannerController.start();
-
-// When it goes away:
-networkConnectionBannerController.stop();
-```
-
-Both methods are idempotent. `start` runs the initial evaluation immediately
-and enables reactions to upstream state changes. `stop` cancels any pending
-timers and resets the banner state to `available`. Upstream state changes are
-ignored while stopped.
+the app is still on the lock screen). It manages its own lifecycle by
+subscribing to `ClientController:stateChanged` and
+`KeyringController:unlock` / `KeyringController:lock`: evaluation runs only
+while the client UI is open on an unlocked wallet. When either condition
+stops holding, pending timers are cancelled and the banner state resets to
+`available`; upstream state changes are ignored until both hold again.
+
+Clients need no lifecycle wiring beyond keeping `ClientController`'s
+`isUiOpen` up to date (via `ClientController:setUiOpen`).
 
 ## Installation
 

package/dist/NetworkConnectionBannerController-method-action-types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.cjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Look for a failed network, if any, and populate the initial state of the\n * banner. Reacts to upstream state changes from this point on.\n *\n * Call this when the wallet UI that consumes the banner becomes active\n * (typically when the wallet is unlocked and the home surface mounts) so\n * timers do not run while the user is not looking at the wallet. Should\n * be called after `NetworkController`, `NetworkEnablementController`, and\n * `ConnectivityController` have been initialized. Idempotent.\n */\nexport type NetworkConnectionBannerControllerStartAction = {\n  type: `NetworkConnectionBannerController:start`;\n  handler: NetworkConnectionBannerController['start'];\n};\n\n/**\n * Stops evaluating network connection state. Clears any pending banner\n * timers and resets state to `available`. Call this when the UI\n * consuming the banner is no longer active. Idempotent.\n */\nexport type NetworkConnectionBannerControllerStopAction = {\n  type: `NetworkConnectionBannerController:stop`;\n  handler: NetworkConnectionBannerController['stop'];\n};\n\n/**\n * Clears the banner state such that the banner will be hidden.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its Infura endpoint,\n * causing the banner to clear once the network becomes available again.\n *\n * @param chainId - The chain whose default RPC endpoint should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction =\n  {\n    type: `NetworkConnectionBannerController:switchToDefaultInfuraRpcEndpoint`;\n    handler: NetworkConnectionBannerController['switchToDefaultInfuraRpcEndpoint'];\n  };\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerStartAction\n  | NetworkConnectionBannerControllerStopAction\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;\n"]}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.cjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Clears the banner state such that the banner will be hidden.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its Infura endpoint and\n * makes it the active network, causing the banner to clear once the\n * network becomes available again.\n *\n * @param chainId - The chain whose default RPC endpoint should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction =\n  {\n    type: `NetworkConnectionBannerController:switchToDefaultInfuraRpcEndpoint`;\n    handler: NetworkConnectionBannerController['switchToDefaultInfuraRpcEndpoint'];\n  };\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;\n"]}

package/dist/NetworkConnectionBannerController-method-action-types.d.cts

@@ -3,29 +3,6 @@
  * Do not edit manually.
  */
 import type { NetworkConnectionBannerController } from "./NetworkConnectionBannerController.cjs";
-/**
- * Look for a failed network, if any, and populate the initial state of the
- * banner. Reacts to upstream state changes from this point on.
- *
- * Call this when the wallet UI that consumes the banner becomes active
- * (typically when the wallet is unlocked and the home surface mounts) so
- * timers do not run while the user is not looking at the wallet. Should
- * be called after `NetworkController`, `NetworkEnablementController`, and
- * `ConnectivityController` have been initialized. Idempotent.
- */
-export type NetworkConnectionBannerControllerStartAction = {
-    type: `NetworkConnectionBannerController:start`;
-    handler: NetworkConnectionBannerController['start'];
-};
-/**
- * Stops evaluating network connection state. Clears any pending banner
- * timers and resets state to `available`. Call this when the UI
- * consuming the banner is no longer active. Idempotent.
- */
-export type NetworkConnectionBannerControllerStopAction = {
-    type: `NetworkConnectionBannerController:stop`;
-    handler: NetworkConnectionBannerController['stop'];
-};
 /**
  * Clears the banner state such that the banner will be hidden.
  */
@@ -34,8 +11,9 @@ export type NetworkConnectionBannerControllerDismissBannerAction = {
     handler: NetworkConnectionBannerController['dismissBanner'];
 };
 /**
- * Switches the chain's default RPC endpoint to its Infura endpoint,
- * causing the banner to clear once the network becomes available again.
+ * Switches the chain's default RPC endpoint to its Infura endpoint and
+ * makes it the active network, causing the banner to clear once the
+ * network becomes available again.
  *
  * @param chainId - The chain whose default RPC endpoint should be switched.
  * @throws If the chain configuration cannot be found, or if it has no
@@ -48,5 +26,5 @@ export type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAct
 /**
  * Union of all NetworkConnectionBannerController action types.
  */
-export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerStartAction | NetworkConnectionBannerControllerStopAction | NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;
+export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;
 //# sourceMappingURL=NetworkConnectionBannerController-method-action-types.d.cts.map

package/dist/NetworkConnectionBannerController-method-action-types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.cts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;;;;;;;;GASG;AACH,MAAM,MAAM,4CAA4C,GAAG;IACzD,IAAI,EAAE,yCAAyC,CAAC;IAChD,OAAO,EAAE,iCAAiC,CAAC,OAAO,CAAC,CAAC;CACrD,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,wCAAwC,CAAC;IAC/C,OAAO,EAAE,iCAAiC,CAAC,MAAM,CAAC,CAAC;CACpD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,uEAAuE,GACjF;IACE,IAAI,EAAE,oEAAoE,CAAC;IAC3E,OAAO,EAAE,iCAAiC,CAAC,kCAAkC,CAAC,CAAC;CAChF,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,4CAA4C,GAC5C,2CAA2C,GAC3C,oDAAoD,GACpD,uEAAuE,CAAC"}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.cts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;GAEG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,uEAAuE,GACjF;IACE,IAAI,EAAE,oEAAoE,CAAC;IAC3E,OAAO,EAAE,iCAAiC,CAAC,kCAAkC,CAAC,CAAC;CAChF,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,oDAAoD,GACpD,uEAAuE,CAAC"}

package/dist/NetworkConnectionBannerController-method-action-types.d.mts

@@ -3,29 +3,6 @@
  * Do not edit manually.
  */
 import type { NetworkConnectionBannerController } from "./NetworkConnectionBannerController.mjs";
-/**
- * Look for a failed network, if any, and populate the initial state of the
- * banner. Reacts to upstream state changes from this point on.
- *
- * Call this when the wallet UI that consumes the banner becomes active
- * (typically when the wallet is unlocked and the home surface mounts) so
- * timers do not run while the user is not looking at the wallet. Should
- * be called after `NetworkController`, `NetworkEnablementController`, and
- * `ConnectivityController` have been initialized. Idempotent.
- */
-export type NetworkConnectionBannerControllerStartAction = {
-    type: `NetworkConnectionBannerController:start`;
-    handler: NetworkConnectionBannerController['start'];
-};
-/**
- * Stops evaluating network connection state. Clears any pending banner
- * timers and resets state to `available`. Call this when the UI
- * consuming the banner is no longer active. Idempotent.
- */
-export type NetworkConnectionBannerControllerStopAction = {
-    type: `NetworkConnectionBannerController:stop`;
-    handler: NetworkConnectionBannerController['stop'];
-};
 /**
  * Clears the banner state such that the banner will be hidden.
  */
@@ -34,8 +11,9 @@ export type NetworkConnectionBannerControllerDismissBannerAction = {
     handler: NetworkConnectionBannerController['dismissBanner'];
 };
 /**
- * Switches the chain's default RPC endpoint to its Infura endpoint,
- * causing the banner to clear once the network becomes available again.
+ * Switches the chain's default RPC endpoint to its Infura endpoint and
+ * makes it the active network, causing the banner to clear once the
+ * network becomes available again.
  *
  * @param chainId - The chain whose default RPC endpoint should be switched.
  * @throws If the chain configuration cannot be found, or if it has no
@@ -48,5 +26,5 @@ export type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAct
 /**
  * Union of all NetworkConnectionBannerController action types.
  */
-export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerStartAction | NetworkConnectionBannerControllerStopAction | NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;
+export type NetworkConnectionBannerControllerMethodActions = NetworkConnectionBannerControllerDismissBannerAction | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;
 //# sourceMappingURL=NetworkConnectionBannerController-method-action-types.d.mts.map

package/dist/NetworkConnectionBannerController-method-action-types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.mts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;;;;;;;;GASG;AACH,MAAM,MAAM,4CAA4C,GAAG;IACzD,IAAI,EAAE,yCAAyC,CAAC;IAChD,OAAO,EAAE,iCAAiC,CAAC,OAAO,CAAC,CAAC;CACrD,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,wCAAwC,CAAC;IAC/C,OAAO,EAAE,iCAAiC,CAAC,MAAM,CAAC,CAAC;CACpD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,uEAAuE,GACjF;IACE,IAAI,EAAE,oEAAoE,CAAC;IAC3E,OAAO,EAAE,iCAAiC,CAAC,kCAAkC,CAAC,CAAC;CAChF,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,4CAA4C,GAC5C,2CAA2C,GAC3C,oDAAoD,GACpD,uEAAuE,CAAC"}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.d.mts","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iCAAiC,EAAE,gDAA4C;AAE7F;;GAEG;AACH,MAAM,MAAM,oDAAoD,GAAG;IACjE,IAAI,EAAE,iDAAiD,CAAC;IACxD,OAAO,EAAE,iCAAiC,CAAC,eAAe,CAAC,CAAC;CAC7D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,uEAAuE,GACjF;IACE,IAAI,EAAE,oEAAoE,CAAC;IAC3E,OAAO,EAAE,iCAAiC,CAAC,kCAAkC,CAAC,CAAC;CAChF,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,8CAA8C,GACtD,oDAAoD,GACpD,uEAAuE,CAAC"}

package/dist/NetworkConnectionBannerController-method-action-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"NetworkConnectionBannerController-method-action-types.mjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Look for a failed network, if any, and populate the initial state of the\n * banner. Reacts to upstream state changes from this point on.\n *\n * Call this when the wallet UI that consumes the banner becomes active\n * (typically when the wallet is unlocked and the home surface mounts) so\n * timers do not run while the user is not looking at the wallet. Should\n * be called after `NetworkController`, `NetworkEnablementController`, and\n * `ConnectivityController` have been initialized. Idempotent.\n */\nexport type NetworkConnectionBannerControllerStartAction = {\n  type: `NetworkConnectionBannerController:start`;\n  handler: NetworkConnectionBannerController['start'];\n};\n\n/**\n * Stops evaluating network connection state. Clears any pending banner\n * timers and resets state to `available`. Call this when the UI\n * consuming the banner is no longer active. Idempotent.\n */\nexport type NetworkConnectionBannerControllerStopAction = {\n  type: `NetworkConnectionBannerController:stop`;\n  handler: NetworkConnectionBannerController['stop'];\n};\n\n/**\n * Clears the banner state such that the banner will be hidden.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its Infura endpoint,\n * causing the banner to clear once the network becomes available again.\n *\n * @param chainId - The chain whose default RPC endpoint should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction =\n  {\n    type: `NetworkConnectionBannerController:switchToDefaultInfuraRpcEndpoint`;\n    handler: NetworkConnectionBannerController['switchToDefaultInfuraRpcEndpoint'];\n  };\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerStartAction\n  | NetworkConnectionBannerControllerStopAction\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;\n"]}
+{"version":3,"file":"NetworkConnectionBannerController-method-action-types.mjs","sourceRoot":"","sources":["../src/NetworkConnectionBannerController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { NetworkConnectionBannerController } from './NetworkConnectionBannerController';\n\n/**\n * Clears the banner state such that the banner will be hidden.\n */\nexport type NetworkConnectionBannerControllerDismissBannerAction = {\n  type: `NetworkConnectionBannerController:dismissBanner`;\n  handler: NetworkConnectionBannerController['dismissBanner'];\n};\n\n/**\n * Switches the chain's default RPC endpoint to its Infura endpoint and\n * makes it the active network, causing the banner to clear once the\n * network becomes available again.\n *\n * @param chainId - The chain whose default RPC endpoint should be switched.\n * @throws If the chain configuration cannot be found, or if it has no\n * Infura endpoint to switch to, or if the default is already Infura.\n */\nexport type NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction =\n  {\n    type: `NetworkConnectionBannerController:switchToDefaultInfuraRpcEndpoint`;\n    handler: NetworkConnectionBannerController['switchToDefaultInfuraRpcEndpoint'];\n  };\n\n/**\n * Union of all NetworkConnectionBannerController action types.\n */\nexport type NetworkConnectionBannerControllerMethodActions =\n  | NetworkConnectionBannerControllerDismissBannerAction\n  | NetworkConnectionBannerControllerSwitchToDefaultInfuraRpcEndpointAction;\n"]}

package/dist/NetworkConnectionBannerController.cjs

@@ -10,10 +10,11 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _NetworkConnectionBannerController_instances, _NetworkConnectionBannerController_degradedTimer, _NetworkConnectionBannerController_unavailableTimer, _NetworkConnectionBannerController_pendingNetworkClientId, _NetworkConnectionBannerController_isStarted, _NetworkConnectionBannerController_refreshState, _NetworkConnectionBannerController_resetBanner, _NetworkConnectionBannerController_clearTimers, _NetworkConnectionBannerController_findFailedNetwork, _NetworkConnectionBannerController_getEnabledEvmChainIds, _NetworkConnectionBannerController_collectNetworksWithMetadata, _NetworkConnectionBannerController_buildFailedNetwork, _NetworkConnectionBannerController_pickBannerNetwork;
+var _NetworkConnectionBannerController_instances, _NetworkConnectionBannerController_degradedTimer, _NetworkConnectionBannerController_unavailableTimer, _NetworkConnectionBannerController_pendingNetworkClientId, _NetworkConnectionBannerController_isStarted, _NetworkConnectionBannerController_isUiOpen, _NetworkConnectionBannerController_isUnlocked, _NetworkConnectionBannerController_updateLifecycle, _NetworkConnectionBannerController_start, _NetworkConnectionBannerController_stop, _NetworkConnectionBannerController_refreshState, _NetworkConnectionBannerController_resetBanner, _NetworkConnectionBannerController_clearTimers, _NetworkConnectionBannerController_findFailedNetwork, _NetworkConnectionBannerController_getEnabledEvmChainIds, _NetworkConnectionBannerController_collectEnabledNetworks, _NetworkConnectionBannerController_buildFailedNetwork, _NetworkConnectionBannerController_pickFailedNetworkToDisplay;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkConnectionBannerController = exports.getDefaultNetworkConnectionBannerControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
+const client_controller_1 = require("@metamask/client-controller");
 const connectivity_controller_1 = require("@metamask/connectivity-controller");
 const network_controller_1 = require("@metamask/network-controller");
 const network_enablement_controller_1 = require("@metamask/network-enablement-controller");
@@ -107,31 +108,29 @@ const DEGRADED_BANNER_TIMEOUT = 5000;
  */
 const UNAVAILABLE_BANNER_TIMEOUT = 30000;
 const MESSENGER_EXPOSED_METHODS = [
-    'start',
-    'stop',
     'dismissBanner',
     'switchToDefaultInfuraRpcEndpoint',
 ];
 /**
  * NetworkConnectionBannerController decides whether the network connection
  * banner should be shown for the user, and which failing network it should
- * describe. It encapsulates the rule, the 5s / 30s timer escalation, and the
- * eTLD+1 grouping used to decide when a wider provider outage is in play.
+ * describe. It encapsulates the rule and the 5s / 30s timer escalation.
  *
  * The banner shows when:
  *
- * - The first failing network's default RPC is a custom (non-Infura) endpoint
- *   — users always want to be informed about errors with RPCs they've chosen.
- * - Failed RPCs span more than one registrable domain (likely client-side).
- * - Every enabled EVM network with known connectivity status is failing
- *   (escape hatch for single-network setups so they still get a signal).
+ * - A failing network's default RPC is a custom (non-Infura) endpoint —
+ *   users always want to be informed about errors with RPCs they've chosen.
+ * - Every enabled EVM network is reporting a failed connectivity status
+ *   (escape hatch so Infura-only setups still get a signal).
  *
- * A wide single-provider outage (e.g. every `*.infura.io` network goes down at
- * once) collapses to one domain and is suppressed, except in the all-down
- * single-network case. When a custom failure is present, it's surfaced first
- * so the "Switch to MetaMask default RPC" CTA targets the network the user
- * can act on.
+ * A partial Infura outage alongside healthy peers is suppressed since it
+ * usually resolves on its own and the user cannot act on it. When a custom
+ * failure is present, it's surfaced first so the "Switch to MetaMask default
+ * RPC" CTA targets the network the user can act on.
  *
+ * The controller manages its own lifecycle: it evaluates RPC health (and
+ * runs the escalation timers) only while the client UI is open
+ * (`ClientController`) and the wallet is unlocked (`KeyringController`).
  * Clients only need to render the banner from the controller's state and wire
  * click handlers to {@link dismissBanner} or {@link switchToDefaultInfuraRpcEndpoint}.
  */
@@ -154,44 +153,45 @@ class NetworkConnectionBannerController extends base_controller_1.BaseController
         _NetworkConnectionBannerController_unavailableTimer.set(this, void 0);
         _NetworkConnectionBannerController_pendingNetworkClientId.set(this, void 0);
         _NetworkConnectionBannerController_isStarted.set(this, false);
+        /** Whether the client UI is open. Combined with {@link #isUnlocked}. */
+        _NetworkConnectionBannerController_isUiOpen.set(this, false);
+        /** Whether the keyring is unlocked. Combined with {@link #isUiOpen}. */
+        _NetworkConnectionBannerController_isUnlocked.set(this, false);
         // Upstream controllers still expose :stateChange; switch to :stateChanged
         // once those packages migrate their event types.
         /* eslint-disable no-restricted-syntax -- awaiting upstream :stateChanged migration */
-        this.messenger.subscribe('NetworkController:stateChange', (networkControllerState) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, { networkControllerState }), selectNetworkControllerFields);
-        this.messenger.subscribe('NetworkEnablementController:stateChange', (networkEnablementControllerState) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, { networkEnablementControllerState }), selectNetworkEnablementControllerFields);
-        this.messenger.subscribe('ConnectivityController:stateChange', (connectivityControllerState) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, { connectivityControllerState }), selectConnectivityControllerFields);
+        this.messenger.subscribe('NetworkController:stateChange', (networkControllerState) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, {
+            networkControllerState,
+            networkEnablementControllerState: this.messenger.call('NetworkEnablementController:getState'),
+            connectivityControllerState: this.messenger.call('ConnectivityController:getState'),
+        }), selectNetworkControllerFields);
+        this.messenger.subscribe('NetworkEnablementController:stateChange', (networkEnablementControllerState) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, {
+            networkControllerState: this.messenger.call('NetworkController:getState'),
+            networkEnablementControllerState,
+            connectivityControllerState: this.messenger.call('ConnectivityController:getState'),
+        }), selectNetworkEnablementControllerFields);
+        this.messenger.subscribe('ConnectivityController:stateChange', (connectivityControllerState) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, {
+            networkControllerState: this.messenger.call('NetworkController:getState'),
+            networkEnablementControllerState: this.messenger.call('NetworkEnablementController:getState'),
+            connectivityControllerState,
+        }), selectConnectivityControllerFields);
         /* eslint-enable no-restricted-syntax */
+        // Lifecycle: evaluate RPC health (and run the banner escalation timers)
+        // only while the client UI is open on an unlocked wallet.
+        this.messenger.subscribe('ClientController:stateChanged', (isUiOpen) => {
+            __classPrivateFieldSet(this, _NetworkConnectionBannerController_isUiOpen, isUiOpen, "f");
+            __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_updateLifecycle).call(this);
+        }, client_controller_1.clientControllerSelectors.selectIsUiOpen);
+        this.messenger.subscribe('KeyringController:unlock', () => {
+            __classPrivateFieldSet(this, _NetworkConnectionBannerController_isUnlocked, true, "f");
+            __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_updateLifecycle).call(this);
+        });
+        this.messenger.subscribe('KeyringController:lock', () => {
+            __classPrivateFieldSet(this, _NetworkConnectionBannerController_isUnlocked, false, "f");
+            __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_updateLifecycle).call(this);
+        });
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
-    /**
-     * Look for a failed network, if any, and populate the initial state of the
-     * banner. Reacts to upstream state changes from this point on.
-     *
-     * Call this when the wallet UI that consumes the banner becomes active
-     * (typically when the wallet is unlocked and the home surface mounts) so
-     * timers do not run while the user is not looking at the wallet. Should
-     * be called after `NetworkController`, `NetworkEnablementController`, and
-     * `ConnectivityController` have been initialized. Idempotent.
-     */
-    start() {
-        if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
-            return;
-        }
-        __classPrivateFieldSet(this, _NetworkConnectionBannerController_isStarted, true, "f");
-        __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this);
-    }
-    /**
-     * Stops evaluating network connection state. Clears any pending banner
-     * timers and resets state to `available`. Call this when the UI
-     * consuming the banner is no longer active. Idempotent.
-     */
-    stop() {
-        if (!__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
-            return;
-        }
-        __classPrivateFieldSet(this, _NetworkConnectionBannerController_isStarted, false, "f");
-        __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
-    }
     /**
      * Clears the banner state such that the banner will be hidden.
      */
@@ -199,8 +199,9 @@ class NetworkConnectionBannerController extends base_controller_1.BaseController
         __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
     }
     /**
-     * Switches the chain's default RPC endpoint to its Infura endpoint,
-     * causing the banner to clear once the network becomes available again.
+     * Switches the chain's default RPC endpoint to its Infura endpoint and
+     * makes it the active network, causing the banner to clear once the
+     * network becomes available again.
      *
      * @param chainId - The chain whose default RPC endpoint should be switched.
      * @throws If the chain configuration cannot be found, or if it has no
@@ -222,25 +223,50 @@ class NetworkConnectionBannerController extends base_controller_1.BaseController
         await this.messenger.call('NetworkController:updateNetwork', chainId, {
             ...networkConfiguration,
             defaultRpcEndpointIndex: infuraEndpointIndex,
-        }, { replacementSelectedRpcEndpointIndex: infuraEndpointIndex });
+        });
+        // Move the active connection onto the Infura endpoint too, so the user
+        // is no longer connected to the failing endpoint.
+        const infuraNetworkClientId = networkConfiguration.rpcEndpoints[infuraEndpointIndex].networkClientId;
+        const { selectedNetworkClientId } = this.messenger.call('NetworkController:getState');
+        if (infuraNetworkClientId !== selectedNetworkClientId) {
+            await this.messenger.call('NetworkController:setActiveNetwork', infuraNetworkClientId);
+        }
     }
 }
 exports.NetworkConnectionBannerController = NetworkConnectionBannerController;
-_NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnectionBannerController_unavailableTimer = new WeakMap(), _NetworkConnectionBannerController_pendingNetworkClientId = new WeakMap(), _NetworkConnectionBannerController_isStarted = new WeakMap(), _NetworkConnectionBannerController_instances = new WeakSet(), _NetworkConnectionBannerController_refreshState = function _NetworkConnectionBannerController_refreshState({ networkControllerState, networkEnablementControllerState, connectivityControllerState, } = {}) {
+_NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnectionBannerController_unavailableTimer = new WeakMap(), _NetworkConnectionBannerController_pendingNetworkClientId = new WeakMap(), _NetworkConnectionBannerController_isStarted = new WeakMap(), _NetworkConnectionBannerController_isUiOpen = new WeakMap(), _NetworkConnectionBannerController_isUnlocked = new WeakMap(), _NetworkConnectionBannerController_instances = new WeakSet(), _NetworkConnectionBannerController_updateLifecycle = function _NetworkConnectionBannerController_updateLifecycle() {
+    if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_isUiOpen, "f") && __classPrivateFieldGet(this, _NetworkConnectionBannerController_isUnlocked, "f")) {
+        __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_start).call(this);
+    }
+    else {
+        __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_stop).call(this);
+    }
+}, _NetworkConnectionBannerController_start = function _NetworkConnectionBannerController_start() {
+    if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
+        return;
+    }
+    __classPrivateFieldSet(this, _NetworkConnectionBannerController_isStarted, true, "f");
+    __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_refreshState).call(this, {
+        networkControllerState: this.messenger.call('NetworkController:getState'),
+        networkEnablementControllerState: this.messenger.call('NetworkEnablementController:getState'),
+        connectivityControllerState: this.messenger.call('ConnectivityController:getState'),
+    });
+}, _NetworkConnectionBannerController_stop = function _NetworkConnectionBannerController_stop() {
+    if (!__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
+        return;
+    }
+    __classPrivateFieldSet(this, _NetworkConnectionBannerController_isStarted, false, "f");
+    __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
+}, _NetworkConnectionBannerController_refreshState = function _NetworkConnectionBannerController_refreshState({ networkControllerState, networkEnablementControllerState, connectivityControllerState, }) {
     if (!__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
         return;
     }
-    const { connectivityStatus } = connectivityControllerState ??
-        this.messenger.call('ConnectivityController:getState');
-    if (connectivityStatus === connectivity_controller_1.CONNECTIVITY_STATUSES.Offline) {
+    if (connectivityControllerState.connectivityStatus ===
+        connectivity_controller_1.CONNECTIVITY_STATUSES.Offline) {
         __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
         return;
     }
-    const networkState = networkControllerState ??
-        this.messenger.call('NetworkController:getState');
-    const enablementState = networkEnablementControllerState ??
-        this.messenger.call('NetworkEnablementController:getState');
-    const failedNetwork = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_findFailedNetwork).call(this, networkState, enablementState);
+    const failedNetwork = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_findFailedNetwork).call(this, networkControllerState, networkEnablementControllerState);
     if (!failedNetwork) {
         __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_resetBanner).call(this);
         return;
@@ -249,10 +275,16 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
         this.state.networkConnectionBannerNetwork?.networkClientId ===
             failedNetwork.networkClientId) {
         this.update((state) => {
+            // Even if the network client ID has not changed, save the current
+            // version of the failed network to state in case the user has updated
+            // its RPC URL.
             state.networkConnectionBannerNetwork = failedNetwork;
         });
         return;
     }
+    // A degraded timer is already counting down for this same network.
+    // Repeated `stateChange` events must not clear and restart it, or a
+    // steady stream of updates could postpone the banner indefinitely.
     if (__classPrivateFieldGet(this, _NetworkConnectionBannerController_pendingNetworkClientId, "f") === failedNetwork.networkClientId) {
         return;
     }
@@ -261,15 +293,15 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
         state.networkConnectionBannerStatus = 'available';
         state.networkConnectionBannerNetwork = null;
     });
-    // A synchronous listener on our `stateChanged` event above may have
-    // called `stop()` re-entrantly. Bail before scheduling anything.
+    // If `stop` is called before scheduling timers, bail early.
     if (!__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
         return;
     }
-    // Capture the failing network at schedule time. We trust the messenger
-    // contract: if the failure resolves or the target changes during the
-    // wait, our upstream subscriptions will have cancelled or replaced this
-    // timer via `#clearTimers` before it fires.
+    // Remember which network the pending timer is for (see the guard above)
+    // and capture the failing network at schedule time. If the failure
+    // resolves or a different network becomes the banner target while we
+    // wait, the subscription handlers re-enter this method and cancel or
+    // replace the timer before it fires.
     __classPrivateFieldSet(this, _NetworkConnectionBannerController_pendingNetworkClientId, failedNetwork.networkClientId, "f");
     __classPrivateFieldSet(this, _NetworkConnectionBannerController_degradedTimer, setTimeout(() => {
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_degradedTimer, undefined, "f");
@@ -278,8 +310,7 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
             state.networkConnectionBannerStatus = 'degraded';
             state.networkConnectionBannerNetwork = failedNetwork;
         });
-        // A synchronous listener on our `stateChanged` event above may have
-        // called `stop()` re-entrantly. Bail before scheduling the escalation.
+        // If `stop` is called before scheduling timers, bail early.
         if (!__classPrivateFieldGet(this, _NetworkConnectionBannerController_isStarted, "f")) {
             return;
         }
@@ -311,16 +342,17 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
         __classPrivateFieldSet(this, _NetworkConnectionBannerController_unavailableTimer, undefined, "f");
     }
 }, _NetworkConnectionBannerController_findFailedNetwork = function _NetworkConnectionBannerController_findFailedNetwork(networkState, enablementState) {
-    const networksWithMetadata = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_collectNetworksWithMetadata).call(this, networkState, enablementState);
-    const failedNetworks = networksWithMetadata
-        .filter(({ metadata }) => metadata.status !== network_controller_1.NetworkStatus.Available)
+    const enabledNetworks = __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_collectEnabledNetworks).call(this, networkState, enablementState);
+    // Networks whose connectivity has not been looked up yet are not failed.
+    const failedNetworks = enabledNetworks
+        .filter(({ metadata }) => metadata !== undefined && metadata.status !== network_controller_1.NetworkStatus.Available)
         .map((network) => __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_buildFailedNetwork).call(this, network));
-    return __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_pickBannerNetwork).call(this, failedNetworks, networksWithMetadata.length);
+    return __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_pickFailedNetworkToDisplay).call(this, failedNetworks, enabledNetworks.length);
 }, _NetworkConnectionBannerController_getEnabledEvmChainIds = function _NetworkConnectionBannerController_getEnabledEvmChainIds(enabledNetworkMap) {
     return Object.entries(enabledNetworkMap[utils_1.KnownCaipNamespace.Eip155] ?? {})
         .filter(([, enabled]) => enabled)
         .map(([chainId]) => chainId);
-}, _NetworkConnectionBannerController_collectNetworksWithMetadata = function _NetworkConnectionBannerController_collectNetworksWithMetadata({ networkConfigurationsByChainId, networksMetadata, }, { enabledNetworkMap, }) {
+}, _NetworkConnectionBannerController_collectEnabledNetworks = function _NetworkConnectionBannerController_collectEnabledNetworks({ networkConfigurationsByChainId, networksMetadata, }, { enabledNetworkMap, }) {
     return __classPrivateFieldGet(this, _NetworkConnectionBannerController_instances, "m", _NetworkConnectionBannerController_getEnabledEvmChainIds).call(this, enabledNetworkMap).flatMap((chainId) => {
         const networkConfiguration = networkConfigurationsByChainId[chainId];
         if (!networkConfiguration) {
@@ -331,10 +363,6 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
         if (!defaultRpcEndpoint) {
             return [];
         }
-        const metadata = networksMetadata[defaultRpcEndpoint.networkClientId];
-        if (!metadata) {
-            return [];
-        }
         return [
             {
                 chainId,
@@ -342,7 +370,7 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
                 rpcEndpoints,
                 defaultRpcEndpointIndex,
                 defaultRpcEndpoint,
-                metadata,
+                metadata: networksMetadata[defaultRpcEndpoint.networkClientId],
             },
         ];
     });
@@ -363,20 +391,14 @@ _NetworkConnectionBannerController_degradedTimer = new WeakMap(), _NetworkConnec
         rpcUrl: defaultRpcEndpoint.url,
         isInfuraEndpoint,
         switchableInfuraNetworkClientId,
-        domain: (0, url_utils_1.getDomain)(defaultRpcEndpoint.url),
     };
-}, _NetworkConnectionBannerController_pickBannerNetwork = function _NetworkConnectionBannerController_pickBannerNetwork(failedNetworks, totalNetworksWithMetadata) {
+}, _NetworkConnectionBannerController_pickFailedNetworkToDisplay = function _NetworkConnectionBannerController_pickFailedNetworkToDisplay(failedNetworks, totalEnabledNetworks) {
     if (failedNetworks.length === 0) {
         return null;
     }
     const firstCustomFailed = failedNetworks.find((entry) => !entry.isInfuraEndpoint);
-    const distinctDomains = new Set(failedNetworks
-        .map((entry) => entry.domain)
-        .filter((domain) => domain !== null)).size;
-    const areAllKnownNetworksFailed = failedNetworks.length === totalNetworksWithMetadata;
-    if (!firstCustomFailed &&
-        distinctDomains <= 1 &&
-        !areAllKnownNetworksFailed) {
+    const areAllEnabledNetworksFailed = failedNetworks.length === totalEnabledNetworks;
+    if (!firstCustomFailed && !areAllEnabledNetworksFailed) {
         return null;
     }
     return firstCustomFailed ?? failedNetworks[0];