From 8c3a9c6dbc0460884fa2f6fa723b2b9feaa3c65f Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Mon, 10 Aug 2020 11:27:19 -0500
Subject: [PATCH] fix(teams): smol tweaks (#12443)

---
 .../client/src/components/tasks/approvalFooter.vue   |  4 +++-
 .../components/tasks/modal-controls/selectMulti.vue  | 12 +++++++++---
 website/client/src/components/tasks/taskModal.vue    |  3 ++-
 website/server/controllers/api-v3/tasks/groups.js    |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue
index 519adbffa5..c984247b1c 100644
--- a/website/client/src/components/tasks/approvalFooter.vue
+++ b/website/client/src/components/tasks/approvalFooter.vue
@@ -3,6 +3,8 @@
     <approval-modal :task="task" />
     <div
       class="claim-bottom-message d-flex align-items-center"
+      v-if="!(userIsAssigned && task.group.approval.approved
+        && !task.completed && task.type !== 'habit')"
     >
       <div
         class="mr-auto ml-2"
@@ -108,7 +110,7 @@ export default {
         assignedUsers.forEach(userId => {
           const index = findIndex(this.group.members, member => member._id === userId);
           const assignedMember = this.group.members[index];
-          assignedUsersNames.push(assignedMember.profile.name);
+          assignedUsersNames.push(`@${assignedMember.auth.local.username}`);
         });
       }
 
diff --git a/website/client/src/components/tasks/modal-controls/selectMulti.vue b/website/client/src/components/tasks/modal-controls/selectMulti.vue
index 7614f0ab9a..7d45f91c84 100644
--- a/website/client/src/components/tasks/modal-controls/selectMulti.vue
+++ b/website/client/src/components/tasks/modal-controls/selectMulti.vue
@@ -57,10 +57,16 @@ multi<template>
           ></div>
           <div
             v-if="item.challenge"
-            class="challenge"
+            class="addl-text"
           >
             {{ $t('challenge') }}
           </div>
+          <div
+            v-else-if="item.addlText"
+            class="addl-text"
+          >
+            {{ item.addlText }}
+          </div>
         </b-dropdown-item-button>
 
         <div
@@ -111,7 +117,7 @@ multi<template>
         flex: 1;
       }
 
-      .challenge {
+      .addl-text {
         height: 1rem;
         font-size: 12px;
         font-weight: normal;
@@ -128,7 +134,7 @@ multi<template>
       }
 
       &:hover {
-        .challenge {
+        .addl-text {
           color: $purple-300;
         }
       }
diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue
index a02e8ce078..4b68ca249a 100644
--- a/website/client/src/components/tasks/taskModal.vue
+++ b/website/client/src/components/tasks/taskModal.vue
@@ -1265,7 +1265,8 @@ export default {
         this.members.forEach(member => {
           this.membersNameAndId.push({
             id: member._id,
-            name: member.auth.local.username,
+            name: member.profile.name,
+            addlText: `@${member.auth.local.username}`,
           });
           this.memberNamesById[member._id] = member.profile.name;
         });
diff --git a/website/server/controllers/api-v3/tasks/groups.js b/website/server/controllers/api-v3/tasks/groups.js
index 4a3112f94b..0e059ec995 100644
--- a/website/server/controllers/api-v3/tasks/groups.js
+++ b/website/server/controllers/api-v3/tasks/groups.js
@@ -215,7 +215,7 @@ api.assignTask = {
 
     const promises = [];
     const taskText = task.text;
-    const userName = user.profile.name;
+    const userName = `@${user.auth.local.username}`;
 
     if (user._id === assignedUserId) {
       const managerIds = Object.keys(group.managers);