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

Ensure that outgoing gift badges can be Viewed

Browse source
This commit is contained in:
Scott Nonnenberg 2022-07-12 09:39:18 -07:00 • committed by GitHub
parent 14591358f1
commit fc98d54326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -593,6 +593,7 @@ export class Message extends React.PureComponent<Props, State> {
{ {
attachments, attachments,
deletedForEveryone, deletedForEveryone,
direction,
expirationLength, expirationLength,
expirationTimestamp, expirationTimestamp,
giftBadge, giftBadge,
@ -615,7 +616,7 @@ export class Message extends React.PureComponent<Props, State> {
} }
if (giftBadge) { if (giftBadge) {
const description = i18n('message--giftBadge--unopened'); const description = i18n(`message--giftBadge--unopened--${direction}`);
const isDescriptionRTL = getDirection(description) === 'rtl'; const isDescriptionRTL = getDirection(description) === 'rtl';
if (giftBadge.state === GiftBadgeStates.Unopened && !isDescriptionRTL) { if (giftBadge.state === GiftBadgeStates.Unopened && !isDescriptionRTL) {

7
ts/messageModifiers/ViewSyncs.ts
View file

@ -8,7 +8,7 @@ import { Collection, Model } from 'backbone';
import type { MessageModel } from '../models/messages'; import type { MessageModel } from '../models/messages';
import { ReadStatus } from '../messages/MessageReadStatus'; import { ReadStatus } from '../messages/MessageReadStatus';
import { markViewed } from '../services/MessageUpdater'; import { markViewed } from '../services/MessageUpdater';
import { isIncoming, isStory } from '../state/selectors/message'; import { isIncoming } from '../state/selectors/message';
import { notificationService } from '../services/notifications'; import { notificationService } from '../services/notifications';
import * as log from '../logging/log'; import * as log from '../logging/log';
import { GiftBadgeStates } from '../components/conversation/Message'; import { GiftBadgeStates } from '../components/conversation/Message';
@ -68,10 +68,7 @@ export class ViewSyncs extends Collection {
uuid: item.sourceUuid, uuid: item.sourceUuid,
}); });
return ( return senderId === sync.get('senderId');
(isIncoming(item) || isStory(item)) &&
senderId === sync.get('senderId')
);
}); });
if (!found) { if (!found) {