Reality2byte
diff --git a/‎app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx‎
Lines changed: 23 additions & 16 deletions b/‎app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.test.tsx‎
Lines changed: 23 additions & 16 deletions
diff --git a/‎app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx‎
Lines changed: 14 additions & 10 deletions b/‎app/components/Views/Settings/NotificationsSettings/AccountsList.hooks.tsx‎
Lines changed: 14 additions & 10 deletions
diff --git a/‎app/components/Views/Settings/NotificationsSettings/AccountsList.test.tsx‎
Lines changed: 3 additions & 0 deletions b/‎app/components/Views/Settings/NotificationsSettings/AccountsList.test.tsx‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.test.tsx‎
Lines changed: 17 additions & 102 deletions b/‎app/components/Views/Settings/NotificationsSettings/NotificationSettingsSection.test.tsx‎
Lines changed: 17 additions & 102 deletions
@@ -36,13 +36,7 @@ jest.mock(
   }),
 );
 
-const mockRefetchPreferences = jest.fn();
-jest.mock('./hooks/useNotificationStoragePreferences', () => ({
-  useNotificationStoragePreferences: () => ({
-    refetch: mockRefetchPreferences,
-  }),
-}));
-
+beforeEach(() => jest.clearAllMocks());
 // Un-spy the notification hook modules between tests (clearAllMocks does not).
 afterEach(() => jest.restoreAllMocks());
 
