From b152809932113b4088843e41f77e2a6857ee56fa Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <hr.softwarelab@t-online.de>
Date: Tue, 9 Dec 2025 23:10:20 +0100
Subject: [PATCH] correct receiver email treatment

---
 .../logging/SendCoinsResultLogging.view.ts    |  1 +
 .../src/graphql/logic/processXComSendCoins.ts |  5 +----
 core/src/graphql/logic/storeForeignUser.ts    | 21 ++++++++++---------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/src/federation/client/1_0/logging/SendCoinsResultLogging.view.ts b/core/src/federation/client/1_0/logging/SendCoinsResultLogging.view.ts
index 1eb08c432..d92a20e71 100644
--- a/core/src/federation/client/1_0/logging/SendCoinsResultLogging.view.ts
+++ b/core/src/federation/client/1_0/logging/SendCoinsResultLogging.view.ts
@@ -14,6 +14,7 @@ export class SendCoinsResultLoggingView extends AbstractLoggingView {
       recipFirstName: this.self.recipFirstName?.substring(0, 3),
       recipLastName: this.self.recipLastName?.substring(0, 3),
       recipAlias: this.self.recipAlias?.substring(0, 3),
+      recipEmail: this.self.recipEmail?.substring(0, 3),
     }
   }
 }
diff --git a/core/src/graphql/logic/processXComSendCoins.ts b/core/src/graphql/logic/processXComSendCoins.ts
index 4955655d0..443b87288 100644
--- a/core/src/graphql/logic/processXComSendCoins.ts
+++ b/core/src/graphql/logic/processXComSendCoins.ts
@@ -169,7 +169,6 @@ export async function processXComCompleteTransaction(
         }
       }
 
-
       await sendTransactionReceivedEmail({
         firstName: foreignUser.firstName,
         lastName: foreignUser.lastName,
@@ -194,8 +193,6 @@ export async function processXComCompleteTransaction(
           transactionMemo: memo,
         })
       }
-
-
     }
   } catch (err) {
     const errmsg =
@@ -512,7 +509,7 @@ export async function processXComCommittingSendCoins(
               }
               sendCoinsResult.recipGradidoID = pendingTx.linkedUserGradidoID
               sendCoinsResult.recipAlias = recipient.recipAlias
-              sendCoinsResult.recipEmail = recipient.recipEmail              
+              sendCoinsResult.recipEmail = recipient.recipEmail
             }
           } catch (err) {
             methodLogger.error(
diff --git a/core/src/graphql/logic/storeForeignUser.ts b/core/src/graphql/logic/storeForeignUser.ts
index ebd1b8aec..48616ba24 100644
--- a/core/src/graphql/logic/storeForeignUser.ts
+++ b/core/src/graphql/logic/storeForeignUser.ts
@@ -40,16 +40,17 @@ export async function storeForeignUser(
         foreignUser = await DbUser.save(foreignUser)
 
         logger.debug('new foreignUser inserted:', foreignUser)
-        let foreignUserEmail = DbUserContact.create()
-        foreignUserEmail.email = committingResult.recipEmail!
-        foreignUserEmail.emailChecked = true
-        foreignUserEmail.user = foreignUser
-        foreignUserEmail = await DbUserContact.save(foreignUserEmail)
-        logger.debug('new foreignUserEmail inserted:', foreignUserEmail)
-
-        foreignUser.emailContact = foreignUserEmail
-        foreignUser.emailId = foreignUserEmail.id
-        foreignUser = await DbUser.save(foreignUser)
+        if (committingResult.recipEmail !== null) {
+          let foreignUserEmail = DbUserContact.create()
+          foreignUserEmail.email = committingResult.recipEmail!
+          foreignUserEmail.emailChecked = true
+          foreignUserEmail.user = foreignUser
+          foreignUserEmail = await DbUserContact.save(foreignUserEmail)
+          logger.debug('new foreignUserEmail inserted:', foreignUserEmail)
+          foreignUser.emailContact = foreignUserEmail
+          foreignUser.emailId = foreignUserEmail.id
+          foreignUser = await DbUser.save(foreignUser)
+        }
 
         return foreignUser
       } else if (