chore: code changes based of review

Merge branch 'main' into expiry-links
2025-11-12 07:43:16 +10:00 · 2024-11-21 21:21:42 +00:00 · 2024-11-21 18:14:35 +00:00 · 2024-11-19 11:09:46 +00:00 · 2024-11-17 22:57:40 +00:00 · 2024-11-17 17:52:28 +00:00
299 changed files with 7080 additions and 9055 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -10,7 +10,13 @@
    "ghcr.io/devcontainers/features/node:1": {}
  },
  "onCreateCommand": "./.devcontainer/on-create.sh",
-  "forwardPorts": [3000, 54320, 9000, 2500, 1100],
+  "forwardPorts": [
+    3000,
+    54320,
+    9000,
+    2500,
+    1100
+  ],
  "customizations": {
    "vscode": {
      "extensions": [
@ -29,4 +35,4 @@
      ]
    }
  }
-}
+}
--- a/.env.example
+++ b/.env.example
@ -139,6 +139,3 @@ E2E_TEST_AUTHENTICATE_USER_PASSWORD="test_Password123"
 # [[REDIS]]
 NEXT_PRIVATE_REDIS_URL=
 NEXT_PRIVATE_REDIS_TOKEN=
-
-# [[LOGGER]]
-NEXT_PRIVATE_LOGGER_HONEY_BADGER_API_KEY=
--- a/README.md
+++ b/README.md
@ -1,7 +1,3 @@
-> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="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>
-
 <img src="https://github.com/documenso/documenso/assets/13398220/a643571f-0239-46a6-a73e-6bef38d1228b" alt="Documenso Logo">

 <p align="center" style="margin-top: 20px">
--- a/apps/documentation/README.md
+++ b/apps/documentation/README.md
@ -1 +1,36 @@
-# @documenso/documentation
+This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3002](http://localhost:3002) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
--- a/apps/documentation/package.json
+++ b/apps/documentation/package.json
@ -27,6 +27,9 @@
    "@types/node": "^20",
    "@types/react": "^18",
    "@types/react-dom": "^18",
+    "autoprefixer": "^10.0.1",
+    "postcss": "^8",
+    "tailwindcss": "^3.3.0",
    "typescript": "^5"
  }
 }
--- a/apps/documentation/pages/developers/embedding/_meta.json
+++ b/apps/documentation/pages/developers/embedding/_meta.json
@ -1,9 +0,0 @@
-{
-  "index": "Get Started",
-  "react": "React Integration",
-  "vue": "Vue Integration",
-  "svelte": "Svelte Integration",
-  "solid": "Solid Integration",
-  "preact": "Preact Integration",
-  "css-variables": "CSS Variables"
-}
--- a/apps/documentation/pages/developers/embedding/css-variables.mdx
+++ b/apps/documentation/pages/developers/embedding/css-variables.mdx
@ -1,120 +0,0 @@
---
-title: CSS Variables
-description: Learn about all available CSS variables for customizing your embedded signing experience
---
-
-# CSS Variables
-
-Platform customers have access to a comprehensive set of CSS variables that can be used to customize the appearance of the embedded signing experience. These variables control everything from colors to spacing and can be used to match your application's design system.
-
-## Available Variables
-
-### Colors
-
-| Variable                | Description                        | Default        |
-| ----------------------- | ---------------------------------- | -------------- |
-| `background`            | Base background color              | System default |
-| `foreground`            | Base text color                    | System default |
-| `muted`                 | Muted/subtle background color      | System default |
-| `mutedForeground`       | Muted/subtle text color            | System default |
-| `popover`               | Popover/dropdown background color  | System default |
-| `popoverForeground`     | Popover/dropdown text color        | System default |
-| `card`                  | Card background color              | System default |
-| `cardBorder`            | Card border color                  | System default |
-| `cardBorderTint`        | Card border tint/highlight color   | System default |
-| `cardForeground`        | Card text color                    | System default |
-| `fieldCard`             | Field card background color        | System default |
-| `fieldCardBorder`       | Field card border color            | System default |
-| `fieldCardForeground`   | Field card text color              | System default |
-| `widget`                | Widget background color            | System default |
-| `widgetForeground`      | Widget text color                  | System default |
-| `border`                | Default border color               | System default |
-| `input`                 | Input field border color           | System default |
-| `primary`               | Primary action/button color        | System default |
-| `primaryForeground`     | Primary action/button text color   | System default |
-| `secondary`             | Secondary action/button color      | System default |
-| `secondaryForeground`   | Secondary action/button text color | System default |
-| `accent`                | Accent/highlight color             | System default |
-| `accentForeground`      | Accent/highlight text color        | System default |
-| `destructive`           | Destructive/danger action color    | System default |
-| `destructiveForeground` | Destructive/danger text color      | System default |
-| `ring`                  | Focus ring color                   | System default |
-| `warning`               | Warning/alert color                | System default |
-
-### Spacing and Layout
-
-| Variable | Description                     | Default        |
-| -------- | ------------------------------- | -------------- |
-| `radius` | Border radius size in REM units | System default |
-
-## Usage Example
-
-Here's how to use these variables in your embedding implementation:
-
-```jsx
-const cssVars = {
-  // Colors
-  background: '#ffffff',
-  foreground: '#000000',
-  primary: '#0000ff',
-  primaryForeground: '#ffffff',
-  accent: '#4f46e5',
-  destructive: '#ef4444',
-
-  // Spacing
-  radius: '0.5rem'
-};
-
-// React/Preact
-<EmbedDirectTemplate
-  token={token}
-  cssVars={cssVars}
-/>
-
-// Vue
-<EmbedDirectTemplate
-  :token="token"
-  :cssVars="cssVars"
-/>
-
-// Svelte
-<EmbedDirectTemplate
-  {token}
-  cssVars={cssVars}
-/>
-
-// Solid
-<EmbedDirectTemplate
-  token={token}
-  cssVars={cssVars}
-/>
-```
-
-## Color Format
-
-Colors can be specified in any valid CSS color format:
-
- Hexadecimal: `#ff0000`
- RGB: `rgb(255, 0, 0)`
- HSL: `hsl(0, 100%, 50%)`
- Named colors: `red`
-
-The colors will be automatically converted to the appropriate format internally.
-
-## Best Practices
-
-1. **Maintain Contrast**: When customizing colors, ensure there's sufficient contrast between background and foreground colors for accessibility.
-
-2. **Test Dark Mode**: If you haven't disabled dark mode, test your color variables in both light and dark modes.
-
-3. **Use Your Brand Colors**: Align the primary and accent colors with your brand's color scheme for a cohesive look.
-
-4. **Consistent Radius**: Use a consistent border radius value that matches your application's design system.
-
-## Related
-
- [React Integration](/developers/embedding/react)
- [Vue Integration](/developers/embedding/vue)
- [Svelte Integration](/developers/embedding/svelte)
- [Solid Integration](/developers/embedding/solid)
- [Preact Integration](/developers/embedding/preact)
--- a/apps/documentation/pages/developers/embedding/index.mdx
+++ b/apps/documentation/pages/developers/embedding/index.mdx
@ -11,11 +11,7 @@ Our embedding feature lets you integrate our document signing experience into yo

 Embedding is currently available for all users on a **Teams Plan** and above, as well as **Early Adopter's** within a team (Early Adopters can create a team for free).

-Our **Platform Plan** offers enhanced customization features including:
-
- Custom CSS and styling variables
- Dark mode controls
- The removal of Documenso branding from the embedding experience
+In the future, we will roll out a **Platform Plan** that will offer additional enhancements for embedding, including the option to remove Documenso branding for a more customized experience.

 ## How Embedding Works

@ -26,49 +22,6 @@ Embedding with Documenso allows you to handle document signing in two main ways:

 _For most use-cases we recommend using direct templates, however if you have a need for a more advanced integration, we are happy to help you get started._

-## Customization Options
-
-### Styling and Theming
-
-Platform customers have access to advanced styling options to customize the embedding experience:
-
-1. **Custom CSS**: You can provide custom CSS to style the embedded component:
-
-```jsx
-<EmbedDirectTemplate
-  token={token}
-  css={`
-    .documenso-embed {
-      border-radius: 8px;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    }
-  `}
-/>
-```
-
-2. **CSS Variables**: Fine-tune the appearance using CSS variables for colors, spacing, and more:
-
-```jsx
-<EmbedDirectTemplate
-  token={token}
-  cssVars={{
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
-  }}
-/>
-```
-
-For a complete list of available CSS variables and their usage, see our [CSS Variables](/developers/embedding/css-variables) documentation.
-
-3. **Dark Mode Control**: Disable dark mode if it doesn't match your application's theme:
-
-```jsx
-<EmbedDirectTemplate token={token} darkModeDisabled={true} />
-```
-
-These customization options are available for both Direct Templates and Signing Token embeds.
-
 ## Supported Frameworks

 We support embedding across a range of popular JavaScript frameworks, including:
@ -167,11 +120,12 @@ Once you've obtained the appropriate tokens, you can integrate the signing exper

 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.

-## Related
+## Stay Tuned for the Platform Plan

