mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix incorrect member count in chat details during pending membership

Browse source 
Co-authored-by: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-03-26 16:17:54 -05:00 committed by GitHub
parent a902de43d5
commit dcd59a70cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/components/conversation/conversation-details/ConversationDetails.tsx
View file

@ -391,7 +391,7 @@ export function ConversationDetails({
i18n={i18n} i18n={i18n}
isMe={conversation.isMe} isMe={conversation.isMe}
isGroup={isGroup} isGroup={isGroup}
memberships={memberships} membersCount={conversation.membersCount ?? null}
startEditing={(isGroupTitle: boolean) => { startEditing={(isGroupTitle: boolean) => {
setModalState( setModalState(
isGroupTitle isGroupTitle

2
ts/components/conversation/conversation-details/ConversationDetailsHeader.stories.tsx
View file

@ -41,7 +41,7 @@ function Wrapper(overrideProps: Partial<Props>) {
i18n={i18n} i18n={i18n}
canEdit={false} canEdit={false}
startEditing={action('startEditing')} startEditing={action('startEditing')}
memberships={new Array(0)} membersCount={0}
isGroup isGroup
isMe={false} isMe={false}
theme={theme} theme={theme}

7
ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
View file

@ -9,7 +9,6 @@ import { AvatarLightbox } from '../../AvatarLightbox';
import type { ConversationType } from '../../../state/ducks/conversations'; import type { ConversationType } from '../../../state/ducks/conversations';
import { GroupDescription } from '../GroupDescription'; import { GroupDescription } from '../GroupDescription';
import { About } from '../About'; import { About } from '../About';
import type { GroupV2Membership } from './ConversationDetailsMembershipList';
import type { LocalizerType, ThemeType } from '../../../types/Util'; import type { LocalizerType, ThemeType } from '../../../types/Util';
import { assertDev } from '../../../util/assert'; import { assertDev } from '../../../util/assert';
import { BadgeDialog } from '../../BadgeDialog'; import { BadgeDialog } from '../../BadgeDialog';
@ -24,7 +23,7 @@ export type Props = {
i18n: LocalizerType; i18n: LocalizerType;
isGroup: boolean; isGroup: boolean;
isMe: boolean; isMe: boolean;
memberships: ReadonlyArray<GroupV2Membership>; membersCount: number | null;
startEditing: (isGroupTitle: boolean) => void; startEditing: (isGroupTitle: boolean) => void;
toggleAboutContactModal: (contactId: string) => void; toggleAboutContactModal: (contactId: string) => void;
theme: ThemeType; theme: ThemeType;
@ -43,7 +42,7 @@ export function ConversationDetailsHeader({
i18n, i18n,
isGroup, isGroup,
isMe, isMe,
memberships, membersCount,
startEditing, startEditing,
toggleAboutContactModal, toggleAboutContactModal,
theme, theme,
@ -69,7 +68,7 @@ export function ConversationDetailsHeader({
subtitle = i18n('icu:ConversationDetailsHeader--add-group-description'); subtitle = i18n('icu:ConversationDetailsHeader--add-group-description');
} else { } else {
subtitle = i18n('icu:ConversationDetailsHeader--members', { subtitle = i18n('icu:ConversationDetailsHeader--members', {
number: memberships.length, number: membersCount ?? 0,
}); });
} }
} else if (!isMe) { } else if (!isMe) {