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

Fix rendering of group joins and remove checkServiceIdEquivalence

Browse source
This commit is contained in:
Scott Nonnenberg 2024-05-03 07:28:36 -07:00 • committed by GitHub
parent 214fae0c6e
commit a1f0afdae8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 108 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ts/components/conversation/GroupV2Change.stories.tsx
View file

@ -50,13 +50,6 @@ const renderContact: SmartContactRendererType<JSX.Element> = (
</React.Fragment>
);
function checkServiceIdEquivalence(
left: ServiceIdString | undefined,
right: ServiceIdString | undefined
): boolean {
return Boolean(left && right && contactMap[left] === contactMap[right]);
}
const renderChange = (
change: GroupV2ChangeType,
{
@ -79,7 +72,6 @@ const renderChange = (
blockGroupLinkRequests={action('blockGroupLinkRequests')}
conversationId="some-conversation-id"
change={change}
checkServiceIdEquivalence={checkServiceIdEquivalence}
groupBannedMemberships={groupBannedMemberships}
groupMemberships={groupMemberships}
groupName={groupName}
@ -615,7 +607,39 @@ export function MemberAddFromInvited(): JSX.Element {
},
],
})}
ACI accepts PNI invite:
ACI accepts PNI invite (X joined the group)
{renderChange({
from: OUR_PNI,
details: [
{
type: 'member-add-from-invite',
aci: OUR_ACI,
pni: OUR_PNI,
inviter: CONTACT_B,
},
],
})}
{renderChange({
from: OUR_PNI,
details: [
{
type: 'member-add-from-invite',
aci: OUR_ACI,
pni: OUR_PNI,
},
],
})}
{renderChange({
from: CONTACT_A_PNI,
details: [
{
type: 'member-add-from-invite',
aci: CONTACT_A,
pni: CONTACT_A_PNI,
},
],
})}
ACI accepts PNI invite, the old way (X added X to group)
{renderChange({
from: OUR_PNI,
details: [