From e90793bef14bc034717319fcff636289275b5dce Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Fri, 4 Sep 2020 09:48:35 +0200
Subject: [PATCH] fix: Last message sort order

---
 lib/src/client.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/client.dart b/lib/src/client.dart
index 56e6aa8..1a458eb 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -1104,9 +1104,9 @@ class Client extends MatrixApi {
             );
       } else {
         var prevState = rooms[j].getState(stateEvent.type, stateEvent.stateKey);
-        if (prevState != null &&
-            prevState.originServerTs.millisecondsSinceEpoch >
-                stateEvent.originServerTs.millisecondsSinceEpoch) return;
+        if (prevState != null && prevState.sortOrder > stateEvent.sortOrder) {
+          return;
+        }
         rooms[j].setState(stateEvent);
       }
     } else if (eventUpdate.type == 'account_data') {