feat: Extend notification account toggles to all wallet keyrings (#27254)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->
Update **Notifications settings** so the **Account activity** section
lists notification-eligible accounts from all wallet keyrings, not just
the first HD wallet. This is tied to the relevant PRs in MM-core:
- MetaMask/core#8108
- MetaMask/core#8449

Keep the existing per-account toggle behavior unchanged, so imported
accounts use the same enable/disable notification flow as HD accounts.

Add focused test coverage for multi-wallet rendering and update the
settings snapshot accordingly.
 
<img width="328" height="722" alt="image"
src="https://github.com/user-attachments/assets/b2c296a2-2cb7-4087-b33f-84741a90c3fb"
/>


## **Changelog**


<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry: Extend notification account toggles to all wallet
keyrings

## **Related issues**

Fixes:

## **Manual testing steps**

```gherkin
Feature: my feature name

  Scenario: user [verb for user action]
    Given [describe expected initial app state]

    When user [verb for user action]
    Then [describe expected outcome]
```

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.



<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Medium Risk**
> Changes the account-listing/filtering logic in notification settings
and upgrades the notification services controller, which could affect
which accounts appear and push-link behavior if filtering/messenger
wiring is incorrect.
> 
> **Overview**
> Extends **Notification Settings → Account activity** to list
notification-eligible (EVM) accounts across *all* wallets/keyrings,
instead of only the first HD/entropy wallet.
> 
> Introduces `useNotificationWalletAccountGroups()` to filter
wallet/account groups down to those containing EVM accounts, updates
`AccountsList` to render per-wallet sections via `SectionList` (skipping
non-EVM groups), and adjusts the settings screen to show/hide the
section based on these filtered groups. Updates and expands unit/UI
tests to cover multi-wallet rendering and empty/no-EVM scenarios, and
refreshes smoke-test notification mocks.
> 
> Also updates the notifications controller messenger delegation to
include push link add/delete actions, and bumps
`@metamask/notification-services-controller` to `^23.1.0`.
> 
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
9844b6e. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: oilnam

app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx

@@ -9,11 +9,13 @@ import { getValidNotificationAccounts } from '../../../../selectors/notification
 import {
   useAccountProps,
   useNotificationAccountListProps,
+  useNotificationWalletAccountGroups,
 } from './AccountsList.hooks';
 import { selectInternalAccountsById } from '../../../../selectors/accountsController';
 import { InternalAccount } from '@metamask/keyring-internal-api';
 import { selectAccountGroupsByWallet } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { AccountGroupType, AccountWalletType } from '@metamask/account-api';
+import { KeyringTypes } from '@metamask/keyring-controller';
 
 jest.mock('../../../../selectors/notifications', () => ({
   getValidNotificationAccounts: jest.fn(),
@@ -32,8 +34,39 @@ jest.mock(
   }),
 );
 
+const MOCK_KEYRING_TYPE = 'HD Key Tree' as KeyringTypes;
+
+const createNotificationAccountsMap = () =>
+  ({
+    'MOCK-ID-FOR-0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a29': {
+      id: 'MOCK-ID-FOR-0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a29',
+      address: '0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a29',
+      type: 'eip155:eoa',
+    } as InternalAccount,
+    'MOCK-ID-FOR-0x700CcD8172BC3807D893883a730A1E0E6630F8EC': {
+      id: 'MOCK-ID-FOR-0x700CcD8172BC3807D893883a730A1E0E6630F8EC',
+      address: '0x700CcD8172BC3807D893883a730A1E0E6630F8EC',
+      type: 'eip155:eoa',
+    } as InternalAccount,
+    'MOCK-ID-FOR-0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a20': {
+      id: 'MOCK-ID-FOR-0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a20',
+      address: '0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a20',
+      type: 'eip155:eoa',
+    } as InternalAccount,
+    'MOCK-ID-FOR-0x700CcD8172BC3807D893883a730A1E0E6630F8E0': {
+      id: 'MOCK-ID-FOR-0x700CcD8172BC3807D893883a730A1E0E6630F8E0',
+      address: '0x700CcD8172BC3807D893883a730A1E0E6630F8E0',
+      type: 'eip155:eoa',
+    } as InternalAccount,
+    'MOCK-ID-FOR-63jw5Q7pJXeHgHSvfTmKytUQ19hQgiAJQ5LZykmSMGRY': {
+      id: 'MOCK-ID-FOR-63jw5Q7pJXeHgHSvfTmKytUQ19hQgiAJQ5LZykmSMGRY',
+      address: '63jw5Q7pJXeHgHSvfTmKytUQ19hQgiAJQ5LZykmSMGRY',
+      type: 'solana:data-account',
+    } as InternalAccount,
+  }) satisfies Record<string, InternalAccount>;
+
 const arrangeMockUseAccounts = () => {
-  const createMockAccountGroup = (
+  const createMockMultichainAccountGroup = (
     idx: number,
     accounts: [string, ...string[]],
   ) =>
@@ -52,22 +85,40 @@ const arrangeMockUseAccounts = () => {
       },
     }) as const;
 
-  const group1 = createMockAccountGroup(0, [
+  const createMockSingleAccountGroup = <
+    T extends `keyring:${string}/${string}`,
+  >(
+    id: T,
+    account: string,
+  ) =>
+    ({
+      accounts: [account] as [string],
+      id,
+      type: AccountGroupType.SingleAccount,
+      metadata: {
+        hidden: false,
+        lastSelected: 0,
+        name: id,
+        pinned: false,
+      },
+    }) as const;
+
+  const group1 = createMockMultichainAccountGroup(0, [
     `MOCK-ID-FOR-0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a29`,
     'MOCK-ID-FOR-63jw5Q7pJXeHgHSvfTmKytUQ19hQgiAJQ5LZykmSMGRY',
   ]);
-  const group2 = createMockAccountGroup(1, [
+  const group2 = createMockMultichainAccountGroup(1, [
     `MOCK-ID-FOR-0x700CcD8172BC3807D893883a730A1E0E6630F8EC`,
     'MOCK-ID-FOR-Agsjd8HjGH5DxiXLMWc8fR4jjgHhvJG3TXcCpc1ieD9B',
   ]);
-  const group3 = createMockAccountGroup(0, [
+  const group3 = createMockSingleAccountGroup(
+    'keyring:wallet-2/0',
     `MOCK-ID-FOR-0xb2B92547A92C1aC55EAe3F6632Fa1aF87dc05a20`,
-    'MOCK-ID-FOR-63jw5Q7pJXeHgHSvfTmKytUQ19hQgiAJQ5LZykmSMGR0',
-  ]);
-  const group4 = createMockAccountGroup(1, [
+  );
+  const group4 = createMockSingleAccountGroup(
+    'keyring:wallet-2/1',
     `MOCK-ID-FOR-0x700CcD8172BC3807D893883a730A1E0E6630F8E0`,
-    'MOCK-ID-FOR-Agsjd8HjGH5DxiXLMWc8fR4jjgHhvJG3TXcCpc1ieD90',
-  ]);
+  );
 
   const mockSelectoWallets = jest
     .mocked(selectAccountGroupsByWallet)
@@ -94,13 +145,13 @@ const arrangeMockUseAccounts = () => {
       {
         title: 'Wallet 2',
         wallet: {
-          id: 'entropy:wallet-2',
-          type: AccountWalletType.Entropy,
+          id: 'keyring:wallet-2',
+          type: AccountWalletType.Keyring,
           metadata: {
-            entropy: {
-              id: '',
-            },
             name: 'Wallet 2',
+            keyring: {
+              type: MOCK_KEYRING_TYPE,
+            },
           },
           status: 'ready',
           groups: {
@@ -297,13 +348,54 @@ describe('useNotificationAccountListProps', () => {
   });
 });
 
+describe('useNotificationWalletAccountGroups', () => {
+  const arrangeMocks = () => {
+    const mocks = arrangeMockUseAccounts();
+    jest
+      .mocked(selectInternalAccountsById)
+      .mockReturnValue(createNotificationAccountsMap());
+
+    return mocks;
+  };
+
+  it('returns wallet groups for all wallets with EVM accounts', () => {
+    arrangeMocks();
+    const { result } = renderHookWithProvider(() =>
+      useNotificationWalletAccountGroups(),
+    );
+
+    expect(result.current).toHaveLength(2);
+    expect(result.current[0]).toStrictEqual(
+      expect.objectContaining({
+        title: 'Wallet 1',
+        wallet: expect.objectContaining({
+          id: 'entropy:wallet-1',
+          type: AccountWalletType.Entropy,
+        }),
+      }),
+    );
+    expect(result.current[1]).toStrictEqual(
+      expect.objectContaining({
+        title: 'Wallet 2',
+        wallet: expect.objectContaining({
+          id: 'keyring:wallet-2',
+          type: AccountWalletType.Keyring,
+        }),
+      }),
+    );
+  });
+});
+
 describe('useAccountProps', () => {
   const arrangeMocks = () => {
     const mockStore = jest.fn().mockReturnValue({
       settings: {
         avatarAccountType: AvatarAccountType.Maskicon,
       },
     });
+    jest
+      .mocked(selectInternalAccountsById)
+      .mockReturnValue(createNotificationAccountsMap());
 
     return {
       ...arrangeMockUseAccounts(),
@@ -318,7 +410,8 @@ describe('useAccountProps', () => {
     });
 
     expect(result.current.accountAvatarType).toBe(AvatarAccountType.Maskicon);
-    expect(result.current.firstHDWalletGroups).toStrictEqual(
+    expect(result.current.accountWalletGroups).toHaveLength(2);
+    expect(result.current.accountWalletGroups[0]).toStrictEqual(
       expect.objectContaining({
         title: 'Wallet 1',
         wallet: expect.objectContaining({
@@ -327,5 +420,14 @@ describe('useAccountProps', () => {
         }),
       }),
     );
+    expect(result.current.accountWalletGroups[1]).toStrictEqual(
+      expect.objectContaining({
+        title: 'Wallet 2',
+        wallet: expect.objectContaining({
+          id: 'keyring:wallet-2',
+          type: AccountWalletType.Keyring,
+        }),
+      }),
+    );
   });
 });

app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx

@@ -1,11 +1,10 @@
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { useFetchAccountNotifications } from '../../../../util/notifications/hooks/useSwitchNotifications';
 import { getValidNotificationAccounts } from '../../../../selectors/notifications';
 import { toFormattedAddress } from '../../../../util/address';
 import { selectAvatarAccountType } from '../../../../selectors/settings';
 import { selectAccountGroupsByWallet } from '../../../../selectors/multichainAccounts/accountTreeController';
-import { AccountWalletType } from '@metamask/account-api';
 import { selectInternalAccountsById } from '../../../../selectors/accountsController';
 import { isEvmAccountType } from '@metamask/keyring-api';
 
@@ -83,20 +82,41 @@ export function useNotificationAccountListProps() {
   };
 }
 
-export function useFirstHDWalletAccounts() {
+export function useNotificationWalletAccountGroups() {
   const accountGroupsByWallet = useSelector(selectAccountGroupsByWallet);
-  const firstHDWalletGroup = accountGroupsByWallet.find(
-    (w) => w.wallet.type === AccountWalletType.Entropy,
+  const accountsMap = useSelector(selectInternalAccountsById);
+
+  const isEvmAccountId = useCallback(
+    (accountId: string) =>
+      Boolean(accountsMap?.[accountId]?.address) &&
+      isEvmAccountType(accountsMap[accountId].type),
+    [accountsMap],
+  );
+
+  const hasNotificationEligibleAccount = useCallback(
+    (accountGroup: { accounts: string[] }) =>
+      accountGroup.accounts.some(isEvmAccountId),
+    [isEvmAccountId],
+  );
+
+  return useMemo(
+    () =>
+      accountGroupsByWallet
+        .map((walletGroup) => ({
+          ...walletGroup,
+          data: walletGroup.data.filter(hasNotificationEligibleAccount),
+        }))
+        .filter((walletGroup) => walletGroup.data.length > 0),
+    [accountGroupsByWallet, hasNotificationEligibleAccount],
   );
-  return firstHDWalletGroup;
 }
 
 export function useAccountProps() {
-  const firstHDWalletGroups = useFirstHDWalletAccounts();
+  const accountWalletGroups = useNotificationWalletAccountGroups();
   const accountAvatarType = useSelector(selectAvatarAccountType);
 
   return {
-    firstHDWalletGroups,
+    accountWalletGroups,
     accountAvatarType,
   };
 }