Merge branch 'archive/nextjs' into feat/customize-doc-audit-log-certificate

Fix optional fields blocking the signature process in embeds

README.md

@@ -1,4 +1,4 @@
-> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="documen.so/sign-everywhere">The Platform Plan</a>!
+> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="https://documen.so/sign-everywhere">The Platform Plan</a>!
 
 <a href="https://www.producthunt.com/posts/documenso-platform-plan?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso&#0045;platform&#0045;plan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=670576&theme=light" alt="Documenso&#0032;Platform&#0032;Plan - Whitelabeled&#0032;signing&#0032;flows&#0032;in&#0032;your&#0032;product | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 

apps/documentation/pages/developers/embedding/_meta.json

@@ -6,5 +6,6 @@
   "solid": "Solid Integration",
   "preact": "Preact Integration",
   "angular": "Angular Integration",
-  "css-variables": "CSS Variables"
+  "css-variables": "CSS Variables",
+  "web-components": "Web Components"
 }

apps/documentation/pages/developers/embedding/index.mdx

@@ -52,9 +52,9 @@ Platform customers have access to advanced styling options to customize the embe
 <EmbedDirectTemplate
   token={token}
   cssVars={{
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
+    primary: '#0000FF',
+    background: '#F5F5F5',
+    radius: '8px',
   }}
 />
 ```
@@ -73,14 +73,15 @@ These customization options are available for both Direct Templates and Signing
 
 We support embedding across a range of popular JavaScript frameworks, including:
 
-| Framework | Package                                                                            |
-| --------- | ---------------------------------------------------------------------------------- |
-| React     | [@documenso/embed-react](https://www.npmjs.com/package/@documenso/embed-react)     |
-| Preact    | [@documenso/embed-preact](https://www.npmjs.com/package/@documenso/embed-preact)   |
-| Vue       | [@documenso/embed-vue](https://www.npmjs.com/package/@documenso/embed-vue)         |
-| Svelte    | [@documenso/embed-svelte](https://www.npmjs.com/package/@documenso/embed-svelte)   |
-| Solid     | [@documenso/embed-solid](https://www.npmjs.com/package/@documenso/embed-solid)     |
-| Angular   | [@documenso/embed-angular](https://www.npmjs.com/package/@documenso/embed-angular) |
+| Framework        | Package                                                                                      |
+| ---------        | ----------------------------------------------------------------------------------           |
+| React            | [@documenso/embed-react](https://www.npmjs.com/package/@documenso/embed-react)               |
+| Preact           | [@documenso/embed-preact](https://www.npmjs.com/package/@documenso/embed-preact)             |
+| Vue              | [@documenso/embed-vue](https://www.npmjs.com/package/@documenso/embed-vue)                   |
+| Svelte           | [@documenso/embed-svelte](https://www.npmjs.com/package/@documenso/embed-svelte)             |
+| Solid            | [@documenso/embed-solid](https://www.npmjs.com/package/@documenso/embed-solid)               |
+| Angular          | [@documenso/embed-angular](https://www.npmjs.com/package/@documenso/embed-angular)           |
+| Web Components   | [@documenso/embed-webcomponent](https://www.npmjs.com/package/@documenso/embed-webcomponent) |
 
 Additionally, we provide **web components** for more generalized use. However, please note that web components are still in their early stages and haven't been extensively tested.
 
@@ -166,6 +167,7 @@ Once you've obtained the appropriate tokens, you can integrate the signing exper
 - [Svelte](/developers/embedding/svelte)
 - [Solid](/developers/embedding/solid)
 - [Angular](/developers/embedding/angular)
+- [Web Components](/developers/embedding/web-components)
 
 If you're using **web components**, the integration process is slightly different. Keep in mind that web components are currently less tested but can still provide flexibility for general use cases.
 
@@ -177,4 +179,5 @@ If you're using **web components**, the integration process is slightly differen
 - [Solid Integration](/developers/embedding/solid)
 - [Preact Integration](/developers/embedding/preact)
 - [Angular Integration](/developers/embedding/angular)
+- [Web Components](/developers/embedding/web-components)
 - [CSS Variables](/developers/embedding/css-variables)

apps/documentation/pages/developers/embedding/preact.mdx

@@ -95,9 +95,9 @@ const MyEmbeddingComponent = () => {
     }
   `;
   const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
+    primary: '#0000FF',
+    background: '#F5F5F5',
+    radius: '8px',
   };
 
   return (

apps/documentation/pages/developers/embedding/react.mdx

@@ -99,9 +99,9 @@ const MyEmbeddingComponent = () => {
       `}
       // CSS Variables
       cssVars={{
-        colorPrimary: '#0000FF',
-        colorBackground: '#F5F5F5',
-        borderRadius: '8px',
+        primary: '#0000FF',
+        background: '#F5F5F5',
+        radius: '8px',
       }}
       // Dark Mode Control
       darkModeDisabled={true}

apps/documentation/pages/developers/embedding/solid.mdx

@@ -95,9 +95,9 @@ const MyEmbeddingComponent = () => {
     }
   `;
   const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
+    primary: '#0000FF',
+    background: '#F5F5F5',
+    radius: '8px',
   };
 
   return (

apps/documentation/pages/developers/embedding/svelte.mdx

@@ -97,9 +97,9 @@ Platform customers have access to advanced styling options:
     }
   `;
   const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
+    primary: '#0000FF',
+    background: '#F5F5F5',
+    radius: '8px',
   };
 </script>
 

apps/documentation/pages/developers/embedding/vue.mdx

@@ -97,9 +97,9 @@ Platform customers have access to advanced styling options:
   }
 `;
   const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
+    primary: '#0000FF',
+    background: '#F5F5F5',
+    radius: '8px',
   };
 </script>
 

apps/documentation/pages/developers/embedding/web-components.mdx

@@ -0,0 +1,89 @@
+---
+title: Web Components Integration
+description: Learn how to use our embedding SDK via Web Components on a framework-less web application.
+---
+
+# Web Components Integration
+
+Our Web Components SDK provides a simple way to embed a signing experience within your framework-less web application. It supports both direct link templates and signing tokens.
+
+## Installation
+
+To install the SDK, run the following command:
+
+```bash
+npm install @documenso/embed-webcomponent
+```
+
+Then in your html file, add the following to add the script, replacing the path with the proper path to the web component script.
+
+```html
+<script src="YOUR_PATH_HERE"></script>
+```
+
+## Usage
+
+To embed a signing experience, you'll need to provide the token for the document you want to embed. This can be done in a few different ways, depending on your use case.
+
+### Direct Link Template
+
+If you have a direct link template, you can simply provide the token for the template to the `documenso-embed-direct-template` tag.
+
+```html
+<documenso-embed-direct-template
+  token="YOUR_TOKEN_HERE"
+</documenso-embed-direct-template>
+```
+
+#### Attributes
+
+| Attribute                | Type                | Description                                                                                |
+| ------------------- | ------------------- | ------------------------------------------------------------------------------------------ |
+| token               | string              | The token for the document you want to embed                                               |
+| host                | string (optional)   | The host to be used for the signing experience, relevant for self-hosters                  |
+| name                | string (optional)   | The name the signer that will be used by default for signing                               |
+| lockName            | boolean (optional)  | Whether or not the name field should be locked disallowing modifications                   |
+| email               | string (optional)   | The email the signer that will be used by default for signing                              |
+| lockEmail           | boolean (optional)  | Whether or not the email field should be locked disallowing modifications                  |
+| onDocumentReady     | function (optional) | A callback function that will be called when the document is loaded and ready to be signed |
+| onDocumentCompleted | function (optional) | A callback function that will be called when the document has been completed               |
+| onDocumentError     | function (optional) | A callback function that will be called when an error occurs with the document             |
+| onFieldSigned       | function (optional) | A callback function that will be called when a field is signed                             |
+| onFieldUnsigned     | function (optional) | A callback function that will be called when a field is unsigned                           |
+
+### Signing Token
+
+If you have a signing token, you can provide it to the `documenso-embed-sign-document` tag.
+
+```html
+<documenso-embed-sign-document
+  token="YOUR_TOKEN_HERE"
+</documenso-embed-sign-document>
+```
+
+#### Attributes
+
+| Attribute                | Type                | Description                                                                                |
+| ------------------- | ------------------- | ------------------------------------------------------------------------------------------ |
+| token               | string              | The token for the document you want to embed                                               |
+| host                | string (optional)   | The host to be used for the signing experience, relevant for self-hosters                  |
+| name                | string (optional)   | The name the signer that will be used by default for signing                               |
+| lockName            | boolean (optional)  | Whether or not the name field should be locked disallowing modifications                   |
+| onDocumentReady     | function (optional) | A callback function that will be called when the document is loaded and ready to be signed |
+| onDocumentCompleted | function (optional) | A callback function that will be called when the document has been completed               |
+| onDocumentError     | function (optional) | A callback function that will be called when an error occurs with the document             |
+
+### Creating via JavaScript
+
+You can also create the tag element using javascript, for dynamic generation of either modes. For example, this would add the sign document embed to the DOM.
+
+```javascript
+document.getElementById('my-wrapper-here').innerHTML = '';
+
+const tag = document.createElement('documenso-embed-sign-document');
+tag.setAttribute('token', data.token);
+tag.style.width = '100%';
+tag.style.height = '100%';
+
+document.getElementById('my-wrapper-here').appendChild(tag);
+```

apps/documentation/pages/developers/public-api/index.mdx

