From c4549f0993dd2e176f6619694cfaa632d166f002 Mon Sep 17 00:00:00 2001 From: tusooa Date: Fri, 18 Aug 2023 20:02:58 -0400 Subject: [PATCH] Display follow requests in extra notifications --- .../extra_notifications/extra_notifications.js | 11 ++++++++++- .../extra_notifications/extra_notifications.vue | 11 +++++++++-- src/i18n/en.json | 3 ++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js index 0bf904baea..1f3c6e6de0 100644 --- a/src/components/extra_notifications/extra_notifications.js +++ b/src/components/extra_notifications/extra_notifications.js @@ -2,7 +2,16 @@ import { mapGetters } from 'vuex' const ExtraNotifications = { computed: { - ...mapGetters(['unreadChatCount', 'unreadAnnouncementCount']) + shouldShowChats () { + return this.unreadChatCount + }, + shouldShowAnnouncements () { + return this.unreadAnnouncementCount + }, + shouldShowFollowRequests () { + return this.followRequestCount + }, + ...mapGetters(['unreadChatCount', 'unreadAnnouncementCount', 'followRequestCount']) } } diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue index 11eeb937f3..f5cf16616e 100644 --- a/src/components/extra_notifications/extra_notifications.vue +++ b/src/components/extra_notifications/extra_notifications.vue @@ -1,19 +1,26 @@ diff --git a/src/i18n/en.json b/src/i18n/en.json index d58fd2fa75..62e80ce3ca 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -207,7 +207,8 @@ "submitted_report": "submitted a report", "poll_ended": "poll has ended", "unread_announcements": "{num} unread announcement | {num} unread announcements", - "unread_chats": "{num} unread chat | {num} unread chats" + "unread_chats": "{num} unread chat | {num} unread chats", + "unread_follow_requests": "{num} new follow request | {num} new follow requests" }, "polls": { "add_poll": "Add poll",