Skip to content

fix(desktop): keep MembersSidebar input usable while an add is in flight #1106

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

Merged
tlongwell-block merged 1 commit into from
Jun 18, 2026
Merged

fix(desktop): keep MembersSidebar input usable while an add is in flight #1106

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
32 changes: 24 additions & 8 deletions desktop/src/features/channels/ui/MembersSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ export function MembersSidebar({
const [inviteSubmissionErrors, setInviteSubmissionErrors] = React.useState<
AddChannelMembersResult["errors"]
>([]);
const [addingMemberPubkeys, setAddingMemberPubkeys] = React.useState<
ReadonlySet<string>
>(() => new Set());
const membersQuery = useChannelMembersQuery(channelId, open);
const addMembersMutation = useAddChannelMembersMutation(channelId);
const changeRoleMutation = useMutation({
Expand Down Expand Up @@ -410,6 +413,7 @@ export function MembersSidebar({
if (!open) {
setSearchQuery("");
setInviteSubmissionErrors([]);
setAddingMemberPubkeys(new Set());
return;
}

Expand All @@ -421,13 +425,25 @@ export function MembersSidebar({
}

async function handleAddSearchResult(user: UserSearchResult) {
setInviteSubmissionErrors([]);
if (addingMemberPubkeys.has(user.pubkey)) {
return;
}

const result = await addMembersMutation.mutateAsync({
pubkeys: [user.pubkey],
role: user.isAgent ? "bot" : "member",
});
setInviteSubmissionErrors(result.errors);
setAddingMemberPubkeys((prev) => new Set(prev).add(user.pubkey));

try {
const result = await addMembersMutation.mutateAsync({
pubkeys: [user.pubkey],
role: user.isAgent ? "bot" : "member",
});
setInviteSubmissionErrors((prev) => [...prev, ...result.errors]);
} finally {
setAddingMemberPubkeys((prev) => {
const next = new Set(prev);
next.delete(user.pubkey);
return next;
});
}
}

function renderMemberCard(member: ChannelMember, memberIsBot: boolean) {
Expand Down Expand Up @@ -507,7 +523,7 @@ export function MembersSidebar({
autoCorrect="off"
className={MODAL_SEARCH_INPUT_CLASS}
data-testid="channel-management-search-users"
disabled={addMembersMutation.isPending || isArchived}
disabled={isArchived}
id="channel-management-search-users"
onChange={(event) => {
setSearchQuery(event.target.value);
Expand Down Expand Up @@ -559,7 +575,7 @@ export function MembersSidebar({
{addSearchResults.map((user) => (
<AddMemberSearchResultRow
disabled={
addMembersMutation.isPending || isArchived
addingMemberPubkeys.has(user.pubkey) || isArchived
}
key={user.pubkey}
onSelect={(selectedUser) => {
Expand Down