From 9c8e523ae8f8e01c7c17a1155071c832f9becd01 Mon Sep 17 00:00:00 2001
From: SebinSong <songxevin@gmail.com>
Date: Mon, 12 Aug 2024 09:37:37 +1200
Subject: [PATCH 1/5] bug-fix

---
 .../containers/dashboard/GroupMembers.vue     |  2 +-
 .../dashboard/GroupMembersTooltipPending.vue  | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/views/containers/dashboard/GroupMembers.vue b/frontend/views/containers/dashboard/GroupMembers.vue
index 747aee109..f5b822826 100644
--- 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
index 7f280df6f..473f1ede8 100644
--- 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,26 @@ 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'
+      'groupMembersPending',
+      'globalProfile'
     ]),
     tooltipText () {
-      const invitedBy = (this.groupMembersPending[this.username] || {}).invitedBy
+      const invitedBy = this.getDisplayName(this.data?.invitedBy)
+      console.log('!@# groupMembersPending: ', 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 })
     }

From eeaf3e1cc5713bbfcf0d37511a11234a5e863800 Mon Sep 17 00:00:00 2001
From: SebinSong <songxevin@gmail.com>
Date: Mon, 12 Aug 2024 09:40:17 +1200
Subject: [PATCH 2/5] remove console.log

---
 .../views/containers/dashboard/GroupMembersTooltipPending.vue    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
index 473f1ede8..6db05720c 100644
--- a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
+++ b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
@@ -34,7 +34,6 @@ export default ({
     ]),
     tooltipText () {
       const invitedBy = this.getDisplayName(this.data?.invitedBy)
-      console.log('!@# groupMembersPending: ', invitedBy)
 
       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 })

From f9193041f24e10526649f2bde748fd911a672d5e Mon Sep 17 00:00:00 2001
From: SebinSong <songxevin@gmail.com>
Date: Mon, 12 Aug 2024 09:53:08 +1200
Subject: [PATCH 3/5] remove unused prop

---
 .../views/containers/dashboard/GroupMembersTooltipPending.vue    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
index 6db05720c..9f02c3e44 100644
--- a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
+++ b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
@@ -29,7 +29,6 @@ export default ({
   computed: {
     ...mapGetters([
       'ourIdentityContractId',
-      'groupMembersPending',
       'globalProfile'
     ]),
     tooltipText () {

From dbeb7583a8599469fe2ba81ea1ab6d302c566ef8 Mon Sep 17 00:00:00 2001
From: SebinSong <songxevin@gmail.com>
Date: Mon, 12 Aug 2024 15:30:19 +1200
Subject: [PATCH 4/5] variable as camelCase

---
 .../containers/dashboard/GroupMembersTooltipPending.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
index 9f02c3e44..3c86921e9 100644
--- a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
+++ b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
@@ -21,9 +21,9 @@ export default ({
     data: Object
   },
   methods: {
-    getDisplayName (memberID) {
-      const profile = this.globalProfile(memberID)
-      return profile?.displayName || profile?.username || memberID
+    getDisplayName (memberId) {
+      const profile = this.globalProfile(memberId)
+      return profile?.displayName || profile?.username || memberId
     }
   },
   computed: {

From 849e608b75f792d16084808289f0541139e8859b Mon Sep 17 00:00:00 2001
From: SebinSong <songxevin@gmail.com>
Date: Mon, 12 Aug 2024 16:25:15 +1200
Subject: [PATCH 5/5] var name update

---
 .../containers/dashboard/GroupMembersTooltipPending.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
index 3c86921e9..9f02c3e44 100644
--- a/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
+++ b/frontend/views/containers/dashboard/GroupMembersTooltipPending.vue
@@ -21,9 +21,9 @@ export default ({
     data: Object
   },
   methods: {
-    getDisplayName (memberId) {
-      const profile = this.globalProfile(memberId)
-      return profile?.displayName || profile?.username || memberId
+    getDisplayName (memberID) {
+      const profile = this.globalProfile(memberID)
+      return profile?.displayName || profile?.username || memberID
     }
   },
   computed: {