Move preferences-controller store subscription with publish listene…

…r into controller constructor
MetaMask · Mar 13, 2024 · b669ccf · b669ccf
1 parent b825ed4
commit b669ccf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
@@ -141,6 +141,12 @@ export default class PreferencesController {
       eventType: `PreferencesController:stateChange`,
       getPayload: () => [this.store.getState(), []],
     });
+    this.store.subscribe((state) => {
+      this.messagingSystem?.publish(`PreferencesController:stateChange`, [
+        state,
+        [],
+      ]);
+    });
 
     global.setPreference = (key, value) => {
       return this.setFeatureFlag(key, value);

diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
@@ -27,7 +27,9 @@ describe('preferences controller', () => {
   let onKeyringStateChangeListener;
 
   beforeEach(() => {
-    const tokenListMessenger = new ControllerMessenger().getRestricted({
+    const controllerMessenger = new ControllerMessenger();
+
+    const tokenListMessenger = controllerMessenger.getRestricted({
       name: 'TokenListController',
     });
     tokenListController = new TokenListController({
@@ -38,8 +40,14 @@ describe('preferences controller', () => {
       messenger: tokenListMessenger,
     });
 
+    const preferencesMessenger = controllerMessenger.getRestricted({
+      name: 'PreferencesController',
+      allowedActions: ['PreferencesController:getState'],
+      allowedEvents: ['PreferencesController:stateChange'],
+    });
     preferencesController = new PreferencesController({
       initLangCode: 'en_US',
+      messenger: preferencesMessenger,
       tokenListController,
       networkConfigurations: NETWORK_CONFIGURATION_DATA,
       onKeyringStateChange: (listener) => {

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -2456,12 +2456,6 @@ export default class MetamaskController extends EventEmitter {
       } else {
         this.txController.stopIncomingTransactionPolling();
       }
-
-      // TODO: Remove once the preferences controller has been replaced with the core monorepo implementation
-      this.controllerMessenger.publish(
-        `${this.preferencesController.name}:stateChange`,
-        [state, []],
-      );
     });
 
     this.controllerMessenger.subscribe(