From 72bfb60e95e2195b4f17c05b16878bfa4050b427 Mon Sep 17 00:00:00 2001
From: Simonas Karuzas <simonas@not.cat>
Date: Mon, 16 Mar 2020 16:42:09 +0200
Subject: [PATCH] fix: Returning newMessage sender & receiver

---
 packages/daf-core/src/graphql/graphql-core.ts | 2 ++
 packages/daf-data-store/src/data-store.ts     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/daf-core/src/graphql/graphql-core.ts b/packages/daf-core/src/graphql/graphql-core.ts
index ef4163f44..172d83ddf 100644
--- a/packages/daf-core/src/graphql/graphql-core.ts
+++ b/packages/daf-core/src/graphql/graphql-core.ts
@@ -24,6 +24,8 @@ const newMessage = async (
 
   const res = {
     ...message,
+    sender: message.from,
+    receiver: message.to,
     data: JSON.stringify(message.data),
     id: message.id,
     raw: message.raw,
diff --git a/packages/daf-data-store/src/data-store.ts b/packages/daf-data-store/src/data-store.ts
index c13624b21..d380b5f60 100644
--- a/packages/daf-data-store/src/data-store.ts
+++ b/packages/daf-data-store/src/data-store.ts
@@ -33,7 +33,7 @@ export class DataStore {
       relations: ['credentials', 'credentials.issuer', 'credentials.subject'],
     })
 
-    return message.credentials.map(this.credentialToLegacyFormat)
+    return message?.credentials.map(this.credentialToLegacyFormat)
   }
 
   async credentialsFieldsForClaimHash(hash: string) {