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

Introduce new 'Block request' button in timeline

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-15 17:11:28 -07:00 • committed by GitHub
parent 536dd0c7b0
commit 703bb8a3a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 1088 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ts/components/conversation/TimelineItem.tsx
View file

@ -45,7 +45,10 @@ import type { PropsData as VerificationNotificationProps } from './VerificationN
import { VerificationNotification } from './VerificationNotification';
import type { PropsData as GroupNotificationProps } from './GroupNotification';
import { GroupNotification } from './GroupNotification';
import type { PropsDataType as GroupV2ChangeProps } from './GroupV2Change';
import type {
PropsDataType as GroupV2ChangeProps,
PropsActionsType as GroupV2ChangeActionsType,
} from './GroupV2Change';
import { GroupV2Change } from './GroupV2Change';
import type { PropsDataType as GroupV1MigrationProps } from './GroupV1Migration';
import { GroupV1Migration } from './GroupV1Migration';
@ -161,6 +164,7 @@ type PropsLocalType = {
type PropsActionsType = MessageActionsType &
CallingNotificationActionsType &
DeliveryIssueActionProps &
GroupV2ChangeActionsType &
PropsChatSessionRefreshedActionsType &
UnsupportedMessageActionsType &
SafetyNumberActionsType;
@ -190,7 +194,6 @@ export class TimelineItem extends React.PureComponent<PropsType> {
theme,
nextItem,
previousItem,
renderContact,
renderUniversalTimerNotification,
returnToActiveCall,
selectMessage,
@ -294,11 +297,7 @@ export class TimelineItem extends React.PureComponent<PropsType> {
);
} else if (item.type === 'groupV2Change') {
notification = (
<GroupV2Change
renderContact={renderContact}
{...item.data}
i18n={i18n}
/>
<GroupV2Change {...this.props} {...item.data} i18n={i18n} />
);
} else if (item.type === 'groupV1Migration') {
notification = (