From d8e1e3da71906221c81a7016028f2408677f3b0b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Fri, 6 Sep 2024 12:33:09 +1000
Subject: [PATCH] fix: use the correct string for legacy groups disappearing
 timer changes

---
 .../conversation/TimerNotification.tsx        | 33 ++++++++++++++++---
 ts/models/conversation.ts                     | 11 ++++---
 ts/state/selectors/selectedConversation.ts    | 27 +++++++++++++++
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index 4895f1875..9b197a83b 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -10,7 +10,9 @@ import {
   useSelectedExpireTimer,
   useSelectedIsGroupOrCommunity,
   useSelectedIsGroupV2,
+  useSelectedIsLegacyGroup,
   useSelectedIsPrivateFriend,
+  useSelectedIsPublic,
 } from '../../state/selectors/selectedConversation';
 import { ReleasedFeatures } from '../../util/releaseFeature';
 import { Flex } from '../basic/Flex';
@@ -20,10 +22,10 @@ import { ExpirableReadableMessage } from './message/message-item/ExpirableReadab
 import { ConversationInteraction } from '../../interactions';
 import { getConversationController } from '../../session/conversations';
 import { updateConfirmModal } from '../../state/ducks/modalDialog';
+import type { LocalizerComponentProps, LocalizerToken } from '../../types/Localizer';
+import { Localizer } from '../basic/Localizer';
 import { SessionButtonColor } from '../basic/SessionButton';
 import { SessionIcon } from '../icon';
-import { Localizer } from '../basic/Localizer';
-import type { LocalizerComponentProps, LocalizerToken } from '../../types/Localizer';
 
 const FollowSettingButton = styled.button`
   color: var(--primary-color);
@@ -145,6 +147,8 @@ function useTextToRenderI18nProps(
 ): LocalizerComponentProps<LocalizerToken> {
   const { pubkey: authorPk, profileName, expirationMode, timespanText: time, disabled } = props;
 
+  const isLegacyGroup = useSelectedIsLegacyGroup();
+
   const authorIsUs = authorPk === UserUtils.getOurPubKeyStrFromCache();
 
   const name = profileName ?? authorPk;
@@ -165,14 +169,32 @@ function useTextToRenderI18nProps(
       ? window.i18n('disappearingMessagesTypeRead')
       : window.i18n('disappearingMessagesTypeSent');
 
+  if (isLegacyGroup) {
+    if (disabled) {
+      if (authorIsUs) {
+        return {
+          token: 'disappearingMessagesTurnedOffYouGroup',
+        };
+      }
+      return {
+        token: 'disappearingMessagesTurnedOffGroup',
+        args: {
+          name,
+        },
+      };
+    }
+  }
+
   if (disabled) {
     if (authorIsUs) {
       return {
-        token: 'disappearingMessagesTurnedOffYou',
+        token: isLegacyGroup
+          ? 'disappearingMessagesTurnedOffYouGroup'
+          : 'disappearingMessagesTurnedOffYou',
       };
     }
     return {
-      token: 'disappearingMessagesTurnedOff',
+      token: isLegacyGroup ? 'disappearingMessagesTurnedOffGroup' : 'disappearingMessagesTurnedOff',
       args: {
         name,
       },
@@ -204,8 +226,9 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
   const i18nProps = useTextToRenderI18nProps(props);
   const isGroupOrCommunity = useSelectedIsGroupOrCommunity();
   const isGroupV2 = useSelectedIsGroupV2();
+  const isPublic = useSelectedIsPublic();
   // renderOff is true when the update is put to off, or when we have a legacy group control message (as they are not expiring at all)
-  const renderOffIcon = props.disabled || (isGroupOrCommunity && !isGroupV2);
+  const renderOffIcon = props.disabled || (isGroupOrCommunity && isPublic && !isGroupV2);
 
   return (
     <ExpirableReadableMessage
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index d7a292dc4..16ccbe3b9 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -891,11 +891,12 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
      * - ignores a off setting for a legacy group (as we can get a setting from restored from configMessage, and a newgroup can still be in the swarm when linking a device
      */
     const shouldAddExpireUpdateMsgGroup =
-      isLegacyGroup &&
-      !fromConfigMessage &&
-      (expirationMode !== this.get('expirationMode') || expireTimer !== this.get('expireTimer')) &&
-      expirationMode !== 'off';
-
+      fromCurrentDevice ||
+      (isLegacyGroup &&
+        !fromConfigMessage &&
+        (expirationMode !== this.get('expirationMode') ||
+          expireTimer !== this.get('expireTimer')) &&
+        expirationMode !== 'off');
     const shouldAddExpireUpdateMessage =
       shouldAddExpireUpdateMsgPrivate || shouldAddExpireUpdateMsgGroup;
 
diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts
index 95c15ed9b..127100d0e 100644
--- a/ts/state/selectors/selectedConversation.ts
+++ b/ts/state/selectors/selectedConversation.ts
@@ -203,10 +203,37 @@ export function useSelectedIsGroupV2() {
   return useSelector(getSelectedConversationIsGroupV2);
 }
 
+/**
+ *
+ * @returns true if the selected conversation is a group (or group v2), but not a community
+ */
+export function useSelectedIsGroupOrGroupV2() {
+  const isGroupOrCommunity = useSelectedIsGroupOrCommunity();
+  const isPublic = useSelectedIsPublic();
+
+  return isGroupOrCommunity && !isPublic;
+}
+
+/**
+ *
+ * @returns true if the selected conversation is a community (public groups)
+ */
 export function useSelectedIsPublic() {
   return useSelector(getSelectedConversationIsPublic);
 }
 
+/**
+ *
+ * @returns true if the conversation is a legacy group (closed group with a 05 pubkey)
+ */
+export function useSelectedIsLegacyGroup() {
+  const isGroupOrCommunity = useSelectedIsGroupOrCommunity();
+  const isGroupV2 = useSelectedIsGroupV2();
+  const isPublic = useSelectedIsPublic();
+
+  return isGroupOrCommunity && !isGroupV2 && !isPublic;
+}
+
 export function useSelectedIsPrivate() {
   return useSelector(getIsSelectedPrivate);
 }