test(e2e): update document specs for faceted toolbar filters

# Conflicts:
#	apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
#	packages/lib/server-only/document/find-documents.ts

.npmrc

@@ -1,3 +1,3 @@
 legacy-peer-deps = true
 prefer-dedupe = true
-# min-release-age = 7
+min-release-age = 7

ARCHITECTURE.md

@@ -42,8 +42,8 @@ Documenso is an open-source document signing platform built as a **monorepo** us
 | Package                    | Description                                              | Port |
 | -------------------------- | -------------------------------------------------------- | ---- |
 | `@documenso/remix`         | Main application - React Router (Remix) with Hono server | 3000 |
+| `@documenso/documentation` | Documentation site (Next.js + Nextra)                    | 3002 |
 | `@documenso/openpage-api`  | Public analytics API                                     | 3003 |
-| `@documenso/docs`          | Documentation site                                       | 3004 |
 
 ### Core Packages (`packages/`)
 

apps/docs/content/docs/developers/api/documents.mdx

@@ -6,8 +6,6 @@ description: Create, manage, and send documents for signing via the API.
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 <Callout type="warn">
   This guide may not reflect the latest endpoints or parameters. For an always up-to-date reference,
   see the [OpenAPI Reference](https://openapi.documenso.com).

apps/docs/content/docs/developers/api/index.mdx

@@ -5,8 +5,6 @@ description: Complete reference for the Documenso REST API.
 
 import { Callout } from 'fumadocs-ui/components/callout';
 
-<EnvelopeWarning />
-
 <Callout type="warn">
   The guides below cover common API patterns but may not reflect the latest endpoints or parameters.
   For an always up-to-date reference, see the [OpenAPI Reference](https://openapi.documenso.com).

apps/docs/content/docs/developers/api/meta.json

@@ -8,7 +8,6 @@
     "teams",
     "rate-limits",
     "versioning",
-    "migrate-to-envelopes",
     "developer-mode",
     "common-errors"
   ]

apps/docs/content/docs/developers/api/migrate-to-envelopes.mdx

@@ -1,249 +0,0 @@
----
-title: Migrating to Envelopes
-description: Why Documenso unified documents and templates into envelopes, and how to migrate from the deprecated document and template create endpoints.
----
-
-import { Accordion, Accordions } from 'fumadocs-ui/components/accordion';
-import { Callout } from 'fumadocs-ui/components/callout';
-import { Step, Steps } from 'fumadocs-ui/components/steps';
-import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
-
-## Summary
-
-The following items have been deprecated and will be removed on the <strong>1st of March 2027</strong>:
-
-- <strong>API V1</strong>
-- <strong>A subset of SDK/API V2 endpoints</strong>
-- <strong>Legacy documents and templates</strong>
-- <strong>EmbedCreateDocumentV1</strong>
-- <strong>EmbedCreateTemplateV1</strong>
-- <strong>EmbedUpdateDocumentV1</strong>
-- <strong>EmbedUpdateTemplateV1</strong>
-
-The beta endpoint `/api/v2-beta` will also be removed. Use `/api/v2` instead, which is a drop-in replacement.
-
-Nothing breaks before 1st of March 2027, so you can migrate at your own pace.
-
-## What are legacy documents and templates
-
-These are documents and templates created by the following endpoints:
-
-- `POST /api/v2/document/create`
-- `POST /api/v2/document/create/beta`
-- `POST /api/v2/template/create`
-- `POST /api/v2/template/create/beta`
-- `POST /api/v1/documents`
-- `POST /api/v1/templates`
-- `POST /api/v1/templates/create-document`
-- `POST /api/v1/templates/generate-document`
-
-## What replaces legacy documents and templates
-
-At the end of 2025 we introduced a unified system for documents and templates, called <strong>envelopes</strong>.
-
-We still reference documents and templates throughout the documentation and application to distinguish them, but internally they are envelopes.
-
-Moving to the envelope system gives you:
-
-- **Multiple PDFs in one envelope.** Send several documents to sign in a single request.
-- **One API for documents and templates.** Learn one set of endpoints instead of two misaligned ones.
-- **A better editor and signing experience** for you and your recipients.
-
-## How to migrate
-
-{/* prettier-ignore */}
-<Steps>
-  <Step>
-    ### Switch to the envelope endpoints
-
-    Replace each deprecated endpoint with its `/api/v2/envelope/*` equivalent from the [mapping tables](#endpoint-mapping-reference) below.
-  </Step>
-  <Step>
-    ### Set the envelope `type` on create
-
-    A single endpoint, `POST /api/v2/envelope/create`, can create both documents and templates. Set `type` to `DOCUMENT` or `TEMPLATE`. You can now upload more than one PDF using the `files` field.
-  </Step>
-  <Step>
-    ### Update how you store IDs
-
-    Envelope IDs are **strings** (for example `envelope_abc123`), not numbers. Update any code that stores, parses, or compares IDs.
-  </Step>
-  <Step>
-    ### Test, then remove the old calls
-
-    Verify the new flow against your account, then delete the deprecated calls.
-  </Step>
-</Steps>
-
-The main data differences are as follows:
-- ID format changed from number to string (e.g. `42` to `envelope_abc123`)
-- pageNumber becomes page
-- pageX becomes positionX
-- pageY becomes positionY
-
-See the [Documents API](/docs/developers/api/documents) and [Templates API](/docs/developers/api/templates) for the full envelope reference.
-
-### Deprecated V1 API Endpoints
-
-Full reference in the [V1 OpenAPI reference](https://openapi-v1.documenso.com).
-
-| Deprecated endpoint                                      | Replacement                                           |
-| -------------------------------------------------------- | ----------------------------------------------------- |
-| `GET /api/v1/documents`                                  | `GET /api/v2/envelope`                                |
-| `GET /api/v1/documents/{id}`                             | `GET /api/v2/envelope/{envelopeId}`                   |
-| `POST /api/v1/documents`                                 | `POST /api/v2/envelope/create`                        |
-| `POST /api/v1/documents/{id}/send`                       | `POST /api/v2/envelope/distribute`                    |
-| `POST /api/v1/documents/{id}/resend`                     | `POST /api/v2/envelope/redistribute`                  |
-| `DELETE /api/v1/documents/{id}`                          | `POST /api/v2/envelope/delete`                        |
-| `GET /api/v1/documents/{id}/download`                    | `GET /api/v2/envelope/item/{envelopeItemId}/download` |
-| `POST /api/v1/documents/{id}/recipients`                 | `POST /api/v2/envelope/recipient/create-many`         |
-| `PATCH /api/v1/documents/{id}/recipients/{recipientId}`  | `POST /api/v2/envelope/recipient/update-many`         |
-| `DELETE /api/v1/documents/{id}/recipients/{recipientId}` | `POST /api/v2/envelope/recipient/delete`              |
-| `POST /api/v1/documents/{id}/fields`                     | `POST /api/v2/envelope/field/create-many`             |
-| `PATCH /api/v1/documents/{id}/fields/{fieldId}`          | `POST /api/v2/envelope/field/update-many`             |
-| `DELETE /api/v1/documents/{id}/fields/{fieldId}`         | `POST /api/v2/envelope/field/delete`                  |
-| `GET /api/v1/templates`                                  | `GET /api/v2/envelope` (with `type=TEMPLATE`)         |
-| `GET /api/v1/templates/{id}`                             | `GET /api/v2/envelope/{envelopeId}`                   |
-| `POST /api/v1/templates`                                 | `POST /api/v2/envelope/create` (`type=TEMPLATE`)      |
-| `DELETE /api/v1/templates/{id}`                          | `POST /api/v2/envelope/delete`                        |
-| `POST /api/v1/templates/{templateId}/create-document`    | `POST /api/v2/envelope/use`                           |
-| `POST /api/v1/templates/{templateId}/generate-document`  | `POST /api/v2/envelope/use`                           |
-
-### Deprecated V2 API Endpoints
-
-Full reference in the [V2 OpenAPI reference](https://openapi.documenso.com).
-
-#### Documents
-
-| Deprecated endpoint                               | Replacement                                           |
-| ------------------------------------------------- | ----------------------------------------------------- |
-| `GET /api/v2/document`                            | `GET /api/v2/envelope`                                |
-| `GET /api/v2/document/{documentId}`               | `GET /api/v2/envelope/{envelopeId}`                   |
-| `POST /api/v2/document/get-many`                  | `POST /api/v2/envelope/get-many`                      |
-| `POST /api/v2/document/create`                    | `POST /api/v2/envelope/create`                        |
-| `POST /api/v2/document/create/beta`               | `POST /api/v2/envelope/create`                        |
-| `POST /api/v2/document/update`                    | `POST /api/v2/envelope/update`                        |
-| `POST /api/v2/document/delete`                    | `POST /api/v2/envelope/delete`                        |
-| `POST /api/v2/document/duplicate`                 | `POST /api/v2/envelope/duplicate`                     |
-| `POST /api/v2/document/distribute`                | `POST /api/v2/envelope/distribute`                    |
-| `POST /api/v2/document/redistribute`              | `POST /api/v2/envelope/redistribute`                  |
-| `GET /api/v2/document/attachment`                 | `GET /api/v2/envelope/attachment`                     |
-| `POST /api/v2/document/attachment/create`         | `POST /api/v2/envelope/attachment/create`             |
-| `POST /api/v2/document/attachment/update`         | `POST /api/v2/envelope/attachment/update`             |
-| `POST /api/v2/document/attachment/delete`         | `POST /api/v2/envelope/attachment/delete`             |
-| `GET /api/v2/document/{documentId}/download`      | `GET /api/v2/envelope/item/{envelopeItemId}/download` |
-| `GET /api/v2/document/{documentId}/download-beta` | `GET /api/v2/envelope/item/{envelopeItemId}/download` |
-
-#### Templates
-
-| Deprecated endpoint                   | Replacement                                      |
-| ------------------------------------- | ------------------------------------------------ |
-| `GET /api/v2/template`                | `GET /api/v2/envelope` (with `type=TEMPLATE`)    |
-| `GET /api/v2/template/{templateId}`   | `GET /api/v2/envelope/{envelopeId}`              |
-| `POST /api/v2/template/get-many`      | `POST /api/v2/envelope/get-many`                 |
-| `POST /api/v2/template/create`        | `POST /api/v2/envelope/create` (`type=TEMPLATE`) |
-| `POST /api/v2/template/create/beta`   | `POST /api/v2/envelope/create` (`type=TEMPLATE`) |
-| `POST /api/v2/template/update`        | `POST /api/v2/envelope/update`                   |
-| `POST /api/v2/template/duplicate`     | `POST /api/v2/envelope/duplicate`                |
-| `POST /api/v2/template/delete`        | `POST /api/v2/envelope/delete`                   |
-| `POST /api/v2/template/use`           | `POST /api/v2/envelope/use`                      |
-| `POST /api/v2/template/direct/create` | **Pending replacement**                               |
-| `POST /api/v2/template/direct/delete` | **Pending replacement**                               |
-| `POST /api/v2/template/direct/toggle` | **Pending replacement**                               |
-
-#### Document fields
-
-| Deprecated endpoint                       | Replacement                               |
-| ----------------------------------------- | ----------------------------------------- |
-| `GET /api/v2/document/field/{fieldId}`    | `GET /api/v2/envelope/field/{fieldId}`    |
-| `POST /api/v2/document/field/create`      | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/document/field/create-many` | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/document/field/update`      | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/document/field/update-many` | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/document/field/delete`      | `POST /api/v2/envelope/field/delete`      |
-
-#### Template fields
-
-| Deprecated endpoint                       | Replacement                               |
-| ----------------------------------------- | ----------------------------------------- |
-| `GET /api/v2/template/field/{fieldId}`    | `GET /api/v2/envelope/field/{fieldId}`    |
-| `POST /api/v2/template/field/create`      | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/template/field/create-many` | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/template/field/update`      | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/template/field/update-many` | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/template/field/delete`      | `POST /api/v2/envelope/field/delete`      |
-
-#### Document recipients
-
-| Deprecated endpoint                            | Replacement                                    |
-| ---------------------------------------------- | ---------------------------------------------- |
-| `GET /api/v2/document/recipient/{recipientId}` | `GET /api/v2/envelope/recipient/{recipientId}` |
-| `POST /api/v2/document/recipient/create`       | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/document/recipient/create-many`  | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/document/recipient/update`       | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/document/recipient/update-many`  | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/document/recipient/delete`       | `POST /api/v2/envelope/recipient/delete`       |
-
-#### Template recipients
-
-| Deprecated endpoint                            | Replacement                                    |
-| ---------------------------------------------- | ---------------------------------------------- |
-| `GET /api/v2/template/recipient/{recipientId}` | `GET /api/v2/envelope/recipient/{recipientId}` |
-| `POST /api/v2/template/recipient/create`       | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/template/recipient/create-many`  | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/template/recipient/update`       | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/template/recipient/update-many`  | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/template/recipient/delete`       | `POST /api/v2/envelope/recipient/delete`       |
-
-### Embedding components
-
-| Deprecated component    | Replacement           |
-| ----------------------- | --------------------- |
-| `EmbedCreateDocumentV1` | `EmbedCreateEnvelope` |
-| `EmbedCreateTemplateV1` | `EmbedCreateEnvelope` |
-| `EmbedUpdateDocumentV1` | `EmbedUpdateEnvelope` |
-| `EmbedUpdateTemplateV1` | `EmbedUpdateEnvelope` |
-
-See the [embedding guide](/docs/developers/embedding) for the envelope components.
-
-## FAQ
-
-<Accordions>
-  <Accordion title="What happens on 1 March 2027?">
-    The deprecated V1 API, the V2 endpoints listed above, and the V1 embedding components are removed.
-    Requests to them will fail, so migrate to the envelope API before that date.
-  </Accordion>
-  <Accordion title="Will my existing documents and templates keep working?">
-    Yes. Documents and templates you already created remain in your account and continue to work. They will automatically be converted to envelopes. Only
-    the deprecated endpoints you call are going away. Your data is not deleted.
-  </Accordion>
-  <Accordion title="Do I need a new API token?">
-    No. Authentication is unchanged. The same API token works for the envelope endpoints under
-    `https://app.documenso.com/api/v2`.
-  </Accordion>
-  <Accordion title="What is the difference between a document and a template now?">
-    Both are envelopes, distinguished by a `type` field of `DOCUMENT` or `TEMPLATE`. They share the same
-    endpoints, recipients, fields, and attachments.
-  </Accordion>
-  <Accordion title="I use an official SDK, what should I do?">
-    The function calls to the legacy endpoints will break on the 1st of March 2027. Update to the latest SDK version and switch to its envelope methods.
-    The deprecated document and template methods map to the envelope endpoints in the tables above.
-  </Accordion>
-  <Accordion title="I need more time or help migrating">
-    Reach out to [support@documenso.com](mailto:support@documenso.com) with your use case and we will
-    help you plan the migration.
-  </Accordion>
-</Accordions>
-
-## Getting help
-
-- [V2 OpenAPI reference](https://openapi.documenso.com): the up-to-date envelope API.
-- [V1 OpenAPI reference](https://openapi-v1.documenso.com): the deprecated V1 API.
-- [support@documenso.com](mailto:support@documenso.com): migration questions and extensions.
-
-## See also
-
-- [Documents API](/docs/developers/api/documents): create and manage envelopes
-- [Templates API](/docs/developers/api/templates): work with templates and direct links
-- [Fields API](/docs/developers/api/fields) and [Recipients API](/docs/developers/api/recipients)
-- [API Versioning](/docs/developers/api/versioning): how Documenso versions the public API

apps/docs/content/docs/developers/api/rate-limits.mdx

@@ -11,14 +11,9 @@ Documenso enforces rate limits on all API endpoints to ensure service stability.
 
 ## HTTP Rate Limits
 
-**Limit:** 1000 requests per minute per IP address  
+**Limit:** 100 requests per minute per IP address  
 **Response:** 429 Too Many Requests
 
-<Callout type="info">
-  This is the global per-IP ceiling. Your organisation may have its own rate limits configured below
-  this value, in which case you can be rate-limited before reaching the global limit.
-</Callout>
-
 ### Rate Limit Response
 
 ```json
@@ -70,4 +65,3 @@ When you exceed a resource limit:
 - [Authentication](/docs/developers/getting-started/authentication) - API authentication guide
 - [API Versioning](/docs/developers/api/versioning) - API version management
 - [First API Call](/docs/developers/getting-started/first-api-call) - Getting started with the API
-- [Organisation Limits](/docs/self-hosting/configuration/organisation-limits) - Admins: set per-organisation resource quotas and rate limits (the HTTP rate limit above is separate and not admin-settable)

apps/docs/content/docs/developers/api/templates.mdx

@@ -6,8 +6,6 @@ description: Create documents from reusable templates via API.
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 <Callout type="warn">
   This guide may not reflect the latest endpoints or parameters. For an always up-to-date reference,
   see the [OpenAPI Reference](https://openapi.documenso.com).

apps/docs/content/docs/developers/api/versioning.mdx

@@ -5,8 +5,6 @@ description: Versioning information for the Documenso public API.
 
 import { Callout } from 'fumadocs-ui/components/callout';
 
-<EnvelopeWarning />
-
 ## Overview
 
 Documenso uses API versioning to manage changes to the public API. This allows us to introduce new features, fix bugs, and make other changes without breaking existing integrations.
@@ -21,16 +19,7 @@ Also, we may deprecate certain features or endpoints in the API. When we depreca
 
 ---
 
-## Documents, Templates, and Envelopes
-
-Documenso has unified documents and templates into a single resource called an **envelope**. New integrations should create documents and templates through the `/envelope/*` endpoints. The `POST /document/create` and `POST /template/create` endpoints (including their `/beta` variants) are deprecated in favor of `POST /envelope/create`.
-
-See [Migrating to the Envelope API](/docs/developers/api/migrate-to-envelopes) for the rationale and step-by-step migration examples.
-
----
-
 ## See Also
 
-- [Migrating to the Envelope API](/docs/developers/api/migrate-to-envelopes) - Move from the document and template create endpoints
 - [Authentication](/docs/developers/getting-started/authentication) - API authentication guide
 - [Rate Limits](/docs/developers/api/rate-limits) - API rate limit details

apps/docs/content/docs/developers/examples/common-workflows.mdx

@@ -8,8 +8,6 @@ import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 ## Workflow 1: Send a Document for Signature
 
 The most common workflow: upload a PDF, add recipients with signature fields, and send for signing.
@@ -474,7 +472,7 @@ Send the same document to multiple recipients in parallel. Useful for policy ack
     <code>distributeDocument: true</code>
   </Step>
   <Step>
-    Process in batches with a short delay to respect rate limits (e.g. 1000 requests/minute)
+    Process in batches with a short delay to respect rate limits (e.g. 100 requests/minute)
   </Step>
 </Steps>
 
@@ -640,8 +638,8 @@ done
 </Tabs>
 
 <Callout type="info">
-  The API allows 1000 requests per minute (your organisation may have its own lower limit). For large
-  batches, implement rate limiting with delays between requests to avoid hitting limits.
+  The API allows 100 requests per minute. For large batches, implement rate limiting with delays
+  between requests to avoid hitting limits.
 </Callout>
 
 ---

apps/docs/content/docs/developers/examples/index.mdx

@@ -3,8 +3,6 @@ title: Examples
 description: Common integration patterns and end-to-end workflows.
 ---
 
-<EnvelopeWarning />
-
 <Cards>
   <Card
     title="Common Workflows"

apps/docs/content/docs/developers/getting-started/authentication.mdx

@@ -7,8 +7,6 @@ import { Accordion, Accordions } from 'fumadocs-ui/components/accordion';
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 
-<EnvelopeWarning />
-
 ## Prerequisites
 
 - A Documenso account (cloud or self-hosted)

apps/docs/content/docs/developers/getting-started/first-api-call.mdx

@@ -7,8 +7,6 @@ import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 ## Prerequisites
 
 Before starting, you need:
@@ -485,7 +483,7 @@ The API returns standard HTTP status codes and JSON error responses:
 
 ### Handling Rate Limits
 
-The API allows 1000 requests per minute per IP address. Your organisation may have its own lower rate limits. When rate limited, wait at least 60 seconds before retrying:
+The API allows 100 requests per minute per IP address. When rate limited, wait at least 60 seconds before retrying:
 
 ```javascript
 async function fetchWithRetry(url, options, maxRetries = 3) {

apps/docs/content/docs/developers/getting-started/index.mdx

@@ -3,8 +3,6 @@ title: Getting Started
 description: Get your API key and make your first API call.
 ---
 
-<EnvelopeWarning />
-
 <Cards>
   <Card
     title="Authentication"

apps/docs/content/docs/developers/index.mdx

@@ -3,8 +3,6 @@ title: Developer Guide
 description: Integrate Documenso into your applications using the REST API, webhooks, and embedding options.
 ---
 
-<EnvelopeWarning />
-
 ## Getting Started
 
 <Cards>

apps/docs/content/docs/policies/enterprise-edition.mdx

@@ -76,8 +76,6 @@ The Enterprise Edition is required when you:
     4. Restart your Documenso instance
     5. Verify the license is active in the **Admin Panel** under the **Stats** section
 
-    See [Apply Your License Key](/docs/self-hosting/configuration/license) for the full walkthrough, including how to enable individual features once licensed.
-
   </Accordion>
 </Accordions>
 
@@ -199,7 +197,7 @@ See [Support](/docs/policies/support) for complete support options.
     1. Sign the Enterprise license agreement
     2. Receive license key and access credentials
     3. Deploy using [self-hosting guides](/docs/self-hosting) or access Documenso Cloud
-    4. Apply the key — see [Apply Your License Key](/docs/self-hosting/configuration/license) — and configure Enterprise features with support assistance
+    4. Configure Enterprise features with support assistance
 
   </Step>
   <Step>
@@ -240,7 +238,6 @@ See [Support](/docs/policies/support) for complete support options.
 
 ## Related
 
-- [Apply Your License Key](/docs/self-hosting/configuration/license) - Step-by-step license activation
 - [Community Edition](/docs/policies/community-edition) - AGPL-3.0 open-source license
 - [Licenses](/docs/policies/licenses) - Complete licensing overview and FAQ
 - [Support](/docs/policies/support) - Support channels and response times

apps/docs/content/docs/policies/fair-use.mdx

@@ -41,17 +41,12 @@ When a limit is reached, requests return a `429 Too Many Requests` response with
 
 | Action | Limit | Window |
 | --- | --- | --- |
-| API requests (v1 and v2) | 1000 requests | 1 minute |
+| API requests (v1 and v2) | 100 requests | 1 minute |
 | File uploads | 20 requests | 1 minute |
 | AI features | 3 requests | 1 minute |
 
 Authentication endpoints (login, signup, password reset, etc.) are also rate-limited to protect against abuse.
 
-<Callout type="info">
-  The API request limit above is the global per-IP ceiling. Individual organisations also have their
-  own rate limits, which may be configured below this value.
-</Callout>
-
 <Callout type="info">
   Rate limits may vary by plan. Enterprise plans can include higher or custom limits. Contact
   [sales](https://documen.so/sales) for details.

apps/docs/content/docs/self-hosting/configuration/environment.mdx

@@ -443,11 +443,11 @@ Telemetry collects only: app version, installation ID, and node ID. No personal
 
 ## Enterprise Features
 
-These variables require an active [Enterprise Edition](/docs/policies/enterprise-edition) license. Obtain a license key from [license.documenso.com](https://license.documenso.com) and set it below to unlock enterprise features such as SSO, embed editor, and 21 CFR Part 11 compliance. See [Apply Your License Key](/docs/self-hosting/configuration/license) for step-by-step setup.
+These variables require an active [Enterprise Edition](/docs/policies/enterprise-edition) license. Obtain a license key from [license.documenso.com](https://license.documenso.com) and set it below to unlock enterprise features such as SSO, embed editor, and 21 CFR Part 11 compliance.
 
 | Variable                             | Description                                      |
 | ------------------------------------ | ------------------------------------------------ |
-| `NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY` | License key for enterprise features — see [Apply Your License Key](/docs/self-hosting/configuration/license) for how to apply it |
+| `NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY` | License key for enterprise features              |
 | `NEXT_PRIVATE_STRIPE_API_KEY`        | Stripe API key for billing                       |
 | `NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET` | Stripe webhook secret                            |
 | `NEXT_PRIVATE_SES_ACCESS_KEY_ID`     | AWS SES access key for email domain verification |
@@ -510,5 +510,4 @@ NEXT_PRIVATE_SIGNING_PASSPHRASE="your-certificate-password"
 - [Email Configuration](/docs/self-hosting/configuration/email) - Configure email delivery
 - [Storage Configuration](/docs/self-hosting/configuration/storage) - Set up S3 storage
 - [Signing Certificate](/docs/self-hosting/configuration/signing-certificate) - Configure document signing
-- [Organisation Limits](/docs/self-hosting/configuration/organisation-limits) - Set per-organisation document, email, and API limits from the admin panel
 - [Troubleshooting](/docs/self-hosting/maintenance/troubleshooting) - Common configuration issues

apps/docs/content/docs/self-hosting/configuration/index.mdx

@@ -29,11 +29,6 @@ description: Configure your self-hosted Documenso instance with environment vari
     description="Digital signature certificate setup."
     href="/docs/self-hosting/configuration/signing-certificate"
   />
-  <Card
-    title="Organisation Limits"
-    description="Set per-organisation document, email, and API limits via the admin panel."
-    href="/docs/self-hosting/configuration/organisation-limits"
-  />
 </Cards>
 
 ## Required Configuration

apps/docs/content/docs/self-hosting/configuration/license.mdx

@@ -1,107 +0,0 @@
----
-title: Apply Your License Key
-description: Activate your Enterprise license key to unlock enterprise features on your self-hosted instance.
----
-
-import { Accordion, Accordions } from 'fumadocs-ui/components/accordion';
-import { Callout } from 'fumadocs-ui/components/callout';
-import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
-
-A license key activates the Enterprise features available to your self-hosted instance, such as CSC signing, SSO, embed white-labelling, and 21 CFR Part 11 compliance.
-
-<Callout type="info">
-  The license key applies to your **whole instance**, not an individual user account. There's one
-  key per deployment.
-</Callout>
-
-## Prerequisites
-
-- An active Enterprise license key — contact [sales](https://documen.so/enterprise) to set up an
-  Enterprise subscription, then copy your key from [license.documenso.com](https://license.documenso.com).
-  See [Enterprise Edition](/docs/policies/enterprise-edition) for details.
-- A running self-hosted Documenso instance that you're able to restart
-
-## Step 1: Set the environment variable
-
-Set `NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY` to your license key.
-
-<Tabs items={['Docker Compose', 'docker run', '.env']}>
-<Tab value="Docker Compose">
-
-Add the variable to your `.env` file (or directly under `environment:` in `compose.yml`):
-
-```bash
-NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY=your-license-key-here
-```
-
-Then apply it:
-
-```bash
-docker compose up -d
-```
-
-</Tab>
-<Tab value="docker run">
-
-```bash
-docker run -d \
-  --name documenso \
-  -e NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY=your-license-key-here \
-  documenso/documenso:latest
-```
-
-</Tab>
-<Tab value=".env">
-
-If you're running Documenso directly (not in a container), add the variable to your `.env` file:
-
-```bash
-NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY=your-license-key-here
-```
-
-</Tab>
-</Tabs>
-
-## Step 2: Restart the instance
-
-The license key is only read once, at process startup. Setting the variable in a running container or shell has no effect until the process restarts.
-
-```bash
-# Docker Compose
-docker compose restart documenso
-
-# Docker
-docker restart documenso
-```
-
-On startup, Documenso validates the key against the Documenso license server and caches the result locally for future startups, so a brief license-server outage won't lock you out.
-
-## What the license enables
-
-A valid license doesn't turn every enterprise feature on everywhere — activation depends on the feature:
-
-- **CSC signing** activates instance-wide automatically once the license is active and CSC transport is configured. See [CSC / QES Signing](/docs/self-hosting/configuration/signing-certificate/csc-qes) for the full setup.
-- **SSO, embed white-labelling, 21 CFR Part 11, and similar** are provisioned per organisation. Follow each feature's own guide to configure it once the license is active.
-
-## Troubleshooting
-
-<Accordions type="multiple">
-  <Accordion title="Enterprise features are still unavailable after applying the key">
-    - Confirm the key is present in the environment the running process actually reads — `docker
-      exec` into the container and check `env | grep LICENSE` if unsure.
-    - Confirm the instance was fully restarted after the variable was set, not just reloaded.
-    - Re-copy the key to rule out truncation or accidental whitespace.
-  </Accordion>
-  <Accordion title="A specific feature still isn't working">
-    Instance-wide features (like CSC signing) also need their own configuration — an active license
-    alone isn't enough. Check that feature's guide to confirm the required settings are in place.
-    Per-organisation features additionally need to be provisioned for the organisation that's using
-    them.
-  </Accordion>
-</Accordions>
-
-## See Also
-
-- [Environment Variables](/docs/self-hosting/configuration/environment) - Complete configuration reference
-- [Enterprise Edition](/docs/policies/enterprise-edition) - What's included and how to purchase a license
-- [CSC / QES Signing](/docs/self-hosting/configuration/signing-certificate/csc-qes) - Enable CSC-based signing

apps/docs/content/docs/self-hosting/configuration/meta.json

@@ -2,14 +2,12 @@
   "title": "Configuration",
   "pages": [
     "environment",
-    "license",
     "database",
     "email",
     "storage",
     "background-jobs",
     "signing-certificate",
     "telemetry",
-    "organisation-limits",
     "advanced"
   ]
 }

apps/docs/content/docs/self-hosting/configuration/organisation-limits.mdx

@@ -1,111 +0,0 @@
----
-title: Organisation Limits
-description: View and set per-organisation document, email, and API limits on a self-hosted Documenso instance using the admin panel's subscription claims.
----
-
-import { Callout } from 'fumadocs-ui/components/callout';
-
-Per-organisation limits — document, email, and API usage, plus feature toggles and team/member caps — are controlled by **subscription claims**. You configure them in the admin panel, not through environment variables.
-
-There are three distinct kinds of limit:
-
-| Limit                  | Caps                                              | Admin-settable          |
-| ---------------------- | ------------------------------------------------- | ----------------------- |
-| Resource quota         | Documents, emails, and API requests **per month** | Yes — per claim and org |
-| Resource rate limit    | The same resources over a short window (e.g. `1h`) | Yes — per claim and org |
-| Global HTTP rate limit | API requests per IP (1000/min, hardcoded)         | No — see [Limitations](#limitations) |
-
-## Prerequisites
-
-- A running self-hosted Documenso instance.
-- An account with the **`ADMIN`** role — an account-level role, separate from organisation and team roles. New accounts are created with the `USER` role only. Grant the first admin by adding `ADMIN` to that user's `roles` directly in the database; after that, an existing admin can grant the role to others under **Admin Panel > Users > _(user)_ > Roles > Update user**.
-
-Open the admin panel at `/admin`. The sidebar sections used below are **Claims**, **Organisations**, and **Organisation Stats**.
-
-## Viewing usage
-
-**One organisation:** open **Admin Panel > Organisations** and select it. The **Organisation usage** section shows the current period's document, email, and API usage against its quotas.
-
-**All organisations:** open **Admin Panel > Organisation Stats** to sort and filter monthly usage. Filter by **claim** and by **period** (a UTC calendar month, shown as `YYYY-MM`), and switch between **Show usage**, **Show usage with quotas**, and **Show daily averages**.
-
-<Callout type="warn">
-  Usage counts **attempts**, not only successful actions. A request that exceeds a quota is still counted before it is rejected, so displayed usage can read higher than the number of actions that succeeded.
-</Callout>
-
-## Subscription claims
-
-A subscription claim is a named bundle of limits and feature flags (for example `Free`, `Individual`, `Teams`, `Platform`, or `Enterprise`). Claims are **templates**: when an organisation is created it receives a private copy of its claim and reads from that copy afterwards. Editing a claim template therefore affects organisations created later, not existing ones — to change an existing organisation, [edit it directly](#change-limits-for-one-organisation).
-
-### Claim fields
-
-Under **Admin Panel > Claims** (`/admin/claims`), each claim has:
-
-| Field                   | Controls                                                                          |
-| ----------------------- | --------------------------------------------------------------------------------- |
-| **Name**                | The claim's display name.                                                         |
-| **Team Count**          | Teams allowed. `0` = unlimited.                                                   |
-| **Member Count**        | Members allowed. `0` = unlimited.                                                 |
-| **Envelope Item Count** | Uploaded files allowed per envelope. Minimum `1`.                                |
-| **Recipient Count**     | Recipients allowed per document. `0` = unlimited.                                |
-| **Feature Flags**       | Feature toggles (see [Feature flags](#feature-flags)).                            |
-| **Limits**              | Monthly quota and rate-limit windows for Documents, Emails, and API.              |
-| **Email transport**     | Transport the claim uses. *Default (system mailer)* uses the instance default.    |
-
-### Quotas and rate limits
-
-The **Limits** section has a column for **Documents**, **Emails**, and **API**, each with two controls:
-
-- **Monthly quota** — how many of that resource are allowed per calendar month. An **empty** field is unlimited; **`0`** blocks the resource entirely.
-- **Rate limit windows** — optional short-window caps, each a duration and a maximum. A window is a number and a unit (`s`, `m`, `h`, `d`), such as `5m`, `1h`, or `24h`, and must be unique within the resource.
-
-<Callout type="warn">
-  Quotas and counts use opposite conventions for "unlimited": an **empty** quota is unlimited (and `0` blocks the resource), whereas `0` in the **Team**, **Member**, and **Recipient Count** fields means unlimited.
-</Callout>
-
-### Feature flags
-
-The **Feature Flags** section toggles capabilities such as Unlimited documents, Branding, Hide Documenso branding, Email domains, Embed authoring, Embed signing, White label for embed authoring/signing, 21 CFR, HIPAA, Authentication portal, Allow Legacy Envelopes, Signing reminders, QES signing, and Disable emails.
-
-Some flags are Enterprise features. If your license does not include one, it is marked and cannot be enabled (you can still turn it off). See [Enterprise Edition](/docs/policies/enterprise-edition).
-
-### Create or edit a claim template
-
-1. Go to **Admin Panel > Claims**.
-2. Select **New claim**, or select an existing claim to edit it.
-3. Set the counts, feature flags, and the **Limits** section.
-4. Save. Changes apply to organisations created afterwards, not existing ones.
-
-### Change limits for one organisation
-
-To change limits for an existing organisation, edit it directly rather than its claim template.
-
-1. Go to **Admin Panel > Organisations** and open the organisation.
-2. Adjust its quota, rate-limit, feature-flag, or email-transport fields.
-3. Save. Changes take effect immediately.
-
-The organisation also shows the **Inherited subscription claim** it was created from.
-
-## Usage reset
-
-Monthly quota usage is keyed to the **UTC calendar month**. There is no scheduled reset job — when the month rolls over, the new period's counter starts at `0`.
-
-## Limitations
-
-The **global HTTP rate limit is not configurable.** Documenso enforces a hardcoded **1000 requests per minute per IP address** on its API endpoint groups (`/api/v1`, `/api/v2`, and the tRPC API are limited separately), returning `429 Too Many Requests`. It is a per-IP safeguard applied at the HTTP layer — not per-organisation, not stored on any claim, and not adjustable from the admin panel. See [Rate Limits](/docs/developers/api/rate-limits).
-
-## Troubleshooting
-
-| Symptom                                          | Cause and fix                                                                                                                    |
-| ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------- |
-| An organisation hit its limit unexpectedly       | Usage counts rejected over-quota attempts. Compare usage against the quota under **Organisation Stats > Show usage with quotas**. |
-| A resource is blocked entirely, not just capped  | The **Monthly quota** is `0`, which blocks the resource. Leave it empty for unlimited.                                           |
-| Emails are not sending for an organisation        | Check whether the **Disable emails** flag is enabled on the organisation's claim — it blocks all emails regardless of quota.     |
-| A claim template edit had no effect              | Template edits are not retroactive. Edit the organisation directly under **Admin Panel > Organisations**.                        |
-
----
-
-## See Also
-
-- [Environment Variables](/docs/self-hosting/configuration/environment) - All configuration options
-- [Rate Limits](/docs/developers/api/rate-limits) - The global HTTP API rate limit (separate from claims)
-- [Enterprise Edition](/docs/policies/enterprise-edition) - Features unlocked by license flags

apps/docs/content/docs/self-hosting/configuration/signing-certificate/csc-qes.mdx

@@ -49,7 +49,7 @@ The callback URL is fixed — Documenso derives it from `NEXT_PUBLIC_WEBAPP_URL`
 
 ### Enterprise Edition license
 
-CSC mode is gated by the `instanceCscSigning` license flag. Without a valid Enterprise license, the transport refuses to start (`CSC_UNLICENSED`). See [Apply Your License Key](/docs/self-hosting/configuration/license) to activate one.
+CSC mode is gated by the `instanceCscSigning` license flag. Without a valid Enterprise license, the transport refuses to start (`CSC_UNLICENSED`).
 
 </Step>
 <Step>

apps/docs/content/docs/self-hosting/index.mdx

@@ -141,7 +141,7 @@ See the [Quick Start guide](/docs/self-hosting/getting-started/quick-start) for
 
 Self-hosted Documenso includes full core functionality under the AGPL-3.0 license. If you need enterprise features such as SSO, embed editor white label, or 21 CFR Part 11 compliance, you can activate them with a license key.
 
-See [Enterprise Edition](/docs/policies/enterprise-edition) for details and [Licenses](/docs/policies/licenses) for a comparison. Already have a key? See [Apply Your License Key](/docs/self-hosting/configuration/license).
+See [Enterprise Edition](/docs/policies/enterprise-edition) for details and [Licenses](/docs/policies/licenses) for a comparison.
 
 ---
 

apps/docs/package.json

@@ -29,7 +29,7 @@
     "@types/node": "^25.1.0",
     "@types/react": "^19.2.10",
     "@types/react-dom": "^19.2.3",
-    "postcss": "^8.5.19",
+    "postcss": "^8.5.14",
     "tailwindcss": "^4.1.18",
     "typescript": "^5.9.3"
   }

apps/docs/src/app/global.css

@@ -83,7 +83,7 @@
   --accent: hsl(0 0% 27.8431%);
   --accent-foreground: hsl(95.0847 71.0843% 67.451%);
   --destructive: hsl(0 86.5979% 61.9608%);
-  --destructive-foreground: hsl(0 0% 98.0392%);
+  --destructive-foreground: hsl(0 87.6289% 19.0196%);
   --border: hsl(0 0% 27.8431%);
   --input: hsl(0 0% 27.8431%);
   --ring: hsl(95.0847 71.0843% 67.451%);

apps/docs/src/components/mdx/envelope-warning.tsx

@@ -1,19 +0,0 @@
-import { Callout } from 'fumadocs-ui/components/callout';
-
-const MIGRATION_GUIDE_HREF = '/docs/developers/api/migrate-to-envelopes';
-
-/**
- * Deprecation banner steering API consumers away from the legacy document and
- * template create endpoints and towards the unified Envelope API.
- *
- * Registered globally in `mdx-components.tsx`, so it can be used in any MDX page
- * as `<EnvelopeWarning />` without an explicit import.
- */
-export function EnvelopeWarning() {
-  return (
-    <Callout type="error">
-      <strong>Documents and templates are being deprecated and replaced by envelopes.</strong>{' '}
-      <a href={MIGRATION_GUIDE_HREF}>Read the migration guide here.</a>
-    </Callout>
-  );
-}

apps/docs/src/mdx-components.tsx

@@ -1,7 +1,6 @@
 import * as TabsComponents from 'fumadocs-ui/components/tabs';
 import defaultMdxComponents from 'fumadocs-ui/mdx';
 import type { MDXComponents } from 'mdx/types';
-import { EnvelopeWarning } from '@/components/mdx/envelope-warning';
 import { Mermaid } from '@/components/mdx/mermaid';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10,7 +9,6 @@ export function getMDXComponents(components?: MDXComponents): any {
     ...defaultMdxComponents,
     ...TabsComponents,
     Mermaid,
-    EnvelopeWarning,
     ...components,
   };
 }

apps/remix/app/components/dialogs/branding-preferences-reset-dialog.tsx

@@ -1,119 +0,0 @@
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { Trans } from '@lingui/react/macro';
-import { useState } from 'react';
-
-export type BrandingPreferencesResetDialogProps = {
-  hasAdvancedBranding: boolean;
-  isSubmitting: boolean;
-  onReset: () => Promise<void>;
-  trigger?: React.ReactNode;
-};
-
-export const BrandingPreferencesResetDialog = ({
-  hasAdvancedBranding,
-  isSubmitting,
-  onReset,
-  trigger,
-}: BrandingPreferencesResetDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const [isResetting, setIsResetting] = useState(false);
-
-  const isLoading = isSubmitting || isResetting;
-
-  const handleResetToDefaults = async () => {
-    setIsResetting(true);
-
-    try {
-      await onReset();
-      setOpen(false);
-    } catch {
-      // The submit handler surfaces its own error toast. Keep the dialog open
-      // so the user can retry.
-    } finally {
-      setIsResetting(false);
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && setOpen(value)}>
-      <DialogTrigger asChild>
-        {trigger ?? (
-          <Button variant="destructive" type="button" size="sm" disabled={isLoading}>
-            <Trans>Reset to defaults</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Reset branding preferences</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            <Trans>
-              This will reset all branding preferences to their default values and save the changes immediately.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="warning">
-          <AlertDescription>
-            <p>
-              <Trans>Once confirmed, the following will be reset:</Trans>
-            </p>
-
-            <ul className="mt-0.5 list-inside list-disc">
-              <li>
-                <Trans>Custom branding enabled setting</Trans>
-              </li>
-              <li>
-                <Trans>Branding logo</Trans>
-              </li>
-              <li>
-                <Trans>Brand website and brand details</Trans>
-              </li>
-              <li>
-                <Trans>Brand colours, including background, foreground, primary, and border colours</Trans>
-              </li>
-
-              {hasAdvancedBranding && (
-                <>
-                  <li>
-                    <Trans>Border radius</Trans>
-                  </li>
-                  <li>
-                    <Trans>Custom CSS</Trans>
-                  </li>
-                </>
-              )}
-            </ul>
-          </AlertDescription>
-        </Alert>
-
-        <DialogFooter>
-          <DialogClose asChild>
-            <Button type="button" variant="secondary" disabled={isLoading}>
-              <Trans>Cancel</Trans>
-            </Button>
-          </DialogClose>
-
-          <Button type="button" variant="destructive" loading={isLoading} onClick={() => void handleResetToDefaults()}>
-            <Trans>Reset to defaults</Trans>
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/remix/app/components/dialogs/document-preferences-reset-dialog.tsx

@@ -1,141 +0,0 @@
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { Trans } from '@lingui/react/macro';
-import { useState } from 'react';
-
-export type DocumentPreferencesResetDialogProps = {
-  isSubmitting: boolean;
-  onReset: () => Promise<void>;
-  showAiFeatures?: boolean;
-  showDocumentVisibility?: boolean;
-  showIncludeSenderDetails?: boolean;
-};
-
-export const DocumentPreferencesResetDialog = ({
-  isSubmitting,
-  onReset,
-  showAiFeatures = false,
-  showDocumentVisibility = false,
-  showIncludeSenderDetails = false,
-}: DocumentPreferencesResetDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const [isResetting, setIsResetting] = useState(false);
-
-  const isLoading = isSubmitting || isResetting;
-
-  const handleResetToDefaults = async () => {
-    setIsResetting(true);
-
-    try {
-      await onReset();
-      setOpen(false);
-    } catch {
-      // The submit handler surfaces its own error toast. Keep the dialog open
-      // so the user can retry.
-    } finally {
-      setIsResetting(false);
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && setOpen(value)}>
-      <DialogTrigger asChild>
-        <Button variant="destructive" type="button" size="sm" disabled={isLoading}>
-          <Trans>Reset to defaults</Trans>
-        </Button>
-      </DialogTrigger>
-
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Reset document preferences</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            <Trans>
-              This will reset all document preferences to their default values and save the changes immediately.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="warning">
-          <AlertDescription>
-            <p>
-              <Trans>Once confirmed, the following will be reset:</Trans>
-            </p>
-
-            <ul className="mt-0.5 list-inside list-disc">
-              {showDocumentVisibility && (
-                <li>
-                  <Trans>Default document visibility</Trans>
-                </li>
-              )}
-              <li>
-                <Trans>Default document language</Trans>
-              </li>
-              <li>
-                <Trans>Default date format</Trans>
-              </li>
-              <li>
-                <Trans>Default time zone</Trans>
-              </li>
-              <li>
-                <Trans>Default signature settings</Trans>
-              </li>
-              {showIncludeSenderDetails && (
-                <li>
-                  <Trans>Send on behalf of team</Trans>
-                </li>
-              )}
-              <li>
-                <Trans>Include the signing certificate in the document</Trans>
-              </li>
-              <li>
-                <Trans>Include the audit logs in the document</Trans>
-              </li>
-              <li>
-                <Trans>Default recipients</Trans>
-              </li>
-              <li>
-                <Trans>Delegate document ownership</Trans>
-              </li>
-              <li>
-                <Trans>Default envelope expiration</Trans>
-              </li>
-              <li>
-                <Trans>Default signing reminders</Trans>
-              </li>
-              {showAiFeatures && (
-                <li>
-                  <Trans>AI features</Trans>
-                </li>
-              )}
-            </ul>
-          </AlertDescription>
-        </Alert>
-
-        <DialogFooter>
-          <DialogClose asChild>
-            <Button type="button" variant="secondary" disabled={isLoading}>
-              <Trans>Cancel</Trans>
-            </Button>
-          </DialogClose>
-
-          <Button type="button" variant="destructive" loading={isLoading} onClick={() => void handleResetToDefaults()}>
-            <Trans>Reset to defaults</Trans>
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/remix/app/components/dialogs/folder-create-dialog.tsx

@@ -1,4 +1,3 @@
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -24,7 +23,7 @@ import { useParams } from 'react-router';
 import { z } from 'zod';
 
 const ZCreateFolderFormSchema = z.object({
-  name: ZNameSchema,
+  name: z.string().min(1, { message: 'Folder name is required' }),
 });
 
 type TCreateFolderFormSchema = z.infer<typeof ZCreateFolderFormSchema>;
@@ -66,7 +65,7 @@ export const FolderCreateDialog = ({ type, trigger, parentFolderId, ...props }:
       toast({
         description: t`Folder created successfully`,
       });
-    } catch (_err) {
+    } catch (err) {
       toast({
         title: t`Failed to create folder`,
         description: t`An unknown error occurred while creating the folder.`,

apps/remix/app/components/dialogs/folder-delete-dialog.tsx

@@ -122,7 +122,7 @@ export const FolderDeleteDialog = ({ folder, isOpen, onOpenChange }: FolderDelet
                     <FormLabel>
                       <Trans>
                         Confirm by typing:{' '}
-                        <span className="font-semibold text-destructive text-sm">{deleteMessage}</span>
+                        <span className="font-semibold font-sm text-destructive">{deleteMessage}</span>
                       </Trans>
                     </FormLabel>
                     <FormControl>

apps/remix/app/components/dialogs/folder-update-dialog.tsx

@@ -1,6 +1,5 @@
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { trpc } from '@documenso/trpc/react';
 import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
@@ -24,6 +23,8 @@ import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
+import { useOptionalCurrentTeam } from '~/providers/team';
+
 export type FolderUpdateDialogProps = {
   folder: TFolderWithSubfolders | null;
   isOpen: boolean;
@@ -31,7 +32,7 @@ export type FolderUpdateDialogProps = {
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 
 export const ZUpdateFolderFormSchema = z.object({
-  name: ZNameSchema,
+  name: z.string().min(1),
   visibility: z.nativeEnum(DocumentVisibility).optional(),
 });
 
@@ -39,6 +40,7 @@ export type TUpdateFolderFormSchema = z.infer<typeof ZUpdateFolderFormSchema>;
 
 export const FolderUpdateDialog = ({ folder, isOpen, onOpenChange }: FolderUpdateDialogProps) => {
   const { t } = useLingui();
+  const team = useOptionalCurrentTeam();
 
   const { toast } = useToast();
   const { mutateAsync: updateFolder } = trpc.folder.updateFolder.useMutation();

apps/remix/app/components/dialogs/organisation-create-dialog.tsx

@@ -336,7 +336,7 @@ const BillingPlanForm = ({ value, onChange, plans, canCreateFreeOrganisation }:
         >
           <div className="w-full text-left">
             <div className="flex items-center justify-between">
-              <p className="font-medium">
+              <p className="text-medium">
                 <Trans context="Plan price">Free</Trans>
               </p>
 

apps/remix/app/components/dialogs/organisation-email-domain-delete-dialog.tsx

@@ -115,7 +115,7 @@ export const OrganisationEmailDomainDeleteDialog = ({
                     <FormLabel>
                       <Trans>
                         Confirm by typing{' '}
-                        <span className="font-semibold text-destructive text-sm">{deleteMessage}</span>
+                        <span className="font-semibold font-sm text-destructive">{deleteMessage}</span>
                       </Trans>
                     </FormLabel>
                     <FormControl>

apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx

@@ -370,7 +370,7 @@ export const OrganisationMemberInviteDialog = ({ trigger, ...props }: Organisati
                           <button
                             type="button"
                             className={cn(
-                              'inline-flex h-10 w-10 items-center justify-start text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50',
+                              'justify-left inline-flex h-10 w-10 items-center text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50',
                               index === 0 ? 'mt-8' : 'mt-0',
                             )}
                             disabled={organisationMemberInvites.length === 1}

apps/remix/app/components/dialogs/passkey-create-dialog.tsx

@@ -1,6 +1,5 @@
 import { MAXIMUM_PASSKEYS } from '@documenso/lib/constants/auth';
 import { AppError } from '@documenso/lib/errors/app-error';
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@@ -26,13 +25,14 @@ import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 import { UAParser } from 'ua-parser-js';
 import { z } from 'zod';
+
 export type PasskeyCreateDialogProps = {
   trigger?: React.ReactNode;
   onSuccess?: () => void;
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 
 const ZCreatePasskeyFormSchema = z.object({
-  passkeyName: ZNameSchema,
+  passkeyName: z.string().min(3),
 });
 
 type TCreatePasskeyFormSchema = z.infer<typeof ZCreatePasskeyFormSchema>;

apps/remix/app/components/dialogs/team-email-update-dialog.tsx

@@ -1,5 +1,4 @@
 import { trpc } from '@documenso/trpc/react';
-import { ZUpdateTeamEmailMutationSchema } from '@documenso/trpc/server/team-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
@@ -20,16 +19,16 @@ import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useRevalidator } from 'react-router';
-import type { z } from 'zod';
+import { z } from 'zod';
 
 export type TeamEmailUpdateDialogProps = {
   teamEmail: TeamEmail;
   trigger?: React.ReactNode;
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 
-const ZUpdateTeamEmailFormSchema = ZUpdateTeamEmailMutationSchema.pick({
-  data: true,
-}).shape.data;
+const ZUpdateTeamEmailFormSchema = z.object({
+  name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
+});
 
 type TUpdateTeamEmailFormSchema = z.infer<typeof ZUpdateTeamEmailFormSchema>;
 
@@ -45,7 +44,6 @@ export const TeamEmailUpdateDialog = ({ teamEmail, trigger, ...props }: TeamEmai
     defaultValues: {
       name: teamEmail.name,
     },
-    mode: 'onSubmit',
   });
 
   const { mutateAsync: updateTeamEmail } = trpc.team.email.update.useMutation();

apps/remix/app/components/dialogs/template-use-dialog.tsx

@@ -8,7 +8,6 @@ import { AppError } from '@documenso/lib/errors/app-error';
 import { type TRecipientLite, ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { trpc } from '@documenso/trpc/react';
-import { DOCUMENT_TITLE_MAX_LENGTH } from '@documenso/trpc/server/document-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import { Checkbox } from '@documenso/ui/primitives/checkbox';
@@ -24,7 +23,6 @@ import {
 } from '@documenso/ui/primitives/dialog';
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
-import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
 import { SpinnerBox } from '@documenso/ui/primitives/spinner';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@@ -34,118 +32,33 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { DocumentDistributionMethod, DocumentSigningOrder } from '@prisma/client';
 import { FileTextIcon, InfoIcon, Plus, UploadCloudIcon, X } from 'lucide-react';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
-import { match } from 'ts-pattern';
 import * as z from 'zod';
 import { getTemplateUseErrorMessage } from '~/utils/toast-error-messages';
 
-const DOCUMENT_NAME_SOURCE = {
-  TEMPLATE: 'template',
-  UPLOAD: 'upload',
-  CUSTOM: 'custom',
-} as const;
-
-type TDocumentNameSource = (typeof DOCUMENT_NAME_SOURCE)[keyof typeof DOCUMENT_NAME_SOURCE];
-
-type TCustomDocumentData = {
-  data?: File;
-  uploadSequence?: number;
-};
-
-const getUploadedDocumentTitle = (file: File) => {
-  return file.name.replace(/\.[^/.]+$/, '').trim();
-};
-
-const getLastUploadedFile = (customDocumentData?: TCustomDocumentData[]) => {
-  const uploadedFiles = customDocumentData?.filter(
-    (item): item is Required<TCustomDocumentData> => item.data !== undefined && item.uploadSequence !== undefined,
-  );
-
-  if (!uploadedFiles || uploadedFiles.length === 0) {
-    return undefined;
-  }
-
-  return uploadedFiles.reduce((lastUploadedFile, uploadedFile) =>
-    uploadedFile.uploadSequence > lastUploadedFile.uploadSequence ? uploadedFile : lastUploadedFile,
-  ).data;
-};
-
-const getTemplateUseDocumentTitle = ({
-  documentNameSource,
-  customDocumentName,
-  customDocumentData,
-}: {
-  documentNameSource: TDocumentNameSource;
-  customDocumentName: string;
-  customDocumentData?: TCustomDocumentData[];
-}) =>
-  match(documentNameSource)
-    .with(DOCUMENT_NAME_SOURCE.UPLOAD, () => {
-      const uploadedFile = getLastUploadedFile(customDocumentData);
-
-      return uploadedFile ? getUploadedDocumentTitle(uploadedFile) : undefined;
-    })
-    .with(DOCUMENT_NAME_SOURCE.CUSTOM, () => customDocumentName.trim())
-    .with(DOCUMENT_NAME_SOURCE.TEMPLATE, () => undefined)
-    .exhaustive();
-
-const ZAddRecipientsForNewDocumentSchema = z
-  .object({
-    distributeDocument: z.boolean(),
-    useCustomDocument: z.boolean().default(false),
-    documentNameSource: z.enum([
-      DOCUMENT_NAME_SOURCE.TEMPLATE,
-      DOCUMENT_NAME_SOURCE.UPLOAD,
-      DOCUMENT_NAME_SOURCE.CUSTOM,
-    ]),
-    customDocumentName: z.string(),
-    customDocumentData: z
-      .array(
-        z.object({
-          title: z.string(),
-          data: z.instanceof(File).optional(),
-          uploadSequence: z.number().optional(),
-          envelopeItemId: z.string(),
-        }),
-      )
-      .optional(),
-    recipients: z.array(
+const ZAddRecipientsForNewDocumentSchema = z.object({
+  distributeDocument: z.boolean(),
+  useCustomDocument: z.boolean().default(false),
+  customDocumentData: z
+    .array(
       z.object({
-        id: z.number(),
-        email: ZRecipientEmailSchema,
-        name: z.string(),
-        signingOrder: z.number().optional(),
+        title: z.string(),
+        data: z.instanceof(File).optional(),
+        envelopeItemId: z.string(),
       }),
-    ),
-  })
-  .superRefine((data, ctx) => {
-    if (data.documentNameSource === DOCUMENT_NAME_SOURCE.TEMPLATE) {
-      return;
-    }
-
-    const title = getTemplateUseDocumentTitle(data);
-    const path = data.documentNameSource === DOCUMENT_NAME_SOURCE.CUSTOM ? 'customDocumentName' : 'documentNameSource';
-
-    if (!title) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: msg`Document name is required`.id,
-        path: [path],
-      });
-
-      return;
-    }
-
-    if (title.length > DOCUMENT_TITLE_MAX_LENGTH) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: msg`Document name is too long`.id,
-        path: [path],
-      });
-    }
-  });
+    )
+    .optional(),
+  recipients: z.array(
+    z.object({
+      id: z.number(),
+      email: ZRecipientEmailSchema,
+      name: z.string(),
+      signingOrder: z.number().optional(),
+    }),
+  ),
+});
 
 type TAddRecipientsForNewDocumentSchema = z.infer<typeof ZAddRecipientsForNewDocumentSchema>;
 
@@ -174,7 +87,6 @@ export function TemplateUseDialog({
   const navigate = useNavigate();
 
   const [open, setOpen] = useState(false);
-  const uploadSequenceRef = useRef(0);
 
   const { data: response, isLoading: isLoadingEnvelopeItems } = trpc.envelope.item.getMany.useQuery(
     {
@@ -194,8 +106,6 @@ export function TemplateUseDialog({
     return {
       distributeDocument: false,
       useCustomDocument: false,
-      documentNameSource: DOCUMENT_NAME_SOURCE.TEMPLATE,
-      customDocumentName: '',
       customDocumentData: envelopeItems.map((item) => ({
         title: item.title,
         data: undefined,
@@ -232,10 +142,9 @@ export function TemplateUseDialog({
 
   const onSubmit = async (data: TAddRecipientsForNewDocumentSchema) => {
     try {
-      const documentTitle = getTemplateUseDocumentTitle(data);
-
-      const customFilesToUpload = (data.customDocumentData ?? []).filter(
-        (item): item is typeof item & { data: File } => item.data !== undefined,
+      const customFilesToUpload = (data.customDocumentData || []).filter(
+        (item): item is { data: File; envelopeItemId: string; title: string } =>
+          item.data !== undefined && item.envelopeItemId !== undefined && item.title !== undefined,
       );
 
       const customDocumentData = await Promise.all(
@@ -254,7 +163,6 @@ export function TemplateUseDialog({
         recipients: data.recipients,
         distributeDocument: data.distributeDocument,
         customDocumentData,
-        ...(documentTitle ? { override: { title: documentTitle } } : {}),
       });
 
       toast({
@@ -287,12 +195,6 @@ export function TemplateUseDialog({
     name: 'recipients',
   });
 
-  const useCustomDocument = form.watch('useCustomDocument');
-  const documentNameSource = form.watch('documentNameSource');
-  const customDocumentData = form.watch('customDocumentData');
-  const lastUploadedFile = useCustomDocument ? getLastUploadedFile(customDocumentData) : undefined;
-  const canUseUploadedDocumentName = Boolean(lastUploadedFile);
-
   useEffect(() => {
     if (open) {
       form.reset(generateDefaultFormValues());
@@ -311,15 +213,6 @@ export function TemplateUseDialog({
     }
   }, [envelopeItems, form, open]);
 
-  useEffect(() => {
-    if (documentNameSource !== DOCUMENT_NAME_SOURCE.UPLOAD || canUseUploadedDocumentName) {
-      return;
-    }
-
-    form.setValue('documentNameSource', DOCUMENT_NAME_SOURCE.TEMPLATE);
-    form.clearErrors('documentNameSource');
-  }, [canUseUploadedDocumentName, documentNameSource, form]);
-
   return (
     <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
       <DialogTrigger asChild>
@@ -345,9 +238,9 @@ export function TemplateUseDialog({
         </DialogHeader>
 
         <Form {...form}>
-          <form className="min-w-0" onSubmit={form.handleSubmit(onSubmit)}>
-            <fieldset className="flex h-full min-w-0 flex-col" disabled={form.formState.isSubmitting}>
-              <div className="custom-scrollbar -m-1 max-h-[60vh] w-full min-w-0 max-w-full space-y-4 overflow-y-auto overflow-x-hidden p-1">
+          <form onSubmit={form.handleSubmit(onSubmit)}>
+            <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
+              <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
                 {formRecipients.map((recipient, index) => (
                   <div className="flex w-full flex-row space-x-4" key={recipient.id}>
                     {templateSigningOrder === DocumentSigningOrder.SEQUENTIAL && (
@@ -508,16 +401,7 @@ export function TemplateUseDialog({
                           onCheckedChange={(checked) => {
                             field.onChange(checked);
                             if (!checked) {
-                              const customDocumentData = form.getValues('customDocumentData');
-
-                              form.setValue(
-                                'customDocumentData',
-                                customDocumentData?.map((item) => ({
-                                  ...item,
-                                  data: undefined,
-                                })),
-                              );
-                              form.clearErrors('customDocumentData');
+                              form.setValue('customDocumentData', undefined);
                             }
                           }}
                         />
@@ -544,7 +428,7 @@ export function TemplateUseDialog({
                   )}
                 />
 
-                {useCustomDocument && (
+                {form.watch('useCustomDocument') && (
                   <div className="my-4 space-y-2">
                     {isLoadingEnvelopeItems ? (
                       <SpinnerBox className="py-16" />
@@ -559,7 +443,7 @@ export function TemplateUseDialog({
                               <FormControl>
                                 <div
                                   key={item.id}
-                                  className="flex w-full min-w-0 items-center gap-4 overflow-hidden rounded-lg border border-border bg-card p-4 transition-colors hover:bg-accent/10"
+                                  className="flex items-center gap-4 rounded-lg border border-border bg-card p-4 transition-colors hover:bg-accent/10"
                                 >
                                   <div className="flex-shrink-0">
                                     <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-primary/10">
@@ -567,15 +451,13 @@ export function TemplateUseDialog({
                                     </div>
                                   </div>
 
-                                  <div className="min-w-0 flex-1 overflow-hidden">
-                                    <h4 className="truncate font-medium text-foreground text-sm">
-                                      {field.value ? getUploadedDocumentTitle(field.value) : item.title}
-                                    </h4>
+                                  <div className="min-w-0 flex-1">
+                                    <h4 className="truncate font-medium text-foreground text-sm">{item.title}</h4>
                                     <p className="mt-0.5 text-muted-foreground text-xs">
                                       {field.value ? (
-                                        <span>
+                                        <div>
                                           <Trans>Custom {(field.value.size / (1024 * 1024)).toFixed(2)} MB file</Trans>
-                                        </span>
+                                        </div>
                                       ) : (
                                         <Trans>Default file</Trans>
                                       )}
@@ -635,7 +517,7 @@ export function TemplateUseDialog({
                                         }
 
                                         if (file.type !== 'application/pdf') {
-                                          form.setError(`customDocumentData.${i}.data`, {
+                                          form.setError('customDocumentData', {
                                             type: 'manual',
                                             message: _(msg`Please select a PDF file`),
                                           });
@@ -644,7 +526,7 @@ export function TemplateUseDialog({
                                         }
 
                                         if (file.size > APP_DOCUMENT_UPLOAD_SIZE_LIMIT * 1024 * 1024) {
-                                          form.setError(`customDocumentData.${i}.data`, {
+                                          form.setError('customDocumentData', {
                                             type: 'manual',
                                             message: _(
                                               msg`File size exceeds the limit of ${APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB`,
@@ -655,11 +537,6 @@ export function TemplateUseDialog({
                                         }
 
                                         field.onChange(file);
-                                        form.setValue(
-                                          `customDocumentData.${i}.uploadSequence`,
-                                          ++uploadSequenceRef.current,
-                                        );
-                                        form.clearErrors(`customDocumentData.${i}.data`);
                                       }}
                                     />
                                   </div>
@@ -673,112 +550,6 @@ export function TemplateUseDialog({
                     )}
                   </div>
                 )}
-
-                <FormField
-                  control={form.control}
-                  name="documentNameSource"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>Document name</Trans>
-                      </FormLabel>
-                      <FormControl>
-                        <RadioGroup
-                          aria-label={_(msg`Document name`)}
-                          value={field.value}
-                          onValueChange={field.onChange}
-                          className="space-y-2"
-                        >
-                          <div className="flex items-center gap-2">
-                            <RadioGroupItem id="document-name-source-template" value={DOCUMENT_NAME_SOURCE.TEMPLATE} />
-                            <label className="text-sm" htmlFor="document-name-source-template">
-                              <Trans>Use template name</Trans>
-                            </label>
-                          </div>
-
-                          <div className="flex items-start gap-2">
-                            <RadioGroupItem
-                              id="document-name-source-upload"
-                              value={DOCUMENT_NAME_SOURCE.UPLOAD}
-                              disabled={!canUseUploadedDocumentName}
-                              className="mt-0.5"
-                            />
-                            <div className="min-w-0">
-                              <div className="flex items-center gap-1">
-                                <label
-                                  className={cn('text-sm', {
-                                    'cursor-not-allowed text-muted-foreground': !canUseUploadedDocumentName,
-                                  })}
-                                  htmlFor="document-name-source-upload"
-                                >
-                                  <Trans>Use uploaded file name</Trans>
-                                </label>
-
-                                <Tooltip>
-                                  <TooltipTrigger
-                                    type="button"
-                                    aria-label={_(msg`About uploaded file naming`)}
-                                    className="text-muted-foreground"
-                                  >
-                                    <InfoIcon className="h-4 w-4" />
-                                  </TooltipTrigger>
-                                  <TooltipContent className="z-[99999] max-w-xs">
-                                    <Trans>
-                                      The document name will use the most recently uploaded file name without its
-                                      extension.
-                                    </Trans>
-                                  </TooltipContent>
-                                </Tooltip>
-                              </div>
-
-                              {lastUploadedFile && (
-                                <p
-                                  className="max-w-sm truncate text-muted-foreground text-xs"
-                                  title={lastUploadedFile.name}
-                                >
-                                  {lastUploadedFile.name}
-                                </p>
-                              )}
-
-                              {!canUseUploadedDocumentName && (
-                                <p className="text-muted-foreground text-xs">
-                                  <Trans>Upload a custom document to use its file name.</Trans>
-                                </p>
-                              )}
-                            </div>
-                          </div>
-
-                          <div className="flex items-center gap-2">
-                            <RadioGroupItem id="document-name-source-custom" value={DOCUMENT_NAME_SOURCE.CUSTOM} />
-                            <label className="text-sm" htmlFor="document-name-source-custom">
-                              <Trans>Enter custom document name</Trans>
-                            </label>
-                          </div>
-                        </RadioGroup>
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                {documentNameSource === DOCUMENT_NAME_SOURCE.CUSTOM && (
-                  <FormField
-                    control={form.control}
-                    name="customDocumentName"
-                    render={({ field }) => (
-                      <FormItem className="ml-6">
-                        <FormControl>
-                          <Input
-                            {...field}
-                            aria-label={_(msg`Custom document name`)}
-                            placeholder={_(msg`Enter a document name`)}
-                          />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-                )}
               </div>
 
               <DialogFooter className="mt-4">

apps/remix/app/components/dialogs/token-create-dialog.tsx

@@ -1,250 +0,0 @@
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { trpc } from '@documenso/trpc/react';
-import { ZCreateApiTokenRequestSchema } from '@documenso/trpc/server/api-token-router/create-api-token.types';
-import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
-import type { z } from 'zod';
-
-import { useCurrentTeam } from '~/providers/team';
-
-const NEVER_EXPIRE = 'NEVER' as const;
-
-export const EXPIRATION_DATES = {
-  ONE_WEEK: msg`7 days`,
-  ONE_MONTH: msg`1 month`,
-  THREE_MONTHS: msg`3 months`,
-  SIX_MONTHS: msg`6 months`,
-  ONE_YEAR: msg`12 months`,
-  [NEVER_EXPIRE]: msg`Never`,
-} as const;
-
-const ZCreateTokenFormSchema = ZCreateApiTokenRequestSchema.pick({
-  tokenName: true,
-  expirationDate: true,
-});
-
-type TCreateTokenFormSchema = z.infer<typeof ZCreateTokenFormSchema>;
-
-export type TokenCreateDialogProps = {
-  trigger?: React.ReactNode;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-export const TokenCreateDialog = ({ trigger, ...props }: TokenCreateDialogProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const team = useCurrentTeam();
-
-  const [open, setOpen] = useState(false);
-  const [createdToken, setCreatedToken] = useState<string | null>(null);
-
-  const form = useForm<TCreateTokenFormSchema>({
-    resolver: zodResolver(ZCreateTokenFormSchema),
-    defaultValues: {
-      tokenName: '',
-      expirationDate: 'THREE_MONTHS',
-    },
-  });
-
-  const { mutateAsync: createToken } = trpc.apiToken.create.useMutation();
-
-  const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenFormSchema) => {
-    try {
-      const { token } = await createToken({
-        teamId: team.id,
-        tokenName,
-        expirationDate: expirationDate === NEVER_EXPIRE ? null : expirationDate,
-      });
-
-      setCreatedToken(token);
-    } catch (err) {
-      const error = AppError.parseError(err);
-
-      const errorMessage = match(error.code)
-        .with(AppErrorCode.UNAUTHORIZED, () => msg`You do not have permission to create a token for this team.`)
-        .otherwise(() => msg`Something went wrong. Please try again later.`);
-
-      toast({
-        title: _(msg`An error occurred`),
-        description: _(errorMessage),
-        variant: 'destructive',
-        duration: 5000,
-      });
-    }
-  };
-
-  useEffect(() => {
-    if (open) {
-      form.reset();
-      setCreatedToken(null);
-    }
-  }, [open, form]);
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)} {...props}>
-      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
-        {trigger ?? (
-          <Button className="flex-shrink-0">
-            <Trans>Create token</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent
-        className="max-w-lg"
-        position="center"
-        onInteractOutside={(event) => {
-          // Prevent losing the created token by accidentally clicking outside the dialog.
-          if (createdToken) {
-            event.preventDefault();
-          }
-        }}
-      >
-        {createdToken ? (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Token created</Trans>
-              </DialogTitle>
-
-              <DialogDescription>
-                <Trans>Copy your token now. For security reasons you will not be able to see it again.</Trans>
-              </DialogDescription>
-            </DialogHeader>
-
-            <div className="relative">
-              <Input
-                className="pr-12 font-mono text-sm"
-                aria-label={_(msg`Your new API token`)}
-                name="createdToken"
-                readOnly
-                value={createdToken}
-              />
-              <div className="absolute top-0 right-2 bottom-0 flex items-center justify-center">
-                <CopyTextButton
-                  value={createdToken}
-                  onCopySuccess={() => toast({ title: _(msg`Token copied to clipboard`) })}
-                />
-              </div>
-            </div>
-
-            <DialogFooter>
-              <Button type="button" onClick={() => setOpen(false)}>
-                <Trans>Done</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        ) : (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Create API token</Trans>
-              </DialogTitle>
-
-              <DialogDescription>
-                <Trans>Use API tokens to authenticate with the Documenso API.</Trans>
-              </DialogDescription>
-            </DialogHeader>
-
-            <Form {...form}>
-              <form onSubmit={form.handleSubmit(onSubmit)}>
-                <fieldset className="flex h-full flex-col space-y-4" disabled={form.formState.isSubmitting}>
-                  <FormField
-                    control={form.control}
-                    name="tokenName"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel required>
-                          <Trans>Name</Trans>
-                        </FormLabel>
-
-                        <FormControl>
-                          <Input className="bg-background" {...field} />
-                        </FormControl>
-
-                        <FormDescription>
-                          <Trans>A name to help you identify this token later.</Trans>
-                        </FormDescription>
-
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name="expirationDate"
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>
-                          <Trans>Expires in</Trans>
-                        </FormLabel>
-
-                        <FormControl>
-                          <Select value={field.value ?? NEVER_EXPIRE} onValueChange={field.onChange}>
-                            <SelectTrigger className="bg-background">
-                              <SelectValue />
-                            </SelectTrigger>
-
-                            <SelectContent>
-                              {Object.entries(EXPIRATION_DATES).map(([key, date]) => (
-                                <SelectItem key={key} value={key}>
-                                  {_(date)}
-                                </SelectItem>
-                              ))}
-                            </SelectContent>
-                          </Select>
-                        </FormControl>
-
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-
-                  <DialogFooter>
-                    <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                      <Trans>Cancel</Trans>
-                    </Button>
-
-                    <Button type="submit" loading={form.formState.isSubmitting}>
-                      <Trans>Create token</Trans>
-                    </Button>
-                  </DialogFooter>
-                </fieldset>
-              </form>
-            </Form>
-          </>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/remix/app/components/dialogs/token-delete-dialog.tsx

@@ -105,7 +105,7 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe
       <DialogContent>
         <DialogHeader>
           <DialogTitle>
-            <Trans>Delete token</Trans>
+            <Trans>Are you sure you want to delete this token?</Trans>
           </DialogTitle>
 
           <DialogDescription>
@@ -126,7 +126,7 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe
                     <FormLabel>
                       <Trans>
                         Confirm by typing:{' '}
-                        <span className="font-semibold text-destructive text-sm">{deleteMessage}</span>
+                        <span className="font-semibold font-sm text-destructive">{deleteMessage}</span>
                       </Trans>
                     </FormLabel>
 
@@ -139,18 +139,21 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe
               />
 
               <DialogFooter>
-                <Button type="button" variant="secondary" onClick={() => setIsOpen(false)}>
-                  <Trans>Cancel</Trans>
-                </Button>
+                <div className="flex w-full flex-nowrap gap-4">
+                  <Button type="button" variant="secondary" className="flex-1" onClick={() => setIsOpen(false)}>
+                    <Trans>Cancel</Trans>
+                  </Button>
 
-                <Button
-                  type="submit"
-                  variant="destructive"
-                  disabled={!form.formState.isValid}
-                  loading={form.formState.isSubmitting}
-                >
-                  <Trans>Delete</Trans>
-                </Button>
+                  <Button
+                    type="submit"
+                    variant="destructive"
+                    className="flex-1"
+                    disabled={!form.formState.isValid}
+                    loading={form.formState.isSubmitting}
+                  >
+                    <Trans>I'm sure! Delete it</Trans>
+                  </Button>
+                </div>
               </DialogFooter>
             </fieldset>
           </form>

apps/remix/app/components/dialogs/webhook-delete-dialog.tsx

@@ -117,7 +117,7 @@ export const WebhookDeleteDialog = ({ webhook, children }: WebhookDeleteDialogPr
                     <FormLabel>
                       <Trans>
                         Confirm by typing:{' '}
-                        <span className="font-semibold text-destructive text-sm">{deleteMessage}</span>
+                        <span className="font-semibold font-sm text-destructive">{deleteMessage}</span>
                       </Trans>
                     </FormLabel>
                     <FormControl>

apps/remix/app/components/embed/authoring/configure-fields-view.tsx

@@ -503,7 +503,7 @@ export const ConfigureFieldsView = ({
             {selectedField && (
               <div
                 className={cn(
-                  'pointer-events-none fixed z-50 flex cursor-pointer flex-col items-center justify-center bg-white text-muted-foreground transition duration-200 [container-type:size] dark:text-muted',
+                  'pointer-events-none fixed z-50 flex cursor-pointer flex-col items-center justify-center bg-white text-muted-foreground transition duration-200 [container-type:size] dark:text-muted-background',
                   selectedRecipientStyles.base,
                   {
                     '-rotate-6 scale-90 opacity-50 dark:bg-black/20': !isFieldWithinBounds,

apps/remix/app/components/forms/branding-preferences-form.tsx

@@ -1,13 +1,7 @@
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import {
-  BRANDING_LOGO_ALLOWED_TYPES,
-  BRANDING_LOGO_MAX_SIZE_BYTES,
-  BRANDING_LOGO_MAX_SIZE_MB,
-} from '@documenso/lib/constants/branding';
 import { DEFAULT_BRAND_COLORS, DEFAULT_BRAND_RADIUS } from '@documenso/lib/constants/theme';
 import { ZCssVarsSchema } from '@documenso/lib/types/css-vars';
-import { normalizeBrandingColors } from '@documenso/lib/utils/normalize-branding-colors';
 import { cn } from '@documenso/ui/lib/utils';
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@documenso/ui/primitives/accordion';
 import { Button } from '@documenso/ui/primitives/button';
@@ -24,21 +18,20 @@ import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
-import { BrandingPreferencesResetDialog } from '~/components/dialogs/branding-preferences-reset-dialog';
 import { useOptionalCurrentTeam } from '~/providers/team';
 import { useCspNonce } from '~/utils/nonce';
 
 import { FormStickySaveBar } from './form-sticky-save-bar';
 
+const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
+const ACCEPTED_FILE_TYPES = ['image/jpeg', 'image/png', 'image/webp'];
+
 const ZBrandingPreferencesFormSchema = z.object({
   brandingEnabled: z.boolean().nullable(),
   brandingLogo: z
     .instanceof(File)
-    .refine(
-      (file) => file.size <= BRANDING_LOGO_MAX_SIZE_BYTES,
-      `File size must be less than ${BRANDING_LOGO_MAX_SIZE_MB}MB`,
-    )
-    .refine((file) => BRANDING_LOGO_ALLOWED_TYPES.includes(file.type), 'Only .jpg, .png, and .webp files are accepted')
+    .refine((file) => file.size <= MAX_FILE_SIZE, 'File size must be less than 5MB')
+    .refine((file) => ACCEPTED_FILE_TYPES.includes(file.type), 'Only .jpg, .png, and .webp files are accepted')
     .nullish(),
   brandingUrl: z.string().url().optional().or(z.literal('')),
   brandingCompanyDetails: z.string().max(500).optional(),
@@ -76,7 +69,6 @@ export function BrandingPreferencesForm({
 
   const [previewUrl, setPreviewUrl] = useState<string>('');
   const [hasLoadedPreview, setHasLoadedPreview] = useState(false);
-  const [colorPickerKey, setColorPickerKey] = useState(0);
 
   const parsedColors = ZCssVarsSchema.safeParse(settings.brandingColors);
   const initialColors = parsedColors.success ? parsedColors.data : {};
@@ -99,42 +91,6 @@ export function BrandingPreferencesForm({
 
   const isBrandingEnabled = form.watch('brandingEnabled');
 
-  const hasResetBrandingColors =
-    settings.brandingColors === null ||
-    settings.brandingColors === undefined ||
-    (parsedColors.success && normalizeBrandingColors(parsedColors.data) === null);
-
-  // Only show the reset action when the saved settings actually differ from the
-  // defaults, so it never renders as a pointless disabled button.
-  const isResetToDefaultsVisible =
-    settings.brandingEnabled !== (canInherit ? null : false) ||
-    !!settings.brandingLogo ||
-    !!settings.brandingUrl ||
-    !!settings.brandingCompanyDetails ||
-    !!settings.brandingCss ||
-    !hasResetBrandingColors;
-
-  const handleResetToDefaults = async () => {
-    const data: TBrandingPreferencesFormSchema = {
-      brandingEnabled: canInherit ? null : false,
-      brandingLogo: null,
-      brandingUrl: '',
-      brandingCompanyDetails: '',
-      brandingColors: {},
-      brandingCss: '',
-    };
-
-    await onFormSubmit(data);
-
-    if (previewUrl.startsWith('blob:')) {
-      URL.revokeObjectURL(previewUrl);
-    }
-
-    setPreviewUrl('');
-    setColorPickerKey((key) => key + 1);
-    form.reset(data);
-  };
-
   const getSavedLogoPreviewUrl = () => {
     if (!settings.brandingLogo) {
       return '';
@@ -289,7 +245,7 @@ export function BrandingPreferencesForm({
                       <FormControl className="relative">
                         <Input
                           type="file"
-                          accept={BRANDING_LOGO_ALLOWED_TYPES.join(',')}
+                          accept={ACCEPTED_FILE_TYPES.join(',')}
                           disabled={!isBrandingEnabled}
                           onChange={(e) => {
                             const file = e.target.files?.[0];
@@ -436,7 +392,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`background-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.background}
@@ -460,7 +415,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`foreground-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.foreground}
@@ -484,7 +438,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`primary-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.primary}
@@ -508,7 +461,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`primary-foreground-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.primaryForeground}
@@ -532,7 +484,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`border-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.border}
@@ -556,7 +507,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`ring-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.ring}
@@ -638,15 +588,6 @@ export function BrandingPreferencesForm({
             isDirty={hasUnsavedChanges}
             isSubmitting={form.formState.isSubmitting}
             onReset={handleReset}
-            resetToDefaults={
-              isResetToDefaultsVisible ? (
-                <BrandingPreferencesResetDialog
-                  hasAdvancedBranding={hasAdvancedBranding}
-                  isSubmitting={form.formState.isSubmitting}
-                  onReset={handleResetToDefaults}
-                />
-              ) : undefined
-            }
           />
         </fieldset>
       </form>

apps/remix/app/components/forms/document-preferences-form.tsx

@@ -11,10 +11,10 @@ import { isValidLanguageCode, SUPPORTED_LANGUAGE_CODES, SUPPORTED_LANGUAGES } fr
 import { TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import type { TDefaultRecipients } from '@documenso/lib/types/default-recipients';
 import { ZDefaultRecipientsSchema } from '@documenso/lib/types/default-recipients';
-import { type TDocumentMetaDateFormat, ZDocumentMetaDateFormatSchema } from '@documenso/lib/types/document-meta';
-import { generateDefaultOrganisationSettings, isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { type TDocumentMetaDateFormat, ZDocumentMetaTimezoneSchema } from '@documenso/lib/types/document-meta';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import { extractTeamSignatureSettings, generateDefaultTeamSettings } from '@documenso/lib/utils/teams';
+import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import { DocumentSignatureSettingsTooltip } from '@documenso/ui/components/document/document-signature-settings-tooltip';
 import { ExpirationPeriodPicker } from '@documenso/ui/components/document/expiration-period-picker';
 import { ReminderSettingsPicker } from '@documenso/ui/components/document/reminder-settings-picker';
@@ -37,11 +37,11 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { msg, t } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { DocumentVisibility, OrganisationType, type RecipientRole, type TeamGlobalSettings } from '@prisma/client';
+import type { TeamGlobalSettings } from '@prisma/client';
+import { DocumentVisibility, OrganisationType, type RecipientRole } from '@prisma/client';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
-import { DocumentPreferencesResetDialog } from '~/components/dialogs/document-preferences-reset-dialog';
 import { useOptionalCurrentTeam } from '~/providers/team';
 
 import { DefaultRecipientsMultiSelectCombobox } from '../general/default-recipients-multiselect-combobox';
@@ -93,26 +93,6 @@ export type DocumentPreferencesFormProps = {
   onFormSubmit: (data: TDocumentPreferencesFormSchema) => Promise<void>;
 };
 
-const getDocumentPreferencesFormValues = (settings: SettingsSubset): TDocumentPreferencesFormSchema => {
-  const parsedDocumentDateFormat = ZDocumentMetaDateFormatSchema.safeParse(settings.documentDateFormat);
-
-  return {
-    documentVisibility: settings.documentVisibility,
-    documentLanguage: isValidLanguageCode(settings.documentLanguage) ? settings.documentLanguage : null,
-    documentTimezone: settings.documentTimezone,
-    documentDateFormat: parsedDocumentDateFormat.success ? parsedDocumentDateFormat.data : null,
-    includeSenderDetails: settings.includeSenderDetails,
-    includeSigningCertificate: settings.includeSigningCertificate,
-    includeAuditLog: settings.includeAuditLog,
-    signatureTypes: extractTeamSignatureSettings({ ...settings }),
-    defaultRecipients: settings.defaultRecipients ? ZDefaultRecipientsSchema.parse(settings.defaultRecipients) : null,
-    delegateDocumentOwnership: settings.delegateDocumentOwnership,
-    aiFeaturesEnabled: settings.aiFeaturesEnabled,
-    envelopeExpirationPeriod: settings.envelopeExpirationPeriod ?? null,
-    reminderSettings: settings.reminderSettings ?? null,
-  };
-};
-
 export const DocumentPreferencesForm = ({
   settings,
   onFormSubmit,
@@ -133,7 +113,7 @@ export const DocumentPreferencesForm = ({
     documentVisibility: z.nativeEnum(DocumentVisibility).nullable(),
     documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).nullable(),
     documentTimezone: z.string().nullable(),
-    documentDateFormat: ZDocumentMetaDateFormatSchema.nullable(),
+    documentDateFormat: ZDocumentMetaTimezoneSchema.nullable(),
     includeSenderDetails: z.boolean().nullable(),
     includeSigningCertificate: z.boolean().nullable(),
     includeAuditLog: z.boolean().nullable(),
@@ -147,33 +127,26 @@ export const DocumentPreferencesForm = ({
     reminderSettings: ZEnvelopeReminderSettings.nullable(),
   });
 
-  const defaultValues = getDocumentPreferencesFormValues(settings);
-  const defaultSettings = canInherit ? generateDefaultTeamSettings() : generateDefaultOrganisationSettings();
-  const baseResetValues = getDocumentPreferencesFormValues(defaultSettings);
-  const resetValues = {
-    ...baseResetValues,
-    aiFeaturesEnabled: isAiFeaturesConfigured ? baseResetValues.aiFeaturesEnabled : defaultValues.aiFeaturesEnabled,
-  };
-
   const form = useForm<TDocumentPreferencesFormSchema>({
-    defaultValues,
+    defaultValues: {
+      documentVisibility: settings.documentVisibility,
+      documentLanguage: isValidLanguageCode(settings.documentLanguage) ? settings.documentLanguage : null,
+      documentTimezone: settings.documentTimezone,
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      documentDateFormat: settings.documentDateFormat as TDocumentMetaDateFormat | null,
+      includeSenderDetails: settings.includeSenderDetails,
+      includeSigningCertificate: settings.includeSigningCertificate,
+      includeAuditLog: settings.includeAuditLog,
+      signatureTypes: extractTeamSignatureSettings({ ...settings }),
+      defaultRecipients: settings.defaultRecipients ? ZDefaultRecipientsSchema.parse(settings.defaultRecipients) : null,
+      delegateDocumentOwnership: settings.delegateDocumentOwnership,
+      aiFeaturesEnabled: settings.aiFeaturesEnabled,
+      envelopeExpirationPeriod: settings.envelopeExpirationPeriod ?? null,
+      reminderSettings: settings.reminderSettings ?? null,
+    },
     resolver: zodResolver(ZDocumentPreferencesFormSchema),
   });
 
-  // Parse both sides through the schema so we compare canonical representations
-  const parsedCurrentValues = ZDocumentPreferencesFormSchema.safeParse(defaultValues);
-  const parsedResetValues = ZDocumentPreferencesFormSchema.safeParse(resetValues);
-
-  const isResetToDefaultsVisible =
-    !parsedCurrentValues.success ||
-    !parsedResetValues.success ||
-    JSON.stringify(parsedCurrentValues.data) !== JSON.stringify(parsedResetValues.data);
-
-  const handleResetToDefaults = async () => {
-    await onFormSubmit(resetValues);
-    form.reset(resetValues);
-  };
-
   const handleFormSubmit = form.handleSubmit(async (data) => {
     try {
       await onFormSubmit(data);
@@ -799,17 +772,6 @@ export const DocumentPreferencesForm = ({
             isDirty={form.formState.isDirty}
             isSubmitting={form.formState.isSubmitting}
             onReset={() => form.reset()}
-            resetToDefaults={
-              isResetToDefaultsVisible ? (
-                <DocumentPreferencesResetDialog
-                  isSubmitting={form.formState.isSubmitting}
-                  onReset={handleResetToDefaults}
-                  showAiFeatures={isAiFeaturesConfigured}
-                  showDocumentVisibility={!isPersonalLayoutMode}
-                  showIncludeSenderDetails={!isPersonalLayoutMode && !isPersonalOrganisation}
-                />
-              ) : undefined
-            }
           />
         </fieldset>
       </form>

apps/remix/app/components/forms/email-transport-form.tsx

@@ -1,4 +1,3 @@
-import { ZNameSchema } from '@documenso/lib/types/name';
 import {
   Form,
   FormControl,
@@ -16,8 +15,8 @@ import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
 const ZEmailTransportFormSchema = z.object({
-  name: ZNameSchema,
-  fromName: ZNameSchema,
+  name: z.string().min(1),
+  fromName: z.string().min(1),
   fromAddress: z.string().email(),
   type: z.enum(['SMTP_AUTH', 'SMTP_API', 'RESEND', 'MAILCHANNELS']),
   host: z.string().optional(),

apps/remix/app/components/forms/form-sticky-save-bar.tsx

@@ -3,17 +3,12 @@ import { Button } from '@documenso/ui/primitives/button';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { AnimatePresence, motion } from 'framer-motion';
 import { AlertTriangleIcon } from 'lucide-react';
-import { type ReactNode, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 export type FormStickySaveBarProps = {
   isDirty: boolean;
   isSubmitting: boolean;
   onReset: () => void;
-  /**
-   * Slot for a "reset to defaults" action, rendered before the Undo button. Hidden while
-   * the bar is floating so it never appears in the unsaved-changes island.
-   */
-  resetToDefaults?: ReactNode;
 };
 
 /**
@@ -29,7 +24,7 @@ export type FormStickySaveBarProps = {
  * shared-layout morph). A 1px sentinel below it detects the stuck state so we can toggle
  * the pill chrome.
  */
-export const FormStickySaveBar = ({ isDirty, isSubmitting, onReset, resetToDefaults }: FormStickySaveBarProps) => {
+export const FormStickySaveBar = ({ isDirty, isSubmitting, onReset }: FormStickySaveBarProps) => {
   const { t } = useLingui();
 
   const sentinelRef = useRef<HTMLDivElement>(null);
@@ -105,8 +100,6 @@ export const FormStickySaveBar = ({ isDirty, isSubmitting, onReset, resetToDefau
         </AnimatePresence>
 
         <div className="ml-auto flex flex-shrink-0 items-center gap-x-2">
-          {!isFloating && resetToDefaults}
-
           {isDirty && (
             <Button type="button" variant="secondary" size="sm" onClick={onReset} disabled={isSubmitting}>
               <Trans>Undo</Trans>

apps/remix/app/components/forms/profile.tsx

@@ -1,5 +1,5 @@
 import { useSession } from '@documenso/lib/client-only/providers/session';
-import { ZNameSchema } from '@documenso/lib/types/name';
+import { ZNameSchema } from '@documenso/lib/constants/auth';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';

apps/remix/app/components/forms/search-param-selector.tsx

@@ -1,49 +0,0 @@
-import { Select, SelectContent, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';
-import type React from 'react';
-import { useMemo } from 'react';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
-
-export type SearchParamSelector = {
-  paramKey: string;
-  isValueValid: (value: unknown) => boolean;
-  children: React.ReactNode;
-};
-
-export const SearchParamSelector = ({ children, paramKey, isValueValid }: SearchParamSelector) => {
-  const { pathname } = useLocation();
-  const [searchParams] = useSearchParams();
-
-  const navigate = useNavigate();
-
-  const value = useMemo(() => {
-    const p = searchParams?.get(paramKey) ?? 'all';
-
-    return isValueValid(p) ? p : 'all';
-  }, [searchParams]);
-
-  const onValueChange = (newValue: string) => {
-    if (!pathname) {
-      return;
-    }
-
-    const params = new URLSearchParams(searchParams?.toString());
-
-    params.set(paramKey, newValue);
-
-    if (newValue === '' || newValue === 'all') {
-      params.delete(paramKey);
-    }
-
-    void navigate(`${pathname}?${params.toString()}`, { preventScrollReset: true });
-  };
-
-  return (
-    <Select defaultValue={value} onValueChange={onValueChange}>
-      <SelectTrigger className="max-w-[200px] text-muted-foreground">
-        <SelectValue />
-      </SelectTrigger>
-
-      <SelectContent position="popper">{children}</SelectContent>
-    </Select>
-  );
-};

apps/remix/app/components/forms/signup.tsx

@@ -1,8 +1,8 @@
 import communityCardsImage from '@documenso/assets/images/community-cards.png';
 import { authClient } from '@documenso/auth/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
+import { ZNameSchema } from '@documenso/lib/constants/auth';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { env } from '@documenso/lib/utils/env';
 import { zEmail } from '@documenso/lib/utils/zod';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
@@ -96,7 +96,7 @@ export const SignUpForm = ({
       password: '',
       signature: '',
     },
-    mode: 'onChange',
+    mode: 'onBlur',
     resolver: zodResolver(ZSignUpFormSchema),
   });
 

apps/remix/app/components/forms/token.tsx

@@ -0,0 +1,254 @@
+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { trpc } from '@documenso/trpc/react';
+import { ZCreateApiTokenRequestSchema } from '@documenso/trpc/server/api-token-router/create-api-token.types';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';
+import { Switch } from '@documenso/ui/primitives/switch';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import type { ApiToken } from '@prisma/client';
+import { AnimatePresence, motion } from 'framer-motion';
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
+import type { z } from 'zod';
+
+import { useCurrentTeam } from '~/providers/team';
+
+export const EXPIRATION_DATES = {
+  ONE_WEEK: msg`7 days`,
+  ONE_MONTH: msg`1 month`,
+  THREE_MONTHS: msg`3 months`,
+  SIX_MONTHS: msg`6 months`,
+  ONE_YEAR: msg`12 months`,
+} as const;
+
+const ZCreateTokenFormSchema = ZCreateApiTokenRequestSchema.pick({
+  tokenName: true,
+  expirationDate: true,
+});
+
+type TCreateTokenFormSchema = z.infer<typeof ZCreateTokenFormSchema>;
+
+type NewlyCreatedToken = {
+  id: number;
+  token: string;
+};
+
+export type ApiTokenFormProps = {
+  className?: string;
+  tokens?: Pick<ApiToken, 'id'>[];
+};
+
+export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
+  const [, copy] = useCopyToClipboard();
+
+  const team = useCurrentTeam();
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const [newlyCreatedToken, setNewlyCreatedToken] = useState<NewlyCreatedToken | null>();
+  const [noExpirationDate, setNoExpirationDate] = useState(false);
+
+  const { mutateAsync: createTokenMutation } = trpc.apiToken.create.useMutation({
+    onSuccess(data) {
+      setNewlyCreatedToken(data);
+    },
+  });
+
+  const form = useForm<TCreateTokenFormSchema>({
+    resolver: zodResolver(ZCreateTokenFormSchema),
+    defaultValues: {
+      tokenName: '',
+      expirationDate: '',
+    },
+  });
+
+  const copyToken = async (token: string) => {
+    try {
+      const copied = await copy(token);
+
+      if (!copied) {
+        throw new Error('Unable to copy the token');
+      }
+
+      toast({
+        title: _(msg`Token copied to clipboard`),
+        description: _(msg`The token was copied to your clipboard.`),
+      });
+    } catch (error) {
+      toast({
+        title: _(msg`Unable to copy token`),
+        description: _(msg`We were unable to copy the token to your clipboard. Please try again.`),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenFormSchema) => {
+    try {
+      await createTokenMutation({
+        teamId: team.id,
+        tokenName,
+        expirationDate: noExpirationDate ? null : expirationDate,
+      });
+
+      toast({
+        title: _(msg`Token created`),
+        description: _(msg`A new token was created successfully.`),
+        duration: 5000,
+      });
+
+      form.reset();
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      const errorMessage = match(error.code)
+        .with(AppErrorCode.UNAUTHORIZED, () => msg`You do not have permission to create a token for this team.`)
+        .otherwise(() => msg`Something went wrong. Please try again later.`);
+
+      toast({
+        title: _(msg`An error occurred`),
+        description: _(errorMessage),
+        variant: 'destructive',
+        duration: 5000,
+      });
+    }
+  };
+
+  return (
+    <div className={cn(className)}>
+      <Form {...form}>
+        <form onSubmit={form.handleSubmit(onSubmit)}>
+          <fieldset className="mt-6 flex w-full flex-col gap-4" disabled={form.formState.isSubmitting}>
+            <FormField
+              control={form.control}
+              name="tokenName"
+              render={({ field }) => (
+                <FormItem className="flex-1">
+                  <FormLabel className="text-muted-foreground">
+                    <Trans>Token name</Trans>
+                  </FormLabel>
+
+                  <div className="flex items-center gap-x-4">
+                    <FormControl className="flex-1">
+                      <Input type="text" {...field} />
+                    </FormControl>
+                  </div>
+
+                  <FormDescription className="text-xs italic">
+                    <Trans>Please enter a meaningful name for your token. This will help you identify it later.</Trans>
+                  </FormDescription>
+
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <div className="flex flex-col gap-4 md:flex-row">
+              <FormField
+                control={form.control}
+                name="expirationDate"
+                render={({ field }) => (
+                  <FormItem className="flex-1">
+                    <FormLabel className="text-muted-foreground">
+                      <Trans>Token expiration date</Trans>
+                    </FormLabel>
+
+                    <div className="flex items-center gap-x-4">
+                      <FormControl className="flex-1">
+                        <Select onValueChange={field.onChange} disabled={noExpirationDate}>
+                          <SelectTrigger className="w-full">
+                            <SelectValue placeholder={_(msg`Choose...`)} />
+                          </SelectTrigger>
+                          <SelectContent>
+                            {Object.entries(EXPIRATION_DATES).map(([key, date]) => (
+                              <SelectItem key={key} value={key}>
+                                {_(date)}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
+                      </FormControl>
+                    </div>
+
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <div>
+                <FormLabel className="mt-2 text-muted-foreground">
+                  <Trans>Never expire</Trans>
+                </FormLabel>
+                <div className="block md:py-1.5">
+                  <Switch
+                    className="mt-2 bg-background"
+                    checked={noExpirationDate}
+                    onCheckedChange={setNoExpirationDate}
+                  />
+                </div>
+              </div>
+            </div>
+
+            <Button type="submit" className="hidden md:inline-flex" loading={form.formState.isSubmitting}>
+              <Trans>Create token</Trans>
+            </Button>
+
+            <div className="md:hidden">
+              <Button type="submit" loading={form.formState.isSubmitting}>
+                <Trans>Create token</Trans>
+              </Button>
+            </div>
+          </fieldset>
+        </form>
+      </Form>
+
+      <AnimatePresence>
+        {newlyCreatedToken && tokens && tokens.find((token) => token.id === newlyCreatedToken.id) && (
+          <motion.div
+            className="mt-8"
+            initial={{ opacity: 0, y: -40 }}
+            animate={{ opacity: 1, y: 0 }}
+            exit={{ opacity: 0, y: 40 }}
+          >
+            <Card gradient>
+              <CardContent className="p-4">
+                <p className="mt-2 text-muted-foreground text-sm">
+                  <Trans>
+                    Your token was created successfully! Make sure to copy it because you won't be able to see it again!
+                  </Trans>
+                </p>
+
+                <p className="my-4 rounded-md bg-muted-foreground/10 px-2.5 py-1 font-mono text-sm">
+                  {newlyCreatedToken.token}
+                </p>
+
+                <Button variant="outline" onClick={() => void copyToken(newlyCreatedToken.token)}>
+                  <Trans>Copy token</Trans>
+                </Button>
+              </CardContent>
+            </Card>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+};

apps/remix/app/components/general/admin-global-settings-section.tsx

@@ -5,7 +5,6 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import type { OrganisationGlobalSettings, TeamGlobalSettings } from '@prisma/client';
-import type { ReactNode } from 'react';
 
 import { DetailsCard, DetailsValue } from '~/components/general/admin-details';
 
@@ -26,72 +25,38 @@ const emailSettingsKeys = Object.keys(EMAIL_SETTINGS_LABELS) as (keyof TDocument
 type AdminGlobalSettingsSectionProps = {
   settings: TeamGlobalSettings | OrganisationGlobalSettings | null;
   isTeam?: boolean;
-  /** When viewing a team, the parent organisation settings the team inherits from. */
-  inheritedSettings?: OrganisationGlobalSettings | null;
 };
 
-export const AdminGlobalSettingsSection = ({
-  settings,
-  isTeam = false,
-  inheritedSettings,
-}: AdminGlobalSettingsSectionProps) => {
+export const AdminGlobalSettingsSection = ({ settings, isTeam = false }: AdminGlobalSettingsSectionProps) => {
   const { _ } = useLingui();
+  const notSetLabel = isTeam ? <Trans>Inherited</Trans> : <Trans>Not set</Trans>;
 
   if (!settings) {
     return null;
   }
 
-  const notSet = <Trans>Not set</Trans>;
-
-  const inheritedValue = (value: ReactNode) => {
-    if (!isTeam || value === null) {
-      return notSet;
+  const textValue = (value: string | null | undefined) => {
+    if (value === null || value === undefined) {
+      return notSetLabel;
     }
 
-    return (
-      <span className="flex items-center gap-1.5">
-        <span className="text-muted-foreground">
-          <Trans>Inherited</Trans>:
-        </span>
-        <span>{value}</span>
-      </span>
-    );
+    return value;
   };
 
-  const textValue = (value: string | null | undefined, inherited?: string | null) => {
-    if (value && value.trim() !== '') {
-      return value;
+  const brandingTextValue = (value: string | null | undefined) => {
+    if (value === null || value === undefined || value.trim() === '') {
+      return notSetLabel;
     }
 
-    if (inherited && inherited.trim() !== '') {
-      return inheritedValue(inherited);
-    }
-
-    return notSet;
+    return value;
   };
 
-  const booleanLabel = (value: boolean) => (value ? <Trans>Enabled</Trans> : <Trans>Disabled</Trans>);
-
-  const booleanValue = (value: boolean | null | undefined, inherited?: boolean | null) => {
-    if (value !== null && value !== undefined) {
-      return booleanLabel(value);
+  const booleanValue = (value: boolean | null | undefined) => {
+    if (value === null || value === undefined) {
+      return notSetLabel;
     }
 
-    return inherited !== null && inherited !== undefined ? inheritedValue(booleanLabel(inherited)) : notSet;
-  };
-
-  const visibilityLabel = (value: string | null | undefined) => {
-    return value && DOCUMENT_VISIBILITY[value] ? _(DOCUMENT_VISIBILITY[value].value) : null;
-  };
-
-  const visibilityValue = (value: string | null | undefined, inherited?: string | null) => {
-    const label = visibilityLabel(value);
-
-    if (label !== null) {
-      return label;
-    }
-
-    return inheritedValue(visibilityLabel(inherited));
+    return value ? <Trans>Enabled</Trans> : <Trans>Disabled</Trans>;
   };
 
   const parsedEmailSettings = ZDocumentEmailSettingsSchema.safeParse(settings.emailDocumentSettings);
@@ -100,82 +65,70 @@ export const AdminGlobalSettingsSection = ({
     <div className="grid grid-cols-1 gap-3 text-sm sm:grid-cols-2 lg:grid-cols-3">
       <DetailsCard label={<Trans>Document visibility</Trans>}>
         <DetailsValue>
-          {visibilityValue(settings.documentVisibility, inheritedSettings?.documentVisibility)}
+          {settings.documentVisibility != null
+            ? _(DOCUMENT_VISIBILITY[settings.documentVisibility].value)
+            : notSetLabel}
         </DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Document language</Trans>}>
-        <DetailsValue>{textValue(settings.documentLanguage, inheritedSettings?.documentLanguage)}</DetailsValue>
+        <DetailsValue>{textValue(settings.documentLanguage)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Document timezone</Trans>}>
-        <DetailsValue>{textValue(settings.documentTimezone, inheritedSettings?.documentTimezone)}</DetailsValue>
+        <DetailsValue>{textValue(settings.documentTimezone)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Date format</Trans>}>
-        <DetailsValue>{textValue(settings.documentDateFormat, inheritedSettings?.documentDateFormat)}</DetailsValue>
+        <DetailsValue>{textValue(settings.documentDateFormat)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Include sender details</Trans>}>
-        <DetailsValue>
-          {booleanValue(settings.includeSenderDetails, inheritedSettings?.includeSenderDetails)}
-        </DetailsValue>
+        <DetailsValue>{booleanValue(settings.includeSenderDetails)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Include signing certificate</Trans>}>
-        <DetailsValue>
-          {booleanValue(settings.includeSigningCertificate, inheritedSettings?.includeSigningCertificate)}
-        </DetailsValue>
+        <DetailsValue>{booleanValue(settings.includeSigningCertificate)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Include audit log</Trans>}>
-        <DetailsValue>{booleanValue(settings.includeAuditLog, inheritedSettings?.includeAuditLog)}</DetailsValue>
+        <DetailsValue>{booleanValue(settings.includeAuditLog)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Delegate document ownership</Trans>}>
-        <DetailsValue>
-          {booleanValue(settings.delegateDocumentOwnership, inheritedSettings?.delegateDocumentOwnership)}
-        </DetailsValue>
+        <DetailsValue>{booleanValue(settings.delegateDocumentOwnership)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Typed signature</Trans>}>
-        <DetailsValue>
-          {booleanValue(settings.typedSignatureEnabled, inheritedSettings?.typedSignatureEnabled)}
-        </DetailsValue>
+        <DetailsValue>{booleanValue(settings.typedSignatureEnabled)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Upload signature</Trans>}>
-        <DetailsValue>
-          {booleanValue(settings.uploadSignatureEnabled, inheritedSettings?.uploadSignatureEnabled)}
-        </DetailsValue>
+        <DetailsValue>{booleanValue(settings.uploadSignatureEnabled)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Draw signature</Trans>}>
-        <DetailsValue>
-          {booleanValue(settings.drawSignatureEnabled, inheritedSettings?.drawSignatureEnabled)}
-        </DetailsValue>
+        <DetailsValue>{booleanValue(settings.drawSignatureEnabled)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Branding</Trans>}>
-        <DetailsValue>{booleanValue(settings.brandingEnabled, inheritedSettings?.brandingEnabled)}</DetailsValue>
+        <DetailsValue>{booleanValue(settings.brandingEnabled)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Branding logo</Trans>}>
-        <DetailsValue>{textValue(settings.brandingLogo, inheritedSettings?.brandingLogo)}</DetailsValue>
+        <DetailsValue>{brandingTextValue(settings.brandingLogo)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Branding URL</Trans>}>
-        <DetailsValue>{textValue(settings.brandingUrl, inheritedSettings?.brandingUrl)}</DetailsValue>
+        <DetailsValue>{brandingTextValue(settings.brandingUrl)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Branding company details</Trans>}>
-        <DetailsValue>
-          {textValue(settings.brandingCompanyDetails, inheritedSettings?.brandingCompanyDetails)}
-        </DetailsValue>
+        <DetailsValue>{brandingTextValue(settings.brandingCompanyDetails)}</DetailsValue>
       </DetailsCard>
 
       <DetailsCard label={<Trans>Email reply-to</Trans>}>
-        <DetailsValue>{textValue(settings.emailReplyTo, inheritedSettings?.emailReplyTo)}</DetailsValue>
+        <DetailsValue>{textValue(settings.emailReplyTo)}</DetailsValue>
       </DetailsCard>
 
       {isTeam && parsedEmailSettings.success && (
@@ -192,7 +145,7 @@ export const AdminGlobalSettingsSection = ({
       )}
 
       <DetailsCard label={<Trans>AI features</Trans>}>
-        <DetailsValue>{booleanValue(settings.aiFeaturesEnabled, inheritedSettings?.aiFeaturesEnabled)}</DetailsValue>
+        <DetailsValue>{booleanValue(settings.aiFeaturesEnabled)}</DetailsValue>
       </DetailsCard>
     </div>
   );

apps/remix/app/components/general/admin-license-card.tsx

@@ -87,7 +87,7 @@ export const AdminLicenseCard = ({ licenseData }: AdminLicenseCardProps) => {
           <KeyRoundIcon className="h-4 w-4 text-muted-foreground" />
         </div>
 
-        <h3 className="mb-2 flex items-end font-medium text-foreground text-sm leading-tight">
+        <h3 className="mb-2 flex items-end font-medium text-primary-forground text-sm leading-tight">
           <Trans>Documenso License</Trans>
         </h3>
 

apps/remix/app/components/general/app-command-menu.types.ts

@@ -1,36 +0,0 @@
-import type { MessageDescriptor } from '@lingui/core';
-import type { LucideIcon } from 'lucide-react';
-
-export type PromptItem = {
-  id: string;
-  label: string | MessageDescriptor;
-  sublabel?: string;
-  path?: string;
-  onAction?: () => void;
-  icon?: LucideIcon;
-  initials?: string;
-  shortcut?: string;
-  isChecked?: boolean;
-};
-
-export type PromptCategory = {
-  id: string;
-  label: MessageDescriptor;
-  items: PromptItem[];
-  /**
-   * The number of actual results, excluding utility rows such as the
-   * "View all results" link.
-   */
-  count: number;
-  /**
-   * The count shown on the category chip, or null to not show a chip at all.
-   * Categories which only contain hardcoded page links have no chip.
-   */
-  chipCount: number | null;
-  isCapped: boolean;
-  /**
-   * Global admin categories are marked with a globe icon to distinguish them
-   * from the equally named personal categories.
-   */
-  isGlobal: boolean;
-};

apps/remix/app/components/general/claim-account.tsx

@@ -1,7 +1,6 @@
 import { authClient } from '@documenso/auth/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { AppError } from '@documenso/lib/errors/app-error';
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { env } from '@documenso/lib/utils/env';
 import { zEmail } from '@documenso/lib/utils/zod';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
@@ -20,6 +19,7 @@ import { useRef } from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 import { z } from 'zod';
+
 import { SIGNUP_ERROR_MESSAGES } from '~/components/forms/signup';
 
 export type ClaimAccountProps = {
@@ -30,7 +30,7 @@ export type ClaimAccountProps = {
 
 export const ZClaimAccountFormSchema = z
   .object({
-    name: ZNameSchema,
+    name: z.string().trim().min(1, { message: msg`Please enter a valid name.`.id }),
     email: zEmail().min(1),
     password: ZPasswordSchema,
   })

apps/remix/app/components/general/claim-limit-fields.tsx

@@ -1,4 +1,11 @@
-import { FormControl, FormField, FormItem, FormLabel, FormMessage } from '@documenso/ui/primitives/form/form';
+import {
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
 import { Trans, useLingui } from '@lingui/react/macro';
 import type { ReactNode } from 'react';
@@ -6,13 +13,6 @@ import type { Control, FieldValues, Path } from 'react-hook-form';
 
 import { RateLimitArrayInput } from './rate-limit-array-input';
 
-/**
- * The rate-limit editor renders its own per-row inline errors, but a submit
- * attempt can still surface array-level Zod issues (e.g. a committed duplicate
- * window). Rendering the field's message here guarantees the form never fails
- * silently when those errors are not tied to a row the editor is showing.
- */
-
 type ClaimLimitFieldsProps<T extends FieldValues> = {
   control: Control<T>;
   /** e.g. '' for the claim form, 'claims.' for the org admin form. */
@@ -20,12 +20,6 @@ type ClaimLimitFieldsProps<T extends FieldValues> = {
   disabled?: boolean;
 };
 
-type LimitGroup = {
-  title: ReactNode;
-  quotaKey: string;
-  rateLimitKey: string;
-};
-
 export const ClaimLimitFields = <T extends FieldValues>({
   control,
   prefix = '',
@@ -36,33 +30,13 @@ export const ClaimLimitFields = <T extends FieldValues>({
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   const name = (key: string) => `${prefix}${key}` as Path<T>;
 
-  const limitGroups: LimitGroup[] = [
-    {
-      title: <Trans>Documents</Trans>,
-      quotaKey: 'documentQuota',
-      rateLimitKey: 'documentRateLimits',
-    },
-    {
-      title: <Trans>Emails</Trans>,
-      quotaKey: 'emailQuota',
-      rateLimitKey: 'emailRateLimits',
-    },
-    {
-      title: <Trans>API</Trans>,
-      quotaKey: 'apiQuota',
-      rateLimitKey: 'apiRateLimits',
-    },
-  ];
-
-  const renderQuotaField = (group: LimitGroup) => (
+  const renderQuotaField = (key: string, label: ReactNode, description: ReactNode) => (
     <FormField
       control={control}
-      name={name(group.quotaKey)}
+      name={name(key)}
       render={({ field }) => (
         <FormItem>
-          <FormLabel className="text-muted-foreground text-xs">
-            <Trans>Monthly quota</Trans>
-          </FormLabel>
+          <FormLabel>{label}</FormLabel>
           <FormControl>
             <Input
               type="number"
@@ -73,18 +47,20 @@ export const ClaimLimitFields = <T extends FieldValues>({
               onChange={(e) => field.onChange(e.target.value === '' ? null : parseInt(e.target.value, 10))}
             />
           </FormControl>
+          <FormDescription>{description}</FormDescription>
           <FormMessage />
         </FormItem>
       )}
     />
   );
 
-  const renderRateLimitField = (group: LimitGroup) => (
+  const renderRateLimitField = (key: string, label: ReactNode) => (
     <FormField
       control={control}
-      name={name(group.rateLimitKey)}
+      name={name(key)}
       render={({ field }) => (
         <FormItem>
+          <FormLabel>{label}</FormLabel>
           <FormControl>
             <RateLimitArrayInput value={field.value ?? []} onChange={field.onChange} disabled={disabled} />
           </FormControl>
@@ -95,30 +71,27 @@ export const ClaimLimitFields = <T extends FieldValues>({
   );
 
   return (
-    <div className="space-y-3">
-      <div>
-        <h3 className="font-semibold text-base">
-          <Trans>Limits</Trans>
-        </h3>
-        <p className="mt-1 text-muted-foreground text-sm">
-          <Trans>
-            Empty quota means unlimited, 0 blocks the resource. Rate limit windows accept values like 5m, 1h or 24h.
-          </Trans>
-        </p>
-      </div>
+    <div className="space-y-4 rounded-md border p-4">
+      <FormLabel>
+        <Trans>Limits</Trans>
+      </FormLabel>
 
-      <div className="overflow-hidden rounded-lg border">
-        <div className="grid grid-cols-1 divide-y divide-border md:grid-cols-3 md:divide-x md:divide-y-0">
-          {limitGroups.map((group) => (
-            <div key={group.quotaKey} className="space-y-4 p-4">
-              <h4 className="font-semibold text-sm">{group.title}</h4>
+      {renderQuotaField(
+        'documentQuota',
+        <Trans>Monthly document quota</Trans>,
+        <Trans>Empty = Unlimited, 0 = Blocked</Trans>,
+      )}
+      {renderRateLimitField('documentRateLimits', <Trans>Document rate limits</Trans>)}
 
-              {renderQuotaField(group)}
-              {renderRateLimitField(group)}
-            </div>
-          ))}
-        </div>
-      </div>
+      {renderQuotaField(
+        'emailQuota',
+        <Trans>Monthly email quota</Trans>,
+        <Trans>Empty = Unlimited, 0 = Blocked</Trans>,
+      )}
+      {renderRateLimitField('emailRateLimits', <Trans>Email rate limits</Trans>)}
+
+      {renderQuotaField('apiQuota', <Trans>Monthly API quota</Trans>, <Trans>Empty = Unlimited, 0 = Blocked</Trans>)}
+      {renderRateLimitField('apiRateLimits', <Trans>API rate limits</Trans>)}
     </div>
   );
 };

apps/remix/app/components/general/direct-template/direct-template-invalid-page.tsx

@@ -1,23 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { AlertTriangleIcon } from 'lucide-react';
-
-export const DirectTemplateInvalidPageView = () => {
-  return (
-    <div className="mx-auto flex h-[70vh] w-full max-w-md flex-col items-center justify-center">
-      <div>
-        <AlertTriangleIcon className="h-10 w-10 text-destructive" />
-
-        <h1 className="mt-4 font-semibold text-3xl">
-          <Trans>Invalid direct link template</Trans>
-        </h1>
-
-        <p className="mt-2 text-muted-foreground text-sm">
-          <Trans>
-            This direct link template cannot be used because one or more signers do not have a signature field assigned.
-            Please contact the sender to update the template.
-          </Trans>
-        </p>
-      </div>
-    </div>
-  );
-};

apps/remix/app/components/general/document/document-search.tsx

@@ -1,46 +0,0 @@
-import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
-import { Input } from '@documenso/ui/primitives/input';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { useCallback, useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router';
-
-export const DocumentSearch = ({ initialValue = '' }: { initialValue?: string }) => {
-  const { _ } = useLingui();
-
-  const [searchParams, setSearchParams] = useSearchParams();
-
-  const [searchTerm, setSearchTerm] = useState(initialValue);
-  const debouncedSearchTerm = useDebouncedValue(searchTerm, 500);
-
-  const handleSearch = useCallback(
-    (term: string) => {
-      const params = new URLSearchParams(searchParams?.toString() ?? '');
-      if (term) {
-        params.set('query', term);
-      } else {
-        params.delete('query');
-      }
-
-      setSearchParams(params);
-    },
-    [searchParams],
-  );
-
-  useEffect(() => {
-    const currentQueryParam = searchParams.get('query') || '';
-
-    if (debouncedSearchTerm !== currentQueryParam) {
-      handleSearch(debouncedSearchTerm);
-    }
-  }, [debouncedSearchTerm, searchParams]);
-
-  return (
-    <Input
-      type="search"
-      placeholder={_(msg`Search documents...`)}
-      value={searchTerm}
-      onChange={(e) => setSearchTerm(e.target.value)}
-    />
-  );
-};

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx

@@ -270,7 +270,7 @@ export const EnvelopeEditorFieldDragDrop = ({
       {selectedField && (
         <div
           className={cn(
-            'pointer-events-none fixed z-50 flex cursor-pointer flex-col items-center justify-center rounded-[2px] bg-white font-noto text-muted-foreground ring-2 transition duration-200 [container-type:size] dark:text-muted',
+            'pointer-events-none fixed z-50 flex cursor-pointer flex-col items-center justify-center rounded-[2px] bg-white font-noto text-muted-foreground ring-2 transition duration-200 [container-type:size] dark:text-muted-background',
             selectedRecipientStyles.base,
             selectedField === FieldType.SIGNATURE && 'font-signature',
             {

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx

@@ -54,7 +54,6 @@ import { useCurrentTeam } from '~/providers/team';
 
 import { EnvelopeEditorFieldDragDrop } from './envelope-editor-fields-drag-drop';
 import { EnvelopeEditorFieldsPageRenderer } from './envelope-editor-fields-page-renderer';
-import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeRendererFileSelector } from './envelope-file-selector';
 import { EnvelopeRecipientSelector } from './envelope-recipient-selector';
 
@@ -239,8 +238,6 @@ export const EnvelopeEditorFieldsPage = () => {
           }
         />
 
-        <EnvelopeEditorInvalidDirectTemplateAlert />
-
         {/* Document View */}
         <div className="mt-4 flex h-full flex-col items-center justify-center">
           {envelope.recipients.length === 0 && (

apps/remix/app/components/general/envelope-editor/envelope-editor-invalid-direct-template-alert.tsx

@@ -1,55 +0,0 @@
-import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
-import { getRecipientsWithMissingFields } from '@documenso/lib/utils/recipients';
-import { cn } from '@documenso/ui/lib/utils';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Trans } from '@lingui/react/macro';
-import { useMemo } from 'react';
-
-export type EnvelopeEditorInvalidDirectTemplateAlertProps = {
-  className?: string;
-};
-
-/**
- * Warns that a direct link template cannot be used because one or more signers
- * are missing a signature field.
- */
-export const EnvelopeEditorInvalidDirectTemplateAlert = ({
-  className,
-}: EnvelopeEditorInvalidDirectTemplateAlertProps) => {
-  const { envelope, isTemplate } = useCurrentEnvelopeEditor();
-
-  const signersMissingSignatureFields = useMemo(() => {
-    if (!isTemplate || !envelope.directLink?.enabled) {
-      return [];
-    }
-
-    return getRecipientsWithMissingFields(envelope.recipients, envelope.fields);
-  }, [isTemplate, envelope.directLink, envelope.recipients, envelope.fields]);
-
-  if (signersMissingSignatureFields.length === 0) {
-    return null;
-  }
-
-  return (
-    <Alert
-      variant="destructive"
-      className={cn('mx-auto w-full max-w-[800px] flex-row items-start gap-3 rounded-sm', className)}
-    >
-      <AlertTitle>
-        <Trans>Invalid direct link template</Trans>
-      </AlertTitle>
-
-      <AlertDescription>
-        <Trans>
-          Recipients cannot use this direct link template because the following signers are missing a signature field
-        </Trans>
-
-        <ul className="list-disc pl-5">
-          {signersMissingSignatureFields.map((recipient, i) => (
-            <li key={recipient.id}>{recipient.email || recipient.name || `Recipient ${i + 1}`}</li>
-          ))}
-        </ul>
-      </AlertDescription>
-    </Alert>
-  );
-};

apps/remix/app/components/general/envelope-editor/envelope-editor-preview-page.tsx

@@ -22,7 +22,6 @@ import { match } from 'ts-pattern';
 import { EnvelopeGenericPageRenderer } from '~/components/general/envelope-editor/envelope-generic-page-renderer';
 import { EnvelopePdfViewer } from '~/components/general/pdf-viewer/envelope-pdf-viewer';
 
-import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeRendererFileSelector } from './envelope-file-selector';
 
 export const EnvelopeEditorPreviewPage = () => {
@@ -229,8 +228,6 @@ export const EnvelopeEditorPreviewPage = () => {
           {/* Horizontal envelope item selector */}
           <EnvelopeRendererFileSelector className="px-0" fields={editorFields.localFields} />
 
-          <EnvelopeEditorInvalidDirectTemplateAlert className="mb-4" />
-
           <Alert variant="warning" className="mx-auto max-w-[800px]">
             <AlertTitle>
               <Trans>Preview Mode</Trans>

apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx

@@ -7,12 +7,7 @@ import { useOptionalSession } from '@documenso/lib/client-only/providers/session
 import type { TDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
 import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
-import {
-  isAssistantLastSigner,
-  isCcRecipient,
-  normalizeRecipientSigningOrders,
-  canRecipientBeModified as utilCanRecipientBeModified,
-} from '@documenso/lib/utils/recipients';
+import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
 import { trpc } from '@documenso/trpc/react';
 import { RecipientActionAuthSelect } from '@documenso/ui/components/recipient/recipient-action-auth-select';
 import {
@@ -161,12 +156,16 @@ export const EnvelopeEditorRecipientForm = () => {
   }, [watchedSigners]);
 
   const normalizeSigningOrders = (signers: typeof watchedSigners) => {
-    return normalizeRecipientSigningOrders(signers, (signer) => canRecipientBeModified(signer.id));
+    return signers
+      .sort((a, b) => (a.signingOrder ?? 0) - (b.signingOrder ?? 0))
+      .map((signer, index) => ({ ...signer, signingOrder: index + 1 }));
   };
 
-  const activeRecipientCount = watchedSigners.filter((signer) => !isCcRecipient(signer)).length;
-
-  const { fields: signers, remove: removeSigner } = useFieldArray({
+  const {
+    append: appendSigner,
+    fields: signers,
+    remove: removeSigner,
+  } = useFieldArray({
     control,
     name: 'signers',
     keyName: 'nativeId',
@@ -209,31 +208,14 @@ export const EnvelopeEditorRecipientForm = () => {
     return utilCanRecipientBeModified(recipient, fields);
   };
 
-  const appendNormalizedSigner = (signer: (typeof watchedSigners)[number], shouldFocus = false) => {
-    const updatedSigners = normalizeSigningOrders([...form.getValues('signers'), signer]);
-
-    form.setValue('signers', updatedSigners, {
-      shouldValidate: true,
-      shouldDirty: true,
-    });
-
-    if (shouldFocus) {
-      const signerIndex = updatedSigners.findIndex((updatedSigner) => updatedSigner.formId === signer.formId);
-
-      if (signerIndex !== -1) {
-        requestAnimationFrame(() => form.setFocus(`signers.${signerIndex}.email`));
-      }
-    }
-  };
-
   const onAddSigner = () => {
-    appendNormalizedSigner({
+    appendSigner({
       formId: nanoid(12),
       name: '',
       email: '',
       role: RecipientRole.SIGNER,
       actionAuth: [],
-      signingOrder: activeRecipientCount + 1,
+      signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
     });
   };
 
@@ -341,16 +323,18 @@ export const EnvelopeEditorRecipientForm = () => {
 
       form.setFocus(`signers.${emptySignerIndex}.email`);
     } else {
-      appendNormalizedSigner(
+      appendSigner(
         {
           formId: nanoid(12),
           name: currentEditorName ?? '',
           email: currentEditorEmail ?? '',
           role: RecipientRole.SIGNER,
           actionAuth: [],
-          signingOrder: activeRecipientCount + 1,
+          signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
+        },
+        {
+          shouldFocus: true,
         },
-        true,
       );
 
       void form.trigger('signers');
@@ -385,14 +369,18 @@ export const EnvelopeEditorRecipientForm = () => {
 
       items.splice(insertIndex, 0, reorderedSigner);
 
-      const updatedSigners = normalizeSigningOrders(items);
+      const updatedSigners = items.map((signer, index) => ({
+        ...signer,
+        signingOrder: !canRecipientBeModified(signer.id) ? signer.signingOrder : index + 1,
+      }));
 
       form.setValue('signers', updatedSigners, {
         shouldValidate: true,
         shouldDirty: true,
       });
 
-      if (isAssistantLastSigner(updatedSigners)) {
+      const lastSigner = updatedSigners[updatedSigners.length - 1];
+      if (lastSigner.role === RecipientRole.ASSISTANT) {
         toast({
           title: t`Warning: Assistant as last signer`,
           description: t`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
@@ -423,19 +411,18 @@ export const EnvelopeEditorRecipientForm = () => {
         return;
       }
 
-      const updatedSigners = normalizeSigningOrders(
-        currentSigners.map((signer, idx) => ({
-          ...signer,
-          role: idx === index ? role : signer.role,
-        })),
-      );
+      const updatedSigners = currentSigners.map((signer, idx) => ({
+        ...signer,
+        role: idx === index ? role : signer.role,
+        signingOrder: !canRecipientBeModified(signer.id) ? signer.signingOrder : idx + 1,
+      }));
 
       form.setValue('signers', updatedSigners, {
         shouldValidate: true,
         shouldDirty: true,
       });
 
-      if (role === RecipientRole.ASSISTANT && isAssistantLastSigner(updatedSigners)) {
+      if (role === RecipientRole.ASSISTANT && index === updatedSigners.length - 1) {
         toast({
           title: t`Warning: Assistant as last signer`,
           description: t`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
@@ -460,30 +447,22 @@ export const EnvelopeEditorRecipientForm = () => {
       const currentSigners = form.getValues('signers');
       const signer = currentSigners[index];
 
-      if (isCcRecipient(signer)) {
-        return;
-      }
+      // Remove signer from current position and insert at new position
+      const remainingSigners = currentSigners.filter((_, idx) => idx !== index);
+      const newPosition = Math.min(Math.max(0, newOrder - 1), currentSigners.length - 1);
+      remainingSigners.splice(newPosition, 0, signer);
 
-      const nonCcSigners = currentSigners.filter((s) => !isCcRecipient(s));
-      const ccSigners = currentSigners.filter((s) => isCcRecipient(s));
-      const currentSigningOrderIndex = nonCcSigners.findIndex((s) => s.formId === signer.formId);
-
-      if (currentSigningOrderIndex === -1) {
-        return;
-      }
-
-      const [reorderedSigner] = nonCcSigners.splice(currentSigningOrderIndex, 1);
-      const newPosition = Math.min(Math.max(0, newOrder - 1), nonCcSigners.length);
-      nonCcSigners.splice(newPosition, 0, reorderedSigner);
-
-      const updatedSigners = normalizeSigningOrders([...nonCcSigners, ...ccSigners]);
+      const updatedSigners = remainingSigners.map((s, idx) => ({
+        ...s,
+        signingOrder: !canRecipientBeModified(s.id) ? s.signingOrder : idx + 1,
+      }));
 
       form.setValue('signers', updatedSigners, {
         shouldValidate: true,
         shouldDirty: true,
       });
 
-      if (signer.role === RecipientRole.ASSISTANT && isAssistantLastSigner(updatedSigners)) {
+      if (signer.role === RecipientRole.ASSISTANT && newPosition === remainingSigners.length - 1) {
         toast({
           title: t`Warning: Assistant as last signer`,
           description: t`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
@@ -497,12 +476,10 @@ export const EnvelopeEditorRecipientForm = () => {
     setShowSigningOrderConfirmation(false);
 
     const currentSigners = form.getValues('signers');
-    const updatedSigners = normalizeSigningOrders(
-      currentSigners.map((signer) => ({
-        ...signer,
-        role: signer.role === RecipientRole.ASSISTANT ? RecipientRole.SIGNER : signer.role,
-      })),
-    );
+    const updatedSigners = currentSigners.map((signer) => ({
+      ...signer,
+      role: signer.role === RecipientRole.ASSISTANT ? RecipientRole.SIGNER : signer.role,
+    }));
 
     form.setValue('signers', updatedSigners, {
       shouldValidate: true,
@@ -819,7 +796,6 @@ export const EnvelopeEditorRecipientForm = () => {
                         isDragDisabled={
                           !isSigningOrderSequential ||
                           isSubmitting ||
-                          isCcRecipient(signer) ||
                           !canRecipientBeModified(signer.id) ||
                           !signer.signingOrder
                         }
@@ -843,11 +819,7 @@ export const EnvelopeEditorRecipientForm = () => {
                               })}
                             >
                               <div className="flex flex-row items-center gap-x-2">
-                                {isSigningOrderSequential && isCcRecipient(signer) && (
-                                  <div className="mt-auto h-10 w-[4.25rem] flex-shrink-0" />
-                                )}
-
-                                {isSigningOrderSequential && !isCcRecipient(signer) && (
+                                {isSigningOrderSequential && (
                                   <FormField
                                     control={form.control}
                                     name={`signers.${index}.signingOrder`}
@@ -863,7 +835,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                         <FormControl>
                                           <Input
                                             type="number"
-                                            max={activeRecipientCount}
+                                            max={signers.length}
                                             data-testid="signing-order-input"
                                             className={cn(
                                               'w-10 text-center',
@@ -1004,6 +976,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                           onValueChange={(value) => {
                                             // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                                             handleRoleChange(index, value as RecipientRole);
+                                            field.onChange(value);
                                           }}
                                           disabled={
                                             snapshot.isDragging || isSubmitting || !canRecipientBeModified(signer.id)

apps/remix/app/components/general/envelope-editor/envelope-editor-upload-page.tsx

@@ -26,7 +26,6 @@ import { ErrorCode as DropzoneErrorCode, type FileRejection, useDropzone } from
 
 import { EnvelopeItemDeleteDialog } from '~/components/dialogs/envelope-item-delete-dialog';
 
-import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeEditorRecipientForm } from './envelope-editor-recipient-form';
 import { EnvelopeItemTitleInput } from './envelope-editor-title-input';
 
@@ -450,9 +449,6 @@ export const EnvelopeEditorUploadPage = () => {
   return (
     <div className="mx-auto max-w-4xl space-y-6 p-8">
       <input {...getReplaceInputProps()} />
-
-      <EnvelopeEditorInvalidDirectTemplateAlert className="max-w-none" />
-
       <Card backdropBlur={false} className="border">
         <CardHeader className="pb-3">
           <CardTitle>

apps/remix/app/components/general/envelope/envelope-drop-zone-wrapper.tsx

@@ -174,7 +174,7 @@ export const EnvelopeDropZoneWrapper = ({ children, type, className }: EnvelopeD
               {type === EnvelopeType.DOCUMENT ? <Trans>Upload Document</Trans> : <Trans>Upload Template</Trans>}
             </h2>
 
-            <p className="mt-4 text-base text-muted-foreground">
+            <p className="mt-4 text-md text-muted-foreground">
               <Trans>Drag and drop your document here</Trans>
             </p>
 

apps/remix/app/components/general/organisation-usage-panel.tsx

@@ -1,38 +1,13 @@
 import { currentMonthlyPeriod } from '@documenso/lib/universal/monthly-period';
-import {
-  getQuotaUsagePercent,
-  isQuotaExceeded,
-  isQuotaNearing,
-  normalizeCapacityLimit,
-} from '@documenso/lib/universal/quota-usage';
-import { cn } from '@documenso/ui/lib/utils';
-import type { BadgeProps } from '@documenso/ui/primitives/badge';
-import { Badge } from '@documenso/ui/primitives/badge';
 import { Progress } from '@documenso/ui/primitives/progress';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';
 
 import { Trans } from '@lingui/react/macro';
 import type { OrganisationClaim, OrganisationMonthlyStat } from '@prisma/client';
-import type { LucideIcon } from 'lucide-react';
-import { FileIcon, MailIcon, MailOpenIcon, PlugIcon, UsersIcon, UsersRoundIcon } from 'lucide-react';
-import type { ReactNode } from 'react';
-import { useId, useState } from 'react';
-
+import { useState } from 'react';
+import { match } from 'ts-pattern';
 import { OrganisationUsageResetButton } from './organisation-usage-reset-button';
 
-type CapacityUsage = {
-  members: number;
-  teams: number;
-};
-
-type UsageRow = {
-  counter: 'document' | 'email' | 'api';
-  label: ReactNode;
-  icon: LucideIcon;
-  used: number;
-  effectiveLimit: number | null;
-};
-
 type OrganisationUsagePanelProps = {
   organisationId: string;
   monthlyStats: Pick<
@@ -40,151 +15,13 @@ type OrganisationUsagePanelProps = {
     'period' | 'documentCount' | 'emailCount' | 'apiCount' | 'emailReports'
   >[];
   organisationClaim: OrganisationClaim;
-  capacityUsage?: CapacityUsage;
-};
-
-type UsageCardState = {
-  status: {
-    label: ReactNode;
-    variant: NonNullable<BadgeProps['variant']>;
-  };
-  percent: number;
-  hasFiniteLimit: boolean;
-  progressClassName: string;
-  subtext: ReactNode;
-};
-
-type UsageCardStateOptions = {
-  used: number;
-  limit: number | null | undefined;
-  footnote?: ReactNode;
-};
-
-const getUsageCardState = ({ used, limit, footnote }: UsageCardStateOptions): UsageCardState => {
-  const percent = getQuotaUsagePercent(used, limit ?? null);
-  const hasFiniteLimit = Boolean(limit && limit > 0);
-
-  if (limit === null || limit === undefined) {
-    return {
-      status: { label: <Trans>Unlimited</Trans>, variant: 'neutral' },
-      percent,
-      hasFiniteLimit,
-      progressClassName: '',
-      subtext: footnote ?? null,
-    };
-  }
-
-  if (limit === 0) {
-    return {
-      status: { label: <Trans>Blocked</Trans>, variant: 'destructive' },
-      percent,
-      hasFiniteLimit,
-      progressClassName: '',
-      subtext: footnote ?? <Trans>Resource blocked</Trans>,
-    };
-  }
-
-  if (used > limit) {
-    return {
-      status: { label: <Trans>Exceeded</Trans>, variant: 'destructive' },
-      percent,
-      hasFiniteLimit,
-      progressClassName: '[&>div]:bg-destructive',
-      subtext: footnote ?? null,
-    };
-  }
-
-  if (isQuotaExceeded(limit, used)) {
-    return {
-      status: { label: <Trans>Limit reached</Trans>, variant: 'orange' },
-      percent,
-      hasFiniteLimit,
-      progressClassName: '[&>div]:bg-orange-500 dark:[&>div]:bg-orange-400',
-      subtext: footnote ?? null,
-    };
-  }
-
-  if (isQuotaNearing(limit, used)) {
-    return {
-      status: { label: <Trans>Near limit</Trans>, variant: 'warning' },
-      percent,
-      hasFiniteLimit,
-      progressClassName: '[&>div]:bg-yellow-500 dark:[&>div]:bg-yellow-400',
-      subtext: footnote ?? null,
-    };
-  }
-
-  return {
-    status: { label: <Trans>Within limit</Trans>, variant: 'default' },
-    percent,
-    hasFiniteLimit,
-    progressClassName: '',
-    subtext: footnote ?? null,
-  };
-};
-
-type UsageStatCardProps = {
-  label: ReactNode;
-  icon: LucideIcon;
-  used: number;
-  limit: number | null | undefined;
-  /** When true the card is a plain counter with no limit, status or progress. */
-  countOnly?: boolean;
-  footnote?: ReactNode;
-  action?: ReactNode;
-};
-
-const UsageStatCard = ({ label, icon: Icon, used, limit, countOnly = false, footnote, action }: UsageStatCardProps) => {
-  const { status, percent, hasFiniteLimit, progressClassName, subtext } = getUsageCardState({ used, limit, footnote });
-
-  return (
-    <div className="flex flex-col rounded-lg border bg-background p-5">
-      <div className="flex items-center justify-between gap-3">
-        <div className="flex items-center gap-2 font-medium text-foreground text-sm">
-          <Icon className="h-4 w-4 text-muted-foreground" />
-          <span>{label}</span>
-        </div>
-
-        {!countOnly && (
-          <Badge variant={status.variant} size="small">
-            {status.label}
-          </Badge>
-        )}
-      </div>
-
-      <div className="mt-4 flex flex-1 flex-col">
-        <div className="flex items-baseline justify-between gap-2">
-          <div className="flex items-baseline gap-1.5">
-            <span className="font-semibold text-3xl text-foreground tabular-nums tracking-tight">
-              {used.toLocaleString()}
-            </span>
-            {hasFiniteLimit ? (
-              <span className="text-base text-muted-foreground tabular-nums">/ {limit?.toLocaleString()}</span>
-            ) : null}
-          </div>
-
-          {hasFiniteLimit ? (
-            <span className="font-medium text-muted-foreground text-sm tabular-nums">{percent}%</span>
-          ) : null}
-        </div>
-
-        {hasFiniteLimit ? <Progress className={cn('mt-3 h-2', progressClassName)} value={percent} /> : null}
-
-        {subtext ? <p className="mt-2 text-muted-foreground text-xs">{subtext}</p> : null}
-      </div>
-
-      {action ? <div className="mt-4 flex justify-end border-t pt-4">{action}</div> : null}
-    </div>
-  );
 };
 
 export const OrganisationUsagePanel = ({
   organisationId,
   monthlyStats,
   organisationClaim,
-  capacityUsage,
 }: OrganisationUsagePanelProps) => {
-  const monthlyUsagePeriodId = useId();
   const [selectedPeriod, setSelectedPeriod] = useState<string | undefined>(() => monthlyStats[0]?.period);
 
   const selectedStat = monthlyStats.find((stat) => stat.period === selectedPeriod) ?? monthlyStats[0];
@@ -193,105 +30,86 @@ export const OrganisationUsagePanel = ({
   // current period), so only offer the reset action when viewing the current month.
   const isCurrentPeriod = selectedStat?.period === currentMonthlyPeriod();
 
-  const capacityRows = capacityUsage
-    ? [
-        {
-          key: 'members',
-          label: <Trans>Members</Trans>,
-          icon: UsersIcon,
-          used: capacityUsage.members,
-          limit: normalizeCapacityLimit(organisationClaim.memberCount),
-        },
-        {
-          key: 'teams',
-          label: <Trans>Teams</Trans>,
-          icon: UsersRoundIcon,
-          used: capacityUsage.teams,
-          limit: normalizeCapacityLimit(organisationClaim.teamCount),
-        },
-      ]
-    : [];
-
-  const monthlyRows: UsageRow[] = [
+  const rows = [
     {
-      counter: 'document',
+      counter: 'document' as const,
       label: <Trans>Documents</Trans>,
-      icon: FileIcon,
       used: selectedStat?.documentCount ?? 0,
       effectiveLimit: organisationClaim.documentQuota,
     },
     {
-      counter: 'email',
+      counter: 'email' as const,
       label: <Trans>Emails</Trans>,
-      icon: MailIcon,
       used: selectedStat?.emailCount ?? 0,
       effectiveLimit: organisationClaim.emailQuota,
     },
     {
-      counter: 'api',
+      counter: 'api' as const,
       label: <Trans>API requests</Trans>,
-      icon: PlugIcon,
       used: selectedStat?.apiCount ?? 0,
       effectiveLimit: organisationClaim.apiQuota,
     },
   ];
 
   return (
-    <div className="mt-4 space-y-6">
-      {capacityRows.length > 0 ? (
-        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
-          {capacityRows.map((row) => (
-            <UsageStatCard key={row.key} label={row.label} icon={row.icon} used={row.used} limit={row.limit} />
-          ))}
-        </div>
-      ) : null}
+    <div className="space-y-4 rounded-md border p-4">
+      <div className="flex items-center justify-between gap-2">
+        <h3 className="font-medium text-sm">
+          <Trans>Usage for period: {selectedStat?.period || 'N/A'}</Trans>
+        </h3>
 
-      <div className="space-y-3">
-        <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-          <h3 id={monthlyUsagePeriodId} className="font-semibold text-base">
-            <Trans>Monthly usage</Trans>
-          </h3>
+        {monthlyStats.length > 0 && (
+          <Select value={selectedStat?.period} onValueChange={setSelectedPeriod}>
+            <SelectTrigger className="w-40">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {monthlyStats.map((stat) => (
+                <SelectItem key={stat.period} value={stat.period}>
+                  {stat.period}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        )}
+      </div>
 
-          {monthlyStats.length > 0 ? (
-            <Select value={selectedStat?.period} onValueChange={setSelectedPeriod}>
-              <SelectTrigger className="h-9 w-full sm:w-44" aria-labelledby={monthlyUsagePeriodId}>
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                {monthlyStats.map((stat) => (
-                  <SelectItem key={stat.period} value={stat.period}>
-                    {stat.period}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          ) : null}
-        </div>
+      {rows.map((row) => {
+        const percent =
+          row.effectiveLimit && row.effectiveLimit > 0
+            ? Math.min(100, Math.round((row.used / row.effectiveLimit) * 100))
+            : 0;
 
-        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
-          {monthlyRows.map((row) => (
-            <UsageStatCard
-              key={row.counter}
-              label={row.label}
-              icon={row.icon}
-              used={row.used}
-              limit={row.effectiveLimit}
-              action={
-                selectedStat && isCurrentPeriod ? (
-                  <OrganisationUsageResetButton organisationId={organisationId} counter={row.counter} />
-                ) : undefined
-              }
-            />
-          ))}
+        return (
+          <div key={row.counter} className="space-y-1">
+            <div className="flex items-center justify-between text-sm">
+              <span>{row.label}</span>
+              <span className="text-muted-foreground">
+                {row.used} /{' '}
+                {match(row.effectiveLimit)
+                  .with(null, () => <Trans>Unlimited</Trans>)
+                  .with(0, () => <Trans>Blocked</Trans>)
+                  .otherwise(String)}
+              </span>
+            </div>
 
-          <UsageStatCard
-            label={<Trans>Reports</Trans>}
-            icon={MailOpenIcon}
-            used={selectedStat?.emailReports ?? 0}
-            limit={null}
-            countOnly
-            footnote={<Trans>Sent this period</Trans>}
-          />
+            {row.effectiveLimit && row.effectiveLimit > 0 ? <Progress className="h-2 w-full" value={percent} /> : null}
+
+            {selectedStat && isCurrentPeriod && (
+              <div className="flex w-full justify-end pt-1">
+                <OrganisationUsageResetButton organisationId={organisationId} counter={row.counter} />
+              </div>
+            )}
+          </div>
+        );
+      })}
+
+      <div className="space-y-1">
+        <div className="flex items-center justify-between text-sm">
+          <span>
+            <Trans>Reports</Trans>
+          </span>
+          <span className="text-muted-foreground">{selectedStat?.emailReports ?? 0}</span>
         </div>
       </div>
     </div>

apps/remix/app/components/general/organisation-usage-reset-button.tsx

@@ -2,7 +2,6 @@ import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 import { Trans, useLingui } from '@lingui/react/macro';
-import { RotateCcwIcon } from 'lucide-react';
 import { useRevalidator } from 'react-router';
 
 type OrganisationUsageResetButtonProps = {
@@ -33,7 +32,6 @@ export const OrganisationUsageResetButton = ({ organisationId, counter }: Organi
       loading={isPending}
       onClick={() => reset({ organisationId, counter })}
     >
-      <RotateCcwIcon className="mr-2 h-3.5 w-3.5" />
       <Trans>Reset</Trans>
     </Button>
   );

apps/remix/app/components/general/period-selector.tsx

@@ -1,62 +0,0 @@
-import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';
-import { Trans } from '@lingui/react/macro';
-import { useMemo } from 'react';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
-
-const isPeriodSelectorValue = (value: unknown): value is PeriodSelectorValue => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return ['', '7d', '14d', '30d'].includes(value as string);
-};
-
-export const PeriodSelector = () => {
-  const { pathname } = useLocation();
-  const [searchParams] = useSearchParams();
-
-  const navigate = useNavigate();
-
-  const period = useMemo(() => {
-    const p = searchParams?.get('period') ?? 'all';
-
-    return isPeriodSelectorValue(p) ? p : 'all';
-  }, [searchParams]);
-
-  const onPeriodChange = (newPeriod: string) => {
-    if (!pathname) {
-      return;
-    }
-
-    const params = new URLSearchParams(searchParams?.toString());
-
-    params.set('period', newPeriod);
-
-    if (newPeriod === '' || newPeriod === 'all') {
-      params.delete('period');
-    }
-
-    void navigate(`${pathname}?${params.toString()}`, { preventScrollReset: true });
-  };
-
-  return (
-    <Select defaultValue={period} onValueChange={onPeriodChange}>
-      <SelectTrigger className="max-w-[200px] text-muted-foreground">
-        <SelectValue />
-      </SelectTrigger>
-
-      <SelectContent position="popper">
-        <SelectItem value="all">
-          <Trans>All Time</Trans>
-        </SelectItem>
-        <SelectItem value="7d">
-          <Trans>Last 7 days</Trans>
-        </SelectItem>
-        <SelectItem value="14d">
-          <Trans>Last 14 days</Trans>
-        </SelectItem>
-        <SelectItem value="30d">
-          <Trans>Last 30 days</Trans>
-        </SelectItem>
-      </SelectContent>
-    </Select>
-  );
-};

apps/remix/app/components/general/rate-limit-array-input.tsx

@@ -1,9 +1,7 @@
-import { RATE_LIMIT_WINDOW_REGEX } from '@documenso/lib/types/subscription';
 import { Button } from '@documenso/ui/primitives/button';
 import { Input } from '@documenso/ui/primitives/input';
-import { Trans, useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
 import { PlusIcon, Trash2Icon } from 'lucide-react';
-import { useState } from 'react';
 
 type RateLimitEntryValue = { window: string; max: number };
 
@@ -13,153 +11,50 @@ type RateLimitArrayInputProps = {
   disabled?: boolean;
 };
 
-const EMPTY_ENTRY: RateLimitEntryValue = { window: '', max: 0 };
-
-/** A row counts as "started" once either field has input; fully-empty rows are dropped on commit. */
-const hasEntryInput = (entry: RateLimitEntryValue) => entry.window.trim() !== '' || entry.max > 0;
-
-/** Keep in-progress rows; drop rows that are completely empty. */
-const persistEntries = (entries: RateLimitEntryValue[]) => {
-  return entries.map((entry) => ({ ...entry, window: entry.window.trim() })).filter(hasEntryInput);
-};
-
 export const RateLimitArrayInput = ({ value, onChange, disabled }: RateLimitArrayInputProps) => {
-  const { t } = useLingui();
-  const [draftEntry, setDraftEntry] = useState<RateLimitEntryValue | null>(null);
-
-  const entries = draftEntry ? [...value, draftEntry] : value.length ? value : [EMPTY_ENTRY];
-
-  const getWindowError = (entry: RateLimitEntryValue, index: number) => {
-    const window = entry.window.trim();
-
-    if (!hasEntryInput(entry)) {
-      return null;
-    }
-
-    if (window === '') {
-      return t`Enter a window, e.g. 5m`;
-    }
-
-    if (!RATE_LIMIT_WINDOW_REGEX.test(window)) {
-      return t`Use a duration with a unit, e.g. 5m, 1h, or 24h`;
-    }
-
-    const isDuplicateWindow = entries.some((otherEntry, otherIndex) => {
-      return otherIndex !== index && otherEntry.window.trim() === window;
-    });
-
-    return isDuplicateWindow ? t`Use a unique window for each rate limit` : null;
-  };
-
-  const getMaxError = (entry: RateLimitEntryValue) => {
-    if (!hasEntryInput(entry)) {
-      return null;
-    }
-
-    return entry.max > 0 ? null : t`Enter a max request count greater than 0`;
-  };
+  const entries = value ?? [];
 
   const updateEntry = (index: number, patch: Partial<RateLimitEntryValue>) => {
-    if (index >= value.length) {
-      const nextDraftEntry = { ...(draftEntry ?? EMPTY_ENTRY), ...patch };
-
-      if (hasEntryInput(nextDraftEntry)) {
-        onChange(persistEntries([...value, nextDraftEntry]));
-        setDraftEntry(null);
-        return;
-      }
-
-      setDraftEntry(nextDraftEntry);
-      return;
-    }
-
-    const next = value.map((entry, i) => (i === index ? { ...entry, ...patch } : entry));
-    onChange(persistEntries(next));
+    const next = entries.map((entry, i) => (i === index ? { ...entry, ...patch } : entry));
+    onChange(next);
   };
 
   const removeEntry = (index: number) => {
-    if (index >= value.length) {
-      setDraftEntry(null);
-      return;
-    }
-
-    const next = value.filter((_, i) => i !== index);
-    onChange(persistEntries(next));
+    onChange(entries.filter((_, i) => i !== index));
   };
 
   const addEntry = () => {
-    setDraftEntry(EMPTY_ENTRY);
+    onChange([...entries, { window: '5m', max: 100 }]);
   };
 
-  const hasErrors = entries.some((entry, index) => getWindowError(entry, index) || getMaxError(entry));
-  const isAddDisabled = disabled || value.length === 0 || Boolean(draftEntry) || hasErrors;
-
   return (
     <div className="space-y-2">
-      <div className="flex items-center gap-2 text-muted-foreground text-xs">
-        <span className="w-20 shrink-0">
-          <Trans>Window</Trans>
-        </span>
-        <span className="flex-1">
-          <Trans>Max requests</Trans>
-        </span>
-        <span className="w-9 shrink-0" aria-hidden="true" />
-      </div>
+      {entries.map((entry, index) => (
+        <div key={index} className="flex items-center gap-2">
+          <Input
+            className="w-24"
+            placeholder="5m"
+            value={entry.window}
+            disabled={disabled}
+            onChange={(e) => updateEntry(index, { window: e.target.value })}
+          />
+          <Input
+            className="w-32"
+            type="number"
+            min={1}
+            value={entry.max}
+            disabled={disabled}
+            onChange={(e) => updateEntry(index, { max: parseInt(e.target.value, 10) || 0 })}
+          />
+          <Button type="button" variant="ghost" size="sm" disabled={disabled} onClick={() => removeEntry(index)}>
+            <Trash2Icon className="h-4 w-4" />
+          </Button>
+        </div>
+      ))}
 
-      {entries.map((entry, index) => {
-        const windowError = getWindowError(entry, index);
-        const maxError = getMaxError(entry);
-
-        return (
-          <div key={index} className="space-y-1">
-            <div className="flex items-center gap-2">
-              <Input
-                className="w-20 shrink-0"
-                placeholder="5m"
-                value={entry.window}
-                disabled={disabled}
-                aria-invalid={Boolean(windowError)}
-                onChange={(e) => updateEntry(index, { window: e.target.value })}
-              />
-              <Input
-                className="flex-1"
-                type="number"
-                min={1}
-                placeholder="100"
-                value={entry.max || ''}
-                disabled={disabled}
-                aria-invalid={Boolean(maxError)}
-                onChange={(e) => updateEntry(index, { max: parseInt(e.target.value, 10) || 0 })}
-              />
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                className="h-9 w-9 shrink-0 p-0 text-muted-foreground hover:text-foreground"
-                disabled={disabled}
-                aria-label={t`Remove rate limit`}
-                onClick={() => removeEntry(index)}
-              >
-                <Trash2Icon className="h-4 w-4" />
-              </Button>
-            </div>
-
-            {windowError ? <p className="text-destructive text-xs">{windowError}</p> : null}
-            {maxError ? <p className="text-destructive text-xs">{maxError}</p> : null}
-          </div>
-        );
-      })}
-
-      <Button
-        type="button"
-        variant="outline"
-        size="sm"
-        className="w-full border-dashed"
-        disabled={isAddDisabled}
-        onClick={addEntry}
-      >
+      <Button type="button" variant="secondary" size="sm" disabled={disabled} onClick={addEntry}>
         <PlusIcon className="mr-2 h-4 w-4" />
-        <Trans>Add rate limit window</Trans>
+        <Trans>Add rate limit</Trans>
       </Button>
     </div>
   );

apps/remix/app/components/general/template/template-page-view-documents-table.tsx

@@ -1,10 +1,9 @@
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { trpc } from '@documenso/trpc/react';
+import { ZFindDocumentsInternalRequestSchema } from '@documenso/trpc/server/document-router/find-documents-internal.types';
 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 { SelectItem } from '@documenso/ui/primitives/select';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
@@ -12,39 +11,33 @@ import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { DocumentSource, DocumentStatus as DocumentStatusEnum } from '@prisma/client';
+import type { DocumentSource } from '@prisma/client';
 import { InfoIcon } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { useMemo } from 'react';
 import { useSearchParams } from 'react-router';
-import { z } from 'zod';
 
-import { SearchParamSelector } from '~/components/forms/search-param-selector';
-import { DocumentSearch } from '~/components/general/document/document-search';
 import { DocumentStatus } from '~/components/general/document/document-status';
 import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
 import { DocumentsTableActionButton } from '~/components/tables/documents-table-action-button';
 import { DocumentsTableActionDropdown } from '~/components/tables/documents-table-action-dropdown';
 import { DataTableTitle } from '~/components/tables/documents-table-title';
+import { TemplateDocumentsTableToolbar } from '~/components/tables/template-documents-table-toolbar';
 import { useCurrentTeam } from '~/providers/team';
 
-import { PeriodSelector } from '../period-selector';
-
 const DOCUMENT_SOURCE_LABELS: { [key in DocumentSource]: MessageDescriptor } = {
   DOCUMENT: msg`Document`,
   TEMPLATE: msg`Template`,
   TEMPLATE_DIRECT_LINK: msg`Direct link`,
 };
 
-const ZDocumentSearchParamsSchema = ZUrlSearchParamsSchema.extend({
-  source: z
-    .nativeEnum(DocumentSource)
-    .optional()
-    .catch(() => undefined),
-  status: z
-    .nativeEnum(DocumentStatusEnum)
-    .optional()
-    .catch(() => undefined),
+const ZDocumentSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
+  page: true,
+  perPage: true,
+  query: true,
+  period: true,
+  status: true,
+  source: true,
 });
 
 type TemplatePageViewDocumentsTableProps = {
@@ -59,9 +52,14 @@ export const TemplatePageViewDocumentsTable = ({ templateId }: TemplatePageViewD
 
   const team = useCurrentTeam();
 
-  const parsedSearchParams = ZDocumentSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
+  const searchParamsString = searchParams.toString();
 
-  const { data, isLoading, isLoadingError } = trpc.document.find.useQuery(
+  const parsedSearchParams = useMemo(
+    () => ZDocumentSearchParamsSchema.parse(Object.fromEntries(searchParams)),
+    [searchParamsString],
+  );
+
+  const { data, isLoading, isLoadingError } = trpc.document.findDocumentsInternal.useQuery(
     {
       templateId,
       page: parsedSearchParams.page,
@@ -69,6 +67,7 @@ export const TemplatePageViewDocumentsTable = ({ templateId }: TemplatePageViewD
       query: parsedSearchParams.query,
       source: parsedSearchParams.source,
       status: parsedSearchParams.status,
+      period: parsedSearchParams.period,
     },
     {
       placeholderData: (previousData) => previousData,
@@ -166,48 +165,11 @@ export const TemplatePageViewDocumentsTable = ({ templateId }: TemplatePageViewD
         ),
       },
     ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
-  }, []);
+  }, [_, i18n, team?.url]);
 
   return (
-    <div>
-      <div className="mb-4 flex flex-row space-x-4">
-        <DocumentSearch />
-
-        <SearchParamSelector
-          paramKey="status"
-          isValueValid={(value) => [...DocumentStatusEnum.COMPLETED].includes(value as unknown as string)}
-        >
-          <SelectItem value="all">
-            <Trans>Any Status</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.COMPLETED}>
-            <Trans>Completed</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.PENDING}>
-            <Trans>Pending</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.DRAFT}>
-            <Trans>Draft</Trans>
-          </SelectItem>
-        </SearchParamSelector>
-
-        <SearchParamSelector
-          paramKey="source"
-          isValueValid={(value) => [...DocumentSource.TEMPLATE].includes(value as unknown as string)}
-        >
-          <SelectItem value="all">
-            <Trans>Any Source</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentSource.TEMPLATE}>
-            <Trans>Template</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentSource.TEMPLATE_DIRECT_LINK}>
-            <Trans>Direct Link</Trans>
-          </SelectItem>
-        </SearchParamSelector>
-
-        <PeriodSelector />
-      </div>
+    <div className="space-y-4">
+      <TemplateDocumentsTableToolbar />
 
       <DataTable
         columns={columns}

apps/remix/app/components/general/use-admin-search-categories.ts

@@ -1,144 +0,0 @@
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION, SKIP_QUERY_BATCH_META } from '@documenso/lib/constants/trpc';
-import { isAdmin } from '@documenso/lib/utils/is-admin';
-import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import type { TAdminSearchResultType } from '@documenso/trpc/server/admin-router/admin-search.types';
-import { ADMIN_SEARCH_MAX_QUERY_LENGTH } from '@documenso/trpc/server/admin-router/admin-search.types';
-
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { keepPreviousData } from '@tanstack/react-query';
-import type { LucideIcon } from 'lucide-react';
-import { ArrowRightIcon, Building2Icon, CreditCardIcon, FileTextIcon, UserIcon, UsersIcon } from 'lucide-react';
-import { useMemo } from 'react';
-import type { PromptCategory, PromptItem } from './app-command-menu.types';
-
-/**
- * The maximum number of results the admin search returns per resource type.
- */
-const ADMIN_SEARCH_RESULTS_CAP = 5;
-
-const ADMIN_GROUP_LABELS: Record<TAdminSearchResultType, MessageDescriptor> = {
-  document: msg`Documents`,
-  user: msg`Users`,
-  organisation: msg`Organisations`,
-  team: msg`Teams`,
-  recipient: msg`Recipients`,
-  subscription: msg`Subscriptions`,
-};
-
-const ADMIN_GROUP_ICONS: Record<TAdminSearchResultType, LucideIcon> = {
-  document: FileTextIcon,
-  user: UserIcon,
-  organisation: Building2Icon,
-  team: UsersIcon,
-  recipient: UserIcon,
-  subscription: CreditCardIcon,
-};
-
-/**
- * Admin list pages which support prefilling their search from the URL, used
- * for the "View all results" links on capped groups. Teams, recipients and
- * subscriptions have no admin list pages.
- */
-const ADMIN_GROUP_LIST_PATHS: Partial<Record<TAdminSearchResultType, (_query: string) => string>> = {
-  document: (query) => `/admin/documents?term=${encodeURIComponent(query)}`,
-  user: (query) => `/admin/users?search=${encodeURIComponent(query)}`,
-  organisation: (query) => `/admin/organisations?query=${encodeURIComponent(query)}`,
-};
-
-export type UseAdminSearchCategoriesOptions = {
-  /**
-   * The trimmed, debounced search query.
-   */
-  query: string;
-  open: boolean;
-};
-
-/**
- * The isolated admin portion of the command prompt: searches every admin
- * resource and maps the results to prompt categories marked as global.
- *
- * Returns no categories and never queries for non admin users. The admin
- * search endpoint is additionally guarded server side by the admin procedure.
- */
-export const useAdminSearchCategories = ({ query, open }: UseAdminSearchCategoriesOptions) => {
-  const { user } = useSession();
-
-  const isUserAdmin = isAdmin(user);
-
-  // Admin searches hit every resource table, so require a longer query unless
-  // it is a number, which could be a resource ID of any length. Queries over
-  // the endpoint's length limit are skipped entirely instead of being sent
-  // and rejected.
-  const hasValidAdminSearch =
-    isUserAdmin && query.length <= ADMIN_SEARCH_MAX_QUERY_LENGTH && (query.length > 3 || /^\d+$/.test(query));
-
-  const {
-    data: adminSearchData,
-    isFetching,
-    isError,
-  } = trpcReact.admin.search.useQuery(
-    {
-      query,
-    },
-    {
-      enabled: open && hasValidAdminSearch,
-      placeholderData: keepPreviousData,
-      // Retyping is the retry in a search-as-you-type flow: fail fast so the
-      // prompt can surface an honest error state instead of retrying.
-      retry: false,
-      ...SKIP_QUERY_BATCH_META,
-      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    },
-  );
-
-  const categories = useMemo((): PromptCategory[] => {
-    if (!hasValidAdminSearch || !adminSearchData) {
-      return [];
-    }
-
-    return adminSearchData.groups.map((group) => {
-      const isCapped = group.results.length >= ADMIN_SEARCH_RESULTS_CAP;
-      const buildListPath = ADMIN_GROUP_LIST_PATHS[group.type];
-
-      const items: PromptItem[] = group.results.map((result) => ({
-        id: `admin-${group.type}-${result.value}`,
-        label: result.label,
-        sublabel: result.sublabel,
-        path: result.path,
-        icon: ADMIN_GROUP_ICONS[group.type],
-        initials: group.type === 'user' || group.type === 'recipient' ? extractInitials(result.label) : undefined,
-      }));
-
-      // Capped groups link to the full admin list page with the search
-      // prefilled so the cap is never a dead end.
-      if (isCapped && buildListPath) {
-        items.push({
-          id: `admin-${group.type}-view-all`,
-          label: msg`View all results`,
-          path: buildListPath(query),
-          icon: ArrowRightIcon,
-        });
-      }
-
-      return {
-        id: `admin-${group.type}`,
-        label: ADMIN_GROUP_LABELS[group.type],
-        items,
-        count: group.results.length,
-        chipCount: group.results.length,
-        isCapped,
-        isGlobal: true,
-      };
-    });
-  }, [hasValidAdminSearch, adminSearchData, query]);
-
-  return {
-    isUserAdmin,
-    categories,
-    isFetching,
-    isError,
-  };
-};

apps/remix/app/components/tables/documents-table-sender-filter.tsx

@@ -1,63 +0,0 @@
-import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
-import { trpc } from '@documenso/trpc/react';
-import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
-import { msg } from '@lingui/core/macro';
-import { Trans } from '@lingui/react/macro';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
-
-type DocumentsTableSenderFilterProps = {
-  teamId: number;
-};
-
-export const DocumentsTableSenderFilter = ({ teamId }: DocumentsTableSenderFilterProps) => {
-  const { pathname } = useLocation();
-  const [searchParams] = useSearchParams();
-  const navigate = useNavigate();
-
-  const isMounted = useIsMounted();
-
-  const senderIds = (searchParams?.get('senderIds') ?? '').split(',').filter((value) => value !== '');
-
-  const { data, isLoading } = trpc.team.member.getMany.useQuery({
-    teamId,
-  });
-
-  const comboBoxOptions = (data ?? []).map((member) => ({
-    label: member.name ?? member.email,
-    value: member.userId.toString(),
-  }));
-
-  const onChange = (newSenderIds: string[]) => {
-    if (!pathname) {
-      return;
-    }
-
-    const params = new URLSearchParams(searchParams?.toString());
-
-    params.set('senderIds', newSenderIds.join(','));
-
-    if (newSenderIds.length === 0) {
-      params.delete('senderIds');
-    }
-
-    void navigate(`${pathname}?${params.toString()}`, { preventScrollReset: true });
-  };
-
-  return (
-    <MultiSelectCombobox
-      emptySelectionPlaceholder={
-        <p className="font-normal text-muted-foreground">
-          <Trans>
-            <span className="text-muted-foreground/70">Sender:</span> All
-          </Trans>
-        </p>
-      }
-      enableClearAllButton={true}
-      inputPlaceholder={msg`Search`}
-      loading={!isMounted || isLoading}
-      options={comboBoxOptions}
-      selectedValues={senderIds}
-      onChange={onChange}
-    />
-  );
-};

apps/remix/app/components/tables/documents-table-toolbar.tsx

@@ -0,0 +1,196 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { XIcon } from 'lucide-react';
+import { useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { parseToStringArray, toCommaSeparatedSearchParam } from '@documenso/lib/utils/params';
+import { trpc } from '@documenso/trpc/react';
+import type { TFindDocumentsInternalResponse } from '@documenso/trpc/server/document-router/find-documents-internal.types';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableFacetedFilterOption } from '@documenso/ui/primitives/data-table-faceted-filter';
+import { DataTableFacetedFilter } from '@documenso/ui/primitives/data-table-faceted-filter';
+import { Input } from '@documenso/ui/primitives/input';
+
+import { PERIOD_OPTIONS } from './table-toolbar.constants';
+
+type DocumentsTableToolbarProps = {
+  teamId?: number;
+  statusOptions: DataTableFacetedFilterOption[];
+  statusCounts: TFindDocumentsInternalResponse['stats'];
+};
+
+export const DocumentsTableToolbar = ({
+  teamId,
+  statusOptions,
+  statusCounts,
+}: DocumentsTableToolbarProps) => {
+  const { _ } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const query = searchParams.get('query') ?? '';
+  const period = searchParams.get('period') ?? '';
+  const statusParam = searchParams.get('status');
+  const senderIdsParam = searchParams.get('senderIds');
+
+  const selectedStatusValues = useMemo(() => parseToStringArray(statusParam), [statusParam]);
+  const selectedSenderValues = useMemo(() => parseToStringArray(senderIdsParam), [senderIdsParam]);
+
+  const [searchTerm, setSearchTerm] = useState(query);
+  const debouncedSearchTerm = useDebouncedValue(searchTerm, 500);
+
+  useEffect(() => {
+    setSearchTerm(query);
+  }, [query]);
+
+  useEffect(() => {
+    if (debouncedSearchTerm !== searchTerm) {
+      return;
+    }
+
+    if (debouncedSearchTerm === query) {
+      return;
+    }
+
+    updateSearchParams(
+      { query: debouncedSearchTerm || undefined, page: undefined },
+      { replace: true },
+    );
+  }, [debouncedSearchTerm, query, searchTerm, updateSearchParams]);
+
+  const { data: members } = trpc.team.member.getMany.useQuery(
+    {
+      teamId: teamId ?? 0,
+    },
+    {
+      enabled: teamId !== undefined,
+    },
+  );
+
+  const senderOptions = useMemo(() => {
+    return (members ?? []).map((member) => ({
+      label: member.name ?? member.email,
+      value: member.userId.toString(),
+    }));
+  }, [members]);
+
+  const periodOptions = useMemo<DataTableFacetedFilterOption[]>(() => {
+    return PERIOD_OPTIONS.map((option) => ({
+      label: _(option.label),
+      value: option.value,
+    }));
+  }, [_]);
+
+  const hasActiveFilters =
+    query.length > 0 ||
+    selectedStatusValues.length > 0 ||
+    selectedSenderValues.length > 0 ||
+    (period.length > 0 && period !== 'all');
+
+  const onResetFilters = () => {
+    setSearchTerm('');
+
+    updateSearchParams({
+      query: undefined,
+      status: undefined,
+      senderIds: undefined,
+      period: undefined,
+      page: undefined,
+    });
+  };
+
+  return (
+    <div className="flex flex-wrap items-center gap-2">
+      <div className="relative min-w-[286px] max-w-[494px]">
+        <Input
+          type="text"
+          value={searchTerm}
+          onChange={(event) => setSearchTerm(event.target.value)}
+          placeholder={_(msg`Search documents...`)}
+          className="h-9 w-full pe-9"
+        />
+
+        {searchTerm.length > 0 && (
+          <button
+            type="button"
+            aria-label={_(msg`Clear search`)}
+            className="absolute inset-y-0 end-0 flex w-9 items-center justify-center text-muted-foreground hover:text-foreground"
+            onClick={() => {
+              setSearchTerm('');
+              updateSearchParams({ query: undefined, page: undefined }, { replace: true });
+            }}
+          >
+            <XIcon className="h-4 w-4" />
+          </button>
+        )}
+      </div>
+
+      <DataTableFacetedFilter
+        title={_(msg`Status`)}
+        options={statusOptions}
+        selectedValues={selectedStatusValues}
+        counts={statusCounts}
+        showSearch={false}
+        onSelectedValuesChange={(values) => {
+          updateSearchParams(
+            {
+              status: toCommaSeparatedSearchParam(values),
+              page: undefined,
+            },
+            { replace: true },
+          );
+        }}
+      />
+
+      {teamId !== undefined && (
+        <DataTableFacetedFilter
+          title={_(msg`Sender`)}
+          options={senderOptions}
+          selectedValues={selectedSenderValues}
+          showSearch
+          onSelectedValuesChange={(values) => {
+            updateSearchParams(
+              {
+                senderIds: toCommaSeparatedSearchParam(values),
+                page: undefined,
+              },
+              { replace: true },
+            );
+          }}
+        />
+      )}
+
+      <DataTableFacetedFilter
+        title={_(msg`Time`)}
+        options={periodOptions}
+        selectedValues={period ? [period] : []}
+        singleSelect
+        showSearch={false}
+        onSelectedValuesChange={(values) => {
+          const nextPeriod = values[0];
+
+          updateSearchParams(
+            {
+              period: nextPeriod ?? undefined,
+              page: undefined,
+            },
+            { replace: true },
+          );
+        }}
+      />
+
+      {hasActiveFilters && (
+        <Button variant="ghost" size="sm" onClick={onResetFilters}>
+          <Trans>Reset</Trans>
+          <XIcon className="ml-2 h-4 w-4" />
+        </Button>
+      )}
+    </div>
+  );
+};

apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx

@@ -1,4 +1,3 @@
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -30,7 +29,7 @@ export type SettingsSecurityPasskeyTableActionsProps = {
 };
 
 const ZUpdatePasskeySchema = z.object({
-  name: ZNameSchema,
+  name: z.string(),
 });
 
 type TUpdatePasskeySchema = z.infer<typeof ZUpdatePasskeySchema>;

apps/remix/app/components/tables/table-toolbar.constants.ts

@@ -0,0 +1,21 @@
+import type { MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+
+export const PERIOD_OPTIONS: Array<{ label: MessageDescriptor; value: string }> = [
+  {
+    label: msg`All Time`,
+    value: 'all',
+  },
+  {
+    label: msg`Last 7 days`,
+    value: '7d',
+  },
+  {
+    label: msg`Last 14 days`,
+    value: '14d',
+  },
+  {
+    label: msg`Last 30 days`,
+    value: '30d',
+  },
+];

apps/remix/app/components/tables/template-documents-table-toolbar.tsx

@@ -0,0 +1,206 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { DocumentSource, DocumentStatus as DocumentStatusEnum } from '@prisma/client';
+import { CheckCircle2, Clock, File, FileText, LinkIcon, XIcon } from 'lucide-react';
+import { useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { parseToStringArray, toCommaSeparatedSearchParam } from '@documenso/lib/utils/params';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableFacetedFilterOption } from '@documenso/ui/primitives/data-table-faceted-filter';
+import { DataTableFacetedFilter } from '@documenso/ui/primitives/data-table-faceted-filter';
+import { Input } from '@documenso/ui/primitives/input';
+
+import { PERIOD_OPTIONS } from './table-toolbar.constants';
+
+export const TemplateDocumentsTableToolbar = () => {
+  const { _ } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams({ preventScrollReset: true });
+
+  const query = searchParams.get('query') ?? '';
+  const period = searchParams.get('period') ?? '';
+  const statusParam = searchParams.get('status');
+  const sourceParam = searchParams.get('source');
+
+  const selectedStatusValues = useMemo(() => parseToStringArray(statusParam), [statusParam]);
+  const selectedSourceValues = useMemo(() => parseToStringArray(sourceParam), [sourceParam]);
+
+  const [searchTerm, setSearchTerm] = useState(query);
+  const debouncedSearchTerm = useDebouncedValue(searchTerm, 500);
+
+  useEffect(() => {
+    setSearchTerm(query);
+  }, [query]);
+
+  useEffect(() => {
+    if (debouncedSearchTerm !== searchTerm) {
+      return;
+    }
+
+    if (debouncedSearchTerm === query) {
+      return;
+    }
+
+    updateSearchParams(
+      { query: debouncedSearchTerm || undefined, page: undefined },
+      { replace: true },
+    );
+  }, [debouncedSearchTerm, query, searchTerm, updateSearchParams]);
+
+  const statusOptions = useMemo<DataTableFacetedFilterOption[]>(
+    () => [
+      {
+        label: _(msg`Completed`),
+        value: DocumentStatusEnum.COMPLETED,
+        icon: CheckCircle2,
+        iconClassName: 'text-green-500 dark:text-green-300',
+      },
+      {
+        label: _(msg`Pending`),
+        value: DocumentStatusEnum.PENDING,
+        icon: Clock,
+        iconClassName: 'text-blue-600 dark:text-blue-300',
+      },
+      {
+        label: _(msg`Draft`),
+        value: DocumentStatusEnum.DRAFT,
+        icon: File,
+        iconClassName: 'text-yellow-500 dark:text-yellow-200',
+      },
+    ],
+    [_],
+  );
+
+  const sourceOptions = useMemo<DataTableFacetedFilterOption[]>(
+    () => [
+      {
+        label: _(msg`Template`),
+        value: DocumentSource.TEMPLATE,
+        icon: FileText,
+      },
+      {
+        label: _(msg`Direct Link`),
+        value: DocumentSource.TEMPLATE_DIRECT_LINK,
+        icon: LinkIcon,
+      },
+    ],
+    [_],
+  );
+
+  const periodOptions = useMemo<DataTableFacetedFilterOption[]>(() => {
+    return PERIOD_OPTIONS.map((option) => ({
+      label: _(option.label),
+      value: option.value,
+    }));
+  }, [_]);
+
+  const hasActiveFilters =
+    query.length > 0 ||
+    selectedStatusValues.length > 0 ||
+    selectedSourceValues.length > 0 ||
+    (period.length > 0 && period !== 'all');
+
+  const onResetFilters = () => {
+    setSearchTerm('');
+
+    updateSearchParams({
+      query: undefined,
+      status: undefined,
+      source: undefined,
+      period: undefined,
+      page: undefined,
+    });
+  };
+
+  return (
+    <div className="flex flex-wrap items-center gap-2">
+      <div className="relative min-w-[286px] max-w-[494px]">
+        <Input
+          type="text"
+          value={searchTerm}
+          onChange={(event) => setSearchTerm(event.target.value)}
+          placeholder={_(msg`Search documents...`)}
+          className="h-9 w-full pe-9"
+        />
+
+        {searchTerm.length > 0 && (
+          <button
+            type="button"
+            aria-label={_(msg`Clear search`)}
+            className="absolute inset-y-0 end-0 flex w-9 items-center justify-center text-muted-foreground hover:text-foreground"
+            onClick={() => {
+              setSearchTerm('');
+              updateSearchParams({ query: undefined, page: undefined }, { replace: true });
+            }}
+          >
+            <XIcon className="h-4 w-4" />
+          </button>
+        )}
+      </div>
+
+      <DataTableFacetedFilter
+        title={_(msg`Status`)}
+        options={statusOptions}
+        selectedValues={selectedStatusValues}
+        showSearch={false}
+        onSelectedValuesChange={(values) => {
+          updateSearchParams(
+            {
+              status: toCommaSeparatedSearchParam(values),
+              page: undefined,
+            },
+            { replace: true },
+          );
+        }}
+      />
+
+      <DataTableFacetedFilter
+        title={_(msg`Source`)}
+        options={sourceOptions}
+        selectedValues={selectedSourceValues}
+        showSearch={false}
+        onSelectedValuesChange={(values) => {
+          updateSearchParams(
+            {
+              source: toCommaSeparatedSearchParam(values),
+              page: undefined,
+            },
+            { replace: true },
+          );
+        }}
+      />
+
+      <DataTableFacetedFilter
+        title={_(msg`Time`)}
+        options={periodOptions}
+        selectedValues={period ? [period] : []}
+        singleSelect
+        showSearch={false}
+        onSelectedValuesChange={(values) => {
+          const nextPeriod = values[0];
+
+          updateSearchParams(
+            {
+              period: nextPeriod ?? undefined,
+              page: undefined,
+            },
+            { replace: true },
+          );
+        }}
+      />
+
+      {hasActiveFilters && (
+        <Button variant="ghost" size="sm" onClick={onResetFilters}>
+          <Trans>Reset</Trans>
+          <XIcon className="ml-2 h-4 w-4" />
+        </Button>
+      )}
+    </div>
+  );
+};

apps/remix/app/components/tables/templates-table-toolbar.tsx

@@ -0,0 +1,131 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { TemplateType } from '@prisma/client';
+import { Globe2Icon, LockIcon, XIcon } from 'lucide-react';
+import { useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { parseToStringArray, toCommaSeparatedSearchParam } from '@documenso/lib/utils/params';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableFacetedFilterOption } from '@documenso/ui/primitives/data-table-faceted-filter';
+import { DataTableFacetedFilter } from '@documenso/ui/primitives/data-table-faceted-filter';
+import { Input } from '@documenso/ui/primitives/input';
+
+export const TemplatesTableToolbar = () => {
+  const { _ } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const query = searchParams.get('query') ?? '';
+  const typeParam = searchParams.get('type');
+
+  const selectedTypeValues = useMemo(() => parseToStringArray(typeParam), [typeParam]);
+
+  const [searchTerm, setSearchTerm] = useState(query);
+  const debouncedSearchTerm = useDebouncedValue(searchTerm, 500);
+
+  useEffect(() => {
+    setSearchTerm(query);
+  }, [query]);
+
+  useEffect(() => {
+    if (debouncedSearchTerm !== searchTerm) {
+      return;
+    }
+
+    if (debouncedSearchTerm === query) {
+      return;
+    }
+
+    updateSearchParams(
+      { query: debouncedSearchTerm || undefined, page: undefined },
+      { replace: true },
+    );
+  }, [debouncedSearchTerm, query, searchTerm, updateSearchParams]);
+
+  const typeOptions = useMemo<DataTableFacetedFilterOption[]>(
+    () => [
+      {
+        label: _(msg`Public`),
+        value: TemplateType.PUBLIC,
+        icon: Globe2Icon,
+        iconClassName: 'text-green-500 dark:text-green-300',
+      },
+      {
+        label: _(msg`Private`),
+        value: TemplateType.PRIVATE,
+        icon: LockIcon,
+        iconClassName: 'text-blue-600 dark:text-blue-300',
+      },
+    ],
+    [_],
+  );
+
+  const hasActiveFilters = query.length > 0 || selectedTypeValues.length > 0;
+
+  const onResetFilters = () => {
+    setSearchTerm('');
+
+    updateSearchParams({
+      query: undefined,
+      type: undefined,
+      page: undefined,
+    });
+  };
+
+  return (
+    <div className="flex flex-wrap items-center gap-2">
+      <div className="relative min-w-[286px] max-w-[494px]">
+        <Input
+          type="text"
+          value={searchTerm}
+          onChange={(event) => setSearchTerm(event.target.value)}
+          placeholder={_(msg`Search templates...`)}
+          className="h-9 w-full pe-9"
+        />
+
+        {searchTerm.length > 0 && (
+          <button
+            type="button"
+            aria-label={_(msg`Clear search`)}
+            className="absolute inset-y-0 end-0 flex w-9 items-center justify-center text-muted-foreground hover:text-foreground"
+            onClick={() => {
+              setSearchTerm('');
+              updateSearchParams({ query: undefined, page: undefined }, { replace: true });
+            }}
+          >
+            <XIcon className="h-4 w-4" />
+          </button>
+        )}
+      </div>
+
+      <DataTableFacetedFilter
+        title={_(msg`Type`)}
+        options={typeOptions}
+        selectedValues={selectedTypeValues}
+        showSearch={false}
+        onSelectedValuesChange={(values) => {
+          updateSearchParams(
+            {
+              type: toCommaSeparatedSearchParam(values),
+              page: undefined,
+            },
+            { replace: true },
+          );
+        }}
+      />
+
+      {hasActiveFilters && (
+        <Button variant="ghost" size="sm" onClick={onResetFilters}>
+          <Trans>Reset</Trans>
+          <XIcon className="ml-2 h-4 w-4" />
+        </Button>
+      )}
+    </div>
+  );
+};

apps/remix/app/entry.client.tsx

@@ -3,32 +3,27 @@ import { dynamicActivate } from '@documenso/lib/utils/i18n';
 import { i18n } from '@lingui/core';
 import { detect, fromHtmlTag } from '@lingui/detect-locale';
 import { I18nProvider } from '@lingui/react';
-import { StrictMode, startTransition } from 'react';
+import { StrictMode, startTransition, useEffect } from 'react';
 import { hydrateRoot } from 'react-dom/client';
 import { HydratedRouter } from 'react-router/dom';
 
 import './utils/polyfills/promise-with-resolvers';
 
-/**
- * Initialised imperatively (not as a component inside `hydrateRoot`) because
- * rendering extra client-only siblings changes the React tree structure
- * relative to the server render in `entry.server.tsx`. That shifts every
- * `useId` value (used by Radix for `id`/`htmlFor`/`aria-*`), causing hydration
- * mismatches which can abort hydration entirely when the user interacts with
- * the page early, leaving dead event handlers (broken dropdowns, native form
- * submits).
- */
-function initPosthog() {
+function PosthogInit() {
   const postHogConfig = extractPostHogConfig();
 
-  if (postHogConfig) {
-    void import('posthog-js').then(({ default: posthog }) => {
-      posthog.init(postHogConfig.key, {
-        api_host: postHogConfig.host,
-        capture_exceptions: true,
+  useEffect(() => {
+    if (postHogConfig) {
+      void import('posthog-js').then(({ default: posthog }) => {
+        posthog.init(postHogConfig.key, {
+          api_host: postHogConfig.host,
+          capture_exceptions: true,
+        });
       });
-    });
-  }
+    }
+  }, []);
+
+  return null;
 }
 
 async function main() {
@@ -43,11 +38,11 @@ async function main() {
         <I18nProvider i18n={i18n}>
           <HydratedRouter />
         </I18nProvider>
+
+        <PosthogInit />
       </StrictMode>,
     );
   });
-
-  void initPosthog();
 }
 
 // eslint-disable-next-line @typescript-eslint/no-floating-promises

apps/remix/app/root.tsx

@@ -119,11 +119,7 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {
   const isRecipientRoute = matches.some((m) => m.id?.startsWith('routes/_recipient+'));
 
   return (
-    // `suppressHydrationWarning` because `remix-themes` intentionally mutates
-    // `data-theme`/`class` on <html> before hydration (PreventFlashOnWrongTheme),
-    // so the server-rendered attributes never match the client render when the
-    // theme is resolved from the system preference. Attribute-only, one level deep.
-    <html translate="no" lang={lang} data-theme={theme} className={theme ?? ''} suppressHydrationWarning>
+    <html translate="no" lang={lang} data-theme={theme} className={theme ?? ''}>
       <head>
         <meta charSet="utf-8" />
         <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
@@ -177,11 +173,7 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {
         <script
           nonce={nonce(cspNonce)}
           dangerouslySetInnerHTML={{
-            // `__webpack_nonce__` is read by `get-nonce` (used by
-            // react-remove-scroll / react-style-singleton inside Radix menus and
-            // dialogs) to stamp runtime-injected <style> elements. Without it the
-            // strict `style-src-elem` CSP blocks the scroll-lock styles.
-            __html: `window.__ENV__ = ${JSON.stringify(publicEnv)}; window.__webpack_nonce__ = ${JSON.stringify(cspNonce ?? '')}`,
+            __html: `window.__ENV__ = ${JSON.stringify(publicEnv)}`,
           }}
         />
 

apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx

@@ -8,7 +8,6 @@ import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisa
 import { trpc } from '@documenso/trpc/react';
 import type { TGetAdminOrganisationResponse } from '@documenso/trpc/server/admin-router/get-admin-organisation.types';
 import { ZUpdateAdminOrganisationRequestSchema } from '@documenso/trpc/server/admin-router/update-admin-organisation.types';
-import { cn } from '@documenso/ui/lib/utils';
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@documenso/ui/primitives/accordion';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Badge } from '@documenso/ui/primitives/badge';
@@ -31,7 +30,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
-import { OrganisationMemberRole, SubscriptionStatus } from '@prisma/client';
+import { OrganisationMemberRole } from '@prisma/client';
 import { ExternalLinkIcon, InfoIcon, Loader } from 'lucide-react';
 import { useMemo } from 'react';
 import { useForm } from 'react-hook-form';
@@ -43,6 +42,7 @@ import { AdminOrganisationDeleteDialog } from '~/components/dialogs/admin-organi
 import { AdminOrganisationMemberDeleteDialog } from '~/components/dialogs/admin-organisation-member-delete-dialog';
 import { AdminOrganisationMemberUpdateDialog } from '~/components/dialogs/admin-organisation-member-update-dialog';
 import { AdminOrganisationSyncSubscriptionDialog } from '~/components/dialogs/admin-organisation-sync-subscription-dialog';
+import { DetailsCard, DetailsValue } from '~/components/general/admin-details';
 import { AdminGlobalSettingsSection } from '~/components/general/admin-global-settings-section';
 import { ClaimLimitFields } from '~/components/general/claim-limit-fields';
 import { GenericErrorLayout } from '~/components/general/generic-error-layout';
@@ -268,32 +268,54 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
 
       <GenericOrganisationAdminForm organisation={organisation} />
 
-      <SettingsHeader
-        title={t`Organisation usage`}
-        subtitle={t`Current usage against organisation limits.`}
-        className="mt-6"
-        hideDivider
-      />
+      <div className="mt-6 rounded-lg border p-4">
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+          <div>
+            <p className="font-medium text-sm">
+              <Trans>Organisation usage</Trans>
+            </p>
+            <p className="mt-1 text-muted-foreground text-sm">
+              <Trans>Current usage against organisation limits.</Trans>
+            </p>
+          </div>
+        </div>
 
-      <OrganisationUsagePanel
-        organisationId={organisation.id}
-        monthlyStats={organisation.monthlyStats}
-        organisationClaim={organisation.organisationClaim}
-        capacityUsage={{
-          members: organisation.members.length,
-          teams: organisation.teams.length,
-        }}
-      />
+        <div className="mt-4 grid grid-cols-1 gap-3 text-sm sm:grid-cols-2">
+          <DetailsCard label={<Trans>Members</Trans>}>
+            <DetailsValue>
+              {organisation.members.length} /{' '}
+              {organisation.organisationClaim.memberCount === 0
+                ? t`Unlimited`
+                : organisation.organisationClaim.memberCount}
+            </DetailsValue>
+          </DetailsCard>
+
+          <DetailsCard label={<Trans>Teams</Trans>}>
+            <DetailsValue>
+              {organisation.teams.length} /{' '}
+              {organisation.organisationClaim.teamCount === 0 ? t`Unlimited` : organisation.organisationClaim.teamCount}
+            </DetailsValue>
+          </DetailsCard>
+        </div>
+
+        <div className="mt-4">
+          <OrganisationUsagePanel
+            organisationId={organisation.id}
+            monthlyStats={organisation.monthlyStats}
+            organisationClaim={organisation.organisationClaim}
+          />
+        </div>
+      </div>
 
       <div className="mt-6 rounded-lg border p-4">
         <Accordion type="single" collapsible>
           <AccordionItem value="global-settings" className="border-b-0">
             <AccordionTrigger className="py-0">
               <div className="text-left">
-                <p className="font-semibold text-base">
+                <p className="font-medium text-sm">
                   <Trans>Global Settings</Trans>
                 </p>
-                <p className="mt-1 text-muted-foreground text-sm">
+                <p className="mt-1 font-normal text-muted-foreground text-sm">
                   <Trans>Default settings applied to this organisation.</Trans>
                 </p>
               </div>
@@ -313,15 +335,7 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
         className="mt-16"
       />
 
-      <Alert
-        className={cn(
-          'my-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center',
-          organisation.subscription?.status === SubscriptionStatus.ACTIVE &&
-            'border border-green-600/20 bg-green-50 dark:border-green-500/20 dark:bg-green-500/10',
-          organisation.subscription?.status === SubscriptionStatus.INACTIVE && 'opacity-60',
-        )}
-        variant="neutral"
-      >
+      <Alert className="my-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center" variant="neutral">
         <div className="mb-4 sm:mb-0">
           <AlertTitle>
             <Trans>Subscription</Trans>
@@ -329,12 +343,7 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
 
           <AlertDescription className="mr-2">
             {organisation.subscription ? (
-              <span className="flex items-center gap-2">
-                {organisation.subscription.status === SubscriptionStatus.ACTIVE && (
-                  <span className="h-2 w-2 shrink-0 rounded-full bg-green-600 dark:bg-green-400" aria-hidden="true" />
-                )}
-                <span>{i18n._(SUBSCRIPTION_STATUS_MAP[organisation.subscription.status])} subscription found</span>
-              </span>
+              <span>{i18n._(SUBSCRIPTION_STATUS_MAP[organisation.subscription.status])} subscription found</span>
             ) : (
               <span>
                 <Trans>No subscription found</Trans>
@@ -347,7 +356,6 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
           <div>
             <Button
               variant="outline"
-              className="bg-background"
               loading={isCreatingStripeCustomer}
               onClick={async () => createStripeCustomer({ organisationId })}
             >
@@ -358,7 +366,7 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
 
         {organisation.customerId && !organisation.subscription && (
           <div>
-            <Button variant="outline" className="bg-background" asChild>
+            <Button variant="outline" asChild>
               <Link
                 target="_blank"
                 to={`https://dashboard.stripe.com/customers/${organisation.customerId}?create=subscription&subscription_default_customer=${organisation.customerId}`}
@@ -375,13 +383,13 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
             <AdminOrganisationSyncSubscriptionDialog
               organisationId={organisationId}
               trigger={
-                <Button variant="outline" className="bg-background">
+                <Button variant="outline">
                   <Trans>Sync Stripe subscription</Trans>
                 </Button>
               }
             />
 
-            <Button variant="outline" className="bg-background" asChild>
+            <Button variant="outline" asChild>
               <Link
                 target="_blank"
                 to={`https://dashboard.stripe.com/subscriptions/${organisation.subscription.planId}`}
@@ -398,27 +406,21 @@ export default function OrganisationGroupSettingsPage({ params, loaderData }: Ro
 
       <div className="mt-16 space-y-10">
         <div>
-          <h3 className="font-semibold text-base">
+          <label className="font-medium text-sm leading-none">
             <Trans>Organisation Members</Trans>
-          </h3>
-          <p className="mt-1 text-muted-foreground text-sm">
-            <Trans>People with access to this organisation.</Trans>
-          </p>
+          </label>
 
-          <div className="mt-3">
+          <div className="my-2">
             <DataTable columns={organisationMembersColumns} data={organisation.members} />
           </div>
         </div>
 
         <div>
-          <h3 className="font-semibold text-base">
+          <label className="font-medium text-sm leading-none">
             <Trans>Organisation Teams</Trans>
-          </h3>
-          <p className="mt-1 text-muted-foreground text-sm">
-            <Trans>Teams that belong to this organisation.</Trans>
-          </p>
+          </label>
 
-          <div className="mt-3">
+          <div className="my-2">
             <DataTable columns={teamsColumns} data={organisation.teams} />
           </div>
         </div>
@@ -646,7 +648,7 @@ const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdmin
               <FormLabel className="flex items-center">
                 <Trans>Inherited subscription claim</Trans>
                 <Tooltip>
-                  <TooltipTrigger type="button">
+                  <TooltipTrigger>
                     <InfoIcon className="mx-2 h-4 w-4" />
                   </TooltipTrigger>
 
@@ -679,15 +681,10 @@ const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdmin
                   </TooltipContent>
                 </Tooltip>
               </FormLabel>
-              <div className="rounded-lg border bg-muted/40 px-3 py-2.5 text-sm">
-                {field.value ? (
-                  <span className="font-mono text-foreground">{field.value}</span>
-                ) : (
-                  <span className="text-muted-foreground">
-                    <Trans>No inherited claim</Trans>
-                  </span>
-                )}
-              </div>
+              <FormControl>
+                <Input disabled {...field} />
+              </FormControl>
+              <FormMessage />
             </FormItem>
           )}
         />
@@ -718,113 +715,108 @@ const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdmin
           )}
         />
 
-        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-          <FormField
-            control={form.control}
-            name="claims.teamCount"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <Trans>Team Count</Trans>
-                </FormLabel>
-                <FormControl>
-                  <Input
-                    type="number"
-                    min={0}
-                    {...field}
-                    onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
-                  />
-                </FormControl>
-                <FormDescription>
-                  <Trans>Number of teams allowed. 0 = Unlimited</Trans>
-                </FormDescription>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+        <FormField
+          control={form.control}
+          name="claims.teamCount"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Team Count</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input
+                  type="number"
+                  min={0}
+                  {...field}
+                  onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Number of teams allowed. 0 = Unlimited</Trans>
+              </FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
 
-          <FormField
-            control={form.control}
-            name="claims.memberCount"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <Trans>Member Count</Trans>
-                </FormLabel>
-                <FormControl>
-                  <Input
-                    type="number"
-                    min={0}
-                    {...field}
-                    onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
-                  />
-                </FormControl>
-                <FormDescription>
-                  <Trans>Number of members allowed. 0 = Unlimited</Trans>
-                </FormDescription>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+        <FormField
+          control={form.control}
+          name="claims.memberCount"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Member Count</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input
+                  type="number"
+                  min={0}
+                  {...field}
+                  onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Number of members allowed. 0 = Unlimited</Trans>
+              </FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
 
-          <FormField
-            control={form.control}
-            name="claims.envelopeItemCount"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <Trans>Envelope Item Count</Trans>
-                </FormLabel>
-                <FormControl>
-                  <Input
-                    type="number"
-                    min={1}
-                    {...field}
-                    onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
-                  />
-                </FormControl>
-                <FormDescription>
-                  <Trans>Maximum number of uploaded files per envelope allowed</Trans>
-                </FormDescription>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+        <FormField
+          control={form.control}
+          name="claims.envelopeItemCount"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Envelope Item Count</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input
+                  type="number"
+                  min={1}
+                  {...field}
+                  onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Maximum number of uploaded files per envelope allowed</Trans>
+              </FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
 
-          <FormField
-            control={form.control}
-            name="claims.recipientCount"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <Trans>Recipient Count</Trans>
-                </FormLabel>
-                <FormControl>
-                  <Input
-                    type="number"
-                    min={0}
-                    {...field}
-                    onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
-                  />
-                </FormControl>
-                <FormDescription>
-                  <Trans>Maximum number of recipients per document allowed. 0 = Unlimited</Trans>
-                </FormDescription>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
+        <FormField
+          control={form.control}
+          name="claims.recipientCount"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Recipient Count</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input
+                  type="number"
+                  min={0}
+                  {...field}
+                  onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Maximum number of recipients per document allowed. 0 = Unlimited</Trans>
+              </FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
 
         <div>
-          <h3 className="font-semibold text-base">
+          <FormLabel>
             <Trans>Feature Flags</Trans>
-          </h3>
-          <p className="mt-1 text-muted-foreground text-sm">
-            <Trans>Capabilities enabled for this organisation.</Trans>
-          </p>
+          </FormLabel>
 
-          <div className="mt-3 space-y-2 rounded-md border p-4">
+          <div className="mt-2 space-y-2 rounded-md border p-4">
             {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(({ key, label, isEnterprise }) => {
               const isRestrictedFeature = isEnterprise && !licenseFlags?.[key as keyof TLicenseClaim]; // eslint-disable-line @typescript-eslint/consistent-type-assertions
 

apps/remix/app/routes/_authenticated+/admin+/teams.$id.tsx

@@ -287,11 +287,7 @@ export default function AdminTeamPage({ params }: Route.ComponentProps) {
               </AccordionTrigger>
               <AccordionContent>
                 <div className="mt-4">
-                  <AdminGlobalSettingsSection
-                    settings={team.teamGlobalSettings}
-                    inheritedSettings={team.organisation.organisationGlobalSettings}
-                    isTeam
-                  />
+                  <AdminGlobalSettingsSection settings={team.teamGlobalSettings} isTeam />
                 </div>
               </AccordionContent>
             </AccordionItem>

apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.branding.tsx

@@ -1,6 +1,7 @@
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { canExecuteOrganisationAction, isPersonalLayout } from '@documenso/lib/utils/organisations';
 import type { SanitizeBrandingCssWarning } from '@documenso/lib/utils/sanitize-branding-css';
 import { trpc } from '@documenso/trpc/react';
@@ -48,29 +49,26 @@ export default function OrganisationSettingsBrandingPage() {
 
   const { mutateAsync: updateOrganisationSettings } = trpc.organisation.settings.update.useMutation();
 
-  const { mutateAsync: updateOrganisationBrandingLogo } = trpc.organisation.settings.updateBrandingLogo.useMutation();
-
   const onBrandingPreferencesFormSubmit = async (data: TBrandingPreferencesFormSchema) => {
     try {
       const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails, brandingColors, brandingCss } = data;
 
-      // Upload (or clear) the logo through the dedicated, server-validated route.
-      if (brandingLogo instanceof File || brandingLogo === null) {
-        const formData = new FormData();
+      let uploadedBrandingLogo: string | undefined;
 
-        formData.append('payload', JSON.stringify({ organisationId: organisation.id }));
+      if (brandingLogo) {
+        uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
+      }
 
-        if (brandingLogo instanceof File) {
-          formData.append('brandingLogo', brandingLogo);
-        }
-
-        await updateOrganisationBrandingLogo(formData);
+      // Empty the branding logo if the user unsets it.
+      if (brandingLogo === null) {
+        uploadedBrandingLogo = '';
       }
 
       const result = await updateOrganisationSettings({
         organisationId: organisation.id,
         data: {
           brandingEnabled: brandingEnabled ?? undefined,
+          brandingLogo: uploadedBrandingLogo,
           brandingUrl,
           brandingCompanyDetails,
           brandingColors,

apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.document.tsx

@@ -88,7 +88,7 @@ export default function OrganisationSettingsDocumentPage() {
           typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
           uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
           drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
-          delegateDocumentOwnership,
+          delegateDocumentOwnership: delegateDocumentOwnership,
           aiFeaturesEnabled,
           envelopeExpirationPeriod: envelopeExpirationPeriod ?? undefined,
           reminderSettings: reminderSettings ?? undefined,

apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx

@@ -3,7 +3,6 @@ import { ORGANISATION_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/org
 import { EXTENDED_ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
 import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
 import { AppError } from '@documenso/lib/errors/app-error';
-import { ZNameSchema } from '@documenso/lib/types/name';
 import { trpc } from '@documenso/trpc/react';
 import type { TFindOrganisationGroupsResponse } from '@documenso/trpc/server/organisation-router/find-organisation-groups.types';
 import { Button } from '@documenso/ui/primitives/button';
@@ -29,6 +28,7 @@ import { useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { Link } from 'react-router';
 import { z } from 'zod';
+
 import { OrganisationGroupDeleteDialog } from '~/components/dialogs/organisation-group-delete-dialog';
 import { GenericErrorLayout } from '~/components/general/generic-error-layout';
 import {
@@ -36,6 +36,7 @@ import {
   OrganisationMembersMultiSelectCombobox,
 } from '~/components/general/organisation-members-multiselect-combobox';
 import { SettingsHeader } from '~/components/general/settings-header';
+
 import type { Route } from './+types/o.$orgUrl.settings.groups.$id';
 
 export default function OrganisationGroupSettingsPage({ params }: Route.ComponentProps) {
@@ -112,7 +113,7 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen
 }
 
 const ZUpdateOrganisationGroupFormSchema = z.object({
-  name: ZNameSchema,
+  name: z.string().min(1, msg`Name is required`.id),
   organisationRole: z.nativeEnum(OrganisationMemberRole),
   memberIds: z.array(z.string()),
 });

apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx

@@ -1,6 +1,5 @@
 import { useSessionStorage } from '@documenso/lib/client-only/hooks/use-session-storage';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
-import { STATS_COUNT_CAP } from '@documenso/lib/constants/document';
 import { SKIP_QUERY_BATCH_META } from '@documenso/lib/constants/trpc';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { parseToIntegerArray } from '@documenso/lib/utils/params';
@@ -11,25 +10,24 @@ import type { TFindDocumentsInternalResponse } from '@documenso/trpc/server/docu
 import { ZFindDocumentsInternalRequestSchema } from '@documenso/trpc/server/document-router/find-documents-internal.types';
 import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
 import type { RowSelectionState } from '@documenso/ui/primitives/data-table';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
+import type { DataTableFacetedFilterOption } from '@documenso/ui/primitives/data-table-faceted-filter';
 import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { EnvelopeType, FolderType, OrganisationType } from '@prisma/client';
 import { useEffect, useMemo, useState } from 'react';
-import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
+import { useNavigate, useParams, useSearchParams } from 'react-router';
 import { z } from 'zod';
 
 import { EnvelopesBulkCancelDialog } from '~/components/dialogs/envelopes-bulk-cancel-dialog';
 import { EnvelopesBulkDeleteDialog } from '~/components/dialogs/envelopes-bulk-delete-dialog';
 import { EnvelopesBulkMoveDialog } from '~/components/dialogs/envelopes-bulk-move-dialog';
-import { DocumentSearch } from '~/components/general/document/document-search';
-import { DocumentStatus } from '~/components/general/document/document-status';
+import { FRIENDLY_STATUS_MAP } from '~/components/general/document/document-status';
 import { EnvelopeDropZoneWrapper } from '~/components/general/envelope/envelope-drop-zone-wrapper';
 import { FolderGrid } from '~/components/general/folder/folder-grid';
-import { PeriodSelector } from '~/components/general/period-selector';
 import { DocumentsTable } from '~/components/tables/documents-table';
 import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
-import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
+import { DocumentsTableToolbar } from '~/components/tables/documents-table-toolbar';
 import { EnvelopesTableBulkActionBar } from '~/components/tables/envelopes-table-bulk-action-bar';
 import { useCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
@@ -49,6 +47,8 @@ const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
 });
 
 export default function DocumentsPage() {
+  const { _ } = useLingui();
+
   const organisation = useCurrentOrganisation();
   const team = useCurrentTeam();
 
@@ -95,35 +95,37 @@ export default function DocumentsPage() {
     },
   );
 
-  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
-    const params = new URLSearchParams(searchParams);
+  const statusOptions = useMemo<DataTableFacetedFilterOption[]>(() => {
+    return [
+      ExtendedDocumentStatus.INBOX,
+      ExtendedDocumentStatus.PENDING,
+      ExtendedDocumentStatus.COMPLETED,
+      ExtendedDocumentStatus.CANCELLED,
+      ExtendedDocumentStatus.DRAFT,
+      ExtendedDocumentStatus.REJECTED,
+    ]
+      .filter((status) => {
+        if (organisation.type === OrganisationType.PERSONAL) {
+          return status !== ExtendedDocumentStatus.INBOX;
+        }
 
-    params.set('status', value);
+        return true;
+      })
+      .map((status) => {
+        const { label, icon, color } = FRIENDLY_STATUS_MAP[status];
 
-    if (value === ExtendedDocumentStatus.ALL) {
-      params.delete('status');
-    }
+        return {
+          label: _(label),
+          value: status,
+          icon,
+          iconClassName: color,
+        };
+      });
+  }, [organisation.type, _]);
 
-    if (value === ExtendedDocumentStatus.INBOX && organisation.type === OrganisationType.PERSONAL) {
-      params.delete('status');
-    }
+  const selectedStatuses = findDocumentSearchParams.status ?? [];
 
-    if (params.has('page')) {
-      params.delete('page');
-    }
-
-    let path = formatDocumentsPath(team.url);
-
-    if (folderId) {
-      path += `/f/${folderId}`;
-    }
-
-    if (params.toString()) {
-      path += `?${params.toString()}`;
-    }
-
-    return path;
-  };
+  const selectedStatus = selectedStatuses.length === 1 ? selectedStatuses[0] : ExtendedDocumentStatus.ALL;
 
   useEffect(() => {
     if (data?.stats) {
@@ -147,56 +149,16 @@ export default function DocumentsPage() {
               <Trans>Documents</Trans>
             </h2>
           </div>
+        </div>
 
-          <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
-            <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">
-              <TabsList>
-                {[
-                  ExtendedDocumentStatus.INBOX,
-                  ExtendedDocumentStatus.PENDING,
-                  ExtendedDocumentStatus.COMPLETED,
-                  ExtendedDocumentStatus.CANCELLED,
-                  ExtendedDocumentStatus.DRAFT,
-                  ExtendedDocumentStatus.ALL,
-                ]
-                  .filter((value) => {
-                    if (organisation.type === OrganisationType.PERSONAL) {
-                      return value !== ExtendedDocumentStatus.INBOX;
-                    }
-
-                    return true;
-                  })
-                  .map((value) => (
-                    <TabsTrigger key={value} className="min-w-[60px] hover:text-foreground" value={value} asChild>
-                      <Link to={getTabHref(value)} preventScrollReset>
-                        <DocumentStatus status={value} />
-
-                        {value !== ExtendedDocumentStatus.ALL && (
-                          <span className="ml-1 inline-block opacity-50">
-                            {stats[value] >= STATS_COUNT_CAP ? `${STATS_COUNT_CAP.toLocaleString()}+` : stats[value]}
-                          </span>
-                        )}
-                      </Link>
-                    </TabsTrigger>
-                  ))}
-              </TabsList>
-            </Tabs>
-
-            {team && <DocumentsTableSenderFilter teamId={team.id} />}
-
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <PeriodSelector />
-            </div>
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <DocumentSearch initialValue={findDocumentSearchParams.query} />
-            </div>
-          </div>
+        <div className="mt-8">
+          <DocumentsTableToolbar teamId={team?.id} statusOptions={statusOptions} statusCounts={stats} />
         </div>
 
         <div className="mt-8">
           <div>
             {data && data.count === 0 ? (
-              <DocumentsTableEmptyState status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL} />
+              <DocumentsTableEmptyState status={selectedStatus} />
             ) : (
               <DocumentsTable
                 data={data}

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.branding.tsx

@@ -1,5 +1,6 @@
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
 import type { SanitizeBrandingCssWarning } from '@documenso/lib/utils/sanitize-branding-css';
 import { trpc } from '@documenso/trpc/react';
@@ -37,7 +38,6 @@ export default function TeamsSettingsPage() {
   });
 
   const { mutateAsync: updateTeamSettings } = trpc.team.settings.update.useMutation();
-  const { mutateAsync: updateTeamBrandingLogo } = trpc.team.settings.updateBrandingLogo.useMutation();
 
   const canConfigureBranding = organisation.organisationClaim.flags.allowCustomBranding || !IS_BILLING_ENABLED();
 
@@ -48,23 +48,22 @@ export default function TeamsSettingsPage() {
     try {
       const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails, brandingColors, brandingCss } = data;
 
-      // Upload (or clear) the logo through the dedicated, server-validated route.
-      if (brandingLogo instanceof File || brandingLogo === null) {
-        const formData = new FormData();
+      let uploadedBrandingLogo: string | undefined;
 
-        formData.append('payload', JSON.stringify({ teamId: team.id }));
+      if (brandingLogo) {
+        uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
+      }
 
-        if (brandingLogo instanceof File) {
-          formData.append('brandingLogo', brandingLogo);
-        }
-
-        await updateTeamBrandingLogo(formData);
+      // Empty the branding logo if the user unsets it.
+      if (brandingLogo === null) {
+        uploadedBrandingLogo = '';
       }
 
       const result = await updateTeamSettings({
         teamId: team.id,
         data: {
           brandingEnabled,
+          brandingLogo: uploadedBrandingLogo,
           brandingUrl: brandingUrl || null,
           brandingCompanyDetails: brandingCompanyDetails || null,
           brandingColors,

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.document.tsx

@@ -82,7 +82,7 @@ export default function TeamsSettingsPage() {
                 uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
                 drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
               }),
-          delegateDocumentOwnership,
+          delegateDocumentOwnership: delegateDocumentOwnership,
         },
       });
 

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx

@@ -1,18 +1,14 @@
 import { trpc } from '@documenso/trpc/react';
-import type { TGetApiTokensResponse } from '@documenso/trpc/server/api-token-router/get-api-tokens.types';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Badge } from '@documenso/ui/primitives/badge';
 import { Button } from '@documenso/ui/primitives/button';
-import { DataTable, type DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-import { TableCell } from '@documenso/ui/primitives/table';
 import { msg } from '@lingui/core/macro';
-import { Trans, useLingui } from '@lingui/react/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
 import { TeamMemberRole } from '@prisma/client';
-import { useMemo } from 'react';
+import { DateTime } from 'luxon';
 
-import { TokenCreateDialog } from '~/components/dialogs/token-create-dialog';
 import TokenDeleteDialog from '~/components/dialogs/token-delete-dialog';
+import { ApiTokenForm } from '~/components/forms/token';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { useOptionalCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
@@ -22,88 +18,33 @@ export function meta() {
 }
 
 export default function ApiTokensPage() {
-  const { t, i18n } = useLingui();
+  const { i18n } = useLingui();
+
+  const { data: tokens } = trpc.apiToken.getMany.useQuery();
 
   const team = useOptionalCurrentTeam();
 
-  const isUnauthorized = !!team && team.currentTeamRole !== TeamMemberRole.ADMIN;
-
-  const {
-    data: tokens,
-    isLoading,
-    isError,
-  } = trpc.apiToken.getMany.useQuery(undefined, {
-    enabled: !isUnauthorized,
-  });
-
-  const columns = useMemo(() => {
-    return [
-      {
-        header: t`Name`,
-        cell: ({ row }) => <span className="font-medium text-foreground">{row.original.name}</span>,
-      },
-      {
-        header: t`Created`,
-        cell: ({ row }) => i18n.date(row.original.createdAt),
-      },
-      {
-        header: t`Expires`,
-        cell: ({ row }) => {
-          if (!row.original.expires) {
-            return (
-              <span className="text-muted-foreground">
-                <Trans>Never</Trans>
-              </span>
-            );
-          }
-
-          if (row.original.expires < new Date()) {
-            return (
-              <Badge variant="destructive" size="small">
-                <Trans>Expired</Trans>
-              </Badge>
-            );
-          }
-
-          return i18n.date(row.original.expires);
-        },
-      },
-      {
-        header: t`Actions`,
-        cell: ({ row }) => (
-          <TokenDeleteDialog token={row.original}>
-            <Button variant="destructive">
-              <Trans>Delete</Trans>
-            </Button>
-          </TokenDeleteDialog>
-        ),
-      },
-    ] satisfies DataTableColumnDef<TGetApiTokensResponse[number]>[];
-  }, []);
-
   return (
     <div>
       <SettingsHeader
         title={<Trans>API Tokens</Trans>}
         subtitle={
           <Trans>
-            Create and manage API tokens. See our{' '}
+            On this page, you can create and manage API tokens. See our{' '}
             <a
               className="text-primary underline"
               href={'https://docs.documenso.com/developers/public-api'}
               target="_blank"
               rel="noopener"
             >
-              documentation
+              Documentation
             </a>{' '}
             for more information.
           </Trans>
         }
-      >
-        {!isUnauthorized && <TokenCreateDialog />}
-      </SettingsHeader>
+      />
 
-      {isUnauthorized ? (
+      {team && team?.currentTeamRole !== TeamMemberRole.ADMIN ? (
         <Alert className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row" variant="warning">
           <div>
             <AlertTitle>
@@ -115,43 +56,58 @@ export default function ApiTokensPage() {
           </div>
         </Alert>
       ) : (
-        <DataTable
-          columns={columns}
-          data={tokens ?? []}
-          perPage={0}
-          currentPage={0}
-          totalPages={0}
-          error={{
-            enable: isError,
-          }}
-          emptyState={
-            <div className="flex h-60 flex-col items-center justify-center gap-y-4 text-muted-foreground/60">
-              <p>
-                <Trans>You have no API tokens yet. Your tokens will be shown here once you create them.</Trans>
+        <>
+          <ApiTokenForm className="max-w-xl" tokens={tokens} />
+
+          <hr className="mt-8 mb-4" />
+
+          <h4 className="font-medium text-xl">
+            <Trans>Your existing tokens</Trans>
+          </h4>
+
+          {tokens && tokens.length === 0 && (
+            <div className="mb-4">
+              <p className="mt-2 text-muted-foreground text-sm italic">
+                <Trans>Your tokens will be shown here once you create them.</Trans>
               </p>
             </div>
-          }
-          skeleton={{
-            enable: isLoading,
-            rows: 3,
-            component: (
-              <>
-                <TableCell>
-                  <Skeleton className="h-4 w-24 rounded-full" />
-                </TableCell>
-                <TableCell>
-                  <Skeleton className="h-4 w-16 rounded-full" />
-                </TableCell>
-                <TableCell>
-                  <Skeleton className="h-4 w-16 rounded-full" />
-                </TableCell>
-                <TableCell>
-                  <Skeleton className="h-4 w-12 rounded-full" />
-                </TableCell>
-              </>
-            ),
-          }}
-        />
+          )}
+
+          {tokens && tokens.length > 0 && (
+            <div className="mt-4 flex max-w-xl flex-col gap-y-4">
+              {tokens.map((token) => (
+                <div key={token.id} className="rounded-lg border border-border p-4">
+                  <div className="flex items-center justify-between gap-x-4">
+                    <div>
+                      <h5 className="text-base">{token.name}</h5>
+
+                      <p className="mt-2 text-muted-foreground text-xs">
+                        <Trans>Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}</Trans>
+                      </p>
+                      {token.expires ? (
+                        <p className="mt-1 text-muted-foreground text-xs">
+                          <Trans>Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}</Trans>
+                        </p>
+                      ) : (
+                        <p className="mt-1 text-muted-foreground text-xs">
+                          <Trans>Token doesn't have an expiration date</Trans>
+                        </p>
+                      )}
+                    </div>
+
+                    <div>
+                      <TokenDeleteDialog token={token}>
+                        <Button variant="destructive">
+                          <Trans>Delete</Trans>
+                        </Button>
+                      </TokenDeleteDialog>
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </>
       )}
     </div>
   );

apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx

@@ -1,7 +1,9 @@
 import { useSessionStorage } from '@documenso/lib/client-only/hooks/use-session-storage';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { FolderType } from '@documenso/lib/types/folder-type';
+import { ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { parseToStringArray } from '@documenso/lib/utils/params';
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
@@ -9,6 +11,7 @@ import type { RowSelectionState } from '@documenso/ui/primitives/data-table';
 import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 import { msg } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
+import type { TemplateType } from '@prisma/client';
 import { EnvelopeType, OrganisationType } from '@prisma/client';
 import { Bird } from 'lucide-react';
 import { parseAsStringLiteral, useQueryState } from 'nuqs';
@@ -21,6 +24,7 @@ import { EnvelopeDropZoneWrapper } from '~/components/general/envelope/envelope-
 import { FolderGrid } from '~/components/general/folder/folder-grid';
 import { EnvelopesTableBulkActionBar } from '~/components/tables/envelopes-table-bulk-action-bar';
 import { TemplatesTable } from '~/components/tables/templates-table';
+import { TemplatesTableToolbar } from '~/components/tables/templates-table-toolbar';
 import { useCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
 
@@ -32,6 +36,12 @@ export function meta() {
   return appMetaTags(msg`Templates`);
 }
 
+const ZTemplatesSearchParamsSchema = ZFindSearchParamsSchema.pick({
+  query: true,
+  page: true,
+  perPage: true,
+});
+
 export default function TemplatesPage() {
   const team = useCurrentTeam();
   const organisation = useCurrentOrganisation();
@@ -39,8 +49,15 @@ export default function TemplatesPage() {
   const { folderId } = useParams();
   const [searchParams] = useSearchParams();
 
-  const page = Number(searchParams.get('page')) || 1;
-  const perPage = Number(searchParams.get('perPage')) || 10;
+  const findTemplatesSearchParams = useMemo(
+    () => ZTemplatesSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},
+    [searchParams],
+  );
+
+  const typeFilter = useMemo(() => {
+    const selected = parseToStringArray(searchParams.get('type'));
+    return selected.length === 1 ? (selected[0] as TemplateType) : undefined;
+  }, [searchParams]);
 
   const [view, setView] = useQueryState('view', parseAsStringLiteral(TEMPLATE_VIEWS).withDefault('team'));
 
@@ -60,8 +77,8 @@ export default function TemplatesPage() {
 
   const teamTemplatesQuery = trpc.template.findTemplates.useQuery(
     {
-      page,
-      perPage,
+      ...findTemplatesSearchParams,
+      type: typeFilter,
       folderId,
     },
     {
@@ -71,8 +88,8 @@ export default function TemplatesPage() {
 
   const orgTemplatesQuery = trpc.template.findOrganisationTemplates.useQuery(
     {
-      page,
-      perPage,
+      page: findTemplatesSearchParams.page,
+      perPage: findTemplatesSearchParams.perPage,
     },
     {
       enabled: isOrgView,
@@ -129,6 +146,12 @@ export default function TemplatesPage() {
             </div>
           )}
 
+          {!isOrgView && (
+            <div className="mt-8">
+              <TemplatesTableToolbar />
+            </div>
+          )}
+
           <div className="mt-8">
             {activeQuery.data && activeQuery.data.count === 0 ? (
               <div className="flex h-96 flex-col items-center justify-center gap-y-4 text-muted-foreground/60">

apps/remix/app/routes/_recipient+/d.$token+/_index.tsx

@@ -7,7 +7,6 @@ import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/
 import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { getRecipientsWithMissingFields } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 import { Plural } from '@lingui/react/macro';
 import { UsersIcon } from 'lucide-react';
@@ -15,7 +14,6 @@ import { redirect } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { Header as AuthenticatedHeader } from '~/components/general/app-header';
-import { DirectTemplateInvalidPageView } from '~/components/general/direct-template/direct-template-invalid-page';
 import { DirectTemplatePageView } from '~/components/general/direct-template/direct-template-page';
 import { DirectTemplateAuthPageView } from '~/components/general/direct-template/direct-template-signing-auth-page';
 import { DocumentSigningAuthPageView } from '~/components/general/document-signing/document-signing-auth-page';
@@ -72,18 +70,8 @@ const handleV1Loader = async ({ params, request }: Route.LoaderArgs) => {
     };
   }
 
-  const recipientsWithMissingFields = getRecipientsWithMissingFields(template.recipients, template.fields);
-
-  if (recipientsWithMissingFields.length > 0) {
-    return {
-      isAccessAuthValid: true,
-      isTemplateMissingSignatures: true,
-    } as const;
-  }
-
   return {
     isAccessAuthValid: true,
-    isTemplateMissingSignatures: false,
     template: {
       ...template,
       folder: null,
@@ -108,7 +96,6 @@ const handleV2Loader = async ({ params, request }: Route.LoaderArgs) => {
     .then((envelopeForSigning) => {
       return {
         isDocumentAccessValid: true,
-        isTemplateMissingSignatures: false,
         envelopeForSigning,
       } as const;
     })
@@ -121,13 +108,6 @@ const handleV2Loader = async ({ params, request }: Route.LoaderArgs) => {
         } as const;
       }
 
-      if (error.code === AppErrorCode.MISSING_SIGNATURE_FIELD) {
-        return {
-          isDocumentAccessValid: true,
-          isTemplateMissingSignatures: true,
-        } as const;
-      }
-
       throw new Response('Not Found', { status: 404 });
     });
 };
@@ -201,10 +181,6 @@ const DirectSigningPageV1 = ({ data }: { data: Awaited<ReturnType<typeof handleV
     return <DirectTemplateAuthPageView />;
   }
 
-  if (data.isTemplateMissingSignatures) {
-    return <DirectTemplateInvalidPageView />;
-  }
-
   const { template, directTemplateRecipient } = data;
 
   return (
@@ -259,10 +235,6 @@ const DirectSigningPageV2 = ({ data }: { data: Awaited<ReturnType<typeof handleV
     return <DocumentSigningAuthPageView email={''} emailHasAccount={true} />;
   }
 
-  if (data.isTemplateMissingSignatures) {
-    return <DirectTemplateInvalidPageView />;
-  }
-
   const { envelope, recipient } = data.envelopeForSigning;
 
   const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({

apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx

@@ -82,7 +82,7 @@ export default function WaitingForTurnToSignPage({ loaderData }: Route.Component
       <RecipientBranding branding={branding} cspNonce={cspNonce} />
       <div className="relative flex flex-col items-center justify-center px-4 py-12 sm:px-6 lg:px-8">
         <div className="w-full max-w-md text-center">
-          <h2 className="font-bold text-3xl tracking-tight">
+          <h2 className="font-bold text-3xl tracking-tigh">
             <Trans>Waiting for Your Turn</Trans>
           </h2>
 

apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx

@@ -1,15 +1,98 @@
-import { redirect } from 'react-router';
+import { prisma } from '@documenso/prisma';
+import { Button } from '@documenso/ui/primitives/button';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { Link } from 'react-router';
 
 import type { Route } from './+types/organisation.decline.$token';
 
-export function loader({ params }: Route.LoaderArgs) {
+export async function loader({ params }: Route.LoaderArgs) {
   const { token } = params;
 
   if (!token) {
-    throw redirect('/');
+    return {
+      state: 'InvalidLink',
+    } as const;
   }
 
-  // Declining now happens on the invite page via tRPC. Redirect there with the
-  // `action=decline` flag so it renders the decline-only view (no accept).
-  throw redirect(`/organisation/invite/${token}?action=decline`);
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findUnique({
+    where: {
+      token,
+    },
+    include: {
+      organisation: {
+        select: {
+          name: true,
+        },
+      },
+    },
+  });
+
+  if (!organisationMemberInvite) {
+    return {
+      state: 'InvalidLink',
+    } as const;
+  }
+
+  if (organisationMemberInvite.status !== OrganisationMemberInviteStatus.DECLINED) {
+    await prisma.organisationMemberInvite.update({
+      where: {
+        id: organisationMemberInvite.id,
+      },
+      data: {
+        status: OrganisationMemberInviteStatus.DECLINED,
+      },
+    });
+  }
+
+  return {
+    state: 'Success',
+    organisationName: organisationMemberInvite.organisation.name,
+  } as const;
+}
+
+export default function DeclineInvitationPage({ loaderData }: Route.ComponentProps) {
+  const data = loaderData;
+
+  if (data.state === 'InvalidLink') {
+    return (
+      <div className="w-screen max-w-lg px-4">
+        <div className="w-full">
+          <h1 className="font-semibold text-4xl">
+            <Trans>Invalid token</Trans>
+          </h1>
+
+          <p className="mt-2 mb-4 text-muted-foreground text-sm">
+            <Trans>This token is invalid or has expired. No action is needed.</Trans>
+          </p>
+
+          <Button asChild>
+            <Link to="/">
+              <Trans>Return</Trans>
+            </Link>
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="w-screen max-w-lg px-4">
+      <h1 className="font-semibold text-4xl">
+        <Trans>Invitation declined</Trans>
+      </h1>
+
+      <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <Trans>
+          You have declined the invitation from <strong>{data.organisationName}</strong> to join their organisation.
+        </Trans>
+      </p>
+
+      <Button asChild>
+        <Link to="/">
+          <Trans>Return to Home</Trans>
+        </Link>
+      </Button>
+    </div>
+  );
 }

apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx

@@ -1,15 +1,9 @@
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
 import { prisma } from '@documenso/prisma';
-import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { OrganisationMemberInviteStatus } from '@prisma/client';
-import { useState } from 'react';
-import { Link, useSearchParams } from 'react-router';
-import { match } from 'ts-pattern';
+import { Trans } from '@lingui/react/macro';
+import { Link } from 'react-router';
 
 import type { Route } from './+types/organisation.invite.$token';
 
@@ -43,22 +37,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     } as const;
   }
 
-  const organisationName = organisationMemberInvite.organisation.name;
-
-  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.ACCEPTED) {
-    return {
-      state: 'AlreadyAccepted',
-      organisationName,
-    } as const;
-  }
-
-  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.DECLINED) {
-    return {
-      state: 'AlreadyDeclined',
-      organisationName,
-    } as const;
-  }
-
   const user = await prisma.user.findFirst({
     where: {
       email: {
@@ -71,13 +49,26 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     },
   });
 
+  // Directly convert the team member invite to a team member if they already have an account.
+  if (user) {
+    await acceptOrganisationInvitation({ token: organisationMemberInvite.token });
+  }
+
+  if (!user) {
+    return {
+      state: 'LoginRequired',
+      email: organisationMemberInvite.email,
+      organisationName: organisationMemberInvite.organisation.name,
+    } as const;
+  }
+
+  const isSessionUserTheInvitedUser = user.id === session.user?.id;
+
   return {
-    state: 'Pending',
-    token: organisationMemberInvite.token,
+    state: 'Success',
     email: organisationMemberInvite.email,
-    organisationName,
-    userExists: user !== null,
-    isSessionUserTheInvitedUser: user !== null && user.id === session.user?.id,
+    organisationName: organisationMemberInvite.organisation.name,
+    isSessionUserTheInvitedUser,
   } as const;
 }
 
@@ -106,253 +97,57 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
     );
   }
 
-  if (data.state === 'AlreadyAccepted') {
+  if (data.state === 'LoginRequired') {
     return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Invitation already accepted</Trans>
-          </h1>
-
-          <p className="mt-2 mb-4 text-muted-foreground text-sm">
-            <Trans>
-              You are already a member of <strong>{data.organisationName}</strong>.
-            </Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Continue</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'AlreadyDeclined') {
-    return <InvitationDeclined organisationName={data.organisationName} />;
-  }
-
-  return (
-    <PendingInvitation
-      token={data.token}
-      email={data.email}
-      organisationName={data.organisationName}
-      userExists={data.userExists}
-      isSessionUserTheInvitedUser={data.isSessionUserTheInvitedUser}
-    />
-  );
-}
-
-type PendingInvitationProps = {
-  token: string;
-  email: string;
-  organisationName: string;
-  userExists: boolean;
-  isSessionUserTheInvitedUser: boolean;
-};
-
-type InvitationResult = 'idle' | 'accepted' | 'declined';
-
-type AcceptFailureReason = 'CapExceeded' | 'SubscriptionInactive' | 'Unknown';
-
-const PendingInvitation = ({
-  token,
-  email,
-  organisationName,
-  userExists,
-  isSessionUserTheInvitedUser,
-}: PendingInvitationProps) => {
-  const { t } = useLingui();
-  const { toast } = useToast();
-  const { refreshSession } = useOptionalSession();
-
-  const [searchParams] = useSearchParams();
-  const actionIsDecline = searchParams.get('action') === 'decline';
-
-  const [result, setResult] = useState<InvitationResult>('idle');
-  const [acceptFailureReason, setAcceptFailureReason] = useState<AcceptFailureReason | null>(null);
-
-  const acceptInvitation = trpc.organisation.member.invite.accept.useMutation({
-    onSuccess: async () => {
-      await refreshSession();
-
-      setResult('accepted');
-    },
-    onError: (err) => {
-      const error = AppError.parseError(err);
-
-      const failureReason = match(error.code)
-        .with(AppErrorCode.LIMIT_EXCEEDED, () => 'CapExceeded' as const)
-        .with('SUBSCRIPTION_INACTIVE', () => 'SubscriptionInactive' as const)
-        .otherwise(() => 'Unknown' as const);
-
-      setAcceptFailureReason(failureReason);
-    },
-  });
-
-  const declineInvitation = trpc.organisation.member.invite.decline.useMutation({
-    onSuccess: async () => {
-      await refreshSession();
-
-      setResult('declined');
-    },
-    onError: () => {
-      toast({
-        title: t`Something went wrong`,
-        description: t`Unable to decline this invitation at this time.`,
-        variant: 'destructive',
-        duration: 10000,
-      });
-    },
-  });
-
-  if (result === 'accepted') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Invitation accepted!</Trans>
-          </h1>
-
-          <p className="mt-2 mb-4 text-muted-foreground text-sm">
-            <Trans>
-              You have accepted an invitation from <strong>{organisationName}</strong> to join their organisation.
-            </Trans>
-          </p>
-
-          {isSessionUserTheInvitedUser ? (
-            <Button asChild>
-              <Link to="/">
-                <Trans>Continue</Trans>
-              </Link>
-            </Button>
-          ) : (
-            <Button asChild>
-              <Link to={`/signin#email=${encodeURIComponent(email)}`}>
-                <Trans>Continue to login</Trans>
-              </Link>
-            </Button>
-          )}
-        </div>
-      </div>
-    );
-  }
-
-  if (result === 'declined') {
-    return <InvitationDeclined organisationName={organisationName} />;
-  }
-
-  // Accepting requires an account (acceptance keys off the invited email).
-  // Declining does not, so we only gate account creation on the accept flow.
-  if (!actionIsDecline && !userExists) {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Organisation invitation</Trans>
-          </h1>
-
-          <p className="mt-2 text-muted-foreground text-sm">
-            <Trans>
-              You have been invited by <strong>{organisationName}</strong> to join their organisation.
-            </Trans>
-          </p>
-
-          <p className="mt-1 mb-4 text-muted-foreground text-sm">
-            <Trans>To accept this invitation you must create an account.</Trans>
-          </p>
-
-          <Button asChild>
-            <Link to={`/signup#email=${encodeURIComponent(email)}`}>
-              <Trans>Create account</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  const isPending = acceptInvitation.isPending || declineInvitation.isPending;
-
-  return (
-    <div className="w-screen max-w-lg px-4">
-      <div className="w-full">
+      <div>
         <h1 className="font-semibold text-4xl">
           <Trans>Organisation invitation</Trans>
         </h1>
 
-        <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <p className="mt-2 text-muted-foreground text-sm">
           <Trans>
-            You have been invited to join <strong>{organisationName}</strong> on Documenso.
+            You have been invited by <strong>{data.organisationName}</strong> to join their organisation.
           </Trans>
         </p>
 
-        {acceptFailureReason && (
-          <p className="mt-2 mb-4 text-destructive text-sm">
-            {match(acceptFailureReason)
-              .with('CapExceeded', () => (
-                <Trans>
-                  <strong>{organisationName}</strong> has reached its member limit. Please contact the organisation
-                  administrator to upgrade their plan before accepting this invitation.
-                </Trans>
-              ))
-              .with('SubscriptionInactive', () => (
-                <Trans>
-                  <strong>{organisationName}</strong> does not have an active subscription. Please contact the
-                  organisation administrator to renew their plan before accepting this invitation.
-                </Trans>
-              ))
-              .with('Unknown', () => (
-                <Trans>
-                  We were unable to add you to <strong>{organisationName}</strong> at this time. Please try again later,
-                  or contact the organisation administrator.
-                </Trans>
-              ))
-              .exhaustive()}
-          </p>
-        )}
+        <p className="mt-1 mb-4 text-muted-foreground text-sm">
+          <Trans>To accept this invitation you must create an account.</Trans>
+        </p>
 
-        <div className="flex items-center gap-x-4">
-          <Button
-            variant="destructive"
-            onClick={async () => declineInvitation.mutateAsync({ token })}
-            loading={declineInvitation.isPending}
-            disabled={isPending}
-          >
-            <Trans>Decline</Trans>
-          </Button>
-
-          {!actionIsDecline && (
-            <Button
-              onClick={async () => acceptInvitation.mutateAsync({ token })}
-              loading={acceptInvitation.isPending}
-              disabled={isPending}
-            >
-              <Trans>Accept</Trans>
-            </Button>
-          )}
-        </div>
+        <Button asChild>
+          <Link to={`/signup#email=${encodeURIComponent(data.email)}`}>
+            <Trans>Create account</Trans>
+          </Link>
+        </Button>
       </div>
-    </div>
-  );
-};
+    );
+  }
 
-const InvitationDeclined = ({ organisationName }: { organisationName: string }) => {
   return (
-    <div className="w-screen max-w-lg px-4">
-      <div className="w-full">
-        <h1 className="font-semibold text-4xl">
-          <Trans>Invitation declined</Trans>
-        </h1>
+    <div>
+      <h1 className="font-semibold text-4xl">
+        <Trans>Invitation accepted!</Trans>
+      </h1>
 
-        <p className="mt-2 mb-4 text-muted-foreground text-sm">
-          <Trans>
-            You have declined the invitation from <strong>{organisationName}</strong> to join their organisation.
-          </Trans>
-        </p>
-      </div>
+      <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <Trans>
+          You have accepted an invitation from <strong>{data.organisationName}</strong> to join their organisation.
+        </Trans>
+      </p>
+
+      {data.isSessionUserTheInvitedUser ? (
+        <Button asChild>
+          <Link to="/">
+            <Trans>Continue</Trans>
+          </Link>
+        </Button>
+      ) : (
+        <Button asChild>
+          <Link to={`/signin#email=${encodeURIComponent(data.email)}`}>
+            <Trans>Continue to login</Trans>
+          </Link>
+        </Button>
+      )}
     </div>
   );
-};
+}

apps/remix/app/utils/toast-error-messages.ts

@@ -32,10 +32,6 @@ export const getDirectTemplateErrorMessage = (code: string): ToastMessageDescrip
   return match(code)
     .with('RECIPIENT_LIMIT_EXCEEDED', () => RECIPIENT_LIMIT_EXCEEDED_ERROR_MESSAGE)
     .with(AppErrorCode.TOO_MANY_REQUESTS, () => FAIR_USE_LIMIT_EXCEEDED_ERROR_MESSAGE)
-    .with(AppErrorCode.MISSING_SIGNATURE_FIELD, () => ({
-      title: msg`Missing signature fields`,
-      description: msg`This direct link template cannot be used because one or more signers do not have a signature field assigned.`,
-    }))
     .otherwise(() => ({
       title: msg`Something went wrong`,
       description: msg`We were unable to submit this document at this time. Please try again later.`,
@@ -81,10 +77,6 @@ export const getTemplateUseErrorMessage = (code: string): ToastMessageDescriptor
       title: msg`Error`,
       description: msg`The document was created but could not be sent to recipients.`,
     }))
-    .with(AppErrorCode.MISSING_SIGNATURE_FIELD, () => ({
-      title: msg`Missing signature fields`,
-      description: msg`The document could not be sent because some signers do not have a signature field. Please edit the template and add a signature field for each signer.`,
-    }))
     .with(AppErrorCode.INVALID_BODY, AppErrorCode.INVALID_REQUEST, () => ({
       title: msg`Error`,
       description: msg`The document could not be created because of missing or invalid information. Please review the template's recipients and fields.`,

apps/remix/package.json

@@ -36,8 +36,8 @@
     "@lingui/react": "^5.6.0",
     "@oslojs/crypto": "^1.0.1",
     "@oslojs/encoding": "^1.1.0",
-    "@react-router/node": "^7.18.1",
-    "@react-router/serve": "^7.18.1",
+    "@react-router/node": "^7.12.0",
+    "@react-router/serve": "^7.12.0",
     "@simplewebauthn/browser": "^13.2.2",
     "@simplewebauthn/server": "^13.2.2",
     "@tanstack/react-query": "5.90.10",
@@ -81,8 +81,8 @@
     "@babel/preset-typescript": "^7.28.5",
     "@lingui/babel-plugin-lingui-macro": "^5.6.0",
     "@lingui/vite-plugin": "^5.6.0",
-    "@react-router/dev": "^7.18.1",
-    "@react-router/remix-routes-option-adapter": "^7.18.1",
+    "@react-router/dev": "^7.12.0",
+    "@react-router/remix-routes-option-adapter": "^7.12.0",
     "@rollup/plugin-babel": "^6.1.0",
     "@rollup/plugin-commonjs": "^28.0.9",
     "@rollup/plugin-json": "^6.1.0",
@@ -100,11 +100,11 @@
     "esbuild": "^0.27.0",
     "remix-flat-routes": "^0.8.5",
     "rollup": "^4.53.3",
-    "tsx": "^4.23.1",
+    "tsx": "^4.20.6",
     "typescript": "5.6.2",
     "vite": "^7.2.4",
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "2.16.0"
+  "version": "2.14.0"
 }

apps/remix/server/api/files/files.ts

@@ -1,8 +1,9 @@
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
-import { AppError } from '@documenso/lib/errors/app-error';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { verifyEmbeddingPresignToken } from '@documenso/lib/server-only/embedding-presign/verify-embedding-presign-token';
 import { putNormalizedPdfFileServerSide } from '@documenso/lib/universal/upload/put-file.server';
+import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions';
 import { prisma } from '@documenso/prisma';
 import { sValidator } from '@hono/standard-validator';
 import type { Prisma } from '@prisma/client';
@@ -11,11 +12,14 @@ import { Hono } from 'hono';
 import type { HonoEnv } from '../../router';
 import { checkEnvelopeFileAccess, handleEnvelopeItemFileRequest, resolveFileUploadUserId } from './files.helpers';
 import {
+  isAllowedUploadContentType,
+  type TGetPresignedPostUrlResponse,
   ZGetEnvelopeItemFileDownloadRequestParamsSchema,
   ZGetEnvelopeItemFileRequestParamsSchema,
   ZGetEnvelopeItemFileRequestQuerySchema,
   ZGetEnvelopeItemFileTokenDownloadRequestParamsSchema,
   ZGetEnvelopeItemFileTokenRequestParamsSchema,
+  ZGetPresignedPostUrlRequestSchema,
   ZUploadPdfRequestSchema,
 } from './files.types';
 import getEnvelopeItemPdfRoute from './routes/get-envelope-item-pdf';
@@ -57,6 +61,29 @@ export const filesRoute = new Hono<HonoEnv>()
       return c.json({ error: 'Upload failed' }, 500);
     }
   })
+  .post('/presigned-post-url', sValidator('json', ZGetPresignedPostUrlRequestSchema), async (c) => {
+    const userId = await resolveFileUploadUserId(c);
+
+    if (!userId) {
+      return c.json({ error: 'Unauthorized' }, 401);
+    }
+
+    const { fileName, contentType } = c.req.valid('json');
+
+    if (!isAllowedUploadContentType(contentType)) {
+      return c.json({ error: 'Unsupported content type' }, 400);
+    }
+
+    try {
+      const { key, url } = await getPresignPostUrl(fileName, contentType, userId);
+
+      return c.json({ key, url } satisfies TGetPresignedPostUrlResponse);
+    } catch (err) {
+      console.error(err);
+
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR);
+    }
+  })
   .get(
     '/envelope/:envelopeId/envelopeItem/:envelopeItemId',
     sValidator('param', ZGetEnvelopeItemFileRequestParamsSchema),

apps/remix/server/api/files/files.types.ts

@@ -13,6 +13,27 @@ export const ZUploadPdfResponseSchema = DocumentDataSchema.pick({
 export type TUploadPdfRequest = z.infer<typeof ZUploadPdfRequestSchema>;
 export type TUploadPdfResponse = z.infer<typeof ZUploadPdfResponseSchema>;
 
+export const ALLOWED_UPLOAD_CONTENT_TYPES = ['application/pdf', 'image/jpeg', 'image/png', 'image/webp'] as const;
+
+export const isAllowedUploadContentType = (contentType: string): boolean => {
+  const normalizedContentType = contentType.split(';').at(0)?.trim().toLowerCase();
+
+  return ALLOWED_UPLOAD_CONTENT_TYPES.some((allowed) => allowed === normalizedContentType);
+};
+
+export const ZGetPresignedPostUrlRequestSchema = z.object({
+  fileName: z.string().min(1),
+  contentType: z.string().min(1),
+});
+
+export const ZGetPresignedPostUrlResponseSchema = z.object({
+  key: z.string().min(1),
+  url: z.string().min(1),
+});
+
+export type TGetPresignedPostUrlRequest = z.infer<typeof ZGetPresignedPostUrlRequestSchema>;
+export type TGetPresignedPostUrlResponse = z.infer<typeof ZGetPresignedPostUrlResponseSchema>;
+
 export const ZGetEnvelopeItemFileRequestParamsSchema = z.object({
   envelopeId: z.string().min(1),
   envelopeItemId: z.string().min(1),

apps/remix/server/router.ts

@@ -105,6 +105,7 @@ app.route('/api/auth', auth);
 
 // Files route.
 app.use('/api/files/upload-pdf', fileRateLimitMiddleware);
+app.use('/api/files/presigned-post-url', fileRateLimitMiddleware);
 app.route('/api/files', filesRoute);
 
 // AI route.

docker/Dockerfile

@@ -19,7 +19,7 @@ WORKDIR /app
 
 COPY . .
 
-RUN npm install -g "turbo@^2.10.0"
+RUN npm install -g "turbo@^1.9.3"
 
 # Outputs to the /out folder
 # source: https://turbo.build/repo/docs/reference/command-line-reference/prune#--docker
@@ -79,7 +79,7 @@ COPY --from=builder /app/out/full/ .
 # Finally copy the turbo.json file so that we can run turbo commands
 COPY turbo.json turbo.json
 
-RUN npm install -g "turbo@^2.10.0"
+RUN npm install -g "turbo@^1.9.3"
 
 RUN turbo run build --filter=@documenso/remix...