- [React Integration](/developers/embedding/react)
- [Vue Integration](/developers/embedding/vue)
- [Svelte Integration](/developers/embedding/svelte)
- [Solid Integration](/developers/embedding/solid)
- [Preact Integration](/developers/embedding/preact)
- [CSS Variables](/developers/embedding/css-variables)
+While embedding is already a powerful tool, we're working on a **Platform Plan** that will introduce even more functionality. This plan will offer:
+
+- Additional customization options
+- The ability to remove Documenso branding
+- Additional controls for the signing experience
+
+More details will be shared as we approach the release.
--- a/apps/documentation/pages/developers/embedding/preact.mdx
+++ b/apps/documentation/pages/developers/embedding/preact.mdx
@ -44,9 +44,6 @@ const MyEmbeddingComponent = () => {
 | 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                  |
 | externalId          | string (optional)   | The external ID to be used for the document that will be created upon completion           |
-| css                 | string (optional)   | Custom CSS to style the embedded component (Platform Plan only)                            |
-| cssVars             | object (optional)   | CSS variables for customizing colors, spacing, etc. (Platform Plan only)                   |
-| darkModeDisabled    | boolean (optional)  | Disable dark mode functionality (Platform Plan only)                                       |
 | 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             |
@ -78,30 +75,3 @@ const MyEmbeddingComponent = () => {
 | 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             |
-
-### Styling and Theming (Platform Plan)
-
-Platform customers have access to advanced styling options:
-
-```jsx
-import { EmbedDirectTemplate } from '@documenso/embed-preact';
-
-const MyEmbeddingComponent = () => {
-  const token = 'your-token';
-  const customCss = `
-    .documenso-embed {
-      border-radius: 8px;
-      box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    }
-  `;
-  const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
-  };
-
-  return (
-    <EmbedDirectTemplate token={token} css={customCss} cssVars={cssVars} darkModeDisabled={true} />
-  );
-};
-```
--- a/apps/documentation/pages/developers/embedding/react.mdx
+++ b/apps/documentation/pages/developers/embedding/react.mdx
@ -44,9 +44,6 @@ const MyEmbeddingComponent = () => {
 | 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                  |
 | externalId          | string (optional)   | The external ID to be used for the document that will be created upon completion           |
-| css                 | string (optional)   | Custom CSS to style the embedded component (Platform Plan only)                            |
-| cssVars             | object (optional)   | CSS variables for customizing colors, spacing, etc. (Platform Plan only)                   |
-| darkModeDisabled    | boolean (optional)  | Disable dark mode functionality (Platform Plan only)                                       |
 | 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             |
@ -78,34 +75,3 @@ const MyEmbeddingComponent = () => {
 | 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             |
-
-### Styling and Theming (Platform Plan)
-
-Platform customers have access to advanced styling options:
-
-```jsx
-import { EmbedDirectTemplate } from '@documenso/embed-react';
-
-const MyEmbeddingComponent = () => {
-  return (
-    <EmbedDirectTemplate
-      token="your-token"
-      // Custom CSS
-      css={`
-        .documenso-embed {
-          border-radius: 8px;
-          box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-        }
-      `}
-      // CSS Variables
-      cssVars={{
-        colorPrimary: '#0000FF',
-        colorBackground: '#F5F5F5',
-        borderRadius: '8px',
-      }}
-      // Dark Mode Control
-      darkModeDisabled={true}
-    />
-  );
-};
-```
--- a/apps/documentation/pages/developers/embedding/solid.mdx
+++ b/apps/documentation/pages/developers/embedding/solid.mdx
@ -44,9 +44,6 @@ const MyEmbeddingComponent = () => {
 | 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                  |
 | externalId          | string (optional)   | The external ID to be used for the document that will be created upon completion           |
-| css                 | string (optional)   | Custom CSS to style the embedded component (Platform Plan only)                            |
-| cssVars             | object (optional)   | CSS variables for customizing colors, spacing, etc. (Platform Plan only)                   |
-| darkModeDisabled    | boolean (optional)  | Disable dark mode functionality (Platform Plan only)                                       |
 | 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             |
@ -78,30 +75,3 @@ const MyEmbeddingComponent = () => {
 | 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             |
-
-### Styling and Theming (Platform Plan)
-
-Platform customers have access to advanced styling options:
-
-```jsx
-import { EmbedDirectTemplate } from '@documenso/embed-solid';
-
-const MyEmbeddingComponent = () => {
-  const token = 'your-token';
-  const customCss = `
-    .documenso-embed {
-      border-radius: 8px;
-      box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    }
-  `;
-  const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
-  };
-
-  return (
-    <EmbedDirectTemplate token={token} css={customCss} cssVars={cssVars} darkModeDisabled={true} />
-  );
-};
-```
--- a/apps/documentation/pages/developers/embedding/svelte.mdx
+++ b/apps/documentation/pages/developers/embedding/svelte.mdx
@ -46,9 +46,6 @@ If you have a direct link template, you can simply provide the token for the tem
 | 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                  |
 | externalId          | string (optional)   | The external ID to be used for the document that will be created upon completion           |
-| css                 | string (optional)   | Custom CSS to style the embedded component (Platform Plan only)                            |
-| cssVars             | object (optional)   | CSS variables for customizing colors, spacing, etc. (Platform Plan only)                   |
-| darkModeDisabled    | boolean (optional)  | Disable dark mode functionality (Platform Plan only)                                       |
 | 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             |
@ -80,28 +77,3 @@ const MyEmbeddingComponent = () => {
 | 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             |
-
-### Styling and Theming (Platform Plan)
-
-Platform customers have access to advanced styling options:
-
-```html
-<script lang="ts">
-  import { EmbedDirectTemplate } from '@documenso/embed-svelte';
-
-  const token = 'your-token';
-  const customCss = `
-    .documenso-embed {
-      border-radius: 8px;
-      box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    }
-  `;
-  const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
-  };
-</script>
-
-<EmbedDirectTemplate {token} css="{customCss}" cssVars="{cssVars}" darkModeDisabled="{true}" />
-```
--- a/apps/documentation/pages/developers/embedding/vue.mdx
+++ b/apps/documentation/pages/developers/embedding/vue.mdx
@ -46,9 +46,6 @@ If you have a direct link template, you can simply provide the token for the tem
 | 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                  |
 | externalId          | string (optional)   | The external ID to be used for the document that will be created upon completion           |
-| css                 | string (optional)   | Custom CSS to style the embedded component (Platform Plan only)                            |
-| cssVars             | object (optional)   | CSS variables for customizing colors, spacing, etc. (Platform Plan only)                   |
-| darkModeDisabled    | boolean (optional)  | Disable dark mode functionality (Platform Plan only)                                       |
 | 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             |
@ -80,35 +77,3 @@ const MyEmbeddingComponent = () => {
 | 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             |
-
-### Styling and Theming (Platform Plan)
-
-Platform customers have access to advanced styling options:
-
-```html
-<script setup lang="ts">
-  import { EmbedDirectTemplate } from '@documenso/embed-vue';
-
-  const token = ref('your-token');
-  const customCss = `
-  .documenso-embed {
-    border-radius: 8px;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-  }
-`;
-  const cssVars = {
-    colorPrimary: '#0000FF',
-    colorBackground: '#F5F5F5',
-    borderRadius: '8px',
-  };
-</script>
-
-<template>
-  <EmbedDirectTemplate
-    :token="token"
-    :css="customCss"
-    :cssVars="cssVars"
-    :darkModeDisabled="true"
-  />
-</template>
-```
--- a/apps/documentation/pages/developers/public-api/reference.mdx
+++ b/apps/documentation/pages/developers/public-api/reference.mdx
@ -500,35 +500,8 @@ Now you can make a `POST` request to the `/api/v1/documents/{documentId}/fields`
  value, this is the value that will be used to sign the field.
 </Callout>

-<Callout type="warning">
-  It's important to pass the `type` in the `fieldMeta` property for the advanced fields. [Read more
-  here](#a-note-on-advanced-fields)
-</Callout>
-
 A successful request will return a JSON response with the newly added fields. The image below illustrates the fields added to the document via the API.

 ![A screenshot of the document in the Documenso editor](/api-reference/fields-added-via-api.webp)

 </Steps>
-
-#### A Note on Advanced Fields
-
-The advanced fields are: text, checkbox, radio, number, and select. Whenever you append any of these advanced fields to a document, you need to pass the `type` in the `fieldMeta` property:
-
-```json
-...
-"fieldMeta": {
-  "type": "text",
-}
-...
-```
-
-Replace the `text` value with the corresponding field type:
-
- For the `TEXT` field it should be `text`.
- For the `CHECKBOX` field it should be `checkbox`.
- For the `RADIO` field it should be `radio`.
- For the `NUMBER` field it should be `number`.
- 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.
--- a/apps/documentation/pages/developers/webhooks.mdx
+++ b/apps/documentation/pages/developers/webhooks.mdx
@ -20,7 +20,6 @@ Documenso supports Webhooks and allows you to subscribe to the following events:
 - `document.opened`
 - `document.signed`
 - `document.completed`
- `document.rejected`

 ## Create a webhook subscription

@ -37,7 +36,7 @@ Clicking on the "**Create Webhook**" button opens a modal to create a new webhoo
 To create a new webhook subscription, you need to provide the following information:

 - Enter the webhook URL that will receive the event payload.
- Select the event(s) you want to subscribe to: `document.created`, `document.sent`, `document.opened`, `document.signed`, `document.completed`, `document.rejected`.
+- Select the event(s) you want to subscribe to: `document.created`, `document.sent`, `document.opened`, `document.signed`, `document.completed`.
 - Optionally, you can provide a secret key that will be used to sign the payload. This key will be included in the `X-Documenso-Secret` header of the request.

 ![A screenshot of the Create Webhook modal that shows the URL input field and the event checkboxes](/webhook-images/webhooks-page-create-webhook-modal.webp)
@ -54,55 +53,45 @@ You can edit or delete your webhook subscriptions by clicking the "**Edit**" or

 The payload sent to the webhook URL contains the following fields:

-| Field                                        | Type      | Description                                           |
-| -------------------------------------------- | --------- | ----------------------------------------------------- |
-| `event`                                      | string    | The type of event that triggered the webhook.         |
-| `payload.id`                                 | number    | The id of the document.                               |
-| `payload.externalId`                         | string?   | External identifier for the document.                 |
-| `payload.userId`                             | number    | The id of the user who owns the document.             |
-| `payload.authOptions`                        | json?     | Authentication options for the document.              |
-| `payload.formValues`                         | json?     | Form values for the document.                         |
-| `payload.visibility`                         | string    | Document visibility (e.g., EVERYONE).                 |
-| `payload.title`                              | string    | The title of the document.                            |
-| `payload.status`                             | string    | The current status of the document.                   |
-| `payload.documentDataId`                     | string    | The identifier for the document data.                 |
-| `payload.createdAt`                          | datetime  | The creation date and time of the document.           |
-| `payload.updatedAt`                          | datetime  | The last update date and time of the document.        |
-| `payload.completedAt`                        | datetime? | The completion date and time of the document.         |
-| `payload.deletedAt`                          | datetime? | The deletion date and time of the document.           |
-| `payload.teamId`                             | number?   | The id of the team if document belongs to a team.     |
-| `payload.templateId`                         | number?   | The id of the template if created from template.      |
-| `payload.source`                             | string    | The source of the document (e.g., DOCUMENT, TEMPLATE) |
-| `payload.documentMeta.id`                    | string    | The id of the document metadata.                      |
-| `payload.documentMeta.subject`               | string?   | The subject of the document.                          |
-| `payload.documentMeta.message`               | string?   | The message associated with the document.             |
-| `payload.documentMeta.timezone`              | string    | The timezone setting for the document.                |
-| `payload.documentMeta.password`              | string?   | The password protection if set.                       |
-| `payload.documentMeta.dateFormat`            | string    | The date format used in the document.                 |
-| `payload.documentMeta.redirectUrl`           | string?   | The URL to redirect after signing.                    |
-| `payload.documentMeta.signingOrder`          | string    | The signing order (e.g., PARALLEL, SEQUENTIAL).       |
-| `payload.documentMeta.typedSignatureEnabled` | boolean   | Whether typed signatures are enabled.                 |
-| `payload.documentMeta.language`              | string    | The language of the document.                         |
-| `payload.documentMeta.distributionMethod`    | string    | The method of distributing the document.              |
-| `payload.documentMeta.emailSettings`         | json?     | Email notification settings.                          |
-| `payload.Recipient[].id`                     | number    | The id of the recipient.                              |
-| `payload.Recipient[].documentId`             | number?   | The id of the document for this recipient.            |
-| `payload.Recipient[].templateId`             | number?   | The template id if from a template.                   |
-| `payload.Recipient[].email`                  | string    | The email address of the recipient.                   |
-| `payload.Recipient[].name`                   | string    | The name of the recipient.                            |
-| `payload.Recipient[].token`                  | string    | The unique token for this recipient.                  |
-| `payload.Recipient[].documentDeletedAt`      | datetime? | When the document was deleted for this recipient.     |
-| `payload.Recipient[].expired`                | datetime? | When the recipient's access expired.                  |
-| `payload.Recipient[].signedAt`               | datetime? | When the recipient signed the document.               |
-| `payload.Recipient[].authOptions`            | json?     | Authentication options for this recipient.            |
-| `payload.Recipient[].signingOrder`           | number?   | The order in which this recipient should sign.        |
-| `payload.Recipient[].rejectionReason`        | string?   | The reason if the recipient rejected the document.    |
-| `payload.Recipient[].role`                   | string    | The role of the recipient (e.g., SIGNER, VIEWER).     |
-| `payload.Recipient[].readStatus`             | string    | Whether the recipient has read the document.          |
-| `payload.Recipient[].signingStatus`          | string    | The signing status of this recipient.                 |
-| `payload.Recipient[].sendStatus`             | string    | The sending status for this recipient.                |
-| `createdAt`                                  | datetime  | The creation date and time of the webhook event.      |
-| `webhookEndpoint`                            | string    | The endpoint URL where the webhook is sent.           |
+| Field                                        | Type      | Description                                          |
+| -------------------------------------------- | --------- | ---------------------------------------------------- |
+| `event`                                      | string    | The type of event that triggered the webhook.        |
+| `payload.id`                                 | number    | The id of the document.                              |
+| `payload.userId`                             | number    | The id of the user who owns the document.            |
+| `payload.authOptions`                        | json?     | Authentication options for the document.             |
+| `payload.formValues`                         | json?     | Form values for the document.                        |
+| `payload.title`                              | string    | The name of the document.                            |
+| `payload.status`                             | string    | The current status of the document.                  |
+| `payload.documentDataId`                     | string    | The identifier for the document data.                |
+| `payload.createdAt`                          | datetime  | The creation date and time of the document.          |
+| `payload.updatedAt`                          | datetime  | The last update date and time of the document.       |
+| `payload.completedAt`                        | datetime? | The completion date and time of the document.        |
+| `payload.deletedAt`                          | datetime? | The deletion date and time of the document.          |
+| `payload.teamId`                             | number?   | The id of the team.                                  |
+| `payload.documentData.id`                    | string    | The id of the document data.                         |
+| `payload.documentData.type`                  | string    | The type of the document data.                       |
+| `payload.documentData.data`                  | string    | The data of the document.                            |
+| `payload.documentData.initialData`           | string    | The initial data of the document.                    |
+| `payload.Recipient[].id`                     | number    | The id of the recipient.                             |
+| `payload.Recipient[].documentId`             | number?   | The id the document associated with the recipient.   |
+| `payload.Recipient[].templateId`             | number?   | The template identifier for the recipient.           |
+| `payload.Recipient[].email`                  | string    | The email address of the recipient.                  |
+| `payload.Recipient[].name`                   | string    | The name of the recipient.                           |
+| `payload.Recipient[].token`                  | string    | The token associated with the recipient.             |
+| `payload.Recipient[].expired`                | datetime? | The expiration status of the recipient.              |
+| `payload.Recipient[].signedAt`               | datetime? | The date and time the recipient signed the document. |
+| `payload.Recipient[].authOptions.accessAuth` | json?     | Access authentication options.                       |
+| `payload.Recipient[].authOptions.actionAuth` | json?     | Action authentication options.                       |
+| `payload.Recipient[].role`                   | string    | The role of the recipient.                           |
+| `payload.Recipient[].readStatus`             | string    | The read status of the document by the recipient.    |
+| `payload.Recipient[].signingStatus`          | string    | The signing status of the recipient.                 |
+| `payload.Recipient[].sendStatus`             | string    | The send status of the document to the recipient.    |
+| `createdAt`                                  | datetime  | The creation date and time of the webhook event.     |
+| `webhookEndpoint`                            | string    | The endpoint URL where the webhook is sent.          |
+
+## Webhook event payload example
+
+When an event that you have subscribed to occurs, Documenso will send a POST request to the specified webhook URL with a payload containing information about the event.

 ## Example payloads

@ -115,11 +104,9 @@ Example payload for the `document.created` event:
  "event": "DOCUMENT_CREATED",
  "payload": {
    "id": 10,
-    "externalId": null,
    "userId": 1,
    "authOptions": null,
    "formValues": null,
-    "visibility": "EVERYONE",
    "title": "documenso.pdf",
    "status": "DRAFT",
    "documentDataId": "hs8qz1ktr9204jn7mg6c5dxy0",
@ -127,43 +114,7 @@ Example payload for the `document.created` event:
    "updatedAt": "2024-04-22T11:44:43.341Z",
    "completedAt": null,
    "deletedAt": null,
-    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "doc_meta_123",
-      "subject": "Please sign this document",
-      "message": "Hello, please review and sign this document.",
-      "timezone": "UTC",
-      "password": null,
-      "dateFormat": "MM/DD/YYYY",
-      "redirectUrl": null,
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": null
-    },
-    "Recipient": [
-      {
-        "id": 52,
-        "documentId": 10,
-        "templateId": null,
-        "email": "signer@documenso.com",
-        "name": "John Doe",
-        "token": "vbT8hi3jKQmrFP_LN1WcS",
-        "documentDeletedAt": null,
-        "expired": null,
-        "signedAt": null,
-        "authOptions": null,
-        "signingOrder": 1,
-        "rejectionReason": null,
-        "role": "SIGNER",
-        "readStatus": "NOT_OPENED",
-        "signingStatus": "NOT_SIGNED",
-        "sendStatus": "NOT_SENT"
-      }
-    ]
+    "teamId": null
  },
  "createdAt": "2024-04-22T11:44:44.779Z",
  "webhookEndpoint": "https://mywebhooksite.com/mywebhook"
@ -177,11 +128,9 @@ Example payload for the `document.sent` event:
  "event": "DOCUMENT_SENT",
  "payload": {
    "id": 10,
-    "externalId": null,
    "userId": 1,
    "authOptions": null,
    "formValues": null,
-    "visibility": "EVERYONE",
    "title": "documenso.pdf",
    "status": "PENDING",
    "documentDataId": "hs8qz1ktr9204jn7mg6c5dxy0",
@ -190,22 +139,6 @@ Example payload for the `document.sent` event:
    "completedAt": null,
    "deletedAt": null,
    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "doc_meta_123",
-      "subject": "Please sign this document",
-      "message": "Hello, please review and sign this document.",
-      "timezone": "UTC",
-      "password": null,
-      "dateFormat": "MM/DD/YYYY",
-      "redirectUrl": null,
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": null
-    },
    "Recipient": [
      {
        "id": 52,
@ -214,12 +147,12 @@ Example payload for the `document.sent` event:
        "email": "signer2@documenso.com",
        "name": "Signer 2",
        "token": "vbT8hi3jKQmrFP_LN1WcS",
-        "documentDeletedAt": null,
        "expired": null,
        "signedAt": null,
-        "authOptions": null,
-        "signingOrder": 1,
-        "rejectionReason": null,
+        "authOptions": {
+          "accessAuth": null,
+          "actionAuth": null
+        },
        "role": "VIEWER",
        "readStatus": "NOT_OPENED",
        "signingStatus": "NOT_SIGNED",
@ -232,12 +165,12 @@ Example payload for the `document.sent` event:
        "email": "signer1@documenso.com",
        "name": "Signer 1",
        "token": "HkrptwS42ZBXdRKj1TyUo",
-        "documentDeletedAt": null,
        "expired": null,
        "signedAt": null,
-        "authOptions": null,
-        "signingOrder": 2,
-        "rejectionReason": null,
+        "authOptions": {
+          "accessAuth": null,
+          "actionAuth": null
+        },
        "role": "SIGNER",
        "readStatus": "NOT_OPENED",
        "signingStatus": "NOT_SIGNED",
@ -257,11 +190,9 @@ Example payload for the `document.opened` event:
  "event": "DOCUMENT_OPENED",
  "payload": {
    "id": 10,
-    "externalId": null,
    "userId": 1,
    "authOptions": null,
    "formValues": null,
-    "visibility": "EVERYONE",
    "title": "documenso.pdf",
    "status": "PENDING",
    "documentDataId": "hs8qz1ktr9204jn7mg6c5dxy0",
@ -270,22 +201,6 @@ Example payload for the `document.opened` event:
    "completedAt": null,
    "deletedAt": null,
    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "doc_meta_123",
-      "subject": "Please sign this document",
-      "message": "Hello, please review and sign this document.",
-      "timezone": "UTC",
-      "password": null,
-      "dateFormat": "MM/DD/YYYY",
-      "redirectUrl": null,
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": null
-    },
    "Recipient": [
      {
        "id": 52,
@ -294,18 +209,24 @@ Example payload for the `document.opened` event:
        "email": "signer2@documenso.com",
        "name": "Signer 2",
        "token": "vbT8hi3jKQmrFP_LN1WcS",
-        "documentDeletedAt": null,
        "expired": null,
        "signedAt": null,
-        "authOptions": null,
-        "signingOrder": 1,
-        "rejectionReason": null,
+        "authOptions": {
+          "accessAuth": null,
+          "actionAuth": null
+        },
        "role": "VIEWER",
        "readStatus": "OPENED",
        "signingStatus": "NOT_SIGNED",
        "sendStatus": "SENT"
      }
-    ]
+    ],
+    "documentData": {
+      "id": "hs8qz1ktr9204jn7mg6c5dxy0",
+      "type": "S3_PATH",
+      "data": "9753/xzqrshtlpokm/documenso.pdf",
+      "initialData": "9753/xzqrshtlpokm/documenso.pdf"
+    }
  },
  "createdAt": "2024-04-22T11:50:26.174Z",
  "webhookEndpoint": "https://mywebhooksite.com/mywebhook"
@ -319,11 +240,9 @@ Example payload for the `document.signed` event:
  "event": "DOCUMENT_SIGNED",
  "payload": {
    "id": 10,
-    "externalId": null,
    "userId": 1,
    "authOptions": null,
    "formValues": null,
-    "visibility": "EVERYONE",
    "title": "documenso.pdf",
    "status": "COMPLETED",
    "documentDataId": "hs8qz1ktr9204jn7mg6c5dxy0",
@ -332,22 +251,6 @@ Example payload for the `document.signed` event:
    "completedAt": "2024-04-22T11:52:05.707Z",
    "deletedAt": null,
    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "doc_meta_123",
-      "subject": "Please sign this document",
-      "message": "Hello, please review and sign this document.",
-      "timezone": "UTC",
-      "password": null,
-      "dateFormat": "MM/DD/YYYY",
-      "redirectUrl": null,
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": null
-    },
    "Recipient": [
      {
        "id": 51,
@ -356,15 +259,12 @@ Example payload for the `document.signed` event:
        "email": "signer1@documenso.com",
        "name": "Signer 1",
        "token": "HkrptwS42ZBXdRKj1TyUo",
-        "documentDeletedAt": null,
        "expired": null,
        "signedAt": "2024-04-22T11:52:05.688Z",
        "authOptions": {
          "accessAuth": null,
          "actionAuth": null
        },
-        "signingOrder": 1,
-        "rejectionReason": null,
        "role": "SIGNER",
        "readStatus": "OPENED",
        "signingStatus": "SIGNED",
@ -384,11 +284,9 @@ Example payload for the `document.completed` event:
  "event": "DOCUMENT_COMPLETED",
  "payload": {
    "id": 10,
-    "externalId": null,
    "userId": 1,
    "authOptions": null,
    "formValues": null,
-    "visibility": "EVERYONE",
    "title": "documenso.pdf",
    "status": "COMPLETED",
    "documentDataId": "hs8qz1ktr9204jn7mg6c5dxy0",
@ -397,21 +295,11 @@ Example payload for the `document.completed` event:
    "completedAt": "2024-04-22T11:52:05.707Z",
    "deletedAt": null,
    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "doc_meta_123",
-      "subject": "Please sign this document",
-      "message": "Hello, please review and sign this document.",
-      "timezone": "UTC",
-      "password": null,
-      "dateFormat": "MM/DD/YYYY",
-      "redirectUrl": null,
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": null
+    "documentData": {
+      "id": "hs8qz1ktr9204jn7mg6c5dxy0",
+      "type": "S3_PATH",
+      "data": "bk9p1h7x0s3m/documenso-signed.pdf",
+      "initialData": "9753/xzqrshtlpokm/documenso.pdf"
    },
    "Recipient": [
      {
@ -421,15 +309,12 @@ Example payload for the `document.completed` event:
        "email": "signer2@documenso.com",
        "name": "Signer 2",
        "token": "vbT8hi3jKQmrFP_LN1WcS",
-        "documentDeletedAt": null,
        "expired": null,
        "signedAt": "2024-04-22T11:51:10.055Z",
        "authOptions": {
          "accessAuth": null,
          "actionAuth": null
        },
-        "signingOrder": 1,
-        "rejectionReason": null,
        "role": "VIEWER",
        "readStatus": "OPENED",
        "signingStatus": "SIGNED",
@ -442,15 +327,12 @@ Example payload for the `document.completed` event:
        "email": "signer1@documenso.com",
        "name": "Signer 1",
        "token": "HkrptwS42ZBXdRKj1TyUo",
-        "documentDeletedAt": null,
        "expired": null,
        "signedAt": "2024-04-22T11:52:05.688Z",
        "authOptions": {
          "accessAuth": null,
          "actionAuth": null
        },
-        "signingOrder": 2,
-        "rejectionReason": null,
        "role": "SIGNER",
        "readStatus": "OPENED",
        "signingStatus": "SIGNED",
@ -463,71 +345,6 @@ Example payload for the `document.completed` event:
 }
 ```

-Example payload for the `document.rejected` event:
-
-```json
-{
-  "event": "DOCUMENT_REJECTED",
-  "payload": {
-    "id": 10,
-    "externalId": null,
-    "userId": 1,
-    "authOptions": null,
-    "formValues": null,
-    "visibility": "EVERYONE",
-    "title": "documenso.pdf",
-    "status": "PENDING",
-    "documentDataId": "hs8qz1ktr9204jn7mg6c5dxy0",
-    "createdAt": "2024-04-22T11:44:43.341Z",
-    "updatedAt": "2024-04-22T11:48:07.569Z",
-    "completedAt": null,
-    "deletedAt": null,
-    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "doc_meta_123",
-      "subject": "Please sign this document",
-      "message": "Hello, please review and sign this document.",
-      "timezone": "UTC",
-      "password": null,
-      "dateFormat": "MM/DD/YYYY",
-      "redirectUrl": null,
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": null
-    },
-    "Recipient": [
-      {
-        "id": 52,
-        "documentId": 10,
-        "templateId": null,
-        "email": "signer@documenso.com",
-        "name": "Signer",
-        "token": "vbT8hi3jKQmrFP_LN1WcS",
-        "documentDeletedAt": null,
-        "expired": null,
-        "signedAt": "2024-04-22T11:48:07.569Z",
-        "authOptions": {
-          "accessAuth": null,
-          "actionAuth": null
-        },
-        "signingOrder": 1,
-        "rejectionReason": "I do not agree with the terms",
-        "role": "SIGNER",
-        "readStatus": "OPENED",
-        "signingStatus": "REJECTED",
-        "sendStatus": "SENT"
-      }
-    ]
-  },
-  "createdAt": "2024-04-22T11:48:07.945Z",
-  "webhookEndpoint": "https://mywebhooksite.com/mywebhook"
-}
-```
-
 ## Availability

 Webhooks are available to individual users and teams.
--- a/apps/documentation/pages/users/_meta.json
+++ b/apps/documentation/pages/users/_meta.json
@ -10,6 +10,7 @@
  "signing-documents": "Signing Documents",
  "templates": "Templates",
  "direct-links": "Direct Signing Links",
+  "document-visibility": "Document Visibility",
  "teams": "Teams",
  "-- Legal Overview": {
    "type": "separator",
--- a/apps/documentation/pages/users/teams/_meta.json
+++ b/apps/documentation/pages/users/teams/_meta.json
@ -1,6 +1,5 @@
 {
-  "preferences": "Preferences",
+  "general-settings": "General Settings",
  "document-visibility": "Document Visibility",
-  "sender-details": "Email Sender Details",
-  "branding-preferences": "Branding Preferences"
+  "sender-details": "Email Sender Details"
 }
--- a/apps/documentation/pages/users/teams/branding-preferences.mdx
+++ b/apps/documentation/pages/users/teams/branding-preferences.mdx
@ -1,16 +0,0 @@
---
-title: Branding Preferences
-description: Learn how to set the branding preferences for your team account.
---
-
-# Branding Preferences
-
-You can set the branding preferences for your team account by going to the **Branding Preferences** tab in the team's settings dashboard.
-
-![A screenshot of the team's branding preferences page](/teams/team-branding-preferences.webp)
-
-On this page, you can:
-
- **Upload a Logo** - Upload your team's logo to be displayed instead of the default Documenso logo.
- **Set the Brand Website** - Enter the URL of your team's website to be displayed in the email communications sent by the team.
- **Add Additional Brand Details** - You can add additional information to display at the bottom of the emails sent by the team. This can include contact information, social media links, and other relevant details.
--- a/apps/documentation/pages/users/teams/document-visibility.mdx
+++ b/apps/documentation/pages/users/teams/document-visibility.mdx
@ -13,9 +13,9 @@ The default document visibility option allows you to control who can view and ac
 - **Managers and above** - The document is visible to team members with the role of _Manager or above_ and _Admin_.
 - **Admin only** - The document is only visible to the team's admins.

-![A screenshot of the document visibility selector from the team's global preferences page](/teams/team-preferences-document-visibility.webp)
+![A screenshot of the document visibility selector from the team's general settings page](/teams/team-general-settings-document-visibility-select.webp)

-The default document visibility is set to "_EVERYONE_" by default. You can change this setting by going to the [team's general preferences page](/users/teams/preferences) and selecting a different visibility option.
+The default document visibility is set to "_EVERYONE_" by default. You can change this setting by going to the [team's general settings page](/users/teams/general-settings) and selecting a different visibility option.

 <Callout type="warning">
  If the team member uploading the document has a role lower than the default document visibility,
--- a/apps/documentation/pages/users/teams/general-settings.mdx
+++ b/apps/documentation/pages/users/teams/general-settings.mdx
@ -0,0 +1,15 @@
+---
+title: General Settings
+description: Learn how to manage your team's General settings.
+---
+
+# General Settings
+
+You can manage your team's general settings by clicking on the **General Settings** tab in the team's settings dashboard.
+
+![A screenshot of team's General settings page](/teams/team-general-settings.webp)
+
+The general settings page allows you to update the following settings:
+
+- **Document Visibility** - Set the default visibility of the documents created by team members. Learn more about [document visibility](/users/teams/document-visibility).
+- **Sender Details** - Set whether the sender's name should be included in the emails sent by the team. Learn more about [sender details](/users/teams/sender-details).
--- a/apps/documentation/pages/users/teams/preferences.mdx
+++ b/apps/documentation/pages/users/teams/preferences.mdx
@ -1,19 +0,0 @@
---
-title: Preferences
-description: Learn how to manage your team's global preferences.
---
-
-# Preferences
-
-You can manage your team's global preferences by clicking on the **Preferences** tab in the team's settings dashboard.
-
-![A screenshot of the team's global preferences page](/teams/team-preferences.webp)
-
-The preferences page allows you to update the following settings:
-
- **Document Visibility** - Set the default visibility of the documents created by team members. Learn more about [document visibility](/users/teams/document-visibility).
- **Default Document Language** - This setting allows you to set the default language for the documents uploaded in the team account. The default language is used as the default language in the email communications with the document recipients. You can change the language for individual documents when uploading them.
- **Sender Details** - Set whether the sender's name should be included in the emails sent by the team. Learn more about [sender details](/users/teams/sender-details).
- **Typed Signature** - It controls whether the document recipients can sign the documents with a typed signature or not. If enabled, the recipients can sign the document using either a drawn or a typed signature. If disabled, the recipients can only sign the documents usign a drawn signature. This setting can also be changed for individual documents when uploading them.
- **Include the Signing Certificate** - This setting controls whether the signing certificate should be included in the signed documents. If enabled, the signing certificate is included in the signed documents. If disabled, the signing certificate is not included in the signed documents. Regardless of this setting, the signing certificate is always available in the document's audit log page.
- **Branding Preferences** - Set the branding preferences and defaults for the team account. Learn more about [branding preferences](/users/teams/branding-preferences).
--- a/apps/documentation/public/teams/team-branding-preferences.webp
+++ b/apps/documentation/public/teams/team-branding-preferences.webp
--- a/apps/documentation/public/teams/team-general-settings-document-visibility-select.webp
+++ b/apps/documentation/public/teams/team-general-settings-document-visibility-select.webp
--- a/apps/documentation/public/teams/team-general-settings.webp
+++ b/apps/documentation/public/teams/team-general-settings.webp
--- a/apps/documentation/public/teams/team-preferences-document-visibility.webp
+++ b/apps/documentation/public/teams/team-preferences-document-visibility.webp
--- a/apps/documentation/public/teams/team-preferences.webp
+++ b/apps/documentation/public/teams/team-preferences.webp
--- a/apps/marketing/package.json
+++ b/apps/marketing/package.json
@ -1,6 +1,6 @@
 {
  "name": "@documenso/marketing",
-  "version": "1.9.0-rc.0",
+  "version": "1.8.1-rc.0",
  "private": true,
  "license": "AGPL-3.0",
  "scripts": {
@ -47,7 +47,7 @@
    "recharts": "^2.7.2",
    "sharp": "0.32.6",
    "typescript": "5.2.2",
-    "zod": "^3.23.8"
+    "zod": "^3.22.4"
  },
  "devDependencies": {
    "@lingui/loader": "^4.11.3",
--- a/apps/openpage-api/.gitignore
+++ b/apps/openpage-api/.gitignore
@ -1,40 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/versions
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# env files (can opt-in for commiting if needed)
-.env*
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
--- a/apps/openpage-api/README.md
+++ b/apps/openpage-api/README.md
@ -1 +0,0 @@
-# @documenso/openpage-api
--- a/apps/openpage-api/app/community/route.ts
+++ b/apps/openpage-api/app/community/route.ts
@ -1,36 +0,0 @@
-import type { NextRequest } from 'next/server';
-
-import cors from '@/lib/cors';
-
-const paths = [
-  { path: '/total-prs', description: 'Total GitHub Merged PRs' },
-  { path: '/total-stars', description: 'Total GitHub Stars' },
-  { path: '/total-forks', description: 'Total GitHub Forks' },
-  { path: '/total-issues', description: 'Total GitHub Issues' },
-];
-
-export function GET(request: NextRequest) {
-  const url = request.nextUrl.toString();
-  const apis = paths.map(({ path, description }) => {
-    return { path: url + path, description };
-  });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(apis), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/community/total-forks/route.ts
+++ b/apps/openpage-api/app/community/total-forks/route.ts
@ -1,27 +0,0 @@
-import cors from '@/lib/cors';
-import { transformData } from '@/lib/transform-data';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
-  const data = await res.json();
-  const transformedData = transformData({ data, metric: 'forks' });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(transformedData), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/community/total-issues/route.ts
+++ b/apps/openpage-api/app/community/total-issues/route.ts
@ -1,27 +0,0 @@
-import cors from '@/lib/cors';
-import { transformData } from '@/lib/transform-data';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
-  const data = await res.json();
-  const transformedData = transformData({ data, metric: 'openIssues' });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(transformedData), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/community/total-prs/route.ts
+++ b/apps/openpage-api/app/community/total-prs/route.ts
@ -1,27 +0,0 @@
-import cors from '@/lib/cors';
-import { transformData } from '@/lib/transform-data';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
-  const data = await res.json();
-  const transformedData = transformData({ data, metric: 'mergedPRs' });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(transformedData), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/community/total-stars/route.ts
+++ b/apps/openpage-api/app/community/total-stars/route.ts
@ -1,27 +0,0 @@
-import cors from '@/lib/cors';
-import { transformData } from '@/lib/transform-data';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://stargrazer-live.onrender.com/api/stats');
-  const data = await res.json();
-  const transformedData = transformData({ data, metric: 'stars' });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(transformedData), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/github/forks/route.ts
+++ b/apps/openpage-api/app/github/forks/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://api.github.com/repos/documenso/documenso');
-  const { forks_count } = await res.json();
-
-  return cors(
-    request,
-    new Response(JSON.stringify({ data: forks_count }), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/github/issues/route.ts
+++ b/apps/openpage-api/app/github/issues/route.ts
@ -1,27 +0,0 @@
-import cors from '@/lib/cors';
-
-export async function GET(request: Request) {
-  const res = await fetch(
-    'https://api.github.com/search/issues?q=repo:documenso/documenso+type:issue+state:open&page=0&per_page=1',
-  );
-  const { total_count } = await res.json();
-
-  return cors(
-    request,
-    new Response(JSON.stringify({ data: total_count }), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/github/prs/route.ts
+++ b/apps/openpage-api/app/github/prs/route.ts
@ -1,27 +0,0 @@
-import cors from '@/lib/cors';
-
-export async function GET(request: Request) {
-  const res = await fetch(
-    'https://api.github.com/search/issues?q=repo:documenso/documenso/+is:pr+merged:>=2010-01-01&page=0&per_page=1',
-  );
-  const { total_count } = await res.json();
-
-  return cors(
-    request,
-    new Response(JSON.stringify({ data: total_count }), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/github/route.ts
+++ b/apps/openpage-api/app/github/route.ts
@ -1,36 +0,0 @@
-import type { NextRequest } from 'next/server';
-
-import cors from '@/lib/cors';
-
-const paths = [
-  { path: '/forks', description: 'GitHub Forks' },
-  { path: '/stars', description: 'GitHub Stars' },
-  { path: '/issues', description: 'GitHub Merged Issues' },
-  { path: '/prs', description: 'GitHub Pull Requests' },
-];
-
-export function GET(request: NextRequest) {
-  const url = request.nextUrl.toString();
-  const apis = paths.map(({ path, description }) => {
-    return { path: url + path, description };
-  });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(apis), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/github/stars/route.ts
+++ b/apps/openpage-api/app/github/stars/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://api.github.com/repos/documenso/documenso');
-  const { stargazers_count } = await res.json();
-
-  return cors(
-    request,
-    new Response(JSON.stringify({ data: stargazers_count }), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/completed-documents/route.ts
+++ b/apps/openpage-api/app/growth/completed-documents/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-import { getCompletedDocumentsMonthly } from '@/lib/growth/get-monthly-completed-document';
-
-export async function GET(request: Request) {
-  const completedDocuments = await getCompletedDocumentsMonthly();
-
-  return cors(
-    request,
-    new Response(JSON.stringify(completedDocuments), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/new-users/route.ts
+++ b/apps/openpage-api/app/growth/new-users/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-import { getUserMonthlyGrowth } from '@/lib/growth/get-user-monthly-growth';
-
-export async function GET(request: Request) {
-  const monthlyUsers = await getUserMonthlyGrowth();
-
-  return cors(
-    request,
-    new Response(JSON.stringify(monthlyUsers), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/route.ts
+++ b/apps/openpage-api/app/growth/route.ts
@ -1,39 +0,0 @@
-import type { NextRequest } from 'next/server';
-
-import cors from '@/lib/cors';
-
-const paths = [
-  { path: '/total-customers', description: 'Total Customers' },
-  { path: '/total-users', description: 'Total Users' },
-  { path: '/new-users', description: 'New Users' },
-  { path: '/completed-documents', description: 'Completed Documents per Month' },
-  { path: '/total-completed-documents', description: 'Total Completed Documents' },
-  { path: '/signer-conversion', description: 'Signers That Signed Up' },
-  { path: '/total-signer-conversion', description: 'Total Signers That Signed Up' },
-];
-
-export function GET(request: NextRequest) {
-  const url = request.nextUrl.toString();
-  const apis = paths.map(({ path, description }) => {
-    return { path: url + path, description };
-  });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(apis), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/signer-conversion/route.ts
+++ b/apps/openpage-api/app/growth/signer-conversion/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-import { getSignerConversionMonthly } from '@/lib/growth/get-signer-conversion';
-
-export async function GET(request: Request) {
-  const signers = await getSignerConversionMonthly();
-
-  return cors(
-    request,
-    new Response(JSON.stringify(signers), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/total-completed-documents/route.ts
+++ b/apps/openpage-api/app/growth/total-completed-documents/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-import { getCompletedDocumentsMonthly } from '@/lib/growth/get-monthly-completed-document';
-
-export async function GET(request: Request) {
-  const totalCompletedDocuments = await getCompletedDocumentsMonthly('cumulative');
-
-  return cors(
-    request,
-    new Response(JSON.stringify(totalCompletedDocuments), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/total-customers/route.ts
+++ b/apps/openpage-api/app/growth/total-customers/route.ts
@ -1,31 +0,0 @@
-import cors from '@/lib/cors';
-import { transformData } from '@/lib/transform-data';
-
-export async function GET(request: Request) {
-  const res = await fetch('https://stargrazer-live.onrender.com/api/stats/stripe');
-  const EARLY_ADOPTERS_DATA = await res.json();
-
-  const transformedData = transformData({
-    data: EARLY_ADOPTERS_DATA,
-    metric: 'earlyAdopters',
-  });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(transformedData), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/total-signer-conversion/route.ts
+++ b/apps/openpage-api/app/growth/total-signer-conversion/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-import { getSignerConversionMonthly } from '@/lib/growth/get-signer-conversion';
-
-export async function GET(request: Request) {
-  const totalSigners = await getSignerConversionMonthly('cumulative');
-
-  return cors(
-    request,
-    new Response(JSON.stringify(totalSigners), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/growth/total-users/route.ts
+++ b/apps/openpage-api/app/growth/total-users/route.ts
@ -1,25 +0,0 @@
-import cors from '@/lib/cors';
-import { getUserMonthlyGrowth } from '@/lib/growth/get-user-monthly-growth';
-
-export async function GET(request: Request) {
-  const totalUsers = await getUserMonthlyGrowth("cumulative");
-
-  return cors(
-    request,
-    new Response(JSON.stringify(totalUsers), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/app/route.ts
+++ b/apps/openpage-api/app/route.ts
@ -1,35 +0,0 @@
-import type { NextRequest } from 'next/server';
-
-import cors from '@/lib/cors';
-
-const paths = [
-  { path: 'github', description: 'GitHub Data' },
-  { path: 'community', description: 'Community Data' },
-  { path: 'growth', description: 'Growth Data' },
-];
-
-export function GET(request: NextRequest) {
-  const url = request.nextUrl.toString();
-  const apis = paths.map(({ path, description }) => {
-    return { path: url + path, description };
-  });
-
-  return cors(
-    request,
-    new Response(JSON.stringify(apis), {
-      status: 200,
-      headers: {
-        'content-type': 'application/json',
-      },
-    }),
-  );
-}
-
-export function OPTIONS(request: Request) {
-  return cors(
-    request,
-    new Response(null, {
-      status: 204,
-    }),
-  );
-}
--- a/apps/openpage-api/lib/cors.ts
+++ b/apps/openpage-api/lib/cors.ts
@ -1,135 +0,0 @@
-/**
- * Multi purpose CORS lib.
- * Note: Based on the `cors` package in npm but using only web APIs.
- * Taken from: https://github.com/vercel/examples/blob/main/edge-functions/cors/lib/cors.ts
- */
-
-type StaticOrigin = boolean | string | RegExp | (boolean | string | RegExp)[];
-
-type OriginFn = (origin: string | undefined, req: Request) => StaticOrigin | Promise<StaticOrigin>;
-
-interface CorsOptions {
-  origin?: StaticOrigin | OriginFn;
-  methods?: string | string[];
-  allowedHeaders?: string | string[];
-  exposedHeaders?: string | string[];
-  credentials?: boolean;
-  maxAge?: number;
-  preflightContinue?: boolean;
-  optionsSuccessStatus?: number;
-}
-
-const defaultOptions: CorsOptions = {
-  origin: '*',
-  methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
-  preflightContinue: false,
-  optionsSuccessStatus: 204,
-};
-
-function isOriginAllowed(origin: string, allowed: StaticOrigin): boolean {
-  return Array.isArray(allowed)
-    ? allowed.some((o) => isOriginAllowed(origin, o))
-    : typeof allowed === 'string'
-    ? origin === allowed
-    : allowed instanceof RegExp
-    ? allowed.test(origin)
-    : !!allowed;
-}
-
-function getOriginHeaders(reqOrigin: string | undefined, origin: StaticOrigin) {
-  const headers = new Headers();
-
-  if (origin === '*') {
-    headers.set('Access-Control-Allow-Origin', '*');
-  } else if (typeof origin === 'string') {
-    headers.set('Access-Control-Allow-Origin', origin);
-    headers.append('Vary', 'Origin');
-  } else {
-    const allowed = isOriginAllowed(reqOrigin ?? '', origin);
-
-    if (allowed && reqOrigin) {
-      headers.set('Access-Control-Allow-Origin', reqOrigin);
-    }
-    headers.append('Vary', 'Origin');
-  }
-
-  return headers;
-}
-
-async function originHeadersFromReq(req: Request, origin: StaticOrigin | OriginFn) {
-  const reqOrigin = req.headers.get('Origin') || undefined;
-  const value = typeof origin === 'function' ? await origin(reqOrigin, req) : origin;
-
-  if (!value) return;
-  return getOriginHeaders(reqOrigin, value);
-}
-
-function getAllowedHeaders(req: Request, allowed?: string | string[]) {
-  const headers = new Headers();
-
-  if (!allowed) {
-    allowed = req.headers.get('Access-Control-Request-Headers')!;
-    headers.append('Vary', 'Access-Control-Request-Headers');
-  } else if (Array.isArray(allowed)) {
-    allowed = allowed.join(',');
-  }
-  if (allowed) {
-    headers.set('Access-Control-Allow-Headers', allowed);
-  }
-
-  return headers;
-}
-
-export default async function cors(req: Request, res: Response, options?: CorsOptions) {
-  const opts = { ...defaultOptions, ...options };
-  const { headers } = res;
-  const originHeaders = await originHeadersFromReq(req, opts.origin ?? false);
-  const mergeHeaders = (v: string, k: string) => {
-    if (k === 'Vary') headers.append(k, v);
-    else headers.set(k, v);
-  };
-
-  // If there's no origin we won't touch the response
-  if (!originHeaders) return res;
-
-  originHeaders.forEach(mergeHeaders);
-
-  if (opts.credentials) {
-    headers.set('Access-Control-Allow-Credentials', 'true');
-  }
-
-  const exposed = Array.isArray(opts.exposedHeaders)
-    ? opts.exposedHeaders.join(',')
-    : opts.exposedHeaders;
-
-  if (exposed) {
-    headers.set('Access-Control-Expose-Headers', exposed);
-  }
-
-  // Handle the preflight request
-  if (req.method === 'OPTIONS') {
-    if (opts.methods) {
-      const methods = Array.isArray(opts.methods) ? opts.methods.join(',') : opts.methods;
-
-      headers.set('Access-Control-Allow-Methods', methods);
-    }
-
-    getAllowedHeaders(req, opts.allowedHeaders).forEach(mergeHeaders);
-
-    if (typeof opts.maxAge === 'number') {
-      headers.set('Access-Control-Max-Age', String(opts.maxAge));
-    }
-
-    if (opts.preflightContinue) return res;
-
-    headers.set('Content-Length', '0');
-    return new Response(null, { status: opts.optionsSuccessStatus, headers });
-  }
-
-  // If we got here, it's a normal request
-  return res;
-}
-
-export function initCors(options?: CorsOptions) {
-  return async (req: Request, res: Response) => cors(req, res, options);
-}
--- a/apps/openpage-api/lib/growth/get-monthly-completed-document.ts
+++ b/apps/openpage-api/lib/growth/get-monthly-completed-document.ts
@ -1,43 +0,0 @@
-import { DateTime } from 'luxon';
-
-import { kyselyPrisma, sql } from '@documenso/prisma';
-import { DocumentStatus } from '@documenso/prisma/client';
-
-export const getCompletedDocumentsMonthly = async (type: 'count' | 'cumulative' = 'count') => {
-  const qb = kyselyPrisma.$kysely
-    .selectFrom('Document')
-    .select(({ fn }) => [
-      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']).as('month'),
-      fn.count('id').as('count'),
-      fn
-        .sum(fn.count('id'))
-        // Feels like a bug in the Kysely extension but I just can not do this orderBy in a type-safe manner
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']) as any))
-        .as('cume_count'),
-    ])
-    .where(() => sql`"Document"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)
-    .groupBy('month')
-    .orderBy('month', 'desc')
-    .limit(12);
-
-  const result = await qb.execute();
-
-  const transformedData = {
-    labels: result.map((row) => DateTime.fromJSDate(row.month).toFormat('MMM yyyy')).reverse(),
-    datasets: [
-      {
-        label: type === 'count' ? 'Completed Documents per Month' : 'Total Completed Documents',
-        data: result
-          .map((row) => (type === 'count' ? Number(row.count) : Number(row.cume_count)))
-          .reverse(),
-      },
-    ],
-  };
-
-  return transformedData;
-};
-
-export type GetCompletedDocumentsMonthlyResult = Awaited<
-  ReturnType<typeof getCompletedDocumentsMonthly>
->;
--- a/apps/openpage-api/lib/growth/get-signer-conversion.ts
+++ b/apps/openpage-api/lib/growth/get-signer-conversion.ts
@ -1,42 +0,0 @@
-import { DateTime } from 'luxon';
-
-import { kyselyPrisma, sql } from '@documenso/prisma';
-
-export const getSignerConversionMonthly = async (type: 'count' | 'cumulative' = 'count') => {
-  const qb = kyselyPrisma.$kysely
-    .selectFrom('Recipient')
-    .innerJoin('User', 'Recipient.email', 'User.email')
-    .select(({ fn }) => [
-      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']).as('month'),
-      fn.count('Recipient.email').distinct().as('count'),
-      fn
-        .sum(fn.count('Recipient.email').distinct())
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']) as any))
-        .as('cume_count'),
-    ])
-    .where('Recipient.signedAt', 'is not', null)
-    .where('Recipient.signedAt', '<', (eb) => eb.ref('User.createdAt'))
-    .groupBy(({ fn }) => fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']))
-    .orderBy('month', 'desc');
-
-  const result = await qb.execute();
-
-  const transformedData = {
-    labels: result.map((row) => DateTime.fromJSDate(row.month).toFormat('MMM yyyy')).reverse(),
-    datasets: [
-      {
-        label: type === 'count' ? 'Signers That Signed Up' : 'Total Signers That Signed Up',
-        data: result
-          .map((row) => (type === 'count' ? Number(row.count) : Number(row.cume_count)))
-          .reverse(),
-      },
-    ],
-  };
-
-  return transformedData;
-};
-
-export type GetSignerConversionMonthlyResult = Awaited<
-  ReturnType<typeof getSignerConversionMonthly>
->;
--- a/apps/openpage-api/lib/growth/get-user-monthly-growth.ts
+++ b/apps/openpage-api/lib/growth/get-user-monthly-growth.ts
@ -1,38 +0,0 @@
-import { DateTime } from 'luxon';
-
-import { kyselyPrisma, sql } from '@documenso/prisma';
-
-export const getUserMonthlyGrowth = async (type: 'count' | 'cumulative' = 'count') => {
-  const qb = kyselyPrisma.$kysely
-    .selectFrom('User')
-    .select(({ fn }) => [
-      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']).as('month'),
-      fn.count('id').as('count'),
-      fn
-        .sum(fn.count('id'))
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']) as any))
-        .as('cume_count'),
-    ])
-    .groupBy('month')
-    .orderBy('month', 'desc')
-    .limit(12);
-
-  const result = await qb.execute();
-
-  const transformedData = {
-    labels: result.map((row) => DateTime.fromJSDate(row.month).toFormat('MMM yyyy')).reverse(),
-    datasets: [
-      {
-        label: type === 'count' ? 'New Users' : 'Total Users',
-        data: result
-          .map((row) => (type === 'count' ? Number(row.count) : Number(row.cume_count)))
-          .reverse(),
-      },
-    ],
-  };
-
-  return transformedData;
-};
-
-export type GetUserMonthlyGrowthResult = Awaited<ReturnType<typeof getUserMonthlyGrowth>>;
--- a/apps/openpage-api/lib/transform-data.ts
+++ b/apps/openpage-api/lib/transform-data.ts
@ -1,68 +0,0 @@
-import { DateTime } from 'luxon';
-
-type MetricKeys = {
-  stars: number;
-  forks: number;
-  mergedPRs: number;
-  openIssues: number;
-  earlyAdopters: number;
-};
-
-type DataEntry = {
-  [key: string]: MetricKeys;
-};
-
-type TransformData = {
-  labels: string[];
-  datasets: {
-    label: string;
-    data: number[];
-  }[];
-};
-
-type MetricKey = keyof MetricKeys;
-
-const FRIENDLY_METRIC_NAMES: { [key in MetricKey]: string } = {
-  stars: 'Stars',
-  forks: 'Forks',
-  mergedPRs: 'Merged PRs',
-  openIssues: 'Open Issues',
-  earlyAdopters: 'Customers',
-};
-
-export function transformData({
-  data,
-  metric,
-}: {
-  data: DataEntry;
-  metric: MetricKey;
-}): TransformData {
-  const sortedEntries = Object.entries(data).sort(([dateA], [dateB]) => {
-    const [yearA, monthA] = dateA.split('-').map(Number);
-    const [yearB, monthB] = dateB.split('-').map(Number);
-
-    return DateTime.local(yearA, monthA).toMillis() - DateTime.local(yearB, monthB).toMillis();
-  });
-
-  const labels = sortedEntries.map(([date]) => {
-    const [year, month] = date.split('-');
-    const dateTime = DateTime.fromObject({
-      year: Number(year),
-      month: Number(month),
-    });
-    return dateTime.toFormat('MMM yyyy');
-  });
-
-  return {
-    labels,
-    datasets: [
-      {
-        label: `Total ${FRIENDLY_METRIC_NAMES[metric]}`,
-        data: sortedEntries.map(([_, stats]) => stats[metric]),
-      },
-    ],
-  };
-}
-
-// To be on the safer side
-export const transformRepoStats = transformData;
--- a/apps/openpage-api/next.config.js
+++ b/apps/openpage-api/next.config.js
@ -1,4 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {};
-
-module.exports = nextConfig;
--- a/apps/openpage-api/package.json
+++ b/apps/openpage-api/package.json
@ -1,23 +0,0 @@
-{
-  "name": "@documenso/openpage-api",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "dev": "next dev -p 3003",
-    "build": "next build",
-    "start": "next start",
-    "lint:fix": "next lint --fix",
-    "clean": "rimraf .next && rimraf node_modules",
-    "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
-  },
-  "dependencies": {
-    "@documenso/prisma": "*",
-    "luxon": "^3.5.0",
-    "next": "14.2.6"
-  },
-  "devDependencies": {
-    "@types/node": "20.16.5",
-    "@types/react": "18.3.5",
-    "typescript": "5.5.4"
-  }
-}
--- a/apps/openpage-api/tsconfig.json
+++ b/apps/openpage-api/tsconfig.json
@ -1,27 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "paths": {
-      "@/*": ["./*"]
-    }
-  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}
--- a/apps/web/package.json
+++ b/apps/web/package.json
@ -1,6 +1,6 @@
 {
  "name": "@documenso/web",
-  "version": "1.9.0-rc.0",
+  "version": "1.8.1-rc.0",
  "private": true,
  "license": "AGPL-3.0",
  "scripts": {
@ -28,7 +28,6 @@
    "@simplewebauthn/browser": "^9.0.1",
    "@simplewebauthn/server": "^9.0.3",
    "@tanstack/react-query": "^4.29.5",
-    "colord": "^2.9.3",
    "cookie-es": "^1.0.0",
    "formidable": "^2.1.1",
    "framer-motion": "^10.12.8",
@ -54,12 +53,12 @@
    "react-icons": "^4.11.0",
    "react-rnd": "^10.4.1",
    "recharts": "^2.7.2",
-    "remeda": "^2.17.3",
+    "remeda": "^2.12.1",
    "sharp": "0.32.6",
    "ts-pattern": "^5.0.5",
    "ua-parser-js": "^1.0.37",
    "uqr": "^0.1.2",
-    "zod": "^3.23.8"
+    "zod": "^3.22.4"
  },
  "devDependencies": {
    "@documenso/tailwind-config": "*",
--- a/apps/web/src/app/(dashboard)/admin/leaderboard/data-table-leaderboard.tsx
+++ b/apps/web/src/app/(dashboard)/admin/leaderboard/data-table-leaderboard.tsx
@ -1,169 +0,0 @@
-'use client';
-
-import { useEffect, useMemo, useState, useTransition } from 'react';
-
-import { msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
-import { ChevronDownIcon as CaretSortIcon, Loader } from 'lucide-react';
-
-import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Input } from '@documenso/ui/primitives/input';
-
-export type SigningVolume = {
-  id: number;
-  name: string;
-  signingVolume: number;
-  createdAt: Date;
-  planId: string;
-};
-
-type LeaderboardTableProps = {
-  signingVolume: SigningVolume[];
-  totalPages: number;
-  perPage: number;
-  page: number;
-  sortBy: 'name' | 'createdAt' | 'signingVolume';
-  sortOrder: 'asc' | 'desc';
-};
-
-export const LeaderboardTable = ({
-  signingVolume,
-  totalPages,
-  perPage,
-  page,
-  sortBy,
-  sortOrder,
-}: LeaderboardTableProps) => {
-  const { _, i18n } = useLingui();
-
-  const [isPending, startTransition] = useTransition();
-  const updateSearchParams = useUpdateSearchParams();
-  const [searchString, setSearchString] = useState('');
-  const debouncedSearchString = useDebouncedValue(searchString, 1000);
-
-  const columns = useMemo(() => {
-    return [
-      {
-        header: () => (
-          <div
-            className="flex cursor-pointer items-center"
-            onClick={() => handleColumnSort('name')}
-          >
-            {_(msg`Name`)}
-            <CaretSortIcon className="ml-2 h-4 w-4" />
-          </div>
-        ),
-        accessorKey: 'name',
-        cell: ({ row }) => {
-          return (
-            <div>
-              <a
-                className="text-primary underline"
-                href={`https://dashboard.stripe.com/subscriptions/${row.original.planId}`}
-                target="_blank"
-              >
-                {row.getValue('name')}
-              </a>
-            </div>
-          );
-        },
-        size: 250,
-      },
-      {
-        header: () => (
-          <div
-            className="flex cursor-pointer items-center"
-            onClick={() => handleColumnSort('signingVolume')}
-          >
-            {_(msg`Signing Volume`)}
-            <CaretSortIcon className="ml-2 h-4 w-4" />
-          </div>
-        ),
-        accessorKey: 'signingVolume',
-        cell: ({ row }) => <div>{Number(row.getValue('signingVolume'))}</div>,
-      },
-      {
-        header: () => {
-          return (
-            <div
-              className="flex cursor-pointer items-center"
-              onClick={() => handleColumnSort('createdAt')}
-            >
-              {_(msg`Created`)}
-              <CaretSortIcon className="ml-2 h-4 w-4" />
-            </div>
-          );
-        },
-        accessorKey: 'createdAt',
-        cell: ({ row }) => i18n.date(row.original.createdAt),
-      },
-    ] satisfies DataTableColumnDef<SigningVolume>[];
-  }, [sortOrder]);
-
-  useEffect(() => {
-    startTransition(() => {
-      updateSearchParams({
-        search: debouncedSearchString,
-        page: 1,
-        perPage,
-        sortBy,
-        sortOrder,
-      });
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [debouncedSearchString]);
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    startTransition(() => {
-      updateSearchParams({
-        page,
-        perPage,
-      });
-    });
-  };
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchString(e.target.value);
-  };
-
-  const handleColumnSort = (column: 'name' | 'createdAt' | 'signingVolume') => {
-    startTransition(() => {
-      updateSearchParams({
-        sortBy: column,
-        sortOrder: sortOrder === 'asc' ? 'desc' : 'asc',
-      });
-    });
-  };
-
-  return (
-    <div className="relative">
-      <Input
-        className="my-6 flex flex-row gap-4"
-        type="text"
-        placeholder={_(msg`Search by name or email`)}
-        value={searchString}
-        onChange={handleChange}
-      />
-      <DataTable
-        columns={columns}
-        data={signingVolume}
-        perPage={perPage}
-        currentPage={page}
-        totalPages={totalPages}
-        onPaginationChange={onPaginationChange}
-      >
-        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
-      </DataTable>
-
-      {isPending && (
-        <div className="absolute inset-0 flex items-center justify-center bg-white/50">
-          <Loader className="h-8 w-8 animate-spin text-gray-500" />
-        </div>
-      )}
-    </div>
-  );
-};
--- a/apps/web/src/app/(dashboard)/admin/leaderboard/fetch-leaderboard.actions.ts
+++ b/apps/web/src/app/(dashboard)/admin/leaderboard/fetch-leaderboard.actions.ts
@ -1,25 +0,0 @@
-'use server';
-
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
-import { getSigningVolume } from '@documenso/lib/server-only/admin/get-signing-volume';
-
-type SearchOptions = {
-  search: string;
-  page: number;
-  perPage: number;
-  sortBy: 'name' | 'createdAt' | 'signingVolume';
-  sortOrder: 'asc' | 'desc';
-};
-
-export async function search({ search, page, perPage, sortBy, sortOrder }: SearchOptions) {
-  const { user } = await getRequiredServerComponentSession();
-
-  if (!isAdmin(user)) {
-    throw new Error('Unauthorized');
-  }
-
-  const results = await getSigningVolume({ search, page, perPage, sortBy, sortOrder });
-
-  return results;
-}
--- a/apps/web/src/app/(dashboard)/admin/leaderboard/page.tsx
+++ b/apps/web/src/app/(dashboard)/admin/leaderboard/page.tsx
@ -1,60 +0,0 @@
-import { Trans } from '@lingui/macro';
-
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
-
-import { LeaderboardTable } from './data-table-leaderboard';
-import { search } from './fetch-leaderboard.actions';
-
-type AdminLeaderboardProps = {
-  searchParams?: {
-    search?: string;
-    page?: number;
-    perPage?: number;
-    sortBy?: 'name' | 'createdAt' | 'signingVolume';
-    sortOrder?: 'asc' | 'desc';
-  };
-};
-
-export default async function Leaderboard({ searchParams = {} }: AdminLeaderboardProps) {
-  await setupI18nSSR();
-
-  const { user } = await getRequiredServerComponentSession();
-
-  if (!isAdmin(user)) {
-    throw new Error('Unauthorized');
-  }
-
-  const page = Number(searchParams.page) || 1;
-  const perPage = Number(searchParams.perPage) || 10;
-  const searchString = searchParams.search || '';
-  const sortBy = searchParams.sortBy || 'signingVolume';
-  const sortOrder = searchParams.sortOrder || 'desc';
-
-  const { leaderboard: signingVolume, totalPages } = await search({
-    search: searchString,
-    page,
-    perPage,
-    sortBy,
-    sortOrder,
-  });
-
-  return (
-    <div>
-      <h2 className="text-4xl font-semibold">
-        <Trans>Signing Volume</Trans>
-      </h2>
-      <div className="mt-8">
-        <LeaderboardTable
-          signingVolume={signingVolume}
-          totalPages={totalPages}
-          page={page}
-          perPage={perPage}
-          sortBy={sortBy}
-          sortOrder={sortOrder}
-        />
-      </div>
-    </div>
-  );
-}
--- a/apps/web/src/app/(dashboard)/admin/nav.tsx
+++ b/apps/web/src/app/(dashboard)/admin/nav.tsx
@ -6,7 +6,7 @@ import Link from 'next/link';
 import { usePathname } from 'next/navigation';

 import { Trans } from '@lingui/macro';
-import { BarChart3, FileStack, Settings, Trophy, Users, Wallet2 } from 'lucide-react';
+import { BarChart3, FileStack, Settings, Users, Wallet2 } from 'lucide-react';

 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@ -80,20 +80,6 @@ export const AdminNav = ({ className, ...props }: AdminNavProps) => {
        </Link>
      </Button>

-      <Button
-        variant="ghost"
-        className={cn(
-          'justify-start md:w-full',
-          pathname?.startsWith('/admin/leaderboard') && 'bg-secondary',
-        )}
-        asChild
-      >
-        <Link href="/admin/leaderboard">
-          <Trophy className="mr-2 h-5 w-5" />
-          <Trans>Leaderboard</Trans>
-        </Link>
-      </Button>
-
      <Button
        variant="ghost"
        className={cn(
--- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx
@ -47,7 +47,7 @@ export const DocumentPageViewButton = ({ document, team }: DocumentPageViewButto
  const onDownloadClick = async () => {
    try {
      const documentWithData = await trpcClient.document.getDocumentById.query({
-        documentId: document.id,
+        id: document.id,
        teamId: team?.id,
      });

--- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx
@ -75,7 +75,7 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
  const onDownloadClick = async () => {
    try {
      const documentWithData = await trpcClient.document.getDocumentById.query({
-        documentId: document.id,
+        id: document.id,
        teamId: team?.id,
      });

--- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recipients.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recipients.tsx
@ -12,13 +12,14 @@ import {
  MailOpenIcon,
  PenIcon,
  PlusIcon,
+  Timer,
 } from 'lucide-react';
 import { match } from 'ts-pattern';

 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import { formatSigningLink } from '@documenso/lib/utils/recipients';
-import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import type { Document, Recipient } from '@documenso/prisma/client';
+import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
 import { SignatureIcon } from '@documenso/ui/icons/signature';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
@ -132,6 +133,14 @@ export const DocumentPageViewRecipients = ({
                  </Badge>
                )}

+              {document.status !== DocumentStatus.DRAFT &&
+                recipient.signingStatus === SigningStatus.EXPIRED && (
+                  <Badge variant="destructive">
+                    <Timer className="mr-1 h-3 w-3" />
+                    <Trans>Expired</Trans>
+                  </Badge>
+                )}
+
              {document.status !== DocumentStatus.DRAFT &&
                recipient.signingStatus === SigningStatus.REJECTED && (
                  <PopoverHover
--- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx
@ -15,9 +15,8 @@ import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/g
 import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { DocumentStatus } from '@documenso/prisma/client';
 import type { Team, TeamEmail } from '@documenso/prisma/client';
-import { TeamMemberRole } from '@documenso/prisma/client';
+import { DocumentStatus, SigningStatus, TeamMemberRole } from '@documenso/prisma/client';
 import { Badge } from '@documenso/ui/primitives/badge';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@ -60,7 +59,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
  const { user } = await getRequiredServerComponentSession();

  const document = await getDocumentById({
-    documentId,
+    id: documentId,
    userId: user.id,
    teamId: team?.id,
  }).catch(() => null);
@ -146,10 +145,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)

      <div className="flex flex-row justify-between truncate">
        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
+          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
            {document.title}
          </h1>

@ -231,8 +227,52 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
                  ))
                  .with(DocumentStatus.PENDING, () => {
                    const pendingRecipients = recipients.filter(
-                      (recipient) => recipient.signingStatus === 'NOT_SIGNED',
+                      (recipient) => recipient.signingStatus === SigningStatus.NOT_SIGNED,
                    );
+                    const rejectedCount = recipients.filter(
+                      (recipient) => recipient.signingStatus === SigningStatus.REJECTED,
+                    ).length;
+                    const expiredCount = recipients.filter(
+                      (recipient) => recipient.signingStatus === SigningStatus.EXPIRED,
+                    ).length;
+
+                    if (rejectedCount > 0 && expiredCount > 0) {
+                      return (
+                        <>
+                          <Plural
+                            value={rejectedCount}
+                            one="1 recipient has rejected the document"
+                            other="# recipients have rejected the document"
+                          />
+                          {' and '}
+                          <Plural
+                            value={expiredCount}
+                            one="1 recipient's signing link has expired"
+                            other="# recipients' signing links have expired"
+                          />
+                        </>
+                      );
+                    }
+
+                    if (rejectedCount > 0) {
+                      return (
+                        <Plural
+                          value={rejectedCount}
+                          one="1 recipient has rejected the document"
+                          other="# recipients have rejected the document"
+                        />
+                      );
+                    }
+
+                    if (expiredCount > 0) {
+                      return (
+                        <Plural
+                          value={expiredCount}
+                          one="1 recipient's signing link has expired"
+                          other="# recipients' signing links have expired"
+                        />
+                      );
+                    }

                    return (
                      <Plural
--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
@ -63,7 +63,7 @@ export const EditDocumentForm = ({
  const { data: document, refetch: refetchDocument } =
    trpc.document.getDocumentWithDetailsById.useQuery(
      {
-        documentId: initialDocument.id,
+        id: initialDocument.id,
        teamId: team?.id,
      },
      {
@ -79,7 +79,7 @@ export const EditDocumentForm = ({
    onSuccess: (newData) => {
      utils.document.getDocumentWithDetailsById.setData(
        {
-          documentId: initialDocument.id,
+          id: initialDocument.id,
          teamId: team?.id,
        },
        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
@ -93,7 +93,7 @@ export const EditDocumentForm = ({
      onSuccess: (newData) => {
        utils.document.getDocumentWithDetailsById.setData(
          {
-            documentId: initialDocument.id,
+            id: initialDocument.id,
            teamId: team?.id,
          },
          (oldData) => ({ ...(oldData || initialDocument), ...newData, id: Number(newData.id) }),
@ -106,7 +106,7 @@ export const EditDocumentForm = ({
    onSuccess: (newFields) => {
      utils.document.getDocumentWithDetailsById.setData(
        {
-          documentId: initialDocument.id,
+          id: initialDocument.id,
          teamId: team?.id,
        },
        (oldData) => ({ ...(oldData || initialDocument), Field: newFields }),
@ -120,7 +120,7 @@ export const EditDocumentForm = ({
      onSuccess: (newData) => {
        utils.document.getDocumentWithDetailsById.setData(
          {
-            documentId: initialDocument.id,
+            id: initialDocument.id,
            teamId: team?.id,
          },
          (oldData) => ({
@ -137,7 +137,7 @@ export const EditDocumentForm = ({
    onSuccess: (newRecipients) => {
      utils.document.getDocumentWithDetailsById.setData(
        {
-          documentId: initialDocument.id,
+          id: initialDocument.id,
          teamId: team?.id,
        },
        (oldData) => ({ ...(oldData || initialDocument), Recipient: newRecipients }),
@ -150,7 +150,7 @@ export const EditDocumentForm = ({
    onSuccess: (newData) => {
      utils.document.getDocumentWithDetailsById.setData(
        {
-          documentId: initialDocument.id,
+          id: initialDocument.id,
          teamId: team?.id,
        },
        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
@ -419,6 +419,8 @@ export const EditDocumentForm = ({
              isDocumentEnterprise={isDocumentEnterprise}
              onSubmit={onAddSignersFormSubmit}
              isDocumentPdfLoaded={isDocumentPdfLoaded}
+              documentId={document.id}
+              // teamId={team?.id}
            />

            <AddFieldsFormPartial
--- a/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx
@ -41,7 +41,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
  const { user } = await getRequiredServerComponentSession();

  const document = await getDocumentWithDetailsById({
-    documentId,
+    id: documentId,
    userId: user.id,
    teamId: team?.id,
  }).catch(() => null);
@ -109,10 +109,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
        <Trans>Documents</Trans>
      </Link>

-      <h1
-        className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-        title={document.title}
-      >
+      <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
        {document.title}
      </h1>

--- a/apps/web/src/app/(dashboard)/documents/[id]/logs/document-logs-page-view.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/logs/document-logs-page-view.tsx
@ -47,7 +47,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie

  const [document, recipients] = await Promise.all([
    getDocumentById({
-      documentId,
+      id: documentId,
      userId: user.id,
      teamId: team?.id,
    }).catch(() => null),
@ -121,10 +121,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie

      <div className="flex flex-col justify-between truncate sm:flex-row">
        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
+          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
            {document.title}
          </h1>

--- a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx
@ -100,7 +100,7 @@ export const ResendDocumentActionItem = ({
      });

      setIsOpen(false);
-    } catch (err) {
+    } catch {
      toast({
        title: _(msg`Something went wrong`),
        description: _(msg`This document could not be re-sent at this time. Please try again.`),
@ -177,12 +177,7 @@ export const ResendDocumentActionItem = ({
        <DialogFooter>
          <div className="flex w-full flex-1 flex-nowrap gap-4">
            <DialogClose asChild>
-              <Button
-                type="button"
-                className="dark:bg-muted dark:hover:bg-muted/80 flex-1  bg-black/5 hover:bg-black/10"
-                variant="secondary"
-                disabled={isSubmitting}
-              >
+              <Button type="button" className="flex-1" variant="secondary" disabled={isSubmitting}>
                <Trans>Cancel</Trans>
              </Button>
            </DialogClose>
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
@ -54,7 +54,7 @@ export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps)

      if (!recipient) {
        document = await trpcClient.document.getDocumentById.query({
-          documentId: row.id,
+          id: row.id,
          teamId: team?.id,
        });
      } else {
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
@ -85,7 +85,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr

      if (!recipient) {
        document = await trpcClient.document.getDocumentById.query({
-          documentId: row.id,
+          id: row.id,
          teamId: team?.id,
        });
      } else {
--- a/apps/web/src/app/(dashboard)/documents/delete-document-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/documents/delete-document-dialog.tsx
@ -47,8 +47,6 @@ export const DeleteDocumentDialog = ({
  const { refreshLimits } = useLimits();
  const { _ } = useLingui();

-  const deleteMessage = msg`delete`;
-
  const [inputValue, setInputValue] = useState('');
  const [isDeleteEnabled, setIsDeleteEnabled] = useState(status === DocumentStatus.DRAFT);

@ -76,7 +74,7 @@ export const DeleteDocumentDialog = ({

  const onDelete = async () => {
    try {
-      await deleteDocument({ documentId: id, teamId });
+      await deleteDocument({ id, teamId });
    } catch {
      toast({
        title: _(msg`Something went wrong`),
@ -89,7 +87,7 @@ export const DeleteDocumentDialog = ({

  const onInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setInputValue(event.target.value);
-    setIsDeleteEnabled(event.target.value === _(deleteMessage));
+    setIsDeleteEnabled(event.target.value === _(msg`delete`));
  };

  return (
@ -183,7 +181,7 @@ export const DeleteDocumentDialog = ({
            type="text"
            value={inputValue}
            onChange={onInputChange}
-            placeholder={_(msg`Please type ${`'${_(deleteMessage)}'`} to confirm`)}
+            placeholder={_(msg`Type 'delete' to confirm`)}
          />
        )}

--- a/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
@ -36,7 +36,7 @@ export const DuplicateDocumentDialog = ({
  const { _ } = useLingui();

  const { data: document, isLoading } = trpcReact.document.getDocumentById.useQuery({
-    documentId: id,
+    id,
    teamId: team?.id,
  });

@ -66,7 +66,7 @@ export const DuplicateDocumentDialog = ({

  const onDuplicate = async () => {
    try {
-      await duplicateDocument({ documentId: id, teamId: team?.id });
+      await duplicateDocument({ id, teamId: team?.id });
    } catch {
      toast({
        title: _(msg`Something went wrong`),
@ -92,7 +92,7 @@ export const DuplicateDocumentDialog = ({
            </h1>
          </div>
        ) : (
-          <div className="p-2 [&>div]:h-[50vh] [&>div]:overflow-y-scroll">
+          <div className="p-2 [&>div]:h-[50vh] [&>div]:overflow-y-scroll  ">
            <LazyPDFViewer key={document?.id} documentData={documentData} />
          </div>
        )}
--- a/apps/web/src/app/(dashboard)/settings/billing/page.tsx
+++ b/apps/web/src/app/(dashboard)/settings/billing/page.tsx
@ -41,7 +41,7 @@ export default async function BillingSettingsPage() {

  const [subscriptions, prices, primaryAccountPlanPrices] = await Promise.all([
    getSubscriptionsByUserId({ userId: user.id }),
-    getPricesByInterval({ plans: [STRIPE_PLAN_TYPE.REGULAR, STRIPE_PLAN_TYPE.PLATFORM] }),
+    getPricesByInterval({ plan: STRIPE_PLAN_TYPE.REGULAR }),
    getPrimaryAccountPlanPrices(),
  ]);

--- a/apps/web/src/app/(dashboard)/settings/profile/delete-account-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/settings/profile/delete-account-dialog.tsx
@ -7,6 +7,7 @@ import { useLingui } from '@lingui/react';
 import { signOut } from 'next-auth/react';

 import type { User } from '@documenso/prisma/client';
+import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@ -51,20 +52,30 @@ export const DeleteAccountDialog = ({ className, user }: DeleteAccountDialogProp

      return await signOut({ callbackUrl: '/' });
    } catch (err) {
-      toast({
-        title: _(msg`An unknown error occurred`),
-        variant: 'destructive',
-        description: _(
-          msg`We encountered an unknown error while attempting to delete your account. Please try again later.`,
-        ),
-      });
+      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+        toast({
+          title: _(msg`An error occurred`),
+          description: err.message,
+          variant: 'destructive',
+        });
+      } else {
+        toast({
+          title: _(msg`An unknown error occurred`),
+          variant: 'destructive',
+          description:
+            err.message ??
+            _(
+              msg`We encountered an unknown error while attempting to delete your account. Please try again later.`,
+            ),
+        });
+      }
    }
  };

  return (
    <div className={className}>
      <Alert
-        className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row"
+        className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row "
        variant="neutral"
      >
        <div>
--- a/apps/web/src/app/(dashboard)/templates/[id]/edit/edit-template.tsx
+++ b/apps/web/src/app/(dashboard)/templates/[id]/edit/edit-template.tsx
@ -59,16 +59,16 @@ export const EditTemplateForm = ({

  const utils = trpc.useUtils();

-  const { data: template, refetch: refetchTemplate } = trpc.template.getTemplateById.useQuery(
-    {
-      templateId: initialTemplate.id,
-      teamId: initialTemplate.teamId || undefined,
-    },
-    {
-      initialData: initialTemplate,
-      ...SKIP_QUERY_BATCH_META,
-    },
-  );
+  const { data: template, refetch: refetchTemplate } =
+    trpc.template.getTemplateWithDetailsById.useQuery(
+      {
+        id: initialTemplate.id,
+      },
+      {
+        initialData: initialTemplate,
+        ...SKIP_QUERY_BATCH_META,
+      },
+    );

  const { Recipient: recipients, Field: fields, templateDocumentData } = template;

@ -92,12 +92,12 @@ export const EditTemplateForm = ({

  const currentDocumentFlow = documentFlow[step];

-  const { mutateAsync: updateTemplateSettings } = trpc.template.updateTemplate.useMutation({
+  const { mutateAsync: updateTemplateSettings } = trpc.template.updateTemplateSettings.useMutation({
    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
    onSuccess: (newData) => {
-      utils.template.getTemplateById.setData(
+      utils.template.getTemplateWithDetailsById.setData(
        {
-          templateId: initialTemplate.id,
+          id: initialTemplate.id,
        },
        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
      );
@ -108,9 +108,9 @@ export const EditTemplateForm = ({
    trpc.template.setSigningOrderForTemplate.useMutation({
      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
      onSuccess: (newData) => {
-        utils.template.getTemplateById.setData(
+        utils.template.getTemplateWithDetailsById.setData(
          {
-            templateId: initialTemplate.id,
+            id: initialTemplate.id,
          },
          (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
        );
@ -120,9 +120,9 @@ export const EditTemplateForm = ({
  const { mutateAsync: addTemplateFields } = trpc.field.addTemplateFields.useMutation({
    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
    onSuccess: (newData) => {
-      utils.template.getTemplateById.setData(
+      utils.template.getTemplateWithDetailsById.setData(
        {
-          templateId: initialTemplate.id,
+          id: initialTemplate.id,
        },
        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
      );
@ -132,32 +132,15 @@ export const EditTemplateForm = ({
  const { mutateAsync: addTemplateSigners } = trpc.recipient.addTemplateSigners.useMutation({
    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
    onSuccess: (newData) => {
-      utils.template.getTemplateById.setData(
+      utils.template.getTemplateWithDetailsById.setData(
        {
-          templateId: initialTemplate.id,
+          id: initialTemplate.id,
        },
        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
      );
    },
  });

-  const { mutateAsync: updateTypedSignature } =
-    trpc.template.updateTemplateTypedSignatureSettings.useMutation({
-      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-      onSuccess: (newData) => {
-        utils.template.getTemplateById.setData(
-          {
-            templateId: initialTemplate.id,
-          },
-          (oldData) => ({
-            ...(oldData || initialTemplate),
-            ...newData,
-            id: Number(newData.id),
-          }),
-        );
-      },
-    });
-
  const onAddSettingsFormSubmit = async (data: TAddTemplateSettingsFormSchema) => {
    try {
      await updateTemplateSettings({
@ -228,12 +211,6 @@ export const EditTemplateForm = ({
        fields: data.fields,
      });

-      await updateTypedSignature({
-        templateId: template.id,
-        teamId: team?.id,
-        typedSignatureEnabled: data.typedSignatureEnabled,
-      });
-
      // Clear all field data from localStorage
      for (let i = 0; i < localStorage.length; i++) {
        const key = localStorage.key(i);
@ -248,13 +225,14 @@ export const EditTemplateForm = ({
        duration: 5000,
      });

+      // Router refresh is here to clear the router cache for when navigating to /documents.
+      router.refresh();
+
      router.push(templateRootPath);
    } catch (err) {
-      console.error(err);
-
      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while adding fields.`),
+        description: _(msg`An error occurred while adding signers.`),
        variant: 'destructive',
      });
    }
@ -323,7 +301,6 @@ export const EditTemplateForm = ({
              fields={fields}
              onSubmit={onAddFieldsFormSubmit}
              teamId={team?.id}
-              typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
            />
          </Stepper>
        </DocumentFlowFormContainer>
--- a/apps/web/src/app/(dashboard)/templates/[id]/edit/template-edit-page-view.tsx
+++ b/apps/web/src/app/(dashboard)/templates/[id]/edit/template-edit-page-view.tsx
@ -8,7 +8,7 @@ import { ChevronLeft } from 'lucide-react';

 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
+import { getTemplateWithDetailsById } from '@documenso/lib/server-only/template/get-template-with-details-by-id';
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import type { Team } from '@documenso/prisma/client';

@ -37,10 +37,9 @@ export const TemplateEditPageView = async ({ params, team }: TemplateEditPageVie

  const { user } = await getRequiredServerComponentSession();

-  const template = await getTemplateById({
+  const template = await getTemplateWithDetailsById({
    id: templateId,
    userId: user.id,
-    teamId: team?.id,
  }).catch(() => null);

  if (!template || !template.templateDocumentData) {
@ -64,10 +63,7 @@ export const TemplateEditPageView = async ({ params, team }: TemplateEditPageVie
            <Trans>Template</Trans>
          </Link>

-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
+          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
            {template.title}
          </h1>

--- a/apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx
+++ b/apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx
@ -73,6 +73,7 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)

  const mockedDocumentMeta = templateMeta
    ? {
+        typedSignatureEnabled: false,
        ...templateMeta,
        signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,
        documentId: 0,
@ -88,10 +89,7 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)

      <div className="flex flex-row justify-between truncate">
        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
+          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
            {template.title}
          </h1>

@ -157,7 +155,7 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
                </div>
              </div>

-              <p className="text-muted-foreground mt-2 px-4 text-sm">
+              <p className="text-muted-foreground mt-2 px-4 text-sm ">
                <Trans>Manage and view template</Trans>
              </p>

--- a/apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx
@ -85,7 +85,7 @@ export const DeleteTemplateDialog = ({
            type="button"
            variant="destructive"
            loading={isLoading}
-            onClick={async () => deleteTemplate({ templateId: id, teamId })}
+            onClick={async () => deleteTemplate({ id, teamId })}
          >
            <Trans>Delete</Trans>
          </Button>
--- a/apps/web/src/app/(internal)/%5F%5Fhtmltopdf/certificate/page.tsx
+++ b/apps/web/src/app/(internal)/%5F%5Fhtmltopdf/certificate/page.tsx
@ -209,19 +209,11 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
                              boxShadow: `0px 0px 0px 4.88px rgba(122, 196, 85, 0.1), 0px 0px 0px 1.22px rgba(122, 196, 85, 0.6), 0px 0px 0px 0.61px rgba(122, 196, 85, 1)`,
                            }}
                          >
-                            {signature.Signature?.signatureImageAsBase64 && (
-                              <img
-                                src={`${signature.Signature?.signatureImageAsBase64}`}
-                                alt="Signature"
-                                className="max-h-12 max-w-full"
-                              />
-                            )}
-
-                            {signature.Signature?.typedSignature && (
-                              <p className="font-signature text-center text-sm">
-                                {signature.Signature?.typedSignature}
-                              </p>
-                            )}
+                            <img
+                              src={`${signature.Signature?.signatureImageAsBase64}`}
+                              alt="Signature"
+                              className="max-h-12 max-w-full"
+                            />
                          </div>

                          <p className="text-muted-foreground mt-2 text-sm print:text-xs">
--- a/apps/web/src/app/(profile)/profile-header.tsx
+++ b/apps/web/src/app/(profile)/profile-header.tsx
@ -9,7 +9,7 @@ import { Trans } from '@lingui/macro';
 import { PlusIcon } from 'lucide-react';

 import LogoIcon from '@documenso/assets/logo_icon.png';
-import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import type { User } from '@documenso/prisma/client';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@ -19,7 +19,7 @@ import { Logo } from '~/components/branding/logo';

 type ProfileHeaderProps = {
  user?: User | null;
-  teams?: TGetTeamsResponse;
+  teams?: GetTeamsResponse;
 };

 export const ProfileHeader = ({ user, teams = [] }: ProfileHeaderProps) => {
@ -58,7 +58,7 @@ export const ProfileHeader = ({ user, teams = [] }: ProfileHeaderProps) => {
            alt="Documenso Logo"
            width={48}
            height={48}
-            className="h-10 w-auto sm:hidden dark:invert"
+            className="h-10 w-auto dark:invert sm:hidden"
          />
        </Link>

--- a/apps/web/src/app/(recipient)/d/[token]/configure-direct-template.tsx
+++ b/apps/web/src/app/(recipient)/d/[token]/configure-direct-template.tsx
@ -40,7 +40,7 @@ export type TConfigureDirectTemplateFormSchema = z.infer<typeof ZConfigureDirect
 export type ConfigureDirectTemplateFormProps = {
  flowStep: DocumentFlowStep;
  isDocumentPdfLoaded: boolean;
-  template: Omit<TemplateWithDetails, 'User'>;
+  template: TemplateWithDetails;
  directTemplateRecipient: Recipient & { Field: Field[] };
  initialEmail?: string;
  onSubmit: (_data: TConfigureDirectTemplateFormSchema) => void;
--- a/apps/web/src/app/(recipient)/d/[token]/direct-template.tsx
+++ b/apps/web/src/app/(recipient)/d/[token]/direct-template.tsx
@ -28,7 +28,7 @@ import type { DirectTemplateLocalField } from './sign-direct-template';
 import { SignDirectTemplateForm } from './sign-direct-template';

 export type TemplatesDirectPageViewProps = {
-  template: Omit<TemplateWithDetails, 'User'>;
+  template: TemplateWithDetails;
  directTemplateToken: string;
  directTemplateRecipient: Recipient & { Field: Field[] };
 };
--- a/apps/web/src/app/(recipient)/d/[token]/page.tsx
+++ b/apps/web/src/app/(recipient)/d/[token]/page.tsx
@ -12,6 +12,7 @@ import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';

 import { DocumentAuthProvider } from '~/app/(signing)/sign/[token]/document-auth-provider';
 import { SigningProvider } from '~/app/(signing)/sign/[token]/provider';
+import { truncateTitle } from '~/helpers/truncate-title';

 import { DirectTemplatePageView } from './direct-template';
 import { DirectTemplateAuthPageView } from './signing-auth-page';
@ -71,11 +72,8 @@ export default async function TemplatesDirectPage({ params }: TemplatesDirectPag
        user={user}
      >
        <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
-            {template.title}
+          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
+            {truncateTitle(template.title)}
          </h1>

          <div className="text-muted-foreground mb-8 mt-2.5 flex items-center gap-x-2">
--- a/apps/web/src/app/(recipient)/d/[token]/sign-direct-template.tsx
+++ b/apps/web/src/app/(recipient)/d/[token]/sign-direct-template.tsx
@ -1,6 +1,7 @@
 import { useMemo, useState } from 'react';

 import { Trans } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';

@ -55,7 +56,7 @@ export type SignDirectTemplateFormProps = {
  flowStep: DocumentFlowStep;
  directRecipient: Recipient;
  directRecipientFields: Field[];
-  template: Omit<TemplateWithDetails, 'User'>;
+  template: TemplateWithDetails;
  onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
 };

@ -71,8 +72,9 @@ export const SignDirectTemplateForm = ({
  template,
  onSubmit,
 }: SignDirectTemplateFormProps) => {
-  const { fullName, signature, signatureValid, setFullName, setSignature } =
-    useRequiredSigningContext();
+  const { _ } = useLingui();
+
+  const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();

  const [localFields, setLocalFields] = useState<DirectTemplateLocalField[]>(directRecipientFields);
  const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
@ -100,9 +102,9 @@ 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,
-          } satisfies Signature;
+            signatureImageAsBase64: value.value,
+            typedSignature: null,
+          };
        }

        if (field.type === FieldType.DATE) {
@ -133,8 +135,6 @@ export const SignDirectTemplateForm = ({
    );
  };

-  const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
-
  const uninsertedFields = useMemo(() => {
    return sortFieldsByPosition(localFields.filter((field) => !field.inserted));
  }, [localFields]);
@ -147,10 +147,6 @@ export const SignDirectTemplateForm = ({
  const handleSubmit = async () => {
    setValidateUninsertedFields(true);

-    if (hasSignatureField && !signatureValid) {
-      return;
-    }
-
    const isFieldsValid = validateFieldsInserted(localFields);

    if (!isFieldsValid) {
--- a/apps/web/src/app/(recipient)/layout.tsx
+++ b/apps/web/src/app/(recipient)/layout.tsx
@ -2,7 +2,7 @@ import React from 'react';

 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { getTeams } from '@documenso/lib/server-only/team/get-teams';

 import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header';
@ -23,7 +23,7 @@ export default async function RecipientLayout({ children }: RecipientLayoutProps

  const { user, session } = await getServerComponentSession();

-  let teams: TGetTeamsResponse = [];
+  let teams: GetTeamsResponse = [];

  if (user && session) {
    teams = await getTeams({ userId: user.id });
--- a/apps/web/src/app/(signing)/sign/[token]/complete/claim-account.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/complete/claim-account.tsx
@ -9,7 +9,7 @@ import { useForm } from 'react-hook-form';
 import { z } from 'zod';

 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
-import { AppError } from '@documenso/lib/errors/app-error';
+import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
@ -25,8 +25,6 @@ import { Input } from '@documenso/ui/primitives/input';
 import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { signupErrorMessages } from '~/components/forms/v2/signup';
-
 export type ClaimAccountProps = {
  defaultName: string;
  defaultEmail: string;
@ -35,10 +33,7 @@ export type ClaimAccountProps = {

 export const ZClaimAccountFormSchema = z
  .object({
-    name: z
-      .string()
-      .trim()
-      .min(1, { message: msg`Please enter a valid name.`.id }),
+    name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
    email: z.string().email().min(1),
    password: ZPasswordSchema,
  })
@ -48,7 +43,7 @@ export const ZClaimAccountFormSchema = z
      return !password.includes(name) && !password.includes(email.split('@')[0]);
    },
    {
-      message: msg`Password should not be common or based on personal information`.id,
+      message: 'Password should not be common or based on personal information',
      path: ['password'],
    },
  );
@ -91,16 +86,22 @@ export const ClaimAccount = ({ defaultName, defaultEmail }: ClaimAccountProps) =
        email,
        timestamp: new Date().toISOString(),
      });
-    } catch (err) {
-      const error = AppError.parseError(err);
-
-      const errorMessage = signupErrorMessages[error.code] ?? signupErrorMessages.INVALID_REQUEST;
-
-      toast({
-        title: _(msg`An error occurred`),
-        description: _(errorMessage),
-        variant: 'destructive',
-      });
+    } catch (error) {
+      if (error instanceof TRPCClientError && error.data?.code === 'BAD_REQUEST') {
+        toast({
+          title: _(msg`An error occurred`),
+          description: error.message,
+          variant: 'destructive',
+        });
+      } else {
+        toast({
+          title: _(msg`An unknown error occurred`),
+          description: _(
+            msg`We encountered an unknown error while attempting to sign you up. Please try again later.`,
+          ),
+          variant: 'destructive',
+        });
+      }
    }
  };

--- a/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx
@ -24,6 +24,8 @@ import { SigningCard3D } from '@documenso/ui/components/signing-card';
 import { cn } from '@documenso/ui/lib/utils';
 import { Badge } from '@documenso/ui/primitives/badge';

+import { truncateTitle } from '~/helpers/truncate-title';
+
 import { SigningAuthPageView } from '../signing-auth-page';
 import { ClaimAccount } from './claim-account';
 import { DocumentPreviewButton } from './document-preview-button';
@ -59,6 +61,8 @@ export default async function CompletedSigningPage({
    return notFound();
  }

+  const truncatedTitle = truncateTitle(document.title);
+
  const { documentData } = document;

  const [fields, recipient] = await Promise.all([
@ -114,9 +118,7 @@ export default async function CompletedSigningPage({
          })}
        >
          <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
-            <span className="block max-w-[10rem] truncate font-medium hover:underline md:max-w-[20rem]">
-              {document.title}
-            </span>
+            {truncatedTitle}
          </Badge>

          {/* Card with recipient */}
--- a/apps/web/src/app/(signing)/sign/[token]/expired/page.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/expired/page.tsx
@ -0,0 +1,99 @@
+import Link from 'next/link';
+import { notFound } from 'next/navigation';
+
+import { Trans } from '@lingui/macro';
+import { Timer } from 'lucide-react';
+
+import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
+import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
+import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-recipient-authorized';
+import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
+import { Badge } from '@documenso/ui/primitives/badge';
+import { Button } from '@documenso/ui/primitives/button';
+
+import { truncateTitle } from '~/helpers/truncate-title';
+
+import { SigningAuthPageView } from '../signing-auth-page';
+
+export type ExpiredSigningPageProps = {
+  params: {
+    token?: string;
+  };
+};
+
+export default async function ExpiredSigningPage({ params: { token } }: ExpiredSigningPageProps) {
+  await setupI18nSSR();
+
+  if (!token) {
+    return notFound();
+  }
+
+  const { user } = await getServerComponentSession();
+
+  const document = await getDocumentAndSenderByToken({
+    token,
+    requireAccessAuth: false,
+  }).catch(() => null);
+
+  if (!document) {
+    return notFound();
+  }
+
+  const truncatedTitle = truncateTitle(document.title);
+
+  const recipient = await getRecipientByToken({ token }).catch(() => null);
+
+  if (!recipient) {
+    return notFound();
+  }
+
+  const isDocumentAccessValid = await isRecipientAuthorized({
+    type: 'ACCESS',
+    documentAuthOptions: document.authOptions,
+    recipient,
+    userId: user?.id,
+  });
+
+  if (!isDocumentAccessValid) {
+    return <SigningAuthPageView email={recipient.email} />;
+  }
+
+  return (
+    <div className="flex flex-col items-center pt-24 lg:pt-36 xl:pt-44">
+      <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
+        {truncatedTitle}
+      </Badge>
+
+      <div className="flex flex-col items-center">
+        <div className="flex items-center gap-x-4">
+          <Timer className="text-destructive h-10 w-10" />
+          <h2 className="max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
+            <Trans>Document Expired</Trans>
+          </h2>
+        </div>
+
+        <div className="text-destructive mt-4 flex items-center text-center text-sm">
+          <Trans>This document has expired and is no longer available to sign</Trans>
+        </div>
+
+        <p className="text-muted-foreground mt-6 max-w-[60ch] text-center text-sm">
+          <Trans>
+            {/* TODO: send email to owner when a user tried to sign an expired document??? */}
+            The document owner has been notified. They may send you a new signing link if required.
+          </Trans>
+        </p>
+
+        <p className="text-muted-foreground mt-2 max-w-[60ch] text-center text-sm">
+          <Trans>No further action is required from you at this time.</Trans>
+        </p>
+
+        {user && (
+          <Button className="mt-6" asChild>
+            <Link href={`/`}>Return Home</Link>
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
--- a/apps/web/src/app/(signing)/sign/[token]/form.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/form.tsx
@ -12,7 +12,7 @@ import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
-import { type Field, FieldType, type Recipient, RecipientRole } from '@documenso/prisma/client';
+import { type Field, type Recipient, RecipientRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { cn } from '@documenso/ui/lib/utils';
@ -44,8 +44,7 @@ export const SigningForm = ({
  const analytics = useAnalytics();
  const { data: session } = useSession();

-  const { fullName, signature, setFullName, setSignature, signatureValid, setSignatureValid } =
-    useRequiredSigningContext();
+  const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();

  const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);

@ -57,8 +56,6 @@ export const SigningForm = ({
  // Keep the loading state going if successful since the redirect may take some time.
  const isSubmitting = formState.isSubmitting || formState.isSubmitSuccessful;

-  const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
-
  const uninsertedFields = useMemo(() => {
    return sortFieldsByPosition(fields.filter((field) => !field.inserted));
  }, [fields]);
@ -71,10 +68,6 @@ export const SigningForm = ({
  const onFormSubmit = async () => {
    setValidateUninsertedFields(true);

-    if (hasSignatureField && !signatureValid) {
-      return;
-    }
-
    const isFieldsValid = validateFieldsInserted(fields);

    if (!isFieldsValid) {
@ -149,7 +142,7 @@ export const SigningForm = ({
                <div className="flex flex-col gap-4 md:flex-row">
                  <Button
                    type="button"
-                    className="dark:bg-muted dark:hover:bg-muted/80 w-full bg-black/5 hover:bg-black/10"
+                    className="dark:bg-muted dark:hover:bg-muted/80 w-full  bg-black/5 hover:bg-black/10"
                    variant="secondary"
                    size="lg"
                    disabled={typeof window !== 'undefined' && window.history.length <= 1}
@ -205,33 +198,20 @@ export const SigningForm = ({
                          className="h-44 w-full"
                          disabled={isSubmitting}
                          defaultValue={signature ?? undefined}
-                          onValidityChange={(isValid) => {
-                            setSignatureValid(isValid);
-                          }}
                          onChange={(value) => {
-                            if (signatureValid) {
-                              setSignature(value);
-                            }
+                            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>
                </div>

                <div className="flex flex-col gap-4 md:flex-row">
                  <Button
                    type="button"
-                    className="dark:bg-muted dark:hover:bg-muted/80 w-full bg-black/5 hover:bg-black/10"
+                    className="dark:bg-muted dark:hover:bg-muted/80 w-full  bg-black/5 hover:bg-black/10"
                    variant="secondary"
                    size="lg"
                    disabled={typeof window !== 'undefined' && window.history.length <= 1}
--- a/apps/web/src/app/(signing)/sign/[token]/layout.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/layout.tsx
@ -2,7 +2,7 @@ import React from 'react';

 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { getTeams } from '@documenso/lib/server-only/team/get-teams';

 import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header';
@ -17,7 +17,7 @@ export default async function SigningLayout({ children }: SigningLayoutProps) {

  const { user, session } = await getServerComponentSession();

-  let teams: TGetTeamsResponse = [];
+  let teams: GetTeamsResponse = [];

  if (user && session) {
    teams = await getTeams({ userId: user.id });
--- a/apps/web/src/app/(signing)/sign/[token]/page.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/page.tsx
@ -12,6 +12,7 @@ import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-f
 import { getIsRecipientsTurnToSign } from '@documenso/lib/server-only/recipient/get-is-recipient-turn';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
+import { isRecipientExpired } from '@documenso/lib/server-only/recipient/is-recipient-expired';
 import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { extractNextHeaderRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
@ -43,6 +44,16 @@ export default async function SigningPage({ params: { token } }: SigningPageProp

  const requestMetadata = extractNextHeaderRequestMetadata(requestHeaders);

+  const isExpired = await isRecipientExpired({ token });
+  if (isExpired) {
+    return redirect(`/sign/${token}/expired`);
+  }
+
+  const isRecipientsTurn = await getIsRecipientsTurnToSign({ token });
+  if (!isRecipientsTurn) {
+    return redirect(`/sign/${token}/waiting`);
+  }
+
  const [document, fields, recipient, completedFields] = await Promise.all([
    getDocumentAndSenderByToken({
      token,
@ -63,12 +74,6 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
    return notFound();
  }

-  const isRecipientsTurn = await getIsRecipientsTurnToSign({ token });
-
-  if (!isRecipientsTurn) {
-    return redirect(`/sign/${token}/waiting`);
-  }
-
  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
    documentAuth: document.authOptions,
    recipientAuth: recipient.authOptions,
--- a/apps/web/src/app/(signing)/sign/[token]/provider.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/provider.tsx
@ -1,6 +1,6 @@
 'use client';

-import { createContext, useContext, useEffect, useState } from 'react';
+import { createContext, useContext, useState } from 'react';

 export type SigningContextValue = {
  fullName: string;
@ -9,8 +9,6 @@ export type SigningContextValue = {
  setEmail: (_value: string) => void;
  signature: string | null;
  setSignature: (_value: string | null) => void;
-  signatureValid: boolean;
-  setSignatureValid: (_valid: boolean) => void;
 };

 const SigningContext = createContext<SigningContextValue | null>(null);
@ -45,13 +43,6 @@ export const SigningProvider = ({
  const [fullName, setFullName] = useState(initialFullName || '');
  const [email, setEmail] = useState(initialEmail || '');
  const [signature, setSignature] = useState(initialSignature || null);
-  const [signatureValid, setSignatureValid] = useState(true);
-
-  useEffect(() => {
-    if (initialSignature) {
-      setSignature(initialSignature);
-    }
-  }, [initialSignature]);

  return (
    <SigningContext.Provider
@ -62,8 +53,6 @@ export const SigningProvider = ({
        setEmail,
        signature,
        setSignature,
-        signatureValid,
-        setSignatureValid,
      }}
    >
      {children}
--- a/apps/web/src/app/(signing)/sign/[token]/rejected/page.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/rejected/page.tsx
@ -8,9 +8,7 @@ import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-recipient-authorized';
-import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
-import { FieldType } from '@documenso/prisma/client';
 import { Badge } from '@documenso/ui/primitives/badge';
 import { Button } from '@documenso/ui/primitives/button';

@ -44,10 +42,7 @@ export default async function RejectedSigningPage({ params: { token } }: Rejecte

  const truncatedTitle = truncateTitle(document.title);

-  const [fields, recipient] = await Promise.all([
-    getFieldsForToken({ token }),
-    getRecipientByToken({ token }).catch(() => null),
-  ]);
+  const recipient = await getRecipientByToken({ token }).catch(() => null);

  if (!recipient) {
    return notFound();
@ -64,11 +59,6 @@ export default async function RejectedSigningPage({ params: { token } }: Rejecte
    return <SigningAuthPageView email={recipient.email} />;
  }

-  const recipientName =
-    recipient.name ||
-    fields.find((field) => field.type === FieldType.NAME)?.customText ||
-    recipient.email;
-
  return (
    <div className="flex flex-col items-center pt-24 lg:pt-36 xl:pt-44">
      <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
--- a/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx
@ -14,6 +14,7 @@ import {
 } from '@documenso/ui/primitives/dialog';

 import { SigningDisclosure } from '~/components/general/signing-disclosure';
+import { truncateTitle } from '~/helpers/truncate-title';

 export type SignDialogProps = {
  isSubmitting: boolean;
@ -35,7 +36,7 @@ export const SignDialog = ({
  disabled = false,
 }: SignDialogProps) => {
  const [showDialog, setShowDialog] = useState(false);
-
+  const truncatedTitle = truncateTitle(documentTitle);
  const isComplete = fields.every((field) => field.inserted);

  const handleOpenChange = (open: boolean) => {
@ -74,13 +75,7 @@ export const SignDialog = ({
          {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}
-                  </span>
-                  ".
-                </span>
+                You are about to complete viewing "{truncatedTitle}".
                <br /> Are you sure?
              </Trans>
            </span>
@ -88,13 +83,7 @@ export const SignDialog = ({
          {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}
-                  </span>
-                  ".
-                </span>
+                You are about to complete signing "{truncatedTitle}".
                <br /> Are you sure?
              </Trans>
            </span>
@ -102,13 +91,7 @@ export const SignDialog = ({
          {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}"
-                  </span>
-                  .
-                </span>
+                You are about to complete approving "{truncatedTitle}".
                <br /> Are you sure?
              </Trans>
            </span>
--- a/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx
@ -1,6 +1,6 @@
 'use client';

-import { useLayoutEffect, useMemo, useRef, useState, useTransition } from 'react';
+import { useMemo, useState, useTransition } from 'react';

 import { useRouter } from 'next/navigation';

@ -51,16 +51,8 @@ export const SignatureField = ({
  const { _ } = useLingui();
  const { toast } = useToast();

-  const signatureRef = useRef<HTMLParagraphElement>(null);
-  const containerRef = useRef<HTMLDivElement>(null);
-  const [fontSize, setFontSize] = useState(2);
-
-  const {
-    signature: providedSignature,
-    setSignature: setProvidedSignature,
-    signatureValid,
-    setSignatureValid,
-  } = useRequiredSigningContext();
+  const { signature: providedSignature, setSignature: setProvidedSignature } =
+    useRequiredSigningContext();

  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();

@ -94,7 +86,7 @@ export const SignatureField = ({
  }, [field.inserted, signature?.signatureImageAsBase64]);

  const onPreSign = () => {
-    if (!providedSignature || !signatureValid) {
+    if (!providedSignature) {
      setShowSignatureModal(true);
      return false;
    }
@ -116,33 +108,20 @@ export const SignatureField = ({
      actionTarget: field.type,
    });
  };
-
  const onSign = async (authOptions?: TRecipientActionAuth, signature?: string) => {
    try {
      const value = signature || providedSignature;

-      if (!value || (signature && !signatureValid)) {
+      if (!value) {
        setShowSignatureModal(true);
        return;
      }

-      const isTypedSignature = !value.startsWith('data:image');
-
-      if (isTypedSignature && !typedSignatureEnabled) {
-        toast({
-          title: _(msg`Error`),
-          description: _(msg`Typed signatures are not allowed. Please draw your signature.`),
-          variant: 'destructive',
-        });
-
-        return;
-      }
-
      const payload: TSignFieldWithTokenMutationSchema = {
        token: recipient.token,
        fieldId: field.id,
        value,
-        isBase64: !isTypedSignature,
+        isBase64: true,
        authOptions,
      };

@ -197,41 +176,6 @@ export const SignatureField = ({
    }
  };

-  useLayoutEffect(() => {
-    if (!signatureRef.current || !containerRef.current || !signature?.typedSignature) {
-      return;
-    }
-
-    const adjustTextSize = () => {
-      const container = containerRef.current;
-      const text = signatureRef.current;
-
-      if (!container || !text) {
-        return;
-      }
-
-      let size = 2;
-      text.style.fontSize = `${size}rem`;
-
-      while (
-        (text.scrollWidth > container.clientWidth || text.scrollHeight > container.clientHeight) &&
-        size > 0.8
-      ) {
-        size -= 0.1;
-        text.style.fontSize = `${size}rem`;
-      }
-
-      setFontSize(size);
-    };
-
-    const resizeObserver = new ResizeObserver(adjustTextSize);
-    resizeObserver.observe(containerRef.current);
-
-    adjustTextSize();
-
-    return () => resizeObserver.disconnect();
-  }, [signature?.typedSignature]);
-
  return (
    <SigningFieldContainer
      field={field}
@ -261,15 +205,10 @@ export const SignatureField = ({
      )}

      {state === 'signed-text' && (
-        <div ref={containerRef} className="flex h-full w-full items-center justify-center p-2">
-          <p
-            ref={signatureRef}
-            className="font-signature text-muted-foreground dark:text-background w-full overflow-hidden break-all text-center leading-tight duration-200"
-            style={{ fontSize: `${fontSize}rem` }}
-          >
-            {signature?.typedSignature}
-          </p>
-        </div>
+        <p className="font-signature text-muted-foreground dark:text-background text-lg duration-200 sm:text-xl md:text-2xl lg:text-3xl">
+          {/* This optional chaining is intentional, we don't want to move the check into the condition above */}
+          {signature?.typedSignature}
+        </p>
      )}

      <Dialog open={showSignatureModal} onOpenChange={setShowSignatureModal}>
@ -286,23 +225,12 @@ export const SignatureField = ({
              <Trans>Signature</Trans>
            </Label>

-            <div className="border-border mt-2 rounded-md border">
-              <SignaturePad
-                id="signature"
-                className="h-44 w-full"
-                onChange={(value) => setLocalSignature(value)}
-                allowTypedSignature={typedSignatureEnabled}
-                onValidityChange={(isValid) => {
-                  setSignatureValid(isValid);
-                }}
-              />
-            </div>
-
-            {!signatureValid && (
-              <div className="text-destructive mt-2 text-sm">
-                <Trans>Signature is too small. Please provide a more complete signature.</Trans>
-              </div>
-            )}
+            <SignaturePad
+              id="signature"
+              className="border-border mt-2 h-44 w-full rounded-md border"
+              onChange={(value) => setLocalSignature(value)}
+              allowTypedSignature={typedSignatureEnabled}
+            />
          </div>

          <SigningDisclosure />
@ -322,7 +250,7 @@ export const SignatureField = ({
              <Button
                type="button"
                className="flex-1"
-                disabled={!localSignature || !signatureValid}
+                disabled={!localSignature}
                onClick={() => onDialogSignClick()}
              >
                <Trans>Sign</Trans>
--- a/apps/web/src/app/(signing)/sign/[token]/signing-page-view.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/signing-page-view.tsx
@ -53,62 +53,34 @@ export const SigningPageView = ({
 }: SigningPageViewProps) => {
  const { documentData, documentMeta } = document;

-  const shouldUseTeamDetails =
-    document.teamId && document.team?.teamGlobalSettings?.includeSenderDetails === false;
-
-  let senderName = document.User.name ?? '';
-  let senderEmail = `(${document.User.email})`;
-
-  if (shouldUseTeamDetails) {
-    senderName = document.team?.name ?? '';
-    senderEmail = document.team?.teamEmail?.email ? `(${document.team.teamEmail.email})` : '';
-  }
-
  return (
    <div className="mx-auto w-full max-w-screen-xl">
-      <h1
-        className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-        title={document.title}
-      >
+      <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
        {document.title}
      </h1>

      <div className="mt-2.5 flex flex-wrap items-center justify-between gap-x-6">
-        <div className="max-w-[50ch]">
-          <span className="text-muted-foreground truncate" title={senderName}>
-            {senderName} {senderEmail}
-          </span>{' '}
-          <span className="text-muted-foreground">
+        <div>
+          <p
+            className="text-muted-foreground truncate"
+            title={document.User.name ? document.User.name : ''}
+          >
+            {document.User.name}
+          </p>
+
+          <p className="text-muted-foreground">
            {match(recipient.role)
-              .with(RecipientRole.VIEWER, () =>
-                document.teamId && !shouldUseTeamDetails ? (
-                  <Trans>
-                    on behalf of "{document.team?.name}" has invited you to view this document
-                  </Trans>
-                ) : (
-                  <Trans>has invited you to view this document</Trans>
-                ),
-              )
-              .with(RecipientRole.SIGNER, () =>
-                document.teamId && !shouldUseTeamDetails ? (
-                  <Trans>
-                    on behalf of "{document.team?.name}" has invited you to sign this document
-                  </Trans>
-                ) : (
-                  <Trans>has invited you to sign this document</Trans>
-                ),
-              )
-              .with(RecipientRole.APPROVER, () =>
-                document.teamId && !shouldUseTeamDetails ? (
-                  <Trans>
-                    on behalf of "{document.team?.name}" has invited you to approve this document
-                  </Trans>
-                ) : (
-                  <Trans>has invited you to approve this document</Trans>
-                ),
-              )
+              .with(RecipientRole.VIEWER, () => (
+                <Trans>({document.User.email}) has invited you to view this document</Trans>
+              ))
+              .with(RecipientRole.SIGNER, () => (
+                <Trans>({document.User.email}) has invited you to sign this document</Trans>
+              ))
+              .with(RecipientRole.APPROVER, () => (
+                <Trans>({document.User.email}) has invited you to approve this document</Trans>
+              ))
              .otherwise(() => null)}
-          </span>
+          </p>
        </div>

        <RejectDocumentDialog document={document} token={recipient.token} />
--- a/apps/web/src/app/(signing)/sign/[token]/waiting/page.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/waiting/page.tsx
@ -48,7 +48,7 @@ export default async function WaitingForTurnToSignPage({

  if (user) {
    isOwnerOrTeamMember = await getDocumentById({
-      documentId: document.id,
+      id: document.id,
      userId: user.id,
      teamId: document.teamId ?? undefined,
    })
--- a/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx
+++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx
@ -52,7 +52,13 @@ export default async function TeamsSettingsPage({ params }: TeamsSettingsPagePro

      <AvatarImageForm className="mb-8" team={team} user={session.user} />

-      <UpdateTeamForm teamId={team.id} teamName={team.name} teamUrl={team.url} />
+      <UpdateTeamForm
+        teamId={team.id}
+        teamName={team.name}
+        teamUrl={team.url}
+        documentVisibility={team.teamGlobalSettings?.documentVisibility}
+        includeSenderDetails={team.teamGlobalSettings?.includeSenderDetails}
+      />

      <section className="mt-6 space-y-6">
        {(team.teamEmail || team.emailVerification) && (
--- a/apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx
+++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/preferences/document-preferences.tsx
@ -39,8 +39,6 @@ const ZTeamDocumentPreferencesFormSchema = z.object({
  documentVisibility: z.nativeEnum(DocumentVisibility),
  documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES),
  includeSenderDetails: z.boolean(),
-  typedSignatureEnabled: z.boolean(),
-  includeSigningCertificate: z.boolean(),
 });

 type TTeamDocumentPreferencesFormSchema = z.infer<typeof ZTeamDocumentPreferencesFormSchema>;
@ -70,8 +68,6 @@ export const TeamDocumentPreferencesForm = ({
        ? settings?.documentLanguage
        : 'en',
      includeSenderDetails: settings?.includeSenderDetails ?? false,
-      typedSignatureEnabled: settings?.typedSignatureEnabled ?? true,
-      includeSigningCertificate: settings?.includeSigningCertificate ?? true,
    },
    resolver: zodResolver(ZTeamDocumentPreferencesFormSchema),
  });
@ -80,13 +76,7 @@ export const TeamDocumentPreferencesForm = ({

  const onSubmit = async (data: TTeamDocumentPreferencesFormSchema) => {
    try {
-      const {
-        documentVisibility,
-        documentLanguage,
-        includeSenderDetails,
-        includeSigningCertificate,
-        typedSignatureEnabled,
-      } = data;
+      const { documentVisibility, documentLanguage, includeSenderDetails } = data;

      await updateTeamDocumentPreferences({
        teamId: team.id,
@ -94,8 +84,6 @@ export const TeamDocumentPreferencesForm = ({
          documentVisibility,
          documentLanguage,
          includeSenderDetails,
-          typedSignatureEnabled,
-          includeSigningCertificate,
        },
      });

@ -117,7 +105,7 @@ export const TeamDocumentPreferencesForm = ({
    <Form {...form}>
      <form onSubmit={form.handleSubmit(onSubmit)}>
        <fieldset
-          className="flex h-full max-w-xl flex-col gap-y-6"
+          className="flex h-full max-w-xl flex-col gap-y-4"
          disabled={form.formState.isSubmitting}
        >
          <FormField
@ -239,67 +227,6 @@ export const TeamDocumentPreferencesForm = ({
            )}
          />

-          <FormField
-            control={form.control}
-            name="typedSignatureEnabled"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Enable Typed Signature</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 recipients can sign the documents using a typed signature.
-                    Enable or disable the typed signature globally.
-                  </Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="includeSigningCertificate"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Include the Signing Certificate 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 signing certificate will be included in the document when
-                    it is downloaded. The signing certificate 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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ephraim Atta-Duncan	2b1b042097	chore: code changes based of review	2024-11-21 21:21:42 +00:00
Ephraim Duncan	31dc403500	Merge branch 'main' into expiry-links	2024-11-21 18:14:35 +00:00
Ephraim Duncan	cfb57c8c27	Merge branch 'main' into expiry-links	2024-11-19 11:09:46 +00:00
Ephraim Atta-Duncan	2d7988f484	feat: update recipient expiry handling	2024-11-17 22:57:40 +00:00
Ephraim Atta-Duncan	ba627e22c5	feat: show recipient as expired on document page view	2024-11-17 17:52:28 +00:00
Ephraim Atta-Duncan	6e9d17f8ea	feat: audit logS	2024-11-17 16:56:15 +00:00
Ephraim Atta-Duncan	8491c69e8c	feat: period select for expiry	2024-11-17 16:06:10 +00:00
Ephraim Atta-Duncan	c422317566	feat: recipient expired on dashboard	2024-11-17 12:55:37 +00:00
Ephraim Atta-Duncan	316dbee446	feat: prevent signing when expired	2024-11-17 12:12:27 +00:00
Ephraim Atta-Duncan	79d0cd7de5	feat: use existing expiry date if available	2024-11-17 11:11:45 +00:00
Ephraim Atta-Duncan	e31a10a943	feat: expiry endpoint	2024-11-17 11:02:52 +00:00
Ephraim Atta-Duncan	ca2b6bea95	feat: expiry dialog	2024-11-17 09:46:41 +00:00
Ephraim Atta-Duncan	63830fb257	chore: add expired signing status	2024-11-16 09:34:59 +00:00