@@ -21,14 +21,25 @@ Check out the [API V1 documentation](https://app.documenso.com/api/v1/openapi) f
 
 ## API V2 - Beta
 
-Our new API V2 is currently in Beta. The new API features typed SDKs for TypeScript, Python and Go and example code for many more.
+<Callout type="warning">API V2 is currently beta, and will be subject to breaking changes</Callout>
 
-<Callout type="warning">
-  NOW IN BETA: [API V2 Documentation](https://documen.so/api-v2-docs)
+Check out the [API V2 documentation](https://documen.so/api-v2-docs) for details about the API endpoints, request parameters, response formats, and authentication methods.
+
+Our new API V2 supports the following typed SDKs:
+
+- [TypeScript](https://github.com/documenso/sdk-typescript)
+- [Python](https://github.com/documenso/sdk-python)
+- [Go](https://github.com/documenso/sdk-go)
+
+<Callout type="info">
+  For the staging API, please use the following base URL:
+  `https://stg-app.documenso.dev/api/v2-beta/`
 </Callout>
 
 🚀 [V2 Announcement](https://documen.so/sdk-blog)
 
+📖 [Documentation](https://documen.so/api-v2-docs)
+
 💬 [Leave Feedback](https://documen.so/sdk-feedback)
 
 🔔 [Breaking Changes](https://documen.so/sdk-breaking)

apps/documentation/pages/developers/public-api/reference.mdx

@@ -532,3 +532,93 @@ Replace the `text` value with the corresponding field type:
 - For the `SELECT` field it should be `select`. (check this before merge)
 
 You must pass this property at all times, even if you don't need to set any other properties. If you don't, the endpoint will throw an error.
+
+## Pre-fill Fields On Document Creation
+
+The API allows you to pre-fill fields on document creation. This is useful when you want to create a document from an existing template and pre-fill the fields with specific values.
+
+To pre-fill a field, you need to make a `POST` request to the `/api/v1/templates/{templateId}/generate-document` endpoint with the field information. Here's an example:
+
+```json
+{
+  "title": "my-document.pdf",
+  "recipients": [
+    {
+      "id": 3,
+      "name": "Example User",
+      "email": "example@documenso.com",
+      "signingOrder": 1,
+      "role": "SIGNER"
+    }
+  ],
+  "prefillFields": [
+    {
+      "id": 21,
+      "type": "text",
+      "label": "my-label",
+      "placeholder": "my-placeholder",
+      "value": "my-value"
+    },
+    {
+      "id": 22,
+      "type": "number",
+      "label": "my-label",
+      "placeholder": "my-placeholder",
+      "value": "123"
+    },
+    {
+      "id": 23,
+      "type": "checkbox",
+      "label": "my-label",
+      "placeholder": "my-placeholder",
+      "value": ["option-1", "option-2"]
+    }
+  ]
+}
+```
+
+Check out the endpoint in the [API V1 documentation](https://app.documenso.com/api/v1/openapi#:~:text=/%7BtemplateId%7D/-,generate,-%2Ddocument).
+
+### API V2
+
+For API V2, you need to make a `POST` request to the `/api/v2-beta/template/use` endpoint with the field(s) information. Here's an example:
+
+```json
+{
+  "templateId": 111,
+  "recipients": [
+    {
+      "id": 3,
+      "name": "Example User",
+      "email": "example@documenso.com",
+      "signingOrder": 1,
+      "role": "SIGNER"
+    }
+  ],
+  "prefillFields": [
+    {
+      "id": 21,
+      "type": "text",
+      "label": "my-label",
+      "placeholder": "my-placeholder",
+      "value": "my-value"
+    },
+    {
+      "id": 22,
+      "type": "number",
+      "label": "my-label",
+      "placeholder": "my-placeholder",
+      "value": "123"
+    },
+    {
+      "id": 23,
+      "type": "checkbox",
+      "label": "my-label",
+      "placeholder": "my-placeholder",
+      "value": ["option-1", "option-2"]
+    }
+  ]
+}
+```
+
+Check out the endpoint in the [API V2 documentation](https://openapi.documenso.com/reference#tag/template/POST/template/use).

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.9.1-rc.2",
+  "version": "1.9.1-rc.9",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {

apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx

@@ -14,6 +14,12 @@ import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import { trpc as trpcClient } from '@documenso/trpc/client';
 import { Button } from '@documenso/ui/primitives/button';
+import {
+  SplitButton,
+  SplitButtonAction,
+  SplitButtonDropdown,
+  SplitButtonDropdownItem,
+} from '@documenso/ui/primitives/split-button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DocumentPageViewButtonProps = {
@@ -25,7 +31,9 @@ export type DocumentPageViewButtonProps = {
   team?: Pick<Team, 'id' | 'url'>;
 };
 
-export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps) => {
+export const DocumentPageViewButton = ({
+  document: activeDocument,
+}: DocumentPageViewButtonProps) => {
   const { data: session } = useSession();
   const { toast } = useToast();
   const { _ } = useLingui();
@@ -34,25 +42,27 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
     return null;
   }
 
-  const recipient = document.recipients.find((recipient) => recipient.email === session.user.email);
+  const recipient = activeDocument.recipients.find(
+    (recipient) => recipient.email === session.user.email,
+  );
 
   const isRecipient = !!recipient;
-  const isPending = document.status === DocumentStatus.PENDING;
-  const isComplete = document.status === DocumentStatus.COMPLETED;
+  const isPending = activeDocument.status === DocumentStatus.PENDING;
+  const isComplete = activeDocument.status === DocumentStatus.COMPLETED;
   const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
   const role = recipient?.role;
 
-  const documentsPath = formatDocumentsPath(document.team?.url);
+  const documentsPath = formatDocumentsPath(activeDocument.team?.url);
 
   const onDownloadClick = async () => {
     try {
       const documentWithData = await trpcClient.document.getDocumentById.query(
         {
-          documentId: document.id,
+          documentId: activeDocument.id,
         },
         {
           context: {
-            teamId: document.team?.id?.toString(),
+            teamId: activeDocument.team?.id?.toString(),
           },
         },
       );
@@ -63,7 +73,10 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
         throw new Error('No document available');
       }
 
-      await downloadPDF({ documentData, fileName: documentWithData.title });
+      await downloadPDF({
+        documentData,
+        fileName: documentWithData.title,
+      });
     } catch (err) {
       toast({
         title: _(msg`Something went wrong`),
@@ -73,6 +86,100 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
     }
   };
 
+  const onDownloadAuditLogClick = async () => {
+    try {
+      const { url } = await trpcClient.document.downloadAuditLogs.mutate({
+        documentId: activeDocument.id,
+      });
+
+      const iframe = Object.assign(document.createElement('iframe'), {
+        src: url,
+      });
+
+      Object.assign(iframe.style, {
+        position: 'fixed',
+        top: '0',
+        left: '0',
+        width: '0',
+        height: '0',
+      });
+
+      const onLoaded = () => {
+        if (iframe.contentDocument?.readyState === 'complete') {
+          iframe.contentWindow?.print();
+
+          iframe.contentWindow?.addEventListener('afterprint', () => {
+            document.body.removeChild(iframe);
+          });
+        }
+      };
+
+      // When the iframe has loaded, print the iframe and remove it from the dom
+      iframe.addEventListener('load', onLoaded);
+
+      document.body.appendChild(iframe);
+
+      onLoaded();
+    } catch (error) {
+      console.error(error);
+
+      toast({
+        title: _(msg`Something went wrong`),
+        description: _(
+          msg`Sorry, we were unable to download the audit logs. Please try again later.`,
+        ),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const onDownloadSigningCertificateClick = async () => {
+    try {
+      const { url } = await trpcClient.document.downloadCertificate.mutate({
+        documentId: activeDocument.id,
+      });
+
+      const iframe = Object.assign(document.createElement('iframe'), {
+        src: url,
+      });
+
+      Object.assign(iframe.style, {
+        position: 'fixed',
+        top: '0',
+        left: '0',
+        width: '0',
+        height: '0',
+      });
+
+      const onLoaded = () => {
+        if (iframe.contentDocument?.readyState === 'complete') {
+          iframe.contentWindow?.print();
+
+          iframe.contentWindow?.addEventListener('afterprint', () => {
+            document.body.removeChild(iframe);
+          });
+        }
+      };
+
+      // When the iframe has loaded, print the iframe and remove it from the dom
+      iframe.addEventListener('load', onLoaded);
+
+      document.body.appendChild(iframe);
+
+      onLoaded();
+    } catch (error) {
+      console.error(error);
+
+      toast({
+        title: _(msg`Something went wrong`),
+        description: _(
+          msg`Sorry, we were unable to download the certificate. Please try again later.`,
+        ),
+        variant: 'destructive',
+      });
+    }
+  };
+
   return match({
     isRecipient,
     isPending,
@@ -106,16 +213,27 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
     ))
     .with({ isComplete: false }, () => (
       <Button className="w-full" asChild>
-        <Link href={`${documentsPath}/${document.id}/edit`}>
+        <Link href={`${documentsPath}/${activeDocument.id}/edit`}>
           <Trans>Edit</Trans>
         </Link>
       </Button>
     ))
     .with({ isComplete: true }, () => (
-      <Button className="w-full" onClick={onDownloadClick}>
-        <Download className="-ml-1 mr-2 inline h-4 w-4" />
-        <Trans>Download</Trans>
-      </Button>
+      <SplitButton className="flex w-full">
+        <SplitButtonAction className="w-full" onClick={() => void onDownloadClick()}>
+          <Download className="-ml-1 mr-2 inline h-4 w-4" />
+          <Trans>Download</Trans>
+        </SplitButtonAction>
+        <SplitButtonDropdown>
+          <SplitButtonDropdownItem onClick={() => void onDownloadAuditLogClick()}>
+            <Trans>Only Audit Log</Trans>
+          </SplitButtonDropdownItem>
+
+          <SplitButtonDropdownItem onClick={() => void onDownloadSigningCertificateClick()}>
+            <Trans>Only Signing Certificate</Trans>
+          </SplitButtonDropdownItem>
+        </SplitButtonDropdown>
+      </SplitButton>
     ))
     .otherwise(() => null);
 };

apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx

@@ -187,6 +187,8 @@ export const EditDocumentForm = ({
           title: data.title,
           externalId: data.externalId || null,
           visibility: data.visibility,
+          includeSigningCertificate: data.includeSigningCertificate,
+          includeAuditTrailLog: data.includeAuditTrailLog,
           globalAccessAuth: data.globalAccessAuth ?? null,
           globalActionAuth: data.globalActionAuth ?? null,
         },

apps/web/src/app/(dashboard)/documents/[id]/logs/document-logs-page-view.tsx

@@ -119,7 +119,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
         <Trans>Document</Trans>
       </Link>
 
-      <div className="flex flex-col justify-between truncate sm:flex-row">
+      <div className="flex flex-col">
         <div>
           <h1
             className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
@@ -127,7 +127,8 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
           >
             {document.title}
           </h1>
-
+        </div>
+        <div className="mt-1 flex flex-col justify-between sm:flex-row">
           <div className="mt-2.5 flex items-center gap-x-6">
             <DocumentStatusComponent
               inheritColor
@@ -135,17 +136,16 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
               className="text-muted-foreground"
             />
           </div>
-        </div>
+          <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
+            <DownloadCertificateButton
+              className="mr-2"
+              documentId={document.id}
+              documentStatus={document.status}
+              teamId={team?.id}
+            />
 
-        <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
-          <DownloadCertificateButton
-            className="mr-2"
-            documentId={document.id}
-            documentStatus={document.status}
-            teamId={team?.id}
-          />
-
-          <DownloadAuditLogButton teamId={team?.id} documentId={document.id} />
+            <DownloadAuditLogButton teamId={team?.id} documentId={document.id} />
+          </div>
         </div>
       </div>
 
@@ -154,7 +154,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
           {documentInformation.map((info, i) => (
             <div className="text-foreground text-sm" key={i}>
               <h3 className="font-semibold">{_(info.description)}</h3>
-              <p className="text-muted-foreground">{info.value}</p>
+              <p className="text-muted-foreground truncate">{info.value}</p>
             </div>
           ))}
 

apps/web/src/app/(recipient)/d/[token]/sign-direct-template.tsx

@@ -90,7 +90,7 @@ export const SignDirectTemplateForm = ({
 
         const tempField: DirectTemplateLocalField = {
           ...field,
-          customText: value.value,
+          customText: value.value ?? '',
           inserted: true,
           signedValue: value,
         };
@@ -101,8 +101,8 @@ export const SignDirectTemplateForm = ({
             created: new Date(),
             recipientId: 1,
             fieldId: 1,
-            signatureImageAsBase64: value.value.startsWith('data:') ? value.value : null,
-            typedSignature: value.value.startsWith('data:') ? null : value.value,
+            signatureImageAsBase64: value.value?.startsWith('data:') ? value.value : null,
+            typedSignature: value.value && !value.value.startsWith('data:') ? value.value : null,
           } satisfies Signature;
         }
 

apps/web/src/app/(signing)/sign/[token]/checkbox-field.tsx

@@ -44,7 +44,12 @@ export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFie
   const [isPending, startTransition] = useTransition();
   const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
-  const parsedFieldMeta = ZCheckboxFieldMeta.parse(field.fieldMeta);
+  const parsedFieldMeta = ZCheckboxFieldMeta.parse(
+    field.fieldMeta ?? {
+      type: 'checkbox',
+      values: [{ id: 1, checked: false, value: '' }],
+    },
+  );
 
   const values = parsedFieldMeta.values?.map((item) => ({
     ...item,

apps/web/src/app/(signing)/sign/[token]/form.tsx

@@ -311,7 +311,11 @@ export const SigningForm = ({
             <>
               <form onSubmit={handleSubmit(onFormSubmit)}>
                 <p className="text-muted-foreground mt-2 text-sm">
-                  <Trans>Please review the document before signing.</Trans>
+                  {recipient.role === RecipientRole.APPROVER && !hasSignatureField ? (
+                    <Trans>Please review the document before approving.</Trans>
+                  ) : (
+                    <Trans>Please review the document before signing.</Trans>
+                  )}
                 </p>
 
                 <hr className="border-border mb-8 mt-4" />
@@ -335,38 +339,40 @@ export const SigningForm = ({
                       />
                     </div>
 
-                    <div>
-                      <Label htmlFor="Signature">
-                        <Trans>Signature</Trans>
-                      </Label>
+                    {hasSignatureField && (
+                      <div>
+                        <Label htmlFor="Signature">
+                          <Trans>Signature</Trans>
+                        </Label>
 
-                      <Card className="mt-2" gradient degrees={-120}>
-                        <CardContent className="p-0">
-                          <SignaturePad
-                            className="h-44 w-full"
-                            disabled={isSubmitting}
-                            defaultValue={signature ?? undefined}
-                            onValidityChange={(isValid) => {
-                              setSignatureValid(isValid);
-                            }}
-                            onChange={(value) => {
-                              if (signatureValid) {
-                                setSignature(value);
-                              }
-                            }}
-                            allowTypedSignature={document.documentMeta?.typedSignatureEnabled}
-                          />
-                        </CardContent>
-                      </Card>
+                        <Card className="mt-2" gradient degrees={-120}>
+                          <CardContent className="p-0">
+                            <SignaturePad
+                              className="h-44 w-full"
+                              disabled={isSubmitting}
+                              defaultValue={signature ?? undefined}
+                              onValidityChange={(isValid) => {
+                                setSignatureValid(isValid);
+                              }}
+                              onChange={(value) => {
+                                if (signatureValid) {
+                                  setSignature(value);
+                                }
+                              }}
+                              allowTypedSignature={document.documentMeta?.typedSignatureEnabled}
+                            />
+                          </CardContent>
+                        </Card>
 
-                      {hasSignatureField && !signatureValid && (
-                        <div className="text-destructive mt-2 text-sm">
-                          <Trans>
-                            Signature is too small. Please provide a more complete signature.
-                          </Trans>
-                        </div>
-                      )}
-                    </div>
+                        {!signatureValid && (
+                          <div className="text-destructive mt-2 text-sm">
+                            <Trans>
+                              Signature is too small. Please provide a more complete signature.
+                            </Trans>
+                          </div>
+                        )}
+                      </div>
+                    )}
                   </div>
 
                   <div className="flex flex-col gap-4 md:flex-row">

apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx

@@ -1,6 +1,7 @@
 import { useMemo, useState } from 'react';
 
 import { Trans } from '@lingui/macro';
+import { match } from 'ts-pattern';
 
 import { fieldsContainUnsignedRequiredField } from '@documenso/lib/utils/advanced-fields-helpers';
 import type { Field } from '@documenso/prisma/client';
@@ -58,62 +59,88 @@ export const SignDialog = ({
           loading={isSubmitting}
           disabled={disabled}
         >
-          {isComplete ? <Trans>Complete</Trans> : <Trans>Next field</Trans>}
+          {match({ isComplete, role })
+            .with({ isComplete: false }, () => <Trans>Next field</Trans>)
+            .with({ isComplete: true, role: RecipientRole.APPROVER }, () => <Trans>Approve</Trans>)
+            .with({ isComplete: true, role: RecipientRole.VIEWER }, () => (
+              <Trans>Mark as viewed</Trans>
+            ))
+            .with({ isComplete: true }, () => <Trans>Complete</Trans>)
+            .exhaustive()}
         </Button>
       </DialogTrigger>
 
       <DialogContent>
         <DialogTitle>
           <div className="text-foreground text-xl font-semibold">
-            {role === RecipientRole.VIEWER && <Trans>Complete Viewing</Trans>}
-            {role === RecipientRole.SIGNER && <Trans>Complete Signing</Trans>}
-            {role === RecipientRole.APPROVER && <Trans>Complete Approval</Trans>}
+            {match(role)
+              .with(RecipientRole.VIEWER, () => <Trans>Complete Viewing</Trans>)
+              .with(RecipientRole.SIGNER, () => <Trans>Complete Signing</Trans>)
+              .with(RecipientRole.APPROVER, () => <Trans>Complete Approval</Trans>)
+              .with(RecipientRole.CC, () => <Trans>Complete Viewing</Trans>)
+              .with(RecipientRole.ASSISTANT, () => <Trans>Complete Assisting</Trans>)
+              .exhaustive()}
           </div>
         </DialogTitle>
 
         <div className="text-muted-foreground max-w-[50ch]">
-          {role === RecipientRole.VIEWER && (
-            <span>
-              <Trans>
-                <span className="inline-flex flex-wrap">
-                  You are about to complete viewing "
-                  <span className="inline-block max-w-[11rem] truncate align-baseline">
-                    {documentTitle}
+          {match(role)
+            .with(RecipientRole.VIEWER, () => (
+              <span>
+                <Trans>
+                  <span className="inline-flex flex-wrap">
+                    You are about to complete viewing "
+                    <span className="inline-block max-w-[11rem] truncate align-baseline">
+                      {documentTitle}
+                    </span>
+                    ".
                   </span>
-                  ".
-                </span>
-                <br /> Are you sure?
-              </Trans>
-            </span>
-          )}
-          {role === RecipientRole.SIGNER && (
-            <span>
-              <Trans>
-                <span className="inline-flex flex-wrap">
-                  You are about to complete signing "
-                  <span className="inline-block max-w-[11rem] truncate align-baseline">
-                    {documentTitle}
+                  <br /> Are you sure?
+                </Trans>
+              </span>
+            ))
+            .with(RecipientRole.SIGNER, () => (
+              <span>
+                <Trans>
+                  <span className="inline-flex flex-wrap">
+                    You are about to complete signing "
+                    <span className="inline-block max-w-[11rem] truncate align-baseline">
+                      {documentTitle}
+                    </span>
+                    ".
                   </span>
-                  ".
-                </span>
-                <br /> Are you sure?
-              </Trans>
-            </span>
-          )}
-          {role === RecipientRole.APPROVER && (
-            <span>
-              <Trans>
-                <span className="inline-flex flex-wrap">
-                  You are about to complete approving{' '}
-                  <span className="inline-block max-w-[11rem] truncate align-baseline">
-                    "{documentTitle}"
+                  <br /> Are you sure?
+                </Trans>
+              </span>
+            ))
+            .with(RecipientRole.APPROVER, () => (
+              <span>
+                <Trans>
+                  <span className="inline-flex flex-wrap">
+                    You are about to complete approving{' '}
+                    <span className="inline-block max-w-[11rem] truncate align-baseline">
+                      "{documentTitle}"
+                    </span>
+                    .
                   </span>
-                  .
-                </span>
-                <br /> Are you sure?
-              </Trans>
-            </span>
-          )}
+                  <br /> Are you sure?
+                </Trans>
+              </span>
+            ))
+            .otherwise(() => (
+              <span>
+                <Trans>
+                  <span className="inline-flex flex-wrap">
+                    You are about to complete viewing "
+                    <span className="inline-block max-w-[11rem] truncate align-baseline">
+                      {documentTitle}
+                    </span>
+                    ".
+                  </span>
+                  <br /> Are you sure?
+                </Trans>
+              </span>
+            ))}
         </div>
 
         <SigningDisclosure className="mt-4" />
@@ -138,9 +165,13 @@ export const SignDialog = ({
               loading={isSubmitting}
               onClick={onSignatureComplete}
             >
-              {role === RecipientRole.VIEWER && <Trans>Mark as Viewed</Trans>}
-              {role === RecipientRole.SIGNER && <Trans>Sign</Trans>}
-              {role === RecipientRole.APPROVER && <Trans>Approve</Trans>}
+              {match(role)
+                .with(RecipientRole.VIEWER, () => <Trans>Mark as Viewed</Trans>)
+                .with(RecipientRole.SIGNER, () => <Trans>Sign</Trans>)
+                .with(RecipientRole.APPROVER, () => <Trans>Approve</Trans>)
+                .with(RecipientRole.CC, () => <Trans>Mark as Viewed</Trans>)
+                .with(RecipientRole.ASSISTANT, () => <Trans>Complete</Trans>)
+                .exhaustive()}
             </Button>
           </div>
         </DialogFooter>

apps/web/src/app/(signing)/sign/[token]/signing-field-container.tsx

@@ -182,6 +182,23 @@ export const SigningFieldContainer = ({
           </button>
         )}
 
+        {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&
+          field.fieldMeta?.label && (
+            <div
+              className={cn(
+                'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',
+                {
+                  'bg-foreground/5 border-border border': !field.inserted,
+                },
+                {
+                  'bg-documenso-200 border-primary border': field.inserted,
+                },
+              )}
+            >
+              {field.fieldMeta.label}
+            </div>
+          )}
+
         {children}
       </FieldRootContainer>
     </div>

apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx

@@ -41,6 +41,7 @@ const ZTeamDocumentPreferencesFormSchema = z.object({
   includeSenderDetails: z.boolean(),
   typedSignatureEnabled: z.boolean(),
   includeSigningCertificate: z.boolean(),
+  includeAuditTrailLog: z.boolean(),
 });
 
 type TTeamDocumentPreferencesFormSchema = z.infer<typeof ZTeamDocumentPreferencesFormSchema>;
@@ -72,6 +73,7 @@ export const TeamDocumentPreferencesForm = ({
       includeSenderDetails: settings?.includeSenderDetails ?? false,
       typedSignatureEnabled: settings?.typedSignatureEnabled ?? true,
       includeSigningCertificate: settings?.includeSigningCertificate ?? true,
+      includeAuditTrailLog: settings?.includeAuditTrailLog ?? false,
     },
     resolver: zodResolver(ZTeamDocumentPreferencesFormSchema),
   });
@@ -86,6 +88,7 @@ export const TeamDocumentPreferencesForm = ({
         includeSenderDetails,
         includeSigningCertificate,
         typedSignatureEnabled,
+        includeAuditTrailLog,
       } = data;
 
       await updateTeamDocumentPreferences({
@@ -96,6 +99,7 @@ export const TeamDocumentPreferencesForm = ({
           includeSenderDetails,
           typedSignatureEnabled,
           includeSigningCertificate,
+          includeAuditTrailLog,
         },
       });
 
@@ -300,6 +304,37 @@ export const TeamDocumentPreferencesForm = ({
             )}
           />
 
+          <FormField
+            control={form.control}
+            name="includeAuditTrailLog"
+            render={({ field }) => (
+              <FormItem className="flex-1">
+                <FormLabel>
+                  <Trans>Include the Audit Trail Log in the Document</Trans>
+                </FormLabel>
+
+                <div>
+                  <FormControl className="block">
+                    <Switch
+                      ref={field.ref}
+                      name={field.name}
+                      checked={field.value}
+                      onCheckedChange={field.onChange}
+                    />
+                  </FormControl>
+                </div>
+
+                <FormDescription>
+                  <Trans>
+                    Controls whether the audit trail log will be included in the document when it is
+                    downloaded. The audit trail log can still be downloaded from the logs page
+                    separately.
+                  </Trans>
+                </FormDescription>
+              </FormItem>
+            )}
+          />
+
           <div className="flex flex-row justify-end space-x-4">
             <Button type="submit" loading={form.formState.isSubmitting}>
               <Trans>Save</Trans>

apps/web/src/app/embed/direct/[[...url]]/client.tsx

@@ -13,6 +13,10 @@ import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn'
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
+import {
+  isFieldUnsignedAndRequired,
+  isRequiredField,
+} from '@documenso/lib/utils/advanced-fields-helpers';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { DocumentMeta, Recipient, Signature, TemplateMeta } from '@documenso/prisma/client';
 import { type DocumentData, type Field, FieldType } from '@documenso/prisma/client';
@@ -49,7 +53,7 @@ export type EmbedDirectTemplateClientPageProps = {
   fields: Field[];
   metadata?: DocumentMeta | TemplateMeta | null;
   hidePoweredBy?: boolean;
-  isPlatformOrEnterprise?: boolean;
+  allowWhiteLabelling?: boolean;
 };
 
 export const EmbedDirectTemplateClientPage = ({
@@ -60,7 +64,7 @@ export const EmbedDirectTemplateClientPage = ({
   fields,
   metadata,
   hidePoweredBy = false,
-  isPlatformOrEnterprise = false,
+  allowWhiteLabelling = false,
 }: EmbedDirectTemplateClientPageProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
@@ -94,7 +98,7 @@ export const EmbedDirectTemplateClientPage = ({
   const [localFields, setLocalFields] = useState<DirectTemplateLocalField[]>(() => fields);
 
   const [pendingFields, _completedFields] = [
-    localFields.filter((field) => !field.inserted),
+    localFields.filter((field) => isFieldUnsignedAndRequired(field)),
     localFields.filter((field) => field.inserted),
   ];
 
@@ -112,7 +116,7 @@ export const EmbedDirectTemplateClientPage = ({
 
         const newField: DirectTemplateLocalField = structuredClone({
           ...field,
-          customText: payload.value,
+          customText: payload.value ?? '',
           inserted: true,
           signedValue: payload,
         });
@@ -123,8 +127,10 @@ export const EmbedDirectTemplateClientPage = ({
             created: new Date(),
             recipientId: 1,
             fieldId: 1,
-            signatureImageAsBase64: payload.value.startsWith('data:') ? payload.value : null,
-            typedSignature: payload.value.startsWith('data:') ? null : payload.value,
+            signatureImageAsBase64:
+              payload.value && payload.value.startsWith('data:') ? payload.value : null,
+            typedSignature:
+              payload.value && !payload.value.startsWith('data:') ? payload.value : null,
           } satisfies Signature;
         }
 
@@ -182,7 +188,7 @@ export const EmbedDirectTemplateClientPage = ({
   };
 
   const onNextFieldClick = () => {
-    validateFieldsInserted(localFields);
+    validateFieldsInserted(pendingFields);
 
     setShowPendingFieldTooltip(true);
     setIsExpanded(false);
@@ -194,7 +200,7 @@ export const EmbedDirectTemplateClientPage = ({
         return;
       }
 
-      const valid = validateFieldsInserted(localFields);
+      const valid = validateFieldsInserted(pendingFields);
 
       if (!valid) {
         setShowPendingFieldTooltip(true);
@@ -207,12 +213,6 @@ export const EmbedDirectTemplateClientPage = ({
         directTemplateExternalId = decodeURIComponent(directTemplateExternalId);
       }
 
-      localFields.forEach((field) => {
-        if (!field.signedValue) {
-          throw new Error('Invalid configuration');
-        }
-      });
-
       const {
         documentId,
         token: documentToken,
@@ -223,13 +223,11 @@ export const EmbedDirectTemplateClientPage = ({
         directRecipientName: fullName,
         directRecipientEmail: email,
         templateUpdatedAt: updatedAt,
-        signedFieldValues: localFields.map((field) => {
-          if (!field.signedValue) {
-            throw new Error('Invalid configuration');
-          }
-
-          return field.signedValue;
-        }),
+        signedFieldValues: localFields
+          .filter((field) => {
+            return field.signedValue && (isRequiredField(field) || field.inserted);
+          })
+          .map((field) => field.signedValue!),
       });
 
       if (window.parent) {
@@ -288,7 +286,7 @@ export const EmbedDirectTemplateClientPage = ({
         document.documentElement.classList.add('dark-mode-disabled');
       }
 
-      if (isPlatformOrEnterprise) {
+      if (allowWhiteLabelling) {
         injectCss({
           css: data.css,
           cssVars: data.cssVars,
@@ -349,7 +347,7 @@ export const EmbedDirectTemplateClientPage = ({
         {/* Widget */}
         <div
           key={isExpanded ? 'expanded' : 'collapsed'}
-          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
+          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit max-h-[calc(100dvh-2rem)] w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
           data-expanded={isExpanded || undefined}
         >
           <div className="border-border bg-widget flex h-fit w-full flex-col rounded-xl border px-4 py-4 md:min-h-[min(calc(100dvh-2rem),48rem)] md:py-6">
@@ -360,19 +358,34 @@ export const EmbedDirectTemplateClientPage = ({
                   <Trans>Sign document</Trans>
                 </h3>
 
-                <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
-                  {isExpanded ? (
-                    <LucideChevronDown
-                      className="text-muted-foreground h-5 w-5"
-                      onClick={() => setIsExpanded(false)}
-                    />
-                  ) : (
-                    <LucideChevronUp
-                      className="text-muted-foreground h-5 w-5"
-                      onClick={() => setIsExpanded(true)}
-                    />
-                  )}
-                </Button>
+                {isExpanded ? (
+                  <Button
+                    variant="outline"
+                    className="h-8 w-8 p-0 md:hidden"
+                    onClick={() => setIsExpanded(false)}
+                  >
+                    <LucideChevronDown className="text-muted-foreground h-5 w-5" />
+                  </Button>
+                ) : pendingFields.length > 0 ? (
+                  <Button
+                    variant="outline"
+                    className="h-8 w-8 p-0 md:hidden"
+                    onClick={() => setIsExpanded(true)}
+                  >
+                    <LucideChevronUp className="text-muted-foreground h-5 w-5" />
+                  </Button>
+                ) : (
+                  <Button
+                    variant="default"
+                    size="sm"
+                    className="md:hidden"
+                    disabled={isThrottled || (hasSignatureField && !signatureValid)}
+                    loading={isSubmitting}
+                    onClick={() => throttledOnCompleteClick()}
+                  >
+                    <Trans>Complete</Trans>
+                  </Button>
+                )}
               </div>
             </div>
 
@@ -417,40 +430,42 @@ export const EmbedDirectTemplateClientPage = ({
                   />
                 </div>
 
-                <div>
-                  <Label htmlFor="Signature">
-                    <Trans>Signature</Trans>
-                  </Label>
+                {hasSignatureField && (
+                  <div>
+                    <Label htmlFor="Signature">
+                      <Trans>Signature</Trans>
+                    </Label>
 
-                  <Card className="mt-2" gradient degrees={-120}>
-                    <CardContent className="p-0">
-                      <SignaturePad
-                        className="h-44 w-full"
-                        disabled={isThrottled || isSubmitting}
-                        defaultValue={signature ?? undefined}
-                        onChange={(value) => {
-                          setSignature(value);
-                        }}
-                        onValidityChange={(isValid) => {
-                          setSignatureValid(isValid);
-                        }}
-                        allowTypedSignature={Boolean(
-                          metadata &&
-                            'typedSignatureEnabled' in metadata &&
-                            metadata.typedSignatureEnabled,
-                        )}
-                      />
-                    </CardContent>
-                  </Card>
+                    <Card className="mt-2" gradient degrees={-120}>
+                      <CardContent className="p-0">
+                        <SignaturePad
+                          className="h-44 w-full"
+                          disabled={isThrottled || isSubmitting}
+                          defaultValue={signature ?? undefined}
+                          onChange={(value) => {
+                            setSignature(value);
+                          }}
+                          onValidityChange={(isValid) => {
+                            setSignatureValid(isValid);
+                          }}
+                          allowTypedSignature={Boolean(
+                            metadata &&
+                              'typedSignatureEnabled' in metadata &&
+                              metadata.typedSignatureEnabled,
+                          )}
+                        />
+                      </CardContent>
+                    </Card>
 
-                  {hasSignatureField && !signatureValid && (
-                    <div className="text-destructive mt-2 text-sm">
-                      <Trans>
-                        Signature is too small. Please provide a more complete signature.
-                      </Trans>
-                    </div>
-                  )}
-                </div>
+                    {hasSignatureField && !signatureValid && (
+                      <div className="text-destructive mt-2 text-sm">
+                        <Trans>
+                          Signature is too small. Please provide a more complete signature.
+                        </Trans>
+                      </div>
+                    )}
+                  </div>
+                )}
               </div>
             </div>
 

apps/web/src/app/embed/direct/[[...url]]/page.tsx

@@ -2,6 +2,7 @@ import { notFound } from 'next/navigation';
 
 import { match } from 'ts-pattern';
 
+import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
@@ -55,12 +56,16 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
     documentAuth: template.authOptions,
   });
 
-  const [isPlatformDocument, isEnterpriseDocument] = await Promise.all([
+  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
     isDocumentPlatform(template),
     isUserEnterprise({
       userId: template.userId,
       teamId: template.teamId ?? undefined,
     }),
+    isUserCommunityPlan({
+      userId: template.userId,
+      teamId: template.teamId ?? undefined,
+    }),
   ]);
 
   const isAccessAuthValid = match(derivedRecipientAccessAuth)
@@ -105,8 +110,10 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
             recipient={recipient}
             fields={fields}
             metadata={template.templateMeta}
-            hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
-            isPlatformOrEnterprise={isPlatformDocument || isEnterpriseDocument}
+            hidePoweredBy={
+              isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
+            }
+            allowWhiteLabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
           />
         </RecipientProvider>
       </DocumentAuthProvider>

apps/web/src/app/embed/sign/[[...url]]/client.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useId, useLayoutEffect, useState } from 'react';
+import { useEffect, useId, useLayoutEffect, useMemo, useState } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
@@ -8,6 +8,7 @@ import { LucideChevronDown, LucideChevronUp } from 'lucide-react';
 
 import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
+import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { DocumentMeta, TemplateMeta } from '@documenso/prisma/client';
 import {
@@ -51,7 +52,7 @@ export type EmbedSignDocumentClientPageProps = {
   metadata?: DocumentMeta | TemplateMeta | null;
   isCompleted?: boolean;
   hidePoweredBy?: boolean;
-  isPlatformOrEnterprise?: boolean;
+  allowWhitelabelling?: boolean;
   allRecipients?: RecipientWithFields[];
 };
 
@@ -64,7 +65,7 @@ export const EmbedSignDocumentClientPage = ({
   metadata,
   isCompleted,
   hidePoweredBy = false,
-  isPlatformOrEnterprise = false,
+  allowWhitelabelling = false,
   allRecipients = [],
 }: EmbedSignDocumentClientPageProps) => {
   const { _ } = useLingui();
@@ -102,19 +103,26 @@ export const EmbedSignDocumentClientPage = ({
   const [throttledOnCompleteClick, isThrottled] = useThrottleFn(() => void onCompleteClick(), 500);
 
   const [pendingFields, _completedFields] = [
-    fields.filter((field) => field.recipientId === recipient.id && !field.inserted),
+    fields.filter(
+      (field) => field.recipientId === recipient.id && isFieldUnsignedAndRequired(field),
+    ),
     fields.filter((field) => field.inserted),
   ];
 
   const { mutateAsync: completeDocumentWithToken, isPending: isSubmitting } =
     trpc.recipient.completeDocumentWithToken.useMutation();
 
+  const fieldsRequiringValidation = useMemo(
+    () => fields.filter(isFieldUnsignedAndRequired),
+    [fields],
+  );
+
   const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
 
   const assistantSignersId = useId();
 
   const onNextFieldClick = () => {
-    validateFieldsInserted(fields);
+    validateFieldsInserted(fieldsRequiringValidation);
 
     setShowPendingFieldTooltip(true);
     setIsExpanded(false);
@@ -126,7 +134,7 @@ export const EmbedSignDocumentClientPage = ({
         return;
       }
 
-      const valid = validateFieldsInserted(fields);
+      const valid = validateFieldsInserted(fieldsRequiringValidation);
 
       if (!valid) {
         setShowPendingFieldTooltip(true);
@@ -212,7 +220,7 @@ export const EmbedSignDocumentClientPage = ({
         document.documentElement.classList.add('dark-mode-disabled');
       }
 
-      if (isPlatformOrEnterprise) {
+      if (allowWhitelabelling) {
         injectCss({
           css: data.css,
           cssVars: data.cssVars,
@@ -288,7 +296,7 @@ export const EmbedSignDocumentClientPage = ({
           {/* Widget */}
           <div
             key={isExpanded ? 'expanded' : 'collapsed'}
-            className="embed--DocumentWidgetContainer group/document-widget fixed bottom-8 left-0 z-50 h-fit w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
+            className="embed--DocumentWidgetContainer group/document-widget fixed bottom-8 left-0 z-50 h-fit max-h-[calc(100dvh-2rem)] w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
             data-expanded={isExpanded || undefined}
           >
             <div className="embed--DocumentWidget border-border bg-widget flex w-full flex-col rounded-xl border px-4 py-4 md:py-6">
@@ -303,19 +311,36 @@ export const EmbedSignDocumentClientPage = ({
                     )}
                   </h3>
 
-                  <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
-                    {isExpanded ? (
-                      <LucideChevronDown
-                        className="text-muted-foreground h-5 w-5"
-                        onClick={() => setIsExpanded(false)}
-                      />
-                    ) : (
-                      <LucideChevronUp
-                        className="text-muted-foreground h-5 w-5"
-                        onClick={() => setIsExpanded(true)}
-                      />
-                    )}
-                  </Button>
+                  {isExpanded ? (
+                    <Button
+                      variant="outline"
+                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
+                      onClick={() => setIsExpanded(false)}
+                    >
+                      <LucideChevronDown className="text-muted-foreground dark:text-background h-5 w-5" />
+                    </Button>
+                  ) : pendingFields.length > 0 ? (
+                    <Button
+                      variant="outline"
+                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
+                      onClick={() => setIsExpanded(true)}
+                    >
+                      <LucideChevronUp className="text-muted-foreground dark:text-background h-5 w-5" />
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="default"
+                      size="sm"
+                      className="md:hidden"
+                      disabled={
+                        isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
+                      }
+                      loading={isSubmitting}
+                      onClick={() => throttledOnCompleteClick()}
+                    >
+                      <Trans>Complete</Trans>
+                    </Button>
+                  )}
                 </div>
               </div>
 
@@ -419,40 +444,42 @@ export const EmbedSignDocumentClientPage = ({
                         />
                       </div>
 
-                      <div>
-                        <Label htmlFor="Signature">
-                          <Trans>Signature</Trans>
-                        </Label>
+                      {hasSignatureField && (
+                        <div>
+                          <Label htmlFor="Signature">
+                            <Trans>Signature</Trans>
+                          </Label>
 
-                        <Card className="mt-2" gradient degrees={-120}>
-                          <CardContent className="p-0">
-                            <SignaturePad
-                              className="h-44 w-full"
-                              disabled={isThrottled || isSubmitting}
-                              defaultValue={signature ?? undefined}
-                              onChange={(value) => {
-                                setSignature(value);
-                              }}
-                              onValidityChange={(isValid) => {
-                                setSignatureValid(isValid);
-                              }}
-                              allowTypedSignature={Boolean(
-                                metadata &&
-                                  'typedSignatureEnabled' in metadata &&
-                                  metadata.typedSignatureEnabled,
-                              )}
-                            />
-                          </CardContent>
-                        </Card>
+                          <Card className="mt-2" gradient degrees={-120}>
+                            <CardContent className="p-0">
+                              <SignaturePad
+                                className="h-44 w-full"
+                                disabled={isThrottled || isSubmitting}
+                                defaultValue={signature ?? undefined}
+                                onChange={(value) => {
+                                  setSignature(value);
+                                }}
+                                onValidityChange={(isValid) => {
+                                  setSignatureValid(isValid);
+                                }}
+                                allowTypedSignature={Boolean(
+                                  metadata &&
+                                    'typedSignatureEnabled' in metadata &&
+                                    metadata.typedSignatureEnabled,
+                                )}
+                              />
+                            </CardContent>
+                          </Card>
 
-                        {hasSignatureField && !signatureValid && (
-                          <div className="text-destructive mt-2 text-sm">
-                            <Trans>
-                              Signature is too small. Please provide a more complete signature.
-                            </Trans>
-                          </div>
-                        )}
-                      </div>
+                          {hasSignatureField && !signatureValid && (
+                            <div className="text-destructive mt-2 text-sm">
+                              <Trans>
+                                Signature is too small. Please provide a more complete signature.
+                              </Trans>
+                            </div>
+                          )}
+                        </div>
+                      )}
                     </>
                   )}
                 </div>

apps/web/src/app/embed/sign/[[...url]]/page.tsx

@@ -2,6 +2,7 @@ import { notFound } from 'next/navigation';
 
 import { match } from 'ts-pattern';
 
+import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
@@ -62,12 +63,16 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
     return <EmbedPaywall />;
   }
 
-  const [isPlatformDocument, isEnterpriseDocument] = await Promise.all([
+  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
     isDocumentPlatform(document),
     isUserEnterprise({
       userId: document.userId,
       teamId: document.teamId ?? undefined,
     }),
+    isUserCommunityPlan({
+      userId: document.userId,
+      teamId: document.teamId ?? undefined,
+    }),
   ]);
 
   const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
@@ -126,8 +131,10 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
           fields={fields}
           metadata={document.documentMeta}
           isCompleted={document.status === DocumentStatus.COMPLETED}
-          hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
-          isPlatformOrEnterprise={isPlatformDocument || isEnterpriseDocument}
+          hidePoweredBy={
+            isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
+          }
+          allowWhitelabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
           allRecipients={allRecipients}
         />
       </DocumentAuthProvider>

apps/web/src/components/(dashboard)/layout/desktop-nav.tsx

@@ -73,7 +73,7 @@ export const DesktopNav = ({ className, setIsCommandMenuOpen, ...props }: Deskto
 
       <Button
         variant="outline"
-        className="text-muted-foreground flex w-96 items-center justify-between rounded-lg"
+        className="text-muted-foreground flex w-full max-w-96 items-center justify-between rounded-lg"
         onClick={() => setIsCommandMenuOpen(true)}
       >
         <div className="flex items-center">
@@ -82,7 +82,7 @@ export const DesktopNav = ({ className, setIsCommandMenuOpen, ...props }: Deskto
         </div>
 
         <div>
-          <div className="text-muted-foreground bg-muted flex items-center rounded-md px-1.5 py-0.5  text-xs tracking-wider">
+          <div className="text-muted-foreground bg-muted flex items-center rounded-md px-1.5 py-0.5 text-xs tracking-wider">
             {modifierKey}+K
           </div>
         </div>

apps/web/src/components/document/document-history-sheet.tsx

@@ -363,6 +363,40 @@ export const DocumentHistorySheet = ({
                       ]}
                     />
                   ))
+                  .with(
+                    { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED },
+                    ({ data }) => (
+                      <DocumentHistorySheetChanges
+                        values={[
+                          {
+                            key: 'Old',
+                            value: data.from,
+                          },
+                          {
+                            key: 'New',
+                            value: data.to,
+                          },
+                        ]}
+                      />
+                    ),
+                  )
+                  .with(
+                    { type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED },
+                    ({ data }) => (
+                      <DocumentHistorySheetChanges
+                        values={[
+                          {
+                            key: 'Old',
+                            value: data.from,
+                          },
+                          {
+                            key: 'New',
+                            value: data.to,
+                          },
+                        ]}
+                      />
+                    ),
+                  )
                   .exhaustive()}
 
                 {isUserDetailsVisible && (

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "1.9.1-rc.2",
+  "version": "1.9.1-rc.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.9.1-rc.2",
+      "version": "1.9.1-rc.9",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -106,7 +106,7 @@
     },
     "apps/web": {
       "name": "@documenso/web",
-      "version": "1.9.1-rc.2",
+      "version": "1.9.1-rc.9",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/api": "*",

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.9.1-rc.2",
+  "version": "1.9.1-rc.9",
   "scripts": {
     "build": "turbo run build",
     "build:web": "turbo run build --filter=@documenso/web",

packages/api/v1/implementation.ts

@@ -586,6 +586,7 @@ export const ApiContractV1Implementation = createNextRoute(ApiContractV1, {
         userId: user.id,
         teamId: team?.id,
         recipients: body.recipients,
+        prefillFields: body.prefillFields,
         override: {
           title: body.title,
           ...body.meta,

packages/api/v1/schema.ts

@@ -11,7 +11,7 @@ import {
   ZRecipientActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
-import { ZFieldMetaSchema } from '@documenso/lib/types/field-meta';
+import { ZFieldMetaPrefillFieldsSchema, ZFieldMetaSchema } from '@documenso/lib/types/field-meta';
 import {
   DocumentDataType,
   DocumentDistributionMethod,
@@ -299,6 +299,7 @@ export const ZGenerateDocumentFromTemplateMutationSchema = z.object({
     })
     .optional(),
   formValues: z.record(z.string(), z.union([z.string(), z.boolean(), z.number()])).optional(),
+  prefillFields: z.array(ZFieldMetaPrefillFieldsSchema).optional(),
 });
 
 export type TGenerateDocumentFromTemplateMutationSchema = z.infer<

packages/app-tests/e2e/api/v1/template-field-prefill.spec.ts

@@ -0,0 +1,612 @@
+import { expect, test } from '@playwright/test';
+
+import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
+import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
+import type { TCheckboxFieldMeta, TRadioFieldMeta } from '@documenso/lib/types/field-meta';
+import { prisma } from '@documenso/prisma';
+import { FieldType, RecipientRole } from '@documenso/prisma/client';
+import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin } from '../../fixtures/authentication';
+
+test.describe('Template Field Prefill API v1', () => {
+  test('should create a document from template with prefilled fields', async ({
+    page,
+    request,
+  }) => {
+    // 1. Create a user
+    const user = await seedUser();
+
+    // 2. Create an API token for the user
+    const { token } = await createApiToken({
+      userId: user.id,
+      tokenName: 'test-token',
+      expiresIn: null,
+    });
+
+    // 3. Create a template with seedBlankTemplate
+    const template = await seedBlankTemplate(user, {
+      createTemplateOptions: {
+        title: 'Template with Advanced Fields',
+      },
+    });
+
+    // 4. Create a recipient for the template
+    const recipient = await prisma.recipient.create({
+      data: {
+        templateId: template.id,
+        email: 'recipient@example.com',
+        name: 'Test Recipient',
+        role: RecipientRole.SIGNER,
+        token: 'test-token',
+        readStatus: 'NOT_OPENED',
+        sendStatus: 'NOT_SENT',
+        signingStatus: 'NOT_SIGNED',
+      },
+    });
+
+    // 5. Add fields to the template
+    // Add TEXT field
+    const textField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.TEXT,
+        page: 1,
+        positionX: 5,
+        positionY: 5,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'text',
+          label: 'Text Field',
+        },
+      },
+    });
+
+    // Add NUMBER field
+    const numberField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.NUMBER,
+        page: 1,
+        positionX: 5,
+        positionY: 15,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'number',
+          label: 'Number Field',
+        },
+      },
+    });
+
+    // Add RADIO field
+    const radioField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.RADIO,
+        page: 1,
+        positionX: 5,
+        positionY: 25,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'radio',
+          label: 'Radio Field',
+          values: [
+            { id: 1, value: 'Option A', checked: false },
+            { id: 2, value: 'Option B', checked: false },
+          ],
+        },
+      },
+    });
+
+    // Add CHECKBOX field
+    const checkboxField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.CHECKBOX,
+        page: 1,
+        positionX: 5,
+        positionY: 35,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'checkbox',
+          label: 'Checkbox Field',
+          values: [
+            { id: 1, value: 'Check A', checked: false },
+            { id: 2, value: 'Check B', checked: false },
+          ],
+        },
+      },
+    });
+
+    // Add DROPDOWN field
+    const dropdownField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.DROPDOWN,
+        page: 1,
+        positionX: 5,
+        positionY: 45,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'dropdown',
+          label: 'Dropdown Field',
+          values: [{ value: 'Select A' }, { value: 'Select B' }],
+        },
+      },
+    });
+
+    // 6. Sign in as the user
+    await apiSignin({
+      page,
+      email: user.email,
+    });
+
+    // 7. Navigate to the template
+    await page.goto(`${WEBAPP_BASE_URL}/templates/${template.id}`);
+
+    // 8. Create a document from the template with prefilled fields
+    const response = await request.post(
+      `${WEBAPP_BASE_URL}/api/v1/templates/${template.id}/generate-document`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          title: 'Document with Prefilled Fields',
+          recipients: [
+            {
+              id: recipient.id,
+              email: 'recipient@example.com',
+              name: 'Test Recipient',
+              role: 'SIGNER',
+            },
+          ],
+          prefillFields: [
+            {
+              id: textField.id,
+              type: 'text',
+              label: 'Prefilled Text',
+              value: 'This is prefilled text',
+            },
+            {
+              id: numberField.id,
+              type: 'number',
+              label: 'Prefilled Number',
+              value: '42',
+            },
+            {
+              id: radioField.id,
+              type: 'radio',
+              label: 'Prefilled Radio',
+              value: 'Option A',
+            },
+            {
+              id: checkboxField.id,
+              type: 'checkbox',
+              label: 'Prefilled Checkbox',
+              value: ['Check A', 'Check B'],
+            },
+            {
+              id: dropdownField.id,
+              type: 'dropdown',
+              label: 'Prefilled Dropdown',
+              value: 'Select B',
+            },
+          ],
+        },
+      },
+    );
+    const responseData = await response.json();
+
+    expect(response.ok()).toBeTruthy();
+    expect(response.status()).toBe(200);
+
+    expect(responseData.documentId).toBeDefined();
+
+    // 9. Verify the document was created with prefilled fields
+    const document = await prisma.document.findUnique({
+      where: {
+        id: responseData.documentId,
+      },
+      include: {
+        fields: true,
+      },
+    });
+
+    expect(document).not.toBeNull();
+
+    // 10. Verify each field has the correct prefilled values
+    const documentTextField = document?.fields.find(
+      (field) => field.type === FieldType.TEXT && field.fieldMeta?.type === 'text',
+    );
+    expect(documentTextField?.fieldMeta).toMatchObject({
+      type: 'text',
+      label: 'Prefilled Text',
+      text: 'This is prefilled text',
+    });
+
+    const documentNumberField = document?.fields.find(
+      (field) => field.type === FieldType.NUMBER && field.fieldMeta?.type === 'number',
+    );
+    expect(documentNumberField?.fieldMeta).toMatchObject({
+      type: 'number',
+      label: 'Prefilled Number',
+      value: '42',
+    });
+
+    const documentRadioField = document?.fields.find(
+      (field) => field.type === FieldType.RADIO && field.fieldMeta?.type === 'radio',
+    );
+    expect(documentRadioField?.fieldMeta).toMatchObject({
+      type: 'radio',
+      label: 'Prefilled Radio',
+    });
+    // Check that the correct radio option is selected
+    const radioValues = (documentRadioField?.fieldMeta as TRadioFieldMeta)?.values || [];
+    const selectedRadioOption = radioValues.find((option) => option.checked);
+    expect(selectedRadioOption?.value).toBe('Option A');
+
+    const documentCheckboxField = document?.fields.find(
+      (field) => field.type === FieldType.CHECKBOX && field.fieldMeta?.type === 'checkbox',
+    );
+    expect(documentCheckboxField?.fieldMeta).toMatchObject({
+      type: 'checkbox',
+      label: 'Prefilled Checkbox',
+    });
+    // Check that the correct checkbox options are selected
+    const checkboxValues = (documentCheckboxField?.fieldMeta as TCheckboxFieldMeta)?.values || [];
+    const checkedOptions = checkboxValues.filter((option) => option.checked);
+    expect(checkedOptions.length).toBe(2);
+    expect(checkedOptions.map((option) => option.value)).toContain('Check A');
+    expect(checkedOptions.map((option) => option.value)).toContain('Check B');
+
+    const documentDropdownField = document?.fields.find(
+      (field) => field.type === FieldType.DROPDOWN && field.fieldMeta?.type === 'dropdown',
+    );
+    expect(documentDropdownField?.fieldMeta).toMatchObject({
+      type: 'dropdown',
+      label: 'Prefilled Dropdown',
+      defaultValue: 'Select B',
+    });
+
+    // 11. Sign in as the recipient and verify the prefilled fields are visible
+    const documentRecipient = await prisma.recipient.findFirst({
+      where: {
+        documentId: document?.id,
+        email: 'recipient@example.com',
+      },
+    });
+
+    // Send the document to the recipient
+    const sendResponse = await request.post(
+      `${WEBAPP_BASE_URL}/api/v1/documents/${document?.id}/send`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          sendEmail: false,
+        },
+      },
+    );
+
+    expect(sendResponse.ok()).toBeTruthy();
+    expect(sendResponse.status()).toBe(200);
+
+    expect(documentRecipient).not.toBeNull();
+
+    // Visit the signing page
+    await page.goto(`${WEBAPP_BASE_URL}/sign/${documentRecipient?.token}`);
+
+    // Verify the prefilled fields are visible with correct values
+    // Text field
+    await expect(page.getByText('This is prefilled')).toBeVisible();
+
+    // Number field
+    await expect(page.getByText('42')).toBeVisible();
+
+    // Radio field
+    await expect(page.getByText('Option A')).toBeVisible();
+    await expect(page.getByRole('radio', { name: 'Option A' })).toBeChecked();
+
+    // Checkbox field
+    await expect(page.getByText('Check A')).toBeVisible();
+    await expect(page.getByText('Check B')).toBeVisible();
+    await expect(page.getByRole('checkbox', { name: 'Check A' })).toBeChecked();
+    await expect(page.getByRole('checkbox', { name: 'Check B' })).toBeChecked();
+
+    // Dropdown field
+    await expect(page.getByText('Select B')).toBeVisible();
+  });
+
+  test('should create a document from template without prefilled fields', async ({
+    page,
+    request,
+  }) => {
+    // 1. Create a user
+    const user = await seedUser();
+
+    // 2. Create an API token for the user
+    const { token } = await createApiToken({
+      userId: user.id,
+      tokenName: 'test-token',
+      expiresIn: null,
+    });
+
+    // 3. Create a template with seedBlankTemplate
+    const template = await seedBlankTemplate(user, {
+      createTemplateOptions: {
+        title: 'Template with Default Fields',
+      },
+    });
+
+    // 4. Create a recipient for the template
+    const recipient = await prisma.recipient.create({
+      data: {
+        templateId: template.id,
+        email: 'recipient@example.com',
+        name: 'Test Recipient',
+        role: RecipientRole.SIGNER,
+        token: 'test-token',
+        readStatus: 'NOT_OPENED',
+        sendStatus: 'NOT_SENT',
+        signingStatus: 'NOT_SIGNED',
+      },
+    });
+
+    // 5. Add fields to the template
+    // Add TEXT field
+    const textField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.TEXT,
+        page: 1,
+        positionX: 5,
+        positionY: 5,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'text',
+          label: 'Default Text Field',
+        },
+      },
+    });
+
+    // Add NUMBER field
+    const numberField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.NUMBER,
+        page: 1,
+        positionX: 5,
+        positionY: 15,
+        width: 10,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'number',
+          label: 'Default Number Field',
+        },
+      },
+    });
+
+    // 6. Sign in as the user
+    await apiSignin({
+      page,
+      email: user.email,
+    });
+
+    // 7. Navigate to the template
+    await page.goto(`${WEBAPP_BASE_URL}/templates/${template.id}`);
+
+    // 8. Create a document from the template without prefilled fields
+    const response = await request.post(
+      `${WEBAPP_BASE_URL}/api/v1/templates/${template.id}/generate-document`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          title: 'Document with Default Fields',
+          recipients: [
+            {
+              id: recipient.id,
+              email: 'recipient@example.com',
+              name: 'Test Recipient',
+              role: 'SIGNER',
+            },
+          ],
+        },
+      },
+    );
+
+    const responseData = await response.json();
+
+    expect(response.ok()).toBeTruthy();
+    expect(response.status()).toBe(200);
+
+    expect(responseData.documentId).toBeDefined();
+
+    // 9. Verify the document was created with default fields
+    const document = await prisma.document.findUnique({
+      where: {
+        id: responseData.documentId,
+      },
+      include: {
+        fields: true,
+      },
+    });
+
+    expect(document).not.toBeNull();
+
+    // 10. Verify fields have their default values
+    const documentTextField = document?.fields.find((field) => field.type === FieldType.TEXT);
+    expect(documentTextField?.fieldMeta).toMatchObject({
+      type: 'text',
+      label: 'Default Text Field',
+    });
+
+    const documentNumberField = document?.fields.find((field) => field.type === FieldType.NUMBER);
+    expect(documentNumberField?.fieldMeta).toMatchObject({
+      type: 'number',
+      label: 'Default Number Field',
+    });
+
+    // 11. Sign in as the recipient and verify the default fields are visible
+    const documentRecipient = await prisma.recipient.findFirst({
+      where: {
+        documentId: document?.id,
+        email: 'recipient@example.com',
+      },
+    });
+
+    expect(documentRecipient).not.toBeNull();
+
+    const sendResponse = await request.post(
+      `${WEBAPP_BASE_URL}/api/v1/documents/${document?.id}/send`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          sendEmail: false,
+        },
+      },
+    );
+
+    expect(sendResponse.ok()).toBeTruthy();
+    expect(sendResponse.status()).toBe(200);
+
+    // Visit the signing page
+    await page.goto(`${WEBAPP_BASE_URL}/sign/${documentRecipient?.token}`);
+
+    // Verify the default fields are visible with correct labels
+    await expect(page.getByText('Default Text Field')).toBeVisible();
+    await expect(page.getByText('Default Number Field')).toBeVisible();
+  });
+
+  test('should handle invalid field prefill values', async ({ request }) => {
+    // 1. Create a user
+    const user = await seedUser();
+
+    // 2. Create an API token for the user
+    const { token } = await createApiToken({
+      userId: user.id,
+      tokenName: 'test-token',
+      expiresIn: null,
+    });
+
+    // 3. Create a template using seedBlankTemplate
+    const template = await seedBlankTemplate(user, {
+      createTemplateOptions: {
+        title: 'Template for Invalid Test',
+        visibility: 'EVERYONE',
+      },
+    });
+
+    // 4. Create a recipient for the template
+    const recipient = await prisma.recipient.create({
+      data: {
+        templateId: template.id,
+        email: 'recipient@example.com',
+        name: 'Test Recipient',
+        role: RecipientRole.SIGNER,
+        token: 'test-token',
+        readStatus: 'NOT_OPENED',
+        sendStatus: 'NOT_SENT',
+        signingStatus: 'NOT_SIGNED',
+      },
+    });
+
+    // 5. Add a field to the template
+    const field = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.RADIO,
+        page: 1,
+        positionX: 100,
+        positionY: 100,
+        width: 100,
+        height: 50,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'radio',
+          label: 'Radio Field',
+          values: [
+            { id: 1, value: 'Option A', checked: false },
+            { id: 2, value: 'Option B', checked: false },
+          ],
+        },
+      },
+    });
+
+    // 6. Try to create a document with invalid prefill value
+    const response = await request.post(
+      `${WEBAPP_BASE_URL}/api/v1/templates/${template.id}/generate-document`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          title: 'Document with Invalid Prefill',
+          recipients: [
+            {
+              id: recipient.id,
+              email: 'recipient@example.com',
+              name: 'Test Recipient',
+              role: 'SIGNER',
+            },
+          ],
+          prefillFields: [
+            {
+              id: field.id,
+              type: 'radio',
+              label: 'Invalid Radio',
+              value: 'Non-existent Option', // This option doesn't exist
+            },
+          ],
+        },
+      },
+    );
+
+    // 7. Verify the request fails with appropriate error
+    expect(response.ok()).toBeFalsy();
+    expect(response.status()).toBe(400);
+
+    const errorData = await response.json();
+    expect(errorData.message).toContain('not found in options for RADIO field');
+  });
+});

packages/app-tests/e2e/api/v2/template-field-prefill.spec.ts

@@ -0,0 +1,600 @@
+import { expect, test } from '@playwright/test';
+
+import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';
+import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
+import type { TCheckboxFieldMeta, TRadioFieldMeta } from '@documenso/lib/types/field-meta';
+import { prisma } from '@documenso/prisma';
+import { FieldType, RecipientRole } from '@documenso/prisma/client';
+import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin } from '../../fixtures/authentication';
+
+test.describe('Template Field Prefill API v2', () => {
+  test('should create a document from template with prefilled fields', async ({
+    page,
+    request,
+  }) => {
+    // 1. Create a user
+    const user = await seedUser();
+
+    // 2. Create an API token for the user
+    const { token } = await createApiToken({
+      userId: user.id,
+      tokenName: 'test-token',
+      expiresIn: null,
+    });
+
+    // 3. Create a template with seedBlankTemplate
+    const template = await seedBlankTemplate(user, {
+      createTemplateOptions: {
+        title: 'Template with Advanced Fields V2',
+      },
+    });
+
+    // 4. Create a recipient for the template
+    const recipient = await prisma.recipient.create({
+      data: {
+        templateId: template.id,
+        email: 'recipient@example.com',
+        name: 'Test Recipient',
+        role: RecipientRole.SIGNER,
+        token: 'test-token',
+        readStatus: 'NOT_OPENED',
+        sendStatus: 'NOT_SENT',
+        signingStatus: 'NOT_SIGNED',
+      },
+    });
+
+    // 5. Add fields to the template
+    // Add TEXT field
+    const textField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.TEXT,
+        page: 1,
+        positionX: 5,
+        positionY: 5,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'text',
+          label: 'Text Field',
+        },
+      },
+    });
+
+    // Add NUMBER field
+    const numberField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.NUMBER,
+        page: 1,
+        positionX: 5,
+        positionY: 15,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'number',
+          label: 'Number Field',
+        },
+      },
+    });
+
+    // Add RADIO field
+    const radioField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.RADIO,
+        page: 1,
+        positionX: 5,
+        positionY: 25,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'radio',
+          label: 'Radio Field',
+          values: [
+            { id: 1, value: 'Option A', checked: false },
+            { id: 2, value: 'Option B', checked: false },
+          ],
+        },
+      },
+    });
+
+    // Add CHECKBOX field
+    const checkboxField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.CHECKBOX,
+        page: 1,
+        positionX: 5,
+        positionY: 35,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'checkbox',
+          label: 'Checkbox Field',
+          values: [
+            { id: 1, value: 'Check A', checked: false },
+            { id: 2, value: 'Check B', checked: false },
+          ],
+        },
+      },
+    });
+
+    // Add DROPDOWN field
+    const dropdownField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.DROPDOWN,
+        page: 1,
+        positionX: 5,
+        positionY: 45,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'dropdown',
+          label: 'Dropdown Field',
+          values: [{ value: 'Select A' }, { value: 'Select B' }],
+        },
+      },
+    });
+
+    // 6. Sign in as the user
+    await apiSignin({
+      page,
+      email: user.email,
+    });
+
+    // 7. Navigate to the template
+    await page.goto(`${WEBAPP_BASE_URL}/templates/${template.id}`);
+
+    // 8. Create a document from the template with prefilled fields using v2 API
+    const response = await request.post(`${WEBAPP_BASE_URL}/api/v2-beta/template/use`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json',
+      },
+      data: {
+        templateId: template.id,
+        recipients: [
+          {
+            id: recipient.id,
+            email: 'recipient@example.com',
+            name: 'Test Recipient',
+          },
+        ],
+        prefillFields: [
+          {
+            id: textField.id,
+            type: 'text',
+            label: 'Prefilled Text',
+            value: 'This is prefilled text',
+          },
+          {
+            id: numberField.id,
+            type: 'number',
+            label: 'Prefilled Number',
+            value: '42',
+          },
+          {
+            id: radioField.id,
+            type: 'radio',
+            label: 'Prefilled Radio',
+            value: 'Option A',
+          },
+          {
+            id: checkboxField.id,
+            type: 'checkbox',
+            label: 'Prefilled Checkbox',
+            value: ['Check A', 'Check B'],
+          },
+          {
+            id: dropdownField.id,
+            type: 'dropdown',
+            label: 'Prefilled Dropdown',
+            value: 'Select B',
+          },
+        ],
+      },
+    });
+
+    const responseData = await response.json();
+
+    expect(response.ok()).toBeTruthy();
+    expect(response.status()).toBe(200);
+
+    expect(responseData.id).toBeDefined();
+
+    // 9. Verify the document was created with prefilled fields
+    const document = await prisma.document.findUnique({
+      where: {
+        id: responseData.id,
+      },
+      include: {
+        fields: true,
+      },
+    });
+
+    expect(document).not.toBeNull();
+
+    // 10. Verify each field has the correct prefilled values
+    const documentTextField = document?.fields.find(
+      (field) => field.type === FieldType.TEXT && field.fieldMeta?.type === 'text',
+    );
+    expect(documentTextField?.fieldMeta).toMatchObject({
+      type: 'text',
+      label: 'Prefilled Text',
+      text: 'This is prefilled text',
+    });
+
+    const documentNumberField = document?.fields.find(
+      (field) => field.type === FieldType.NUMBER && field.fieldMeta?.type === 'number',
+    );
+    expect(documentNumberField?.fieldMeta).toMatchObject({
+      type: 'number',
+      label: 'Prefilled Number',
+      value: '42',
+    });
+
+    const documentRadioField = document?.fields.find(
+      (field) => field.type === FieldType.RADIO && field.fieldMeta?.type === 'radio',
+    );
+    expect(documentRadioField?.fieldMeta).toMatchObject({
+      type: 'radio',
+      label: 'Prefilled Radio',
+    });
+    // Check that the correct radio option is selected
+    const radioValues = (documentRadioField?.fieldMeta as TRadioFieldMeta)?.values || [];
+    const selectedRadioOption = radioValues.find((option) => option.checked);
+    expect(selectedRadioOption?.value).toBe('Option A');
+
+    const documentCheckboxField = document?.fields.find(
+      (field) => field.type === FieldType.CHECKBOX && field.fieldMeta?.type === 'checkbox',
+    );
+    expect(documentCheckboxField?.fieldMeta).toMatchObject({
+      type: 'checkbox',
+      label: 'Prefilled Checkbox',
+    });
+    // Check that the correct checkbox options are selected
+    const checkboxValues = (documentCheckboxField?.fieldMeta as TCheckboxFieldMeta)?.values || [];
+    const checkedOptions = checkboxValues.filter((option) => option.checked);
+    expect(checkedOptions.length).toBe(2);
+    expect(checkedOptions.map((option) => option.value)).toContain('Check A');
+    expect(checkedOptions.map((option) => option.value)).toContain('Check B');
+
+    const documentDropdownField = document?.fields.find(
+      (field) => field.type === FieldType.DROPDOWN && field.fieldMeta?.type === 'dropdown',
+    );
+    expect(documentDropdownField?.fieldMeta).toMatchObject({
+      type: 'dropdown',
+      label: 'Prefilled Dropdown',
+      defaultValue: 'Select B',
+    });
+
+    const sendResponse = await request.post(`${WEBAPP_BASE_URL}/api/v2-beta/document/distribute`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json',
+      },
+      data: {
+        documentId: document?.id,
+        meta: {
+          subject: 'Test Subject',
+          message: 'Test Message',
+        },
+      },
+    });
+
+    await expect(sendResponse.ok()).toBeTruthy();
+    await expect(sendResponse.status()).toBe(200);
+
+    // 11. Sign in as the recipient and verify the prefilled fields are visible
+    const documentRecipient = await prisma.recipient.findFirst({
+      where: {
+        documentId: document?.id,
+        email: 'recipient@example.com',
+      },
+    });
+
+    expect(documentRecipient).not.toBeNull();
+
+    // Visit the signing page
+    await page.goto(`${WEBAPP_BASE_URL}/sign/${documentRecipient?.token}`);
+
+    // Verify the prefilled fields are visible with correct values
+    // Text field
+    await expect(page.getByText('This is prefilled')).toBeVisible();
+
+    // Number field
+    await expect(page.getByText('42')).toBeVisible();
+
+    // Radio field
+    await expect(page.getByText('Option A')).toBeVisible();
+    await expect(page.getByRole('radio', { name: 'Option A' })).toBeChecked();
+
+    // Checkbox field
+    await expect(page.getByText('Check A')).toBeVisible();
+    await expect(page.getByText('Check B')).toBeVisible();
+    await expect(page.getByRole('checkbox', { name: 'Check A' })).toBeChecked();
+    await expect(page.getByRole('checkbox', { name: 'Check B' })).toBeChecked();
+
+    // Dropdown field
+    await expect(page.getByText('Select B')).toBeVisible();
+  });
+
+  test('should create a document from template without prefilled fields', async ({
+    page,
+    request,
+  }) => {
+    // 1. Create a user
+    const user = await seedUser();
+
+    // 2. Create an API token for the user
+    const { token } = await createApiToken({
+      userId: user.id,
+      tokenName: 'test-token',
+      expiresIn: null,
+    });
+
+    // 3. Create a template with seedBlankTemplate
+    const template = await seedBlankTemplate(user, {
+      createTemplateOptions: {
+        title: 'Template with Default Fields V2',
+      },
+    });
+
+    // 4. Create a recipient for the template
+    const recipient = await prisma.recipient.create({
+      data: {
+        templateId: template.id,
+        email: 'recipient@example.com',
+        name: 'Test Recipient',
+        role: RecipientRole.SIGNER,
+        token: 'test-token',
+        readStatus: 'NOT_OPENED',
+        sendStatus: 'NOT_SENT',
+        signingStatus: 'NOT_SIGNED',
+      },
+    });
+
+    // 5. Add fields to the template
+    // Add TEXT field
+    const textField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.TEXT,
+        page: 1,
+        positionX: 5,
+        positionY: 5,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'text',
+          label: 'Default Text Field',
+        },
+      },
+    });
+
+    // Add NUMBER field
+    const numberField = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.NUMBER,
+        page: 1,
+        positionX: 5,
+        positionY: 15,
+        width: 20,
+        height: 5,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'number',
+          label: 'Default Number Field',
+        },
+      },
+    });
+
+    // 6. Sign in as the user
+    await apiSignin({
+      page,
+      email: user.email,
+    });
+
+    // 7. Navigate to the template
+    await page.goto(`${WEBAPP_BASE_URL}/templates/${template.id}`);
+
+    // 8. Create a document from the template without prefilled fields using v2 API
+    const response = await request.post(`${WEBAPP_BASE_URL}/api/v2-beta/template/use`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json',
+      },
+      data: {
+        templateId: template.id,
+        recipients: [
+          {
+            id: recipient.id,
+            email: 'recipient@example.com',
+            name: 'Test Recipient',
+          },
+        ],
+      },
+    });
+
+    const responseData = await response.json();
+
+    expect(response.ok()).toBeTruthy();
+    expect(response.status()).toBe(200);
+
+    expect(responseData.id).toBeDefined();
+
+    // 9. Verify the document was created with default fields
+    const document = await prisma.document.findUnique({
+      where: {
+        id: responseData.id,
+      },
+      include: {
+        fields: true,
+      },
+    });
+
+    expect(document).not.toBeNull();
+
+    // 10. Verify fields have their default values
+    const documentTextField = document?.fields.find((field) => field.type === FieldType.TEXT);
+    expect(documentTextField?.fieldMeta).toMatchObject({
+      type: 'text',
+      label: 'Default Text Field',
+    });
+
+    const documentNumberField = document?.fields.find((field) => field.type === FieldType.NUMBER);
+    expect(documentNumberField?.fieldMeta).toMatchObject({
+      type: 'number',
+      label: 'Default Number Field',
+    });
+
+    const sendResponse = await request.post(`${WEBAPP_BASE_URL}/api/v2-beta/document/distribute`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json',
+      },
+      data: {
+        documentId: document?.id,
+        meta: {
+          subject: 'Test Subject',
+          message: 'Test Message',
+        },
+      },
+    });
+
+    await expect(sendResponse.ok()).toBeTruthy();
+    await expect(sendResponse.status()).toBe(200);
+
+    // 11. Sign in as the recipient and verify the default fields are visible
+    const documentRecipient = await prisma.recipient.findFirst({
+      where: {
+        documentId: document?.id,
+        email: 'recipient@example.com',
+      },
+    });
+
+    expect(documentRecipient).not.toBeNull();
+
+    // Visit the signing page
+    await page.goto(`${WEBAPP_BASE_URL}/sign/${documentRecipient?.token}`);
+
+    await expect(page.getByText('This is prefilled')).not.toBeVisible();
+  });
+
+  test('should handle invalid field prefill values', async ({ request }) => {
+    // 1. Create a user
+    const user = await seedUser();
+
+    // 2. Create an API token for the user
+    const { token } = await createApiToken({
+      userId: user.id,
+      tokenName: 'test-token',
+      expiresIn: null,
+    });
+
+    // 3. Create a template using seedBlankTemplate
+    const template = await seedBlankTemplate(user, {
+      createTemplateOptions: {
+        title: 'Template for Invalid Test V2',
+        visibility: 'EVERYONE',
+      },
+    });
+
+    // 4. Create a recipient for the template
+    const recipient = await prisma.recipient.create({
+      data: {
+        templateId: template.id,
+        email: 'recipient@example.com',
+        name: 'Test Recipient',
+        role: RecipientRole.SIGNER,
+        token: 'test-token',
+        readStatus: 'NOT_OPENED',
+        sendStatus: 'NOT_SENT',
+        signingStatus: 'NOT_SIGNED',
+      },
+    });
+
+    // 5. Add a field to the template
+    const field = await prisma.field.create({
+      data: {
+        templateId: template.id,
+        recipientId: recipient.id,
+        type: FieldType.RADIO,
+        page: 1,
+        positionX: 100,
+        positionY: 100,
+        width: 100,
+        height: 50,
+        customText: '',
+        inserted: false,
+        fieldMeta: {
+          type: 'radio',
+          label: 'Radio Field',
+          values: [
+            { id: 1, value: 'Option A', checked: false },
+            { id: 2, value: 'Option B', checked: false },
+          ],
+        },
+      },
+    });
+
+    // 7. Try to create a document with invalid prefill value
+    const response = await request.post(`${WEBAPP_BASE_URL}/api/v2-beta/template/use`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'Content-Type': 'application/json',
+      },
+      data: {
+        templateId: template.id,
+        recipients: [
+          {
+            id: recipient.id,
+            email: 'recipient@example.com',
+            name: 'Test Recipient',
+          },
+        ],
+        prefillFields: [
+          {
+            id: field.id,
+            type: 'radio',
+            label: 'Invalid Radio',
+            value: 'Non-existent Option', // This option doesn't exist
+          },
+        ],
+      },
+    });
+
+    // 8. Verify the request fails with appropriate error
+    expect(response.ok()).toBeFalsy();
+    expect(response.status()).toBe(400);
+
+    const errorData = await response.json();
+    expect(errorData.message).toContain('not found in options for RADIO field');
+  });
+});

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

