From c067ac9fc4401e54ecacbc3cd7df918eda62dec2 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 24 Aug 2023 17:08:46 +1000
Subject: [PATCH] fix: simplified legacy support in conversationheadertitle

---
 .../conversation/header/ConversationHeaderTitle.tsx      | 9 ++-------
 ts/models/conversation.ts                                | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx
index 794627eac..dd6eabf4d 100644
--- a/ts/components/conversation/header/ConversationHeaderTitle.tsx
+++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx
@@ -77,16 +77,11 @@ export const ConversationHeaderTitle = () => {
   }
 
   const disappearingMessageSettingText =
-    expirationType === 'off'
-      ? null
-      : expirationType === 'deleteAfterRead'
+    expirationType === 'deleteAfterRead'
       ? window.i18n('disappearingMessagesModeAfterRead')
       : expirationType === 'deleteAfterSend'
       ? window.i18n('disappearingMessagesModeAfterSend')
-      : // legacy mode support
-      isMe || isGroup
-      ? window.i18n('disappearingMessagesModeAfterSend')
-      : window.i18n('disappearingMessagesModeAfterRead');
+      : null;
   const abbreviatedExpireTime = isNumber(expireTimer)
     ? ExpirationTimerOptions.getAbbreviated(expireTimer)
     : null;
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 5175b6770..c48639461 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -869,7 +869,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       lastDisappearingMessageChangeTimestamp,
     });
 
-    window?.log?.debug('Updating conversation disappearing messages setting', {
+    window?.log?.debug('WIP: Updating conversation disappearing messages setting', {
       id: this.idForLogging(),
       expirationType,
       expireTimer,