fix: merge conflicts

packages/api/v1/implementation.ts

@@ -301,6 +301,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         dateFormat: dateFormat?.value,
         redirectUrl: body.meta.redirectUrl,
         signingOrder: body.meta.signingOrder,
+        language: body.meta.language,
         requestMetadata: extractNextApiRequestMetadata(args.req),
       });
 

packages/api/v1/schema.ts

@@ -2,6 +2,7 @@ import { extendZodWithOpenApi } from '@anatine/zod-openapi';
 import { z } from 'zod';
 
 import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
+import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
 import '@documenso/lib/constants/time-zones';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { ZUrlSchema } from '@documenso/lib/schemas/common';
@@ -127,6 +128,7 @@ export const ZCreateDocumentMutationSchema = z.object({
         }),
       redirectUrl: z.string(),
       signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
+      language: z.enum(SUPPORTED_LANGUAGE_CODES).optional(),
     })
     .partial(),
   authOptions: z
@@ -181,6 +183,7 @@ export const ZCreateDocumentFromTemplateMutationSchema = z.object({
       dateFormat: z.string(),
       redirectUrl: z.string(),
       signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
+      language: z.enum(SUPPORTED_LANGUAGE_CODES).optional(),
     })
     .partial()
     .optional(),
@@ -247,6 +250,7 @@ export const ZGenerateDocumentFromTemplateMutationSchema = z.object({
       dateFormat: z.string(),
       redirectUrl: ZUrlSchema,
       signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
+      language: z.enum(SUPPORTED_LANGUAGE_CODES).optional(),
     })
     .partial()
     .optional(),

packages/app-tests/e2e/document-auth/action-auth.spec.ts

