From 0c36f57f64ae12dee01fb46a345ba365edcd85c6 Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Mon, 12 Feb 2024 16:38:01 +0000
Subject: [PATCH] Fix profile form removing unknown metadata fields

---
 .changeset/soft-trees-check.md           |  5 +++++
 src/views/profile/edit.tsx               | 16 ++++++++--------
 src/views/settings/database-settings.tsx |  5 +++--
 3 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/soft-trees-check.md

diff --git a/.changeset/soft-trees-check.md b/.changeset/soft-trees-check.md
new file mode 100644
index 000000000..96a00a2fd
--- /dev/null
+++ b/.changeset/soft-trees-check.md
@@ -0,0 +1,5 @@
+---
+"nostrudel": patch
+---
+
+Fix profile form removing unknown metadata fields
diff --git a/src/views/profile/edit.tsx b/src/views/profile/edit.tsx
index 4f53cbc96..c8db19bb9 100644
--- a/src/views/profile/edit.tsx
+++ b/src/views/profile/edit.tsx
@@ -205,27 +205,27 @@ export const ProfileEditView = () => {
   );
 
   const handleSubmit = async (data: FormData) => {
-    const metadata: Kind0ParsedContent = {
+    const newMetadata: Kind0ParsedContent = {
       name: data.username,
       picture: data.picture,
     };
-    if (data.displayName) metadata.displayName = metadata.display_name = data.displayName;
-    if (data.about) metadata.about = data.about;
-    if (data.website) metadata.website = data.website;
-    if (data.nip05) metadata.nip05 = data.nip05;
+    if (data.displayName) newMetadata.displayName = newMetadata.display_name = data.displayName;
+    if (data.about) newMetadata.about = data.about;
+    if (data.website) newMetadata.website = data.website;
+    if (data.nip05) newMetadata.nip05 = data.nip05;
 
     if (data.lightningAddress) {
       if (isLNURL(data.lightningAddress)) {
-        metadata.lud06 = data.lightningAddress;
+        newMetadata.lud06 = data.lightningAddress;
       } else if (isLightningAddress(data.lightningAddress)) {
-        metadata.lud16 = data.lightningAddress;
+        newMetadata.lud16 = data.lightningAddress;
       }
     }
 
     const draft: DraftNostrEvent = {
       created_at: dayjs().unix(),
       kind: 0,
-      content: JSON.stringify(metadata),
+      content: JSON.stringify({ ...metadata, ...newMetadata }),
       tags: [],
     };
 
diff --git a/src/views/settings/database-settings.tsx b/src/views/settings/database-settings.tsx
index 56d0baae8..a0e5cd6c9 100644
--- a/src/views/settings/database-settings.tsx
+++ b/src/views/settings/database-settings.tsx
@@ -10,6 +10,7 @@ import {
   ButtonGroup,
   Text,
   Input,
+  Flex,
 } from "@chakra-ui/react";
 import { addEvents, countEvents, countEventsByKind, getEventUID, updateUsed } from "nostr-idb";
 import stringify from "json-stringify-deterministic";
@@ -119,7 +120,7 @@ export default function DatabaseSettings() {
       </h2>
       <AccordionPanel>
         <DatabaseStats />
-        <ButtonGroup mt="2">
+        <Flex mt="2" gap="2" wrap="wrap">
           <Button onClick={handleClearData} isLoading={clearing}>
             Clear cache
           </Button>
@@ -130,7 +131,7 @@ export default function DatabaseSettings() {
           <Button colorScheme="red" onClick={handleDeleteDatabase} isLoading={deleting}>
             Delete database
           </Button>
-        </ButtonGroup>
+        </Flex>
       </AccordionPanel>
     </AccordionItem>
   );