Merge pull request #209 from syphon-org/bugfix-less-message-jank

[bugfix] less message jank
syphon-org · Dec 16, 2020 · f3a6bde · f3a6bde
2 parents d4a0d97 + 222eccc
commit f3a6bde
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/lib/store/rooms/actions.dart b/lib/store/rooms/actions.dart
@@ -149,27 +149,31 @@ ThunkAction<AppState> syncRooms(Map roomData) {
         '[syncRooms] ${room.name} ids msg count ${room.messageIds.length}',
       );
 
+      // update cold storage
+      await Future.wait([
+        saveUsers(room.usersNew, storage: Storage.main),
+        saveRooms({room.id: room}, storage: Storage.main),
+        saveMessages(room.messagesNew, storage: Storage.main),
+      ]);
+
       // update store
       await store.dispatch(
         setUsers(room.usersNew),
       );
+
       await store.dispatch(
         setMessageEvents(room: room, messages: room.messagesNew),
       );
 
-      // update cold storage
-      await Future.wait([
-        saveUsers(room.usersNew, storage: Storage.main),
-        saveRooms({room.id: room}, storage: Storage.main),
-        saveMessages(room.messagesNew, storage: Storage.main),
-      ]);
-
       // TODO: remove with parsers - clear users from parsed room objects
       room = room.copyWith(
         users: Map<String, User>(),
         messagesNew: List<Message>(),
       );
 
+      // update room
+      store.dispatch(SetRoom(room: room));
+
       // fetch avatar if a uri was found
       if (room.avatarUri != null) {
         store.dispatch(fetchThumbnail(
@@ -188,9 +192,6 @@ ThunkAction<AppState> syncRooms(Map roomData) {
           from: room.prevHash,
         ));
       }
-
-      // update room
-      store.dispatch(SetRoom(room: room));
     });
   };
 }