Skip to content
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

contacts: use contacts for populating contact book list, display @p if nickname set #4240

Merged
merged 1 commit into from
Dec 3, 2024
Merged

contacts: use contacts for populating contact book list, display @p if nickname set #4240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion packages/ui/src/components/ContactBook.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,18 @@ export function ContactBook({
width?: number;
}) {
const contacts = useContacts();
const contactsForBook = useMemo(() => {
const markedContacts =
contacts?.filter((contact) => contact.isContact) ?? [];
if (markedContacts.length) {
return markedContacts;
}
return contacts;
}, [contacts]);
const immutableSet = useMemo(() => new Set(immutableIds), [immutableIds]);
const contactsIndex = useContactIndex();
const segmentedContacts = useAlphabeticallySegmentedContacts(
latter-bolden marked this conversation as resolved.
Show resolved Hide resolved
contacts ?? [],
contactsForBook ?? [],
contactsIndex ?? {}
);

Expand Down
7 changes: 4 additions & 3 deletions packages/ui/src/components/ContactRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ function ContactRowItemRaw({
<ListItem {...rest}>
<ListItem.ContactIcon contactId={contact.id} />
<ListItem.MainContent>
<XStack alignItems="center">
<ListItem.Title marginLeft="$l">{displayName}</ListItem.Title>
</XStack>
<ListItem.Title>{displayName}</ListItem.Title>
{contact?.nickname && (
<ListItem.Subtitle>{contact.id}</ListItem.Subtitle>
)}
</ListItem.MainContent>
{selectable && (
<ListItem.EndContent>
Expand Down
Loading