From 074711dd907fc216d386f78dfc9d9a1423e36664 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 14:31:57 +0200
Subject: [PATCH] Fix: order createdAt_desc & lastMessageAt_desc

---
 webapp/components/Chat/Chat.vue | 2 +-
 webapp/graphql/Rooms.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dd724d200..fd14ced6e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,7 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.unshift(this.fixRoomObject(r))
+            rms.push(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 4e9cd0209..46f089e36 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -24,7 +24,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc, createdAt_desc]) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [createdAt_desc, lastMessageAt_desc]) {
       id
       roomId
       roomName