From 6503a0aad6fe3914c5310b6eed12d3584bea505a Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 15 Jul 2024 15:26:50 -0700
Subject: [PATCH] Show original sent timestamp for edited messages

---
 ts/models/conversations.ts          | 5 +----
 ts/state/selectors/message.ts       | 2 +-
 ts/test-mock/messaging/edit_test.ts | 8 ++++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 3c95232cf6..d96bac7848 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4213,10 +4213,7 @@ export class ConversationModel extends window.Backbone
         : undefined;
 
       timestamp =
-        callHistory?.timestamp ||
-        activityMessage.get('editMessageTimestamp') ||
-        activityMessage.get('sent_at') ||
-        timestamp;
+        callHistory?.timestamp || activityMessage.get('sent_at') || timestamp;
       lastMessageReceivedAt =
         activityMessage.get('received_at') || lastMessageReceivedAt;
       lastMessageReceivedAtMs =
diff --git a/ts/state/selectors/message.ts b/ts/state/selectors/message.ts
index 7ec9350b55..4f0d7d3ba6 100644
--- a/ts/state/selectors/message.ts
+++ b/ts/state/selectors/message.ts
@@ -774,7 +774,7 @@ export const getPropsForMessage = (
     status: getMessagePropStatus(message, ourConversationId),
     text: message.body,
     textDirection: getTextDirection(message.body),
-    timestamp: getMessageSentTimestamp(message, { includeEdits: true, log }),
+    timestamp: getMessageSentTimestamp(message, { includeEdits: false, log }),
     receivedAtMS: message.received_at_ms,
   };
 };
diff --git a/ts/test-mock/messaging/edit_test.ts b/ts/test-mock/messaging/edit_test.ts
index 10a8897d0c..72724929a3 100644
--- a/ts/test-mock/messaging/edit_test.ts
+++ b/ts/test-mock/messaging/edit_test.ts
@@ -348,7 +348,7 @@ describe('editing', function (this: Mocha.Suite) {
 
       await sendEditedMessage(
         window,
-        firstEdit.dataMessage?.timestamp?.toNumber() ?? 0,
+        originalMessage.timestamp?.toNumber() ?? 0,
         '.3'
       );
 
@@ -361,7 +361,7 @@ describe('editing', function (this: Mocha.Suite) {
 
       debug('opening edit history');
       const secondEditMessage = window.locator(
-        `.module-message[data-testid="${secondEdit.dataMessage?.timestamp?.toNumber()}"]`
+        `.module-message[data-testid="${originalMessage?.timestamp?.toNumber()}"]`
       );
       await secondEditMessage
         .locator('.module-message__metadata__edited')
@@ -669,7 +669,7 @@ describe('editing', function (this: Mocha.Suite) {
       debug('sending edit message v3 desktop -> friend');
       await sendEditedMessage(
         page,
-        editMessageV2.dataMessage?.timestamp?.toNumber() ?? 0,
+        originalMessage?.timestamp?.toNumber() ?? 0,
         '3'
       );
 
@@ -690,7 +690,7 @@ describe('editing', function (this: Mocha.Suite) {
       debug('sending edit message v4 desktop -> friend');
       await sendEditedMessage(
         page,
-        editMessageV3.dataMessage?.timestamp?.toNumber() ?? 0,
+        originalMessage?.timestamp?.toNumber() ?? 0,
         '4'
       );