From 8d770833adeac2f3d88621114d6bbc1ec5e516db Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Wed, 8 Jan 2020 11:23:19 +1100
Subject: [PATCH] Sort the messages by sender's timestamp

---
 .../src/Messages/Interactions/TSInteraction.m             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
index b40632d37..c5ce657b8 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction.m
@@ -188,8 +188,12 @@ NSString *NSStringFromOWSInteractionType(OWSInteractionType value)
 {
     OWSAssertDebug(other);
 
-    uint64_t sortId1 = self.sortId;
-    uint64_t sortId2 = other.sortId;
+//    uint64_t sortId1 = self.sortId;
+//    uint64_t sortId2 = other.sortId;
+    
+    //Loki - Sort the messages by sender's timestamp
+    uint64_t sortId1 = self.timestamp;
+    uint64_t sortId2 = other.timestamp;
 
     if (sortId1 > sortId2) {
         return NSOrderedDescending;