@@ -36,7 +36,7 @@ test('[DOCUMENT_AUTH]: should allow signing when no auth setup', async ({ page }
     await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
 
     // Add signature.
-    const canvas = page.locator('canvas');
+    const canvas = page.locator('canvas').first();
     const box = await canvas.boundingBox();
     if (box) {
       await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
@@ -93,7 +93,7 @@ test('[DOCUMENT_AUTH]: should allow signing with valid global auth', async ({ pa
   await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
 
   // Add signature.
-  const canvas = page.locator('canvas');
+  const canvas = page.locator('canvas').first();
   const box = await canvas.boundingBox();
   if (box) {
     await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
@@ -262,7 +262,7 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient au
     }
 
     // Add signature.
-    const canvas = page.locator('canvas');
+    const canvas = page.locator('canvas').first();
     const box = await canvas.boundingBox();
     if (box) {
       await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
@@ -373,7 +373,7 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient an
     }
 
     // Add signature.
-    const canvas = page.locator('canvas');
+    const canvas = page.locator('canvas').first();
     const box = await canvas.boundingBox();
     if (box) {
       await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);

packages/app-tests/e2e/document-flow/stepper-component.spec.ts

@@ -106,7 +106,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document', async ({ page }) =>
   await page.getByRole('button', { name: 'Continue' }).click();
 
   // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -190,7 +190,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
   await page.getByRole('button', { name: 'Continue' }).click();
 
   // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -287,7 +287,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
   await page.getByRole('button', { name: 'Continue' }).click();
 
   // Add subject and send
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');
@@ -566,7 +566,7 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
 
   await page.getByRole('button', { name: 'Continue' }).click();
 
-  await expect(page.getByRole('heading', { name: 'Add Subject' })).toBeVisible();
+  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
   await page.getByRole('button', { name: 'Send' }).click();
 
   await page.waitForURL('/documents');

packages/app-tests/e2e/teams/team-documents.spec.ts

@@ -462,6 +462,45 @@ test('[TEAMS]: check document visibility based on team member role', async ({ pa
   }
 });
 
+test('[TEAMS]: ensure document owner can see document regardless of visibility', async ({
+  page,
+}) => {
+  const team = await seedTeam();
+
+  // Seed a member user
+  const memberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
+  });
+
+  // Seed a document with ADMIN visibility but make the member user a recipient
+  await seedDocuments([
+    {
+      sender: memberUser,
+      recipients: [],
+      type: DocumentStatus.COMPLETED,
+      documentOptions: {
+        teamId: team.id,
+        visibility: 'ADMIN',
+        title: 'Admin Document with Member Document Owner',
+      },
+    },
+  ]);
+
+  await apiSignin({
+    page,
+    email: memberUser.email,
+    redirectPath: `/t/${team.url}/documents?status=COMPLETED`,
+  });
+
+  // Check that the member user can see the document
+  await expect(
+    page.getByRole('link', { name: 'Admin Document with Member Document Owner', exact: true }),
+  ).toBeVisible();
+
+  await apiSignout({ page });
+});
+
 test('[TEAMS]: ensure recipient can see document regardless of visibility', async ({ page }) => {
   const team = await seedTeam();
 

packages/app-tests/e2e/teams/team-global-settings.spec.ts

@@ -0,0 +1,62 @@
+import { expect, test } from '@playwright/test';
+
+import { seedTeam } from '@documenso/prisma/seed/teams';
+
+import { apiSignin } from '../fixtures/authentication';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('[TEAMS]: update the default document visibility in the team global settings', async ({
+  page,
+}) => {
+  const team = await seedTeam({
+    createTeamMembers: 1,
+  });
+
+  await apiSignin({
+    page,
+    email: team.owner.email,
+    password: 'password',
+    redirectPath: `/t/${team.url}/settings`,
+  });
+
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Admin' }).click();
+  await page.getByRole('button', { name: 'Update team' }).click();
+
+  const toast = page.locator('li[role="status"][data-state="open"]').first();
+  await expect(toast).toBeVisible();
+  await expect(toast.getByText('Success', { exact: true })).toBeVisible();
+  await expect(
+    toast.getByText('Your team has been successfully updated.', { exact: true }),
+  ).toBeVisible();
+});
+
+test('[TEAMS]: update the sender details in the team global settings', async ({ page }) => {
+  const team = await seedTeam({
+    createTeamMembers: 1,
+  });
+
+  await apiSignin({
+    page,
+    email: team.owner.email,
+    password: 'password',
+    redirectPath: `/t/${team.url}/settings`,
+  });
+
+  const checkbox = page.getByLabel('Send on Behalf of Team');
+  await checkbox.check();
+
+  await expect(checkbox).toBeChecked();
+
+  await page.getByRole('button', { name: 'Update team' }).click();
+
+  const toast = page.locator('li[role="status"][data-state="open"]').first();
+  await expect(toast).toBeVisible();
+  await expect(toast.getByText('Success', { exact: true })).toBeVisible();
+  await expect(
+    toast.getByText('Your team has been successfully updated.', { exact: true }),
+  ).toBeVisible();
+
+  await expect(checkbox).toBeChecked();
+});

packages/app-tests/e2e/teams/transfer-team.spec.ts

@@ -29,7 +29,7 @@ test('[TEAMS]: initiate and cancel team transfer', async ({ page }) => {
   await page.getByLabel('Confirm by typing transfer').fill('transfer');
   await page.getByRole('button', { name: 'Transfer' }).click();
 
-  await expect(page.locator('[id="\\:r2\\:-form-item-message"]')).toContainText(
+  await expect(page.locator('[id*="form-item-message"]').first()).toContainText(
     `You must enter 'transfer ${team.name}' to proceed`,
   );
 

packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts

@@ -32,7 +32,7 @@ test.describe('[EE_ONLY]', () => {
     await apiSignin({
       page,
       email: user.email,
-      redirectPath: `/templates/${template.id}`,
+      redirectPath: `/templates/${template.id}/edit`,
     });
 
     // Set EE action auth.
@@ -74,7 +74,7 @@ test.describe('[EE_ONLY]', () => {
     await apiSignin({
       page,
       email: teamMemberUser.email,
-      redirectPath: `/t/${team.url}/templates/${template.id}`,
+      redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
     });
 
     // Set EE action auth.
@@ -110,7 +110,7 @@ test.describe('[EE_ONLY]', () => {
     await apiSignin({
       page,
       email: teamMemberUser.email,
-      redirectPath: `/templates/${template.id}`,
+      redirectPath: `/templates/${template.id}/edit`,
     });
 
     // Global action auth should not be visible.
@@ -132,7 +132,7 @@ test('[TEMPLATE_FLOW]: add settings', async ({ page }) => {
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}`,
+    redirectPath: `/templates/${template.id}/edit`,
   });
 
   // Set title.

packages/app-tests/e2e/templates-flow/template-signers-step.spec.ts

@@ -31,7 +31,7 @@ test.describe('[EE_ONLY]', () => {
     await apiSignin({
       page,
       email: user.email,
-      redirectPath: `/templates/${template.id}`,
+      redirectPath: `/templates/${template.id}/edit`,
     });
 
     // Save the settings by going to the next step.
@@ -81,7 +81,7 @@ test('[TEMPLATE_FLOW]: add placeholder', async ({ page }) => {
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}`,
+    redirectPath: `/templates/${template.id}/edit`,
   });
 
   // Save the settings by going to the next step.

packages/app-tests/e2e/templates/create-document-from-template.spec.ts

@@ -37,7 +37,7 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}`,
+    redirectPath: `/templates/${template.id}/edit`,
   });
 
   // Set template title.
@@ -172,7 +172,7 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
   await apiSignin({
     page,
     email: owner.email,
-    redirectPath: `/t/${team.url}/templates/${template.id}`,
+    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
   // Set template title.

packages/app-tests/e2e/user/auth-flow.spec.ts

@@ -18,7 +18,7 @@ test('[USER] can sign up with email and password', async ({ page }: { page: Page
   await page.getByLabel('Email').fill(email);
   await page.getByLabel('Password', { exact: true }).fill(password);
 
-  const canvas = page.locator('canvas');
+  const canvas = page.locator('canvas').first();
   const box = await canvas.boundingBox();
 
   if (box) {

packages/app-tests/e2e/user/update-name.spec.ts

@@ -12,7 +12,7 @@ test('[USER] update full name', async ({ page }) => {
 
   await page.getByLabel('Full Name').fill('John Doe');
 
-  const canvas = page.locator('canvas');
+  const canvas = page.locator('canvas').first();
   const box = await canvas.boundingBox();
 
   if (box) {

packages/email/mailer.ts

@@ -1,10 +1,56 @@
+import type { Transporter } from 'nodemailer';
 import { createTransport } from 'nodemailer';
 
 import { ResendTransport } from '@documenso/nodemailer-resend';
 
 import { MailChannelsTransport } from './transports/mailchannels';
 
-const getTransport = () => {
+/**
+ * Creates a Nodemailer transport object for sending emails.
+ *
+ * This function uses various environment variables to configure the appropriate
+ * email transport mechanism. It supports multiple types of email transports,
+ * including MailChannels, Resend, and different SMTP configurations.
+ *
+ * @returns {Transporter} A configured Nodemailer transporter instance.
+ *
+ * Supported Transports:
+ * - **mailchannels**: Uses MailChannelsTransport, requiring:
+ *   - `NEXT_PRIVATE_MAILCHANNELS_API_KEY`: API key for MailChannels
+ *   - `NEXT_PRIVATE_MAILCHANNELS_ENDPOINT`: Endpoint for MailChannels (optional)
+ * - **resend**: Uses ResendTransport, requiring:
+ *   - `NEXT_PRIVATE_RESEND_API_KEY`: API key for Resend
+ * - **smtp-api**: Uses a custom SMTP API configuration, requiring:
+ *   - `NEXT_PRIVATE_SMTP_HOST`: The SMTP server host
+ *   - `NEXT_PRIVATE_SMTP_APIKEY`: The API key for SMTP authentication
+ *   - `NEXT_PRIVATE_SMTP_APIKEY_USER`: The username for SMTP authentication (default: 'apikey')
+ * - **smtp-auth** (default): Uses a standard SMTP configuration, requiring:
+ *   - `NEXT_PRIVATE_SMTP_HOST`: The SMTP server host (default: 'localhost:2500')
+ *   - `NEXT_PRIVATE_SMTP_PORT`: The port to connect to (default: 587)
+ *   - `NEXT_PRIVATE_SMTP_SECURE`: Whether to use SSL/TLS (default: false)
+ *   - `NEXT_PRIVATE_SMTP_UNSAFE_IGNORE_TLS`: Whether to ignore TLS (default: false)
+ *   - `NEXT_PRIVATE_SMTP_USERNAME`: The username for SMTP authentication
+ *   - `NEXT_PRIVATE_SMTP_PASSWORD`: The password for SMTP authentication
+ *   - `NEXT_PRIVATE_SMTP_SERVICE`: The SMTP service provider (e.g., "gmail"). This option is used
+ *     when integrating with well-known services (like Gmail), enabling simplified configuration.
+ *
+ * Example Usage:
+ * ```env
+ * NEXT_PRIVATE_SMTP_TRANSPORT='smtp-auth';
+ * NEXT_PRIVATE_SMTP_HOST='smtp.example.com';
+ * NEXT_PRIVATE_SMTP_PORT=587;
+ * NEXT_PRIVATE_SMTP_SERVICE='gmail';
+ * NEXT_PRIVATE_SMTP_SECURE='true';
+ * NEXT_PRIVATE_SMTP_USERNAME='your-email@gmail.com';
+ * NEXT_PRIVATE_SMTP_PASSWORD='your-password';
+ * ```
+ *
+ * Notes:
+ * - Ensure that the required environment variables for each transport type are set.
+ * - If `NEXT_PRIVATE_SMTP_TRANSPORT` is not specified, the default is `smtp-auth`.
+ * - `NEXT_PRIVATE_SMTP_SERVICE` is optional and used specifically for well-known services like Gmail.
+ */
+const getTransport = (): Transporter => {
   const transport = process.env.NEXT_PRIVATE_SMTP_TRANSPORT ?? 'smtp-auth';
 
   if (transport === 'mailchannels') {
@@ -53,6 +99,9 @@ const getTransport = () => {
           pass: process.env.NEXT_PRIVATE_SMTP_PASSWORD ?? '',
         }
       : undefined,
+    ...(process.env.NEXT_PRIVATE_SMTP_SERVICE
+      ? { service: process.env.NEXT_PRIVATE_SMTP_SERVICE }
+      : {}),
   });
 };
 

packages/email/providers/branding.tsx

@@ -0,0 +1,44 @@
+'use client';
+
+import { createContext, useContext } from 'react';
+
+type BrandingContextValue = {
+  brandingEnabled: boolean;
+  brandingUrl: string;
+  brandingLogo: string;
+  brandingCompanyDetails: string;
+  brandingHidePoweredBy: boolean;
+};
+
+const BrandingContext = createContext<BrandingContextValue | undefined>(undefined);
+
+const defaultBrandingContextValue: BrandingContextValue = {
+  brandingEnabled: false,
+  brandingUrl: '',
+  brandingLogo: '',
+  brandingCompanyDetails: '',
+  brandingHidePoweredBy: false,
+};
+
+export const BrandingProvider = (props: {
+  branding?: BrandingContextValue;
+  children: React.ReactNode;
+}) => {
+  return (
+    <BrandingContext.Provider value={props.branding ?? defaultBrandingContextValue}>
+      {props.children}
+    </BrandingContext.Provider>
+  );
+};
+
+export const useBranding = () => {
+  const ctx = useContext(BrandingContext);
+
+  if (!ctx) {
+    throw new Error('Branding context not found');
+  }
+
+  return ctx;
+};
+
+export type BrandingSettings = BrandingContextValue;

packages/email/render.ts

@@ -1 +0,0 @@
-export { render, renderAsync } from '@react-email/render';

packages/email/render.tsx

@@ -0,0 +1,48 @@
+import * as ReactEmail from '@react-email/render';
+
+import config from '@documenso/tailwind-config';
+
+import { Tailwind } from './components';
+import { BrandingProvider, type BrandingSettings } from './providers/branding';
+
+export type RenderOptions = ReactEmail.Options & {
+  branding?: BrandingSettings;
+};
+
+export const render = (element: React.ReactNode, options?: RenderOptions) => {
+  const { branding, ...otherOptions } = options ?? {};
+
+  return ReactEmail.render(
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
+      <BrandingProvider branding={branding}>{element}</BrandingProvider>
+    </Tailwind>,
+    otherOptions,
+  );
+};
+
+export const renderAsync = async (element: React.ReactNode, options?: RenderOptions) => {
+  const { branding, ...otherOptions } = options ?? {};
+
+  return await ReactEmail.renderAsync(
+    <Tailwind
+      config={{
+        theme: {
+          extend: {
+            colors: config.theme.extend.colors,
+          },
+        },
+      }}
+    >
+      <BrandingProvider branding={branding}>{element}</BrandingProvider>
+    </Tailwind>,
+    otherOptions,
+  );
+};

packages/email/template-components/template-confirmation-email.tsx

@@ -1,3 +1,5 @@
+import { Trans } from '@lingui/macro';
+
 import { Button, Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
 
@@ -16,11 +18,13 @@ export const TemplateConfirmationEmail = ({
 
       <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          Welcome to Documenso!
+          <Trans>Welcome to Documenso!</Trans>
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          Before you get started, please confirm your email address by clicking the button below:
+          <Trans>
+            Before you get started, please confirm your email address by clicking the button below:
+          </Trans>
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
@@ -28,11 +32,13 @@ export const TemplateConfirmationEmail = ({
             className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
             href={confirmationLink}
           >
-            Confirm email
+            <Trans>Confirm email</Trans>
           </Button>
           <Text className="mt-8 text-center text-sm italic text-slate-400">
-            You can also copy and paste this link into your browser: {confirmationLink} (link
-            expires in 1 hour)
+            <Trans>
+              You can also copy and paste this link into your browser: {confirmationLink} (link
+              expires in 1 hour)
+            </Trans>
           </Text>
         </Section>
       </Section>

packages/email/template-components/template-document-cancel.tsx

@@ -1,3 +1,5 @@
+import { Trans } from '@lingui/macro';
+
 import { Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
 
@@ -19,16 +21,18 @@ export const TemplateDocumentCancel = ({
 
       <Section>
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          {inviterName} has cancelled the document
-          <br />"{documentName}"
+          <Trans>
+            {inviterName} has cancelled the document
+            <br />"{documentName}"
+          </Trans>
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          All signatures have been voided.
+          <Trans>All signatures have been voided.</Trans>
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          You don't need to sign it anymore.
+          <Trans>You don't need to sign it anymore.</Trans>
         </Text>
       </Section>
     </>

packages/email/template-components/template-document-completed.tsx

@@ -1,3 +1,5 @@
+import { Trans } from '@lingui/macro';
+
 import { Button, Column, Img, Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
 
@@ -30,27 +32,20 @@ export const TemplateDocumentCompleted = ({
                 src={getAssetUrl('/static/completed.png')}
                 className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
               />
-              Completed
+              <Trans>Completed</Trans>
             </Text>
           </Column>
         </Section>
 
         <Text className="text-primary mb-0 text-center text-lg font-semibold">
-          {customBody ?? `“${documentName}” was signed by all signers`}
+          {customBody || <Trans>“{documentName}” was signed by all signers</Trans>}
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          Continue by downloading the document.
+          <Trans>Continue by downloading the document.</Trans>
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
-          {/* <Button
-            className="mr-4 inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
-            href={reviewLink}
-          >
-            <Img src={getAssetUrl('/static/review.png')} className="-mb-1 mr-2 inline h-5 w-5" />
-            Review
-          </Button> */}
           <Button
             className="rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
             href={downloadLink}
@@ -59,7 +54,7 @@ export const TemplateDocumentCompleted = ({
               src={getAssetUrl('/static/download.png')}
               className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
             />
-            Download
+            <Trans>Download</Trans>
           </Button>
         </Section>
       </Section>

packages/email/template-components/template-document-invite.tsx

@@ -1,5 +1,11 @@
-import { RECIPIENT_ROLES_DESCRIPTION_ENG } from '@documenso/lib/constants/recipient-roles';
-import type { RecipientRole } from '@documenso/prisma/client';
+import { useMemo } from 'react';
+
+import { Trans } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
+import { match } from 'ts-pattern';
+
+import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
+import { RecipientRole } from '@documenso/prisma/client';
 
 import { Button, Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
@@ -14,6 +20,7 @@ export interface TemplateDocumentInviteProps {
   selfSigner: boolean;
   isTeamInvite: boolean;
   teamName?: string;
+  includeSenderDetails?: boolean;
 }
 
 export const TemplateDocumentInvite = ({
@@ -25,8 +32,19 @@ export const TemplateDocumentInvite = ({
   selfSigner,
   isTeamInvite,
   teamName,
+  includeSenderDetails,
 }: TemplateDocumentInviteProps) => {
-  const { actionVerb, progressiveVerb } = RECIPIENT_ROLES_DESCRIPTION_ENG[role];
+  const { _ } = useLingui();
+
+  const { actionVerb } = RECIPIENT_ROLES_DESCRIPTION[role];
+
+  const rejectDocumentLink = useMemo(() => {
+    const url = new URL(signDocumentLink);
+
+    url.searchParams.set('reject', 'true');
+
+    return url.toString();
+  }, []);
 
   return (
     <>
@@ -35,36 +53,59 @@ export const TemplateDocumentInvite = ({
       <Section>
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
           {selfSigner ? (
-            <>
-              {`Please ${actionVerb.toLowerCase()} your document`}
-              <br />
-              {`"${documentName}"`}
-            </>
+            <Trans>
+              Please {_(actionVerb).toLowerCase()} your document
+              <br />"{documentName}"
+            </Trans>
           ) : isTeamInvite ? (
             <>
-              {`${inviterName} on behalf of ${teamName} has invited you to ${actionVerb.toLowerCase()}`}
-              <br />
-              {`"${documentName}"`}
+              {includeSenderDetails ? (
+                <Trans>
+                  {inviterName} on behalf of {teamName} has invited you to{' '}
+                  {_(actionVerb).toLowerCase()}
+                </Trans>
+              ) : (
+                <Trans>
+                  {teamName} has invited you to {_(actionVerb).toLowerCase()}
+                </Trans>
+              )}
+              <br />"{documentName}"
             </>
           ) : (
-            <>
-              {`${inviterName} has invited you to ${actionVerb.toLowerCase()}`}
-              <br />
-              {`"${documentName}"`}
-            </>
+            <Trans>
+              {inviterName} has invited you to {_(actionVerb).toLowerCase()}
+              <br />"{documentName}"
+            </Trans>
           )}
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          Continue by {progressiveVerb.toLowerCase()} the document.
+          {match(role)
+            .with(RecipientRole.SIGNER, () => <Trans>Continue by signing the document.</Trans>)
+            .with(RecipientRole.VIEWER, () => <Trans>Continue by viewing the document.</Trans>)
+            .with(RecipientRole.APPROVER, () => <Trans>Continue by approving the document.</Trans>)
+            .with(RecipientRole.CC, () => '')
+            .exhaustive()}
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
+          <Button
+            className="mr-4 inline-flex items-center justify-center rounded-lg bg-red-500 px-6 py-3 text-center text-sm font-medium text-black no-underline"
+            href={rejectDocumentLink}
+          >
+            <Trans>Reject Document</Trans>
+          </Button>
+
           <Button
             className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
             href={signDocumentLink}
           >
-            {actionVerb} Document
+            {match(role)
+              .with(RecipientRole.SIGNER, () => <Trans>Sign Document</Trans>)
+              .with(RecipientRole.VIEWER, () => <Trans>View Document</Trans>)
+              .with(RecipientRole.APPROVER, () => <Trans>Approve Document</Trans>)
+              .with(RecipientRole.CC, () => '')
+              .exhaustive()}
           </Button>
         </Section>
       </Section>

packages/email/template-components/template-document-pending.tsx

@@ -1,3 +1,5 @@
+import { Trans } from '@lingui/macro';
+
 import { Column, Img, Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
 
@@ -26,19 +28,21 @@ export const TemplateDocumentPending = ({
                 src={getAssetUrl('/static/clock.png')}
                 className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
               />
-              Waiting for others
+              <Trans>Waiting for others</Trans>
             </Text>
           </Column>
         </Section>
 
         <Text className="text-primary mb-0 text-center text-lg font-semibold">
-          “{documentName}” has been signed
+          <Trans>“{documentName}” has been signed</Trans>
         </Text>
 
         <Text className="mx-auto mb-6 mt-1 max-w-[80%] text-center text-base text-slate-400">
-          We're still waiting for other signers to sign this document.
-          <br />
-          We'll notify you as soon as it's ready.
+          <Trans>
+            We're still waiting for other signers to sign this document.
+            <br />
+            We'll notify you as soon as it's ready.
+          </Trans>
         </Text>
       </Section>
     </>

packages/email/template-components/template-document-rejected.tsx

@@ -0,0 +1,48 @@
+import { Trans } from '@lingui/macro';
+
+import { Button, Heading, Text } from '../components';
+
+export interface TemplateDocumentRejectedProps {
+  documentName: string;
+  recipientName: string;
+  rejectionReason?: string;
+  documentUrl: string;
+}
+
+export function TemplateDocumentRejected({
+  documentName,
+  recipientName: signerName,
+  rejectionReason,
+  documentUrl,
+}: TemplateDocumentRejectedProps) {
+  return (
+    <div className="mt-4">
+      <Heading className="mb-4 text-center text-2xl font-semibold text-slate-800">
+        <Trans>Document Rejected</Trans>
+      </Heading>
+
+      <Text className="mb-4 text-base">
+        <Trans>
+          {signerName} has rejected the document "{documentName}".
+        </Trans>
+      </Text>
+
+      {rejectionReason && (
+        <Text className="mb-4 text-base text-slate-400">
+          <Trans>Reason for rejection: {rejectionReason}</Trans>
+        </Text>
+      )}
+
+      <Text className="mb-6 text-base">
+        <Trans>You can view the document and its status by clicking the button below.</Trans>
+      </Text>
+
+      <Button
+        href={documentUrl}
+        className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
+      >
+        <Trans>View Document</Trans>
+      </Button>
+    </div>
+  );
+}

packages/email/template-components/template-document-rejection-confirmed.tsx

@@ -0,0 +1,48 @@
+import { Trans } from '@lingui/macro';
+
+import { Container, Heading, Section, Text } from '../components';
+
+interface TemplateDocumentRejectionConfirmedProps {
+  recipientName: string;
+  documentName: string;
+  documentOwnerName: string;
+  reason?: string;
+}
+
+export function TemplateDocumentRejectionConfirmed({
+  recipientName,
+  documentName,
+  documentOwnerName,
+  reason,
+}: TemplateDocumentRejectionConfirmedProps) {
+  return (
+    <Container>
+      <Section>
+        <Heading className="text-2xl font-semibold">
+          <Trans>Rejection Confirmed</Trans>
+        </Heading>
+
+        <Text className="text-primary text-base">
+          <Trans>
+            This email confirms that you have rejected the document{' '}
+            <strong className="font-bold">"{documentName}"</strong> sent by {documentOwnerName}.
+          </Trans>
+        </Text>
+
+        {reason && (
+          <Text className="text-base font-medium text-slate-400">
+            <Trans>Rejection reason: {reason}</Trans>
+          </Text>
+        )}
+
+        <Text className="text-base">
+          <Trans>
+            The document owner has been notified of this rejection. No further action is required
+            from you at this time. The document owner may contact you with any questions regarding
+            this rejection.
+          </Trans>
+        </Text>
+      </Section>
+    </Container>
+  );
+}

packages/email/template-components/template-document-self-signed.tsx

@@ -1,3 +1,4 @@
+import { Trans } from '@lingui/macro';
 import { env } from 'next-runtime-env';
 
 import { Button, Column, Img, Link, Section, Text } from '../components';
@@ -32,25 +33,27 @@ export const TemplateDocumentSelfSigned = ({
                 src={getAssetUrl('/static/completed.png')}
                 className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
               />
-              Completed
+              <Trans>Completed</Trans>
             </Text>
           </Column>
         </Section>
 
         <Text className="text-primary mb-0 mt-6 text-center text-lg font-semibold">
-          You have signed “{documentName}”
+          <Trans>You have signed “{documentName}”</Trans>
         </Text>
 
         <Text className="mx-auto mb-6 mt-1 max-w-[80%] text-center text-base text-slate-400">
-          Create a{' '}
-          <Link
-            href={signUpUrl}
-            target="_blank"
-            className="text-documenso-700 hover:text-documenso-600 whitespace-nowrap"
-          >
-            free account
-          </Link>{' '}
-          to access your signed documents at any time.
+          <Trans>
+            Create a{' '}
+            <Link
+              href={signUpUrl}
+              target="_blank"
+              className="text-documenso-700 hover:text-documenso-600 whitespace-nowrap"
+            >
+              free account
+            </Link>{' '}
+            to access your signed documents at any time.
+          </Trans>
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
@@ -62,7 +65,7 @@ export const TemplateDocumentSelfSigned = ({
               src={getAssetUrl('/static/user-plus.png')}
               className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
             />
-            Create account
+            <Trans>Create account</Trans>
           </Button>
 
           <Button
@@ -73,7 +76,7 @@ export const TemplateDocumentSelfSigned = ({
               src={getAssetUrl('/static/review.png')}
               className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
             />
-            View plans
+            <Trans>View plans</Trans>
           </Button>
         </Section>
       </Section>

packages/email/template-components/template-document-super-delete.tsx

@@ -1,3 +1,5 @@
+import { Trans } from '@lingui/macro';
+
 import { Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
 
@@ -18,20 +20,22 @@ export const TemplateDocumentDelete = ({
 
       <Section>
         <Text className="text-primary mb-0 mt-6 text-left text-lg font-semibold">
-          Your document has been deleted by an admin!
+          <Trans>Your document has been deleted by an admin!</Trans>
         </Text>
 
         <Text className="mx-auto mb-6 mt-1 text-left text-base text-slate-400">
-          "{documentName}" has been deleted by an admin.
+          <Trans>"{documentName}" has been deleted by an admin.</Trans>
         </Text>
 
         <Text className="mx-auto mb-6 mt-1 text-left text-base text-slate-400">
-          This document can not be recovered, if you would like to dispute the reason for future
-          documents please contact support.
+          <Trans>
+            This document can not be recovered, if you would like to dispute the reason for future
+            documents please contact support.
+          </Trans>
         </Text>
 
         <Text className="mx-auto mt-1 text-left text-base text-slate-400">
-          The reason provided for deletion is the following:
+          <Trans>The reason provided for deletion is the following:</Trans>
         </Text>
 
         <Text className="mx-auto mb-6 mt-1 text-left text-base italic text-slate-400">

packages/email/template-components/template-footer.tsx

@@ -1,26 +1,46 @@
+import { Trans } from '@lingui/macro';
+
 import { Link, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 
 export type TemplateFooterProps = {
   isDocument?: boolean;
 };
 
 export const TemplateFooter = ({ isDocument = true }: TemplateFooterProps) => {
+  const branding = useBranding();
+
   return (
     <Section>
-      {isDocument && (
+      {isDocument && !branding.brandingHidePoweredBy && (
         <Text className="my-4 text-base text-slate-400">
-          This document was sent using{' '}
-          <Link className="text-[#7AC455]" href="https://documen.so/mail-footer">
-            Documenso.
-          </Link>
+          <Trans>
+            This document was sent using{' '}
+            <Link className="text-[#7AC455]" href="https://documen.so/mail-footer">
+              Documenso.
+            </Link>
+          </Trans>
         </Text>
       )}
 
-      <Text className="my-8 text-sm text-slate-400">
-        Documenso, Inc.
-        <br />
-        2261 Market Street, #5211, San Francisco, CA 94114, USA
-      </Text>
+      {branding.brandingCompanyDetails ? (
+        <Text className="my-8 text-sm text-slate-400">
+          {branding.brandingCompanyDetails.split('\n').map((line, idx) => {
+            return (
+              <>
+                {idx > 0 && <br />}
+                {line}
+              </>
+            );
+          })}
+        </Text>
+      ) : (
+        <Text className="my-8 text-sm text-slate-400">
+          Documenso, Inc.
+          <br />
+          2261 Market Street, #5211, San Francisco, CA 94114, USA
+        </Text>
+      )}
     </Section>
   );
 };

packages/email/template-components/template-forgot-password.tsx

@@ -1,3 +1,5 @@
+import { Trans } from '@lingui/macro';
+
 import { Button, Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
 
@@ -16,11 +18,11 @@ export const TemplateForgotPassword = ({
 
       <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          Forgot your password?
+          <Trans>Forgot your password?</Trans>
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          That's okay, it happens! Click the button below to reset your password.
+          <Trans>That's okay, it happens! Click the button below to reset your password.</Trans>
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
@@ -28,7 +30,7 @@ export const TemplateForgotPassword = ({
             className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
             href={resetPasswordLink}
           >
-            Reset Password
+            <Trans>Reset Password</Trans>
           </Button>
         </Section>
       </Section>

packages/email/template-components/template-reset-password.tsx

@@ -1,3 +1,4 @@
+import { Trans } from '@lingui/macro';
 import { env } from 'next-runtime-env';
 
 import { Button, Section, Text } from '../components';
@@ -18,11 +19,11 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
 
       <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          Password updated!
+          <Trans>Password updated!</Trans>
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">
-          Your password has been updated.
+          <Trans>Your password has been updated.</Trans>
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
@@ -30,7 +31,7 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
             className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
             href={`${NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signin`}
           >
-            Sign In
+            <Trans>Sign In</Trans>
           </Button>
         </Section>
       </Section>

packages/email/templates/confirm-email.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateConfirmationEmailProps } from '../template-components/template-confirmation-email';
 import { TemplateConfirmationEmail } from '../template-components/template-confirmation-email';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -9,7 +11,10 @@ export const ConfirmEmailTemplate = ({
   confirmationLink,
   assetBaseUrl = 'http://localhost:3002',
 }: TemplateConfirmationEmailProps) => {
-  const previewText = `Please confirm your email address`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Please confirm your email address`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -18,40 +23,34 @@ export const ConfirmEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateConfirmationEmail
-                  confirmationLink={confirmationLink}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
-            <div className="mx-auto mt-12 max-w-xl" />
+              <TemplateConfirmationEmail
+                confirmationLink={confirmationLink}
+                assetBaseUrl={assetBaseUrl}
+              />
+            </Section>
+          </Container>
+          <div className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/confirm-team-email.tsx

@@ -1,5 +1,7 @@
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
+
 import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
 
 import {
   Body,
@@ -8,12 +10,13 @@ import {
   Head,
   Hr,
   Html,
+  Img,
   Link,
   Preview,
   Section,
-  Tailwind,
   Text,
 } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -32,97 +35,103 @@ export const ConfirmTeamEmailTemplate = ({
   teamUrl = 'demo',
   token = '',
 }: ConfirmTeamEmailProps) => {
-  const previewText = `Accept team email request for ${teamName} on Documenso`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Accept team email request for ${teamName} on Documenso`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
+            {branding.brandingEnabled && branding.brandingLogo ? (
+              <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6 p-2" />
+            ) : (
               <TemplateImage
                 assetBaseUrl={assetBaseUrl}
                 className="mb-4 h-6 p-2"
                 staticAsset="logo.png"
               />
+            )}
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="mail-open.png"
-                />
-              </Section>
+            <Section>
+              <TemplateImage
+                className="mx-auto"
+                assetBaseUrl={assetBaseUrl}
+                staticAsset="mail-open.png"
+              />
+            </Section>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">
-                  Verify your team email address
-                </Text>
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">
+                <Trans>Verify your team email address</Trans>
+              </Text>
 
-                <Text className="text-center text-base">
+              <Text className="text-center text-base">
+                <Trans>
                   <span className="font-bold">{teamName}</span> has requested to use your email
                   address for their team on Documenso.
-                </Text>
+                </Trans>
+              </Text>
 
-                <div className="mx-auto mt-6 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
+              <div className="mx-auto mt-6 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
 
-                <Section className="mt-6">
-                  <Text className="my-0 text-sm">
+              <Section className="mt-6">
+                <Text className="my-0 text-sm">
+                  <Trans>
                     By accepting this request, you will be granting <strong>{teamName}</strong>{' '}
                     access to:
-                  </Text>
+                  </Trans>
+                </Text>
 
-                  <ul className="mb-0 mt-2">
-                    <li className="text-sm">
-                      View all documents sent to and from this email address
-                    </li>
-                    <li className="mt-1 text-sm">
-                      Allow document recipients to reply directly to this email address
-                    </li>
-                    <li className="mt-1 text-sm">
-                      Send documents on behalf of the team using the email address
-                    </li>
-                  </ul>
+                <ul className="mb-0 mt-2">
+                  <li className="text-sm">
+                    <Trans>View all documents sent to and from this email address</Trans>
+                  </li>
+                  <li className="mt-1 text-sm">
+                    <Trans>Allow document recipients to reply directly to this email address</Trans>
+                  </li>
+                  <li className="mt-1 text-sm">
+                    <Trans>Send documents on behalf of the team using the email address</Trans>
+                  </li>
+                </ul>
 
-                  <Text className="mt-2 text-sm">
+                <Text className="mt-2 text-sm">
+                  <Trans>
                     You can revoke access at any time in your team settings on Documenso{' '}
                     <Link href={`${baseUrl}/settings/teams`}>here.</Link>
-                  </Text>
-                </Section>
-
-                <Section className="mb-6 mt-8 text-center">
-                  <Button
-                    className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-                    href={`${baseUrl}/team/verify/email/${token}`}
-                  >
-                    Accept
-                  </Button>
-                </Section>
+                  </Trans>
+                </Text>
               </Section>
 
-              <Text className="text-center text-xs text-slate-500">Link expires in 1 hour.</Text>
-            </Container>
+              <Section className="mb-6 mt-8 text-center">
+                <Button
+                  className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
+                  href={`${baseUrl}/team/verify/email/${token}`}
+                >
+                  <Trans>Accept</Trans>
+                </Button>
+              </Section>
+            </Section>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+            <Text className="text-center text-xs text-slate-500">
+              <Trans>Link expires in 1 hour.</Trans>
+            </Text>
+          </Container>
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Hr className="mx-auto mt-12 max-w-xl" />
+
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-cancel.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Hr, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Hr, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateDocumentCancelProps } from '../template-components/template-document-cancel';
 import { TemplateDocumentCancel } from '../template-components/template-document-cancel';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -13,7 +15,10 @@ export const DocumentCancelTemplate = ({
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentCancelEmailTemplateProps) => {
-  const previewText = `${inviterName} has cancelled the document ${documentName}, you don't need to sign it anymore.`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`${inviterName} has cancelled the document ${documentName}, you don't need to sign it anymore.`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -22,43 +27,38 @@ export const DocumentCancelTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentCancel
-                  inviterName={inviterName}
-                  inviterEmail={inviterEmail}
-                  documentName={documentName}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
+              <TemplateDocumentCancel
+                inviterName={inviterName}
+                inviterEmail={inviterEmail}
+                documentName={documentName}
+                assetBaseUrl={assetBaseUrl}
+              />
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-completed.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateDocumentCompletedProps } from '../template-components/template-document-completed';
 import { TemplateDocumentCompleted } from '../template-components/template-document-completed';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -15,7 +17,10 @@ export const DocumentCompletedEmailTemplate = ({
   assetBaseUrl = 'http://localhost:3002',
   customBody,
 }: DocumentCompletedEmailTemplateProps) => {
-  const previewText = `Completed Document`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Completed Document`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -24,41 +29,36 @@ export const DocumentCompletedEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
-              <Section className="p-2">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            <Section className="p-2">
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentCompleted
-                  downloadLink={downloadLink}
-                  documentName={documentName}
-                  assetBaseUrl={assetBaseUrl}
-                  customBody={customBody}
-                />
-              </Section>
-            </Container>
+              <TemplateDocumentCompleted
+                downloadLink={downloadLink}
+                documentName={documentName}
+                assetBaseUrl={assetBaseUrl}
+                customBody={customBody}
+              />
+            </Section>
+          </Container>
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-created-from-direct-template.tsx

@@ -1,18 +1,10 @@
-import { RECIPIENT_ROLES_DESCRIPTION_ENG } from '@documenso/lib/constants/recipient-roles';
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import {
-  Body,
-  Button,
-  Container,
-  Head,
-  Html,
-  Img,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '../components';
+import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
+
+import { Body, Button, Container, Head, Html, Img, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import TemplateDocumentImage from '../template-components/template-document-image';
 import { TemplateFooter } from '../template-components/template-footer';
 import { RecipientRole } from '.prisma/client';
@@ -32,9 +24,12 @@ export const DocumentCreatedFromDirectTemplateEmailTemplate = ({
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentCompletedEmailTemplateProps) => {
-  const action = RECIPIENT_ROLES_DESCRIPTION_ENG[recipientRole].actioned.toLowerCase();
+  const { _ } = useLingui();
+  const branding = useBranding();
 
-  const previewText = `Document created from direct template`;
+  const action = _(RECIPIENT_ROLES_DESCRIPTION[recipientRole].actioned).toLowerCase();
+
+  const previewText = msg`Document created from direct template`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -43,55 +38,52 @@ export const DocumentCreatedFromDirectTemplateEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
-              <Section className="p-2">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            <Section className="p-2">
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+              <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
-                <Section>
-                  <Text className="text-primary mb-0 text-center text-lg font-semibold">
+              <Section>
+                <Text className="text-primary mb-0 text-center text-lg font-semibold">
+                  <Trans>
                     {recipientName} {action} a document by using one of your direct links
-                  </Text>
+                  </Trans>
+                </Text>
 
-                  <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-sm text-slate-600">
-                    {documentName}
-                  </div>
+                <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-sm text-slate-600">
+                  {documentName}
+                </div>
 
-                  <Section className="my-6 text-center">
-                    <Button
-                      className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-                      href={documentLink}
-                    >
-                      View document
-                    </Button>
-                  </Section>
+                <Section className="my-6 text-center">
+                  <Button
+                    className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
+                    href={documentLink}
+                  >
+                    <Trans>View document</Trans>
+                  </Button>
                 </Section>
               </Section>
-            </Container>
+            </Section>
+          </Container>
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-invite.tsx

@@ -1,20 +1,11 @@
-import { RECIPIENT_ROLES_DESCRIPTION_ENG } from '@documenso/lib/constants/recipient-roles';
-import type { RecipientRole } from '@documenso/prisma/client';
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import {
-  Body,
-  Container,
-  Head,
-  Hr,
-  Html,
-  Img,
-  Link,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '../components';
+import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
+import type { RecipientRole } from '@documenso/prisma/client';
+
+import { Body, Container, Head, Hr, Html, Img, Link, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateDocumentInviteProps } from '../template-components/template-document-invite';
 import { TemplateDocumentInvite } from '../template-components/template-document-invite';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -26,6 +17,7 @@ export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInvitePro
   isTeamInvite?: boolean;
   teamName?: string;
   teamEmail?: string;
+  includeSenderDetails?: boolean;
 };
 
 export const DocumentInviteEmailTemplate = ({
@@ -39,14 +31,24 @@ export const DocumentInviteEmailTemplate = ({
   selfSigner = false,
   isTeamInvite = false,
   teamName,
+  includeSenderDetails,
 }: DocumentInviteEmailTemplateProps) => {
-  const action = RECIPIENT_ROLES_DESCRIPTION_ENG[role].actionVerb.toLowerCase();
+  const { _ } = useLingui();
+  const branding = useBranding();
 
-  const previewText = selfSigner
-    ? `Please ${action} your document ${documentName}`
-    : isTeamInvite
-    ? `${inviterName} on behalf of ${teamName} has invited you to ${action} ${documentName}`
-    : `${inviterName} has invited you to ${action} ${documentName}`;
+  const action = _(RECIPIENT_ROLES_DESCRIPTION[role].actionVerb).toLowerCase();
+
+  let previewText = msg`${inviterName} has invited you to ${action} ${documentName}`;
+
+  if (isTeamInvite) {
+    previewText = includeSenderDetails
+      ? msg`${inviterName} on behalf of ${teamName} has invited you to ${action} ${documentName}`
+      : msg`${teamName} has invited you to ${action} ${documentName}`;
+  }
+
+  if (selfSigner) {
+    previewText = msg`Please ${action} your document ${documentName}`;
+  }
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -55,67 +57,67 @@ export const DocumentInviteEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentInvite
-                  inviterName={inviterName}
-                  inviterEmail={inviterEmail}
-                  documentName={documentName}
-                  signDocumentLink={signDocumentLink}
-                  assetBaseUrl={assetBaseUrl}
-                  role={role}
-                  selfSigner={selfSigner}
-                  isTeamInvite={isTeamInvite}
-                  teamName={teamName}
-                />
-              </Section>
-            </Container>
+              <TemplateDocumentInvite
+                inviterName={inviterName}
+                inviterEmail={inviterEmail}
+                documentName={documentName}
+                signDocumentLink={signDocumentLink}
+                assetBaseUrl={assetBaseUrl}
+                role={role}
+                selfSigner={selfSigner}
+                isTeamInvite={isTeamInvite}
+                teamName={teamName}
+                includeSenderDetails={includeSenderDetails}
+              />
+            </Section>
+          </Container>
 
-            <Container className="mx-auto mt-12 max-w-xl">
-              <Section>
-                <Text className="my-4 text-base font-semibold">
+          <Container className="mx-auto mt-12 max-w-xl">
+            <Section>
+              <Text className="my-4 text-base font-semibold">
+                <Trans>
                   {inviterName}{' '}
                   <Link className="font-normal text-slate-400" href="mailto:{inviterEmail}">
                     ({inviterEmail})
                   </Link>
-                </Text>
+                </Trans>
+              </Text>
 
-                <Text className="mt-2 text-base text-slate-400">
-                  {customBody ? (
-                    <pre className="font-sans text-base text-slate-400">{customBody}</pre>
-                  ) : (
-                    `${inviterName} has invited you to ${action} the document "${documentName}".`
-                  )}
-                </Text>
-              </Section>
-            </Container>
+              <Text className="mt-2 text-base text-slate-400">
+                {customBody ? (
+                  <pre className="font-sans text-base text-slate-400">{customBody}</pre>
+                ) : (
+                  <Trans>
+                    {inviterName} has invited you to {action} the document "{documentName}".
+                  </Trans>
+                )}
+              </Text>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-pending.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateDocumentPendingProps } from '../template-components/template-document-pending';
 import { TemplateDocumentPending } from '../template-components/template-document-pending';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -11,7 +13,10 @@ export const DocumentPendingEmailTemplate = ({
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentPendingEmailTemplateProps) => {
-  const previewText = `Pending Document`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Pending Document`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -20,36 +25,31 @@ export const DocumentPendingEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentPending documentName={documentName} assetBaseUrl={assetBaseUrl} />
-              </Section>
-            </Container>
+              <TemplateDocumentPending documentName={documentName} assetBaseUrl={assetBaseUrl} />
+            </Section>
+          </Container>
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-rejected.tsx

@@ -0,0 +1,70 @@
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
+
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
+import { TemplateDocumentRejected } from '../template-components/template-document-rejected';
+import { TemplateFooter } from '../template-components/template-footer';
+
+type DocumentRejectedEmailProps = {
+  recipientName: string;
+  documentName: string;
+  documentUrl: string;
+  rejectionReason: string;
+  assetBaseUrl?: string;
+};
+
+export function DocumentRejectedEmail({
+  recipientName,
+  documentName,
+  documentUrl,
+  rejectionReason,
+  assetBaseUrl = 'http://localhost:3002',
+}: DocumentRejectedEmailProps) {
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = _(msg`${recipientName} has rejected the document '${documentName}'`);
+
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
+  return (
+    <Html>
+      <Head />
+      <Preview>{previewText}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
+                <Img
+                  src={getAssetUrl('/static/logo.png')}
+                  alt="Documenso Logo"
+                  className="mb-4 h-6"
+                />
+              )}
+
+              <TemplateDocumentRejected
+                recipientName={recipientName}
+                documentName={documentName}
+                documentUrl={documentUrl}
+                rejectionReason={rejectionReason}
+              />
+            </Section>
+          </Container>
+
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
+    </Html>
+  );
+}
+
+export default DocumentRejectedEmail;

packages/email/templates/document-rejection-confirmed.tsx

@@ -0,0 +1,70 @@
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
+
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
+import { TemplateDocumentRejectionConfirmed } from '../template-components/template-document-rejection-confirmed';
+import { TemplateFooter } from '../template-components/template-footer';
+
+export type DocumentRejectionConfirmedEmailProps = {
+  recipientName: string;
+  documentName: string;
+  documentOwnerName: string;
+  reason: string;
+  assetBaseUrl?: string;
+};
+
+export function DocumentRejectionConfirmedEmail({
+  recipientName,
+  documentName,
+  documentOwnerName,
+  reason,
+  assetBaseUrl = 'http://localhost:3002',
+}: DocumentRejectionConfirmedEmailProps) {
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = _(msg`You have rejected the document '${documentName}'`);
+
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
+  return (
+    <Html>
+      <Head />
+      <Preview>{previewText}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
+                <Img
+                  src={getAssetUrl('/static/logo.png')}
+                  alt="Documenso Logo"
+                  className="mb-4 h-6"
+                />
+              )}
+
+              <TemplateDocumentRejectionConfirmed
+                recipientName={recipientName}
+                documentName={documentName}
+                documentOwnerName={documentOwnerName}
+                reason={reason}
+              />
+            </Section>
+          </Container>
+
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
+    </Html>
+  );
+}
+
+export default DocumentRejectionConfirmedEmail;

packages/email/templates/document-self-signed.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateDocumentSelfSignedProps } from '../template-components/template-document-self-signed';
 import { TemplateDocumentSelfSigned } from '../template-components/template-document-self-signed';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -11,7 +13,10 @@ export const DocumentSelfSignedEmailTemplate = ({
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentSelfSignedTemplateProps) => {
-  const previewText = `Completed Document`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Completed Document`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -20,39 +25,31 @@ export const DocumentSelfSignedEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
-              <Section className="p-2">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            <Section className="p-2">
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentSelfSigned
-                  documentName={documentName}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
+              <TemplateDocumentSelfSigned documentName={documentName} assetBaseUrl={assetBaseUrl} />
+            </Section>
+          </Container>
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/document-super-delete.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Hr, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Hr, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import {
   TemplateDocumentDelete,
   type TemplateDocumentDeleteProps,
@@ -14,7 +16,10 @@ export const DocumentSuperDeleteEmailTemplate = ({
   assetBaseUrl = 'http://localhost:3002',
   reason = 'Unknown',
 }: DocumentDeleteEmailTemplateProps) => {
-  const previewText = `An admin has deleted your document "${documentName}".`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`An admin has deleted your document "${documentName}".`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -23,42 +28,37 @@ export const DocumentSuperDeleteEmailTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentDelete
-                  reason={reason}
-                  documentName={documentName}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
+              <TemplateDocumentDelete
+                reason={reason}
+                documentName={documentName}
+                assetBaseUrl={assetBaseUrl}
+              />
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/forgot-password.tsx

@@ -1,6 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from '../components';
+import { Body, Container, Head, Html, Img, Preview, Section } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import type { TemplateForgotPasswordProps } from '../template-components/template-forgot-password';
 import { TemplateForgotPassword } from '../template-components/template-forgot-password';
@@ -11,7 +13,10 @@ export const ForgotPasswordTemplate = ({
   resetPasswordLink = 'https://documenso.com',
   assetBaseUrl = 'http://localhost:3002',
 }: ForgotPasswordTemplateProps) => {
-  const previewText = `Password Reset Requested`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Password Reset Requested`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -20,41 +25,36 @@ export const ForgotPasswordTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateForgotPassword
-                  resetPasswordLink={resetPasswordLink}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
+              <TemplateForgotPassword
+                resetPasswordLink={resetPasswordLink}
+                assetBaseUrl={assetBaseUrl}
+              />
+            </Section>
+          </Container>
 
-            <div className="mx-auto mt-12 max-w-xl" />
+          <div className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/recipient-removed-from-document.tsx

@@ -1,17 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import {
-  Body,
-  Container,
-  Head,
-  Hr,
-  Html,
-  Img,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '../components';
+import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import type { TemplateDocumentCancelProps } from '../template-components/template-document-cancel';
 import TemplateDocumentImage from '../template-components/template-document-image';
 import { TemplateFooter } from '../template-components/template-footer';
@@ -23,7 +14,10 @@ export const RecipientRemovedFromDocumentTemplate = ({
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentCancelEmailTemplateProps) => {
-  const previewText = `${inviterName} has removed you from the document ${documentName}.`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`${inviterName} has removed you from the document ${documentName}.`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -32,45 +26,42 @@ export const RecipientRemovedFromDocumentTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+              <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
 
-                <Section>
-                  <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
+              <Section>
+                <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
+                  <Trans>
                     {inviterName} has removed you from the document
                     <br />"{documentName}"
-                  </Text>
-                </Section>
+                  </Trans>
+                </Text>
               </Section>
-            </Container>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/reset-password.tsx

@@ -1,18 +1,8 @@
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import {
-  Body,
-  Container,
-  Head,
-  Hr,
-  Html,
-  Img,
-  Link,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '../components';
+import { Body, Container, Head, Hr, Html, Img, Link, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import type { TemplateResetPasswordProps } from '../template-components/template-reset-password';
 import { TemplateResetPassword } from '../template-components/template-reset-password';
@@ -24,7 +14,10 @@ export const ResetPasswordTemplate = ({
   userEmail = 'lucas@documenso.com',
   assetBaseUrl = 'http://localhost:3002',
 }: ResetPasswordTemplateProps) => {
-  const previewText = `Password Reset Successful`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Password Reset Successful`;
 
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
@@ -33,65 +26,66 @@ export const ResetPasswordTemplate = ({
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto bg-white font-sans">
+        <Section>
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
+            <Section>
+              {branding.brandingEnabled && branding.brandingLogo ? (
+                <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6" />
+              ) : (
                 <Img
                   src={getAssetUrl('/static/logo.png')}
                   alt="Documenso Logo"
                   className="mb-4 h-6"
                 />
+              )}
 
-                <TemplateResetPassword
-                  userName={userName}
-                  userEmail={userEmail}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
+              <TemplateResetPassword
+                userName={userName}
+                userEmail={userEmail}
+                assetBaseUrl={assetBaseUrl}
+              />
+            </Section>
+          </Container>
 
-            <Container className="mx-auto mt-12 max-w-xl">
-              <Section>
-                <Text className="my-4 text-base font-semibold">
+          <Container className="mx-auto mt-12 max-w-xl">
+            <Section>
+              <Text className="my-4 text-base font-semibold">
+                <Trans>
                   Hi, {userName}{' '}
                   <Link className="font-normal text-slate-400" href={`mailto:${userEmail}`}>
                     ({userEmail})
                   </Link>
-                </Text>
+                </Trans>
+              </Text>
 
-                <Text className="mt-2 text-base text-slate-400">
+              <Text className="mt-2 text-base text-slate-400">
+                <Trans>
                   We've changed your password as you asked. You can now sign in with your new
                   password.
-                </Text>
-                <Text className="mt-2 text-base text-slate-400">
+                </Trans>
+              </Text>
+              <Text className="mt-2 text-base text-slate-400">
+                <Trans>
                   Didn't request a password change? We are here to help you secure your account,
                   just{' '}
                   <Link className="text-documenso-700 font-normal" href="mailto:hi@documenso.com">
                     contact us.
                   </Link>
-                </Text>
-              </Section>
-            </Container>
+                </Trans>
+              </Text>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/team-delete.tsx

@@ -1,7 +1,10 @@
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
+import { msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Hr, Html, Preview, Section, Tailwind, Text } from '../components';
+import { formatTeamUrl } from '@documenso/lib/utils/teams';
+
+import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -18,67 +21,65 @@ export const TeamDeleteEmailTemplate = ({
   teamUrl = 'demo',
   isOwner = false,
 }: TeamDeleteEmailProps) => {
+  const { _ } = useLingui();
+  const branding = useBranding();
+
   const previewText = isOwner
-    ? 'Your team has been deleted'
-    : 'A team you were a part of has been deleted';
+    ? msg`Your team has been deleted`
+    : msg`A team you were a part of has been deleted`;
 
   const title = isOwner
-    ? 'Your team has been deleted'
-    : 'A team you were a part of has been deleted';
+    ? msg`Your team has been deleted`
+    : msg`A team you were a part of has been deleted`;
 
   const description = isOwner
-    ? 'The following team has been deleted by you'
-    : 'The following team has been deleted by its owner. You will no longer be able to access this team and its documents';
+    ? msg`The following team has been deleted by you`
+    : msg`The following team has been deleted by its owner. You will no longer be able to access this team and its documents`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white text-slate-500">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white text-slate-500">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            {branding.brandingEnabled && branding.brandingLogo ? (
+              <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6 p-2" />
+            ) : (
               <TemplateImage
                 assetBaseUrl={assetBaseUrl}
                 className="mb-4 h-6 p-2"
                 staticAsset="logo.png"
               />
+            )}
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="delete-team.png"
-                />
-              </Section>
+            <Section>
+              <TemplateImage
+                className="mx-auto"
+                assetBaseUrl={assetBaseUrl}
+                staticAsset="delete-team.png"
+              />
+            </Section>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">{title}</Text>
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">{_(title)}</Text>
 
-                <Text className="my-1 text-center text-base">{description}</Text>
+              <Text className="my-1 text-center text-base">{_(description)}</Text>
 
-                <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
-              </Section>
-            </Container>
+              <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/team-email-removed.tsx

@@ -1,7 +1,10 @@
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Hr, Html, Preview, Section, Tailwind, Text } from '../components';
+import { formatTeamUrl } from '@documenso/lib/utils/teams';
+
+import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -20,62 +23,62 @@ export const TeamEmailRemovedTemplate = ({
   teamName = 'Team Name',
   teamUrl = 'demo',
 }: TeamEmailRemovedTemplateProps) => {
-  const previewText = `Team email removed for ${teamName} on Documenso`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Team email removed for ${teamName} on Documenso`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white text-slate-500">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white text-slate-500">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
+            {branding.brandingEnabled && branding.brandingLogo ? (
+              <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6 p-2" />
+            ) : (
               <TemplateImage
                 assetBaseUrl={assetBaseUrl}
                 className="mb-4 h-6 p-2"
                 staticAsset="logo.png"
               />
+            )}
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="mail-open-alert.png"
-                />
-              </Section>
+            <Section>
+              <TemplateImage
+                className="mx-auto"
+                assetBaseUrl={assetBaseUrl}
+                staticAsset="mail-open-alert.png"
+              />
+            </Section>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">
-                  Team email removed
-                </Text>
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">
+                <Trans>Team email removed</Trans>
+              </Text>
 
-                <Text className="my-1 text-center text-base">
+              <Text className="my-1 text-center text-base">
+                <Trans>
                   The team email <span className="font-bold">{teamEmail}</span> has been removed
                   from the following team
-                </Text>
+                </Trans>
+              </Text>
 
-                <div className="mx-auto mb-6 mt-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
-              </Section>
-            </Container>
+              <div className="mx-auto mb-6 mt-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/team-invite.tsx

@@ -1,5 +1,7 @@
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
+
 import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
 
 import {
   Body,
@@ -8,11 +10,12 @@ import {
   Head,
   Hr,
   Html,
+  Img,
   Preview,
   Section,
-  Tailwind,
   Text,
 } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -33,80 +36,80 @@ export const TeamInviteEmailTemplate = ({
   teamUrl = 'demo',
   token = '',
 }: TeamInviteEmailProps) => {
-  const previewText = `Accept invitation to join a team on Documenso`;
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`Accept invitation to join a team on Documenso`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white text-slate-500">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white text-slate-500">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            {branding.brandingEnabled && branding.brandingLogo ? (
+              <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6 p-2" />
+            ) : (
               <TemplateImage
                 assetBaseUrl={assetBaseUrl}
                 className="mb-4 h-6 p-2"
                 staticAsset="logo.png"
               />
+            )}
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="add-user.png"
-                />
-              </Section>
+            <Section>
+              <TemplateImage
+                className="mx-auto"
+                assetBaseUrl={assetBaseUrl}
+                staticAsset="add-user.png"
+              />
+            </Section>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">
-                  Join {teamName} on Documenso
-                </Text>
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">
+                <Trans>Join {teamName} on Documenso</Trans>
+              </Text>
 
-                <Text className="my-1 text-center text-base">
-                  You have been invited to join the following team
-                </Text>
+              <Text className="my-1 text-center text-base">
+                <Trans>You have been invited to join the following team</Trans>
+              </Text>
 
-                <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
+              <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
 
-                <Text className="my-1 text-center text-base">
+              <Text className="my-1 text-center text-base">
+                <Trans>
                   by <span className="text-slate-900">{senderName}</span>
-                </Text>
+                </Trans>
+              </Text>
 
-                <Section className="mb-6 mt-6 text-center">
-                  <Button
-                    className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-                    href={`${baseUrl}/team/invite/${token}`}
-                  >
-                    Accept
-                  </Button>
-                  <Button
-                    className="ml-4 inline-flex items-center justify-center rounded-lg bg-gray-50 px-6 py-3 text-center text-sm font-medium text-slate-600 no-underline"
-                    href={`${baseUrl}/team/decline/${token}`}
-                  >
-                    Decline
-                  </Button>
-                </Section>
+              <Section className="mb-6 mt-6 text-center">
+                <Button
+                  className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
+                  href={`${baseUrl}/team/invite/${token}`}
+                >
+                  <Trans>Accept</Trans>
+                </Button>
+                <Button
+                  className="ml-4 inline-flex items-center justify-center rounded-lg bg-gray-50 px-6 py-3 text-center text-sm font-medium text-slate-600 no-underline"
+                  href={`${baseUrl}/team/decline/${token}`}
+                >
+                  <Trans>Decline</Trans>
+                </Button>
               </Section>
-            </Container>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/team-join.tsx

@@ -1,7 +1,10 @@
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Hr, Html, Preview, Section, Tailwind, Text } from '../components';
+import { formatTeamUrl } from '@documenso/lib/utils/teams';
+
+import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -22,61 +25,61 @@ export const TeamJoinEmailTemplate = ({
   teamName = 'Team Name',
   teamUrl = 'demo',
 }: TeamJoinEmailProps) => {
-  const previewText = 'A team member has joined a team on Documenso';
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`A team member has joined a team on Documenso`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white text-slate-500">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white text-slate-500">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            {branding.brandingEnabled && branding.brandingLogo ? (
+              <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6 p-2" />
+            ) : (
               <TemplateImage
                 assetBaseUrl={assetBaseUrl}
                 className="mb-4 h-6 p-2"
                 staticAsset="logo.png"
               />
+            )}
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="add-user.png"
-                />
-              </Section>
+            <Section>
+              <TemplateImage
+                className="mx-auto"
+                assetBaseUrl={assetBaseUrl}
+                staticAsset="add-user.png"
+              />
+            </Section>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">
+                <Trans>
                   {memberName || memberEmail} joined the team {teamName} on Documenso
-                </Text>
+                </Trans>
+              </Text>
 
-                <Text className="my-1 text-center text-base">
-                  {memberEmail} joined the following team
-                </Text>
+              <Text className="my-1 text-center text-base">
+                <Trans>{memberEmail} joined the following team</Trans>
+              </Text>
 
-                <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
-              </Section>
-            </Container>
+              <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/team-leave.tsx

@@ -1,7 +1,10 @@
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import { Body, Container, Head, Hr, Html, Preview, Section, Tailwind, Text } from '../components';
+import { formatTeamUrl } from '@documenso/lib/utils/teams';
+
+import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
+import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -22,61 +25,61 @@ export const TeamLeaveEmailTemplate = ({
   teamName = 'Team Name',
   teamUrl = 'demo',
 }: TeamLeaveEmailProps) => {
-  const previewText = 'A team member has left a team on Documenso';
+  const { _ } = useLingui();
+  const branding = useBranding();
+
+  const previewText = msg`A team member has left a team on Documenso`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white text-slate-500">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white text-slate-500">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-2 backdrop-blur-sm">
+            {branding.brandingEnabled && branding.brandingLogo ? (
+              <Img src={branding.brandingLogo} alt="Branding Logo" className="mb-4 h-6 p-2" />
+            ) : (
               <TemplateImage
                 assetBaseUrl={assetBaseUrl}
                 className="mb-4 h-6 p-2"
                 staticAsset="logo.png"
               />
+            )}
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="delete-user.png"
-                />
-              </Section>
+            <Section>
+              <TemplateImage
+                className="mx-auto"
+                assetBaseUrl={assetBaseUrl}
+                staticAsset="delete-user.png"
+              />
+            </Section>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">
+                <Trans>
                   {memberName || memberEmail} left the team {teamName} on Documenso
-                </Text>
+                </Trans>
+              </Text>
 
-                <Text className="my-1 text-center text-base">
-                  {memberEmail} left the following team
-                </Text>
+              <Text className="my-1 text-center text-base">
+                <Trans>{memberEmail} left the following team</Trans>
+              </Text>
 
-                <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
-              </Section>
-            </Container>
+              <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
+            </Section>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/email/templates/team-transfer-request.tsx

@@ -1,18 +1,9 @@
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-import config from '@documenso/tailwind-config';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 
-import {
-  Body,
-  Button,
-  Container,
-  Head,
-  Hr,
-  Html,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '../components';
+import { formatTeamUrl } from '@documenso/lib/utils/teams';
+
+import { Body, Button, Container, Head, Hr, Html, Preview, Section, Text } from '../components';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
@@ -33,78 +24,77 @@ export const TeamTransferRequestTemplate = ({
   teamUrl = 'demo',
   token = '',
 }: TeamTransferRequestTemplateProps) => {
-  const previewText = 'Accept team transfer request on Documenso';
+  const { _ } = useLingui();
+
+  const previewText = msg`Accept team transfer request on Documenso`;
 
   return (
     <Html>
       <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto font-sans">
-          <Section className="bg-white text-slate-500">
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
+      <Preview>{_(previewText)}</Preview>
+
+      <Body className="mx-auto my-auto font-sans">
+        <Section className="bg-white text-slate-500">
+          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
+            <TemplateImage
+              assetBaseUrl={assetBaseUrl}
+              className="mb-4 h-6 p-2"
+              staticAsset="logo.png"
+            />
+
+            <Section>
               <TemplateImage
+                className="mx-auto"
                 assetBaseUrl={assetBaseUrl}
-                className="mb-4 h-6 p-2"
-                staticAsset="logo.png"
+                staticAsset="add-user.png"
               />
+            </Section>
 
-              <Section>
-                <TemplateImage
-                  className="mx-auto"
-                  assetBaseUrl={assetBaseUrl}
-                  staticAsset="add-user.png"
-                />
-              </Section>
+            <Section className="p-2 text-slate-500">
+              <Text className="text-center text-lg font-medium text-black">
+                <Trans>{teamName} ownership transfer request</Trans>
+              </Text>
 
-              <Section className="p-2 text-slate-500">
-                <Text className="text-center text-lg font-medium text-black">
-                  {teamName} ownership transfer request
-                </Text>
-
-                <Text className="my-1 text-center text-base">
+              <Text className="my-1 text-center text-base">
+                <Trans>
                   <span className="font-bold">{senderName}</span> has requested that you take
                   ownership of the following team
-                </Text>
+                </Trans>
+              </Text>
 
-                <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                  {formatTeamUrl(teamUrl, baseUrl)}
-                </div>
+              <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
+                {formatTeamUrl(teamUrl, baseUrl)}
+              </div>
 
-                <Text className="text-center text-sm">
+              <Text className="text-center text-sm">
+                <Trans>
                   By accepting this request, you will take responsibility for any billing items
                   associated with this team.
-                </Text>
+                </Trans>
+              </Text>
 
-                <Section className="mb-6 mt-6 text-center">
-                  <Button
-                    className="bg-documenso-500 ml-2 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-                    href={`${baseUrl}/team/verify/transfer/${token}`}
-                  >
-                    Accept
-                  </Button>
-                </Section>
+              <Section className="mb-6 mt-6 text-center">
+                <Button
+                  className="bg-documenso-500 ml-2 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
+                  href={`${baseUrl}/team/verify/transfer/${token}`}
+                >
+                  <Trans>Accept</Trans>
+                </Button>
               </Section>
+            </Section>
 
-              <Text className="text-center text-xs">Link expires in 1 hour.</Text>
-            </Container>
+            <Text className="text-center text-xs">
+              <Trans>Link expires in 1 hour.</Trans>
+            </Text>
+          </Container>
 
-            <Hr className="mx-auto mt-12 max-w-xl" />
+          <Hr className="mx-auto mt-12 max-w-xl" />
 
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
+          <Container className="mx-auto max-w-xl">
+            <TemplateFooter isDocument={false} />
+          </Container>
+        </Section>
+      </Body>
     </Html>
   );
 };

packages/lib/client-only/providers/i18n.server.tsx

@@ -7,58 +7,94 @@ import { setupI18n } from '@lingui/core';
 import { setI18n } from '@lingui/react/server';
 
 import { IS_APP_WEB } from '../../constants/app';
-import { SUPPORTED_LANGUAGE_CODES } from '../../constants/i18n';
+import {
+  APP_I18N_OPTIONS,
+  SUPPORTED_LANGUAGE_CODES,
+  isValidLanguageCode,
+} from '../../constants/i18n';
 import { extractLocaleData } from '../../utils/i18n';
+import { remember } from '../../utils/remember';
 
 type SupportedLanguages = (typeof SUPPORTED_LANGUAGE_CODES)[number];
 
-async function loadCatalog(lang: SupportedLanguages): Promise<{
+export async function loadCatalog(lang: SupportedLanguages): Promise<{
   [k: string]: Messages;
 }> {
   const extension = process.env.NODE_ENV === 'development' ? 'po' : 'js';
   const context = IS_APP_WEB ? 'web' : 'marketing';
 
-  const { messages } = await import(`../../translations/${lang}/${context}.${extension}`);
+  let { messages } = await import(`../../translations/${lang}/${context}.${extension}`);
+
+  if (extension === 'po') {
+    const { messages: commonMessages } = await import(
+      `../../translations/${lang}/common.${extension}`
+    );
+
+    messages = { ...messages, ...commonMessages };
+  }
 
   return {
     [lang]: messages,
   };
 }
 
-const catalogs = await Promise.all(SUPPORTED_LANGUAGE_CODES.map(loadCatalog));
+const catalogs = Promise.all(SUPPORTED_LANGUAGE_CODES.map(loadCatalog));
 
 // transform array of catalogs into a single object
-export const allMessages = catalogs.reduce((acc, oneCatalog) => {
-  return { ...acc, ...oneCatalog };
-}, {});
+const allMessages = async () => {
+  return await catalogs.then((catalogs) =>
+    catalogs.reduce((acc, oneCatalog) => {
+      return {
+        ...acc,
+        ...oneCatalog,
+      };
+    }, {}),
+  );
+};
 
 type AllI18nInstances = { [K in SupportedLanguages]: I18n };
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-export const allI18nInstances = SUPPORTED_LANGUAGE_CODES.reduce((acc, lang) => {
-  const messages = allMessages[lang] ?? {};
+export const allI18nInstances = remember('i18n.allI18nInstances', async () => {
+  const loadedMessages = await allMessages();
 
-  const i18n = setupI18n({
-    locale: lang,
-    messages: { [lang]: messages },
-  });
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return SUPPORTED_LANGUAGE_CODES.reduce((acc, lang) => {
+    const messages = loadedMessages[lang] ?? {};
 
-  return { ...acc, [lang]: i18n };
-}, {}) as AllI18nInstances;
+    const i18n = setupI18n({
+      locale: lang,
+      messages: { [lang]: messages },
+    });
+
+    return { ...acc, [lang]: i18n };
+  }, {}) as AllI18nInstances;
+});
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+export const getI18nInstance = async (lang?: SupportedLanguages | (string & {})) => {
+  const instances = await allI18nInstances;
+
+  if (!isValidLanguageCode(lang)) {
+    return instances[APP_I18N_OPTIONS.sourceLang];
+  }
+
+  return instances[lang] ?? instances[APP_I18N_OPTIONS.sourceLang];
+};
 
 /**
  * This needs to be run in all layouts and page server components that require i18n.
  *
  * https://lingui.dev/tutorials/react-rsc#pages-layouts-and-lingui
  */
-export const setupI18nSSR = () => {
+export const setupI18nSSR = async () => {
   const { lang, locales } = extractLocaleData({
     cookies: cookies(),
     headers: headers(),
   });
 
   // Get and set a ready-made i18n instance for the given language.
-  const i18n = allI18nInstances[lang];
+  const i18n = await getI18nInstance(lang);
 
   // Reactivate the i18n instance with the locale for date and number formatting.
   i18n.activate(lang, locales);

packages/lib/client-only/recipient-type.ts

@@ -6,6 +6,7 @@ export enum RecipientStatusType {
   OPENED = 'opened',
   WAITING = 'waiting',
   UNSIGNED = 'unsigned',
+  REJECTED = 'rejected',
 }
 
 export const getRecipientType = (recipient: Recipient) => {
@@ -16,6 +17,10 @@ export const getRecipientType = (recipient: Recipient) => {
     return RecipientStatusType.COMPLETED;
   }
 
+  if (recipient.signingStatus === SigningStatus.REJECTED) {
+    return RecipientStatusType.REJECTED;
+  }
+
   if (
     recipient.sendStatus === SendStatus.SENT &&
     recipient.readStatus === ReadStatus.OPENED &&

packages/lib/constants/document.ts

@@ -0,0 +1,34 @@
+import type { MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/macro';
+
+import { DocumentDistributionMethod, DocumentStatus } from '@documenso/prisma/client';
+
+export const DOCUMENT_STATUS: {
+  [status in DocumentStatus]: { description: MessageDescriptor };
+} = {
+  [DocumentStatus.COMPLETED]: {
+    description: msg`Completed`,
+  },
+  [DocumentStatus.DRAFT]: {
+    description: msg`Draft`,
+  },
+  [DocumentStatus.PENDING]: {
+    description: msg`Pending`,
+  },
+};
+
+type DocumentDistributionMethodTypeData = {
+  value: DocumentDistributionMethod;
+  description: MessageDescriptor;
+};
+
+export const DOCUMENT_DISTRIBUTION_METHODS: Record<string, DocumentDistributionMethodTypeData> = {
+  [DocumentDistributionMethod.EMAIL]: {
+    value: DocumentDistributionMethod.EMAIL,
+    description: msg`Email`,
+  },
+  [DocumentDistributionMethod.NONE]: {
+    value: DocumentDistributionMethod.NONE,
+    description: msg`None`,
+  },
+} satisfies Record<DocumentDistributionMethod, DocumentDistributionMethodTypeData>;

packages/lib/constants/i18n.ts

@@ -47,3 +47,6 @@ export const SUPPORTED_LANGUAGES: Record<string, SupportedLanguage> = {
     short: 'es',
   },
 } satisfies Record<SupportedLanguageCodes, SupportedLanguage>;
+
+export const isValidLanguageCode = (code: unknown): code is SupportedLanguageCodes =>
+  SUPPORTED_LANGUAGE_CODES.includes(code as SupportedLanguageCodes);

packages/lib/constants/recipient-roles.ts

@@ -9,63 +9,35 @@ export const RECIPIENT_ROLES_DESCRIPTION = {
     actioned: msg`Approved`,
     progressiveVerb: msg`Approving`,
     roleName: msg`Approver`,
+    roleNamePlural: msg`Approvers`,
   },
   [RecipientRole.CC]: {
     actionVerb: msg`CC`,
     actioned: msg`CC'd`,
     progressiveVerb: msg`CC`,
     roleName: msg`Cc`,
+    roleNamePlural: msg`Ccers`,
   },
   [RecipientRole.SIGNER]: {
     actionVerb: msg`Sign`,
     actioned: msg`Signed`,
     progressiveVerb: msg`Signing`,
     roleName: msg`Signer`,
+    roleNamePlural: msg`Signers`,
   },
   [RecipientRole.VIEWER]: {
     actionVerb: msg`View`,
     actioned: msg`Viewed`,
     progressiveVerb: msg`Viewing`,
     roleName: msg`Viewer`,
-  },
-} satisfies Record<keyof typeof RecipientRole, unknown>;
-
-/**
- * Raw english descriptions for emails.
- *
- * Todo: Handle i18n for emails.
- */
-export const RECIPIENT_ROLES_DESCRIPTION_ENG = {
-  [RecipientRole.APPROVER]: {
-    actionVerb: `Approve`,
-    actioned: `Approved`,
-    progressiveVerb: `Approving`,
-    roleName: `Approver`,
-  },
-  [RecipientRole.CC]: {
-    actionVerb: `CC`,
-    actioned: `CC'd`,
-    progressiveVerb: `CC`,
-    roleName: `Cc`,
-  },
-  [RecipientRole.SIGNER]: {
-    actionVerb: `Sign`,
-    actioned: `Signed`,
-    progressiveVerb: `Signing`,
-    roleName: `Signer`,
-  },
-  [RecipientRole.VIEWER]: {
-    actionVerb: `View`,
-    actioned: `Viewed`,
-    progressiveVerb: `Viewing`,
-    roleName: `Viewer`,
+    roleNamePlural: msg`Viewers`,
   },
 } satisfies Record<keyof typeof RecipientRole, unknown>;
 
 export const RECIPIENT_ROLE_TO_EMAIL_TYPE = {
-  [RecipientRole.SIGNER]: 'SIGNING_REQUEST',
-  [RecipientRole.VIEWER]: 'VIEW_REQUEST',
-  [RecipientRole.APPROVER]: 'APPROVE_REQUEST',
+  [RecipientRole.SIGNER]: `SIGNING_REQUEST`,
+  [RecipientRole.VIEWER]: `VIEW_REQUEST`,
+  [RecipientRole.APPROVER]: `APPROVE_REQUEST`,
 } as const;
 
 export const RECIPIENT_ROLE_SIGNING_REASONS = {
@@ -74,13 +46,3 @@ export const RECIPIENT_ROLE_SIGNING_REASONS = {
   [RecipientRole.CC]: msg`I am required to receive a copy of this document`,
   [RecipientRole.VIEWER]: msg`I am a viewer of this document`,
 } satisfies Record<keyof typeof RecipientRole, MessageDescriptor>;
-
-/**
- * Raw english descriptions for certificates.
- */
-export const RECIPIENT_ROLE_SIGNING_REASONS_ENG = {
-  [RecipientRole.SIGNER]: `I am a signer of this document`,
-  [RecipientRole.APPROVER]: `I am an approver of this document`,
-  [RecipientRole.CC]: `I am required to receive a copy of this document`,
-  [RecipientRole.VIEWER]: `I am a viewer of this document`,
-} satisfies Record<keyof typeof RecipientRole, string>;

packages/lib/jobs/client.ts

@@ -1,5 +1,6 @@
 import { JobClient } from './client/client';
 import { SEND_CONFIRMATION_EMAIL_JOB_DEFINITION } from './definitions/emails/send-confirmation-email';
+import { SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION } from './definitions/emails/send-rejection-emails';
 import { SEND_SIGNING_EMAIL_JOB_DEFINITION } from './definitions/emails/send-signing-email';
 import { SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-deleted-email';
 import { SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-member-joined-email';
@@ -17,6 +18,7 @@ export const jobsClient = new JobClient([
   SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION,
   SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION,
   SEAL_DOCUMENT_JOB_DEFINITION,
+  SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION,
 ] as const);
 
 export const jobs = jobsClient;

packages/lib/jobs/client/local.ts

@@ -43,18 +43,10 @@ export class LocalJobProvider extends BaseJobProvider {
   }
 
   public async triggerJob(options: SimpleTriggerJobOptions) {
-    console.log({ jobDefinitions: this._jobDefinitions });
-
     const eligibleJobs = Object.values(this._jobDefinitions).filter(
       (job) => job.trigger.name === options.name,
     );
 
-    console.log({ options });
-    console.log(
-      'Eligible jobs:',
-      eligibleJobs.map((job) => job.name),
-    );
-
     await Promise.all(
       eligibleJobs.map(async (job) => {
         // Ideally we will change this to a createMany with returning later once we upgrade Prisma
@@ -177,7 +169,7 @@ export class LocalJobProvider extends BaseJobProvider {
           },
         });
       } catch (error) {
-        console.error(`[JOBS]: Job ${options.name} failed`, error);
+        console.log(`[JOBS]: Job ${options.name} failed`, error);
 
         const taskHasExceededRetries = error instanceof BackgroundTaskExceededRetriesError;
         const jobHasExceededRetries =
@@ -303,7 +295,7 @@ export class LocalJobProvider extends BaseJobProvider {
           });
 
           return result;
-        } catch {
+        } catch (err) {
           task = await prisma.backgroundJobTask.update({
             where: {
               id: task.id,
@@ -317,6 +309,8 @@ export class LocalJobProvider extends BaseJobProvider {
             },
           });
 
+          console.log(`[JOBS:${task.id}] Task failed`, err);
+
           throw new BackgroundTaskFailedError('Task failed');
         }
       },

packages/lib/jobs/definitions/emails/send-rejection-emails.ts

@@ -0,0 +1,169 @@
+import { createElement } from 'react';
+
+import { msg } from '@lingui/macro';
+import { z } from 'zod';
+
+import { mailer } from '@documenso/email/mailer';
+import DocumentRejectedEmail from '@documenso/email/templates/document-rejected';
+import DocumentRejectionConfirmedEmail from '@documenso/email/templates/document-rejection-confirmed';
+import { prisma } from '@documenso/prisma';
+import { SendStatus, SigningStatus } from '@documenso/prisma/client';
+
+import { getI18nInstance } from '../../../client-only/providers/i18n.server';
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
+import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
+import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
+import { formatDocumentsPath } from '../../../utils/teams';
+import { type JobDefinition } from '../../client/_internal/job';
+
+const SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_ID = 'send.signing.rejected.emails';
+
+const SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_SCHEMA = z.object({
+  documentId: z.number(),
+  recipientId: z.number(),
+});
+
+export const SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION = {
+  id: SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_ID,
+  name: 'Send Rejection Emails',
+  version: '1.0.0',
+  trigger: {
+    name: SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_ID,
+    schema: SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_SCHEMA,
+  },
+  handler: async ({ payload, io }) => {
+    const { documentId, recipientId } = payload;
+
+    const [document, recipient] = await Promise.all([
+      prisma.document.findFirstOrThrow({
+        where: {
+          id: documentId,
+        },
+        include: {
+          User: true,
+          documentMeta: true,
+          team: {
+            select: {
+              teamEmail: true,
+              name: true,
+              url: true,
+              teamGlobalSettings: true,
+            },
+          },
+        },
+      }),
+      prisma.recipient.findFirstOrThrow({
+        where: {
+          id: recipientId,
+          signingStatus: SigningStatus.REJECTED,
+        },
+      }),
+    ]);
+
+    const { documentMeta, team, User: documentOwner } = document;
+
+    const isEmailEnabled = extractDerivedDocumentEmailSettings(
+      document.documentMeta,
+    ).recipientSigningRequest;
+
+    if (!isEmailEnabled) {
+      return;
+    }
+
+    const i18n = await getI18nInstance(documentMeta?.language);
+
+    // Send confirmation email to the recipient who rejected
+    await io.runTask('send-rejection-confirmation-email', async () => {
+      const recipientTemplate = createElement(DocumentRejectionConfirmedEmail, {
+        recipientName: recipient.name,
+        documentName: document.title,
+        documentOwnerName: document.User.name || document.User.email,
+        reason: recipient.rejectionReason || '',
+        assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
+      });
+
+      const branding = document.team?.teamGlobalSettings
+        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+        : undefined;
+
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(recipientTemplate, { lang: documentMeta?.language, branding }),
+        renderEmailWithI18N(recipientTemplate, {
+          lang: documentMeta?.language,
+          branding,
+          plainText: true,
+        }),
+      ]);
+
+      await mailer.sendMail({
+        to: {
+          name: recipient.name,
+          address: recipient.email,
+        },
+        from: {
+          name: FROM_NAME,
+          address: FROM_ADDRESS,
+        },
+        subject: i18n._(msg`Document "${document.title}" - Rejection Confirmed`),
+        html,
+        text,
+      });
+    });
+
+    // Send notification email to document owner
+    await io.runTask('send-owner-notification-email', async () => {
+      const ownerTemplate = createElement(DocumentRejectedEmail, {
+        recipientName: recipient.name,
+        documentName: document.title,
+        documentUrl: `${NEXT_PUBLIC_WEBAPP_URL()}${formatDocumentsPath(document.team?.url)}/${
+          document.id
+        }`,
+        rejectionReason: recipient.rejectionReason || '',
+        assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
+      });
+
+      const branding = document.team?.teamGlobalSettings
+        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+        : undefined;
+
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(ownerTemplate, { lang: documentMeta?.language, branding }),
+        renderEmailWithI18N(ownerTemplate, {
+          lang: documentMeta?.language,
+          branding,
+          plainText: true,
+        }),
+      ]);
+
+      await mailer.sendMail({
+        to: {
+          name: documentOwner.name || '',
+          address: documentOwner.email,
+        },
+        from: {
+          name: FROM_NAME,
+          address: FROM_ADDRESS,
+        },
+        subject: i18n._(msg`Document "${document.title}" - Rejected by ${recipient.name}`),
+        html,
+        text,
+      });
+    });
+
+    await io.runTask('update-recipient', async () => {
+      await prisma.recipient.update({
+        where: {
+          id: recipient.id,
+        },
+        data: {
+          sendStatus: SendStatus.SENT,
+        },
+      });
+    });
+  },
+} as const satisfies JobDefinition<
+  typeof SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_ID,
+  z.infer<typeof SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION_SCHEMA>
+>;

packages/lib/jobs/definitions/emails/send-signing-email.ts

@@ -1,9 +1,9 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
 import { z } from 'zod';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import DocumentInviteEmailTemplate from '@documenso/email/templates/document-invite';
 import { prisma } from '@documenso/prisma';
 import {
@@ -13,16 +13,20 @@ import {
   SendStatus,
 } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
 import {
-  RECIPIENT_ROLES_DESCRIPTION_ENG,
+  RECIPIENT_ROLES_DESCRIPTION,
   RECIPIENT_ROLE_TO_EMAIL_TYPE,
 } from '../../../constants/recipient-roles';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../../types/document-audit-logs';
+import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { ZRequestMetadataSchema } from '../../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../../utils/document-audit-logs';
 import { renderCustomEmailTemplate } from '../../../utils/render-custom-email-template';
+import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import { type JobDefinition } from '../../client/_internal/job';
 
 const SEND_SIGNING_EMAIL_JOB_DEFINITION_ID = 'send.signing.requested.email';
@@ -62,6 +66,7 @@ export const SEND_SIGNING_EMAIL_JOB_DEFINITION = {
             select: {
               teamEmail: true,
               name: true,
+              teamGlobalSettings: true,
             },
           },
         },
@@ -79,6 +84,14 @@ export const SEND_SIGNING_EMAIL_JOB_DEFINITION = {
       return;
     }
 
+    const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
+      document.documentMeta,
+    ).recipientSigningRequest;
+
+    if (!isRecipientSigningRequestEmailEnabled) {
+      return;
+    }
+
     const customEmail = document?.documentMeta;
     const isDirectTemplate = document.source === DocumentSource.TEMPLATE_DIRECT_LINK;
     const isTeamDocument = document.teamId !== null;
@@ -87,25 +100,43 @@ export const SEND_SIGNING_EMAIL_JOB_DEFINITION = {
 
     const { email, name } = recipient;
     const selfSigner = email === user.email;
-    const recipientActionVerb =
-      RECIPIENT_ROLES_DESCRIPTION_ENG[recipient.role].actionVerb.toLowerCase();
+
+    const i18n = await getI18nInstance(documentMeta?.language);
+
+    const recipientActionVerb = i18n
+      ._(RECIPIENT_ROLES_DESCRIPTION[recipient.role].actionVerb)
+      .toLowerCase();
 
     let emailMessage = customEmail?.message || '';
-    let emailSubject = `Please ${recipientActionVerb} this document`;
+    let emailSubject = i18n._(msg`Please ${recipientActionVerb} this document`);
 
     if (selfSigner) {
-      emailMessage = `You have initiated the document ${`"${document.title}"`} that requires you to ${recipientActionVerb} it.`;
-      emailSubject = `Please ${recipientActionVerb} your document`;
+      emailMessage = i18n._(
+        msg`You have initiated the document ${`"${document.title}"`} that requires you to ${recipientActionVerb} it.`,
+      );
+      emailSubject = i18n._(msg`Please ${recipientActionVerb} your document`);
     }
 
     if (isDirectTemplate) {
-      emailMessage = `A document was created by your direct template that requires you to ${recipientActionVerb} it.`;
-      emailSubject = `Please ${recipientActionVerb} this document created by your direct template`;
+      emailMessage = i18n._(
+        msg`A document was created by your direct template that requires you to ${recipientActionVerb} it.`,
+      );
+      emailSubject = i18n._(
+        msg`Please ${recipientActionVerb} this document created by your direct template`,
+      );
     }
 
     if (isTeamDocument && team) {
-      emailSubject = `${team.name} invited you to ${recipientActionVerb} a document`;
-      emailMessage = `${user.name} on behalf of ${team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`;
+      emailSubject = i18n._(msg`${team.name} invited you to ${recipientActionVerb} a document`);
+      emailMessage = customEmail?.message ?? '';
+
+      if (!emailMessage) {
+        emailMessage = i18n._(
+          team.teamGlobalSettings?.includeSenderDetails
+            ? msg`${user.name} on behalf of ${team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`
+            : msg`${team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`,
+        );
+      }
     }
 
     const customEmailTemplate = {
@@ -129,9 +160,23 @@ export const SEND_SIGNING_EMAIL_JOB_DEFINITION = {
       isTeamInvite: isTeamDocument,
       teamName: team?.name,
       teamEmail: team?.teamEmail?.email,
+      includeSenderDetails: team?.teamGlobalSettings?.includeSenderDetails,
     });
 
     await io.runTask('send-signing-email', async () => {
+      const branding = document.team?.teamGlobalSettings
+        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+        : undefined;
+
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(template, { lang: documentMeta?.language, branding }),
+        renderEmailWithI18N(template, {
+          lang: documentMeta?.language,
+          branding,
+          plainText: true,
+        }),
+      ]);
+
       await mailer.sendMail({
         to: {
           name: recipient.name,
@@ -145,8 +190,8 @@ export const SEND_SIGNING_EMAIL_JOB_DEFINITION = {
           documentMeta?.subject || emailSubject,
           customEmailTemplate,
         ),
-        html: render(template),
-        text: render(template, { plainText: true }),
+        html,
+        text,
       });
     });
 

packages/lib/jobs/definitions/emails/send-team-deleted-email.ts

@@ -1,5 +1,7 @@
 import { z } from 'zod';
 
+import { DocumentVisibility } from '@documenso/prisma/client';
+
 import { sendTeamDeleteEmail } from '../../../server-only/team/delete-team';
 import type { JobDefinition } from '../../client/_internal/job';
 
@@ -10,6 +12,19 @@ const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
     name: z.string(),
     url: z.string(),
     ownerUserId: z.number(),
+    teamGlobalSettings: z
+      .object({
+        documentVisibility: z.nativeEnum(DocumentVisibility),
+        documentLanguage: z.string(),
+        includeSenderDetails: z.boolean(),
+        brandingEnabled: z.boolean(),
+        brandingLogo: z.string(),
+        brandingUrl: z.string(),
+        brandingCompanyDetails: z.string(),
+        brandingHidePoweredBy: z.boolean(),
+        teamId: z.number(),
+      })
+      .nullish(),
   }),
   members: z.array(
     z.object({
@@ -35,8 +50,7 @@ export const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION = {
       await io.runTask(`send-team-deleted-email--${team.url}_${member.id}`, async () => {
         await sendTeamDeleteEmail({
           email: member.email,
-          teamName: team.name,
-          teamUrl: team.url,
+          team,
           isOwner: member.id === team.ownerUserId,
         });
       });

packages/lib/jobs/definitions/emails/send-team-member-joined-email.ts

@@ -1,13 +1,18 @@
+import { createElement } from 'react';
+
+import { msg } from '@lingui/macro';
 import { z } from 'zod';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import TeamJoinEmailTemplate from '@documenso/email/templates/team-join';
 import { prisma } from '@documenso/prisma';
 import { TeamMemberRole } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../../client-only/providers/i18n.server';
 import { WEBAPP_BASE_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobDefinition } from '../../client/_internal/job';
 
 const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID = 'send.team-member-joined.email';
@@ -41,6 +46,7 @@ export const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION = {
             user: true,
           },
         },
+        teamGlobalSettings: true,
       },
     });
 
@@ -62,7 +68,7 @@ export const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION = {
       await io.runTask(
         `send-team-member-joined-email--${invitedMember.id}_${member.id}`,
         async () => {
-          const emailContent = TeamJoinEmailTemplate({
+          const emailContent = createElement(TeamJoinEmailTemplate, {
             assetBaseUrl: WEBAPP_BASE_URL,
             baseUrl: WEBAPP_BASE_URL,
             memberName: invitedMember.user.name || '',
@@ -71,15 +77,36 @@ export const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION = {
             teamUrl: team.url,
           });
 
+          const branding = team.teamGlobalSettings
+            ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+            : undefined;
+
+          const lang = team.teamGlobalSettings?.documentLanguage;
+
+          // !: Replace with the actual language of the recipient later
+          const [html, text] = await Promise.all([
+            renderEmailWithI18N(emailContent, {
+              lang,
+              branding,
+            }),
+            renderEmailWithI18N(emailContent, {
+              lang,
+              branding,
+              plainText: true,
+            }),
+          ]);
+
+          const i18n = await getI18nInstance(lang);
+
           await mailer.sendMail({
             to: member.user.email,
             from: {
               name: FROM_NAME,
               address: FROM_ADDRESS,
             },
-            subject: 'A new member has joined your team',
-            html: render(emailContent),
-            text: render(emailContent, { plainText: true }),
+            subject: i18n._(msg`A new member has joined your team`),
+            html,
+            text,
           });
         },
       );

packages/lib/jobs/definitions/emails/send-team-member-left-email.ts

@@ -1,13 +1,18 @@
+import { createElement } from 'react';
+
+import { msg } from '@lingui/macro';
 import { z } from 'zod';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import TeamJoinEmailTemplate from '@documenso/email/templates/team-join';
 import { prisma } from '@documenso/prisma';
 import { TeamMemberRole } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../../client-only/providers/i18n.server';
 import { WEBAPP_BASE_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobDefinition } from '../../client/_internal/job';
 
 const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID = 'send.team-member-left.email';
@@ -41,6 +46,7 @@ export const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION = {
             user: true,
           },
         },
+        teamGlobalSettings: true,
       },
     });
 
@@ -52,7 +58,7 @@ export const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION = {
 
     for (const member of team.members) {
       await io.runTask(`send-team-member-left-email--${oldMember.id}_${member.id}`, async () => {
-        const emailContent = TeamJoinEmailTemplate({
+        const emailContent = createElement(TeamJoinEmailTemplate, {
           assetBaseUrl: WEBAPP_BASE_URL,
           baseUrl: WEBAPP_BASE_URL,
           memberName: oldMember.name || '',
@@ -61,15 +67,35 @@ export const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION = {
           teamUrl: team.url,
         });
 
+        const branding = team.teamGlobalSettings
+          ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+          : undefined;
+
+        const lang = team.teamGlobalSettings?.documentLanguage;
+
+        const [html, text] = await Promise.all([
+          renderEmailWithI18N(emailContent, {
+            lang,
+            branding,
+          }),
+          renderEmailWithI18N(emailContent, {
+            lang,
+            branding,
+            plainText: true,
+          }),
+        ]);
+
+        const i18n = await getI18nInstance(lang);
+
         await mailer.sendMail({
           to: member.user.email,
           from: {
             name: FROM_NAME,
             address: FROM_ADDRESS,
           },
-          subject: `A team member has left ${team.name}`,
-          html: render(emailContent),
-          text: render(emailContent, { plainText: true }),
+          subject: i18n._(msg`A team member has left ${team.name}`),
+          html,
+          text,
         });
       });
     }

packages/lib/package.json

@@ -25,6 +25,9 @@
     "@documenso/email": "*",
     "@documenso/prisma": "*",
     "@documenso/signing": "*",
+    "@lingui/core": "^4.11.3",
+    "@lingui/macro": "^4.11.3",
+    "@lingui/react": "^4.11.3",
     "@next-auth/prisma-adapter": "1.0.7",
     "@noble/ciphers": "0.4.0",
     "@noble/hashes": "1.3.2",

packages/lib/server-only/admin/get-recipients-stats.ts

@@ -13,6 +13,7 @@ export const getRecipientsStats = async () => {
     [ReadStatus.NOT_OPENED]: 0,
     [SigningStatus.SIGNED]: 0,
     [SigningStatus.NOT_SIGNED]: 0,
+    [SigningStatus.REJECTED]: 0,
     [SendStatus.SENT]: 0,
     [SendStatus.NOT_SENT]: 0,
   };

packages/lib/server-only/auth/send-confirmation-email.ts

@@ -1,11 +1,14 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { ConfirmEmailTemplate } from '@documenso/email/templates/confirm-email';
 import { prisma } from '@documenso/prisma';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 
 export interface SendConfirmationEmailProps {
   userId: number;
@@ -45,6 +48,13 @@ export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailPro
     confirmationLink,
   });
 
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(confirmationTemplate),
+    renderEmailWithI18N(confirmationTemplate, { plainText: true }),
+  ]);
+
+  const i18n = await getI18nInstance();
+
   return mailer.sendMail({
     to: {
       address: user.email,
@@ -54,8 +64,8 @@ export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailPro
       name: senderName,
       address: senderAddress,
     },
-    subject: 'Please confirm your email',
-    html: render(confirmationTemplate),
-    text: render(confirmationTemplate, { plainText: true }),
+    subject: i18n._(msg`Please confirm your email`),
+    html,
+    text,
   });
 };

packages/lib/server-only/auth/send-forgot-password.ts

@@ -1,11 +1,14 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { ForgotPasswordTemplate } from '@documenso/email/templates/forgot-password';
 import { prisma } from '@documenso/prisma';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 
 export interface SendForgotPasswordOptions {
   userId: number;
@@ -39,6 +42,13 @@ export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions)
     resetPasswordLink,
   });
 
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template),
+    renderEmailWithI18N(template, { plainText: true }),
+  ]);
+
+  const i18n = await getI18nInstance();
+
   return await mailer.sendMail({
     to: {
       address: user.email,
@@ -48,8 +58,8 @@ export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions)
       name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
       address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
     },
-    subject: 'Forgot Password?',
-    html: render(template),
-    text: render(template, { plainText: true }),
+    subject: i18n._(msg`Forgot Password?`),
+    html,
+    text,
   });
 };

packages/lib/server-only/auth/send-reset-password.ts

@@ -1,11 +1,11 @@
 import { createElement } from 'react';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { ResetPasswordTemplate } from '@documenso/email/templates/reset-password';
 import { prisma } from '@documenso/prisma';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 
 export interface SendResetPasswordOptions {
   userId: number;
@@ -26,6 +26,11 @@ export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) =>
     userName: user.name || '',
   });
 
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template),
+    renderEmailWithI18N(template, { plainText: true }),
+  ]);
+
   return await mailer.sendMail({
     to: {
       address: user.email,
@@ -36,7 +41,7 @@ export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) =>
       address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
     },
     subject: 'Password Reset Success!',
-    html: render(template),
-    text: render(template, { plainText: true }),
+    html,
+    text,
   });
 };

packages/lib/server-only/document-meta/upsert-document-meta.ts

@@ -7,7 +7,10 @@ import {
   diffDocumentMetaChanges,
 } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
-import type { DocumentSigningOrder } from '@documenso/prisma/client';
+import type { DocumentDistributionMethod, DocumentSigningOrder } from '@documenso/prisma/client';
+
+import type { SupportedLanguageCodes } from '../../constants/i18n';
+import type { TDocumentEmailSettings } from '../../types/document-email';
 
 export type CreateDocumentMetaOptions = {
   documentId: number;
@@ -17,8 +20,11 @@ export type CreateDocumentMetaOptions = {
   password?: string;
   dateFormat?: string;
   redirectUrl?: string;
+  emailSettings?: TDocumentEmailSettings;
   signingOrder?: DocumentSigningOrder;
+  distributionMethod?: DocumentDistributionMethod;
   typedSignatureEnabled?: boolean;
+  language?: SupportedLanguageCodes;
   userId: number;
   requestMetadata: RequestMetadata;
 };
@@ -33,7 +39,10 @@ export const upsertDocumentMeta = async ({
   userId,
   redirectUrl,
   signingOrder,
+  emailSettings,
+  distributionMethod,
   typedSignatureEnabled,
+  language,
   requestMetadata,
 }: CreateDocumentMetaOptions) => {
   const user = await prisma.user.findFirstOrThrow({
@@ -84,7 +93,10 @@ export const upsertDocumentMeta = async ({
         documentId,
         redirectUrl,
         signingOrder,
+        emailSettings,
+        distributionMethod,
         typedSignatureEnabled,
+        language,
       },
       update: {
         subject,
@@ -94,7 +106,10 @@ export const upsertDocumentMeta = async ({
         timezone,
         redirectUrl,
         signingOrder,
+        emailSettings,
+        distributionMethod,
         typedSignatureEnabled,
+        language,
       },
     });
 

packages/lib/server-only/document/create-document.ts

@@ -5,7 +5,9 @@ import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-log
 import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
-import { DocumentSource, WebhookTriggerEvents } from '@documenso/prisma/client';
+import { DocumentSource, DocumentVisibility, WebhookTriggerEvents } from '@documenso/prisma/client';
+import type { Team, TeamGlobalSettings } from '@documenso/prisma/client';
+import { TeamMemberRole } from '@documenso/prisma/client';
 
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
@@ -48,6 +50,51 @@ export const createDocument = async ({
     throw new AppError(AppErrorCode.NOT_FOUND, 'Team not found');
   }
 
+  let team: (Team & { teamGlobalSettings: TeamGlobalSettings | null }) | null = null;
+  let userTeamRole: TeamMemberRole | undefined;
+
+  if (teamId) {
+    const teamWithUserRole = await prisma.team.findFirstOrThrow({
+      where: {
+        id: teamId,
+      },
+      include: {
+        teamGlobalSettings: true,
+        members: {
+          where: {
+            userId: userId,
+          },
+          select: {
+            role: true,
+          },
+        },
+      },
+    });
+
+    team = teamWithUserRole;
+    userTeamRole = teamWithUserRole.members[0]?.role;
+  }
+
+  const determineVisibility = (
+    globalVisibility: DocumentVisibility | null | undefined,
+    userRole: TeamMemberRole,
+  ): DocumentVisibility => {
+    const defaultVisibility = globalVisibility ?? DocumentVisibility.EVERYONE;
+
+    if (userRole === TeamMemberRole.ADMIN) {
+      return defaultVisibility;
+    }
+
+    if (userRole === TeamMemberRole.MANAGER) {
+      if (defaultVisibility === DocumentVisibility.ADMIN) {
+        return DocumentVisibility.MANAGER_AND_ABOVE;
+      }
+      return defaultVisibility;
+    }
+
+    return DocumentVisibility.EVERYONE;
+  };
+
   return await prisma.$transaction(async (tx) => {
     const document = await tx.document.create({
       data: {
@@ -56,8 +103,17 @@ export const createDocument = async ({
         documentDataId,
         userId,
         teamId,
+        visibility: determineVisibility(
+          team?.teamGlobalSettings?.documentVisibility,
+          userTeamRole ?? TeamMemberRole.MEMBER,
+        ),
         formValues,
         source: DocumentSource.DOCUMENT,
+        documentMeta: {
+          create: {
+            language: team?.teamGlobalSettings?.documentLanguage,
+          },
+        },
       },
     });
 

packages/lib/server-only/document/delete-document.ts

@@ -2,18 +2,30 @@
 
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import DocumentCancelTemplate from '@documenso/email/templates/document-cancel';
 import { prisma } from '@documenso/prisma';
-import type { Document, DocumentMeta, Recipient, User } from '@documenso/prisma/client';
+import type {
+  Document,
+  DocumentMeta,
+  Recipient,
+  Team,
+  TeamGlobalSettings,
+  User,
+} from '@documenso/prisma/client';
 import { DocumentStatus, SendStatus } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../constants/email';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 
 export type DeleteDocumentOptions = {
   id: number;
@@ -46,8 +58,9 @@ export const deleteDocument = async ({
       Recipient: true,
       documentMeta: true,
       team: {
-        select: {
+        include: {
           members: true,
+          teamGlobalSettings: true,
         },
       },
     },
@@ -70,6 +83,7 @@ export const deleteDocument = async ({
     await handleDocumentOwnerDelete({
       document,
       user,
+      team: document.team,
       requestMetadata,
     });
   }
@@ -110,6 +124,11 @@ type HandleDocumentOwnerDeleteOptions = {
     Recipient: Recipient[];
     documentMeta: DocumentMeta | null;
   };
+  team?:
+    | (Team & {
+        teamGlobalSettings?: TeamGlobalSettings | null;
+      })
+    | null;
   user: User;
   requestMetadata?: RequestMetadata;
 };
@@ -117,6 +136,7 @@ type HandleDocumentOwnerDeleteOptions = {
 const handleDocumentOwnerDelete = async ({
   document,
   user,
+  team,
   requestMetadata,
 }: HandleDocumentOwnerDeleteOptions) => {
   if (document.deletedAt) {
@@ -175,6 +195,14 @@ const handleDocumentOwnerDelete = async ({
     });
   });
 
+  const isDocumentDeleteEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).documentDeleted;
+
+  if (!isDocumentDeleteEmailEnabled) {
+    return deletedDocument;
+  }
+
   // Send cancellation emails to recipients.
   await Promise.all(
     document.Recipient.map(async (recipient) => {
@@ -191,6 +219,21 @@ const handleDocumentOwnerDelete = async ({
         assetBaseUrl,
       });
 
+      const branding = team?.teamGlobalSettings
+        ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+        : undefined;
+
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+        renderEmailWithI18N(template, {
+          lang: document.documentMeta?.language,
+          branding,
+          plainText: true,
+        }),
+      ]);
+
+      const i18n = await getI18nInstance(document.documentMeta?.language);
+
       await mailer.sendMail({
         to: {
           address: recipient.email,
@@ -200,9 +243,9 @@ const handleDocumentOwnerDelete = async ({
           name: FROM_NAME,
           address: FROM_ADDRESS,
         },
-        subject: 'Document Cancelled',
-        html: render(template),
-        text: render(template, { plainText: true }),
+        subject: i18n._(msg`Document Cancelled`),
+        html,
+        text,
       });
     }),
   );

packages/lib/server-only/document/find-document-audit-logs.ts

@@ -66,6 +66,7 @@ export const findDocumentAuditLogs = async ({
             DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_DELETED,
             DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED,
             DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED,
+            DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED,
             DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SENT,
             DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_MOVED_TO_TEAM,
           ],

packages/lib/server-only/document/find-documents.ts

@@ -3,7 +3,14 @@ import { P, match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
 import { RecipientRole, SigningStatus, TeamMemberRole } from '@documenso/prisma/client';
-import type { Document, Prisma, Team, TeamEmail, User } from '@documenso/prisma/client';
+import type {
+  Document,
+  DocumentSource,
+  Prisma,
+  Team,
+  TeamEmail,
+  User,
+} from '@documenso/prisma/client';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 
 import { DocumentVisibility } from '../../types/document-visibility';
@@ -16,6 +23,8 @@ export type FindDocumentsOptions = {
   userId: number;
   teamId?: number;
   term?: string;
+  templateId?: number;
+  source?: DocumentSource;
   status?: ExtendedDocumentStatus;
   page?: number;
   perPage?: number;
@@ -32,6 +41,8 @@ export const findDocuments = async ({
   userId,
   teamId,
   term,
+  templateId,
+  source,
   status = ExtendedDocumentStatus.ALL,
   page = 1,
   perPage = 10,
@@ -40,44 +51,37 @@ export const findDocuments = async ({
   senderIds,
   search,
 }: FindDocumentsOptions) => {
-  const { user, team } = await prisma.$transaction(async (tx) => {
-    const user = await tx.user.findFirstOrThrow({
+  const user = await prisma.user.findFirstOrThrow({
+    where: {
+      id: userId,
+    },
+  });
+
+  let team = null;
+
+  if (teamId !== undefined) {
+    team = await prisma.team.findFirstOrThrow({
       where: {
-        id: userId,
+        id: teamId,
+        members: {
+          some: {
+            userId,
+          },
+        },
+      },
+      include: {
+        teamEmail: true,
+        members: {
+          where: {
+            userId,
+          },
+          select: {
+            role: true,
+          },
+        },
       },
     });
-
-    let team = null;
-
-    if (teamId !== undefined) {
-      team = await tx.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-        include: {
-          teamEmail: true,
-          members: {
-            where: {
-              userId,
-            },
-            select: {
-              role: true,
-            },
-          },
-        },
-      });
-    }
-
-    return {
-      user,
-      team,
-    };
-  });
+  }
 
   const orderByColumn = orderBy?.column ?? 'createdAt';
   const orderByDirection = orderBy?.direction ?? 'desc';
@@ -120,11 +124,18 @@ export const findDocuments = async ({
       }))
       .otherwise(() => ({ visibility: DocumentVisibility.EVERYONE })),
     {
-      Recipient: {
-        some: {
-          email: user.email,
+      OR: [
+        {
+          Recipient: {
+            some: {
+              email: user.email,
+            },
+          },
         },
-      },
+        {
+          userId: user.id,
+        },
+      ],
     },
   ];
 
@@ -197,8 +208,27 @@ export const findDocuments = async ({
     };
   }
 
+  const whereAndClause: Prisma.DocumentWhereInput['AND'] = [
+    { ...termFilters },
+    { ...filters },
+    { ...deletedFilter },
+    { ...searchFilter },
+  ];
+
+  if (templateId) {
+    whereAndClause.push({
+      templateId,
+    });
+  }
+
+  if (source) {
+    whereAndClause.push({
+      source,
+    });
+  }
+
   const whereClause: Prisma.DocumentWhereInput = {
-    AND: [{ ...termFilters }, { ...filters }, { ...deletedFilter }, { ...searchFilter }],
+    AND: whereAndClause,
   };
 
   if (period) {

packages/lib/server-only/document/get-document-by-id.ts

@@ -143,11 +143,18 @@ export const getDocumentWhereInput = async ({
       ])
       .otherwise(() => [{ visibility: DocumentVisibility.EVERYONE }]),
     {
-      Recipient: {
-        some: {
-          email: user.email,
+      OR: [
+        {
+          Recipient: {
+            some: {
+              email: user.email,
+            },
+          },
         },
-      },
+        {
+          userId: user.id,
+        },
+      ],
     },
   ];
 

packages/lib/server-only/document/get-stats.ts

@@ -6,11 +6,10 @@ import { prisma } from '@documenso/prisma';
 import { TeamMemberRole } from '@documenso/prisma/client';
 import type { Prisma, User } from '@documenso/prisma/client';
 import { SigningStatus } from '@documenso/prisma/client';
+import { DocumentVisibility } from '@documenso/prisma/client';
 import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 
-import { DocumentVisibility } from '../../types/document-visibility';
-
 export type GetStatsInput = {
   user: User;
   team?: Omit<GetTeamCountsOption, 'createdAt'>;
@@ -207,47 +206,45 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
   let notSignedCountsGroupByArgs = null;
   let hasSignedCountsGroupByArgs = null;
 
-  const visibilityFilters = [
-    ...match(options.currentTeamMemberRole)
-      .with(TeamMemberRole.ADMIN, () => [
-        { visibility: DocumentVisibility.EVERYONE },
-        { visibility: DocumentVisibility.MANAGER_AND_ABOVE },
-        { visibility: DocumentVisibility.ADMIN },
-      ])
-      .with(TeamMemberRole.MANAGER, () => [
-        { visibility: DocumentVisibility.EVERYONE },
-        { visibility: DocumentVisibility.MANAGER_AND_ABOVE },
-      ])
-      .otherwise(() => [{ visibility: DocumentVisibility.EVERYONE }]),
-  ];
-
-  ownerCountsWhereInput = {
-    ...ownerCountsWhereInput,
-    OR: [
+  const visibilityFiltersWhereInput: Prisma.DocumentWhereInput = {
+    AND: [
+      { deletedAt: null },
       {
-        AND: [
-          {
-            visibility: {
-              in: visibilityFilters.map((filter) => filter.visibility),
-            },
-          },
-          {
-            Recipient: {
-              none: {
-                email: options.currentUserEmail,
+        OR: [
+          match(options.currentTeamMemberRole)
+            .with(TeamMemberRole.ADMIN, () => ({
+              visibility: {
+                in: [
+                  DocumentVisibility.EVERYONE,
+                  DocumentVisibility.MANAGER_AND_ABOVE,
+                  DocumentVisibility.ADMIN,
+                ],
               },
-            },
+            }))
+            .with(TeamMemberRole.MANAGER, () => ({
+              visibility: {
+                in: [DocumentVisibility.EVERYONE, DocumentVisibility.MANAGER_AND_ABOVE],
+              },
+            }))
+            .otherwise(() => ({
+              visibility: {
+                equals: DocumentVisibility.EVERYONE,
+              },
+            })),
+          {
+            OR: [
+              { userId: options.userId },
+              { Recipient: { some: { email: options.currentUserEmail } } },
+            ],
           },
         ],
       },
-      {
-        Recipient: {
-          some: {
-            email: options.currentUserEmail,
-          },
-        },
-      },
     ],
+  };
+
+  ownerCountsWhereInput = {
+    ...ownerCountsWhereInput,
+    ...visibilityFiltersWhereInput,
     ...searchFilter,
   };
 

packages/lib/server-only/document/reject-document-with-token.ts

@@ -0,0 +1,92 @@
+import { SigningStatus } from '@prisma/client';
+import { TRPCError } from '@trpc/server';
+
+import { jobs } from '@documenso/lib/jobs/client';
+import { prisma } from '@documenso/prisma';
+
+import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
+import type { RequestMetadata } from '../../universal/extract-request-metadata';
+import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+
+export type RejectDocumentWithTokenOptions = {
+  token: string;
+  documentId: number;
+  reason: string;
+  requestMetadata?: RequestMetadata;
+};
+
+export async function rejectDocumentWithToken({
+  token,
+  documentId,
+  reason,
+  requestMetadata,
+}: RejectDocumentWithTokenOptions) {
+  // Find the recipient and document in a single query
+  const recipient = await prisma.recipient.findFirst({
+    where: {
+      token,
+      documentId,
+    },
+    include: {
+      Document: {
+        include: {
+          User: true,
+        },
+      },
+    },
+  });
+
+  const document = recipient?.Document;
+
+  if (!recipient || !document) {
+    throw new TRPCError({
+      code: 'NOT_FOUND',
+      message: 'Document or recipient not found',
+    });
+  }
+
+  // Add the audit log entry before updating the recipient
+
+  // Update the recipient status to rejected
+  const [updatedRecipient] = await prisma.$transaction([
+    prisma.recipient.update({
+      where: {
+        id: recipient.id,
+      },
+      data: {
+        signedAt: new Date(),
+        signingStatus: SigningStatus.REJECTED,
+        rejectionReason: reason,
+      },
+    }),
+    prisma.documentAuditLog.create({
+      data: createDocumentAuditLogData({
+        documentId,
+        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED,
+        user: {
+          name: recipient.name,
+          email: recipient.email,
+        },
+        data: {
+          recipientEmail: recipient.email,
+          recipientName: recipient.name,
+          recipientId: recipient.id,
+          recipientRole: recipient.role,
+          reason,
+        },
+        requestMetadata,
+      }),
+    }),
+  ]);
+
+  // Send email notifications
+  await jobs.triggerJob({
+    name: 'send.signing.rejected.emails',
+    payload: {
+      recipientId: recipient.id,
+      documentId,
+    },
+  });
+
+  return updatedRecipient;
+}

packages/lib/server-only/document/resend-document.tsx

@@ -1,11 +1,12 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
 import {
-  RECIPIENT_ROLES_DESCRIPTION_ENG,
+  RECIPIENT_ROLES_DESCRIPTION,
   RECIPIENT_ROLE_TO_EMAIL_TYPE,
 } from '@documenso/lib/constants/recipient-roles';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
@@ -16,7 +17,11 @@ import { prisma } from '@documenso/prisma';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import type { Prisma } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 import { getDocumentWhereInput } from './get-document-by-id';
 
 export type ResendDocumentOptions = {
@@ -62,6 +67,7 @@ export const resendDocument = async ({
         select: {
           teamEmail: true,
           name: true,
+          teamGlobalSettings: true,
         },
       },
     },
@@ -86,31 +92,50 @@ export const resendDocument = async ({
     throw new Error('Can not send completed document');
   }
 
+  const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).recipientSigningRequest;
+
+  if (!isRecipientSigningRequestEmailEnabled) {
+    return;
+  }
+
   await Promise.all(
     document.Recipient.map(async (recipient) => {
       if (recipient.role === RecipientRole.CC) {
         return;
       }
 
+      const i18n = await getI18nInstance(document.documentMeta?.language);
+
       const recipientEmailType = RECIPIENT_ROLE_TO_EMAIL_TYPE[recipient.role];
 
       const { email, name } = recipient;
       const selfSigner = email === user.email;
 
-      const recipientActionVerb =
-        RECIPIENT_ROLES_DESCRIPTION_ENG[recipient.role].actionVerb.toLowerCase();
+      const recipientActionVerb = i18n
+        ._(RECIPIENT_ROLES_DESCRIPTION[recipient.role].actionVerb)
+        .toLowerCase();
 
       let emailMessage = customEmail?.message || '';
-      let emailSubject = `Reminder: Please ${recipientActionVerb} this document`;
+      let emailSubject = i18n._(msg`Reminder: Please ${recipientActionVerb} this document`);
 
       if (selfSigner) {
-        emailMessage = `You have initiated the document ${`"${document.title}"`} that requires you to ${recipientActionVerb} it.`;
-        emailSubject = `Reminder: Please ${recipientActionVerb} your document`;
+        emailMessage = i18n._(
+          msg`You have initiated the document ${`"${document.title}"`} that requires you to ${recipientActionVerb} it.`,
+        );
+        emailSubject = i18n._(msg`Reminder: Please ${recipientActionVerb} your document`);
       }
 
       if (isTeamDocument && document.team) {
-        emailSubject = `Reminder: ${document.team.name} invited you to ${recipientActionVerb} a document`;
-        emailMessage = `${user.name} on behalf of ${document.team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`;
+        emailSubject = i18n._(
+          msg`Reminder: ${document.team.name} invited you to ${recipientActionVerb} a document`,
+        );
+        emailMessage =
+          customEmail?.message ||
+          i18n._(
+            msg`${user.name} on behalf of ${document.team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`,
+          );
       }
 
       const customEmailTemplate = {
@@ -135,8 +160,24 @@ export const resendDocument = async ({
         teamName: document.team?.name,
       });
 
+      const branding = document.team?.teamGlobalSettings
+        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+        : undefined;
+
       await prisma.$transaction(
         async (tx) => {
+          const [html, text] = await Promise.all([
+            renderEmailWithI18N(template, {
+              lang: document.documentMeta?.language,
+              branding,
+            }),
+            renderEmailWithI18N(template, {
+              lang: document.documentMeta?.language,
+              branding,
+              plainText: true,
+            }),
+          ]);
+
           await mailer.sendMail({
             to: {
               address: email,
@@ -147,10 +188,13 @@ export const resendDocument = async ({
               address: FROM_ADDRESS,
             },
             subject: customEmail?.subject
-              ? renderCustomEmailTemplate(`Reminder: ${customEmail.subject}`, customEmailTemplate)
+              ? renderCustomEmailTemplate(
+                  i18n._(msg`Reminder: ${customEmail.subject}`),
+                  customEmailTemplate,
+                )
               : emailSubject,
-            html: render(template),
-            text: render(template, { plainText: true }),
+            html,
+            text,
           });
 
           await tx.documentAuditLog.create({

packages/lib/server-only/document/seal-document.ts

@@ -10,6 +10,7 @@ import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/
 import { WebhookTriggerEvents } from '@documenso/prisma/client';
 import { signPdf } from '@documenso/signing';
 
+import { ZSupportedLanguageCodeSchema } from '../../constants/i18n';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getFile } from '../../universal/upload/get-file';
 import { putPdfFile } from '../../universal/upload/put-file';
@@ -45,6 +46,7 @@ export const sealDocument = async ({
     },
     include: {
       documentData: true,
+      documentMeta: true,
       Recipient: true,
     },
   });
@@ -90,7 +92,9 @@ export const sealDocument = async ({
   // !: Need to write the fields onto the document as a hard copy
   const pdfData = await getFile(documentData);
 
-  const certificate = await getCertificatePdf({ documentId })
+  const documentLanguage = ZSupportedLanguageCodeSchema.parse(document.documentMeta?.language);
+
+  const certificate = await getCertificatePdf({ documentId, language: documentLanguage })
     .then(async (doc) => PDFDocument.load(doc))
     .catch(() => null);
 

packages/lib/server-only/document/search-documents-with-keyword.ts

@@ -1,6 +1,10 @@
+import { match } from 'ts-pattern';
+
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { prisma } from '@documenso/prisma';
 import { DocumentStatus } from '@documenso/prisma/client';
 import type { Document, Recipient, User } from '@documenso/prisma/client';
+import { DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client';
 
 export type SearchDocumentsWithKeywordOptions = {
   query: string;
@@ -67,10 +71,40 @@ export const searchDocumentsWithKeyword = async ({
           },
           deletedAt: null,
         },
+        {
+          title: {
+            contains: query,
+            mode: 'insensitive',
+          },
+          teamId: {
+            not: null,
+          },
+          team: {
+            members: {
+              some: {
+                userId: userId,
+              },
+            },
+          },
+          deletedAt: null,
+        },
       ],
     },
     include: {
       Recipient: true,
+      team: {
+        select: {
+          url: true,
+          members: {
+            where: {
+              userId: userId,
+            },
+            select: {
+              role: true,
+            },
+          },
+        },
+      },
     },
     orderBy: {
       createdAt: 'desc',
@@ -82,15 +116,48 @@ export const searchDocumentsWithKeyword = async ({
   const getSigningLink = (recipients: Recipient[], user: User) =>
     `/sign/${recipients.find((r) => r.email === user.email)?.token}`;
 
-  const maskedDocuments = documents.map((document) => {
-    const { Recipient, ...documentWithoutRecipient } = document;
+  const maskedDocuments = documents
+    .filter((document) => {
+      if (!document.teamId || isOwner(document, user)) {
+        return true;
+      }
 
-    return {
-      ...documentWithoutRecipient,
-      path: isOwner(document, user) ? `/documents/${document.id}` : getSigningLink(Recipient, user),
-      value: [document.id, document.title, ...document.Recipient.map((r) => r.email)].join(' '),
-    };
-  });
+      const teamMemberRole = document.team?.members[0]?.role;
+
+      if (!teamMemberRole) {
+        return false;
+      }
+
+      const canAccessDocument = match([document.visibility, teamMemberRole])
+        .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
+        .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
+        .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
+        .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
+        .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
+        .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
+        .otherwise(() => false);
+
+      return canAccessDocument;
+    })
+    .map((document) => {
+      const { Recipient, ...documentWithoutRecipient } = document;
+
+      let documentPath;
+
+      if (isOwner(document, user)) {
+        documentPath = `${formatDocumentsPath(document.team?.url)}/${document.id}`;
+      } else if (document.teamId && document.team) {
+        documentPath = `${formatDocumentsPath(document.team.url)}/${document.id}`;
+      } else {
+        documentPath = getSigningLink(Recipient, user);
+      }
+
+      return {
+        ...documentWithoutRecipient,
+        path: documentPath,
+        value: [document.id, document.title, ...document.Recipient.map((r) => r.email)].join(' '),
+      };
+    });
 
   return maskedDocuments;
 };

packages/lib/server-only/document/send-completed-email.ts

@@ -1,17 +1,23 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed';
 import { prisma } from '@documenso/prisma';
 import { DocumentSource } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getFile } from '../../universal/upload/get-file';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { renderCustomEmailTemplate } from '../../utils/render-custom-email-template';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { formatDocumentsPath } from '../../utils/teams';
 
 export interface SendDocumentOptions {
   documentId: number;
@@ -32,6 +38,7 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
         select: {
           id: true,
           url: true,
+          teamGlobalSettings: true,
         },
       },
     },
@@ -53,7 +60,9 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
 
   const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
 
-  let documentOwnerDownloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}/documents/${document.id}`;
+  let documentOwnerDownloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}${formatDocumentsPath(
+    document.team?.url,
+  )}/${document.id}`;
 
   if (document.team?.url) {
     documentOwnerDownloadLink = `${NEXT_PUBLIC_WEBAPP_URL()}/t/${document.team.url}/documents/${
@@ -61,14 +70,36 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
     }`;
   }
 
-  // If the document owner is not a recipient then send the email to them separately
-  if (!document.Recipient.find((recipient) => recipient.email === owner.email)) {
+  const i18n = await getI18nInstance(document.documentMeta?.language);
+
+  const isDocumentCompletedEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).documentCompleted;
+
+  // If the document owner is not a recipient, OR recipient emails are disabled, then send the email to them separately.
+  if (
+    !document.Recipient.find((recipient) => recipient.email === owner.email) ||
+    !isDocumentCompletedEmailEnabled
+  ) {
     const template = createElement(DocumentCompletedEmailTemplate, {
       documentName: document.title,
       assetBaseUrl,
       downloadLink: documentOwnerDownloadLink,
     });
 
+    const branding = document.team?.teamGlobalSettings
+      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+      : undefined;
+
+    const [html, text] = await Promise.all([
+      renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+      renderEmailWithI18N(template, {
+        lang: document.documentMeta?.language,
+        branding,
+        plainText: true,
+      }),
+    ]);
+
     await mailer.sendMail({
       to: [
         {
@@ -80,9 +111,9 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
         name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
         address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
       },
-      subject: 'Signing Complete!',
-      html: render(template),
-      text: render(template, { plainText: true }),
+      subject: i18n._(msg`Signing Complete!`),
+      html,
+      text,
       attachments: [
         {
           filename: document.title.endsWith('.pdf') ? document.title : document.title + '.pdf',
@@ -109,6 +140,10 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
     });
   }
 
+  if (!isDocumentCompletedEmailEnabled) {
+    return;
+  }
+
   await Promise.all(
     document.Recipient.map(async (recipient) => {
       const customEmailTemplate = {
@@ -129,6 +164,19 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
             : undefined,
       });
 
+      const branding = document.team?.teamGlobalSettings
+        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+        : undefined;
+
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+        renderEmailWithI18N(template, {
+          lang: document.documentMeta?.language,
+          branding,
+          plainText: true,
+        }),
+      ]);
+
       await mailer.sendMail({
         to: [
           {
@@ -143,9 +191,9 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
         subject:
           isDirectTemplate && document.documentMeta?.subject
             ? renderCustomEmailTemplate(document.documentMeta.subject, customEmailTemplate)
-            : 'Signing Complete!',
-        html: render(template),
-        text: render(template, { plainText: true }),
+            : i18n._(msg`Signing Complete!`),
+        html,
+        text,
         attachments: [
           {
             filename: document.title.endsWith('.pdf') ? document.title : document.title + '.pdf',

packages/lib/server-only/document/send-delete-email.ts

@@ -1,11 +1,16 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { DocumentSuperDeleteEmailTemplate } from '@documenso/email/templates/document-super-delete';
 import { prisma } from '@documenso/prisma';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 
 export interface SendDeleteEmailOptions {
   documentId: number;
@@ -19,6 +24,12 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
     },
     include: {
       User: true,
+      documentMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -26,6 +37,14 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
     throw new Error('Document not found');
   }
 
+  const isDocumentDeletedEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).documentDeleted;
+
+  if (!isDocumentDeletedEmailEnabled) {
+    return;
+  }
+
   const { email, name } = document.User;
 
   const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
@@ -36,6 +55,21 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
     assetBaseUrl,
   });
 
+  const branding = document.team?.teamGlobalSettings
+    ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+    : undefined;
+
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+    renderEmailWithI18N(template, {
+      lang: document.documentMeta?.language,
+      branding,
+      plainText: true,
+    }),
+  ]);
+
+  const i18n = await getI18nInstance();
+
   await mailer.sendMail({
     to: {
       address: email,
@@ -45,8 +79,8 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
       name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
       address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
     },
-    subject: 'Document Deleted!',
-    html: render(template),
-    text: render(template, { plainText: true }),
+    subject: i18n._(msg`Document Deleted!`),
+    html,
+    text,
   });
 };

packages/lib/server-only/document/send-document.tsx

@@ -13,6 +13,7 @@ import {
 import { WebhookTriggerEvents } from '@documenso/prisma/client';
 
 import { jobs } from '../../jobs/client';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { getFile } from '../../universal/upload/get-file';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@@ -29,7 +30,7 @@ export const sendDocument = async ({
   documentId,
   userId,
   teamId,
-  sendEmail = true,
+  sendEmail,
   requestMetadata,
 }: SendDocumentOptions) => {
   const user = await prisma.user.findFirstOrThrow({
@@ -156,7 +157,14 @@ export const sendDocument = async ({
   //   throw new Error('Some signers have not been assigned a signature field.');
   // }
 
-  if (sendEmail) {
+  const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).recipientSigningRequest;
+
+  // Only send email if one of the following is true:
+  // - It is explicitly set
+  // - The email is enabled for signing requests AND sendEmail is undefined
+  if (sendEmail || (isRecipientSigningRequestEmailEnabled && sendEmail === undefined)) {
     await Promise.all(
       recipientsToNotify.map(async (recipient) => {
         if (recipient.sendStatus === SendStatus.SENT || recipient.role === RecipientRole.CC) {

packages/lib/server-only/document/send-pending-email.ts

@@ -1,11 +1,16 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { DocumentPendingEmailTemplate } from '@documenso/email/templates/document-pending';
 import { prisma } from '@documenso/prisma';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 
 export interface SendPendingEmailOptions {
   documentId: number;
@@ -28,6 +33,12 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
           id: recipientId,
         },
       },
+      documentMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -39,6 +50,14 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
     throw new Error('Document has no recipients');
   }
 
+  const isDocumentPendingEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).documentPending;
+
+  if (!isDocumentPendingEmailEnabled) {
+    return;
+  }
+
   const [recipient] = document.Recipient;
 
   const { email, name } = recipient;
@@ -50,6 +69,21 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
     assetBaseUrl,
   });
 
+  const branding = document.team?.teamGlobalSettings
+    ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+    : undefined;
+
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+    renderEmailWithI18N(template, {
+      lang: document.documentMeta?.language,
+      branding,
+      plainText: true,
+    }),
+  ]);
+
+  const i18n = await getI18nInstance(document.documentMeta?.language);
+
   await mailer.sendMail({
     to: {
       address: email,
@@ -59,8 +93,8 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
       name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
       address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
     },
-    subject: 'Waiting for others to complete signing.',
-    html: render(template),
-    text: render(template, { plainText: true }),
+    subject: i18n._(msg`Waiting for others to complete signing.`),
+    html,
+    text,
   });
 };

packages/lib/server-only/document/super-delete-document.ts

@@ -2,17 +2,22 @@
 
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import DocumentCancelTemplate from '@documenso/email/templates/document-cancel';
 import { prisma } from '@documenso/prisma';
 import { DocumentStatus, SendStatus } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../constants/email';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 
 export type SuperDeleteDocumentOptions = {
   id: number;
@@ -28,6 +33,11 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
       Recipient: true,
       documentMeta: true,
       User: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -37,8 +47,16 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
 
   const { status, User: user } = document;
 
+  const isDocumentDeletedEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).documentDeleted;
+
   // if the document is pending, send cancellation emails to all recipients
-  if (status === DocumentStatus.PENDING && document.Recipient.length > 0) {
+  if (
+    status === DocumentStatus.PENDING &&
+    document.Recipient.length > 0 &&
+    isDocumentDeletedEmailEnabled
+  ) {
     await Promise.all(
       document.Recipient.map(async (recipient) => {
         if (recipient.sendStatus !== SendStatus.SENT) {
@@ -53,6 +71,21 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
           assetBaseUrl,
         });
 
+        const branding = document.team?.teamGlobalSettings
+          ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+          : undefined;
+
+        const [html, text] = await Promise.all([
+          renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+          renderEmailWithI18N(template, {
+            lang: document.documentMeta?.language,
+            branding,
+            plainText: true,
+          }),
+        ]);
+
+        const i18n = await getI18nInstance(document.documentMeta?.language);
+
         await mailer.sendMail({
           to: {
             address: recipient.email,
@@ -62,9 +95,9 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
             name: FROM_NAME,
             address: FROM_ADDRESS,
           },
-          subject: 'Document Cancelled',
-          html: render(template),
-          text: render(template, { plainText: true }),
+          subject: i18n._(msg`Document Cancelled`),
+          html,
+          text,
         });
       }),
     );

packages/lib/server-only/document/update-document-settings.ts

@@ -1,13 +1,15 @@
 'use server';
 
+import { match } from 'ts-pattern';
+
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import type { CreateDocumentAuditLogDataResponse } from '@documenso/lib/utils/document-audit-logs';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
-import type { DocumentVisibility } from '@documenso/prisma/client';
-import { DocumentStatus } from '@documenso/prisma/client';
+import { DocumentVisibility } from '@documenso/prisma/client';
+import { DocumentStatus, TeamMemberRole } from '@documenso/prisma/client';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
@@ -20,7 +22,7 @@ export type UpdateDocumentSettingsOptions = {
   data: {
     title?: string;
     externalId?: string | null;
-    visibility?: string | null;
+    visibility?: DocumentVisibility | null;
     globalAccessAuth?: TDocumentAccessAuthTypes | null;
     globalActionAuth?: TDocumentActionAuthTypes | null;
   };
@@ -63,8 +65,62 @@ export const updateDocumentSettings = async ({
             teamId: null,
           }),
     },
+    include: {
+      team: {
+        select: {
+          members: {
+            where: {
+              userId,
+            },
+            select: {
+              role: true,
+            },
+          },
+        },
+      },
+    },
   });
 
+  if (teamId) {
+    const currentUserRole = document.team?.members[0]?.role;
+
+    match(currentUserRole)
+      .with(TeamMemberRole.ADMIN, () => true)
+      .with(TeamMemberRole.MANAGER, () => {
+        const allowedVisibilities: DocumentVisibility[] = [
+          DocumentVisibility.EVERYONE,
+          DocumentVisibility.MANAGER_AND_ABOVE,
+        ];
+
+        if (
+          !allowedVisibilities.includes(document.visibility) ||
+          (data.visibility && !allowedVisibilities.includes(data.visibility))
+        ) {
+          throw new AppError(
+            AppErrorCode.UNAUTHORIZED,
+            'You do not have permission to update the document visibility',
+          );
+        }
+      })
+      .with(TeamMemberRole.MEMBER, () => {
+        if (
+          document.visibility !== DocumentVisibility.EVERYONE ||
+          (data.visibility && data.visibility !== DocumentVisibility.EVERYONE)
+        ) {
+          throw new AppError(
+            AppErrorCode.UNAUTHORIZED,
+            'You do not have permission to update the document visibility',
+          );
+        }
+      })
+      .otherwise(() => {
+        throw new AppError(
+          AppErrorCode.UNAUTHORIZED,
+          'You do not have permission to update the document',
+        );
+      });
+  }
+
   const { documentAuthOption } = extractDocumentAuthMethods({
     documentAuth: document.authOptions,
   });

packages/lib/server-only/htmltopdf/get-certificate-pdf.ts

@@ -2,13 +2,15 @@ import { DateTime } from 'luxon';
 import type { Browser } from 'playwright';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import type { SupportedLanguageCodes } from '../../constants/i18n';
 import { encryptSecondaryData } from '../crypto/encrypt';
 
 export type GetCertificatePdfOptions = {
   documentId: number;
+  language?: SupportedLanguageCodes;
 };
 
-export const getCertificatePdf = async ({ documentId }: GetCertificatePdfOptions) => {
+export const getCertificatePdf = async ({ documentId, language }: GetCertificatePdfOptions) => {
   const { chromium } = await import('playwright');
 
   const encryptedId = encryptSecondaryData({
@@ -32,7 +34,19 @@ export const getCertificatePdf = async ({ documentId }: GetCertificatePdfOptions
     );
   }
 
-  const page = await browser.newPage();
+  const browserContext = await browser.newContext();
+
+  const page = await browserContext.newPage();
+
+  if (language) {
+    await page.context().addCookies([
+      {
+        name: 'language',
+        value: language,
+        url: NEXT_PUBLIC_WEBAPP_URL(),
+      },
+    ]);
+  }
 
   await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/__htmltopdf/certificate?d=${encryptedId}`, {
     waitUntil: 'networkidle',
@@ -43,6 +57,8 @@ export const getCertificatePdf = async ({ documentId }: GetCertificatePdfOptions
     format: 'A4',
   });
 
+  await browserContext.close();
+
   void browser.close();
 
   return result;

packages/lib/server-only/recipient/set-recipients-for-document.ts

@@ -1,8 +1,9 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import RecipientRemovedFromDocumentTemplate from '@documenso/email/templates/recipient-removed-from-document';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import {
@@ -21,10 +22,14 @@ import type { Recipient } from '@documenso/prisma/client';
 import { RecipientRole } from '@documenso/prisma/client';
 import { SendStatus, SigningStatus } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../constants/email';
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { canRecipientBeModified } from '../../utils/recipients';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 
 export interface SetRecipientsForDocumentOptions {
   userId: number;
@@ -62,6 +67,12 @@ export const setRecipientsForDocument = async ({
     },
     include: {
       Field: true,
+      documentMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -276,10 +287,14 @@ export const setRecipientsForDocument = async ({
       });
     });
 
+    const isRecipientRemovedEmailEnabled = extractDerivedDocumentEmailSettings(
+      document.documentMeta,
+    ).recipientRemoved;
+
     // Send emails to deleted recipients.
     await Promise.all(
       removedRecipients.map(async (recipient) => {
-        if (recipient.sendStatus !== SendStatus.SENT) {
+        if (recipient.sendStatus !== SendStatus.SENT || !isRecipientRemovedEmailEnabled) {
           return;
         }
 
@@ -291,6 +306,17 @@ export const setRecipientsForDocument = async ({
           assetBaseUrl,
         });
 
+        const branding = document.team?.teamGlobalSettings
+          ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
+          : undefined;
+
+        const [html, text] = await Promise.all([
+          renderEmailWithI18N(template, { lang: document.documentMeta?.language }),
+          renderEmailWithI18N(template, { lang: document.documentMeta?.language, plainText: true }),
+        ]);
+
+        const i18n = await getI18nInstance(document.documentMeta?.language);
+
         await mailer.sendMail({
           to: {
             address: recipient.email,
@@ -300,9 +326,9 @@ export const setRecipientsForDocument = async ({
             name: FROM_NAME,
             address: FROM_ADDRESS,
           },
-          subject: 'You have been removed from a document',
-          html: render(template),
-          text: render(template, { plainText: true }),
+          subject: i18n._(msg`You have been removed from a document`),
+          html,
+          text,
         });
       }),
     );

packages/lib/server-only/team/accept-team-invitation.ts

@@ -42,7 +42,16 @@ export const acceptTeamInvitation = async ({ userId, teamId }: AcceptTeamInvitat
       });
 
       if (teamMemberInvite.status === TeamMemberInviteStatus.ACCEPTED) {
-        return;
+        const memberExists = await tx.teamMember.findFirst({
+          where: {
+            teamId: teamMemberInvite.teamId,
+            userId: user.id,
+          },
+        });
+
+        if (memberExists) {
+          return;
+        }
       }
 
       const { team } = teamMemberInvite;
@@ -81,7 +90,7 @@ export const acceptTeamInvitation = async ({ userId, teamId }: AcceptTeamInvitat
       await jobs.triggerJob({
         name: 'send.team-member-joined.email',
         payload: {
-          teamId: team.id,
+          teamId: teamMember.teamId,
           memberId: teamMember.id,
         },
       });

packages/lib/server-only/team/create-team-email-verification.ts

@@ -1,9 +1,9 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
 import { z } from 'zod';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { ConfirmTeamEmailTemplate } from '@documenso/email/templates/confirm-team-email';
 import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
@@ -11,8 +11,13 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { createTokenVerification } from '@documenso/lib/utils/token-verification';
 import { prisma } from '@documenso/prisma';
+import type { Team, TeamGlobalSettings } from '@documenso/prisma/client';
 import { Prisma } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+
 export type CreateTeamEmailVerificationOptions = {
   userId: number;
   teamId: number;
@@ -45,6 +50,7 @@ export const createTeamEmailVerification = async ({
           include: {
             teamEmail: true,
             emailVerification: true,
+            teamGlobalSettings: true,
           },
         });
 
@@ -77,7 +83,7 @@ export const createTeamEmailVerification = async ({
           },
         });
 
-        await sendTeamEmailVerificationEmail(data.email, token, team.name, team.url);
+        await sendTeamEmailVerificationEmail(data.email, token, team);
       },
       { timeout: 30_000 },
     );
@@ -109,27 +115,47 @@ export const createTeamEmailVerification = async ({
 export const sendTeamEmailVerificationEmail = async (
   email: string,
   token: string,
-  teamName: string,
-  teamUrl: string,
+  team: Team & {
+    teamGlobalSettings?: TeamGlobalSettings | null;
+  },
 ) => {
   const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
 
   const template = createElement(ConfirmTeamEmailTemplate, {
     assetBaseUrl,
     baseUrl: WEBAPP_BASE_URL,
-    teamName,
-    teamUrl,
+    teamName: team.name,
+    teamUrl: team.url,
     token,
   });
 
+  const branding = team.teamGlobalSettings
+    ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+    : undefined;
+
+  const lang = team.teamGlobalSettings?.documentLanguage;
+
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template, { lang, branding }),
+    renderEmailWithI18N(template, {
+      lang,
+      branding,
+      plainText: true,
+    }),
+  ]);
+
+  const i18n = await getI18nInstance(lang);
+
   await mailer.sendMail({
     to: email,
     from: {
       name: FROM_NAME,
       address: FROM_ADDRESS,
     },
-    subject: `A request to use your email has been initiated by ${teamName} on Documenso`,
-    html: render(template),
-    text: render(template, { plainText: true }),
+    subject: i18n._(
+      msg`A request to use your email has been initiated by ${team.name} on Documenso`,
+    ),
+    html,
+    text,
   });
 };

packages/lib/server-only/team/create-team-member-invites.ts

@@ -1,10 +1,9 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
 import { nanoid } from 'nanoid';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import type { TeamInviteEmailProps } from '@documenso/email/templates/team-invite';
 import { TeamInviteEmailTemplate } from '@documenso/email/templates/team-invite';
 import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
@@ -12,9 +11,14 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
 import { prisma } from '@documenso/prisma';
+import type { Team, TeamGlobalSettings } from '@documenso/prisma/client';
 import { TeamMemberInviteStatus } from '@documenso/prisma/client';
 import type { TCreateTeamMemberInvitesMutationSchema } from '@documenso/trpc/server/team-router/schema';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+
 export type CreateTeamMemberInvitesOptions = {
   userId: number;
   userName: string;
@@ -56,6 +60,7 @@ export const createTeamMemberInvites = async ({
         },
       },
       invites: true,
+      teamGlobalSettings: true,
     },
   });
 
@@ -109,8 +114,7 @@ export const createTeamMemberInvites = async ({
       sendTeamMemberInviteEmail({
         email,
         token,
-        teamName: team.name,
-        teamUrl: team.url,
+        team,
         senderName: userName,
       }),
     ),
@@ -131,8 +135,13 @@ export const createTeamMemberInvites = async ({
   }
 };
 
-type SendTeamMemberInviteEmailOptions = Omit<TeamInviteEmailProps, 'baseUrl' | 'assetBaseUrl'> & {
+type SendTeamMemberInviteEmailOptions = {
   email: string;
+  senderName: string;
+  token: string;
+  team: Team & {
+    teamGlobalSettings?: TeamGlobalSettings | null;
+  };
 };
 
 /**
@@ -140,22 +149,42 @@ type SendTeamMemberInviteEmailOptions = Omit<TeamInviteEmailProps, 'baseUrl' | '
  */
 export const sendTeamMemberInviteEmail = async ({
   email,
-  ...emailTemplateOptions
+  senderName,
+  token,
+  team,
 }: SendTeamMemberInviteEmailOptions) => {
   const template = createElement(TeamInviteEmailTemplate, {
     assetBaseUrl: WEBAPP_BASE_URL,
     baseUrl: WEBAPP_BASE_URL,
-    ...emailTemplateOptions,
+    senderName,
+    token,
+    teamName: team.name,
+    teamUrl: team.url,
   });
 
+  const branding = team.teamGlobalSettings
+    ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+    : undefined;
+
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template, { lang: team.teamGlobalSettings?.documentLanguage, branding }),
+    renderEmailWithI18N(template, {
+      lang: team.teamGlobalSettings?.documentLanguage,
+      branding,
+      plainText: true,
+    }),
+  ]);
+
+  const i18n = await getI18nInstance(team.teamGlobalSettings?.documentLanguage);
+
   await mailer.sendMail({
     to: email,
     from: {
       name: FROM_NAME,
       address: FROM_ADDRESS,
     },
-    subject: `You have been invited to join ${emailTemplateOptions.teamName} on Documenso`,
-    html: render(template),
-    text: render(template, { plainText: true }),
+    subject: i18n._(msg`You have been invited to join ${team.name} on Documenso`),
+    html,
+    text,
   });
 };

packages/lib/server-only/team/delete-team-email.ts

@@ -1,13 +1,18 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { TeamEmailRemovedTemplate } from '@documenso/email/templates/team-email-removed';
 import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
 import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
 import { prisma } from '@documenso/prisma';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+
 export type DeleteTeamEmailOptions = {
   userId: number;
   userEmail: string;
@@ -50,6 +55,7 @@ export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamE
             email: true,
           },
         },
+        teamGlobalSettings: true,
       },
     });
 
@@ -73,6 +79,19 @@ export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamE
       teamUrl: team.url,
     });
 
+    const branding = team.teamGlobalSettings
+      ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+      : undefined;
+
+    const lang = team.teamGlobalSettings?.documentLanguage;
+
+    const [html, text] = await Promise.all([
+      renderEmailWithI18N(template, { lang, branding }),
+      renderEmailWithI18N(template, { lang, branding, plainText: true }),
+    ]);
+
+    const i18n = await getI18nInstance(lang);
+
     await mailer.sendMail({
       to: {
         address: team.owner.email,
@@ -82,9 +101,9 @@ export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamE
         name: FROM_NAME,
         address: FROM_ADDRESS,
       },
-      subject: `Team email has been revoked for ${team.name}`,
-      html: render(template),
-      text: render(template, { plainText: true }),
+      subject: i18n._(msg`Team email has been revoked for ${team.name}`),
+      html,
+      text,
     });
   } catch (e) {
     // Todo: Teams - Alert us.

packages/lib/server-only/team/delete-team.ts

@@ -1,16 +1,20 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import type { TeamDeleteEmailProps } from '@documenso/email/templates/team-delete';
 import { TeamDeleteEmailTemplate } from '@documenso/email/templates/team-delete';
 import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
 import { AppError } from '@documenso/lib/errors/app-error';
 import { stripe } from '@documenso/lib/server-only/stripe';
 import { prisma } from '@documenso/prisma';
+import type { Team, TeamGlobalSettings } from '@documenso/prisma/client';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { jobs } from '../../jobs/client';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 
 export type DeleteTeamOptions = {
   userId: number;
@@ -38,6 +42,7 @@ export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
               },
             },
           },
+          teamGlobalSettings: true,
         },
       });
 
@@ -60,6 +65,7 @@ export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
             name: team.name,
             url: team.url,
             ownerUserId: team.ownerUserId,
+            teamGlobalSettings: team.teamGlobalSettings,
           },
           members: team.members.map((member) => ({
             id: member.user.id,
@@ -80,29 +86,43 @@ export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
   );
 };
 
-type SendTeamDeleteEmailOptions = Omit<TeamDeleteEmailProps, 'baseUrl' | 'assetBaseUrl'> & {
+type SendTeamDeleteEmailOptions = {
   email: string;
-  teamName: string;
+  team: Pick<Team, 'url' | 'name'> & {
+    teamGlobalSettings?: TeamGlobalSettings | null;
+  };
+  isOwner: boolean;
 };
 
-export const sendTeamDeleteEmail = async ({
-  email,
-  ...emailTemplateOptions
-}: SendTeamDeleteEmailOptions) => {
+export const sendTeamDeleteEmail = async ({ email, isOwner, team }: SendTeamDeleteEmailOptions) => {
   const template = createElement(TeamDeleteEmailTemplate, {
     assetBaseUrl: WEBAPP_BASE_URL,
     baseUrl: WEBAPP_BASE_URL,
-    ...emailTemplateOptions,
+    teamUrl: team.url,
+    isOwner,
   });
 
+  const branding = team.teamGlobalSettings
+    ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
+    : undefined;
+
+  const lang = team.teamGlobalSettings?.documentLanguage;
+
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template, { lang, branding }),
+    renderEmailWithI18N(template, { lang, branding, plainText: true }),
+  ]);
+
+  const i18n = await getI18nInstance(lang);
+
   await mailer.sendMail({
     to: email,
     from: {
       name: FROM_NAME,
       address: FROM_ADDRESS,
     },
-    subject: `Team "${emailTemplateOptions.teamName}" has been deleted on Documenso`,
-    html: render(template),
-    text: render(template, { plainText: true }),
+    subject: i18n._(msg`Team "${team.name}" has been deleted on Documenso`),
+    html,
+    text,
   });
 };

packages/lib/server-only/team/get-team.ts

@@ -30,6 +30,7 @@ export const getTeamById = async ({ userId, teamId }: GetTeamByIdOptions) => {
     where: whereFilter,
     include: {
       teamEmail: true,
+      teamGlobalSettings: true,
       members: {
         where: {
           userId,
@@ -89,6 +90,7 @@ export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) =>
         },
       },
       subscription: true,
+      teamGlobalSettings: true,
       members: {
         where: {
           userId,

packages/lib/server-only/team/request-team-ownership-transfer.ts

@@ -1,13 +1,17 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
+
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { TeamTransferRequestTemplate } from '@documenso/email/templates/team-transfer-request';
 import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
 import { createTokenVerification } from '@documenso/lib/utils/token-verification';
 import { prisma } from '@documenso/prisma';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+
 export type RequestTeamOwnershipTransferOptions = {
   /**
    * The ID of the user initiating the transfer.
@@ -93,15 +97,24 @@ export const requestTeamOwnershipTransfer = async ({
         token,
       });
 
+      const [html, text] = await Promise.all([
+        renderEmailWithI18N(template),
+        renderEmailWithI18N(template, { plainText: true }),
+      ]);
+
+      const i18n = await getI18nInstance();
+
       await mailer.sendMail({
         to: newOwnerUser.email,
         from: {
           name: FROM_NAME,
           address: FROM_ADDRESS,
         },
-        subject: `You have been requested to take ownership of team ${team.name} on Documenso`,
-        html: render(template),
-        text: render(template, { plainText: true }),
+        subject: i18n._(
+          msg`You have been requested to take ownership of team ${team.name} on Documenso`,
+        ),
+        html,
+        text,
       });
     },
     { timeout: 30_000 },

packages/lib/server-only/team/resend-team-email-verification.ts

@@ -33,6 +33,7 @@ export const resendTeamEmailVerification = async ({
         },
         include: {
           emailVerification: true,
+          teamGlobalSettings: true,
         },
       });
 
@@ -61,7 +62,7 @@ export const resendTeamEmailVerification = async ({
         },
       });
 
-      await sendTeamEmailVerificationEmail(emailVerification.email, token, team.name, team.url);
+      await sendTeamEmailVerificationEmail(emailVerification.email, token, team);
     },
     { timeout: 30_000 },
   );

packages/lib/server-only/team/resend-team-member-invitation.ts

@@ -49,6 +49,9 @@ export const resendTeamMemberInvitation = async ({
             },
           },
         },
+        include: {
+          teamGlobalSettings: true,
+        },
       });
 
       if (!team) {
@@ -69,9 +72,8 @@ export const resendTeamMemberInvitation = async ({
       await sendTeamMemberInviteEmail({
         email: teamMemberInvite.email,
         token: teamMemberInvite.token,
-        teamName: team.name,
-        teamUrl: team.url,
         senderName: userName,
+        team,
       });
     },
     { timeout: 30_000 },

packages/lib/server-only/team/update-team-branding-settings.ts

@@ -0,0 +1,52 @@
+import { prisma } from '@documenso/prisma';
+import { TeamMemberRole } from '@documenso/prisma/client';
+
+export type UpdateTeamBrandingSettingsOptions = {
+  userId: number;
+  teamId: number;
+
+  settings: {
+    brandingEnabled: boolean;
+    brandingLogo: string;
+    brandingUrl: string;
+    brandingCompanyDetails: string;
+  };
+};
+
+export const updateTeamBrandingSettings = async ({
+  userId,
+  teamId,
+  settings,
+}: UpdateTeamBrandingSettingsOptions) => {
+  const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = settings;
+
+  const member = await prisma.teamMember.findFirst({
+    where: {
+      userId,
+      teamId,
+    },
+  });
+
+  if (!member || member.role !== TeamMemberRole.ADMIN) {
+    throw new Error('You do not have permission to update this team.');
+  }
+
+  return await prisma.teamGlobalSettings.upsert({
+    where: {
+      teamId,
+    },
+    create: {
+      teamId,
+      brandingEnabled,
+      brandingLogo,
+      brandingUrl,
+      brandingCompanyDetails,
+    },
+    update: {
+      brandingEnabled,
+      brandingLogo,
+      brandingUrl,
+      brandingCompanyDetails,
+    },
+  });
+};

packages/lib/server-only/team/update-team-document-settings.ts

@@ -0,0 +1,52 @@
+import { prisma } from '@documenso/prisma';
+import type { DocumentVisibility } from '@documenso/prisma/client';
+import { TeamMemberRole } from '@documenso/prisma/client';
+
+import type { SupportedLanguageCodes } from '../../constants/i18n';
+
+export type UpdateTeamDocumentSettingsOptions = {
+  userId: number;
+  teamId: number;
+
+  settings: {
+    documentVisibility: DocumentVisibility;
+    documentLanguage: SupportedLanguageCodes;
+    includeSenderDetails: boolean;
+  };
+};
+
+export const updateTeamDocumentSettings = async ({
+  userId,
+  teamId,
+  settings,
+}: UpdateTeamDocumentSettingsOptions) => {
+  const { documentVisibility, documentLanguage, includeSenderDetails } = settings;
+
+  const member = await prisma.teamMember.findFirst({
+    where: {
+      userId,
+      teamId,
+    },
+  });
+
+  if (!member || member.role !== TeamMemberRole.ADMIN) {
+    throw new Error('You do not have permission to update this team.');
+  }
+
+  return await prisma.teamGlobalSettings.upsert({
+    where: {
+      teamId,
+    },
+    create: {
+      teamId,
+      documentVisibility,
+      documentLanguage,
+      includeSenderDetails,
+    },
+    update: {
+      documentVisibility,
+      documentLanguage,
+      includeSenderDetails,
+    },
+  });
+};

packages/lib/server-only/team/update-team.ts

@@ -4,6 +4,7 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { prisma } from '@documenso/prisma';
 import { Prisma } from '@documenso/prisma/client';
+import type { DocumentVisibility } from '@documenso/prisma/client';
 
 export type UpdateTeamOptions = {
   userId: number;
@@ -11,6 +12,8 @@ export type UpdateTeamOptions = {
   data: {
     name?: string;
     url?: string;
+    documentVisibility?: DocumentVisibility;
+    includeSenderDetails?: boolean;
   };
 };
 
@@ -42,6 +45,18 @@ export const updateTeam = async ({ userId, teamId, data }: UpdateTeamOptions) =>
         data: {
           url: data.url,
           name: data.name,
+          teamGlobalSettings: {
+            upsert: {
+              create: {
+                documentVisibility: data.documentVisibility,
+                includeSenderDetails: data.includeSenderDetails,
+              },
+              update: {
+                documentVisibility: data.documentVisibility,
+                includeSenderDetails: data.includeSenderDetails,
+              },
+            },
+          },
         },
       });
 

packages/lib/server-only/template/create-document-from-direct-template.ts

@@ -1,15 +1,16 @@
 import { createElement } from 'react';
 
+import { msg } from '@lingui/macro';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';
 
 import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
 import { DocumentCreatedFromDirectTemplateEmailTemplate } from '@documenso/email/templates/document-created-from-direct-template';
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 import type { Field, Signature } from '@documenso/prisma/client';
 import {
+  DocumentSigningOrder,
   DocumentSource,
   DocumentStatus,
   FieldType,
@@ -21,6 +22,7 @@ import {
 } from '@documenso/prisma/client';
 import type { TSignFieldWithTokenMutationSchema } from '@documenso/trpc/server/field-router/schema';
 
+import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '../../constants/date-formats';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '../../constants/time-zones';
@@ -37,6 +39,8 @@ import {
   createRecipientAuthOptions,
   extractDocumentAuthMethods,
 } from '../../utils/document-auth';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 import { formatDocumentsPath } from '../../utils/teams';
 import { sendDocument } from '../document/send-document';
 import { validateFieldAuth } from '../document/validate-field-auth';
@@ -88,6 +92,11 @@ export const createDocumentFromDirectTemplate = async ({
       templateDocumentData: true,
       templateMeta: true,
       User: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -142,6 +151,9 @@ export const createDocumentFromDirectTemplate = async ({
   const metaDateFormat = template.templateMeta?.dateFormat || DEFAULT_DOCUMENT_DATE_FORMAT;
   const metaEmailMessage = template.templateMeta?.message || '';
   const metaEmailSubject = template.templateMeta?.subject || '';
+  const metaLanguage =
+    template.templateMeta?.language ?? template.team?.teamGlobalSettings?.documentLanguage;
+  const metaSigningOrder = template.templateMeta?.signingOrder || DocumentSigningOrder.PARALLEL;
 
   // Associate, validate and map to a query every direct template recipient field with the provided fields.
   const createDirectRecipientFieldArgs = await Promise.all(
@@ -232,6 +244,7 @@ export const createDocumentFromDirectTemplate = async ({
         createdAt: initialRequestTime,
         status: DocumentStatus.PENDING,
         externalId: directTemplateExternalId,
+        visibility: template.team?.teamGlobalSettings?.documentVisibility,
         documentDataId: documentData.id,
         authOptions: createDocumentAuthOptions({
           globalAccessAuth: templateAuthOptions.globalAccessAuth,
@@ -256,6 +269,7 @@ export const createDocumentFromDirectTemplate = async ({
                   recipient.role === RecipientRole.CC
                     ? SigningStatus.SIGNED
                     : SigningStatus.NOT_SIGNED,
+                signingOrder: recipient.signingOrder,
                 token: nanoid(),
               };
             }),
@@ -267,6 +281,9 @@ export const createDocumentFromDirectTemplate = async ({
             dateFormat: metaDateFormat,
             message: metaEmailMessage,
             subject: metaEmailSubject,
+            language: metaLanguage,
+            signingOrder: metaSigningOrder,
+            distributionMethod: template.templateMeta?.distributionMethod,
           },
         },
       },
@@ -330,6 +347,7 @@ export const createDocumentFromDirectTemplate = async ({
         signingStatus: SigningStatus.SIGNED,
         sendStatus: SendStatus.SENT,
         signedAt: initialRequestTime,
+        signingOrder: directTemplateRecipient.signingOrder,
         Field: {
           createMany: {
             data: directTemplateNonSignatureFields.map(({ templateField, customText }) => ({
@@ -524,6 +542,17 @@ export const createDocumentFromDirectTemplate = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000',
     });
 
+    const branding = template.team?.teamGlobalSettings
+      ? teamGlobalSettingsToBranding(template.team.teamGlobalSettings)
+      : undefined;
+
+    const [html, text] = await Promise.all([
+      renderEmailWithI18N(emailTemplate, { lang: metaLanguage, branding }),
+      renderEmailWithI18N(emailTemplate, { lang: metaLanguage, branding, plainText: true }),
+    ]);
+
+    const i18n = await getI18nInstance(metaLanguage);
+
     await mailer.sendMail({
       to: [
         {
@@ -535,9 +564,9 @@ export const createDocumentFromDirectTemplate = async ({
         name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
         address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
       },
-      subject: 'Document created from direct template',
-      html: render(emailTemplate),
-      text: render(emailTemplate, { plainText: true }),
+      subject: i18n._(msg`Document created from direct template`),
+      html,
+      text,
     });
 
     return {

packages/lib/server-only/template/create-document-from-template-legacy.ts

@@ -46,6 +46,12 @@ export const createDocumentFromTemplateLegacy = async ({
       Recipient: true,
       Field: true,
       templateDocumentData: true,
+      templateMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -68,6 +74,7 @@ export const createDocumentFromTemplateLegacy = async ({
       userId,
       teamId: template.teamId,
       title: template.title,
+      visibility: template.team?.teamGlobalSettings?.documentVisibility,
       documentDataId: documentData.id,
       Recipient: {
         create: template.Recipient.map((recipient) => ({
@@ -78,6 +85,18 @@ export const createDocumentFromTemplateLegacy = async ({
           token: nanoid(),
         })),
       },
+      documentMeta: {
+        create: {
+          subject: template.templateMeta?.subject,
+          message: template.templateMeta?.message,
+          timezone: template.templateMeta?.timezone,
+          dateFormat: template.templateMeta?.dateFormat,
+          redirectUrl: template.templateMeta?.redirectUrl,
+          signingOrder: template.templateMeta?.signingOrder ?? undefined,
+          language:
+            template.templateMeta?.language || template.team?.teamGlobalSettings?.documentLanguage,
+        },
+      },
     },
 
     include: {

packages/lib/server-only/template/create-document-from-template.ts

@@ -1,5 +1,6 @@
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
+import type { DocumentDistributionMethod } from '@documenso/prisma/client';
 import {
   DocumentSigningOrder,
   DocumentSource,
@@ -11,6 +12,7 @@ import {
   WebhookTriggerEvents,
 } from '@documenso/prisma/client';
 
+import type { SupportedLanguageCodes } from '../../constants/i18n';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import { ZRecipientAuthOptionsSchema } from '../../types/document-auth';
@@ -24,7 +26,10 @@ import {
 } from '../../utils/document-auth';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
-type FinalRecipient = Pick<Recipient, 'name' | 'email' | 'role' | 'authOptions'> & {
+type FinalRecipient = Pick<
+  Recipient,
+  'name' | 'email' | 'role' | 'authOptions' | 'signingOrder'
+> & {
   templateRecipientId: number;
   fields: Field[];
 };
@@ -57,6 +62,8 @@ export type CreateDocumentFromTemplateOptions = {
     dateFormat?: string;
     redirectUrl?: string;
     signingOrder?: DocumentSigningOrder;
+    language?: SupportedLanguageCodes;
+    distributionMethod?: DocumentDistributionMethod;
   };
   requestMetadata?: RequestMetadata;
 };
@@ -103,6 +110,11 @@ export const createDocumentFromTemplate = async ({
       },
       templateDocumentData: true,
       templateMeta: true,
+      team: {
+        include: {
+          teamGlobalSettings: true,
+        },
+      },
     },
   });
 
@@ -164,6 +176,7 @@ export const createDocumentFromTemplate = async ({
           globalAccessAuth: templateAuthOptions.globalAccessAuth,
           globalActionAuth: templateAuthOptions.globalActionAuth,
         }),
+        visibility: template.team?.teamGlobalSettings?.documentVisibility,
         documentMeta: {
           create: {
             subject: override?.subject || template.templateMeta?.subject,
@@ -172,10 +185,17 @@ export const createDocumentFromTemplate = async ({
             password: override?.password || template.templateMeta?.password,
             dateFormat: override?.dateFormat || template.templateMeta?.dateFormat,
             redirectUrl: override?.redirectUrl || template.templateMeta?.redirectUrl,
+            distributionMethod:
+              override?.distributionMethod || template.templateMeta?.distributionMethod,
+            emailSettings: template.templateMeta?.emailSettings || undefined,
             signingOrder:
               override?.signingOrder ||
               template.templateMeta?.signingOrder ||
               DocumentSigningOrder.PARALLEL,
+            language:
+              override?.language ||
+              template.templateMeta?.language ||
+              template.team?.teamGlobalSettings?.documentLanguage,
           },
         },
         Recipient: {
@@ -197,6 +217,7 @@ export const createDocumentFromTemplate = async ({
                   recipient.role === RecipientRole.CC
                     ? SigningStatus.SIGNED
                     : SigningStatus.NOT_SIGNED,
+                signingOrder: recipient.signingOrder,
                 token: nanoid(),
               };
             }),

packages/lib/server-only/template/duplicate-template.ts

@@ -1,3 +1,5 @@
+import { omit } from 'remeda';
+
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 import type { Prisma } from '@documenso/prisma/client';
@@ -38,6 +40,7 @@ export const duplicateTemplate = async ({
       Recipient: true,
       Field: true,
       templateDocumentData: true,
+      templateMeta: true,
     },
   });
 
@@ -53,6 +56,17 @@ export const duplicateTemplate = async ({
     },
   });
 
+  let templateMeta: Prisma.TemplateCreateArgs['data']['templateMeta'] | undefined = undefined;
+
+  if (template.templateMeta) {
+    templateMeta = {
+      create: {
+        ...omit(template.templateMeta, ['id', 'templateId']),
+        emailSettings: template.templateMeta.emailSettings || undefined,
+      },
+    };
+  }
+
   const duplicatedTemplate = await prisma.template.create({
     data: {
       userId,
@@ -66,8 +80,8 @@ export const duplicateTemplate = async ({
           token: nanoid(),
         })),
       },
+      templateMeta,
     },
-
     include: {
       Recipient: true,
     },