Use 1x icon in View-once bubbles, explanatory expired toasts

This commit is contained in:
Scott Nonnenberg 2020-01-10 08:29:51 -08:00 committed by Ken Powers
parent 14cc11d5de
commit 4f50c0b093
11 changed files with 96 additions and 34 deletions

View file

@ -129,6 +129,9 @@ export type PropsActions = {
openLink: (url: string) => void;
scrollToQuotedMessage: (options: { author: string; sentAt: number }) => void;
selectMessage?: (messageId: string, conversationId: string) => unknown;
showExpiredIncomingTapToViewToast: () => unknown;
showExpiredOutgoingTapToViewToast: () => unknown;
};
export type Props = PropsData & PropsHousekeeping & PropsActions;
@ -1311,7 +1314,7 @@ export class Message extends React.PureComponent<Props, State> {
);
}
// tslint:disable-next-line cyclomatic-complexity
// tslint:disable-next-line cyclomatic-complexity max-func-body-length
public handleOpen = (
event: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent
) => {
@ -1319,19 +1322,32 @@ export class Message extends React.PureComponent<Props, State> {
attachments,
contact,
displayTapToViewMessage,
direction,
id,
isTapToView,
isTapToViewExpired,
openConversation,
showContactDetail,
showVisualAttachment,
showExpiredIncomingTapToViewToast,
showExpiredOutgoingTapToViewToast,
} = this.props;
const { imageBroken } = this.state;
const isAttachmentPending = this.isAttachmentPending();
if (isTapToView) {
if (!isTapToViewExpired && !isAttachmentPending) {
if (isAttachmentPending) {
return;
}
if (isTapToViewExpired) {
const action =
direction === 'outgoing'
? showExpiredOutgoingTapToViewToast
: showExpiredIncomingTapToViewToast;
action();
} else {
event.preventDefault();
event.stopPropagation();