From 1b6c90bb5070abe6c2de71cd417e300a333d0315 Mon Sep 17 00:00:00 2001
From: mutugiii <mutugimutuma@gmail.com>
Date: Wed, 20 Dec 2023 16:31:42 +0300
Subject: [PATCH 1/3] Sort based on the createdDate db field

---
 src/app/chat/chat-sidebar/chat-sidebar.component.html | 2 +-
 src/app/chat/chat-sidebar/chat-sidebar.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/chat/chat-sidebar/chat-sidebar.component.html b/src/app/chat/chat-sidebar/chat-sidebar.component.html
index 42853bc2fd..515cc0aa98 100644
--- a/src/app/chat/chat-sidebar/chat-sidebar.component.html
+++ b/src/app/chat/chat-sidebar/chat-sidebar.component.html
@@ -30,7 +30,7 @@
     </div>
     <ng-container *ngIf="filteredConversations?.length; else noChats">
       <ul>
-        <li *ngFor="let conversation of filteredConversations.reverse(); let i = index" (click)="selectConversation(conversation)">
+        <li *ngFor="let conversation of filteredConversations; let i = index" (click)="selectConversation(conversation)">
           <ng-container *ngIf="isEditing; else notEditing">
             <ng-container *ngIf="selectedConversation?._id === conversation?._id; else conversationTitle">
               <form [formGroup]="titleForm[conversation?._id]" (ngSubmit)="submitTitle(conversation)">
diff --git a/src/app/chat/chat-sidebar/chat-sidebar.component.ts b/src/app/chat/chat-sidebar/chat-sidebar.component.ts
index ffe5a71878..eb9b76ccdb 100644
--- a/src/app/chat/chat-sidebar/chat-sidebar.component.ts
+++ b/src/app/chat/chat-sidebar/chat-sidebar.component.ts
@@ -101,8 +101,8 @@ export class ChatSidebarComponent implements OnInit, OnDestroy {
 
   getChatHistory() {
     this.chatService.findConversations([], [ this.userService.get().name ]).subscribe(
-      (conversations) => {
-        this.conversations = conversations;
+      (conversations: any) => {
+        this.conversations = conversations.sort((a, b) => b.createdDate - a.createdDate);
         this.filteredConversations = [ ...conversations ];
         this.initializeFormGroups();
       },

From 469ed7f6ea08e0d10523f6a979c5b25c6c33ae53 Mon Sep 17 00:00:00 2001
From: mutugiii <mutugimutuma@gmail.com>
Date: Wed, 20 Dec 2023 16:59:01 +0300
Subject: [PATCH 2/3] Update with updatedDate in consideration

---
 src/app/chat/chat-sidebar/chat-sidebar.component.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/chat/chat-sidebar/chat-sidebar.component.ts b/src/app/chat/chat-sidebar/chat-sidebar.component.ts
index eb9b76ccdb..2f12d60885 100644
--- a/src/app/chat/chat-sidebar/chat-sidebar.component.ts
+++ b/src/app/chat/chat-sidebar/chat-sidebar.component.ts
@@ -102,7 +102,12 @@ export class ChatSidebarComponent implements OnInit, OnDestroy {
   getChatHistory() {
     this.chatService.findConversations([], [ this.userService.get().name ]).subscribe(
       (conversations: any) => {
-        this.conversations = conversations.sort((a, b) => b.createdDate - a.createdDate);
+        this.conversations = conversations.sort((a, b) => {
+          const dateA = a.updatedDate || a.createdDate;
+          const dateB = b.updatedDate || b.createdDate;
+
+          return dateB - dateA;
+        });
         this.filteredConversations = [ ...conversations ];
         this.initializeFormGroups();
       },

From 3393635cdfcbd453789c7433f93c906763ad2bdc Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Fri, 22 Dec 2023 12:27:45 -0500
Subject: [PATCH 3/3] Update package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e2b633acd8..aa85cf9cdf 100755
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.13.93",
+  "version": "0.13.97",
   "myplanet": {
-    "latest": "v0.12.09",
+    "latest": "v0.12.28",
     "min": "v0.11.60"
   },
   "scripts": {