From 02f34211b5116415e833e1bca2c2f01113c76d14 Mon Sep 17 00:00:00 2001
From: JorgeGraciaViveros
 <119986448+JorgeGraciaViveros@users.noreply.github.com>
Date: Wed, 4 Dec 2024 23:52:35 -0500
Subject: [PATCH] =?UTF-8?q?Updated=20email=20invitation=20logic=20to=20inc?=
 =?UTF-8?q?lude=20sender=20details=20in=20the=20From=20=E2=80=A6=20(#8858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated email invitation logic to include sender details in the From
field.

Please feel free to provide comments so that we can make adjustments as
early as possible if needed


Fixes #7001

---------

Co-authored-by: Your Name <your@email.address>
Co-authored-by: Félix Malfait <felix@twenty.com>
---
 .../src/emails/send-invite-link.email.tsx              |  4 +++-
 .../services/workspace-invitation.service.ts           | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/twenty-emails/src/emails/send-invite-link.email.tsx b/packages/twenty-emails/src/emails/send-invite-link.email.tsx
index 97d519e885c..4abf1e0a9a3 100644
--- a/packages/twenty-emails/src/emails/send-invite-link.email.tsx
+++ b/packages/twenty-emails/src/emails/send-invite-link.email.tsx
@@ -18,6 +18,7 @@ type SendInviteLinkEmailProps = {
   sender: {
     email: string;
     firstName: string;
+    lastName: string;
   };
   serverUrl?: string;
 };
@@ -29,13 +30,14 @@ export const SendInviteLinkEmail = ({
   serverUrl,
 }: SendInviteLinkEmailProps) => {
   const workspaceLogo = getImageAbsoluteURI(workspace.logo, serverUrl);
+
   return (
     <BaseEmail width={333}>
       <Title value="Join your team on Twenty" />
       <MainText>
         {capitalize(sender.firstName)} (
         <Link
-          href={sender.email}
+          href={`mailto:${sender.email}`}
           value={sender.email}
           color={emailTheme.font.colors.blue}
         />
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
index 49b9e36a2fc..8460082e6d8 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
@@ -344,7 +344,11 @@ export class WorkspaceInvitationService {
         const emailData = {
           link: link.toString(),
           workspace: { name: workspace.displayName, logo: workspace.logo },
-          sender: { email: sender.email, firstName: sender.firstName },
+          sender: {
+            email: sender.email,
+            firstName: sender.firstName,
+            lastName: sender.lastName,
+          },
           serverUrl: this.environmentService.get('SERVER_URL'),
         };
 
@@ -358,9 +362,7 @@ export class WorkspaceInvitationService {
         });
 
         await this.emailService.send({
-          from: `${this.environmentService.get(
-            'EMAIL_FROM_NAME',
-          )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
+          from: `${sender.firstName} ${sender.lastName} (via Twenty) <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
           to: invitation.value.email,
           subject: 'Join your team on Twenty',
           text,