[preferences-controller] Replace manual publish calls with subscripti…

…on to observable store
MetaMask · Mar 13, 2024 · 4f6a160 · 4f6a160
1 parent 56eff3f
commit 4f6a160
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
@@ -133,11 +133,11 @@ export default class PreferencesController {
     });
 
     this.messagingSystem = opts.messenger;
-    this.messagingSystem.registerActionHandler(
+    this.messagingSystem?.registerActionHandler(
       `PreferencesController:getState`,
       () => this.store.getState(),
     );
-    this.messagingSystem.registerInitialEventPayload({
+    this.messagingSystem?.registerInitialEventPayload({
       eventType: `PreferencesController:stateChange`,
       getPayload: () => [this.store.getState(), []],
     });
@@ -211,10 +211,6 @@ export default class PreferencesController {
    */
   setUseTokenDetection(val) {
     this.store.updateState({ useTokenDetection: val });
-    this.messagingSystem.publish('PreferencesController:stateChange', [
-      this.store.getState(),
-      [],
-    ]);
     this.tokenListController.updatePreventPollingOnNetworkRestart(!val);
     if (val) {
       this.tokenListController.start();
@@ -497,10 +493,6 @@ export default class PreferencesController {
 
     selectedIdentity.lastSelected = Date.now();
     this.store.updateState({ identities, selectedAddress: address });
-    this.messagingSystem.publish('PreferencesController:stateChange', [
-      this.store.getState(),
-      [],
-    ]);
   }
 
   /**

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -2456,6 +2456,11 @@ export default class MetamaskController extends EventEmitter {
       } else {
         this.txController.stopIncomingTransactionPolling();
       }
+
+      this.controllerMessenger.publish(
+        `${this.preferencesController.name}:stateChange`,
+        [state, []],
+      );
     });
 
     this.controllerMessenger.subscribe(