Group member label improvements

This commit is contained in:
Scott Nonnenberg
2026-02-05 03:17:50 +10:00
committed by GitHub
parent f9bd84445c
commit e6278fded7
33 changed files with 663 additions and 83 deletions

View File

@@ -1,12 +1,18 @@
// Copyright 2026 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import React, { memo } from 'react';
import { useSelector } from 'react-redux';
import { GroupMemberLabelEditor } from '../../components/conversation/conversation-details/GroupMemberLabelEditor.dom.js';
import { getConversationSelector } from '../selectors/conversations.dom.js';
import {
getCachedConversationMemberColorsSelector,
getConversationSelector,
} from '../selectors/conversations.dom.js';
import { getIntl, getTheme, getUser } from '../selectors/user.std.js';
import { useConversationsActions } from '../ducks/conversations.preload.js';
import { createLogger } from '../../logging/log.std.js';
import { getPreferredBadgeSelector } from '../selectors/badges.preload.js';
const log = createLogger('SmartGroupMemberLabelEditor');
@@ -24,11 +30,18 @@ export const SmartGroupMemberLabelEditor = memo(
const conversationSelector = useSelector(getConversationSelector);
const conversation = conversationSelector(conversationId);
const me = conversationSelector(user.ourAci);
const { updateGroupMemberLabel, popPanelForConversation } =
useConversationsActions();
const getMemberColors = useSelector(
getCachedConversationMemberColorsSelector
);
const memberColors = getMemberColors(conversationId);
const ourColor = memberColors?.get(me.id);
const getPreferredBadge = useSelector(getPreferredBadgeSelector);
const { ourAci } = user;
// TODO: DESKTOP-9698
const ourMembership = conversation.memberships?.find(
membership => membership?.aci === ourAci
);
@@ -42,10 +55,13 @@ export const SmartGroupMemberLabelEditor = memo(
return (
<GroupMemberLabelEditor
i18n={i18n}
conversation={conversation}
existingLabelEmoji={existingLabelEmoji}
existingLabelString={existingLabelString}
getPreferredBadge={getPreferredBadge}
group={conversation}
i18n={i18n}
me={me}
ourColor={ourColor}
popPanelForConversation={popPanelForConversation}
theme={theme}
updateGroupMemberLabel={updateGroupMemberLabel}