Merge branch 'fix/merge-conflicts/report-notifications' into 'feat/report-notification'

Fixing merge conflicts and lint for report notifications MR

See merge request pleroma/pleroma-fe!1585

1 files changed, 4 insertions, 2 deletions

diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 8f74c0e6..f60a1a6a 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -6,6 +6,7 @@ import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import Report from '../report/report.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import UserPopover from '../user_popover/user_popover.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -40,7 +41,7 @@ const Notification = {
       unmuted: false
     }
   },
-  props: [ 'notification' ],
+  props: ['notification'],
   components: {
     StatusContent,
     UserAvatar,
@@ -48,7 +49,8 @@ const Notification = {
     Timeago,
     Status,
     Report,
-    RichContent
+    RichContent,
+    UserPopover
   },
   methods: {
     toggleUserExpanded () {