fix: disable notifications (#4890)

MetaMask · Nov 1, 2024 · 096f2d1 · 096f2d1
1 parent 6814f82
commit 096f2d1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...ices-controller/src/NotificationServicesController/NotificationServicesController.test.ts b/...ices-controller/src/NotificationServicesController/NotificationServicesController.test.ts
@@ -41,6 +41,7 @@ import { processFeatureAnnouncement } from './processors';
 import { processNotification } from './processors/process-notifications';
 import { processSnapNotification } from './processors/process-snap-notifications';
 import * as OnChainNotifications from './services/onchain-notifications';
+import type { INotification } from './types';
 import type { UserStorage } from './types/user-storage/user-storage';
 import * as Utils from './utils/utils';
 
@@ -834,7 +835,13 @@ describe('metamask-notifications - disableMetamaskNotifications()', () => {
     const controller = new NotificationServicesController({
       messenger: mocks.messenger,
       env: { featureAnnouncements: featureAnnouncementsEnv },
-      state: { isNotificationServicesEnabled: true },
+      state: {
+        isNotificationServicesEnabled: true,
+        metamaskNotificationsList: [
+          createMockFeatureAnnouncementRaw() as INotification,
+          createMockSnapNotification() as INotification,
+        ],
+      },
     });
 
     const promise = controller.disableNotificationServices();
@@ -847,6 +854,9 @@ describe('metamask-notifications - disableMetamaskNotifications()', () => {
     // Act - final state
     expect(controller.state.isUpdatingMetamaskNotifications).toBe(false);
     expect(controller.state.isNotificationServicesEnabled).toBe(false);
+    expect(controller.state.metamaskNotificationsList).toStrictEqual([
+      createMockSnapNotification(),
+    ]);
 
     expect(mocks.mockDisablePushNotifications).toHaveBeenCalled();
 

diff --git a/...-services-controller/src/NotificationServicesController/NotificationServicesController.ts b/...-services-controller/src/NotificationServicesController/NotificationServicesController.ts
@@ -924,11 +924,17 @@ export default class NotificationServicesController extends BaseController<
       const UUIDs = Utils.getAllUUIDs(userStorage);
       await this.#pushNotifications.disablePushNotifications(UUIDs);
 
+      const snapNotifications = this.state.metamaskNotificationsList.filter(
+        (notification) => notification.type === TRIGGER_TYPES.SNAP,
+      );
+
       // Clear Notification States (toggles and list)
       this.update((state) => {
         state.isNotificationServicesEnabled = false;
         state.isFeatureAnnouncementsEnabled = false;
-        state.metamaskNotificationsList = [];
+        // reassigning the notifications list with just snaps
+        // since the disable shouldn't affect snaps notifications
+        state.metamaskNotificationsList = snapNotifications;
       });
     } catch (e) {
       log.error('Unable to disable notifications', e);