@@ -384,7 +384,9 @@ test('[DOCUMENT_FLOW]: should be able to approve a document', async ({ page }) =
       await expect(page.locator(`#field-${field.id}`)).toHaveAttribute('data-inserted', 'true');
     }
 
-    await page.getByRole('button', { name: 'Complete' }).click();
+    await page
+      .getByRole('button', { name: role === RecipientRole.SIGNER ? 'Complete' : 'Approve' })
+      .click();
     await page
       .getByRole('button', { name: role === RecipientRole.SIGNER ? 'Sign' : 'Approve' })
       .click();
@@ -454,7 +456,7 @@ test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a
   const { status } = await getDocumentByToken(token);
   expect(status).toBe(DocumentStatus.PENDING);
 
-  await page.getByRole('button', { name: 'Complete' }).click();
+  await page.getByRole('button', { name: 'Approve' }).click();
   await expect(page.getByRole('dialog').getByText('Complete Approval').first()).toBeVisible();
   await page.getByRole('button', { name: 'Approve' }).click();
 

packages/ee/server-only/stripe/get-prices-by-plan.ts

@@ -4,15 +4,14 @@ import { stripe } from '@documenso/lib/server-only/stripe';
 type PlanType = (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE];
 
 export const getPricesByPlan = async (plan: PlanType | PlanType[]) => {
-  const planTypes = typeof plan === 'string' ? [plan] : plan;
+  const planTypes: string[] = typeof plan === 'string' ? [plan] : plan;
 
-  const query = planTypes.map((planType) => `metadata['plan']:'${planType}'`).join(' OR ');
-
-  const { data: prices } = await stripe.prices.search({
-    query,
+  const prices = await stripe.prices.list({
     expand: ['data.product'],
     limit: 100,
   });
 
-  return prices.filter((price) => price.type === 'recurring');
+  return prices.data.filter(
+    (price) => price.type === 'recurring' && planTypes.includes(price.metadata.plan),
+  );
 };

packages/ee/server-only/util/is-community-plan.ts

@@ -0,0 +1,56 @@
+import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
+import { prisma } from '@documenso/prisma';
+import type { Subscription } from '@documenso/prisma/client';
+
+import { getCommunityPlanPriceIds } from '../stripe/get-community-plan-prices';
+
+export type IsCommunityPlanOptions = {
+  userId: number;
+  teamId?: number;
+};
+
+/**
+ * Whether the user or team is on the community plan.
+ */
+export const isCommunityPlan = async ({
+  userId,
+  teamId,
+}: IsCommunityPlanOptions): Promise<boolean> => {
+  let subscriptions: Subscription[] = [];
+
+  if (teamId) {
+    subscriptions = await prisma.team
+      .findFirstOrThrow({
+        where: {
+          id: teamId,
+        },
+        select: {
+          owner: {
+            include: {
+              subscriptions: true,
+            },
+          },
+        },
+      })
+      .then((team) => team.owner.subscriptions);
+  } else {
+    subscriptions = await prisma.user
+      .findFirstOrThrow({
+        where: {
+          id: userId,
+        },
+        select: {
+          subscriptions: true,
+        },
+      })
+      .then((user) => user.subscriptions);
+  }
+
+  if (subscriptions.length === 0) {
+    return false;
+  }
+
+  const communityPlanPriceIds = await getCommunityPlanPriceIds();
+
+  return subscriptionsContainsActivePlan(subscriptions, communityPlanPriceIds);
+};

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

@@ -17,6 +17,7 @@ const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
         documentLanguage: z.string(),
         includeSenderDetails: z.boolean(),
         includeSigningCertificate: z.boolean(),
+        includeAuditTrailLog: z.boolean(),
         brandingEnabled: z.boolean(),
         brandingLogo: z.string(),
         brandingUrl: z.string(),

packages/lib/jobs/definitions/internal/seal-document.handler.ts

@@ -13,6 +13,7 @@ import { signPdf } from '@documenso/signing';
 
 import { sendCompletedEmail } from '../../../server-only/document/send-completed-email';
 import PostHogServerClient from '../../../server-only/feature-flags/get-post-hog-server-client';
+import { getAuditLogsPdf } from '../../../server-only/htmltopdf/get-audit-logs-pdf';
 import { getCertificatePdf } from '../../../server-only/htmltopdf/get-certificate-pdf';
 import { flattenAnnotations } from '../../../server-only/pdf/flatten-annotations';
 import { flattenForm } from '../../../server-only/pdf/flatten-form';
@@ -57,6 +58,7 @@ export const run = async ({
           teamGlobalSettings: {
             select: {
               includeSigningCertificate: true,
+              includeAuditTrailLog: true,
             },
           },
         },
@@ -121,13 +123,36 @@ export const run = async ({
 
   const pdfData = await getFile(documentData);
 
-  const certificateData =
-    (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
-      ? await getCertificatePdf({
-          documentId,
-          language: document.documentMeta?.language,
-        }).catch(() => null)
-      : null;
+  let includeSigningCertificate;
+
+  if (document.teamId) {
+    includeSigningCertificate =
+      document.team?.teamGlobalSettings?.includeSigningCertificate ?? true;
+  } else {
+    includeSigningCertificate = document.includeSigningCertificate ?? true;
+  }
+
+  const certificateData = includeSigningCertificate
+    ? await getCertificatePdf({
+        documentId,
+        language: document.documentMeta?.language,
+      }).catch(() => null)
+    : null;
+
+  let includeAuditTrailLog;
+
+  if (document.teamId) {
+    includeAuditTrailLog = document.team?.teamGlobalSettings?.includeAuditTrailLog ?? true;
+  } else {
+    includeAuditTrailLog = document.includeAuditTrailLog ?? true;
+  }
+
+  const auditLogData = includeAuditTrailLog
+    ? await getAuditLogsPdf({
+        documentId,
+        language: document.documentMeta?.language,
+      }).catch(() => null)
+    : null;
 
   const newDataId = await io.runTask('decorate-and-sign-pdf', async () => {
     const pdfDoc = await PDFDocument.load(pdfData);
@@ -150,6 +175,16 @@ export const run = async ({
       });
     }
 
+    if (auditLogData) {
+      const auditLog = await PDFDocument.load(auditLogData);
+
+      const auditLogPages = await pdfDoc.copyPages(auditLog, auditLog.getPageIndices());
+
+      auditLogPages.forEach((page) => {
+        pdfDoc.addPage(page);
+      });
+    }
+
     for (const field of fields) {
       if (field.inserted) {
         await insertFieldInPDF(pdfDoc, field);

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

@@ -124,6 +124,8 @@ export const createDocument = async ({
           team?.teamGlobalSettings?.documentVisibility,
           userTeamRole ?? TeamMemberRole.MEMBER,
         ),
+        includeSigningCertificate: team?.teamGlobalSettings?.includeSigningCertificate ?? true,
+        includeAuditTrailLog: team?.teamGlobalSettings?.includeAuditTrailLog ?? true,
         formValues,
         source: DocumentSource.DOCUMENT,
         documentMeta: {

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

@@ -88,6 +88,7 @@ export const findDocuments = async ({
   const searchFilter: Prisma.DocumentWhereInput = {
     OR: [
       { title: { contains: query, mode: 'insensitive' } },
+      { externalId: { contains: query, mode: 'insensitive' } },
       { recipients: { some: { name: { contains: query, mode: 'insensitive' } } } },
       { recipients: { some: { email: { contains: query, mode: 'insensitive' } } } },
     ],

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

@@ -22,6 +22,7 @@ import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { getFile } from '../../universal/upload/get-file';
 import { putPdfFile } from '../../universal/upload/put-file';
 import { fieldsContainUnsignedRequiredField } from '../../utils/advanced-fields-helpers';
+import { getAuditLogsPdf } from '../htmltopdf/get-audit-logs-pdf';
 import { getCertificatePdf } from '../htmltopdf/get-certificate-pdf';
 import { flattenAnnotations } from '../pdf/flatten-annotations';
 import { flattenForm } from '../pdf/flatten-form';
@@ -61,6 +62,7 @@ export const sealDocument = async ({
           teamGlobalSettings: {
             select: {
               includeSigningCertificate: true,
+              includeAuditTrailLog: true,
             },
           },
         },
@@ -109,13 +111,36 @@ export const sealDocument = async ({
   // !: Need to write the fields onto the document as a hard copy
   const pdfData = await getFile(documentData);
 
-  const certificateData =
-    (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
-      ? await getCertificatePdf({
-          documentId,
-          language: document.documentMeta?.language,
-        }).catch(() => null)
-      : null;
+  let includeSigningCertificate;
+
+  if (document.teamId) {
+    includeSigningCertificate =
+      document.team?.teamGlobalSettings?.includeSigningCertificate ?? true;
+  } else {
+    includeSigningCertificate = document.includeSigningCertificate ?? true;
+  }
+
+  const certificateData = includeSigningCertificate
+    ? await getCertificatePdf({
+        documentId,
+        language: document.documentMeta?.language,
+      }).catch(() => null)
+    : null;
+
+  let includeAuditTrailLog;
+
+  if (document.teamId) {
+    includeAuditTrailLog = document.team?.teamGlobalSettings?.includeAuditTrailLog ?? true;
+  } else {
+    includeAuditTrailLog = document.includeAuditTrailLog ?? true;
+  }
+
+  const auditLogData = includeAuditTrailLog
+    ? await getAuditLogsPdf({
+        documentId,
+        language: document.documentMeta?.language,
+      }).catch(() => null)
+    : null;
 
   const doc = await PDFDocument.load(pdfData);
 
@@ -134,6 +159,16 @@ export const sealDocument = async ({
     });
   }
 
+  if (auditLogData) {
+    const auditLog = await PDFDocument.load(auditLogData);
+
+    const auditLogPages = await doc.copyPages(auditLog, auditLog.getPageIndices());
+
+    auditLogPages.forEach((page) => {
+      doc.addPage(page);
+    });
+  }
+
   for (const field of fields) {
     await insertFieldInPDF(doc, field);
   }

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

@@ -34,6 +34,14 @@ export const searchDocumentsWithKeyword = async ({
           userId: userId,
           deletedAt: null,
         },
+        {
+          externalId: {
+            contains: query,
+            mode: 'insensitive',
+          },
+          userId: userId,
+          deletedAt: null,
+        },
         {
           recipients: {
             some: {
@@ -88,6 +96,23 @@ export const searchDocumentsWithKeyword = async ({
           },
           deletedAt: null,
         },
+        {
+          externalId: {
+            contains: query,
+            mode: 'insensitive',
+          },
+          teamId: {
+            not: null,
+          },
+          team: {
+            members: {
+              some: {
+                userId: userId,
+              },
+            },
+          },
+          deletedAt: null,
+        },
       ],
     },
     include: {

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

@@ -21,6 +21,8 @@ export type UpdateDocumentOptions = {
     title?: string;
     externalId?: string | null;
     visibility?: DocumentVisibility | null;
+    includeSigningCertificate?: boolean;
+    includeAuditTrailLog?: boolean;
     globalAccessAuth?: TDocumentAccessAuthTypes | null;
     globalActionAuth?: TDocumentActionAuthTypes | null;
   };
@@ -156,6 +158,12 @@ export const updateDocument = async ({
     documentGlobalActionAuth === undefined || documentGlobalActionAuth === newGlobalActionAuth;
   const isDocumentVisibilitySame =
     data.visibility === undefined || data.visibility === document.visibility;
+  const isIncludeSigningCertificateSame =
+    data.includeSigningCertificate === undefined ||
+    data.includeSigningCertificate === document.includeSigningCertificate;
+  const isIncludeAuditTrailLogSame =
+    data.includeAuditTrailLog === undefined ||
+    data.includeAuditTrailLog === document.includeAuditTrailLog;
 
   const auditLogs: CreateDocumentAuditLogDataResponse[] = [];
 
@@ -235,6 +243,34 @@ export const updateDocument = async ({
     );
   }
 
+  if (!isIncludeSigningCertificateSame) {
+    auditLogs.push(
+      createDocumentAuditLogData({
+        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED,
+        documentId,
+        metadata: requestMetadata,
+        data: {
+          from: String(document.includeSigningCertificate),
+          to: String(data.includeSigningCertificate || false),
+        },
+      }),
+    );
+  }
+
+  if (!isIncludeAuditTrailLogSame) {
+    auditLogs.push(
+      createDocumentAuditLogData({
+        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED,
+        documentId,
+        metadata: requestMetadata,
+        data: {
+          from: String(document.includeAuditTrailLog),
+          to: String(data.includeAuditTrailLog || false),
+        },
+      }),
+    );
+  }
+
   // Early return if nothing is required.
   if (auditLogs.length === 0) {
     return document;
@@ -254,6 +290,8 @@ export const updateDocument = async ({
         title: data.title,
         externalId: data.externalId,
         visibility: data.visibility as DocumentVisibility,
+        includeSigningCertificate: data.includeSigningCertificate,
+        includeAuditTrailLog: data.includeAuditTrailLog,
         authOptions,
       },
     });

packages/lib/server-only/htmltopdf/get-audit-logs-pdf.ts

@@ -0,0 +1,74 @@
+import { DateTime } from 'luxon';
+import type { Browser } from 'playwright';
+
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { type SupportedLanguageCodes, isValidLanguageCode } from '../../constants/i18n';
+import { encryptSecondaryData } from '../crypto/encrypt';
+
+export type GetAuditLogsPdfParams = {
+  documentId: number;
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  language?: SupportedLanguageCodes | (string & {});
+};
+
+export const getAuditLogsPdf = async ({ documentId, language }: GetAuditLogsPdfParams) => {
+  const { chromium } = await import('playwright');
+
+  const encryptedId = encryptSecondaryData({
+    data: documentId.toString(),
+    expiresAt: DateTime.now().plus({ minutes: 5 }).toJSDate().valueOf(),
+  });
+
+  let browser: Browser;
+
+  if (process.env.NEXT_PRIVATE_BROWSERLESS_URL) {
+    // !: Use CDP rather than the default `connect` method to avoid coupling to the playwright version.
+    // !: Previously we would have to keep the playwright version in sync with the browserless version to avoid errors.
+    browser = await chromium.connectOverCDP(process.env.NEXT_PRIVATE_BROWSERLESS_URL);
+  } else {
+    browser = await chromium.launch();
+  }
+
+  if (!browser) {
+    throw new Error(
+      'Failed to establish a browser, please ensure you have either a Browserless.io url or chromium browser installed',
+    );
+  }
+
+  const browserContext = await browser.newContext();
+
+  const page = await browserContext.newPage();
+
+  const lang = isValidLanguageCode(language) ? language : 'en';
+
+  await page.context().addCookies([
+    {
+      name: 'language',
+      value: lang,
+      url: NEXT_PUBLIC_WEBAPP_URL(),
+    },
+  ]);
+
+  try {
+    await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/__htmltopdf/audit-log?d=${encryptedId}`, {
+      waitUntil: 'networkidle',
+      timeout: 10_000,
+    });
+
+    const result = await page.pdf({
+      format: 'A4',
+    });
+
+    await browserContext.close();
+
+    void browser.close();
+
+    return result;
+  } catch (error) {
+    await browserContext.close();
+
+    void browser.close();
+
+    throw error;
+  }
+};

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

@@ -17,6 +17,7 @@ export type UpdateTeamDocumentSettingsOptions = {
     includeSenderDetails: boolean;
     typedSignatureEnabled: boolean;
     includeSigningCertificate: boolean;
+    includeAuditTrailLog: boolean;
   };
 };
 
@@ -36,6 +37,7 @@ export const updateTeamDocumentSettings = async ({
     documentLanguage,
     includeSenderDetails,
     includeSigningCertificate,
+    includeAuditTrailLog,
     typedSignatureEnabled,
   } = settings;
 
@@ -61,6 +63,7 @@ export const updateTeamDocumentSettings = async ({
       includeSenderDetails,
       typedSignatureEnabled,
       includeSigningCertificate,
+      includeAuditTrailLog,
     },
     update: {
       documentVisibility,
@@ -68,6 +71,7 @@ export const updateTeamDocumentSettings = async ({
       includeSenderDetails,
       typedSignatureEnabled,
       includeSigningCertificate,
+      includeAuditTrailLog,
     },
   });
 };

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

@@ -37,6 +37,7 @@ import {
   mapDocumentToWebhookDocumentPayload,
 } from '../../types/webhook-payload';
 import type { ApiRequestMetadata } from '../../universal/extract-request-metadata';
+import { isRequiredField } from '../../utils/advanced-fields-helpers';
 import type { CreateDocumentAuditLogDataResponse } from '../../utils/document-audit-logs';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import {
@@ -175,20 +176,28 @@ export const createDocumentFromDirectTemplate = async ({
   const metaSigningOrder = template.templateMeta?.signingOrder || DocumentSigningOrder.PARALLEL;
 
   // Associate, validate and map to a query every direct template recipient field with the provided fields.
+  // Only process fields that are either required or have been signed by the user
+  const fieldsToProcess = directTemplateRecipient.fields.filter((templateField) => {
+    const signedFieldValue = signedFieldValues.find((value) => value.fieldId === templateField.id);
+
+    // Include if it's required or has a signed value
+    return isRequiredField(templateField) || signedFieldValue !== undefined;
+  });
+
   const createDirectRecipientFieldArgs = await Promise.all(
-    directTemplateRecipient.fields.map(async (templateField) => {
+    fieldsToProcess.map(async (templateField) => {
       const signedFieldValue = signedFieldValues.find(
         (value) => value.fieldId === templateField.id,
       );
 
-      if (!signedFieldValue) {
+      if (isRequiredField(templateField) && !signedFieldValue) {
         throw new AppError(AppErrorCode.INVALID_BODY, {
           message: 'Invalid, missing or changed fields',
         });
       }
 
       if (templateField.type === FieldType.NAME && directRecipientName === undefined) {
-        directRecipientName === signedFieldValue.value;
+        directRecipientName === signedFieldValue?.value;
       }
 
       const derivedRecipientActionAuth = await validateFieldAuth({
@@ -199,9 +208,18 @@ export const createDocumentFromDirectTemplate = async ({
         },
         field: templateField,
         userId: user?.id,
-        authOptions: signedFieldValue.authOptions,
+        authOptions: signedFieldValue?.authOptions,
       });
 
+      if (!signedFieldValue) {
+        return {
+          templateField,
+          customText: '',
+          derivedRecipientActionAuth,
+          signature: null,
+        };
+      }
+
       const { value, isBase64 } = signedFieldValue;
 
       const isSignatureField =
@@ -379,7 +397,7 @@ export const createDocumentFromDirectTemplate = async ({
               positionY: templateField.positionY,
               width: templateField.width,
               height: templateField.height,
-              customText,
+              customText: customText ?? '',
               inserted: true,
               fieldMeta: templateField.fieldMeta || Prisma.JsonNull,
             })),

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

@@ -1,3 +1,5 @@
+import { match } from 'ts-pattern';
+
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 import type { DocumentDistributionMethod } from '@documenso/prisma/client';
@@ -17,7 +19,20 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import { ZRecipientAuthOptionsSchema } from '../../types/document-auth';
 import type { TDocumentEmailSettings } from '../../types/document-email';
-import { ZFieldMetaSchema } from '../../types/field-meta';
+import type {
+  TCheckboxFieldMeta,
+  TDropdownFieldMeta,
+  TFieldMetaPrefillFieldsSchema,
+  TNumberFieldMeta,
+  TRadioFieldMeta,
+  TTextFieldMeta,
+} from '../../types/field-meta';
+import {
+  ZCheckboxFieldMeta,
+  ZDropdownFieldMeta,
+  ZFieldMetaSchema,
+  ZRadioFieldMeta,
+} from '../../types/field-meta';
 import {
   ZWebhookDocumentSchema,
   mapDocumentToWebhookDocumentPayload,
@@ -50,6 +65,7 @@ export type CreateDocumentFromTemplateOptions = {
     email: string;
     signingOrder?: number | null;
   }[];
+  prefillFields?: TFieldMetaPrefillFieldsSchema[];
   customDocumentDataId?: string;
 
   /**
@@ -72,6 +88,165 @@ export type CreateDocumentFromTemplateOptions = {
   requestMetadata: ApiRequestMetadata;
 };
 
+const getUpdatedFieldMeta = (field: Field, prefillField?: TFieldMetaPrefillFieldsSchema) => {
+  if (!prefillField) {
+    return field.fieldMeta;
+  }
+
+  const advancedField = ['NUMBER', 'RADIO', 'CHECKBOX', 'DROPDOWN', 'TEXT'].includes(field.type);
+
+  if (!advancedField) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: `Field ${field.id} is not an advanced field and cannot have field meta information. Allowed types: NUMBER, RADIO, CHECKBOX, DROPDOWN, TEXT.`,
+    });
+  }
+
+  // We've already validated that the field types match at a higher level
+  // Start with the existing field meta or an empty object
+  const existingMeta = field.fieldMeta || {};
+
+  // Apply type-specific updates based on the prefill field type using ts-pattern
+  return match(prefillField)
+    .with({ type: 'text' }, (field) => {
+      if (typeof field.value !== 'string') {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Invalid value for TEXT field ${field.id}: expected string, got ${typeof field.value}`,
+        });
+      }
+
+      const meta: TTextFieldMeta = {
+        ...existingMeta,
+        type: 'text',
+        label: field.label,
+        text: field.value,
+      };
+
+      return meta;
+    })
+    .with({ type: 'number' }, (field) => {
+      if (typeof field.value !== 'string') {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Invalid value for NUMBER field ${field.id}: expected string, got ${typeof field.value}`,
+        });
+      }
+
+      const meta: TNumberFieldMeta = {
+        ...existingMeta,
+        type: 'number',
+        label: field.label,
+        value: field.value,
+      };
+
+      return meta;
+    })
+    .with({ type: 'radio' }, (field) => {
+      if (typeof field.value !== 'string') {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Invalid value for RADIO field ${field.id}: expected string, got ${typeof field.value}`,
+        });
+      }
+
+      const result = ZRadioFieldMeta.safeParse(existingMeta);
+
+      if (!result.success) {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Invalid field meta for RADIO field ${field.id}`,
+        });
+      }
+
+      const radioMeta = result.data;
+
+      // Validate that the value exists in the options
+      const valueExists = radioMeta.values?.some((option) => option.value === field.value);
+
+      if (!valueExists) {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Value "${field.value}" not found in options for RADIO field ${field.id}`,
+        });
+      }
+
+      const newValues = radioMeta.values?.map((option) => ({
+        ...option,
+        checked: option.value === field.value,
+      }));
+
+      const meta: TRadioFieldMeta = {
+        ...existingMeta,
+        type: 'radio',
+        label: field.label,
+        values: newValues,
+      };
+
+      return meta;
+    })
+    .with({ type: 'checkbox' }, (field) => {
+      const result = ZCheckboxFieldMeta.safeParse(existingMeta);
+
+      if (!result.success) {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Invalid field meta for CHECKBOX field ${field.id}`,
+        });
+      }
+
+      const checkboxMeta = result.data;
+
+      // Validate that all values exist in the options
+      for (const value of field.value) {
+        const valueExists = checkboxMeta.values?.some((option) => option.value === value);
+
+        if (!valueExists) {
+          throw new AppError(AppErrorCode.INVALID_BODY, {
+            message: `Value "${value}" not found in options for CHECKBOX field ${field.id}`,
+          });
+        }
+      }
+
+      const newValues = checkboxMeta.values?.map((option) => ({
+        ...option,
+        checked: field.value.includes(option.value),
+      }));
+
+      const meta: TCheckboxFieldMeta = {
+        ...existingMeta,
+        type: 'checkbox',
+        label: field.label,
+        values: newValues,
+      };
+
+      return meta;
+    })
+    .with({ type: 'dropdown' }, (field) => {
+      const result = ZDropdownFieldMeta.safeParse(existingMeta);
+
+      if (!result.success) {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Invalid field meta for DROPDOWN field ${field.id}`,
+        });
+      }
+
+      const dropdownMeta = result.data;
+
+      // Validate that the value exists in the options if values are defined
+      const valueExists = dropdownMeta.values?.some((option) => option.value === field.value);
+
+      if (!valueExists) {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `Value "${field.value}" not found in options for DROPDOWN field ${field.id}`,
+        });
+      }
+
+      const meta: TDropdownFieldMeta = {
+        ...existingMeta,
+        type: 'dropdown',
+        label: field.label,
+        defaultValue: field.value,
+      };
+
+      return meta;
+    })
+    .otherwise(() => field.fieldMeta);
+};
+
 export const createDocumentFromTemplate = async ({
   templateId,
   externalId,
@@ -81,6 +256,7 @@ export const createDocumentFromTemplate = async ({
   customDocumentDataId,
   override,
   requestMetadata,
+  prefillFields,
 }: CreateDocumentFromTemplateOptions) => {
   const template = await prisma.template.findUnique({
     where: {
@@ -258,6 +434,47 @@ export const createDocumentFromTemplate = async ({
 
     let fieldsToCreate: Omit<Field, 'id' | 'secondaryId' | 'templateId'>[] = [];
 
+    // Get all template field IDs first so we can validate later
+    const allTemplateFieldIds = finalRecipients.flatMap((recipient) =>
+      recipient.fields.map((field) => field.id),
+    );
+
+    if (prefillFields?.length) {
+      // Validate that all prefill field IDs exist in the template
+      const invalidFieldIds = prefillFields
+        .map((prefillField) => prefillField.id)
+        .filter((id) => !allTemplateFieldIds.includes(id));
+
+      if (invalidFieldIds.length > 0) {
+        throw new AppError(AppErrorCode.INVALID_BODY, {
+          message: `The following field IDs do not exist in the template: ${invalidFieldIds.join(', ')}`,
+        });
+      }
+
+      // Validate that all prefill fields have the correct type
+      for (const prefillField of prefillFields) {
+        const templateField = finalRecipients
+          .flatMap((recipient) => recipient.fields)
+          .find((field) => field.id === prefillField.id);
+
+        if (!templateField) {
+          // This should never happen due to the previous validation, but just in case
+          throw new AppError(AppErrorCode.INVALID_BODY, {
+            message: `Field with ID ${prefillField.id} not found in the template`,
+          });
+        }
+
+        const expectedType = templateField.type.toLowerCase();
+        const actualType = prefillField.type;
+
+        if (expectedType !== actualType) {
+          throw new AppError(AppErrorCode.INVALID_BODY, {
+            message: `Field type mismatch for field ${prefillField.id}: expected ${expectedType}, got ${actualType}`,
+          });
+        }
+      }
+    }
+
     Object.values(finalRecipients).forEach(({ email, fields }) => {
       const recipient = document.recipients.find((recipient) => recipient.email === email);
 
@@ -266,19 +483,25 @@ export const createDocumentFromTemplate = async ({
       }
 
       fieldsToCreate = fieldsToCreate.concat(
-        fields.map((field) => ({
-          documentId: document.id,
-          recipientId: recipient.id,
-          type: field.type,
-          page: field.page,
-          positionX: field.positionX,
-          positionY: field.positionY,
-          width: field.width,
-          height: field.height,
-          customText: '',
-          inserted: false,
-          fieldMeta: field.fieldMeta,
-        })),
+        fields.map((field) => {
+          const prefillField = prefillFields?.find((value) => value.id === field.id);
+          // Use type assertion to help TypeScript understand the structure
+          const updatedFieldMeta = getUpdatedFieldMeta(field, prefillField);
+
+          return {
+            documentId: document.id,
+            recipientId: recipient.id,
+            type: field.type,
+            page: field.page,
+            positionX: field.positionX,
+            positionY: field.positionY,
+            width: field.width,
+            height: field.height,
+            customText: '',
+            inserted: false,
+            fieldMeta: updatedFieldMeta,
+          };
+        }),
       );
     });
 

packages/lib/translations/fr/web.po

@@ -360,7 +360,7 @@ msgstr "<0>{teamName}</0> a demandé à utiliser votre adresse e-mail pour leur
 
 #: apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx:463
 msgid "<0>Click to upload</0> or drag and drop"
-msgstr "<0>Cliquez pour télécharger</0> ou faites glisser et déposez"
+msgstr "<0>Cliquez pour importer</0> ou faites glisser et déposez"
 
 #: packages/ui/primitives/template-flow/add-template-settings.tsx:287
 msgid "<0>Email</0> - The recipient will be emailed the document to sign, approve, etc."
@@ -1009,7 +1009,7 @@ msgstr "Une erreur est survenue lors de la mise à jour de votre profil."
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:108
 msgid "An error occurred while uploading your document."
-msgstr "Une erreur est survenue lors du téléchargement de votre document."
+msgstr "Une erreur est survenue lors de l'importation de votre document."
 
 #: apps/web/src/app/(dashboard)/admin/documents/[id]/super-delete-document-dialog.tsx:58
 #: apps/web/src/app/(dashboard)/admin/site-settings/banner-form.tsx:81
@@ -1430,7 +1430,7 @@ msgstr "Cliquez ici pour réessayer"
 
 #: apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx:392
 msgid "Click here to upload"
-msgstr "Cliquez ici pour télécharger"
+msgstr "Cliquez ici pour importer"
 
 #: apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx:52
 #: apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx:65
@@ -1597,11 +1597,11 @@ msgstr "Continuer vers la connexion"
 
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx:185
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
-msgstr "Contrôle la langue par défaut d'un document téléchargé. Cela sera utilisé comme langue dans les communications par e-mail avec les destinataires."
+msgstr "Contrôle la langue par défaut d'un document importé. Cela sera utilisé comme langue dans les communications par e-mail avec les destinataires."
 
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx:153
 msgid "Controls the default visibility of an uploaded document."
-msgstr "Contrôle la visibilité par défaut d'un document téléchargé."
+msgstr "Contrôle la visibilité par défaut d'un document importé."
 
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx:232
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
@@ -2255,11 +2255,11 @@ msgstr "Document mis à jour"
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:55
 msgid "Document upload disabled due to unpaid invoices"
-msgstr "Téléchargement du document désactivé en raison de factures impayées"
+msgstr "Importation de documents désactivé en raison de factures impayées"
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:85
 msgid "Document uploaded"
-msgstr "Document téléchargé"
+msgstr "Document importé"
 
 #: apps/web/src/app/(signing)/sign/[token]/complete/page.tsx:131
 msgid "Document Viewed"
@@ -2721,7 +2721,7 @@ msgstr "Pour toute question concernant cette divulgation, les signatures électr
 
 #: apps/web/src/components/templates/template-bulk-send-dialog.tsx:147
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
-msgstr "Pour chaque destinataire, fournissez leur email (obligatoire) et leur nom (facultatif) dans des colonnes séparées. Téléchargez le modèle CSV ci-dessous pour le format correct."
+msgstr "Pour chaque destinataire, fournissez son e-mail (obligatoire) et son nom (facultatif) dans des colonnes séparées. Téléchargez le modèle CSV ci-dessous pour obtenir le format requis."
 
 #: packages/lib/server-only/auth/send-forgot-password.ts:61
 msgid "Forgot Password?"
@@ -2770,7 +2770,7 @@ msgstr "Authentification d'action de destinataire globale"
 #: apps/web/src/components/partials/not-found.tsx:67
 #: packages/ui/primitives/document-flow/document-flow-root.tsx:142
 msgid "Go Back"
-msgstr "Retourner"
+msgstr "Retour"
 
 #: apps/web/src/app/(unauthenticated)/verify-email/[token]/client.tsx:48
 #: apps/web/src/app/(unauthenticated)/verify-email/[token]/page.tsx:73
@@ -2834,7 +2834,7 @@ msgstr "Salut, je suis Timur"
 
 #: packages/email/templates/bulk-send-complete.tsx:36
 msgid "Hi {userName},"
-msgstr "Bonjour, {userName},"
+msgstr "Bonjour {userName},"
 
 #: packages/email/templates/reset-password.tsx:56
 msgid "Hi, {userName} <0>({userEmail})</0>"
@@ -2856,7 +2856,7 @@ msgstr "Je suis un signataire de ce document"
 
 #: packages/lib/constants/recipient-roles.ts:47
 msgid "I am a viewer of this document"
-msgstr "Je suis un visualiseur de ce document"
+msgstr "Je suis un lecteur de ce document"
 
 #: packages/lib/constants/recipient-roles.ts:45
 msgid "I am an approver of this document"
@@ -3234,11 +3234,11 @@ msgstr "MAU (document terminé)"
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx:209
 msgid "Max"
-msgstr ""
+msgstr "Maximum"
 
 #: apps/web/src/components/templates/template-bulk-send-dialog.tsx:227
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
-msgstr "Taille maximale du fichier : 4 Mo. Maximum de 100 lignes par téléversement. Les valeurs vides utiliseront les valeurs par défaut du modèle."
+msgstr "Taille maximale du fichier : 4 Mo. Maximum de 100 lignes par importation. Les valeurs vides utiliseront les valeurs par défaut du modèle."
 
 #: packages/lib/constants/teams.ts:12
 msgid "Member"
@@ -5032,7 +5032,7 @@ msgstr "Modèle supprimé"
 
 #: apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx:66
 msgid "Template document uploaded"
-msgstr "Document modèle téléchargé"
+msgstr "Document modèle importé"
 
 #: apps/web/src/app/(dashboard)/templates/duplicate-template-dialog.tsx:41
 msgid "Template duplicated"
@@ -5097,11 +5097,11 @@ msgstr "Couleur du texte"
 
 #: apps/web/src/app/(unauthenticated)/articles/signature-disclosure/page.tsx:24
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
-msgstr "Merci d'utiliser Documenso pour signer vos documents électroniquement. L'objectif de cette divulgation est de vous informer sur le processus, la légalité et vos droits concernant l'utilisation des signatures électroniques sur notre plateforme. En choisissant d'utiliser une signature électronique, vous acceptez les termes et conditions énoncés ci-dessous."
+msgstr "Merci d'utiliser Documenso pour signer vos documents électroniquement. L'objectif de cette clause est de vous informer sur le processus, la légalité et vos droits concernant l'utilisation de la signature électronique sur notre plateforme. En choisissant d'utiliser un sytème de signature électronique, vous acceptez les termes et conditions exposés ci-dessous."
 
 #: packages/email/template-components/template-forgot-password.tsx:25
 msgid "That's okay, it happens! Click the button below to reset your password."
-msgstr "C'est d'accord, cela arrive ! Cliquez sur le bouton ci-dessous pour réinitialiser votre mot de passe."
+msgstr "Ce n'est pas grave, cela arrive ! Cliquez sur le bouton ci-dessous pour réinitialiser votre mot de passe."
 
 #: apps/web/src/app/(dashboard)/admin/users/[id]/delete-user-dialog.tsx:52
 msgid "The account has been deleted successfully."
@@ -5331,7 +5331,7 @@ msgstr "Le webhook a été créé avec succès."
 
 #: apps/web/src/app/(dashboard)/documents/empty-state.tsx:25
 msgid "There are no active drafts at the current moment. You can upload a document to start drafting."
-msgstr "Il n'y a pas de brouillons actifs pour le moment. Vous pouvez télécharger un document pour commencer à rédiger."
+msgstr "Il n'y a pas de brouillons actifs pour le moment. Vous pouvez importer un document pour commencer un brouillon."
 
 #: apps/web/src/app/(dashboard)/documents/empty-state.tsx:20
 msgid "There are no completed documents yet. Documents that you have created or received will appear here once completed."
@@ -5899,27 +5899,27 @@ msgstr "Améliorer"
 
 #: apps/web/src/components/templates/template-bulk-send-dialog.tsx:132
 msgid "Upload a CSV file to create multiple documents from this template. Each row represents one document with its recipient details."
-msgstr "Téléchargez un fichier CSV pour créer plusieurs documents à partir de ce modèle. Chaque ligne représente un document avec ses détails de destinataire."
+msgstr "Importer un fichier CSV pour créer plusieurs documents à partir de ce modèle. Chaque ligne représente un document avec les coordonnées de son destinataire."
 
 #: apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx:426
 msgid "Upload a custom document to use instead of the template's default document"
-msgstr "Téléchargez un document personnalisé à utiliser à la place du document par défaut du modèle"
+msgstr "Importer un document personnalisé à utiliser à la place du modèle par défaut"
 
 #: apps/web/src/components/templates/template-bulk-send-dialog.tsx:267
 msgid "Upload and Process"
-msgstr "Télécharger et traiter"
+msgstr "Importer et traiter"
 
 #: apps/web/src/components/forms/avatar-image.tsx:179
 msgid "Upload Avatar"
-msgstr "Télécharger un avatar"
+msgstr "Importer un avatar"
 
 #: apps/web/src/components/templates/template-bulk-send-dialog.tsx:198
 msgid "Upload CSV"
-msgstr "Télécharger le CSV"
+msgstr "Importer le CSV"
 
 #: apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx:419
 msgid "Upload custom document"
-msgstr "Télécharger un document personnalisé"
+msgstr "Importer un document personnalisé"
 
 #: packages/ui/primitives/signature-pad/signature-pad.tsx:529
 msgid "Upload Signature"
@@ -5927,7 +5927,7 @@ msgstr "Importer une signature"
 
 #: packages/ui/primitives/document-dropzone.tsx:70
 msgid "Upload Template Document"
-msgstr "Télécharger le document modèle"
+msgstr "Importer le document modèle"
 
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/branding-preferences.tsx:256
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
@@ -5940,15 +5940,15 @@ msgstr "Téléversé par"
 
 #: apps/web/src/components/forms/avatar-image.tsx:91
 msgid "Uploaded file is too large"
-msgstr "Le fichier téléchargé est trop volumineux"
+msgstr "Le fichier importé est trop volumineux"
 
 #: apps/web/src/components/forms/avatar-image.tsx:92
 msgid "Uploaded file is too small"
-msgstr "Le fichier téléchargé est trop petit"
+msgstr "Le fichier importé est trop petit"
 
 #: apps/web/src/components/forms/avatar-image.tsx:93
 msgid "Uploaded file not an allowed file type"
-msgstr "Le fichier téléchargé n'est pas un type de fichier autorisé"
+msgstr "Le fichier importé n'est pas un type de fichier autorisé"
 
 #: apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx:175
 msgid "Use"
@@ -6040,7 +6040,7 @@ msgstr "Vérifiez votre adresse e-mail pour débloquer toutes les fonctionnalit
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:60
 msgid "Verify your email to upload documents."
-msgstr "Vérifiez votre e-mail pour télécharger des documents."
+msgstr "Vérifiez votre e-mail pour importer des documents."
 
 #: packages/email/templates/confirm-team-email.tsx:71
 msgid "Verify your team email address"
@@ -6137,11 +6137,11 @@ msgstr "Vu"
 
 #: packages/lib/constants/recipient-roles.ts:32
 msgid "Viewer"
-msgstr "Visiteur"
+msgstr "Lecteur"
 
 #: packages/lib/constants/recipient-roles.ts:33
 msgid "Viewers"
-msgstr "Spectateurs"
+msgstr "Lecteurs"
 
 #: packages/lib/constants/recipient-roles.ts:31
 msgid "Viewing"
@@ -6526,7 +6526,7 @@ msgstr "Vous êtes sur le point d'envoyer ce document aux destinataires. Êtes-v
 
 #: apps/web/src/app/(dashboard)/settings/billing/page.tsx:80
 msgid "You are currently on the <0>Free Plan</0>."
-msgstr "Vous êtes actuellement sur le <0>Plan Gratuit</0>."
+msgstr "Vous êtes actuellement sur l'<0>Abonnement Gratuit</0>."
 
 #: apps/web/src/components/(teams)/dialogs/update-team-member-dialog.tsx:148
 msgid "You are currently updating <0>{teamMemberName}.</0>"
@@ -6610,11 +6610,11 @@ msgstr "Vous ne pouvez pas modifier un membre de l'équipe qui a un rôle plus
 
 #: packages/ui/primitives/document-dropzone.tsx:43
 msgid "You cannot upload documents at this time."
-msgstr "Vous ne pouvez pas télécharger de documents pour le moment."
+msgstr "Vous ne pouvez pas importer de documents pour le moment."
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:103
 msgid "You cannot upload encrypted PDFs"
-msgstr "Vous ne pouvez pas télécharger de PDF cryptés"
+msgstr "Vous ne pouvez pas importer de PDF cryptés"
 
 #: apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx:46
 msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
@@ -6678,11 +6678,11 @@ msgstr "Vous n'avez pas encore de webhooks. Vos webhooks seront affichés ici un
 
 #: apps/web/src/app/(dashboard)/templates/empty-state.tsx:15
 msgid "You have not yet created any templates. To create a template please upload one."
-msgstr "Vous n'avez pas encore créé de modèles. Pour créer un modèle, veuillez en télécharger un."
+msgstr "Vous n'avez pas encore créé de modèles. Pour créer un modèle, veuillez en importer un."
 
 #: apps/web/src/app/(dashboard)/documents/empty-state.tsx:30
 msgid "You have not yet created or received any documents. To create a document please upload one."
-msgstr "Vous n'avez pas encore créé ou reçu de documents. Pour créer un document, veuillez en télécharger un."
+msgstr "Vous n'avez pas encore créé ou reçu de documents. Pour créer un document, veuillez en importer un."
 
 #: apps/web/src/app/(dashboard)/templates/template-direct-link-dialog.tsx:229
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
@@ -6690,7 +6690,7 @@ msgstr "Vous avez atteint la limite maximale de {0} modèles directs. <0>Mettez
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:106
 msgid "You have reached your document limit for this month. Please upgrade your plan."
-msgstr "Vous avez atteint votre limite de documents pour ce mois. Veuillez passer à un plan supérieur."
+msgstr "Vous avez atteint votre limite de documents pour ce mois. Veuillez passer à l'abonnement supérieur."
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:56
 #: packages/ui/primitives/document-dropzone.tsx:69
@@ -6811,11 +6811,11 @@ msgstr "Votre envoi groupé a été initié. Vous recevrez une notification par
 
 #: packages/email/templates/bulk-send-complete.tsx:40
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
-msgstr "Votre opération d'envoi groupé pour le modèle \"{templateName}\" est terminée."
+msgstr "Votre envoi groupé pour le modèle \"{templateName}\" est terminé."
 
 #: apps/web/src/app/(dashboard)/settings/billing/page.tsx:125
 msgid "Your current plan is past due. Please update your payment information."
-msgstr "Votre plan actuel est en retard. Veuillez mettre à jour vos informations de paiement."
+msgstr "Votre abonnement actuel est arrivé à échéance. Veuillez mettre à jour vos informations de paiement."
 
 #: apps/web/src/components/templates/manage-public-template-dialog.tsx:249
 msgid "Your direct signing templates"
@@ -6823,7 +6823,7 @@ msgstr "Vos modèles de signature directe"
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:123
 msgid "Your document failed to upload."
-msgstr "Votre document a échoué à se télécharger."
+msgstr "L'importation de votre document a échoué."
 
 #: apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx:169
 msgid "Your document has been created from the template successfully."
@@ -6847,11 +6847,11 @@ msgstr "Votre document a été dupliqué avec succès."
 
 #: apps/web/src/app/(dashboard)/documents/upload-document.tsx:86
 msgid "Your document has been uploaded successfully."
-msgstr "Votre document a été téléchargé avec succès."
+msgstr "Votre document a été importé avec succès."
 
 #: apps/web/src/app/(dashboard)/templates/new-template-dialog.tsx:68
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
-msgstr "Votre document a été téléchargé avec succès. Vous serez redirigé vers la page de modèle."
+msgstr "Votre document a été importé avec succès. Vous serez redirigé vers la page de modèle."
 
 #: apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx:104
 msgid "Your document preferences have been updated"

packages/lib/types/document-audit-logs.ts

@@ -29,7 +29,9 @@ export const ZDocumentAuditLogTypeSchema = z.enum([
   'DOCUMENT_FIELD_INSERTED', // When a field is inserted (signed/approved/etc) by a recipient.
   'DOCUMENT_FIELD_UNINSERTED', // When a field is uninserted by a recipient.
   'DOCUMENT_FIELD_PREFILLED', // When a field is prefilled by an assistant.
-  'DOCUMENT_VISIBILITY_UPDATED', // When the document visibility scope is updated
+  'DOCUMENT_VISIBILITY_UPDATED', // When the document visibility scope is updated.
+  'DOCUMENT_SIGNING_CERTIFICATE_UPDATED', // When the include signing certificate is updated.
+  'DOCUMENT_AUDIT_TRAIL_UPDATED', // When the include audit trail is updated.
   'DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED', // When the global access authentication is updated.
   'DOCUMENT_GLOBAL_AUTH_ACTION_UPDATED', // When the global action authentication is updated.
   'DOCUMENT_META_UPDATED', // When the document meta data is updated.
@@ -397,6 +399,16 @@ export const ZDocumentAuditLogEventDocumentVisibilitySchema = z.object({
   data: ZGenericFromToSchema,
 });
 
+export const ZDocumentAuditLogEventDocumentSigningCertificateUpdatedSchema = z.object({
+  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED),
+  data: ZGenericFromToSchema,
+});
+
+export const ZDocumentAuditLogEventDocumentAuditTrailUpdatedSchema = z.object({
+  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED),
+  data: ZGenericFromToSchema,
+});
+
 /**
  * Event: Document global authentication access updated.
  */
@@ -574,6 +586,8 @@ export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and(
     ZDocumentAuditLogEventDocumentFieldUninsertedSchema,
     ZDocumentAuditLogEventDocumentFieldPrefilledSchema,
     ZDocumentAuditLogEventDocumentVisibilitySchema,
+    ZDocumentAuditLogEventDocumentSigningCertificateUpdatedSchema,
+    ZDocumentAuditLogEventDocumentAuditTrailUpdatedSchema,
     ZDocumentAuditLogEventDocumentGlobalAuthAccessUpdatedSchema,
     ZDocumentAuditLogEventDocumentGlobalAuthActionUpdatedSchema,
     ZDocumentAuditLogEventDocumentMetaUpdatedSchema,

packages/lib/types/document.ts

@@ -18,6 +18,8 @@ import { ZRecipientLiteSchema } from './recipient';
  */
 export const ZDocumentSchema = DocumentSchema.pick({
   visibility: true,
+  includeSigningCertificate: true,
+  includeAuditTrailLog: true,
   status: true,
   source: true,
   id: true,
@@ -82,6 +84,8 @@ export const ZDocumentLiteSchema = DocumentSchema.pick({
   deletedAt: true,
   teamId: true,
   templateId: true,
+  includeSigningCertificate: true,
+  includeAuditTrailLog: true,
 });
 
 /**
@@ -104,6 +108,8 @@ export const ZDocumentManySchema = DocumentSchema.pick({
   deletedAt: true,
   teamId: true,
   templateId: true,
+  includeSigningCertificate: true,
+  includeAuditTrailLog: true,
 }).extend({
   user: UserSchema.pick({
     id: true,

packages/lib/types/field-meta.ts

@@ -123,6 +123,42 @@ export const ZFieldMetaNotOptionalSchema = z.discriminatedUnion('type', [
 
 export type TFieldMetaNotOptionalSchema = z.infer<typeof ZFieldMetaNotOptionalSchema>;
 
+export const ZFieldMetaPrefillFieldsSchema = z
+  .object({
+    id: z.number(),
+  })
+  .and(
+    z.discriminatedUnion('type', [
+      z.object({
+        type: z.literal('text'),
+        label: z.string(),
+        value: z.string(),
+      }),
+      z.object({
+        type: z.literal('number'),
+        label: z.string(),
+        value: z.string(),
+      }),
+      z.object({
+        type: z.literal('radio'),
+        label: z.string(),
+        value: z.string(),
+      }),
+      z.object({
+        type: z.literal('checkbox'),
+        label: z.string(),
+        value: z.array(z.string()),
+      }),
+      z.object({
+        type: z.literal('dropdown'),
+        label: z.string(),
+        value: z.string(),
+      }),
+    ]),
+  );
+
+export type TFieldMetaPrefillFieldsSchema = z.infer<typeof ZFieldMetaPrefillFieldsSchema>;
+
 export const ZFieldMetaSchema = z
   .union([
     // Handles an empty object being provided as fieldMeta.

packages/lib/utils/document-audit-logs.ts

@@ -322,6 +322,14 @@ export const formatDocumentAuditLogAction = (
       anonymous: msg`Document visibility updated`,
       identified: msg`${prefix} updated the document visibility`,
     }))
+    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_SIGNING_CERTIFICATE_UPDATED }, () => ({
+      anonymous: msg`Document signing certificate updated`,
+      identified: msg`${prefix} updated the document signing certificate`,
+    }))
+    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_AUDIT_TRAIL_UPDATED }, () => ({
+      anonymous: msg`Document audit trail updated`,
+      identified: msg`${prefix} updated the document audit trail`,
+    }))
     .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED }, () => ({
       anonymous: msg`Document access auth updated`,
       identified: msg`${prefix} updated the document access auth requirements`,

packages/prisma/migrations/20250217090902_add_audit_trail_log_team_preferences/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "TeamGlobalSettings" ADD COLUMN     "includeAuditTrailLog" BOOLEAN NOT NULL DEFAULT false;

packages/prisma/migrations/20250219075352_add_document_properties/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Document" ADD COLUMN     "includeAuditTrail" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "includeSigningCertificate" BOOLEAN NOT NULL DEFAULT true;

packages/prisma/migrations/20250219100115_update_property_name/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `includeAuditTrail` on the `Document` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Document" DROP COLUMN "includeAuditTrail",
+ADD COLUMN     "includeAuditTrailLog" BOOLEAN NOT NULL DEFAULT false;

packages/prisma/schema.prisma

@@ -311,30 +311,32 @@ enum DocumentVisibility {
 
 /// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';", "import { ZDocumentFormValuesSchema } from '@documenso/lib/types/document-form-values';"])
 model Document {
-  id             Int                 @id @default(autoincrement())
-  externalId     String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
-  userId         Int /// @zod.number.describe("The ID of the user that created this document.")
-  user           User                @relation(fields: [userId], references: [id], onDelete: Cascade)
-  authOptions    Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
-  formValues     Json? /// [DocumentFormValues] @zod.custom.use(ZDocumentFormValuesSchema)
-  visibility     DocumentVisibility  @default(EVERYONE)
-  title          String
-  status         DocumentStatus      @default(DRAFT)
-  recipients     Recipient[]
-  fields         Field[]
-  shareLinks     DocumentShareLink[]
-  documentDataId String
-  documentData   DocumentData        @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
-  documentMeta   DocumentMeta?
-  createdAt      DateTime            @default(now())
-  updatedAt      DateTime            @default(now()) @updatedAt
-  completedAt    DateTime?
-  deletedAt      DateTime?
-  teamId         Int?
-  team           Team?               @relation(fields: [teamId], references: [id])
-  templateId     Int?
-  template       Template?           @relation(fields: [templateId], references: [id], onDelete: SetNull)
-  source         DocumentSource
+  id                        Int                 @id @default(autoincrement())
+  externalId                String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
+  userId                    Int /// @zod.number.describe("The ID of the user that created this document.")
+  user                      User                @relation(fields: [userId], references: [id], onDelete: Cascade)
+  authOptions               Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
+  formValues                Json? /// [DocumentFormValues] @zod.custom.use(ZDocumentFormValuesSchema)
+  visibility                DocumentVisibility  @default(EVERYONE)
+  includeSigningCertificate Boolean             @default(true)
+  includeAuditTrailLog      Boolean             @default(false)
+  title                     String
+  status                    DocumentStatus      @default(DRAFT)
+  recipients                Recipient[]
+  fields                    Field[]
+  shareLinks                DocumentShareLink[]
+  documentDataId            String
+  documentData              DocumentData        @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
+  documentMeta              DocumentMeta?
+  createdAt                 DateTime            @default(now())
+  updatedAt                 DateTime            @default(now()) @updatedAt
+  completedAt               DateTime?
+  deletedAt                 DateTime?
+  teamId                    Int?
+  team                      Team?               @relation(fields: [teamId], references: [id])
+  templateId                Int?
+  template                  Template?           @relation(fields: [templateId], references: [id], onDelete: SetNull)
+  source                    DocumentSource
 
   auditLogs DocumentAuditLog[]
 
@@ -543,6 +545,7 @@ model TeamGlobalSettings {
   includeSenderDetails      Boolean            @default(true)
   typedSignatureEnabled     Boolean            @default(true)
   includeSigningCertificate Boolean            @default(true)
+  includeAuditTrailLog      Boolean            @default(false)
 
   brandingEnabled        Boolean @default(false)
   brandingLogo           String  @default("")

packages/trpc/server/document-router/router.ts

@@ -65,7 +65,7 @@ export const documentRouter = router({
     .input(ZGetDocumentByIdQuerySchema)
     .query(async ({ input, ctx }) => {
       const { teamId } = ctx;
-      const { documentId } = input;
+      const { documentId, includeCertificate, includeAuditLog } = input;
 
       return await getDocumentById({
         userId: ctx.user.id,

packages/trpc/server/document-router/schema.ts

@@ -63,6 +63,16 @@ export const ZDocumentVisibilitySchema = z
   .nativeEnum(DocumentVisibility)
   .describe('The visibility of the document.');
 
+export const ZDocumentIncludeSigningCertificateSchema = z
+  .boolean()
+  .default(true)
+  .describe('Whether to include a signing certificate in the document.');
+
+export const ZDocumentIncludeAuditTrailSchema = z
+  .boolean()
+  .default(true)
+  .describe('Whether to include an audit trail in the document.');
+
 export const ZDocumentMetaTimezoneSchema = z
   .string()
   .describe(
@@ -141,6 +151,8 @@ export const ZFindDocumentAuditLogsQuerySchema = ZFindSearchParamsSchema.extend(
 
 export const ZGetDocumentByIdQuerySchema = z.object({
   documentId: z.number(),
+  includeCertificate: z.boolean().default(true).optional(),
+  includeAuditLog: z.boolean().default(true).optional(),
 });
 
 export const ZDuplicateDocumentRequestSchema = z.object({
@@ -235,6 +247,8 @@ export const ZUpdateDocumentRequestSchema = z.object({
       title: ZDocumentTitleSchema.optional(),
       externalId: ZDocumentExternalIdSchema.nullish(),
       visibility: ZDocumentVisibilitySchema.optional(),
+      includeSigningCertificate: ZDocumentIncludeSigningCertificateSchema.optional(),
+      includeAuditTrailLog: ZDocumentIncludeAuditTrailSchema.optional(),
       globalAccessAuth: ZDocumentAccessAuthTypesSchema.nullish(),
       globalActionAuth: ZDocumentActionAuthTypesSchema.nullish(),
     })

packages/trpc/server/field-router/router.ts

@@ -452,7 +452,7 @@ export const fieldRouter = router({
       return await signFieldWithToken({
         token,
         fieldId,
-        value,
+        value: value ?? '',
         isBase64,
         userId: ctx.user?.id,
         authOptions,

packages/trpc/server/field-router/schema.ts

@@ -153,7 +153,7 @@ export const ZSetFieldsForTemplateResponseSchema = z.object({
 export const ZSignFieldWithTokenMutationSchema = z.object({
   token: z.string(),
   fieldId: z.number(),
-  value: z.string().trim(),
+  value: z.string().trim().optional(),
   isBase64: z.boolean().optional(),
   authOptions: ZRecipientActionAuthSchema.optional(),
 });

packages/trpc/server/team-router/schema.ts

@@ -206,6 +206,7 @@ export const ZUpdateTeamDocumentSettingsMutationSchema = z.object({
     includeSenderDetails: z.boolean().optional().default(false),
     typedSignatureEnabled: z.boolean().optional().default(true),
     includeSigningCertificate: z.boolean().optional().default(true),
+    includeAuditTrailLog: z.boolean().optional().default(true),
   }),
 });
 

packages/trpc/server/template-router/router.ts

@@ -227,7 +227,8 @@ export const templateRouter = router({
     .output(ZCreateDocumentFromTemplateResponseSchema)
     .mutation(async ({ ctx, input }) => {
       const { teamId } = ctx;
-      const { templateId, recipients, distributeDocument, customDocumentDataId } = input;
+      const { templateId, recipients, distributeDocument, customDocumentDataId, prefillFields } =
+        input;
 
       const limits = await getServerLimits({ email: ctx.user.email, teamId });
 
@@ -242,6 +243,7 @@ export const templateRouter = router({
         recipients,
         customDocumentDataId,
         requestMetadata: ctx.metadata,
+        prefillFields,
       });
 
       if (distributeDocument) {

packages/trpc/server/template-router/schema.ts

@@ -6,6 +6,7 @@ import {
   ZDocumentActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
+import { ZFieldMetaPrefillFieldsSchema } from '@documenso/lib/types/field-meta';
 import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
 import {
   ZTemplateLiteSchema,
@@ -67,6 +68,7 @@ export const ZCreateDocumentFromTemplateRequestSchema = z.object({
       'The data ID of an alternative PDF to use when creating the document. If not provided, the PDF attached to the template will be used.',
     )
     .optional(),
+  prefillFields: z.array(ZFieldMetaPrefillFieldsSchema).optional(),
 });
 
 export const ZCreateDocumentFromTemplateResponseSchema = ZDocumentSchema;

packages/ui/primitives/document-flow/add-settings.tsx

@@ -42,6 +42,7 @@ import {
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
 
+import { Checkbox } from '../checkbox';
 import { Combobox } from '../combobox';
 import { Input } from '../input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../select';
@@ -92,6 +93,8 @@ export const AddSettingsFormPartial = ({
       visibility: document.visibility || '',
       globalAccessAuth: documentAuthOption?.globalAccessAuth || undefined,
       globalActionAuth: documentAuthOption?.globalActionAuth || undefined,
+      includeSigningCertificate: document.includeSigningCertificate ?? true,
+      includeAuditTrailLog: document.includeAuditTrailLog ?? true,
       meta: {
         timezone:
           TIME_ZONES.find((timezone) => timezone === document.documentMeta?.timezone) ??
@@ -259,6 +262,111 @@ export const AddSettingsFormPartial = ({
               />
             )}
 
+            <FormField
+              control={form.control}
+              name="globalActionAuth"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className="flex flex-row items-center">
+                    <Trans>Recipient action authentication</Trans>
+                    <DocumentGlobalAuthActionTooltip />
+                  </FormLabel>
+
+                  <FormControl>
+                    <DocumentGlobalAuthActionSelect {...field} onValueChange={field.onChange} />
+                  </FormControl>
+                </FormItem>
+              )}
+            />
+
+            <Accordion type="multiple" className="mt-6">
+              <AccordionItem value="advanced-options" className="border-none">
+                <AccordionTrigger className="text-foreground mb-2 rounded border px-3 py-2 text-left hover:bg-neutral-200/30 hover:no-underline">
+                  <Trans>Certificates</Trans>
+                </AccordionTrigger>
+
+                <AccordionContent className="text-muted-foreground -mx-1 px-1 pt-2 text-sm leading-relaxed">
+                  <div className="flex flex-col space-y-6">
+                    <FormField
+                      control={form.control}
+                      name="includeSigningCertificate"
+                      render={({ field }) => (
+                        <FormItem>
+                          <div className="flex flex-row items-center gap-4">
+                            <FormControl>
+                              <Checkbox
+                                checked={field.value}
+                                className="h-5 w-5"
+                                onCheckedChange={field.onChange}
+                              />
+                            </FormControl>
+                            <FormLabel className="m-0 flex flex-row items-center">
+                              <Trans>Include signing certificate</Trans>{' '}
+                              <Tooltip>
+                                <TooltipTrigger>
+                                  <InfoIcon className="mx-2 h-4 w-4" />
+                                </TooltipTrigger>
+
+                                <TooltipContent className="text-muted-foreground max-w-xs">
+                                  <Trans>
+                                    Including the signing certificate means that the certificate
+                                    will be attached to the document. You won't be able to remove
+                                    it. <br />
+                                    <br />
+                                    If you don't include it, you can download it individually.
+                                  </Trans>
+                                </TooltipContent>
+                              </Tooltip>
+                            </FormLabel>
+                          </div>
+
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
+                    <FormField
+                      control={form.control}
+                      name="includeAuditTrailLog"
+                      render={({ field }) => (
+                        <FormItem>
+                          <div className="flex flex-row items-center gap-4">
+                            <FormControl>
+                              <Checkbox
+                                checked={field.value}
+                                className="h-5 w-5"
+                                onCheckedChange={field.onChange}
+                              />
+                            </FormControl>
+                            <FormLabel className="m-0 flex flex-row items-center">
+                              <Trans>Include audit trail</Trans>{' '}
+                              <Tooltip>
+                                <TooltipTrigger>
+                                  <InfoIcon className="mx-2 h-4 w-4" />
+                                </TooltipTrigger>
+
+                                <TooltipContent className="text-muted-foreground max-w-xs">
+                                  <Trans>
+                                    Including the audit trail means that the log of all actions will
+                                    be attached to the document. You won't be able to remove it.{' '}
+                                    <br />
+                                    <br />
+                                    If you don't include it, you can download it individually.
+                                  </Trans>
+                                </TooltipContent>
+                              </Tooltip>
+                            </FormLabel>
+                          </div>
+
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+                </AccordionContent>
+              </AccordionItem>
+            </Accordion>
+
             {isDocumentEnterprise && (
               <FormField
                 control={form.control}

packages/ui/primitives/document-flow/add-settings.types.ts

@@ -29,6 +29,8 @@ export const ZAddSettingsFormSchema = z.object({
   title: z.string().trim().min(1, { message: "Title can't be empty" }),
   externalId: z.string().optional(),
   visibility: z.nativeEnum(DocumentVisibility).optional(),
+  includeSigningCertificate: z.boolean().default(true).optional(),
+  includeAuditTrailLog: z.boolean().default(true).optional(),
   globalAccessAuth: ZMapNegativeOneToUndefinedSchema.pipe(
     ZDocumentAccessAuthTypesSchema.optional(),
   ),

packages/ui/primitives/document-flow/field-item.tsx

@@ -12,6 +12,7 @@ import { match } from 'ts-pattern';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import type { TFieldMetaSchema } from '@documenso/lib/types/field-meta';
 import { ZCheckboxFieldMeta, ZRadioFieldMeta } from '@documenso/lib/types/field-meta';
+import { FieldType } from '@documenso/prisma/client';
 
 import { useSignerColors } from '../../lib/signer-colors';
 import { cn } from '../../lib/utils';
@@ -185,11 +186,35 @@ export const FieldItem = ({
     () => hasFieldMetaValues('CHECKBOX', field.fieldMeta, ZCheckboxFieldMeta),
     [field.fieldMeta],
   );
+
   const radioHasValues = useMemo(
     () => hasFieldMetaValues('RADIO', field.fieldMeta, ZRadioFieldMeta),
     [field.fieldMeta],
   );
 
+  const hasCheckedValues = (fieldMeta: TFieldMetaSchema, type: FieldType) => {
+    if (!fieldMeta || (type !== FieldType.RADIO && type !== FieldType.CHECKBOX)) {
+      return false;
+    }
+
+    if (type === FieldType.RADIO) {
+      const parsed = ZRadioFieldMeta.parse(fieldMeta);
+      return parsed.values?.some((value) => value.checked) ?? false;
+    }
+
+    if (type === FieldType.CHECKBOX) {
+      const parsed = ZCheckboxFieldMeta.parse(fieldMeta);
+      return parsed.values?.some((value) => value.checked) ?? false;
+    }
+
+    return false;
+  };
+
+  const fieldHasCheckedValues = useMemo(
+    () => hasCheckedValues(field.fieldMeta, field.type),
+    [field.fieldMeta, field.type],
+  );
+
   const fixedSize = checkBoxHasValues || radioHasValues;
 
   return createPortal(
@@ -229,6 +254,21 @@ export const FieldItem = ({
         onMove?.(d.node);
       }}
     >
+      {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&
+        field.fieldMeta?.label && (
+          <div
+            className={cn(
+              'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',
+              {
+                'bg-foreground/5 border-primary border': !fieldHasCheckedValues,
+                'bg-documenso-200 border-primary border': fieldHasCheckedValues,
+              },
+            )}
+          >
+            {field.fieldMeta.label}
+          </div>
+        )}
+
       <div
         className={cn(
           'relative flex h-full w-full items-center justify-center bg-white',

packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx

@@ -126,6 +126,18 @@ export const CheckboxFieldAdvancedSettings = ({
 
   return (
     <div className="flex flex-col gap-4">
+      <div className="mb-2">
+        <Label>
+          <Trans>Label</Trans>
+        </Label>
+        <Input
+          id="label"
+          className="bg-background mt-2"
+          placeholder={_(msg`Field label`)}
+          value={fieldState.label}
+          onChange={(e) => handleFieldChange('label', e.target.value)}
+        />
+      </div>
       <div className="flex flex-row items-center gap-x-4">
         <div className="flex w-2/3 flex-col">
           <Label>

packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx

@@ -105,8 +105,12 @@ export const DropdownFieldAdvancedSettings = ({
           <Trans>Select default option</Trans>
         </Label>
         <Select
-          defaultValue={defaultValue}
+          value={defaultValue}
           onValueChange={(val) => {
+            if (!val) {
+              return;
+            }
+
             setDefaultValue(val);
             handleFieldChange('defaultValue', val);
           }}
@@ -172,7 +176,7 @@ export const DropdownFieldAdvancedSettings = ({
               />
               <button
                 type="button"
-                className="col-span-1 mt-auto inline-flex h-10 w-10 items-center  text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50"
+                className="col-span-1 mt-auto inline-flex h-10 w-10 items-center text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50"
                 onClick={() => removeValue(index)}
               >
                 <Trash className="h-5 w-5" />

packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx

@@ -2,7 +2,8 @@
 
 import { useEffect, useState } from 'react';
 
-import { Trans } from '@lingui/macro';
+import { Trans, msg } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 import { ChevronDown, ChevronUp, Trash } from 'lucide-react';
 
 import { validateRadioField } from '@documenso/lib/advanced-fields-validation/validate-radio';
@@ -27,6 +28,8 @@ export const RadioFieldAdvancedSettings = ({
   handleFieldChange,
   handleErrors,
 }: RadioFieldAdvancedSettingsProps) => {
+  const { _ } = useLingui();
+
   const [showValidation, setShowValidation] = useState(false);
   const [values, setValues] = useState(
     fieldState.values ?? [{ id: 1, checked: false, value: 'Default value' }],
@@ -102,6 +105,18 @@ export const RadioFieldAdvancedSettings = ({
   return (
     <div className="flex flex-col gap-4">
       <div className="flex flex-col gap-4">
+        <div>
+          <Label>
+            <Trans>Label</Trans>
+          </Label>
+          <Input
+            id="label"
+            className="bg-background mt-2"
+            placeholder={_(msg`Field label`)}
+            value={fieldState.label}
+            onChange={(e) => handleFieldChange('label', e.target.value)}
+          />
+        </div>
         <div className="flex flex-row items-center gap-2">
           <Switch
             className="bg-background"

packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx

@@ -126,7 +126,13 @@ export const TextFieldAdvancedSettings = ({
 
         <Select
           value={fieldState.textAlign}
-          onValueChange={(value) => handleInput('textAlign', value)}
+          onValueChange={(value) => {
+            if (!value) {
+              return;
+            }
+
+            handleInput('textAlign', value);
+          }}
         >
           <SelectTrigger className="bg-background mt-2">
             <SelectValue placeholder="Select text align" />

packages/ui/primitives/signature-pad/signature-pad.tsx

@@ -282,7 +282,11 @@ export const SignaturePad = ({
       event.preventDefault();
     }
 
-    onMouseUp(event, false);
+    if (isPressed) {
+      onMouseUp(event, true);
+    } else {
+      onMouseUp(event, false);
+    }
   };
 
   const onClearClick = () => {

packages/ui/primitives/split-button.tsx

@@ -0,0 +1,83 @@
+'use client';
+
+import * as React from 'react';
+
+import { ChevronDown } from 'lucide-react';
+
+import { cn } from '../lib/utils';
+import { Button } from './button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from './dropdown-menu';
+
+const SplitButtonContext = React.createContext<{
+  variant?: React.ComponentProps<typeof Button>['variant'];
+  size?: React.ComponentProps<typeof Button>['size'];
+}>({});
+
+const SplitButton = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement> & {
+    variant?: React.ComponentProps<typeof Button>['variant'];
+    size?: React.ComponentProps<typeof Button>['size'];
+  }
+>(({ className, children, variant = 'default', size = 'default', ...props }, ref) => {
+  return (
+    <SplitButtonContext.Provider value={{ variant, size }}>
+      <div ref={ref} className={cn('inline-flex', className)} {...props}>
+        {children}
+      </div>
+    </SplitButtonContext.Provider>
+  );
+});
+SplitButton.displayName = 'SplitButton';
+
+const SplitButtonAction = React.forwardRef<
+  HTMLButtonElement,
+  React.ButtonHTMLAttributes<HTMLButtonElement>
+>(({ className, children, ...props }, ref) => {
+  const { variant, size } = React.useContext(SplitButtonContext);
+  return (
+    <Button
+      ref={ref}
+      variant={variant}
+      size={size}
+      className={cn('rounded-r-none border-r-0', className)}
+      {...props}
+    >
+      {children}
+    </Button>
+  );
+});
+SplitButtonAction.displayName = 'SplitButtonAction';
+
+const SplitButtonDropdown = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+  ({ children, ...props }, ref) => {
+    const { variant, size } = React.useContext(SplitButtonContext);
+    return (
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button
+            variant={variant}
+            size={size}
+            className="rounded-l-none px-2 focus-visible:ring-offset-0"
+          >
+            <ChevronDown className="h-4 w-4" />
+            <span className="sr-only">More options</span>
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end" {...props} ref={ref}>
+          {children}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+  },
+);
+SplitButtonDropdown.displayName = 'SplitButtonDropdown';
+
+const SplitButtonDropdownItem = DropdownMenuItem;
+
+export { SplitButton, SplitButtonAction, SplitButtonDropdown, SplitButtonDropdownItem };