allow blocking another person's content from this user (with iViewContent contact field)

src/libs/fontawesome.ts

@@ -10,8 +10,8 @@ import {
   faArrowLeft,
   faArrowRight,
   faArrowRotateBackward,
-  faArrowUpRightFromSquare,
   faArrowUp,
+  faArrowUpRightFromSquare,
   faBan,
   faBitcoinSign,
   faBurst,
@@ -92,8 +92,8 @@ library.add(
   faArrowLeft,
   faArrowRight,
   faArrowRotateBackward,
-  faArrowUpRightFromSquare,
   faArrowUp,
+  faArrowUpRightFromSquare,
   faBan,
   faBitcoinSign,
   faBurst,

src/libs/util.ts

@@ -17,7 +17,7 @@ import {
   updateDefaultSettings,
 } from "../db/index";
 import { Account, AccountEncrypted } from "../db/tables/accounts";
-import { Contact } from "../db/tables/contacts";
+import { Contact, ContactWithJsonStrings } from "../db/tables/contacts";
 import * as databaseUtil from "../db/databaseUtil";
 import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "../db/tables/settings";
 import {
@@ -974,19 +974,16 @@ export interface DatabaseExport {
  */
 export const contactsToExportJson = (contacts: Contact[]): DatabaseExport => {
   // Convert each contact to a plain object and ensure all fields are included
-  const rows = contacts.map((contact) => ({
-    did: contact.did,
-    name: contact.name || null,
-    contactMethods: contact.contactMethods
-      ? JSON.stringify(parseJsonField(contact.contactMethods, []))
-      : null,
-    nextPubKeyHashB64: contact.nextPubKeyHashB64 || null,
-    notes: contact.notes || null,
-    profileImageUrl: contact.profileImageUrl || null,
-    publicKeyBase64: contact.publicKeyBase64 || null,
-    seesMe: contact.seesMe || false,
-    registered: contact.registered || false,
-  }));
+  const rows = contacts.map((contact) => {
+    const exContact: ContactWithJsonStrings = R.omit(
+      ["contactMethods"],
+      contact,
+    );
+    exContact.contactMethods = contact.contactMethods
+      ? JSON.stringify(contact.contactMethods, [])
+      : undefined;
+    return exContact;
+  });
 
   return {
     data: {