Merge branch 'edit-notifications' into 'develop'

Status edits notifications

See merge request soapbox-pub/soapbox-fe!1689

app/soapbox/features/notifications/components/filter_bar.tsx

@@ -15,7 +15,6 @@ const messages = defineMessages({
   boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' },
   polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
   follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
-  moves: { id: 'notifications.filter.moves', defaultMessage: 'Moves' },
   emoji_reacts: { id: 'notifications.filter.emoji_reacts', defaultMessage: 'Emoji reacts' },
   statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
 });
@@ -88,12 +87,6 @@ const NotificationFilterBar = () => {
       action: onClick('follow'),
       name: 'follow',
     });
-    items.push({
-      text: <Icon src={require('feather-icons/dist/icons/briefcase.svg')} />,
-      title: intl.formatMessage(messages.moves),
-      action: onClick('move'),
-      name: 'move',
-    });
   }
 
   return <Tabs items={items} activeItem={selectedFilter} />;

app/soapbox/features/notifications/components/notification.tsx

@@ -54,6 +54,7 @@ const icons: Record<NotificationType, string> = {
   'pleroma:chat_mention': require('@tabler/icons/messages.svg'),
   'pleroma:emoji_reaction': require('@tabler/icons/mood-happy.svg'),
   user_approved: require('@tabler/icons/user-plus.svg'),
+  update: require('@tabler/icons/pencil.svg'),
 };
 
 const messages: Record<NotificationType, MessageDescriptor> = defineMessages({
@@ -101,6 +102,10 @@ const messages: Record<NotificationType, MessageDescriptor> = defineMessages({
     id: 'notification.user_approved',
     defaultMessage: 'Welcome to {instance}!',
   },
+  update: {
+    id: 'notification.update',
+    defaultMessage: '{name} edited a post',
+  },
 });
 
 const buildMessage = (
@@ -287,6 +292,7 @@ const Notification: React.FC<INotificaton> = (props) => {
       case 'reblog':
       case 'status':
       case 'poll':
+      case 'update':
       case 'pleroma:emoji_reaction':
         return status && typeof status === 'object' ? (
           // @ts-ignore

app/soapbox/utils/notification.ts

@@ -11,6 +11,7 @@ const NOTIFICATION_TYPES = [
   'pleroma:chat_mention',
   'pleroma:emoji_reaction',
   'user_approved',
+  'update',
 ] as const;
 
 type NotificationType = typeof NOTIFICATION_TYPES[number];