@metamask-previews/notification-services-controller 10.0.0-preview-7dcef379 → 10.0.0-preview-5dcecbb7

package/CHANGELOG.md

@@ -9,24 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **BREAKING:** Migrated to notification v2 endpoints ([#5945](https://github.com/MetaMask/core/pull/5945))
-
-  - `https://trigger.api.cx.metamask.io/api/v2` for managing out notification subscriptions
-  - `https://notification.api.cx.metamask.io/api/v2` for fetching notifications (in-app notifications)
-  - `https://push.api.cx.metamask.io/v2` for subscribing push notifications
-  - Renamed method `updateOnChainTriggersByAccount` to `enableAccounts` in `NotificationServicesController`
-  - Renamed method `deleteOnChainTriggersByAccount` to `disableAccounts` in `NotificationServicesController`
-  - Deprecated `updateTriggerPushNotifications` from `NotificationServicesPushController` and will be removed in a subsequent release.
-
 - Bump `@metamask/controller-utils` to `^11.10.0` ([#5935](https://github.com/MetaMask/core/pull/5935))
 
-### Removed
-
-- **BREAKING:** Migrated to notification v2 endpoints ([#5945](https://github.com/MetaMask/core/pull/5945))
-
-  - removed `NotificationServicesPushController:updateTriggerPushNotifications` action from `NotificationServicesController`
-  - removed `UserStorageController` usage from `NotificationServicesController`.
-
 ## [10.0.0]
 
 ### Changed

package/dist/NotificationServicesController/NotificationServicesController.cjs

@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _NotificationServicesController_instances, _NotificationServicesController_keyringController, _NotificationServicesController_auth, _NotificationServicesController_pushNotifications, _NotificationServicesController_accounts, _NotificationServicesController_featureAnnouncementEnv, _NotificationServicesController_registerMessageHandlers, _NotificationServicesController_clearLoadingStates, _NotificationServicesController_assertAuthEnabled, _NotificationServicesController_enableAuth, _NotificationServicesController_getBearerToken, _NotificationServicesController_setIsUpdatingMetamaskNotifications, _NotificationServicesController_setIsFetchingMetamaskNotifications, _NotificationServicesController_setIsCheckingAccountsPresence, _NotificationServicesController_updateUpdatingAccountsState, _NotificationServicesController_clearUpdatingAccountsState;
+var _NotificationServicesController_instances, _NotificationServicesController_keyringController, _NotificationServicesController_auth, _NotificationServicesController_storage, _NotificationServicesController_pushNotifications, _NotificationServicesController_accounts, _NotificationServicesController_featureAnnouncementEnv, _NotificationServicesController_registerMessageHandlers, _NotificationServicesController_clearLoadingStates, _NotificationServicesController_assertAuthEnabled, _NotificationServicesController_enableAuth, _NotificationServicesController_getValidStorageKeyAndBearerToken, _NotificationServicesController_assertUserStorage, _NotificationServicesController_getUserStorage, _NotificationServicesController_setIsUpdatingMetamaskNotifications, _NotificationServicesController_setIsFetchingMetamaskNotifications, _NotificationServicesController_setIsCheckingAccountsPresence, _NotificationServicesController_updateUpdatingAccountsState, _NotificationServicesController_clearUpdatingAccountsState;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -44,10 +44,12 @@ const controller_utils_1 = require("@metamask/controller-utils");
 const keyring_controller_1 = require("@metamask/keyring-controller");
 const utils_1 = require("@metamask/utils");
 const loglevel_1 = __importDefault(require("loglevel"));
+const constants_1 = require("./constants/constants.cjs");
 const notification_schema_1 = require("./constants/notification-schema.cjs");
 const process_notifications_1 = require("./processors/process-notifications.cjs");
 const FeatureNotifications = __importStar(require("./services/feature-announcements.cjs"));
 const OnChainNotifications = __importStar(require("./services/onchain-notifications.cjs"));
+const Utils = __importStar(require("./utils/utils.cjs"));
 // Unique name for the controller
 const controllerName = 'NotificationServicesController';
 const metadata = {
@@ -157,6 +159,17 @@ class NotificationServicesController extends base_controller_1.BaseController {
                 return await this.messagingSystem.call('AuthenticationController:performSignIn');
             },
         });
+        _NotificationServicesController_storage.set(this, {
+            getStorageKey: () => {
+                return this.messagingSystem.call('UserStorageController:getStorageKey');
+            },
+            getNotificationStorage: async () => {
+                return await this.messagingSystem.call('UserStorageController:performGetStorage', 'notifications.notification_settings');
+            },
+            setNotificationStorage: async (state) => {
+                return await this.messagingSystem.call('UserStorageController:performSetStorage', 'notifications.notification_settings', state);
+            },
+        });
         _NotificationServicesController_pushNotifications.set(this, {
             // Flag to check is notifications have been setup when the browser/extension is initialized.
             // We want to re-initialize push notifications when the browser/extension is refreshed
@@ -165,9 +178,9 @@ class NotificationServicesController extends base_controller_1.BaseController {
             subscribeToPushNotifications: async () => {
                 await this.messagingSystem.call('NotificationServicesPushController:subscribeToPushNotifications');
             },
-            enablePushNotifications: async (addresses) => {
+            enablePushNotifications: async (UUIDs) => {
                 try {
-                    await this.messagingSystem.call('NotificationServicesPushController:enablePushNotifications', addresses);
+                    await this.messagingSystem.call('NotificationServicesPushController:enablePushNotifications', UUIDs);
                 }
                 catch (e) {
                     loglevel_1.default.error('Silently failed to enable push notifications', e);
@@ -181,6 +194,14 @@ class NotificationServicesController extends base_controller_1.BaseController {
                     loglevel_1.default.error('Silently failed to disable push notifications', e);
                 }
             },
+            updatePushNotifications: async (UUIDs) => {
+                try {
+                    await this.messagingSystem.call('NotificationServicesPushController:updateTriggerPushNotifications', UUIDs);
+                }
+                catch (e) {
+                    loglevel_1.default.error('Silently failed to update push notifications', e);
+                }
+            },
             subscribe: () => {
                 this.messagingSystem.subscribe('NotificationServicesPushController:onNewNotifications', (notification) => {
                     // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -215,7 +236,7 @@ class NotificationServicesController extends base_controller_1.BaseController {
         _NotificationServicesController_accounts.set(this, {
             // Flag to ensure we only setup once
             isNotificationAccountsSetup: false,
-            getNotificationAccounts: () => {
+            getNotificationAccounts: async () => {
                 const { keyrings } = this.messagingSystem.call('KeyringController:getState');
                 const firstHDKeyring = keyrings.find((k) => k.type === keyring_controller_1.KeyringTypes.hd.toString());
                 const keyringAccounts = firstHDKeyring?.accounts ?? null;
@@ -226,9 +247,9 @@ class NotificationServicesController extends base_controller_1.BaseController {
              *
              * @returns addresses removed, added, and latest list of addresses
              */
-            listAccounts: () => {
+            listAccounts: async () => {
                 // Get previous and current account sets
-                const nonChecksumAccounts = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").getNotificationAccounts();
+                const nonChecksumAccounts = await __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").getNotificationAccounts();
                 if (!nonChecksumAccounts) {
                     return {
                         accountsAdded: [],
@@ -265,11 +286,13 @@ class NotificationServicesController extends base_controller_1.BaseController {
             },
             /**
              * Initializes the cache/previous list. This is handy so we have an accurate in-mem state of the previous list of accounts.
+             *
+             * @returns result from list accounts
              */
-            initialize: () => {
+            initialize: async () => {
                 if (__classPrivateFieldGet(this, _NotificationServicesController_keyringController, "f").isUnlocked &&
                     !__classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").isNotificationAccountsSetup) {
-                    __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
+                    await __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
                     __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").isNotificationAccountsSetup = true;
                 }
             },
@@ -285,15 +308,15 @@ class NotificationServicesController extends base_controller_1.BaseController {
                         !hasTotalAccountsChanged) {
                         return;
                     }
-                    const { accountsAdded, accountsRemoved } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
+                    const { accountsAdded, accountsRemoved } = await __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
                     const promises = [];
                     if (accountsAdded.length > 0) {
-                        promises.push(this.enableAccounts(accountsAdded));
+                        promises.push(this.updateOnChainTriggersByAccount(accountsAdded));
                     }
                     if (accountsRemoved.length > 0) {
-                        promises.push(this.disableAccounts(accountsRemoved));
+                        promises.push(this.deleteOnChainTriggersByAccount(accountsRemoved));
                     }
-                    await Promise.allSettled(promises);
+                    await Promise.all(promises);
                 }, (state) => {
                     return (state?.keyrings?.flatMap?.((keyring) => keyring.accounts)?.length ??
                         0);
@@ -307,9 +330,10 @@ class NotificationServicesController extends base_controller_1.BaseController {
     }
     init() {
         __classPrivateFieldGet(this, _NotificationServicesController_keyringController, "f").setupLockedStateSubscriptions(async () => {
-            __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").initialize();
+            await __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").initialize();
             await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").initializePushNotifications();
         });
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").initialize();
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").initializePushNotifications();
@@ -320,20 +344,13 @@ class NotificationServicesController extends base_controller_1.BaseController {
      * Public method to expose enabling push notifications
      */
     async enablePushNotifications() {
-        try {
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            const { accounts } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
-            const addressesWithNotifications = await OnChainNotifications.getOnChainNotificationsConfigCached(bearerToken, accounts);
-            const addresses = addressesWithNotifications
-                .filter((a) => Boolean(a.enabled))
-                .map((a) => a.address);
-            if (addresses.length > 0) {
-                await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").enablePushNotifications(addresses);
-            }
-        }
-        catch (e) {
-            loglevel_1.default.error('Failed to enable push notifications', e);
+        await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_enableAuth).call(this);
+        const storage = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getUserStorage).call(this);
+        if (!storage) {
+            throw new Error('Unable to get triggers');
         }
+        const uuids = Utils.getAllUUIDs(storage);
+        await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").enablePushNotifications(uuids);
     }
     /**
      * Public method to expose disabling push notifications
@@ -345,13 +362,10 @@ class NotificationServicesController extends base_controller_1.BaseController {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_setIsCheckingAccountsPresence).call(this, true);
             // Retrieve user storage
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            const addressesWithNotifications = await OnChainNotifications.getOnChainNotificationsConfigCached(bearerToken, accounts);
-            const result = {};
-            addressesWithNotifications.forEach((a) => {
-                result[a.address] = a.enabled;
-            });
-            return result;
+            const userStorage = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getUserStorage).call(this);
+            __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_assertUserStorage).call(this, userStorage);
+            const presence = Utils.checkAccountsPresence(userStorage, accounts);
+            return presence;
         }
         catch (error) {
             loglevel_1.default.error('Failed to check accounts presence', error);
@@ -395,32 +409,40 @@ class NotificationServicesController extends base_controller_1.BaseController {
     async createOnChainTriggers(opts) {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_setIsUpdatingMetamaskNotifications).call(this, true);
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            const { accounts } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
-            // 1. See if has enabled notifications before
-            const addressesWithNotifications = await OnChainNotifications.getOnChainNotificationsConfigCached(bearerToken, accounts);
-            // Notifications API can return array with addresses set to false
-            // So assert that at least one address is enabled
-            let accountsWithNotifications = addressesWithNotifications
-                .filter((a) => Boolean(a.enabled))
-                .map((a) => a.address);
-            // 2. Enable Notifications (if no accounts subscribed or we are resetting)
-            if (accountsWithNotifications.length === 0 || opts?.resetNotifications) {
-                await OnChainNotifications.updateOnChainNotifications(bearerToken, accounts.map((address) => ({ address, enabled: true })));
-                accountsWithNotifications = accounts;
+            const { bearerToken, storageKey } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getValidStorageKeyAndBearerToken).call(this);
+            const { accounts } = await __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
+            // Attempt Get User Storage
+            // Will be null if entry does not exist, or a user is resetting their notifications
+            // Will be defined if entry exists
+            // Will throw if fails to get the user storage entry
+            let userStorage = opts?.resetNotifications
+                ? null
+                : await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getUserStorage).call(this);
+            // If userStorage does not exist, create a new one
+            // All the triggers created are set as: "disabled"
+            if (userStorage?.[constants_1.USER_STORAGE_VERSION_KEY] === undefined) {
+                userStorage = Utils.initializeUserStorage(accounts.map((account) => ({ address: account })), false);
+                // Write the userStorage
+                await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").setNotificationStorage(JSON.stringify(userStorage));
             }
-            // 3. Lazily enable push notifications (FCM may take some time, so keeps UI unblocked)
-            __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f")
-                .enablePushNotifications(accountsWithNotifications)
-                .catch(() => {
+            // Create the triggers
+            const triggers = Utils.traverseUserStorageTriggers(userStorage);
+            await OnChainNotifications.createOnChainTriggers(userStorage, storageKey, bearerToken, triggers);
+            // Create push notifications triggers in background
+            const allUUIDS = Utils.getAllUUIDs(userStorage);
+            // We do not want to wait for this request as it may take a while (e.g. for Firebase to setup)
+            __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").enablePushNotifications(allUUIDS).catch(() => {
                 // Do Nothing
             });
+            // Write the new userStorage (triggers are now "enabled")
+            await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").setNotificationStorage(JSON.stringify(userStorage));
             // Update the state of the controller
             this.update((state) => {
                 state.isNotificationServicesEnabled = true;
                 state.isFeatureAnnouncementsEnabled = true;
                 state.isMetamaskNotificationsFeatureSeen = true;
             });
+            return userStorage;
         }
         catch (err) {
             loglevel_1.default.error('Failed to create On Chain triggers', err);
@@ -433,6 +455,10 @@ class NotificationServicesController extends base_controller_1.BaseController {
     /**
      * Enables all MetaMask notifications for the user.
      * This is identical flow when initializing notifications for the first time.
+     * 1. Enable Profile Syncing
+     * 2. Get or Create Notification User Storage
+     * 3. Upsert Triggers
+     * 4. Update Push notifications
      *
      * @throws {Error} If there is an error during the process of enabling notifications.
      */
@@ -480,11 +506,12 @@ class NotificationServicesController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_setIsUpdatingMetamaskNotifications).call(this, false);
     }
     /**
-     * Deletes on-chain triggers associated with a specific account/s.
+     * Deletes on-chain triggers associated with a specific account.
      * This method performs several key operations:
-     * 1. Validates Auth
-     * 2. Deletes accounts
-     * (note) We do not need to look through push notifications as we've deleted triggers
+     * 1. Validates Auth & Storage
+     * 2. Finds and deletes all triggers associated with the account
+     * 3. Disables any related push notifications
+     * 4. Updates Storage to reflect new state.
      *
      * **Action** - When a user disables notifications for a given account in settings.
      *
@@ -492,13 +519,29 @@ class NotificationServicesController extends base_controller_1.BaseController {
      * @returns A promise that resolves to void or an object containing a success message.
      * @throws {Error} Throws an error if unauthenticated or from other operations.
      */
-    async disableAccounts(accounts) {
+    async deleteOnChainTriggersByAccount(accounts) {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_updateUpdatingAccountsState).call(this, accounts);
             // Get and Validate BearerToken and User Storage Key
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
+            const { bearerToken, storageKey } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getValidStorageKeyAndBearerToken).call(this);
+            // Get & Validate User Storage
+            const userStorage = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getUserStorage).call(this);
+            __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_assertUserStorage).call(this, userStorage);
+            // Get the UUIDs to delete
+            const UUIDs = accounts
+                .map((a) => Utils.getUUIDsForAccount(userStorage, a.toLowerCase()))
+                .flat();
+            if (UUIDs.length === 0) {
+                return userStorage;
+            }
             // Delete these UUIDs (Mutates User Storage)
-            await OnChainNotifications.updateOnChainNotifications(bearerToken, accounts.map((address) => ({ address, enabled: false })));
+            await OnChainNotifications.deleteOnChainTriggers(userStorage, storageKey, bearerToken, UUIDs);
+            // Update Push Notifications with new list of IDs
+            const remainingTriggerIds = Utils.getAllUUIDs(userStorage);
+            await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").updatePushNotifications(remainingTriggerIds);
+            // Update User Storage
+            await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").setNotificationStorage(JSON.stringify(userStorage));
+            return userStorage;
         }
         catch (err) {
             loglevel_1.default.error('Failed to delete OnChain triggers', err);
@@ -523,11 +566,45 @@ class NotificationServicesController extends base_controller_1.BaseController {
      * @returns A promise that resolves to the updated user storage.
      * @throws {Error} Throws an error if unauthenticated or from other operations.
      */
-    async enableAccounts(accounts) {
+    async updateOnChainTriggersByAccount(accounts) {
         try {
             __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_updateUpdatingAccountsState).call(this, accounts);
-            const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-            await OnChainNotifications.updateOnChainNotifications(bearerToken, accounts.map((address) => ({ address, enabled: true })));
+            // Get and Validate BearerToken and User Storage Key
+            const { bearerToken, storageKey } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getValidStorageKeyAndBearerToken).call(this);
+            // Get & Validate User Storage
+            const userStorage = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getUserStorage).call(this);
+            __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_assertUserStorage).call(this, userStorage);
+            // Add any missing triggers
+            accounts.forEach((a) => Utils.upsertAddressTriggers(a, userStorage));
+            const newTriggers = Utils.traverseUserStorageTriggers(userStorage, {
+                mapTrigger: (t) => {
+                    if (!t.enabled) {
+                        return t;
+                    }
+                    return undefined;
+                },
+            });
+            // Create any missing triggers.
+            if (newTriggers.length > 0) {
+                // Write te updated userStorage (where triggers are disabled)
+                await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").setNotificationStorage(JSON.stringify(userStorage));
+                // Create the triggers
+                const triggers = Utils.traverseUserStorageTriggers(userStorage, {
+                    mapTrigger: (t) => {
+                        if (accounts.some((a) => a.toLowerCase() === t.address.toLowerCase())) {
+                            return t;
+                        }
+                        return undefined;
+                    },
+                });
+                await OnChainNotifications.createOnChainTriggers(userStorage, storageKey, bearerToken, triggers);
+            }
+            // Update Push Notifications Triggers
+            const UUIDs = Utils.getAllUUIDs(userStorage);
+            await __classPrivateFieldGet(this, _NotificationServicesController_pushNotifications, "f").updatePushNotifications(UUIDs);
+            // Update the userStorage (where triggers are enabled)
+            await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").setNotificationStorage(JSON.stringify(userStorage));
+            return userStorage;
         }
         catch (err) {
             loglevel_1.default.error('Failed to update OnChain triggers', err);
@@ -554,31 +631,37 @@ class NotificationServicesController extends base_controller_1.BaseController {
             // Not used by Snaps
             const isGlobalNotifsEnabled = this.state.isNotificationServicesEnabled;
             // Raw Feature Notifications
-            const rawAnnouncements = isGlobalNotifsEnabled && this.state.isFeatureAnnouncementsEnabled
+            const rawFeatureAnnouncementNotifications = isGlobalNotifsEnabled && this.state.isFeatureAnnouncementsEnabled
                 ? await FeatureNotifications.getFeatureAnnouncementNotifications(__classPrivateFieldGet(this, _NotificationServicesController_featureAnnouncementEnv, "f"), previewToken).catch(() => [])
                 : [];
             // Raw On Chain Notifications
             const rawOnChainNotifications = [];
             if (isGlobalNotifsEnabled) {
-                try {
-                    const { bearerToken } = await __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_getBearerToken).call(this);
-                    const { accounts } = __classPrivateFieldGet(this, _NotificationServicesController_accounts, "f").listAccounts();
-                    const addressesWithNotifications = (await OnChainNotifications.getOnChainNotificationsConfigCached(bearerToken, accounts)).map((a) => a.address);
-                    const notifications = await OnChainNotifications.getOnChainNotifications(bearerToken, addressesWithNotifications).catch(() => []);
+                const userStorage = await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f")
+                    .getNotificationStorage()
+                    .then((s) => s && JSON.parse(s))
+                    .catch(() => null);
+                const bearerToken = await __classPrivateFieldGet(this, _NotificationServicesController_auth, "f").getBearerToken().catch(() => null);
+                if (userStorage && bearerToken) {
+                    const notifications = await OnChainNotifications.getOnChainNotifications(userStorage, bearerToken).catch(() => []);
                     rawOnChainNotifications.push(...notifications);
                 }
-                catch {
-                    // Do nothing
-                }
             }
             // Snap Notifications (original)
             // We do not want to remove them
             const snapNotifications = this.state.metamaskNotificationsList.filter((notification) => notification.type === notification_schema_1.TRIGGER_TYPES.SNAP);
+            // Process Notifications
             const readIds = this.state.metamaskNotificationsReadList;
+            const isNotUndefined = (t) => Boolean(t);
+            const processAndFilter = (ns) => ns
+                .map((n) => (0, process_notifications_1.safeProcessNotification)(n, readIds))
+                .filter(isNotUndefined);
+            const featureAnnouncementNotifications = processAndFilter(rawFeatureAnnouncementNotifications);
+            const onChainNotifications = processAndFilter(rawOnChainNotifications);
             // Combine Notifications
             const metamaskNotifications = [
-                ...(0, process_notifications_1.processAndFilterNotifications)(rawAnnouncements, readIds),
-                ...(0, process_notifications_1.processAndFilterNotifications)(rawOnChainNotifications, readIds),
+                ...featureAnnouncementNotifications,
+                ...onChainNotifications,
                 ...snapNotifications,
             ];
             // Sort Notifications
@@ -746,7 +829,7 @@ class NotificationServicesController extends base_controller_1.BaseController {
         }
     }
 }
-_NotificationServicesController_keyringController = new WeakMap(), _NotificationServicesController_auth = new WeakMap(), _NotificationServicesController_pushNotifications = new WeakMap(), _NotificationServicesController_accounts = new WeakMap(), _NotificationServicesController_featureAnnouncementEnv = new WeakMap(), _NotificationServicesController_instances = new WeakSet(), _NotificationServicesController_registerMessageHandlers = function _NotificationServicesController_registerMessageHandlers() {
+_NotificationServicesController_keyringController = new WeakMap(), _NotificationServicesController_auth = new WeakMap(), _NotificationServicesController_storage = new WeakMap(), _NotificationServicesController_pushNotifications = new WeakMap(), _NotificationServicesController_accounts = new WeakMap(), _NotificationServicesController_featureAnnouncementEnv = new WeakMap(), _NotificationServicesController_instances = new WeakSet(), _NotificationServicesController_registerMessageHandlers = function _NotificationServicesController_registerMessageHandlers() {
     this.messagingSystem.registerActionHandler(`${controllerName}:updateMetamaskNotificationsList`, this.updateMetamaskNotificationsList.bind(this));
     this.messagingSystem.registerActionHandler(`${controllerName}:disableNotificationServices`, this.disableNotificationServices.bind(this));
     this.messagingSystem.registerActionHandler(`${controllerName}:getNotificationsByType`, this.getNotificationsByType.bind(this));
@@ -770,13 +853,42 @@ _NotificationServicesController_keyringController = new WeakMap(), _Notification
     if (!isSignedIn) {
         await __classPrivateFieldGet(this, _NotificationServicesController_auth, "f").signIn();
     }
-}, _NotificationServicesController_getBearerToken = async function _NotificationServicesController_getBearerToken() {
+}, _NotificationServicesController_getValidStorageKeyAndBearerToken = async function _NotificationServicesController_getValidStorageKeyAndBearerToken() {
     __classPrivateFieldGet(this, _NotificationServicesController_instances, "m", _NotificationServicesController_assertAuthEnabled).call(this);
     const bearerToken = await __classPrivateFieldGet(this, _NotificationServicesController_auth, "f").getBearerToken();
-    if (!bearerToken) {
-        throw new Error('Missing BearerToken');
+    const storageKey = await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").getStorageKey();
+    if (!bearerToken || !storageKey) {
+        throw new Error('Missing BearerToken or storage key');
+    }
+    return { bearerToken, storageKey };
+}, _NotificationServicesController_assertUserStorage = function _NotificationServicesController_assertUserStorage(storage) {
+    if (!storage) {
+        throw new Error('User Storage does not exist');
+    }
+}, _NotificationServicesController_getUserStorage = 
+/**
+ * Retrieves and parses the user storage from the storage key.
+ *
+ * This method attempts to retrieve the user storage using the specified storage key,
+ * then parses the JSON string to an object. If the storage is not found or cannot be parsed,
+ * it throws an error.
+ *
+ * @returns The parsed user storage object or null
+ */
+async function _NotificationServicesController_getUserStorage() {
+    const userStorageString = await __classPrivateFieldGet(this, _NotificationServicesController_storage, "f").getNotificationStorage();
+    if (!userStorageString) {
+        return null;
+    }
+    try {
+        const userStorage = JSON.parse(userStorageString);
+        Utils.cleanUserStorage(userStorage);
+        return userStorage;
+    }
+    catch {
+        loglevel_1.default.error('Unable to parse User Storage');
+        return null;
     }
-    return { bearerToken };
 }, _NotificationServicesController_setIsUpdatingMetamaskNotifications = function _NotificationServicesController_setIsUpdatingMetamaskNotifications(isUpdatingMetamaskNotifications) {
     this.update((state) => {
         state.isUpdatingMetamaskNotifications = isUpdatingMetamaskNotifications;