Merge branch 'master' into replace-iconrenderer

src/libs/endorserServer.ts

@@ -212,13 +212,13 @@ const testRecursivelyOnStrings = (
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function containsHiddenDid(obj: any) {
-  return testRecursivelyOnStrings(isHiddenDid, obj);
+  return testRecursivelyOnStrings(obj, isHiddenDid);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const containsNonHiddenDid = (obj: any) => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return testRecursivelyOnStrings((s: any) => isDid(s) && !isHiddenDid(s), obj);
+  return testRecursivelyOnStrings(obj, (s: any) => isDid(s) && !isHiddenDid(s));
 };
 
 export function stripEndorserPrefix(claimId: string) {
@@ -697,7 +697,6 @@ export function hydrateGive(
 
   if (amount && !isNaN(amount)) {
     const quantitativeValue: QuantitativeValue = {
-      "@type": "QuantitativeValue",
       amountOfThisGood: amount,
       unitCode: unitCode || "HUR",
     };
@@ -1342,7 +1341,6 @@ export async function createEndorserJwtVcFromClaim(
     vc: {
       "@context": "https://www.w3.org/2018/credentials/v1",
       "@type": "VerifiableCredential",
-      type: ["VerifiableCredential"],
       credentialSubject: claim,
     },
   };
@@ -1350,12 +1348,12 @@ export async function createEndorserJwtVcFromClaim(
 }
 
 /**
- * Create a JWT for a RegisterAction claim.
+ * Create a JWT for a RegisterAction claim, used for registrations & invites.
  *
  * @param activeDid - The DID of the user creating the invite
- * @param contact - The contact to register, with a 'did' field (all optional for invites)
- * @param identifier - The identifier for the invite, usually random
- * @param expiresIn - The number of seconds until the invite expires
+ * @param contact - Optional - The contact to register, with a 'did' field (all optional for invites)
+ * @param identifier - Optional - The identifier for the invite, usually random
+ * @param expiresIn - Optional - The number of seconds until the invite expires
  * @returns The JWT for the RegisterAction claim
  */
 export async function createInviteJwt(
@@ -1369,7 +1367,7 @@ export async function createInviteJwt(
     "@type": "RegisterAction",
     agent: { identifier: activeDid },
     object: SERVICE_ID,
-    identifier: identifier,
+    identifier: identifier, // not sent if undefined
   };
   if (contact?.did) {
     vcClaim.participant = { identifier: contact.did };
@@ -1380,7 +1378,6 @@ export async function createInviteJwt(
     vc: {
       "@context": "https://www.w3.org/2018/credentials/v1",
       "@type": "VerifiableCredential",
-      type: ["VerifiableCredential"],
       credentialSubject: vcClaim as unknown as ClaimObject, // Type assertion needed due to object being string
     },
   };

src/libs/partnerServer.ts

@@ -4,6 +4,6 @@ export interface UserProfile {
   locLon?: number;
   locLat2?: number;
   locLon2?: number;
-  issuerDid?: string;
+  issuerDid: string;
   rowId?: string; // set on profile retrieved from server
 }

src/libs/util.ts

@@ -7,7 +7,7 @@ import { useClipboard } from "@vueuse/core";
 
 import { DEFAULT_PUSH_SERVER, NotificationIface } from "../constants/app";
 import { Account, AccountEncrypted } from "../db/tables/accounts";
-import { Contact, ContactWithJsonStrings } from "../db/tables/contacts";
+import { Contact } from "../db/tables/contacts";
 import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "../db/tables/settings";
 import {
   arrayBufferToBase64,
@@ -34,18 +34,7 @@ import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
 import { IIdentifier } from "@veramo/core";
 import { DEFAULT_ROOT_DERIVATION_PATH } from "./crypto";
 
-// Consolidate this with src/utils/PlatformServiceMixin._parseJsonField
-function parseJsonField<T>(value: unknown, defaultValue: T): T {
-  if (typeof value === "string") {
-    try {
-      return JSON.parse(value);
-    } catch {
-      return defaultValue;
-    }
-  }
-  return (value as T) || defaultValue;
-}
-
+// Consolidate this with src/utils/PlatformServiceMixin.mapQueryResultToValues
 function mapQueryResultToValues(
   record: { columns: string[]; values: unknown[][] } | undefined,
 ): Array<Record<string, unknown>> {
@@ -68,10 +57,10 @@ async function getPlatformService() {
 }
 
 export interface GiverReceiverInputInfo {
-  did?: string;
+  did?: string; // only for people
   name?: string;
   image?: string;
-  handleId?: string;
+  handleId?: string; // only for projects
 }
 
 export enum OnboardPage {
@@ -191,9 +180,9 @@ export const nameForDid = (
   did: string,
 ): string => {
   if (did === activeDid) {
-    return "you";
+    return "You";
   }
-  const contact = R.find((con) => con.did == did, contacts);
+  const contact = R.find((con) => con.did === did, contacts);
   return nameForContact(contact);
 };
 
@@ -806,7 +795,7 @@ export const contactToCsvLine = (contact: Contact): string => {
 
   // Handle contactMethods array by stringifying it
   const contactMethodsStr = contact.contactMethods
-    ? escapeField(JSON.stringify(parseJsonField(contact.contactMethods, [])))
+    ? escapeField(JSON.stringify(contact.contactMethods))
     : "";
 
   const fields = [
@@ -904,31 +893,19 @@ export interface DatabaseExport {
 }
 
 /**
- * Converts an array of contacts to the standardized database export JSON format.
+ * Converts an array of contacts to the export JSON format.
  * This format is used for data migration and backup purposes.
  *
  * @param contacts - Array of Contact objects to convert
  * @returns DatabaseExport object in the standardized format
  */
 export const contactsToExportJson = (contacts: Contact[]): DatabaseExport => {
-  // Convert each contact to a plain object and ensure all fields are included
-  const rows = contacts.map((contact) => {
-    const exContact: ContactWithJsonStrings = R.omit(
-      ["contactMethods"],
-      contact,
-    );
-    exContact.contactMethods = contact.contactMethods
-      ? JSON.stringify(parseJsonField(contact.contactMethods, []))
-      : undefined;
-    return exContact;
-  });
-
   return {
     data: {
       data: [
         {
           tableName: "contacts",
-          rows,
+          rows: contacts,
         },
       ],
     },