@@ -246,8 +240,6 @@ describe('useNotificationAccountListProps', () => {
     return { mocks, hook };
   };
 
-  beforeEach(() => jest.clearAllMocks());
-
   it('returns correct loading state', async () => {
     const addresses = ['0x123', '0x456'];
     const { hook } = arrange(addresses);
@@ -369,14 +361,31 @@ describe('useNotificationAccountListProps', () => {
     });
   });
 
-  it('refetches the preferences blob alongside account settings', async () => {
-    const { hook } = arrange(['0x123', '0x456']);
+  it('surfaces a failed read with no settings to show', async () => {
+    const { hook } = arrange(['0x123', '0x456'], (m) => {
+      m.mockUseFetchAccountNotifications.mockReturnValue({
+        ...m.createUseFetchAccountNotificationsReturn(),
+        error: 'Failed to get account settings',
+      });
+    });
 
-    await act(async () => hook.result.current.refetchAccountSettings());
+    expect(hook.result.current.accountSettingsError).toBe(
+      'Failed to get account settings',
+    );
+    expect(hook.result.current.shouldDisableSwitches).toBe(true);
+  });
 
-    await waitFor(() => {
-      expect(mockRefetchPreferences).toHaveBeenCalledTimes(1);
+  it('keeps switches interactive when a failed read has earlier settings to show', async () => {
+    const { hook } = arrange(['0x123', '0x456'], (m) => {
+      m.mockUseFetchAccountNotifications.mockReturnValue({
+        ...m.createUseFetchAccountNotificationsReturn(),
+        data: { '0x123': true },
+        error: 'Failed to get account settings',
+      });
     });
+
+    expect(hook.result.current.accountSettingsError).toBeNull();
+    expect(hook.result.current.shouldDisableSwitches).toBe(false);
   });
 });
 
@@ -498,8 +507,6 @@ describe('useWalletActivityAccountSelection', () => {
     };
   };
 
-  beforeEach(() => jest.clearAllMocks());
-
   it('deselects all visible EVM accounts when any account is enabled', async () => {
     const mocks = arrangeMocks({
       [FORMATTED_EVM_ADDRESSES[0]]: true,
 
@@ -10,24 +10,27 @@ import { selectAvatarAccountType } from '../../../../selectors/settings';
 import { selectAccountGroupsByWallet } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { selectInternalAccountsById } from '../../../../selectors/accountsController';
 import { isEvmAccountType } from '@metamask/keyring-api';
-import { useNotificationStoragePreferences } from './hooks/useNotificationStoragePreferences';
 
 export function useNotificationAccountListProps() {
   const accountAddresses = useSelector(getValidNotificationAccounts);
   const accountsMap = useSelector(selectInternalAccountsById);
-  const { update, initialLoading, accountsBeingUpdated, data } =
+  const { update, initialLoading, accountsBeingUpdated, data, error } =
     useFetchAccountNotifications(accountAddresses);
-  const { refetch: refetchPreferences } = useNotificationStoragePreferences();
 
-  // Only disable switches during initial data loading, not when individual accounts are updating
-  const shouldDisableSwitches = initialLoading;
+  // Account settings live in the Trigger API, which reports an unreadable
+  // config as a failure rather than "every account disabled". Surface that
+  // failure instead of showing switches in the wrong position — but only when
+  // there is no earlier successful read to fall back on.
+  const hasAccountSettings = Object.keys(data).length > 0;
+  const accountSettingsError = hasAccountSettings ? null : error;
+
+  // Only disable switches during initial data loading or when a failed read
+  // left us with no settings to show, not when individual accounts are updating
+  const shouldDisableSwitches = initialLoading || Boolean(accountSettingsError);
 
-  // Account toggles rewrite `walletActivity.accounts` behind the cached
-  // preferences, so refresh both — otherwise the next section write PUTs a
-  // stale accounts array.
   const refetchAccountSettings = useCallback(async () => {
-    await Promise.all([update(accountAddresses), refetchPreferences()]);
-  }, [accountAddresses, update, refetchPreferences]);
+    await update(accountAddresses);
+  }, [accountAddresses, update]);
 
   // Helper to get addresses from account IDs
   const getEvmAddressesFromAccountIds = useCallback(
@@ -85,6 +88,7 @@ export function useNotificationAccountListProps() {
   return {
     shouldDisableSwitches,
     isAnyAccountUpdating,
+    accountSettingsError,
     refetchAccountSettings,
     isAccountLoading,
     isAccountEnabled,
 
@@ -86,6 +86,8 @@ interface RenderAccountsListMocks {
 }
 
 describe('AccountList', () => {
+  beforeEach(() => jest.clearAllMocks());
+
   const arrangeSelectors = () => {
     jest
       .spyOn(AccountSelectorsModule, 'selectIconSeedAddressByAccountGroupId')
@@ -192,6 +194,7 @@ describe('AccountList', () => {
     const notificationAccountListProps: NotificationAccountListProps = {
       shouldDisableSwitches: false,
       isAnyAccountUpdating: false,
+      accountSettingsError: null,
       refetchAccountSettings: mockRefetchAccountSettings,
       isAccountLoading: jest
         .fn()
 
@@ -97,22 +97,6 @@ jest.mock('./AccountsList.hooks', () => ({
   }),
 }));
 
-interface WalletActivitySection {
-  pushNotificationsEnabled: boolean;
-  inAppNotificationsEnabled: boolean;
-  accounts: { address: string; enabled: boolean }[];
-}
-
-// Runs the updater passed to updatePreferencesSection to get the persisted section.
-const applyWalletActivityUpdate = (
-  walletActivity: WalletActivitySection = mockPreferences.walletActivity,
-) => {
-  const [, sectionUpdate] = mockUpdatePreferencesSection.mock.calls[0];
-  return (sectionUpdate as (section: WalletActivitySection) => unknown)(
-    walletActivity,
-  );
-};
-
 const marketingDisclaimer =
   'By turning this on, you agree to receive product news and marketing updates from MetaMask.';
 
@@ -176,7 +160,7 @@ describe('NotificationSettingsSection', () => {
     expect(screen.getByText(marketingDisclaimer)).toBeOnTheScreen();
   });
 
-  it('disables both channels and tracks an ALL update when deselecting all accounts', async () => {
+  it('tracks an ALL update without touching stored preferences when deselecting all accounts', async () => {
     renderSection({
       type: 'walletActivity',
       title: 'Wallet activity',
@@ -206,19 +190,11 @@ describe('NotificationSettingsSection', () => {
           .build(),
       );
     });
-    expect(mockUpdatePreferencesSection).toHaveBeenCalledTimes(1);
-    expect(mockUpdatePreferencesSection).toHaveBeenCalledWith(
-      'walletActivity',
-      expect.any(Function),
-    );
-    expect(applyWalletActivityUpdate()).toStrictEqual({
-      ...mockPreferences.walletActivity,
-      pushNotificationsEnabled: false,
-      inAppNotificationsEnabled: false,
-    });
+    // Account subscriptions live in the Trigger API; no preferences blob write.
+    expect(mockUpdatePreferencesSection).not.toHaveBeenCalled();
   });
 
-  it('enables both channels and tracks an ALL update when selecting all accounts', async () => {
+  it('tracks an ALL update without touching stored preferences when selecting all accounts', async () => {
     mockHasEnabledAccount = false;
 
     renderSection({
@@ -250,52 +226,10 @@ describe('NotificationSettingsSection', () => {
           .build(),
       );
     });
-    expect(mockUpdatePreferencesSection).toHaveBeenCalledTimes(1);
-    expect(mockUpdatePreferencesSection).toHaveBeenCalledWith(
-      'walletActivity',
-      expect.any(Function),
-    );
-    expect(applyWalletActivityUpdate()).toStrictEqual({
-      ...mockPreferences.walletActivity,
-      pushNotificationsEnabled: true,
-      inAppNotificationsEnabled: true,
-    });
+    expect(mockUpdatePreferencesSection).not.toHaveBeenCalled();
   });
 
-  it('keeps the accounts written by the controller when flipping channels for all accounts', async () => {
-    renderSection({
-      type: 'walletActivity',
-      title: 'Wallet Activity',
-      description: 'Buy, sells, transfers, swaps and rewards',
-    });
-
-    await act(async () => {
-      fireEvent.press(
-        screen.getByTestId(
-          NotificationSettingsViewSelectorsIDs.ACCOUNT_NOTIFICATIONS_SELECT_ALL,
-        ),
-      );
-    });
-
-    await waitFor(() => {
-      expect(mockUpdatePreferencesSection).toHaveBeenCalledTimes(1);
-    });
-
-    // Updater must apply to the refreshed preferences, not this render's copy.
-    const refreshedWalletActivity = {
-      pushNotificationsEnabled: true,
-      inAppNotificationsEnabled: true,
-      accounts: [{ address: '0x1', enabled: false }],
-    };
-
-    expect(applyWalletActivityUpdate(refreshedWalletActivity)).toStrictEqual({
-      pushNotificationsEnabled: false,
-      inAppNotificationsEnabled: false,
-      accounts: [{ address: '0x1', enabled: false }],
-    });
-  });
-
-  it('disables the accounts section when both wallet activity channels are off', () => {
+  it('keeps the wallet activity accounts interactive when both stored channel flags are off', () => {
     mockPreferences.walletActivity.pushNotificationsEnabled = false;
     mockPreferences.walletActivity.inAppNotificationsEnabled = false;
 
@@ -312,27 +246,8 @@ describe('NotificationSettingsSection', () => {
       .UNSAFE_getAllByType(Text)
       .find((node) => node.props.children === 'Deselect all');
 
-    expect(selectAll).toBeDisabled();
-    expect(deselectAllLabel?.props.color).toBe(TextColor.TextMuted);
-  });
-
-  it('keeps the accounts section interactive when at least one channel is on', () => {
-    mockPreferences.walletActivity.pushNotificationsEnabled = true;
-    mockPreferences.walletActivity.inAppNotificationsEnabled = false;
-
-    renderSection({
-      type: 'walletActivity',
-      title: 'Wallet Activity',
-      description: 'Buy, sells, transfers, swaps and rewards',
-    });
-
-    const selectAll = screen.getByTestId(
-      NotificationSettingsViewSelectorsIDs.ACCOUNT_NOTIFICATIONS_SELECT_ALL,
-    );
-    const deselectAllLabel = screen
-      .UNSAFE_getAllByType(Text)
-      .find((node) => node.props.children === 'Deselect all');
-
+    // Wallet activity has no channel toggles; stale stored flags must not
+    // grey out the only remaining settings surface.
     expect(selectAll).not.toBeDisabled();
     expect(deselectAllLabel?.props.color).toBe(TextColor.PrimaryDefault);
   });
@@ -479,9 +394,9 @@ describe('NotificationSettingsSection', () => {
       }),
     );
     renderSection({
-      type: 'walletActivity',
-      title: 'Wallet activity',
-      description: 'Buy, sells, transfers, swaps',
+      type: 'perps',
+      title: 'Trading Activity',
+      description: 'Perps position changes',
     });
 
     const pushToggle = screen.getByTestId(
@@ -499,7 +414,7 @@ describe('NotificationSettingsSection', () => {
       expect(inAppToggle.props.disabled).not.toBe(true);
     });
     expect(mockUpdateSectionChannel).toHaveBeenCalledWith(
-      'walletActivity',
+      'perps',
       'pushNotificationsEnabled',
       false,
     );
@@ -519,9 +434,9 @@ describe('NotificationSettingsSection', () => {
       )
       .mockResolvedValueOnce(undefined);
     renderSection({
-      type: 'walletActivity',
-      title: 'Wallet activity',
-      description: 'Buy, sells, transfers, and swaps',
+      type: 'perps',
+      title: 'Trading Activity',
+      description: 'Perps position changes',
     });
 
     await act(async () => {
@@ -569,13 +484,13 @@ describe('NotificationSettingsSection', () => {
     });
     expect(mockUpdateSectionChannel).toHaveBeenNthCalledWith(
       1,
-      'walletActivity',
+      'perps',
       'pushNotificationsEnabled',
       false,
     );
     expect(mockUpdateSectionChannel).toHaveBeenNthCalledWith(
       2,
-      'walletActivity',
+      'perps',
       'pushNotificationsEnabled',
       true,
     );