From c1857dea2db54368f2c525487a21b852b16a1f9e Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Wed, 12 Apr 2023 13:30:21 -0500
Subject: [PATCH] Fix message ordering

---
 ROADMAP.md                         | 1 -
 src/app2/views/MessagesList.svelte | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 80b81dcf..9cfbc008 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -3,7 +3,6 @@
 - [ ] Refactor
   - Move global modals to child components?
   - Combine app/agent, rename app2
-  - Sort DMs
 - [ ] Improve topic suggestions and rendering
 - [ ] Add topic search
 - [ ] Relays bounty
diff --git a/src/app2/views/MessagesList.svelte b/src/app2/views/MessagesList.svelte
index 33568e22..d6b49087 100644
--- a/src/app2/views/MessagesList.svelte
+++ b/src/app2/views/MessagesList.svelte
@@ -9,7 +9,8 @@
   let activeTab = "messages"
   let contacts = []
 
-  const getContacts = tab => sortBy(c => -c.lastMessage, tab === "messages" ? $accepted : $requests)
+  const getContacts = tab =>
+    sortBy(c => -c.lastMessage || 0, tab === "messages" ? $accepted : $requests)
 
   $: contacts = getContacts(activeTab)
 
@@ -17,10 +18,8 @@
     activeTab = tab
   }
 
-  const accepted = watch("contacts", t => sortBy(e => -e.lastMessage, t.all({accepted: true})))
-  const requests = watch("contacts", t =>
-    sortBy(e => -e.lastMessage, t.all({accepted: {$ne: true}}))
-  )
+  const accepted = watch("contacts", t => t.all({accepted: true}))
+  const requests = watch("contacts", t => t.all({accepted: {$ne: true}}))
 
   const getDisplay = tab => ({
     title: toTitle(tab),