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

GroupV2: Show summary of change details on re-join of group

Browse source
This commit is contained in:
Scott Nonnenberg 2022-12-06 13:12:57 -08:00 • committed by GitHub
parent 105162dc66
commit e9b7a74b32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 181 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1278,14 +1278,45 @@ export function AdminApprovalRemove(): JSX.Element {
},
],
})}
</>
);
}
AdminApprovalRemove.story = {
name: 'Admin Approval (Remove)',
};
export function AdminApprovalBounce(): JSX.Element {
return (
<>
Should show button:
{renderChange(
{
// From Joiner
from: CONTACT_A,
details: [
{
type: 'admin-approval-remove-one',
type: 'admin-approval-bounce',
uuid: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
{
groupMemberships: [{ uuid: CONTACT_C, isAdmin: false }],
groupBannedMemberships: [CONTACT_B],
}
)}
{renderChange(
{
// From nobody
details: [
{
type: 'admin-approval-bounce',
uuid: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
@ -1295,37 +1326,26 @@ export function AdminApprovalRemove(): JSX.Element {
}
)}
{renderChange({
from: ADMIN_A,
details: [
{
type: 'admin-approval-remove-one',
type: 'admin-approval-bounce',
uuid: CONTACT_A,
times: 1,
isApprovalPending: false,
},
// No group membership info
],
})}
Should show button:
{renderChange(
{
details: [
{
type: 'admin-approval-remove-one',
uuid: CONTACT_A,
},
],
},
{
groupMemberships: [{ uuid: CONTACT_C, isAdmin: false }],
groupBannedMemberships: [CONTACT_B],
}
)}
Would show button, but we&apos;re not admin:
{renderChange(
{
from: CONTACT_A,
details: [
{
type: 'admin-approval-remove-one',
type: 'admin-approval-bounce',
uuid: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
@ -1338,8 +1358,10 @@ export function AdminApprovalRemove(): JSX.Element {
from: CONTACT_A,
details: [
{
type: 'admin-approval-remove-one',
type: 'admin-approval-bounce',
uuid: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
@ -1351,8 +1373,10 @@ export function AdminApprovalRemove(): JSX.Element {
from: CONTACT_A,
details: [
{
type: 'admin-approval-remove-one',
type: 'admin-approval-bounce',
uuid: CONTACT_A,
times: 1,
isApprovalPending: false,
},
],
},
@ -1363,8 +1387,8 @@ export function AdminApprovalRemove(): JSX.Element {
);
}
AdminApprovalRemove.story = {
name: 'Admin Approval (Remove)',
AdminApprovalBounce.story = {
name: 'Admin Approval (Bounce)',
};
export function GroupLinkAdd(): JSX.Element {
@ -1646,3 +1670,18 @@ export function AnnouncementGroupChange(): JSX.Element {
AnnouncementGroupChange.story = {
name: 'Announcement Group (Change)',
};
export function Summary(): JSX.Element {
return (
<>
{renderChange({
from: OUR_ACI,
details: [
{
type: 'summary',
},
],
})}
</>
);
}

4
ts/components/conversation/GroupV2Change.tsx
View file

@ -70,6 +70,7 @@ type GroupIconType =
| 'group-avatar'
| 'group-decline'
| 'group-edit'
| 'group-summary'
| 'group-leave'
| 'group-remove';
@ -120,6 +121,9 @@ function getIcon(
if (changeType === 'admin-approval-bounce' && isLastText) {
possibleIcon = undefined;
}
if (changeType === 'summary') {
possibleIcon = 'group-summary';
}
return possibleIcon || 'group';
}