Merge 849e608 into d8fd80a

okTurtles · Aug 12, 2024 · e8f7207 · e8f7207
2 parents d8fd80a + 849e608
commit e8f7207
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/frontend/views/containers/dashboard/GroupMembers.vue b/frontend/views/containers/dashboard/GroupMembers.vue
@@ -26,7 +26,7 @@
         i18n.pill.is-neutral(v-if='invitedBy' data-test='pillPending') pending
         i18n.pill.is-primary(v-else-if='isNew' data-test='pillNew') new
 
-        group-members-tooltip-pending.c-menu(v-if='invitedBy' :contractID='contractID')
+        group-members-tooltip-pending.c-menu(v-if='invitedBy' :contractID='contractID' :data='invitedBy')
 
   i18n.link(
     tag='button'

diff --git a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
@@ -3,7 +3,7 @@
     span.button.is-icon-small(data-test='pendingTooltip')
       i.icon-question-circle
     template(slot='tooltip')
-      p {{tooltipText }}
+      p {{ tooltipText }}
 </template>
 
 <script>
@@ -17,17 +17,24 @@ export default ({
     Tooltip
   },
   props: {
-    contractID: String
+    contractID: String,
+    data: Object
+  },
+  methods: {
+    getDisplayName (memberID) {
+      const profile = this.globalProfile(memberID)
+      return profile?.displayName || profile?.username || memberID
+    }
   },
   computed: {
     ...mapGetters([
       'ourIdentityContractId',
-      'groupMembersPending'
+      'globalProfile'
     ]),
     tooltipText () {
-      const invitedBy = (this.groupMembersPending[this.username] || {}).invitedBy
+      const invitedBy = this.getDisplayName(this.data?.invitedBy)
 
-      return this.contractID === this.ourIdentityContractId
+      return this.ourIdentityContractId === this.data?.invitedBy
         ? L('This member did not use their invite link to join the group yet. This link should be given to them by {invitedBy} (you).', { invitedBy })
         : L('This member did not use their invite link to join the group yet. This link should be given to them by {invitedBy}.', { invitedBy })
     }