From abb839c24b722bca92499017ddebe66e36a4eb08 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:50:19 -0700
Subject: [PATCH] Use timestamp of edited message when editing

---
 ts/util/sendEditedMessage.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ts/util/sendEditedMessage.ts b/ts/util/sendEditedMessage.ts
index c143216c9e..f1c81b748e 100644
--- a/ts/util/sendEditedMessage.ts
+++ b/ts/util/sendEditedMessage.ts
@@ -192,7 +192,9 @@ export async function sendEditedMessage(
     conversationId,
     fromId,
     message: tmpMessage,
-    targetSentTimestamp: targetMessage.attributes.timestamp,
+    targetSentTimestamp:
+      targetMessage.attributes.editMessageTimestamp ??
+      targetMessage.attributes.timestamp,
   };
 
   // Takes care of putting the message in the edit history, replacing the