From 03a433e6bba23fcaaa063748f7a56ba9439720d3 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Tue, 20 Aug 2024 15:39:23 +1000
Subject: [PATCH] fix: update email wording

---
 packages/email/templates/document-invite.tsx  | 20 ++++--
 .../definitions/emails/send-signing-email.ts  |  2 +-
 .../server-only/document/resend-document.tsx  |  3 +-
 packages/prisma/seed/initial-seed.ts          | 62 +------------------
 4 files changed, 19 insertions(+), 68 deletions(-)

diff --git a/packages/email/templates/document-invite.tsx b/packages/email/templates/document-invite.tsx
index 7e845126b..5d678ddbe 100644
--- a/packages/email/templates/document-invite.tsx
+++ b/packages/email/templates/document-invite.tsx
@@ -39,13 +39,16 @@ export const DocumentInviteEmailTemplate = ({
   selfSigner = false,
   isTeamInvite = false,
   teamName,
+  teamEmail,
 }: DocumentInviteEmailTemplateProps) => {
   const action = RECIPIENT_ROLES_DESCRIPTION[role].actionVerb.toLowerCase();
 
   const previewText = selfSigner
     ? `Please ${action} your document ${documentName}`
     : isTeamInvite
-    ? `${inviterName} on behalf of ${teamName} has invited you to ${action} ${documentName}`
+    ? `${inviterName} on behalf of ${teamName}${
+        teamEmail ? ` (${teamEmail})` : ''
+      } has invited you to ${action} ${documentName}`
     : `${inviterName} has invited you to ${action} ${documentName}`;
 
   const getAssetUrl = (path: string) => {
@@ -92,9 +95,14 @@ export const DocumentInviteEmailTemplate = ({
             <Container className="mx-auto mt-12 max-w-xl">
               <Section>
                 <Text className="my-4 text-base font-semibold">
-                  {inviterName}{' '}
-                  <Link className="font-normal text-slate-400" href="mailto:{inviterEmail}">
-                    ({inviterEmail})
+                  {isTeamInvite && teamName
+                    ? `${inviterName} on behalf of ${teamName}`
+                    : inviterName}{' '}
+                  <Link
+                    className="font-normal text-slate-400"
+                    href={`mailto:${teamEmail || inviterEmail}`}
+                  >
+                    ({teamEmail || inviterEmail})
                   </Link>
                 </Text>
 
@@ -102,7 +110,9 @@ export const DocumentInviteEmailTemplate = ({
                   {customBody ? (
                     <pre className="font-sans text-base text-slate-400">{customBody}</pre>
                   ) : (
-                    `${inviterName} has invited you to ${action} the document "${documentName}".`
+                    `${inviterName} ${
+                      isTeamInvite ? `on behalf of ${teamName}` : ''
+                    } has invited you to ${action} the document "${documentName}".`
                   )}
                 </Text>
               </Section>
diff --git a/packages/lib/jobs/definitions/emails/send-signing-email.ts b/packages/lib/jobs/definitions/emails/send-signing-email.ts
index 43ad730c6..60b837a67 100644
--- a/packages/lib/jobs/definitions/emails/send-signing-email.ts
+++ b/packages/lib/jobs/definitions/emails/send-signing-email.ts
@@ -120,7 +120,7 @@ export const SEND_SIGNING_EMAIL_JOB_DEFINITION = {
     const template = createElement(DocumentInviteEmailTemplate, {
       documentName: document.title,
       inviterName: user.name || undefined,
-      inviterEmail: isTeamDocument ? team?.teamEmail?.email || user.email : user.email,
+      inviterEmail: user.email,
       assetBaseUrl,
       signDocumentLink,
       customBody: renderCustomEmailTemplate(emailMessage, customEmailTemplate),
diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx
index 8ea39445c..ed7d246ff 100644
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@@ -125,7 +125,7 @@ export const resendDocument = async ({
       const template = createElement(DocumentInviteEmailTemplate, {
         documentName: document.title,
         inviterName: user.name || undefined,
-        inviterEmail: isTeamDocument ? document.team?.teamEmail?.email || user.email : user.email,
+        inviterEmail: user.email,
         assetBaseUrl,
         signDocumentLink,
         customBody: renderCustomEmailTemplate(emailMessage, customEmailTemplate),
@@ -133,6 +133,7 @@ export const resendDocument = async ({
         selfSigner,
         isTeamInvite: isTeamDocument,
         teamName: document.team?.name,
+        teamEmail: document.team?.teamEmail?.email,
       });
 
       await prisma.$transaction(
diff --git a/packages/prisma/seed/initial-seed.ts b/packages/prisma/seed/initial-seed.ts
index 38b340a79..66c944c9b 100644
--- a/packages/prisma/seed/initial-seed.ts
+++ b/packages/prisma/seed/initial-seed.ts
@@ -4,7 +4,7 @@ import path from 'node:path';
 import { hashSync } from '@documenso/lib/server-only/auth/hash';
 
 import { prisma } from '..';
-import { DocumentDataType, DocumentSource, Role, TeamMemberRole } from '../client';
+import { DocumentDataType, DocumentSource, Role } from '../client';
 
 export const seedDatabase = async () => {
   const examplePdf = fs
@@ -67,64 +67,4 @@ export const seedDatabase = async () => {
       },
     },
   });
-
-  const testUsers = [
-    'test@documenso.com',
-    'test2@documenso.com',
-    'test3@documenso.com',
-    'test4@documenso.com',
-  ];
-
-  const createdUsers = [];
-
-  for (const email of testUsers) {
-    const testUser = await prisma.user.upsert({
-      where: {
-        email: email,
-      },
-      create: {
-        name: 'Test User',
-        email: email,
-        emailVerified: new Date(),
-        password: hashSync('password'),
-        roles: [Role.USER],
-      },
-      update: {},
-    });
-
-    createdUsers.push(testUser);
-  }
-
-  const team1 = await prisma.team.create({
-    data: {
-      name: 'Team 1',
-      url: 'team1',
-      ownerUserId: createdUsers[0].id,
-    },
-  });
-
-  const team2 = await prisma.team.create({
-    data: {
-      name: 'Team 2',
-      url: 'team2',
-      ownerUserId: createdUsers[1].id,
-    },
-  });
-
-  for (const team of [team1, team2]) {
-    await prisma.teamMember.createMany({
-      data: [
-        {
-          teamId: team.id,
-          userId: createdUsers[1].id,
-          role: TeamMemberRole.ADMIN,
-        },
-        {
-          teamId: team.id,
-          userId: createdUsers[2].id,
-          role: TeamMemberRole.MEMBER,
-        },
-      ],
-    });
-  }
 };