From 43b607aedd688a2ea74d7aec78044a9ff3d129bc Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 17 Apr 2019 09:05:23 -0500
Subject: [PATCH] fix(tasks): force sync instead of explicitly clearing notif

---
 .../components/header/notifications/groupTaskApproval.vue  | 7 ++++---
 website/server/controllers/api-v3/tasks/groups.js          | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/components/header/notifications/groupTaskApproval.vue b/website/client/components/header/notifications/groupTaskApproval.vue
index f324c930f4..8d8021330d 100644
--- a/website/client/components/header/notifications/groupTaskApproval.vue
+++ b/website/client/components/header/notifications/groupTaskApproval.vue
@@ -4,7 +4,6 @@ base-notification(
   :has-icon="false",
   :notification="notification",
   @click="action",
-  ref="taskApprovalNotification",
 )
   div(slot="content")
     div(v-html="notification.data.message")
@@ -16,8 +15,10 @@ base-notification(
 <script>
 import BaseNotification from './base';
 import { mapState } from 'client/libs/store';
+import sync from 'client/mixins/sync';
 
 export default {
+  mixins: [sync],
   props: ['notification', 'canRemove'],
   components: {
     BaseNotification,
@@ -49,7 +50,7 @@ export default {
         userId: this.notification.data.userId,
       });
 
-      this.$refs.taskApprovalNotification.remove();
+      this.sync();
     },
     async needsWork () {
       // Redirect users to the group tasks page if the notification doesn't have data
@@ -68,7 +69,7 @@ export default {
         userId: this.notification.data.userId,
       });
 
-      this.$refs.taskApprovalNotification.remove();
+      this.sync();
     },
   },
 };
diff --git a/website/server/controllers/api-v3/tasks/groups.js b/website/server/controllers/api-v3/tasks/groups.js
index 6aeaf68842..69f050ad3d 100644
--- a/website/server/controllers/api-v3/tasks/groups.js
+++ b/website/server/controllers/api-v3/tasks/groups.js
@@ -331,7 +331,6 @@ api.approveTask = {
     // Remove old notifications
     let approvalPromises = [];
     managers.forEach((manager) => {
-      if (manager._id === task.group.approval.approvingUser) return;
       let notificationIndex = manager.notifications.findIndex(function findNotification (notification) {
         return notification && notification.data && notification.data.taskId === task._id && notification.type === 'GROUP_TASK_APPROVAL';
       });