Merge pull request #2668 from Bilb/fix-msg-request-merge-timestamp

Fix msg request merge timestamp

ts/receiver/contentMessage.ts

@@ -626,11 +626,9 @@ async function handleMessageRequestResponse(
     unblindedConvoId,
     ConversationTypeEnum.PRIVATE
   );
-  let mostRecentActiveAt =
-    Math.max(...compact(convosToMerge.map(m => m.get('active_at')))) || Date.now();
-
-  if (!isFinite(mostRecentActiveAt)) {
-    mostRecentActiveAt = Date.now();
+  let mostRecentActiveAt = Math.max(...compact(convosToMerge.map(m => m.get('active_at'))));
+  if (!isFinite(mostRecentActiveAt) || mostRecentActiveAt <= 0) {
+    mostRecentActiveAt = toNumber(envelope.timestamp);
   }
 
   conversationToApprove.set({