fix: simplified legacy support in conversationheadertitle

pull/2971/head
William Grant 2 years ago
parent 60b75a8ddf
commit c067ac9fc4

@ -77,16 +77,11 @@ export const ConversationHeaderTitle = () => {
} }
const disappearingMessageSettingText = const disappearingMessageSettingText =
expirationType === 'off' expirationType === 'deleteAfterRead'
? null
: expirationType === 'deleteAfterRead'
? window.i18n('disappearingMessagesModeAfterRead') ? window.i18n('disappearingMessagesModeAfterRead')
: expirationType === 'deleteAfterSend' : expirationType === 'deleteAfterSend'
? window.i18n('disappearingMessagesModeAfterSend') ? window.i18n('disappearingMessagesModeAfterSend')
: // legacy mode support : null;
isMe || isGroup
? window.i18n('disappearingMessagesModeAfterSend')
: window.i18n('disappearingMessagesModeAfterRead');
const abbreviatedExpireTime = isNumber(expireTimer) const abbreviatedExpireTime = isNumber(expireTimer)
? ExpirationTimerOptions.getAbbreviated(expireTimer) ? ExpirationTimerOptions.getAbbreviated(expireTimer)
: null; : null;

@ -869,7 +869,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
lastDisappearingMessageChangeTimestamp, lastDisappearingMessageChangeTimestamp,
}); });
window?.log?.debug('Updating conversation disappearing messages setting', { window?.log?.debug('WIP: Updating conversation disappearing messages setting', {
id: this.idForLogging(), id: this.idForLogging(),
expirationType, expirationType,
expireTimer, expireTimer,

Loading…
Cancel
Save