Merge remote-tracking branch 'origin/nip17dm' into ark2

# Conflicts:
#	src/lib/nip07.ts
#	src/lib/nip17.ts
#	src/locales/en.json
#	src/locales/fr.json
#	src/routes/(app)/dm/+page.svelte

1 files changed, 6 insertions, 1 deletions

diff --git a/src/routes/(app)/dm/+page.svelte b/src/routes/(app)/dm/+page.svelte
index a0ad4f27..67c647b0 100644
--- a/src/routes/(app)/dm/+page.svelte
+++ b/src/routes/(app)/dm/+page.svelte
@@ -164,6 +164,9 @@
     }
 
     selectedChat = c;
+    if (!selectedChat) {
+      return;
+    }
     if (!includesPubkey(chats, c.pubkey)) {
       chats.unshift(c);
     }
@@ -281,6 +284,7 @@
   const sendMessage = async (message: string) => {
     const expiry = expiryEnabled ? expiryDays : undefined;
     await libnip17.send(message, user, selectedChat, expiry);
+    text = "";
     updateEvents();
   };
 
@@ -315,7 +319,8 @@
         (creatingNewChat ? ($theme === "light" ? " light-selected" : " dark-selected") : "")}
         onclick={() => {
           creatingNewChat = !creatingNewChat;
-          selectedChat = null;
+          selectChat(null);
+          searchQuery = "";
         }}
       >
         +