fix: remove push check in main notification controller

instead the push controller will bail early and do the correct checks

Author: Prithpal-Sooriya

packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.test.ts

@@ -47,7 +47,6 @@ 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';
-import type { NotificationServicesPushControllerGetStateAction } from '../NotificationServicesPushController';
 
 // Mock type used for testing purposes
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -959,7 +958,6 @@ function mockNotificationMessenger() {
       'KeyringController:getState',
       'AuthenticationController:getBearerToken',
       'AuthenticationController:isSignedIn',
-      'NotificationServicesPushController:getState',
       'NotificationServicesPushController:disablePushNotifications',
       'NotificationServicesPushController:enablePushNotifications',
       'NotificationServicesPushController:updateTriggerPushNotifications',
@@ -1015,14 +1013,6 @@ function mockNotificationMessenger() {
   const mockPerformSetStorage =
     typedMockAction<UserStorageController.UserStorageControllerPerformSetStorage>();
 
-  const mockPushControllerGetState =
-    typedMockAction<NotificationServicesPushControllerGetStateAction>().mockReturnValue(
-      {
-        fcmToken: '',
-        isPushEnabled: true,
-      },
-    );
-
   jest.spyOn(messenger, 'call').mockImplementation((...args) => {
     const [actionType] = args;
 
@@ -1046,10 +1036,6 @@ function mockNotificationMessenger() {
       return mockIsSignedIn();
     }
 
-    if (actionType === 'NotificationServicesPushController:getState') {
-      return mockPushControllerGetState();
-    }
-
     if (
       actionType ===
       'NotificationServicesPushController:disablePushNotifications'

packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts

@@ -34,7 +34,6 @@ import type { OnChainRawNotification } from './types/on-chain-notification/on-ch
 import type { UserStorage } from './types/user-storage/user-storage';
 import * as Utils from './utils/utils';
 import type {
-  NotificationServicesPushControllerGetStateAction,
   NotificationServicesPushControllerStateChangeEvent,
   NotificationServicesPushControllerState,
 } from '../NotificationServicesPushController';
@@ -238,7 +237,6 @@ export type AllowedActions =
   | UserStorageController.UserStorageControllerPerformGetStorage
   | UserStorageController.UserStorageControllerPerformSetStorage
   // Push Notifications Controller Requests
-  | NotificationServicesPushControllerGetStateAction
   | NotificationServicesPushControllerEnablePushNotifications
   | NotificationServicesPushControllerDisablePushNotifications
   | NotificationServicesPushControllerUpdateTriggerPushNotifications
@@ -365,10 +363,6 @@ export default class NotificationServicesController extends BaseController<
   };
 
   readonly #pushNotifications = {
-    isEnabled: () =>
-      this.messagingSystem.call('NotificationServicesPushController:getState')
-        ?.isPushEnabled ?? false,
-
     subscribeToPushEnabled: async () => {
       this.messagingSystem.subscribe(
         'NotificationServicesPushController:stateChange',
@@ -399,9 +393,6 @@ export default class NotificationServicesController extends BaseController<
       );
     },
     enablePushNotifications: async (UUIDs: string[]) => {
-      if (!this.#pushNotifications.isEnabled()) {
-        return;
-      }
       try {
         await this.messagingSystem.call(
           'NotificationServicesPushController:enablePushNotifications',
@@ -412,9 +403,6 @@ export default class NotificationServicesController extends BaseController<
       }
     },
     disablePushNotifications: async (UUIDs: string[]) => {
-      if (!this.#pushNotifications.isEnabled()) {
-        return;
-      }
       try {
         await this.messagingSystem.call(
           'NotificationServicesPushController:disablePushNotifications',
@@ -425,9 +413,6 @@ export default class NotificationServicesController extends BaseController<
       }
     },
     updatePushNotifications: async (UUIDs: string[]) => {
-      if (!this.#pushNotifications.isEnabled()) {
-        return;
-      }
       try {
         await this.messagingSystem.call(
           'NotificationServicesPushController:updateTriggerPushNotifications',
@@ -438,9 +423,6 @@ export default class NotificationServicesController extends BaseController<
       }
     },
     subscribe: () => {
-      if (!this.#pushNotifications.isEnabled()) {
-        return;
-      }
       this.messagingSystem.subscribe(
         'NotificationServicesPushController:onNewNotifications',
         (notification) => {

packages/notification-services-controller/src/NotificationServicesPushController/NotificationServicesPushController.ts

@@ -215,11 +215,18 @@ export default class NotificationServicesPushController extends BaseController<
 
   setIsPushNotificationsEnabled(isEnabled: boolean) {
     this.update((state) => {
+      if (!state.isPushEnabled) {
+        state.fcmToken = '';
+      }
       state.isPushEnabled = isEnabled;
     });
   }
 
   async subscribeToPushNotifications() {
+    if (!this.#config.isPushFeatureEnabled) {
+      return;
+    }
+
     if (this.#pushListenerUnsubscribe) {
       this.#pushListenerUnsubscribe();
       this.#pushListenerUnsubscribe = undefined;