fix: updated child types from PropsExpiringMessges

use type and the ampersand operator instead of the interface with extends for better consistency with the rest of the code base
pull/2660/head
William Grant 3 years ago
parent f9c9702d12
commit ec3f62d12f

@ -23,11 +23,11 @@ import {
export type CallNotificationType = 'missed-call' | 'started-call' | 'answered-a-call'; export type CallNotificationType = 'missed-call' | 'started-call' | 'answered-a-call';
export interface PropsForCallNotification extends PropsForExpiringMessage { export type PropsForCallNotification = PropsForExpiringMessage & {
notificationType: CallNotificationType; notificationType: CallNotificationType;
receivedAt: number; receivedAt: number;
isUnread: boolean; isUnread: boolean;
} };
export type MessageModelPropsWithoutConvoProps = { export type MessageModelPropsWithoutConvoProps = {
propsForMessage: PropsForMessageWithoutConvoProps; propsForMessage: PropsForMessageWithoutConvoProps;
@ -84,7 +84,7 @@ export type PropsForExpiringMessage = {
isExpired?: boolean; isExpired?: boolean;
}; };
export interface PropsForExpirationTimer extends PropsForExpiringMessage { export type PropsForExpirationTimer = PropsForExpiringMessage & {
expirationType: DisappearingMessageConversationType; expirationType: DisappearingMessageConversationType;
timespan: string; timespan: string;
disabled: boolean; disabled: boolean;
@ -97,7 +97,7 @@ export interface PropsForExpirationTimer extends PropsForExpiringMessage {
messageId: string; messageId: string;
isUnread: boolean; isUnread: boolean;
receivedAt: number | undefined; receivedAt: number | undefined;
} };
export type PropsForGroupUpdateGeneral = { export type PropsForGroupUpdateGeneral = {
type: 'general'; type: 'general';
@ -130,21 +130,21 @@ export type PropsForGroupUpdateType =
| PropsForGroupUpdateName | PropsForGroupUpdateName
| PropsForGroupUpdateLeft; | PropsForGroupUpdateLeft;
export interface PropsForGroupUpdate extends PropsForExpiringMessage { export type PropsForGroupUpdate = PropsForExpiringMessage & {
change: PropsForGroupUpdateType; change: PropsForGroupUpdateType;
messageId: string; messageId: string;
receivedAt: number | undefined; receivedAt: number | undefined;
isUnread: boolean; isUnread: boolean;
} };
export interface PropsForGroupInvitation extends PropsForExpiringMessage { export type PropsForGroupInvitation = PropsForExpiringMessage & {
serverName: string; serverName: string;
url: string; url: string;
acceptUrl: string; acceptUrl: string;
messageId: string; messageId: string;
receivedAt?: number; receivedAt?: number;
isUnread: boolean; isUnread: boolean;
} };
export type PropsForAttachment = { export type PropsForAttachment = {
id: number; id: number;

Loading…
Cancel
Save