From a305fa24b1901f0e79e6d3593261c17db4649941 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner Date: Thu, 8 Jan 2026 01:07:07 +0100 Subject: [PATCH] add email template transactionReceivedNoSender without sender-answering --- .../resolver/TransactionLinkResolver.ts | 41 ++++++++----------- .../transactionReceivedNoSender/html.pug | 23 +++++++++++ .../transactionReceivedNoSender/subject.pug | 1 + 3 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 core/src/emails/templates/transactionReceivedNoSender/html.pug create mode 100644 core/src/emails/templates/transactionReceivedNoSender/subject.pug diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index d46d3b9f6..a224ffbbd 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -674,31 +674,22 @@ export class TransactionLinkResolver { methodLogger.error(errmsg) throw new LogError(errmsg) } - if(recipientUser.emailContact?.email !== null && senderUser.emailContact?.email !== null){ - if (methodLogger.isDebugEnabled()) { - methodLogger.debug('Sending Transaction Received Email to recipient=' + recipientUser.firstName + ' ' + recipientUser.lastName + 'sender=' + senderUser.firstName + ' ' + senderUser.lastName) - } - try { - await sendTransactionReceivedEmail({ - firstName: recipientFirstName, - lastName: recipientUser.lastName, - email: recipientUser.emailContact.email, - language: recipientUser.language, - memo, - senderFirstName: senderUser.firstName, - senderLastName: senderUser.lastName, - senderEmail: senderUser.emailContact.email, - transactionAmount: new Decimal(amount), - }) - } catch (e) { - const errmsg = `Send Transaction Received Email to recipient failed with error=${e}` - methodLogger.error(errmsg) - throw new Error(errmsg) - } - } else { - if (methodLogger.isDebugEnabled()) { - methodLogger.debug('Sender or Recipient are foreign users with no email contact, not sending Transaction Received Email: recipient=' + recipientUser.firstName + ' ' + recipientUser.lastName + 'sender=' + senderUser.firstName + ' ' + senderUser.lastName) - } + try { + await sendTransactionReceivedEmail({ + firstName: recipientFirstName, + lastName: recipientUser.lastName, + email: recipientUser.emailContact.email, + language: recipientUser.language, + memo, + senderFirstName: senderUser.firstName, + senderLastName: senderUser.lastName, + senderEmail: senderUser.emailContact.email, + transactionAmount: new Decimal(amount), + }) + } catch (e) { + const errmsg = `Send Transaction Received Email to recipient failed with error=${e}` + methodLogger.error(errmsg) + throw new Error(errmsg) } } catch (e) { const errmsg = `Disburse JWT was not sent successfully with error=${e}` diff --git a/core/src/emails/templates/transactionReceivedNoSender/html.pug b/core/src/emails/templates/transactionReceivedNoSender/html.pug new file mode 100644 index 000000000..a3d16e9b9 --- /dev/null +++ b/core/src/emails/templates/transactionReceivedNoSender/html.pug @@ -0,0 +1,23 @@ +extend ../layout.pug + +block content + mixin mailto(email, subject) + - var formattedSubject = encodeURIComponent(subject) + a(class!=attributes.class href=`mailto:${email}?subject=${formattedSubject}`) + block + + - var subject= t('emails.transactionReceived.replySubject', { senderFirstName, senderLastName, transactionAmount }) + h2= t('emails.transactionReceived.title', { senderFirstName, senderLastName, transactionAmount }) + .text-block + include ../includes/salutation.pug + p + = t('emails.transactionReceived.haveReceivedAmountGDDFrom', { transactionAmount, senderFirstName, senderLastName }) + .content + h2= t('emails.general.message') + .child-left + div(class="p_content")= memo + + a.button-3(href=`${communityURL}/transactions`) #{t('emails.general.toAccount')} + + + diff --git a/core/src/emails/templates/transactionReceivedNoSender/subject.pug b/core/src/emails/templates/transactionReceivedNoSender/subject.pug new file mode 100644 index 000000000..872806ebc --- /dev/null +++ b/core/src/emails/templates/transactionReceivedNoSender/subject.pug @@ -0,0 +1 @@ += t('emails.transactionReceived.subject', { senderFirstName, senderLastName, transactionAmount })