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

Improve handling of payment notification messages

Browse source
This commit is contained in:
trevor-signal 2023-09-11 12:58:34 -04:00 committed by GitHub
parent ccb517a218
commit 90d36350a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ts/components/conversation/Message.tsx
View file

@ -89,7 +89,7 @@ import { DAY, HOUR, MINUTE, SECOND } from '../../util/durations';
import { BadgeImageTheme } from '../../badges/BadgeImageTheme';
import { getBadgeImageFileLocalPath } from '../../badges/getBadgeImageFileLocalPath';
import { handleOutsideClick } from '../../util/handleOutsideClick';
import { PaymentEventKind } from '../../types/Payment';
import { isPaymentNotificationEvent } from '../../types/Payment';
import type { AnyPaymentEvent } from '../../types/Payment';
import { getPaymentEventDescription } from '../../messages/helpers';
import { PanelType } from '../../types/Panels';
@ -1470,7 +1470,7 @@ export class Message extends React.PureComponent<Props, State> {
conversationColor,
i18n,
} = this.props;
if (payment == null || payment.kind !== PaymentEventKind.Notification) {
if (payment == null || !isPaymentNotificationEvent(payment)) {
return null;
}
@ -1769,6 +1769,7 @@ export class Message extends React.PureComponent<Props, State> {
isSpoilerExpanded,
kickOffAttachmentDownload,
messageExpanded,
payment,
showConversation,
showSpoiler,
status,
@ -1788,6 +1789,12 @@ export class Message extends React.PureComponent<Props, State> {
return null;
}
// Payment notifications are rendered in renderPayment, but they may have additional
// text in message.body for backwards-compatibility that we don't want to render
if (payment && isPaymentNotificationEvent(payment)) {
return null;
}
return (
<div // eslint-disable-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
className={classNames(