merge the latest main in

okTurtles · Feb 20, 2024 · 5a8aaf7 · 5a8aaf7
2 parents c0b8f07 + 29b35d0
commit 5a8aaf7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/frontend/views/components/modal/Prompt.vue b/frontend/views/components/modal/Prompt.vue
@@ -45,11 +45,11 @@ export default ({
   methods: {
     closeModal () {
       sbp('okTurtles.events/emit', MODAL_RESPONSE, false)
-      this.$refs.modal.close()
+      this.$refs.modal.unload()
     },
     submit () {
       sbp('okTurtles.events/emit', MODAL_RESPONSE, true)
-      this.$refs.modal.close()
+      this.$refs.modal.unload()
     }
   }
 }: Object)

diff --git a/frontend/views/containers/chatroom/SendArea.vue b/frontend/views/containers/chatroom/SendArea.vue
@@ -387,7 +387,10 @@ export default ({
       const userArr = this.ephemeral.typingUsers
 
       if (userArr.length) {
-        const getDisplayName = (memberID) => (this.globalProfile(memberID).displayName || this.globalProfile(memberID).username || memberID)
+        const getDisplayName = (memberID) => {
+          const profile = this.globalProfile(memberID)
+          return profile?.displayName || profile?.username || memberID
+        }
         const isMultiple = userArr.length > 1
         const usernameCombined = userArr.map(u => getDisplayName(u)).join(', ')
 

diff --git a/frontend/views/containers/chatroom/poll-message-content/PollVoteResult.vue b/frontend/views/containers/chatroom/poll-message-content/PollVoteResult.vue
@@ -32,7 +32,7 @@
 
     .c-voters
       .c-voter-avatars-item(v-for='entry in list.voters' :key='entry.id')
-        voter-avatars(:voters='entry.members' :optionName='entry.optionName')
+        voter-avatars(:voters='entry.users' :optionName='entry.optionName')
 </template>
 
 <script>

diff --git a/frontend/views/containers/chatroom/poll-message-content/VoterAvatars.vue b/frontend/views/containers/chatroom/poll-message-content/VoterAvatars.vue
@@ -23,9 +23,9 @@
         modal-close.c-tooltip-close-btn(@close='closeTooltip')
 
       ul.c-voters-list
-        li.c-voter-item(v-for='(votername, index) in voters' :key='votername + index')
-          avatar-user.c-voter-item-avatar(:contractID='votername' size='xs')
-          span.c-voter-item-name {{ getDisplayName(votername) }}
+        li.c-voter-item(v-for='(voterContractID, index) in voters' :key='voterContractID + index')
+          avatar-user.c-voter-item-avatar(:contractID='voterContractID' size='xs')
+          span.c-voter-item-name {{ getDisplayName(voterContractID) }}
 </template>
 
 <script>
@@ -77,8 +77,9 @@ export default ({
     closeTooltip () {
       this.ephemeral.isTooltipActive = false
     },
-    getDisplayName (username) {
-      return this.globalProfile(username).displayName || username
+    getDisplayName (contractID) {
+      const profile = this.globalProfile(contractID)
+      return profile.displayName || profile.username
     }
   }
 }: Object)