Merge branch 'master' into linked-user-email

backend/src/graphql/resolver/TransactionResolver.ts

@@ -117,6 +117,7 @@ export const executeTransaction = async (
     recipientFirstName: recipient.firstName,
     recipientLastName: recipient.lastName,
     email: recipient.email,
+    senderEmail: sender.email,
     amount,
     memo,
   })

backend/src/mailer/sendTransactionReceivedEmail.test.ts

@@ -17,6 +17,7 @@ describe('sendTransactionReceivedEmail', () => {
       recipientFirstName: 'Peter',
       recipientLastName: 'Lustig',
       email: 'peter@lustig.de',
+      senderEmail: 'bibi@bloxberg.de',
       amount: new Decimal(42.0),
       memo: 'Vielen herzlichen Dank für den neuen Hexenbesen!',
     })
@@ -30,6 +31,7 @@ describe('sendTransactionReceivedEmail', () => {
         expect.stringContaining('Hallo Peter Lustig') &&
         expect.stringContaining('42,00 GDD') &&
         expect.stringContaining('Bibi Bloxberg') &&
+        expect.stringContaining('(bibi@bloxberg.de)') &&
         expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!'),
     })
   })

backend/src/mailer/sendTransactionReceivedEmail.ts

@@ -8,6 +8,7 @@ export const sendTransactionReceivedEmail = (data: {
   recipientFirstName: string
   recipientLastName: string
   email: string
+  senderEmail: string
   amount: Decimal
   memo: string
 }): Promise<boolean> => {

backend/src/mailer/text/transactionReceived.ts

@@ -9,6 +9,7 @@ export const transactionReceived = {
       recipientFirstName: string
       recipientLastName: string
       email: string
+      senderEmail: string
       amount: Decimal
       memo: string
     }): string =>
@@ -16,7 +17,7 @@ export const transactionReceived = {
 
 Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${
         data.senderLastName
-      } erhalten.
+      } (${data.senderEmail}) erhalten.
 ${data.senderFirstName} ${data.senderLastName} schreibt:
 
 ${data.memo}