From 4e8cae5191f6dd3ced65fd37189d3eeeab39e2aa Mon Sep 17 00:00:00 2001
From: Bojan Mojsilovic <bmojsilovic@itekako.com>
Date: Mon, 18 Mar 2024 16:31:02 +0100
Subject: [PATCH] Fix DM losing conversation list

---
 src/contexts/MessagesContext.tsx | 7 +++++++
 src/pages/Messages.tsx           | 7 ++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/contexts/MessagesContext.tsx b/src/contexts/MessagesContext.tsx
index 6403d3a..8dd78e3 100644
--- a/src/contexts/MessagesContext.tsx
+++ b/src/contexts/MessagesContext.tsx
@@ -77,6 +77,7 @@ export type MessagesContextStore = {
     getNextConversationPage: () => void,
     addUserReference: (user: PrimalUser) => void,
     clearAllMessages: () => void,
+    clearReceiver: () => void,
   }
 }
 
@@ -232,6 +233,11 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
     updateStore('senders', reconcile({}));
   };
 
+  const clearReceiver = () => {
+    updateStore('activePubkey', () => undefined);
+    currentSender = '';
+  };
+
   const getConversationWithSender = (sender: string | null, until = 0) => {
     if (!account?.isKeyLookupDone || !account.hasPublicKey() || !sender) {
       return;
@@ -891,6 +897,7 @@ export const MessagesProvider = (props: { children: ContextChildren }) => {
       getNextConversationPage,
       addUserReference,
       clearAllMessages,
+      clearReceiver,
     },
   });
 
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 5fb778b..d7ea831 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -195,13 +195,9 @@ const Messages: Component = () => {
       npubToHex(params.sender) :
       params.sender;
 
-    const url = currentUrl.startsWith('npub') ?
-      npubToHex(currentUrl) :
-      currentUrl;
-
     if(currentUrl !== sender) {
       currentUrl = sender;
-      messages?.actions.selectSender(sender);
+      selectSender(sender);
     }
   });
 
@@ -622,6 +618,7 @@ const Messages: Component = () => {
     newMessageInput && newMessageInput.removeEventListener('keydown', onKeyDown);
     messages?.actions.clearAllMessages();
     messages?.actions.selectSender();
+    messages?.actions.clearReceiver();
   });
 
   const sendMessage = async () => {