Fix suggestions

MetaMask · Jan 9, 2025 · b273f9f · b273f9f
1 parent e5e6db4
commit b273f9f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/packages/message-manager/CHANGELOG.md b/packages/message-manager/CHANGELOG.md
@@ -10,10 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - **BREAKING:** Base class of `DecryptMessageManager` and `EncryptionPublicKeyManager`(`AbstractMessageManager`) now expects new options to initialise ([#5103](https://github.com/MetaMask/core/pull/5103))
+- Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
+
+### Removed
+
 - **BREAKING:** Removed internal event emitter (`hub` property) from `AbstractMessageManager` ([#5103](https://github.com/MetaMask/core/pull/5103))
 - **BREAKING:** `unapprovedMessage` and `updateBadge` removed from internal events. These events are now emitted from messaging system ([#5103](https://github.com/MetaMask/core/pull/5103))
   - Controllers should now listen to `DerivedManagerName:X` event instead of using internal event emitter.
-- Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
 
 ## [11.0.3]
 

diff --git a/packages/message-manager/src/AbstractMessageManager.ts b/packages/message-manager/src/AbstractMessageManager.ts
@@ -100,7 +100,7 @@ export type MessageManagerState<Message extends AbstractMessage> = {
 
 export type UpdateBadgeEvent = {
   type: `${string}:updateBadge`;
-  payload: [unusedPayload: string];
+  payload: [];
 };
 
 /**
@@ -245,8 +245,7 @@ export abstract class AbstractMessageManager<
       state.unapprovedMessagesCount = this.getUnapprovedMessagesCount();
     });
     if (emitUpdateBadge) {
-      // Empty payload is used to satisfy event constraint for BaseControllerV2
-      this.messagingSystem.publish(`${this.name as string}:updateBadge`, '');
+      this.messagingSystem.publish(`${this.name as string}:updateBadge`);
     }
   }
 

diff --git a/packages/message-manager/src/DecryptMessageManager.ts b/packages/message-manager/src/DecryptMessageManager.ts
@@ -25,10 +25,17 @@ export type DecryptMessageManagerUnapprovedMessageAddedEvent = {
   payload: [AbstractMessageParamsMetamask];
 };
 
+export type DecryptMessageManagerUpdateBadgeEvent = {
+  type: `${typeof managerName}:updateBadge`;
+  payload: [];
+};
+
 export type DecryptMessageManagerMessenger = RestrictedControllerMessenger<
   string,
   ActionConstraint,
-  EventConstraint | DecryptMessageManagerUnapprovedMessageAddedEvent,
+  | EventConstraint
+  | DecryptMessageManagerUnapprovedMessageAddedEvent
+  | DecryptMessageManagerUpdateBadgeEvent,
   string,
   string
 >;
@@ -90,7 +97,9 @@ export class DecryptMessageManager extends AbstractMessageManager<
   DecryptMessageParams,
   DecryptMessageParamsMetamask,
   ActionConstraint,
-  EventConstraint | DecryptMessageManagerUnapprovedMessageAddedEvent
+  | EventConstraint
+  | DecryptMessageManagerUnapprovedMessageAddedEvent
+  | DecryptMessageManagerUpdateBadgeEvent
 > {
   constructor({
     additionalFinishStatuses,

diff --git a/packages/message-manager/src/EncryptionPublicKeyManager.ts b/packages/message-manager/src/EncryptionPublicKeyManager.ts
@@ -26,10 +26,17 @@ export type EncryptionPublicKeyManagerUnapprovedMessageAddedEvent = {
   payload: [AbstractMessageParamsMetamask];
 };
 
+export type EncryptionPublicKeyManagerUpdateBadgeEvent = {
+  type: `${typeof managerName}:updateBadge`;
+  payload: [];
+};
+
 export type EncryptionPublicKeyManagerMessenger = RestrictedControllerMessenger<
   string,
   ActionConstraint,
-  EventConstraint | EncryptionPublicKeyManagerUnapprovedMessageAddedEvent,
+  | EventConstraint
+  | EncryptionPublicKeyManagerUnapprovedMessageAddedEvent
+  | EncryptionPublicKeyManagerUpdateBadgeEvent,
   string,
   string
 >;
@@ -88,7 +95,9 @@ export class EncryptionPublicKeyManager extends AbstractMessageManager<
   EncryptionPublicKeyParams,
   EncryptionPublicKeyParamsMetamask,
   ActionConstraint,
-  EventConstraint | EncryptionPublicKeyManagerUnapprovedMessageAddedEvent
+  | EventConstraint
+  | EncryptionPublicKeyManagerUnapprovedMessageAddedEvent
+  | EncryptionPublicKeyManagerUpdateBadgeEvent
 > {
   constructor({
     additionalFinishStatuses,