From 6cc25fe9e85342846f938ff842e3330cf6b3732d Mon Sep 17 00:00:00 2001
From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:39:07 -0700
Subject: [PATCH] Fix timestamps on call history message updating

---
 ts/util/callDisposition.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ts/util/callDisposition.ts b/ts/util/callDisposition.ts
index 4e217d689c..30a524a9bc 100644
--- a/ts/util/callDisposition.ts
+++ b/ts/util/callDisposition.ts
@@ -832,10 +832,13 @@ async function updateLocalCallHistory(
         id: prevMessage?.id ?? generateGuid(),
         conversationId: conversation.id,
         type: 'call-history',
-        sent_at: callHistory.timestamp,
-        timestamp: callHistory.timestamp,
-        received_at: receivedAtCounter ?? incrementMessageCounter(),
-        received_at_ms: callHistory.timestamp,
+        timestamp: prevMessage?.timestamp ?? callHistory.timestamp,
+        sent_at: prevMessage?.sent_at ?? callHistory.timestamp,
+        received_at:
+          prevMessage?.received_at ??
+          receivedAtCounter ??
+          incrementMessageCounter(),
+        received_at_ms: prevMessage?.received_at_ms ?? callHistory.timestamp,
         readStatus,
         seenStatus,
         callId: callHistory.callId,