Skip to content

Commit

Permalink
Merge pull request #11890 from nextcloud/feat/11885/show-new-proxy-av…
Browse files Browse the repository at this point in the history
…atars

feat(federation): show proxy avatars when creating new conversation or accepting invitation
  • Loading branch information
Antreesy authored Mar 21, 2024
2 parents a87d915 + df7d157 commit d722e14
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/components/ContactSelectionBubble.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<template>
<div class="contact-selection-bubble">
<AvatarWrapper :id="participant.id"
token="new"
class="contact-selection-bubble__avatar"
:name="participant.label"
:source="participant.source"
Expand Down
2 changes: 1 addition & 1 deletion src/components/LeftSidebar/InvitationHandler.vue
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export default {
return {
user: {
component: Mention,
props: { id, name: item.inviterDisplayName, server, token: item.token, type: 'user' }
props: { id, name: item.inviterDisplayName, server, token: item.token || 'new', type: 'user' }
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/RightSidebar/Participants/Participant.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@keydown.enter="handleClick">
<!-- Participant's avatar -->
<AvatarWrapper :id="computedId"
:token="token"
:token="isSearched ? 'new' : token"
:name="computedName"
:source="participant.source || participant.actorType"
:disable-menu="isSearched"
Expand Down

0 comments on commit d722e14

Please sign in to comment.