Skip to content

Fix content sharing external badge #4589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reneshen0328 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix content sharing external badge #4589

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167833d
fix(content-sharing): render external badge logic
reneshen0328 May 22, 2026
ade9bdf
fix: update test
reneshen0328 May 22, 2026
03ac124
fix: update external badge render logic to match webapp
reneshen0328 May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/elements/content-sharing/utils/__tests__/convertCollaborators.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe('convertCollaborators', () => {
avatarUrlMap: mockAvatarUrlMap,
collab: mockCollaborations[5],
currentUserId: mockOwnerId,
isCurrentUserOwner: false,
isCurrentUserOwner: true,
ownerEmailDomain,
});

Expand Down Expand Up @@ -225,7 +225,7 @@ describe('convertCollaborators', () => {
avatarUrlMap: mockAvatarUrlMap,
collab: mockCollaborations[2],
currentUserId: mockOwnerId,
isCurrentUserOwner: false,
isCurrentUserOwner: true,
ownerEmailDomain,
});

Expand Down Expand Up @@ -310,7 +310,7 @@ describe('convertCollaborators', () => {
hasCustomAvatar: false,
id: '124',
isCurrentUser: false,
isExternal: false,
isExternal: true,
isPending: false,
name: 'Raccoon Queen',
role: 'viewer',
Expand All @@ -336,7 +336,7 @@ describe('convertCollaborators', () => {
hasCustomAvatar: false,
id: '127',
isCurrentUser: false,
isExternal: false,
isExternal: true,
isPending: true,
name: 'bbear@external.example.com',
role: 'editor',
Expand Down
4 changes: 3 additions & 1 deletion src/elements/content-sharing/utils/convertCollaborators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ export const convertCollab = ({
return null;
}

// External collaborator icons will only be displayed in the USM if the current user owns
// the item and if the collaborator's email domain differs from the owner's email domain.
Copy link
Copy Markdown
Contributor

@tjuanitas tjuanitas May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no

const isExternal =
!isCurrentUserOwner && !!collabEmail && !!ownerEmailDomain && collabEmail.split('@')[1] !== ownerEmailDomain;
isCurrentUserOwner && !!collabEmail && !!ownerEmailDomain && collabEmail.split('@')[1] !== ownerEmailDomain;
const avatarUrl = avatarUrlMap ? avatarUrlMap[collabId] : undefined;

return {
Expand Down
Loading