feat(notifications): sync filter tabs and push toggles across all types

package.json

@@ -45,7 +45,7 @@
     "@babel/preset-typescript": "^7.26.0",
     "@babel/runtime": "^7.26.7",
     "@ecency/render-helper": "^2.5.22",
-    "@ecency/sdk": "^2.3.57",
+    "@ecency/sdk": "^2.3.61",
     "@esteemapp/react-native-autocomplete-input": "^4.2.1",
     "@esteemapp/react-native-multi-slider": "^1.1.0",
     "@native-html/iframe-plugin": "^2.6.1",

src/components/notification/view/notificationView.tsx

@@ -16,14 +16,26 @@ import { selectIsDarkTheme } from '../../../redux/selectors';
 import styles from './notificationStyles';
 
 // Each `key` must match a NotificationFilters enum value (passed straight to the
-// notifications query) and have a `notification.<key>` locale string, which is
-// also the displayed label — so the key is the single source for both.
+// notifications query) and have a `notification.filters.<key>` locale string.
+// Labels live under their own `filters` namespace rather than reusing
+// `notification.<key>`: several of those are notification BODY strings
+// (`payouts` is "Payout received: ${amount}", `delegations` is "delegated"), so
+// using them as labels renders template text in the dropdown.
 const FILTERS = [
   { key: 'activities' },
   { key: 'replies' },
   { key: 'mentions' },
   { key: 'rvotes' },
   { key: 'follows' },
+  { key: 'reblogs' },
+  { key: 'transfers' },
+  { key: 'delegations' },
+  { key: 'nfavorites' },
+  { key: 'nbookmarks' },
+  { key: 'payouts' },
+  { key: 'scheduled_published' },
+  { key: 'account_updates' },
+  { key: 'weekly_earnings' },
 ];
 
 interface Props {
@@ -113,7 +125,7 @@ const NotificationView = ({
       <FilterBar
         dropdownIconName="arrow-drop-down"
         options={FILTERS.map((item) =>
-          intl.formatMessage({ id: `notification.${item.key}` }).toUpperCase(),
+          intl.formatMessage({ id: `notification.filters.${item.key}` }).toUpperCase(),
         )}
         defaultText="ALL"
         onDropdownSelect={_handleOnDropdownSelect}

src/config/locales/en-US.json

@@ -373,6 +373,22 @@
     "selected": "Selected {postfix}"
   },
   "notification": {
+    "filters": {
+      "activities": "All",
+      "replies": "Replies",
+      "mentions": "Mentions",
+      "rvotes": "Votes",
+      "follows": "Follows",
+      "reblogs": "Reblogs",
+      "transfers": "Transfers",
+      "delegations": "Delegations",
+      "nfavorites": "Favorites",
+      "nbookmarks": "Bookmarks",
+      "payouts": "Payouts",
+      "scheduled_published": "Scheduled posts",
+      "account_updates": "Account updates",
+      "weekly_earnings": "Weekly earnings"
+    },
     "this_week": "This Week",
     "reblog": "reblogged",
     "unfollow": "unfollowed you",
@@ -1581,6 +1597,9 @@
       "vote": "Vote",
       "follow": "Follow",
       "scheduled_published": "Scheduled post published",
+      "payouts": "Payouts",
+      "account_update": "Account updates",
+      "weekly_earnings": "Weekly earnings",
       "fcm_unavailable": "Push notifications are not supported on this device. You will receive notifications only while the app is open."
     },
     "keys_warning": "Sensitive account information!\nEcency must be secured with PIN code before viewing private keys.",

src/providers/ecency/ecency.types.ts

@@ -185,6 +185,12 @@ export enum NotificationFilters {
   DELEGATIONS = 'delegations',
   FAVOURITES = 'nfavorites',
   BOOKMARKS = 'nbookmarks',
+  PAYOUTS = 'payouts',
+  SCHEDULED_PUBLISHED = 'scheduled_published',
+  // Filter path is plural while the notification `type` string is singular
+  // (`account_update`) — enotify routes on the plural form.
+  ACCOUNT_UPDATES = 'account_updates',
+  WEEKLY_EARNINGS = 'weekly_earnings',
 }
 
 export enum PointActivityIds {

src/redux/actions/applicationActions.ts

@@ -9,6 +9,10 @@ import {
   CHANGE_REBLOG_NOTIFICATION,
   CHANGE_TRANSFERS_NOTIFICATION,
   CHANGE_SCHEDULED_PUBLISHED_NOTIFICATION,
+  CHANGE_DELEGATIONS_NOTIFICATION,
+  CHANGE_PAYOUTS_NOTIFICATION,
+  CHANGE_ACCOUNT_UPDATE_NOTIFICATION,
+  CHANGE_WEEKLY_EARNINGS_NOTIFICATION,
   CHANGE_ALL_NOTIFICATION_SETTINGS,
   CHANGE_VOTE_NOTIFICATION,
   IS_CONNECTED,
@@ -140,6 +144,30 @@ export const changeNotificationSettings = (payload) => {
         type: CHANGE_SCHEDULED_PUBLISHED_NOTIFICATION,
       };
 
+    case 'notification.delegations':
+      return {
+        payload: payload.action,
+        type: CHANGE_DELEGATIONS_NOTIFICATION,
+      };
+
+    case 'notification.payouts':
+      return {
+        payload: payload.action,
+        type: CHANGE_PAYOUTS_NOTIFICATION,
+      };
+
+    case 'notification.accountUpdate':
+      return {
+        payload: payload.action,
+        type: CHANGE_ACCOUNT_UPDATE_NOTIFICATION,
+      };
+
+    case 'notification.weeklyEarnings':
+      return {
+        payload: payload.action,
+        type: CHANGE_WEEKLY_EARNINGS_NOTIFICATION,
+      };
+
     case 'notification':
       return {
         payload: payload.action,

src/redux/constants/constants.ts

@@ -34,6 +34,10 @@ export const CHANGE_BOOKMARK_NOTIFICATION = 'CHANGE_BOOKMARK_NOTIFICATION';
 export const CHANGE_REBLOG_NOTIFICATION = 'CHANGE_REBLOG_NOTIFICATION';
 export const CHANGE_TRANSFERS_NOTIFICATION = 'CHANGE_TRANSFERS_NOTIFICATION';
 export const CHANGE_SCHEDULED_PUBLISHED_NOTIFICATION = 'CHANGE_SCHEDULED_PUBLISHED_NOTIFICATION';
+export const CHANGE_DELEGATIONS_NOTIFICATION = 'CHANGE_DELEGATIONS_NOTIFICATION';
+export const CHANGE_PAYOUTS_NOTIFICATION = 'CHANGE_PAYOUTS_NOTIFICATION';
+export const CHANGE_ACCOUNT_UPDATE_NOTIFICATION = 'CHANGE_ACCOUNT_UPDATE_NOTIFICATION';
+export const CHANGE_WEEKLY_EARNINGS_NOTIFICATION = 'CHANGE_WEEKLY_EARNINGS_NOTIFICATION';
 export const CHANGE_ALL_NOTIFICATION_SETTINGS = 'CHANGE_ALL_NOTIFICATION_SETTINGS';
 export const SET_LAST_APP_VERSION = 'SET_LAST_APP_VERSION';
 export const SET_COLOR_THEME = 'SET_COLOR_THEME';

src/redux/reducers/applicationReducer.ts

@@ -10,6 +10,10 @@ import {
   CHANGE_REBLOG_NOTIFICATION,
   CHANGE_TRANSFERS_NOTIFICATION,
   CHANGE_SCHEDULED_PUBLISHED_NOTIFICATION,
+  CHANGE_DELEGATIONS_NOTIFICATION,
+  CHANGE_PAYOUTS_NOTIFICATION,
+  CHANGE_ACCOUNT_UPDATE_NOTIFICATION,
+  CHANGE_WEEKLY_EARNINGS_NOTIFICATION,
   CHANGE_VOTE_NOTIFICATION,
   CHANGE_ALL_NOTIFICATION_SETTINGS,
   IS_CONNECTED,
@@ -76,6 +80,10 @@ interface State {
     transfersNotification: boolean;
     voteNotification: boolean;
     scheduledPublishedNotification: boolean;
+    delegationsNotification: boolean;
+    payoutsNotification: boolean;
+    accountUpdateNotification: boolean;
+    weeklyEarningsNotification: boolean;
   };
   postUpvotePercent: number;
   commentUpvotePercent: number;
@@ -122,6 +130,10 @@ const initialState: State = {
     transfersNotification: true,
     voteNotification: true,
     scheduledPublishedNotification: true,
+    delegationsNotification: true,
+    payoutsNotification: true,
+    accountUpdateNotification: true,
+    weeklyEarningsNotification: true,
   },
   postUpvotePercent: 1,
   commentUpvotePercent: 1,
@@ -238,6 +250,34 @@ const applicationReducer = (state = initialState, action): State => {
           scheduledPublishedNotification: action.payload,
         },
       });
+    case CHANGE_DELEGATIONS_NOTIFICATION:
+      return Object.assign({}, state, {
+        notificationDetails: {
+          ...state.notificationDetails,
+          delegationsNotification: action.payload,
+        },
+      });
+    case CHANGE_PAYOUTS_NOTIFICATION:
+      return Object.assign({}, state, {
+        notificationDetails: {
+          ...state.notificationDetails,
+          payoutsNotification: action.payload,
+        },
+      });
+    case CHANGE_ACCOUNT_UPDATE_NOTIFICATION:
+      return Object.assign({}, state, {
+        notificationDetails: {
+          ...state.notificationDetails,
+          accountUpdateNotification: action.payload,
+        },
+      });
+    case CHANGE_WEEKLY_EARNINGS_NOTIFICATION:
+      return Object.assign({}, state, {
+        notificationDetails: {
+          ...state.notificationDetails,
+          weeklyEarningsNotification: action.payload,
+        },
+      });
     case CHANGE_VOTE_NOTIFICATION:
       return Object.assign({}, state, {
         notificationDetails: {

src/redux/store/store.ts

@@ -50,7 +50,7 @@ const persistConfig = {
   key: 'root',
   // Storage Method (React Native)
   storage: AsyncStorage,
-  version: 20, // v20: Default scheduledPublished notification ON, backfill bookmark setting
+  version: 21, // v21: Default delegations/payouts/accountUpdate/weeklyEarnings notifications ON
   // // Blacklist (Don't Save Specific Reducers)
   blacklist: ['communities', 'user', 'ui'],
   transforms: [transformCacheVoteMap, transformWalkthroughMap],

src/screens/application/container/applicationContainer.tsx

@@ -388,6 +388,9 @@ class ApplicationContainer extends Component {
         'transfer',
         'delegations',
         'scheduled_published',
+        'payouts',
+        'account_update',
+        'weekly_earnings',
       ];
       const messageType = remoteMessage?.data?.type;
       if (notificationTypes.includes(messageType)) {
@@ -890,14 +893,59 @@ class ApplicationContainer extends Component {
             wsData.type === 'reply' ||
             wsData.type === 'transfer' ||
             wsData.type === 'delegations' ||
-            wsData.type === 'scheduled_published')
+            wsData.type === 'scheduled_published' ||
+            wsData.type === 'payouts' ||
+            wsData.type === 'account_update' ||
+            wsData.type === 'weekly_earnings')
         ) {
           // Re-fetch the authoritative unread count rather than a local +1:
           // FCM may deliver the same event, and a local increment in both
           // paths double-counted (daily-spin POINT transfers showed 2 not 1).
           this._refreshUnreadActivityCount();
           const { type, source, target, extra } = wsData;
 
+          // Title/body per type. A ternary chain here previously ended in a
+          // delegation fallback, so any unhandled type announced itself as a
+          // delegation — every type in the allowlist above needs a case.
+          let notifTitle = '';
+          let notifBody = '';
+          switch (type) {
+            case 'mention':
+              notifTitle = `@${source} mentioned @${target}`;
+              break;
+            case 'reply':
+              notifTitle = `@${source} replied to @${target}`;
+              notifBody = extra?.body ? extra.body.substring(0, 100) : '';
+              break;
+            case 'transfer':
+              notifTitle = `@${source} transferred to @${target}`;
+              notifBody = extra?.amount || '';
+              break;
+            case 'delegations':
+              notifTitle = `@${source} delegated to @${target}`;
+              notifBody = extra?.amount || '';
+              break;
+            case 'scheduled_published':
+              notifTitle = 'Scheduled post published';
+              notifBody = extra?.title || '';
+              break;
+            case 'payouts':
+              notifTitle = 'Rewards received';
+              notifBody = extra?.amount || '';
+              break;
+            case 'account_update':
+              notifTitle = 'Account updated';
+              notifBody = 'Your account details were updated';
+              break;
+            case 'weekly_earnings':
+              notifTitle = 'Weekly earnings';
+              notifBody = extra?.total_usd ? `$${extra.total_usd}` : '';
+              break;
+            default:
+              notifTitle = `@${source}`;
+              break;
+          }
+
           // Build FCM-compatible notification object
           const fcmFormat = {
             data: {
@@ -914,24 +962,8 @@ class ApplicationContainer extends Component {
               amount: extra?.amount || '',
             },
             notification: {
-              title:
-                type === 'mention'
-                  ? `@${source} mentioned @${target}`
-                  : type === 'reply'
-                  ? `@${source} replied to @${target}`
-                  : type === 'transfer'
-                  ? `@${source} transferred to @${target}`
-                  : type === 'scheduled_published'
-                  ? 'Scheduled post published'
-                  : `@${source} delegated to @${target}`,
-              body:
-                type === 'reply' && extra?.body
-                  ? extra.body.substring(0, 100)
-                  : type === 'transfer' || type === 'delegations'
-                  ? extra?.amount || ''
-                  : type === 'scheduled_published'
-                  ? extra?.title || ''
-                  : '',
+              title: notifTitle,
+              body: notifBody,
             },
           };
 
@@ -1078,6 +1110,10 @@ class ApplicationContainer extends Component {
         transfersNotification: 6,
         favoriteNotification: 13,
         bookmarkNotification: 15,
+        delegationsNotification: 10,
+        payoutsNotification: 19,
+        accountUpdateNotification: 20,
+        weeklyEarningsNotification: 21,
         scheduledPublishedNotification: 22,
       };
 

src/screens/login/container/loginContainer.tsx

@@ -255,6 +255,10 @@ class LoginContainer extends PureComponent {
       transfers: 6,
       favorite: 13,
       bookmark: 15,
+      delegations: 10,
+      payouts: 19,
+      accountUpdate: 20,
+      weeklyEarnings: 21,
       scheduledPublished: 22,
     };
     const notifyTypes = [];

src/screens/settings/container/settingsContainer.tsx

@@ -480,6 +480,10 @@ class SettingsContainer extends Component {
       case 'notification.reblog':
       case 'notification.transfers':
       case 'notification.scheduledPublished':
+      case 'notification.delegations':
+      case 'notification.payouts':
+      case 'notification.accountUpdate':
+      case 'notification.weeklyEarnings':
         this._handleNotification(action, actionType);
         break;
 
@@ -538,6 +542,10 @@ class SettingsContainer extends Component {
       transfers: 6,
       favorite: 13,
       bookmark: 15,
+      delegations: 10,
+      payouts: 19,
+      accountUpdate: 20,
+      weeklyEarnings: 21,
       scheduledPublished: 22,
     };
     const notifyTypes = [];
@@ -888,6 +896,10 @@ const mapStateToProps = (state) => {
     transfersNotification: notificationDetails.transfersNotification,
     voteNotification: notificationDetails.voteNotification,
     scheduledPublishedNotification: notificationDetails.scheduledPublishedNotification,
+    delegationsNotification: notificationDetails.delegationsNotification,
+    payoutsNotification: notificationDetails.payoutsNotification,
+    accountUpdateNotification: notificationDetails.accountUpdateNotification,
+    weeklyEarningsNotification: notificationDetails.weeklyEarningsNotification,
     selectedApi: selectApi(state),
     selectedCurrency: selectCurrency(state),
     selectedLanguage: selectLanguage(state),