From b731774ac7d62ff7444a7e09ef5af6d9249fdca8 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 20 Oct 2023 16:43:52 +1100
Subject: [PATCH] fix: use correct values for legacy mode

fix datatestid on generic message
---
 .../message-item/GenericReadableMessage.tsx   |  2 +-
 .../disappearing_messages/timerOptions.ts     | 26 ++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
index 847ea0c10..c262473d2 100644
--- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx
@@ -160,7 +160,7 @@ export const GenericReadableMessage = (props: Props) => {
         ctxMenuID={ctxMenuID}
         messageId={messageId}
         isDetailView={isDetailView}
-        dataTestId={`message-content-${messageId}`}
+        dataTestId={'message-content'}
         enableReactions={enableReactions}
       />
     </StyledReadableMessage>
diff --git a/ts/session/disappearing_messages/timerOptions.ts b/ts/session/disappearing_messages/timerOptions.ts
index 16f6f76c4..e880379e9 100644
--- a/ts/session/disappearing_messages/timerOptions.ts
+++ b/ts/session/disappearing_messages/timerOptions.ts
@@ -67,9 +67,9 @@ const VALUES: Array<number> = timerOptionsDurations.map(t => {
 
 const DELETE_AFTER_READ = VALUES.filter(option => {
   return (
-    option === 10 || // 10 seconds (for development or qa)
-    option === 30 || // 30 seconds (for development or qa)
-    option === 60 || // 1 minute (for testing)
+    option === 10 || // 10 seconds // TODO DO NOT MERGE Remove after QA
+    option === 30 || // 30 seconds // TODO DO NOT MERGE Remove after QA
+    option === 60 || // 1 minute // TODO DO NOT MERGE Remove after QA
     option === 300 || // 5 minutes
     option === 3600 || // 1 hour
     option === 43200 || // 12 hours
@@ -81,9 +81,9 @@ const DELETE_AFTER_READ = VALUES.filter(option => {
 
 const DELETE_AFTER_SEND = VALUES.filter(option => {
   return (
-    option === 10 || // 10 seconds (for development or qa)
-    option === 30 || // 30 seconds (for development or qa)
-    option === 60 || // 1 minute (for testing)
+    option === 10 || // 10 seconds // TODO DO NOT MERGE Remove after QA
+    option === 30 || // 30 seconds // TODO DO NOT MERGE Remove after QA
+    option === 60 || // 1 minute // TODO DO NOT MERGE Remove after QA
     option === 43200 || // 12 hours
     option === 86400 || // 1 day
     option === 604800 || // 1 week
@@ -94,17 +94,13 @@ const DELETE_AFTER_SEND = VALUES.filter(option => {
 // TODO legacy messages support will be removed in a future release
 const DELETE_LEGACY = VALUES.filter(option => {
   return (
-    option === 5 || // 5 seconds
-    option === 10 || // 10 seconds
-    option === 30 || // 30 seconds
-    option === 60 || // 1 minute
-    option === 300 || // 5 minutes
-    option === 1800 || // 30 minutes
-    option === 3600 || // 1 hour
-    option === 21600 || // 6 hours
+    option === 10 || // 10 seconds  // TODO DO NOT MERGE Remove after QA
+    option === 30 || // 30 seconds  // TODO DO NOT MERGE Remove after QA
+    option === 60 || // 1 minute  // TODO DO NOT MERGE Remove after QA
     option === 43200 || // 12 hours
     option === 86400 || // 1 day
-    option === 604800 // 1 week
+    option === 604800 || // 1 week
+    option === 1209600 // 2 weeks
   );
 });