From 9119fef90a7ca8f349ec96d006cdcedc48906594 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Thu, 5 Sep 2024 14:24:41 +1000
Subject: [PATCH] fix: do not construct expireTimer string by hand

---
 .../conversation/TimerNotification.tsx        |  2 +-
 .../overlay/OverlayRightPanelSettings.tsx     |  1 -
 ts/hooks/useParamSelector.ts                  | 34 ++++++++-----------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index c8f3e894b..4895f1875 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -57,7 +57,7 @@ function useFollowSettingsButtonClick(
           },
         };
 
-    const okText = props.disabled ? window.i18n('yes') : window.i18n('set');
+    const okText = window.i18n('confirm');
 
     dispatch(
       updateConfirmModal({
diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
index 25e87817e..500aa0471 100644
--- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
+++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
@@ -206,7 +206,6 @@ export const OverlayRightPanelSettings = () => {
   const weAreAdmin = useSelectedWeAreAdmin();
   const disappearingMessagesSubtitle = useDisappearingMessageSettingText({
     convoId: selectedConvoKey,
-    separator: ': ',
   });
   const lastMessage = useSelectedLastMessage();
 
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index d322fb53b..b6db344f6 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -398,32 +398,16 @@ export function useSortedGroupMembers(convoId: string | undefined): Array<string
 export function useDisappearingMessageSettingText({
   convoId,
   abbreviate,
-  separator = ' - ',
 }: {
   convoId?: string;
   abbreviate?: boolean;
-  separator?: string;
 }): string {
   const convoProps = useConversationPropsById(convoId);
   if (!convoProps) {
     return '';
   }
 
-  const { expirationMode, expireTimer, isMe, isPublic } = convoProps;
-
-  const isGroup = !convoProps.isPrivate && !convoProps.isPublic;
-
-  // TODO legacy messages support will be removed in a future release
-  const expirationModeText =
-    expirationMode === 'deleteAfterRead'
-      ? window.i18n('disappearingMessagesDisappearAfterRead')
-      : expirationMode === 'deleteAfterSend'
-        ? window.i18n('disappearingMessagesDisappearAfterSend')
-        : expirationMode === 'legacy'
-          ? isMe || (isGroup && !isPublic)
-            ? window.i18n('disappearingMessagesDisappearAfterSend')
-            : window.i18n('disappearingMessagesDisappearAfterRead')
-          : null;
+  const { expirationMode, expireTimer } = convoProps;
 
   const expireTimerText = isNumber(expireTimer)
     ? abbreviate
@@ -431,9 +415,19 @@ export function useDisappearingMessageSettingText({
       : TimerOptions.getName(expireTimer)
     : null;
 
-  return expireTimer && expirationModeText
-    ? `${expirationModeText}${expireTimerText ? `${separator}${expireTimerText}` : ''}`
-    : '';
+  if (!expireTimerText) {
+    return '';
+  }
+
+  if (expirationMode === 'legacy') {
+    throw new Error('legacy support is removed');
+  }
+
+  return expirationMode === 'deleteAfterRead'
+    ? window.i18n('disappearingMessagesDisappearAfterReadState', { time: expireTimerText })
+    : expirationMode === 'deleteAfterSend'
+      ? window.i18n('disappearingMessagesDisappearAfterSendState', { time: expireTimerText })
+      : '';
 }
 
 export function useLastMessage(convoId?: string) {