chore: remove generated translation catalogs from branch

.agents/skills/create-justification/SKILL.md

@@ -0,0 +1,56 @@
+---
+name: create-justification
+description: Create a new justification file in .agents/justifications/ with a unique three-word ID, frontmatter, and formatted title
+license: MIT
+compatibility: opencode
+metadata:
+  audience: agents
+  workflow: decision-making
+---
+
+## What I do
+
+I help you create new justification files in the `.agents/justifications/` directory. Each justification file gets:
+
+- A unique three-word identifier (e.g., `swift-emerald-river`)
+- Frontmatter with the current date and formatted title
+- Content you provide
+
+## How to use
+
+Run the script with a slug and content:
+
+```bash
+npx tsx scripts/create-justification.ts "decision-name" "Justification content here"
+```
+
+Or use heredoc for multi-line content:
+
+```bash
+npx tsx scripts/create-justification.ts "decision-name" << HEREDOC
+Multi-line
+justification content
+goes here
+HEREDOC
+```
+
+## File format
+
+Files are created as: `{three-word-id}-{slug}.md`
+
+Example: `swift-emerald-river-decision-name.md`
+
+The file includes frontmatter:
+
+```markdown
+---
+date: 2026-01-13
+title: Decision Name
+---
+
+Your content here
+```
+
+## When to use me
+
+Use this skill when you need to document the reasoning or justification for a decision, approach, or architectural choice. The unique ID ensures no filename conflicts, and the frontmatter provides metadata for organization.

.agents/skills/create-plan/SKILL.md

@@ -0,0 +1,56 @@
+---
+name: create-plan
+description: Create a new plan file in .agents/plans/ with a unique three-word ID, frontmatter, and formatted title
+license: MIT
+compatibility: opencode
+metadata:
+  audience: agents
+  workflow: planning
+---
+
+## What I do
+
+I help you create new plan files in the `.agents/plans/` directory. Each plan file gets:
+
+- A unique three-word identifier (e.g., `happy-blue-moon`)
+- Frontmatter with the current date and formatted title
+- Content you provide
+
+## How to use
+
+Run the script with a slug and content:
+
+```bash
+npx tsx scripts/create-plan.ts "feature-name" "Plan content here"
+```
+
+Or use heredoc for multi-line content:
+
+```bash
+npx tsx scripts/create-plan.ts "feature-name" << HEREDOC
+Multi-line
+plan content
+goes here
+HEREDOC
+```
+
+## File format
+
+Files are created as: `{three-word-id}-{slug}.md`
+
+Example: `happy-blue-moon-feature-name.md`
+
+The file includes frontmatter:
+
+```markdown
+---
+date: 2026-01-13
+title: Feature Name
+---
+
+Your content here
+```
+
+## When to use me
+
+Use this skill when you need to create a new plan document for a feature, task, or project. The unique ID ensures no filename conflicts, and the frontmatter provides metadata for organization.

.agents/skills/create-scratch/SKILL.md

@@ -0,0 +1,56 @@
+---
+name: create-scratch
+description: Create a new scratch file in .agents/scratches/ with a unique three-word ID, frontmatter, and formatted title
+license: MIT
+compatibility: opencode
+metadata:
+  audience: agents
+  workflow: exploration
+---
+
+## What I do
+
+I help you create new scratch files in the `.agents/scratches/` directory. Each scratch file gets:
+
+- A unique three-word identifier (e.g., `calm-teal-cloud`)
+- Frontmatter with the current date and formatted title
+- Content you provide
+
+## How to use
+
+Run the script with a slug and content:
+
+```bash
+npx tsx scripts/create-scratch.ts "note-name" "Scratch content here"
+```
+
+Or use heredoc for multi-line content:
+
+```bash
+npx tsx scripts/create-scratch.ts "note-name" << HEREDOC
+Multi-line
+scratch content
+goes here
+HEREDOC
+```
+
+## File format
+
+Files are created as: `{three-word-id}-{slug}.md`
+
+Example: `calm-teal-cloud-note-name.md`
+
+The file includes frontmatter:
+
+```markdown
+---
+date: 2026-01-13
+title: Note Name
+---
+
+Your content here
+```
+
+## When to use me
+
+Use this skill when you need to create a temporary note, exploration document, or scratch pad for ideas. The unique ID ensures no filename conflicts, and the frontmatter provides metadata for organization.

.env.example

@@ -80,8 +80,6 @@ NEXT_PRIVATE_SIGNING_CSC_OAUTH_CLIENT_SECRET=
 NEXT_PRIVATE_SIGNING_CSC_SIGNATURE_LEVEL=
 # OPTIONAL: Comma-separated list of timestamp authority URLs for PDF signing (enables LTV and archival timestamps).
 NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY=
-# OPTIONAL: Reason to embed in PDF signatures. Defaults to "Signed by Documenso".
-NEXT_PRIVATE_SIGNING_REASON=
 # OPTIONAL: Contact info to embed in PDF signatures. Defaults to the webapp URL.
 NEXT_PUBLIC_SIGNING_CONTACT_INFO=
 # OPTIONAL: Set to "true" to use the legacy adbe.pkcs7.detached subfilter instead of ETSI.CAdES.detached.

.github/ISSUE_TEMPLATE/deploy-provider-request.yml

@@ -1,61 +0,0 @@
-name: 'One-Click Deploy Provider Request'
-description: Request a new one-click deployment provider (Railway, Render, etc.) to be added to our README
-title: 'One-Click Deploy Provider Request: [Provider Name]'
-labels: ['deploy-provider-request']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for your interest in adding a one-click deploy option for Documenso!
-
-        Each provider we list requires us to create, test, and maintain a deployment template, which is ongoing work on top of everything else. To keep this manageable, we ask that providers (or users) **open an issue instead of a PR** so the community can signal interest.
-
-        **How this works:**
-
-        - 👍 this issue if you'd like to see Documenso deployable on this provider.
-        - If community interest is high enough, we'll consider adding it to the README.
-        - Opening an issue is not a guarantee of inclusion. PRs adding badges without a prior issue and demonstrated interest will be closed.
-  - type: input
-    attributes:
-      label: Provider Name
-      placeholder: e.g. Railway
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Provider Website
-      placeholder: e.g. https://railway.com
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Deploy/Template URL
-      description: A link to an existing deployment template or deploy button URL, if one exists.
-  - type: dropdown
-    attributes:
-      label: Who creates and maintains the deployment template?
-      options:
-        - The provider
-        - Me / the community
-        - Nobody yet
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Testing & Maintenance
-      description: Has the template been tested against the current Documenso release? How are updates handled when Documenso ships breaking changes (env vars, migrations, Docker changes)?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Why this provider?
-      description: Tell us why Documenso users would benefit — existing user base, region coverage, free tier, etc.
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Please check the boxes that apply to this request.
-      options:
-        - label: I have searched existing issues to make sure this provider has not already been requested.
-        - label: I understand that inclusion depends on community interest and is not guaranteed.
-        - label: I understand that PRs adding deploy badges without a prior issue will be closed.

.github/actions/node-install/action.yml

@@ -2,7 +2,7 @@ name: 'Setup node'
 inputs:
   node_version:
     required: false
-    default: v24.x
+    default: v22.x
 
 runs:
   using: 'composite'

.github/workflows/ci.yml

@@ -15,7 +15,6 @@ jobs:
   build_app:
     name: Build App
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -33,7 +32,6 @@ jobs:
   build_docker:
     name: Build Docker Image
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/codeql-analysis.yml

@@ -11,7 +11,6 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     permissions:
       actions: read
       contents: read

.github/workflows/deploy.yml

@@ -8,7 +8,6 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
 
     steps:
       - name: Checkout code

.github/workflows/issue-labeler.yml

@@ -7,7 +7,6 @@ on:
 jobs:
   label-when-assigned:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
       - name: Label issue
         uses: actions/github-script@v6

.github/workflows/issue-opened.yml

@@ -7,7 +7,6 @@ on:
 jobs:
   label_issues:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     permissions:
       issues: write
     steps:

.github/workflows/pr-labeler.yml

@@ -13,7 +13,6 @@ jobs:
       contents: read
       pull-requests: write
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
       - uses: actions/labeler@v4
         with:

.github/workflows/publish.yml

@@ -14,7 +14,6 @@ jobs:
   build_and_publish_platform_containers:
     name: Build and publish platform containers
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -79,7 +78,6 @@ jobs:
   create_and_publish_manifest:
     name: Create and publish manifest
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     needs: build_and_publish_platform_containers
     steps:
       - name: Checkout

.github/workflows/semantic-pull-requests.yml

@@ -15,7 +15,6 @@ jobs:
   validate-pr:
     name: Validate PR title
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
       - uses: amannn/action-semantic-pull-request@v5
         id: lint_pr_title

.github/workflows/stale.yml

@@ -7,7 +7,6 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     permissions:
       issues: write
       pull-requests: write

.github/workflows/translations-force-pull.yml

@@ -18,7 +18,6 @@ jobs:
   pull_translations:
     name: Force pull translations
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     environment: Translations
     permissions:
       contents: write

.github/workflows/translations-pull.yml

@@ -16,7 +16,6 @@ jobs:
   pull_translations:
     name: Pull translations
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     environment: Translations
     permissions:
       contents: write

.github/workflows/translations-upload.yml

@@ -14,7 +14,6 @@ jobs:
   extract_translations:
     name: Extract and upload translations
     runs-on: ubuntu-latest
-    timeout-minutes: 30
     environment: Translations
     permissions:
       contents: write

.npmrc

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

README.md

@@ -107,7 +107,7 @@ Contact us if you are interested in our Enterprise plan for large organizations
 
 To run Documenso locally, you will need
 
-- Node.js (v24 or above)
+- Node.js (v22 or above)
 - Postgres SQL Database
 - Docker (optional)
 
@@ -186,37 +186,21 @@ For full instructions, requirements, and configuration details, see the [Self Ho
 
 ### One-Click Deploys
 
-> [!NOTE]
-> Want to see another provider listed here? Please [open a provider request](https://github.com/documenso/documenso/issues/new?template=deploy-provider-request.yml) instead of a PR so the community can signal interest. PRs adding deploy badges without a prior issue will be closed.
+#### Railway
 
-<table>
-  <tr>
-    <td align="center" width="200">
-      <a href="https://railway.com/deploy/DjrRRX?referralCode=EZR3s0&utm_medium=integration&utm_source=template&utm_campaign=generic">
-        <img src="https://railway.com/button.svg" alt="Deploy on Railway" height="40" />
-      </a>
-    </td>
-    <td align="center" width="200">
-      <a href="https://render.com/deploy?repo=https://github.com/documenso/documenso">
-        <img src="https://render.com/images/deploy-to-render-button.svg" alt="Deploy to Render" height="40" />
-      </a>
-    </td>
-    <td align="center" width="200">
-      <a href="https://app.koyeb.com/deploy?type=git&repository=github.com/documenso/documenso&branch=main&name=documenso-app&builder=dockerfile&dockerfile=/docker/Dockerfile">
-        <img src="https://www.koyeb.com/static/images/deploy/button.svg" alt="Deploy to Koyeb" height="40" />
-      </a>
-    </td>
-  </tr>
-  <tr>
-    <td align="center" width="200">
-      <a href="https://elest.io/open-source/documenso">
-        <img src="https://elest.io/images/logos/deploy-to-elestio-btn.png" alt="Deploy on Elestio" height="40" />
-      </a>
-    </td>
-    <td align="center" width="200"></td>
-    <td align="center" width="200"></td>
-  </tr>
-</table>
+[![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/DjrRRX?referralCode=EZR3s0&utm_medium=integration&utm_source=template&utm_campaign=generic)
+
+#### Render
+
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/documenso/documenso)
+
+#### Koyeb
+
+[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?type=git&repository=github.com/documenso/documenso&branch=main&name=documenso-app&builder=dockerfile&dockerfile=/docker/Dockerfile)
+
+#### Elestio
+
+[![Deploy on Elestio](https://elest.io/images/logos/deploy-to-elestio-btn.png)](https://elest.io/open-source/documenso)
 
 ## Security
 

apps/docs/content/docs/developers/api/common-errors.mdx

@@ -15,8 +15,6 @@ This guide provides a comprehensive troubleshooting matrix for the standard erro
 | `INVALID_REQUEST` | The overall request is malformed or invalid. | Review your API call parameters, including the URL, query parameters, and headers. Correct the request syntax. |
 | `RECIPIENT_EXPIRED` | The signing link or recipient access has expired. | Generate and resend a new invitation to the affected recipient. |
 | `LIMIT_EXCEEDED` | Your account usage quota has been exceeded. | Check your current plan limits. Upgrade your subscription or wait until your billing cycle renews. |
-| `MISSING_ENV_VAR` | A required environment variable is not configured on the server (500). | Primarily affects self-hosted instances: set the environment variable named in the error message and restart. On Documenso Cloud, contact support. |
-| `MISSING_SIGNATURE_FIELD` | A signer has no signature field placed on the document (400). Returned when distributing an envelope. | Add at least one signature field for every recipient with a signing role before calling `/envelope/distribute`. |
 | `NOT_FOUND` | The requested resource could not be found (404). | Verify the resource ID (envelope, document, webhook) passed in the URL. Ensure the resource has not been deleted. |
 | `NOT_IMPLEMENTED` | The requested feature is not currently supported by the server. | Consult the API documentation to verify available methods. Do not use this endpoint at this time. |
 | `NOT_SETUP` | The required configuration for this action is incomplete. | Access your account or integration settings and complete the necessary configuration before retrying. |
@@ -39,28 +37,7 @@ The following errors occur when attempting to perform actions on an envelope tha
 | `ENVELOPE_DRAFT` | The action cannot be performed because the envelope is still in a draft state. | Finalize the envelope configuration and transition it to the `PENDING` (sent) state before attempting this operation. |
 | `ENVELOPE_COMPLETED` | The action cannot be performed because the envelope is already completed. | No further modifications (e.g., adding signers, modifying documents) can be made to an envelope once the signing process is finished. |
 | `ENVELOPE_REJECTED` | The action cannot be performed because the envelope was rejected by a recipient. | The signing flow is permanently halted. Create a new envelope if you wish to resubmit the document. |
-| `ENVELOPE_CANCELLED` | The action cannot be performed because the envelope was cancelled (400). | Create a new envelope if you need to restart the signing process. |
 | `ENVELOPE_LEGACY` | The action cannot be performed because the envelope uses an obsolete format. | This envelope was created with a legacy version of the system. Recreate the envelope using the current API version to interact with it. |
-| `ENVELOPE_TSP_LOCKED` | An AES/QES envelope cannot be modified after it leaves the draft state (400). | Make changes while the envelope is in `DRAFT`, or create a new envelope. |
-
-## CSC Signing Errors
-
-These errors apply to Cloud Signature Consortium (CSC) signing flows.
-
-| Error Code | Description | Recommended Action |
-| :--- | :--- | :--- |
-| `CSC_INSTANCE_MODE_MISMATCH` | The requested signature level does not match the instance's CSC mode (400). | Use the signature level supported by the instance's signing configuration. |
-| `CSC_UNLICENSED` | CSC signing is not licensed for this instance (403). | Enable the CSC signing license before retrying. |
-| `CSC_PROVIDER_INFO_FAILED` | The CSC provider's discovery request failed or returned unusable information (500). | Check the provider URL, availability, and OAuth configuration. |
-| `CSC_PROVIDER_NO_TSA` | A timestamp authority is unavailable or unusable for CSC signing (500). | Configure `NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY` and verify provider timestamp access. |
-| `CSC_CREDENTIAL_LIST_EMPTY` | The CSC provider returned no signing credentials for the authenticated user (400). | Enrol a signing credential with the provider, then authenticate again. |
-| `CSC_CERT_INVALID` | The selected signing certificate is missing, invalid, or outside its validity period (400). | Select or renew a valid certificate, then authenticate again. |
-| `CSC_ALGORITHM_REFUSED` | The signing credential uses an unsupported key or digest algorithm (400). | Select a credential that satisfies the instance's CSC algorithm policy. |
-| `CSC_SAD_EXPIRED_PRE_SIGN` | The signature activation data is missing, expired, or unreadable before signing (400). | Repeat the credential authorization flow. |
-| `CSC_TSP_TIMEOUT` | The trust service provider did not complete the signing request before the timeout (408). | Retry the signing request after checking provider availability. |
-| `CSC_EMBED_FAILED` | The returned CSC signature could not be embedded into the envelope items (400). | Restart the signing attempt. If it fails again, contact support. |
-| `CSC_BASE_DOCUMENT_MUTATED` | The document changed between signature preparation and signing (500). | Restart signing from the current envelope state. |
-| `CSC_REQUEST_FAILED` | A CSC provider request failed without a more specific CSC error (500). | Check provider availability and configuration, then retry. |
 
 ## See Also
 

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

@@ -28,62 +28,35 @@ Each document contains one or more PDF files, a list of recipients, and the fiel
 
 A document object contains the following properties:
 
-| Property            | Type           | Description                                                                                  |
-| ------------------- | -------------- | -------------------------------------------------------------------------------------------- |
-| `id`                | string         | Unique identifier (e.g., `envelope_abc123`)                                                  |
-| `secondaryId`       | string         | Legacy identifier in prefixed form (`document_123` for documents, `template_123` for templates) |
-| `internalVersion`   | number         | Internal envelope schema version                                                             |
-| `type`              | string         | `DOCUMENT` or `TEMPLATE`                                                                     |
-| `status`            | string         | Current status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, or `CANCELLED`                  |
-| `title`             | string         | Document title                                                                               |
-| `source`            | string         | How the document was created: `DOCUMENT`, `TEMPLATE`, `TEMPLATE_DIRECT_LINK`                 |
-| `visibility`        | string         | Who can view: `EVERYONE`, `ADMIN`, `MANAGER_AND_ABOVE`                                       |
-| `templateType`      | string         | Template visibility: `PUBLIC`, `PRIVATE`, or `ORGANISATION` (only meaningful for templates)  |
-| `externalId`        | string \| null | Your custom identifier for the document                                                      |
-| `userId`            | number         | ID of the user who owns the document                                                         |
-| `teamId`            | number         | ID of the team the document belongs to                                                       |
-| `folderId`          | string \| null | ID of the folder containing the document                                                     |
-| `templateId`        | number \| null | Legacy ID of the template this document was created from                                     |
-| `authOptions`       | object \| null | Access and action authentication requirements                                                |
-| `formValues`        | object \| null | Pre-filled form values                                                                       |
-| `publicTitle`       | string         | Public title shown on profile and direct-link pages                                          |
-| `publicDescription` | string         | Public description shown on profile and direct-link pages                                    |
-| `createdAt`         | string         | ISO 8601 timestamp                                                                           |
-| `updatedAt`         | string         | ISO 8601 timestamp                                                                           |
-| `completedAt`       | string \| null | Timestamp when all recipients completed signing                                              |
-| `deletedAt`         | string \| null | Timestamp if soft-deleted                                                                    |
-| `recipients`        | array          | List of recipients and their signing status                                                  |
-| `fields`            | array          | Signature and form fields on the document                                                    |
-| `envelopeItems`     | array          | PDF files attached to the document                                                           |
-| `directLink`        | object \| null | Direct-link signing configuration (`id`, `token`, `enabled`, `directTemplateRecipientId`)    |
-| `team`              | object         | Owning team (`id`, `url`)                                                                    |
-| `user`              | object         | Document owner (`id`, `name`, `email`)                                                       |
-| `documentMeta`      | object         | Email settings, redirect URL, signing options                                                |
-
-Documents created through the API have `source: "DOCUMENT"` — there is no separate `API` source value. To tag documents created by your integration, set `externalId` when creating them.
+| Property        | Type           | Description                                                    |
+| --------------- | -------------- | -------------------------------------------------------------- |
+| `id`            | string         | Unique identifier (e.g., `envelope_abc123`)                    |
+| `type`          | string         | `DOCUMENT` or `TEMPLATE`                                       |
+| `status`        | string         | Current status: `DRAFT`, `PENDING`, `COMPLETED`, or `REJECTED` |
+| `title`         | string         | Document title                                                 |
+| `source`        | string         | How the document was created: `DOCUMENT`, `TEMPLATE`, `API`    |
+| `visibility`    | string         | Who can view: `EVERYONE`, `ADMIN`, `MANAGER_AND_ABOVE`         |
+| `externalId`    | string \| null | Your custom identifier for the document                        |
+| `createdAt`     | string         | ISO 8601 timestamp                                             |
+| `updatedAt`     | string         | ISO 8601 timestamp                                             |
+| `completedAt`   | string \| null | Timestamp when all recipients completed signing                |
+| `deletedAt`     | string \| null | Timestamp if soft-deleted                                      |
+| `recipients`    | array          | List of recipients and their signing status                    |
+| `fields`        | array          | Signature and form fields on the document                      |
+| `envelopeItems` | array          | PDF files attached to the document                             |
+| `documentMeta`  | object         | Email settings, redirect URL, signing options                  |
 
 ### Example Document Object
 
 ```json
 {
   "id": "envelope_abc123xyz",
-  "secondaryId": "document_123",
-  "internalVersion": 2,
   "type": "DOCUMENT",
   "status": "PENDING",
-  "source": "DOCUMENT",
+  "source": "API",
   "visibility": "EVERYONE",
-  "templateType": "PRIVATE",
   "title": "Service Agreement",
   "externalId": "contract-2025-001",
-  "userId": 1,
-  "teamId": 1,
-  "folderId": null,
-  "templateId": null,
-  "authOptions": null,
-  "formValues": null,
-  "publicTitle": "",
-  "publicDescription": "",
   "createdAt": "2025-01-15T10:30:00.000Z",
   "updatedAt": "2025-01-15T10:35:00.000Z",
   "completedAt": null,
@@ -100,41 +73,23 @@ Documents created through the API have `source: "DOCUMENT"` — there is no sepa
   ],
   "fields": [
     {
-      "id": 123,
-      "secondaryId": "field_abc123",
+      "id": "field_123",
       "type": "SIGNATURE",
-      "recipientId": 1,
-      "envelopeId": "envelope_abc123xyz",
-      "envelopeItemId": "envelope_item_xyz",
       "page": 1,
-      "positionX": "10",
-      "positionY": "80",
-      "width": "30",
-      "height": "5",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": null
+      "positionX": 10,
+      "positionY": 80,
+      "width": 30,
+      "height": 5,
+      "recipientId": 1
     }
   ],
   "envelopeItems": [
     {
       "id": "envelope_item_xyz",
-      "envelopeId": "envelope_abc123xyz",
-      "documentDataId": "doc_data_abc123",
       "title": "contract.pdf",
       "order": 1
     }
   ],
-  "directLink": null,
-  "team": {
-    "id": 1,
-    "url": "your-team"
-  },
-  "user": {
-    "id": 1,
-    "name": "Jane Smith",
-    "email": "jane@example.com"
-  },
   "documentMeta": {
     "subject": "Please sign this document",
     "message": "Hi, please review and sign this agreement.",
@@ -144,8 +99,6 @@ Documents created through the API have `source: "DOCUMENT"` — there is no sepa
 }
 ```
 
-Field position and size values are stored as decimals and serialized as strings in API responses.
-
 ## List Documents
 
 Retrieve a paginated list of documents.
@@ -161,7 +114,7 @@ GET /envelope
 | `page`             | integer | Page number (default: 1)                                      |
 | `perPage`          | integer | Results per page (default: 10, max: 100)                      |
 | `type`             | string  | Filter by `DOCUMENT` or `TEMPLATE`                            |
-| `status`           | string  | Filter by status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, `CANCELLED` |
+| `status`           | string  | Filter by status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED` |
 | `source`           | string  | Filter by creation source                                     |
 | `folderId`         | string  | Filter by folder ID                                           |
 | `orderByColumn`    | string  | Sort field (only `createdAt` supported)                       |
@@ -201,8 +154,8 @@ const response = await fetch(`${BASE_URL}/envelope`, {
   },
 });
 
-const { data, count } = await response.json();
-console.log(`Found ${count} documents`);
+const { data, pagination } = await response.json();
+console.log(`Found ${pagination.totalItems} documents`);
 
 // Filter by status
 const pendingResponse = await fetch(
@@ -244,10 +197,12 @@ const pendingDocs = await pendingResponse.json();
       ]
     }
   ],
-  "count": 42,
-  "currentPage": 1,
-  "perPage": 10,
-  "totalPages": 5
+  "pagination": {
+    "page": 1,
+    "perPage": 10,
+    "totalPages": 5,
+    "totalItems": 42
+  }
 }
 ```
 
@@ -673,72 +628,6 @@ The response includes signing URLs for each recipient:
 
 ---
 
-## Cancel Document
-
-Cancel a pending document. This changes its status from `PENDING` to `CANCELLED`.
-
-```
-POST /envelope/cancel
-```
-
-### Request Body
-
-| Field        | Type   | Required | Description                         |
-| ------------ | ------ | -------- | ----------------------------------- |
-| `envelopeId` | string | Yes      | Document ID                         |
-| `reason`     | string | No       | Reason for cancelling the document |
-
-### Code Examples
-
-<Tabs items={['curl', 'TypeScript']}>
-<Tab value="curl">
-```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/cancel" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "envelopeId": "envelope_abc123",
-    "reason": "The agreement is no longer needed."
-  }'
-```
-</Tab>
-<Tab value="TypeScript">
-```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope/cancel', {
-  method: 'POST',
-  headers: {
-    Authorization: 'api_xxxxxxxxxxxxxxxx',
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({
-    envelopeId: 'envelope_abc123',
-    reason: 'The agreement is no longer needed.',
-  }),
-});
-
-const { success } = await response.json();
-```
-</Tab>
-</Tabs>
-
-### Response
-
-```json
-{
-  "success": true
-}
-```
-
-### Behavior
-
-- Only documents in `PENDING` status can be cancelled. Other statuses return `400`.
-- Cancellation is not idempotent. Cancelling the same document again returns `400`.
-- The document owner and team members with `MANAGER` or higher permissions can cancel it. Requests for documents you cannot view return `404`; requests for visible documents without sufficient permissions return `401`.
-- A successful cancellation fires the `DOCUMENT_CANCELLED` webhook.
-- Cancellation emails are sent only to eligible non-CC, non-rejected recipients who were sent or opened the document.
-
----
-
 ## Delete Document
 
 Delete a document. Completed documents cannot be deleted.
@@ -781,7 +670,7 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/delete',
 
 const { success } = await response.json();
 
-```
+````
 </Tab>
 </Tabs>
 
@@ -791,7 +680,7 @@ const { success } = await response.json();
 {
   "success": true
 }
-```
+````
 
 ---
 
@@ -805,11 +694,9 @@ POST /envelope/get-many
 
 ### Request Body
 
-| Field      | Type   | Required | Description                                                                  |
-| ---------- | ------ | -------- | ---------------------------------------------------------------------------- |
-| `ids`      | object | Yes      | ID selector containing `type` and `ids`                                      |
-| `ids.type` | string | Yes      | `envelopeId`, `documentId`, or `templateId`                                  |
-| `ids.ids`  | array  | Yes      | 1-20 IDs: strings for `envelopeId`; numbers for `documentId` or `templateId` |
+| Field         | Type  | Required | Description           |
+| ------------- | ----- | -------- | --------------------- |
+| `envelopeIds` | array | Yes      | Array of document IDs |
 
 ### Code Examples
 
@@ -820,17 +707,12 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/get-many" \
   -H "Authorization: api_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: application/json" \
   -d '{
-    "ids": {
-      "type": "envelopeId",
-      "ids": ["envelope_abc123", "envelope_def456", "envelope_ghi789"]
-    }
+    "envelopeIds": ["envelope_abc123", "envelope_def456", "envelope_ghi789"]
   }'
 ```
 </Tab>
 <Tab value="TypeScript">
 ```typescript
-const requestedIds = ['envelope_abc123', 'envelope_def456', 'envelope_ghi789'];
-
 const response = await fetch('https://app.documenso.com/api/v2/envelope/get-many', {
   method: 'POST',
   headers: {
@@ -838,36 +720,16 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/get-many
     'Content-Type': 'application/json',
   },
   body: JSON.stringify({
-    ids: {
-      type: 'envelopeId',
-      ids: requestedIds,
-    },
+    envelopeIds: ['envelope_abc123', 'envelope_def456', 'envelope_ghi789'],
   }),
 });
 
-const { data } = await response.json();
+const documents = await response.json();
 
-```
+````
 </Tab>
 </Tabs>
 
-### Response
-
-```json
-{
-  "data": [
-    {
-      "id": "envelope_abc123",
-      "type": "DOCUMENT",
-      "status": "PENDING",
-      "title": "Service Agreement"
-    }
-  ]
-}
-```
-
-The endpoint silently omits envelopes you cannot access instead of returning `404`. Compare `data.length` with `requestedIds.length` to detect omissions.
-
 ---
 
 ## Document Statuses
@@ -878,7 +740,6 @@ The endpoint silently omits envelopes you cannot access instead of returning `40
 | `PENDING` | Document has been sent. Waiting for recipients to sign. |
 | `COMPLETED` | All recipients have signed. Document is sealed. |
 | `REJECTED` | A recipient rejected the document. |
-| `CANCELLED` | The document was cancelled by its owner or a team member with `MANAGER` or higher permissions. |
 
 ### Status Transitions
 
@@ -886,13 +747,11 @@ The endpoint silently omits envelopes you cannot access instead of returning `40
 flowchart LR
   DRAFT --> PENDING --> COMPLETED
   PENDING --> REJECTED
-  PENDING --> CANCELLED
 ```
 
 - **DRAFT to PENDING**: Call the distribute endpoint
 - **PENDING to COMPLETED**: All recipients complete their signing
 - **PENDING to REJECTED**: A recipient rejects the document
-- **PENDING to CANCELLED**: The document owner or a team member with `MANAGER` or higher permissions cancels the document
 
 <Callout type="warn">
   You cannot modify recipients or fields after a document moves to `PENDING` status.
@@ -914,8 +773,8 @@ flowchart LR
 | Parameter  | Values                                      | Description               |
 | ---------- | ------------------------------------------- | ------------------------- |
 | `type`     | `DOCUMENT`, `TEMPLATE`                      | Filter by envelope type   |
-| `status`   | `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, `CANCELLED` | Filter by status          |
-| `source`   | `DOCUMENT`, `TEMPLATE`, `TEMPLATE_DIRECT_LINK`          | Filter by creation source |
+| `status`   | `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED` | Filter by status          |
+| `source`   | `DOCUMENT`, `TEMPLATE`, `API`               | Filter by creation source |
 | `folderId` | string                                      | Filter by folder          |
 
 ### Sorting
@@ -941,10 +800,10 @@ async function getAllPendingDocuments() {
       },
     );
 
-    const { data, currentPage, totalPages } = await response.json();
+    const { data, pagination } = await response.json();
     documents.push(...data);
 
-    hasMore = currentPage < totalPages;
+    hasMore = page < pagination.totalPages;
     page++;
   }
 

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

@@ -6,8 +6,6 @@ description: Add signature and form fields to documents 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).
@@ -21,13 +19,13 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 | `secondaryId`    | string         | Secondary identifier for audit logs          |
 | `type`           | string         | Field type (see [Field Types](#field-types)) |
 | `recipientId`    | number         | ID of the recipient assigned to this field   |
-| `envelopeId`     | string         | ID of the parent envelope                    |
+| `envelopeId`     | number         | ID of the parent envelope                    |
 | `envelopeItemId` | string         | ID of the PDF item the field is placed on    |
 | `page`           | number         | Page number (1-indexed)                      |
-| `positionX`      | string         | X coordinate as percentage (0-100), a decimal serialized as a string |
-| `positionY`      | string         | Y coordinate as percentage (0-100), a decimal serialized as a string |
-| `width`          | string         | Width as percentage of page (0-100), a decimal serialized as a string |
-| `height`         | string         | Height as percentage of page (0-100), a decimal serialized as a string |
+| `positionX`      | number         | X coordinate as percentage (0-100)           |
+| `positionY`      | number         | Y coordinate as percentage (0-100)           |
+| `width`          | number         | Width as percentage of page (0-100)          |
+| `height`         | number         | Height as percentage of page (0-100)         |
 | `customText`     | string         | Value entered by the recipient               |
 | `inserted`       | boolean        | Whether the field has been completed         |
 | `fieldMeta`      | object \| null | Type-specific configuration options          |
@@ -40,19 +38,18 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
   "secondaryId": "field_abc123",
   "type": "SIGNATURE",
   "recipientId": 123,
-  "envelopeId": "envelope_abcdefhiklmnorst",
-  "envelopeItemId": "envelope_item_abcdefhiklmnorst",
+  "envelopeId": 789,
+  "envelopeItemId": "envelope_item_xyz",
   "page": 1,
-  "positionX": "10",
-  "positionY": "80",
-  "width": "30",
-  "height": "5",
+  "positionX": 10,
+  "positionY": 80,
+  "width": 30,
+  "height": 5,
   "customText": "",
   "inserted": false,
   "fieldMeta": {
     "type": "signature",
-    "required": true,
-    "overflow": "auto"
+    "required": true
   }
 }
 ```
@@ -64,7 +61,7 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 | Type             | Description                               | Auto-filled |
 | ---------------- | ----------------------------------------- | ----------- |
 | `SIGNATURE`      | Drawn, typed, or uploaded signature       | No          |
-| `FREE_SIGNATURE` | Legacy free-form signature. Accepted by the v2 create schema but rejected by the v1 API and unsupported in the signing UI — avoid in new integrations | No          |
+| `FREE_SIGNATURE` | Unrestricted signature without validation | No          |
 | `INITIALS`       | Recipient's initials                      | No          |
 | `NAME`           | Recipient's full name                     | Yes         |
 | `EMAIL`          | Recipient's email address                 | Yes         |
@@ -137,12 +134,10 @@ POST /envelope/field/create-many
 
 ### Request Body
 
-| Field        | Type   | Required | Description                     |
-| ------------ | ------ | -------- | ------------------------------- |
-| `envelopeId` | string | Yes      | The envelope ID                 |
-| `data`       | array  | Yes      | Array of field configurations   |
-
-Each entry in `data` requires a `type`, a `recipientId`, and a position — either explicit coordinates (`page`, `positionX`, `positionY`, `width`, `height`) or a [text placeholder](#placeholder-based-field-positioning) (`placeholder` with optional `width`, `height`, and `matchAll`). Optional per-entry properties: `envelopeItemId` (which PDF in the envelope to place the field on; defaults to the first item) and `fieldMeta`.
+| Field       | Type   | Required | Description                     |
+| ----------- | ------ | -------- | ------------------------------- |
+| `documentId`| number | Yes      | The document ID                 |
+| `fields`    | array  | Yes      | Array of field configurations   |
 
 ### Code Examples
 
@@ -153,32 +148,32 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/field/create-many" \
   -H "Authorization: api_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: application/json" \
   -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
-    "data": [
+    "documentId": 123,
+    "fields": [
       {
         "type": "SIGNATURE",
         "recipientId": 456,
-        "page": 1,
-        "positionX": 10,
-        "positionY": 80,
+        "pageNumber": 1,
+        "pageX": 10,
+        "pageY": 80,
         "width": 30,
         "height": 5
       },
       {
         "type": "DATE",
         "recipientId": 456,
-        "page": 1,
-        "positionX": 50,
-        "positionY": 80,
+        "pageNumber": 1,
+        "pageX": 50,
+        "pageY": 80,
         "width": 20,
         "height": 3
       },
       {
         "type": "TEXT",
         "recipientId": 456,
-        "page": 1,
-        "positionX": 10,
-        "positionY": 70,
+        "pageNumber": 1,
+        "pageX": 10,
+        "pageY": 70,
         "width": 40,
         "height": 4,
         "fieldMeta": {
@@ -204,32 +199,32 @@ const response = await fetch(
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
-      data: [
+      documentId: 123,
+      fields: [
         {
           type: 'SIGNATURE',
           recipientId: 456,
-          page: 1,
-          positionX: 10,
-          positionY: 80,
+          pageNumber: 1,
+          pageX: 10,
+          pageY: 80,
           width: 30,
           height: 5,
         },
         {
           type: 'DATE',
           recipientId: 456,
-          page: 1,
-          positionX: 50,
-          positionY: 80,
+          pageNumber: 1,
+          pageX: 50,
+          pageY: 80,
           width: 20,
           height: 3,
         },
         {
           type: 'TEXT',
           recipientId: 456,
-          page: 1,
-          positionX: 10,
-          positionY: 70,
+          pageNumber: 1,
+          pageX: 10,
+          pageY: 70,
           width: 40,
           height: 4,
           fieldMeta: {
@@ -244,8 +239,8 @@ const response = await fetch(
   }
 );
 
-const { data } = await response.json();
-console.log(`Created ${data.length} fields`);
+const { fields } = await response.json();
+console.log(`Created ${fields.length} fields`);
 
 ````
 </Tab>
@@ -255,68 +250,36 @@ console.log(`Created ${data.length} fields`);
 
 ```json
 {
-  "data": [
+  "fields": [
     {
       "id": 101,
-      "secondaryId": "field_abc123",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
       "type": "SIGNATURE",
       "recipientId": 456,
       "page": 1,
-      "positionX": "10",
-      "positionY": "80",
-      "width": "30",
-      "height": "5",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "signature",
-        "fontSize": 18,
-        "overflow": "auto"
-      }
+      "positionX": 10,
+      "positionY": 80,
+      "width": 30,
+      "height": 5
     },
     {
       "id": 102,
-      "secondaryId": "field_def456",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
       "type": "DATE",
       "recipientId": 456,
       "page": 1,
-      "positionX": "50",
-      "positionY": "80",
-      "width": "20",
-      "height": "3",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "date",
-        "fontSize": 12,
-        "textAlign": "left",
-        "overflow": "auto"
-      }
+      "positionX": 50,
+      "positionY": 80,
+      "width": 20,
+      "height": 3
     },
     {
       "id": 103,
-      "secondaryId": "field_ghi789",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
       "type": "TEXT",
       "recipientId": 456,
       "page": 1,
-      "positionX": "10",
-      "positionY": "70",
-      "width": "40",
-      "height": "4",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "text",
-        "label": "Job Title",
-        "placeholder": "Enter your job title",
-        "required": true
-      }
+      "positionX": 10,
+      "positionY": 70,
+      "width": 40,
+      "height": 4
     }
   ]
 }
@@ -336,10 +299,8 @@ POST /envelope/field/update-many
 
 | Field        | Type   | Required | Description                   |
 | ------------ | ------ | -------- | ----------------------------- |
-| `envelopeId` | string | Yes      | The envelope ID               |
-| `data`       | array  | Yes      | Array of field update objects |
-
-Each entry in `data` requires the field `id` and `type`. Position properties (`page`, `positionX`, `positionY`, `width`, `height`), `envelopeItemId`, and `fieldMeta` are optional — only supplied values are updated. Placeholder positioning is not supported when updating; use coordinates.
+| `documentId` | number | Yes      | The document ID               |
+| `fields`     | array  | Yes      | Array of field update objects |
 
 ### Code Examples
 
@@ -350,17 +311,17 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/field/update-many" \
   -H "Authorization: api_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: application/json" \
   -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
-    "data": [
+    "documentId": 123,
+    "fields": [
       {
         "id": 101,
         "type": "SIGNATURE",
-        "positionY": 85
+        "pageY": 85
       },
       {
         "id": 102,
         "type": "DATE",
-        "positionY": 85
+        "pageY": 85
       }
     ]
   }'
@@ -377,16 +338,16 @@ const response = await fetch(
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
-      data: [
-        { id: 101, type: 'SIGNATURE', positionY: 85 },
-        { id: 102, type: 'DATE', positionY: 85 },
+      documentId: 123,
+      fields: [
+        { id: 101, type: 'SIGNATURE', pageY: 85 },
+        { id: 102, type: 'DATE', pageY: 85 },
       ],
     }),
   }
 );
 
-const { data } = await response.json();
+const { fields } = await response.json();
 
 ````
 </Tab>
@@ -396,48 +357,9 @@ const { data } = await response.json();
 
 ```json
 {
-  "data": [
-    {
-      "id": 101,
-      "secondaryId": "field_abc123",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
-      "type": "SIGNATURE",
-      "recipientId": 456,
-      "page": 1,
-      "positionX": "10",
-      "positionY": "85",
-      "width": "30",
-      "height": "5",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "signature",
-        "fontSize": 18,
-        "overflow": "auto"
-      }
-    },
-    {
-      "id": 102,
-      "secondaryId": "field_def456",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
-      "type": "DATE",
-      "recipientId": 456,
-      "page": 1,
-      "positionX": "50",
-      "positionY": "85",
-      "width": "20",
-      "height": "3",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "date",
-        "fontSize": 12,
-        "textAlign": "left",
-        "overflow": "auto"
-      }
-    }
+  "fields": [
+    { "id": 101, "type": "SIGNATURE", "positionY": 85 },
+    { "id": 102, "type": "DATE", "positionY": 85 }
   ]
 }
 ````
@@ -521,8 +443,8 @@ Fields use percentage-based coordinates relative to the PDF page dimensions.
 (0,0) ─────────────────────────── (100,0)
   │                                   │
   │    ┌─────────┐                    │
-  │    │  Field  │ (positionX: 10,    │
-  │    │         │  positionY: 20,    │
+  │    │  Field  │ (pageX: 10,        │
+  │    │         │  pageY: 20,        │
   │    └─────────┘  width: 30,        │
   │                 height: 5)        │
   │                                   │
@@ -535,9 +457,9 @@ Fields use percentage-based coordinates relative to the PDF page dimensions.
 const field = {
   type: 'SIGNATURE',
   recipientId: 123,
-  page: 1,
-  positionX: 60, // 60% from left
-  positionY: 85, // 85% from top (near bottom)
+  pageNumber: 1,
+  pageX: 60, // 60% from left
+  pageY: 85, // 85% from top (near bottom)
   width: 30, // 30% of page width
   height: 8, // 8% of page height
 };
@@ -557,33 +479,6 @@ This approach is useful when generating PDFs programmatically or using templates
 
 See the [PDF Placeholders](/docs/users/documents/advanced/pdf-placeholders) guide for the full placeholder format reference, including supported field types, recipient identifiers, and field options.
 
-### Placeholder Positioning via the API
-
-`POST /envelope/field/create-many` accepts a placeholder position in place of coordinates. Instead of `page`, `positionX`, `positionY`, `width`, and `height`, pass:
-
-| Field         | Type    | Required | Description                                                                                                  |
-| ------------- | ------- | -------- | ------------------------------------------------------------------------------------------------------------ |
-| `placeholder` | string  | Yes      | Text to search for in the PDF (e.g. `{{name}}`). The field is placed at the bounding box of the first match. |
-| `width`       | number  | No       | Override the field width. Defaults to the width of the matched text.                                          |
-| `height`      | number  | No       | Override the field height. Defaults to the height of the matched text.                                        |
-| `matchAll`    | boolean | No       | Create a field at every occurrence of the placeholder instead of only the first.                              |
-
-```json
-{
-  "envelopeId": "envelope_abcdefhiklmnorst",
-  "data": [
-    {
-      "type": "SIGNATURE",
-      "recipientId": 456,
-      "placeholder": "{{signature}}",
-      "matchAll": true
-    }
-  ]
-}
-```
-
-`POST /envelope/field/update-many` does not accept placeholders — field updates are coordinate-only.
-
 ---
 
 ## Field Meta Options
@@ -748,15 +643,15 @@ All field types support these base options:
 Create a document with a signature block containing multiple field types:
 
 ```typescript
-async function addSignatureBlock(envelopeId: string, recipientId: number) {
-  const data = [
+async function addSignatureBlock(documentId: number, recipientId: number) {
+  const fields = [
     // Signature
     {
       type: 'SIGNATURE',
       recipientId,
-      page: 1,
-      positionX: 10,
-      positionY: 80,
+      pageNumber: 1,
+      pageX: 10,
+      pageY: 80,
       width: 30,
       height: 8,
       fieldMeta: {
@@ -768,9 +663,9 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
     {
       type: 'NAME',
       recipientId,
-      page: 1,
-      positionX: 10,
-      positionY: 90,
+      pageNumber: 1,
+      pageX: 10,
+      pageY: 90,
       width: 30,
       height: 4,
       fieldMeta: {
@@ -782,9 +677,9 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
     {
       type: 'DATE',
       recipientId,
-      page: 1,
-      positionX: 50,
-      positionY: 80,
+      pageNumber: 1,
+      pageX: 50,
+      pageY: 80,
       width: 20,
       height: 4,
       fieldMeta: {
@@ -796,9 +691,9 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
     {
       type: 'TEXT',
       recipientId,
-      page: 1,
-      positionX: 50,
-      positionY: 90,
+      pageNumber: 1,
+      pageX: 50,
+      pageY: 90,
       width: 30,
       height: 4,
       fieldMeta: {
@@ -815,7 +710,7 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
       Authorization: 'api_xxxxxxxxxxxxxxxx',
       'Content-Type': 'application/json',
     },
-    body: JSON.stringify({ envelopeId, data }),
+    body: JSON.stringify({ documentId, fields }),
   });
 
   return response.json();

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

@@ -60,8 +60,8 @@ Authorization: api_xxxxxxxxxxxxxxxx
     href="/docs/developers/api/templates"
   />
   <Card
-    title="Team-scoped access"
-    description="Use team-scoped API tokens with envelope endpoints."
+    title="Teams"
+    description="Manage teams and team members."
     href="/docs/developers/api/teams"
   />
 </Cards>

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

@@ -119,7 +119,7 @@ Full reference in the [V2 OpenAPI reference](https://openapi.documenso.com).
 | ------------------------------------------------- | ----------------------------------------------------- |
 | `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` (body changes from `documentIds: number[]` to `ids: { type: "documentId"; ids: number[] }`) |
+| `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`                        |
@@ -140,7 +140,7 @@ Full reference in the [V2 OpenAPI reference](https://openapi.documenso.com).
 | ------------------------------------- | ------------------------------------------------ |
 | `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` (body changes from `templateIds: number[]` to `ids: { type: "templateId"; ids: number[] }`) |
+| `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`                   |

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

@@ -11,12 +11,6 @@ Documenso enforces rate limits on all API endpoints to ensure service stability.
 
 ## HTTP Rate Limits
 
-The rate limit applies to:
-
-- `/api/v1/*`
-- `/api/v2/*`
-- `/api/v2-beta/*`
-
 **Limit:** 1000 requests per minute per IP address  
 **Response:** 429 Too Many Requests
 
@@ -25,7 +19,7 @@ The rate limit applies to:
   this value, in which case you can be rate-limited before reaching the global limit.
 </Callout>
 
-### Global per-IP 429 Response
+### Rate Limit Response
 
 ```json
 {
@@ -33,22 +27,10 @@ The rate limit applies to:
 }
 ```
 
-### Rate Limit Headers
-
-Responses from `/api/v1/*`, `/api/v2/*`, and `/api/v2-beta/*` include these headers. The only
-exception is CORS preflight (`OPTIONS`) requests, which are answered before the rate limiter runs
-and carry no rate limit headers:
-
-| Header                  | Description                                                            |
-| ----------------------- | ---------------------------------------------------------------------- |
-| `X-RateLimit-Limit`     | Maximum requests allowed in the current global window                  |
-| `X-RateLimit-Remaining` | Requests remaining in the current global window                        |
-| `X-RateLimit-Reset`     | End of the current global window, as a Unix epoch timestamp in seconds |
-
-A 429 response from a windowed limiter also includes `Retry-After`, in seconds, with a minimum
-value of `1`. The global API limit uses fixed, epoch-aligned one-minute buckets, so the actual wait
-until the next window is between 1 and 60 seconds. Honor `Retry-After` exactly instead of sleeping
-for a fixed 60 seconds. See the [Retry-After handling example](/docs/developers/examples/common-workflows#error-handling-patterns).
+<Callout type="warn">
+  No rate limit headers are currently provided. When you receive a 429 response, wait at least 60
+  seconds before retrying.
+</Callout>
 
 ## Resource Limits
 
@@ -62,55 +44,24 @@ Beyond HTTP rate limits, your account has usage limits based on your subscriptio
 | Total Recipients | 10   | Unlimited | Unlimited   | Unlimited  |
 | Direct Templates | 3    | Unlimited | Unlimited   | Unlimited  |
 
-### Organisation Limit 429 Responses
+### Error Response
 
-Organisation windowed limits and organisation monthly quotas produce 429 responses whose body
-shape depends on the API version, and neither matches the global per-IP limiter's
-`{ "error": "..." }` body.
-
-On `/api/v1/*`, the body contains only a message:
+When you exceed a resource limit:
 
 ```json
 {
-  "message": "Too many requests, please try again later. Contact support if you require higher limits."
+  "error": "You have reached your document limit for this month. Please upgrade your plan.",
+  "code": "LIMIT_EXCEEDED",
+  "statusCode": 400
 }
 ```
 
-On `/api/v2/*` and `/api/v2-beta/*`, the body is a structured error object:
-
-```json
-{
-  "message": "Too many requests, please try again later. Contact support if you require higher limits.",
-  "code": "TOO_MANY_REQUESTS",
-  "data": {
-    "code": "TOO_MANY_REQUESTS",
-    "httpStatus": 429,
-    "appError": {
-      "code": "TOO_MANY_REQUESTS",
-      "message": "Too many requests, please try again later. Contact support if you require higher limits."
-    }
-  }
-}
-```
-
-Organisation windowed limit responses include the `X-RateLimit-*` headers and `Retry-After` for
-their own window. Monthly quota responses carry no quota-specific rate limit headers or
-`Retry-After` because the quota is not a time window; rely on the status code and message instead.
-
 ## Error Codes
 
-| Code                | Status | Description                                                        |
-| ------------------- | ------ | ------------------------------------------------------------------ |
-| `TOO_MANY_REQUESTS` | 429    | Global per-IP, organisation windowed, or monthly quota exceeded    |
-| `LIMIT_EXCEEDED`    | 400    | Resource usage limit exceeded                                      |
-
-There are three sources of `TOO_MANY_REQUESTS` responses:
-
-1. The global per-IP limit, returning the `{ "error": "..." }` body shown above.
-2. Organisation windowed rate limits for the `api`, `document`, and `email` counters.
-3. Organisation monthly quotas for the same three counters. Every authenticated API request
-   consumes the `api` counter, so any endpoint can return this 429 once the monthly API quota is
-   exhausted — not just envelope-related ones.
+| Code                | Status | Description                   |
+| ------------------- | ------ | ----------------------------- |
+| `TOO_MANY_REQUESTS` | 429    | HTTP rate limit exceeded      |
+| `LIMIT_EXCEEDED`    | 400    | Resource usage limit exceeded |
 
 ---
 

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

@@ -6,8 +6,6 @@ description: Add and manage envelope recipients 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).
@@ -18,7 +16,7 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 ```json
 {
   "id": 123,
-  "envelopeId": "envelope_abcdefhiklmnorst",
+  "envelopeId": "clu1abc2def3ghi4jkl",
   "email": "signer@example.com",
   "name": "John Doe",
   "role": "SIGNER",
@@ -136,7 +134,7 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/recipient/create-many" \
   -H "Authorization: api_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: application/json" \
   -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
+    "envelopeId": "clu1abc2def3ghi4jkl",
     "data": [
       {
         "email": "signer@example.com",
@@ -166,7 +164,7 @@ const response = await fetch(
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
+      envelopeId: 'clu1abc2def3ghi4jkl',
       data: [
         {
           email: 'signer@example.com',
@@ -198,7 +196,7 @@ const { data: recipients } = await response.json();
   "data": [
     {
       "id": 789,
-      "envelopeId": "envelope_abcdefhiklmnorst",
+      "envelopeId": "clu1abc2def3ghi4jkl",
       "email": "signer@example.com",
       "name": "John Doe",
       "role": "SIGNER",
@@ -211,7 +209,7 @@ const { data: recipients } = await response.json();
     },
     {
       "id": 790,
-      "envelopeId": "envelope_abcdefhiklmnorst",
+      "envelopeId": "clu1abc2def3ghi4jkl",
       "email": "approver@example.com",
       "name": "Jane Smith",
       "role": "APPROVER",
@@ -264,7 +262,7 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/recipient/update-many" \
   -H "Authorization: api_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: application/json" \
   -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
+    "envelopeId": "clu1abc2def3ghi4jkl",
     "data": [
       {
         "id": 789,
@@ -286,7 +284,7 @@ const response = await fetch(
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
+      envelopeId: 'clu1abc2def3ghi4jkl',
       data: [
         {
           id: 789,
@@ -389,7 +387,7 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/recipien
     'Content-Type': 'application/json',
   },
   body: JSON.stringify({
-    envelopeId: 'envelope_abcdefhiklmnorst',
+    envelopeId: 'clu1abc2def3ghi4jkl',
     data: [
       {
         email: 'approver@example.com',
@@ -464,7 +462,7 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/recipien
     'Content-Type': 'application/json',
   },
   body: JSON.stringify({
-    envelopeId: 'envelope_abcdefhiklmnorst',
+    envelopeId: 'clu1abc2def3ghi4jkl',
     data: [
       {
         email: 'signer@example.com',

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

@@ -1,29 +1,44 @@
 ---
-title: Team-Scoped API Access
-description: Use team-scoped API tokens with document and template envelopes.
+title: Teams API
+description: Manage team resources, documents, and templates with team-scoped API tokens.
 ---
 
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 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).
 </Callout>
 
-## Team Context
+## Team Object
 
-<Callout type="info">
-  The V2 REST API does not expose `/team/*` endpoints. Create and manage teams, members, and team
-  settings in the Documenso web application. This page explains how a team-scoped token applies
-  that team context to supported API resources.
-</Callout>
+A team object contains the following properties:
 
-The API resolves the team from your token. You do not pass a team ID when creating, listing, or
-using envelopes. The token's team ID determines which resources the request can access.
+| Property          | Type           | Description                                         |
+| ----------------- | -------------- | --------------------------------------------------- |
+| `id`              | number         | Unique team identifier                              |
+| `name`            | string         | Team display name                                   |
+| `url`             | string         | Unique team URL slug                                |
+| `createdAt`       | string         | ISO 8601 timestamp                                  |
+| `avatarImageId`   | string \| null | ID of the team's avatar image                       |
+| `organisationId`  | string         | ID of the parent organisation                       |
+| `currentTeamRole` | string         | Your role in the team: `ADMIN`, `MANAGER`, `MEMBER` |
+
+### Example Team Object
+
+```json
+{
+  "id": 123,
+  "name": "Engineering",
+  "url": "engineering",
+  "createdAt": "2025-01-15T10:30:00.000Z",
+  "avatarImageId": null,
+  "organisationId": "org_abc123",
+  "currentTeamRole": "ADMIN"
+}
+```
 
 ## Team-Scoped API Tokens
 
@@ -80,7 +95,7 @@ Documents created with a team token belong to that team:
 <Tab value="curl">
 ```bash
 curl -X POST "https://app.documenso.com/api/v2/envelope/create" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
+  -H "Authorization: api_team_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: multipart/form-data" \
   -F 'payload={
     "type": "DOCUMENT",
@@ -141,26 +156,26 @@ Retrieve all documents belonging to the team:
 <Tab value="curl">
 ```bash
 # List all team documents
-curl -X GET "https://app.documenso.com/api/v2/envelope?type=DOCUMENT" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx"
+curl -X GET "https://app.documenso.com/api/v2/envelope" \
+  -H "Authorization: api_team_xxxxxxxxxxxxxxxx"
 
 # Filter by status
-curl -X GET "https://app.documenso.com/api/v2/envelope?type=DOCUMENT&status=PENDING" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx"
+curl -X GET "https://app.documenso.com/api/v2/envelope?status=PENDING" \
+  -H "Authorization: api_team_xxxxxxxxxxxxxxxx"
 ````
 
 </Tab>
 <Tab value="TypeScript">
 ```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope?type=DOCUMENT', {
+const response = await fetch('https://app.documenso.com/api/v2/envelope', {
   method: 'GET',
   headers: {
     Authorization: TEAM_API_TOKEN,
   },
 });
 
-const { data, count } = await response.json();
-console.log(`Found ${count} team documents`);
+const { data, pagination } = await response.json();
+console.log(`Found ${pagination.totalItems} team documents`);
 
 ````
 </Tab>
@@ -175,11 +190,10 @@ Templates created with a team token are shared across the team.
 <Tabs items={['curl', 'TypeScript']}>
 <Tab value="curl">
 ```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/create" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
+curl -X POST "https://app.documenso.com/api/v2/template/create" \
+  -H "Authorization: api_team_xxxxxxxxxxxxxxxx" \
   -H "Content-Type: multipart/form-data" \
   -F 'payload={
-    "type": "TEMPLATE",
     "title": "NDA Template",
     "recipients": [
       {
@@ -209,7 +223,6 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/create" \
 const form = new FormData();
 
 const payload = {
-  type: 'TEMPLATE',
   title: 'NDA Template',
   recipients: [
     {
@@ -236,7 +249,7 @@ form.append('files', fs.createReadStream('./nda-template.pdf'), {
   contentType: 'application/pdf',
 });
 
-const response = await fetch('https://app.documenso.com/api/v2/envelope/create', {
+const response = await fetch('https://app.documenso.com/api/v2/template/create', {
   method: 'POST',
   headers: {
     Authorization: TEAM_API_TOKEN,
@@ -244,8 +257,8 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/create',
   body: form,
 });
 
-const { id } = await response.json();
-console.log('Created team template envelope:', id);
+const template = await response.json();
+console.log('Created team template:', template.id);
 ````
 </Tab>
 </Tabs>
@@ -255,14 +268,14 @@ console.log('Created team template envelope:', id);
 <Tabs items={['curl', 'TypeScript']}>
 <Tab value="curl">
 ```bash
-curl -X GET "https://app.documenso.com/api/v2/envelope?type=TEMPLATE" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx"
+curl -X GET "https://app.documenso.com/api/v2/template" \
+  -H "Authorization: api_team_xxxxxxxxxxxxxxxx"
 ````
 
 </Tab>
 <Tab value="TypeScript">
 ```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope?type=TEMPLATE', {
+const response = await fetch('https://app.documenso.com/api/v2/template', {
   method: 'GET',
   headers: {
     Authorization: TEAM_API_TOKEN,
@@ -317,19 +330,19 @@ const SALES_TEAM_TOKEN = process.env.SALES_TEAM_API_TOKEN;
 const LEGAL_TEAM_TOKEN = process.env.LEGAL_TEAM_API_TOKEN;
 
 // Get pending documents from sales team
-const salesResponse = await fetch('https://app.documenso.com/api/v2/envelope?type=DOCUMENT&status=PENDING', {
+const salesResponse = await fetch('https://app.documenso.com/api/v2/envelope?status=PENDING', {
   headers: { Authorization: SALES_TEAM_TOKEN },
 });
 const salesDocs = await salesResponse.json();
 
 // Get completed documents from legal team
-const legalResponse = await fetch('https://app.documenso.com/api/v2/envelope?type=DOCUMENT&status=COMPLETED', {
+const legalResponse = await fetch('https://app.documenso.com/api/v2/envelope?status=COMPLETED', {
   headers: { Authorization: LEGAL_TEAM_TOKEN },
 });
 const legalDocs = await legalResponse.json();
 
-console.log(`Sales team: ${salesDocs.count} pending`);
-console.log(`Legal team: ${legalDocs.count} completed`);
+console.log(`Sales team: ${salesDocs.pagination.totalItems} pending`);
+console.log(`Legal team: ${legalDocs.pagination.totalItems} completed`);
 ```
 
 ## Error Responses

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

@@ -13,194 +13,7 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
   see the [OpenAPI Reference](https://openapi.documenso.com).
 </Callout>
 
-## Use a Template Envelope
-
-New integrations should create a document from a template envelope with the Envelope API.
-
-```
-POST /envelope/use
-Content-Type: multipart/form-data
-```
-
-The request uses `multipart/form-data`:
-
-| Part      | Type    | Required | Description                                                        |
-| --------- | ------- | -------- | ------------------------------------------------------------------ |
-| `payload` | JSON    | Yes      | Template envelope ID, recipient details, and document settings     |
-| `files`   | File(s) | No       | Replacement PDFs referenced by entries in `customDocumentData`     |
-
-### Payload Schema
-
-| Field                | Type    | Required | Description                                                              |
-| -------------------- | ------- | -------- | ------------------------------------------------------------------------ |
-| `envelopeId`         | string  | Yes      | ID of the template envelope                                              |
-| `externalId`         | string  | No       | Your identifier for the created document envelope                        |
-| `recipients`         | array   | No       | Recipient details mapped to recipients in the template                    |
-| `distributeDocument` | boolean | No       | If `true`, create the document as pending and distribute it               |
-| `customDocumentData` | array   | No       | Maps uploaded replacement PDFs to template envelope items                 |
-| `folderId`           | string  | No       | Folder in which to create the document                                    |
-| `prefillFields`      | array   | No       | Field values to prefill before distribution                               |
-| `override`           | object  | No       | Template values to override for the created document                      |
-| `attachments`        | array   | No       | Link attachments to add to the document                                   |
-| `formValues`         | object  | No       | PDF form values to apply                                                   |
-
-Each recipient entry accepts the following fields:
-
-| Field          | Type    | Required | Description                                  |
-| -------------- | ------- | -------- | -------------------------------------------- |
-| `id`           | number  | Yes      | Recipient ID from the template envelope      |
-| `email`        | string  | Yes      | Recipient email address                      |
-| `name`         | string  | No       | Recipient display name                       |
-| `signingOrder` | number  | No       | Recipient position in sequential signing     |
-
-Each `customDocumentData` entry maps an uploaded file to a template item:
-
-| Field            | Type             | Required | Description                                                     |
-| ---------------- | ---------------- | -------- | --------------------------------------------------------------- |
-| `identifier`     | string \| number | Yes      | Uploaded filename or zero-based file index                      |
-| `envelopeItemId` | string           | Yes      | Template envelope item whose PDF the uploaded file replaces     |
-
-### Code Examples
-
-<Tabs items={['curl', 'TypeScript']}>
-<Tab value="curl">
-```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/use" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
-  -F 'payload={
-    "envelopeId": "envelope_template123",
-    "externalId": "contract-2025-001",
-    "recipients": [
-      {
-        "id": 1,
-        "email": "john.doe@example.com",
-        "name": "John Doe"
-      }
-    ],
-    "prefillFields": [
-      {
-        "id": 101,
-        "type": "text",
-        "value": "Senior Software Engineer"
-      }
-    ],
-    "distributeDocument": false
-  }'
-```
-</Tab>
-<Tab value="TypeScript">
-```typescript
-const form = new FormData();
-
-form.append(
-  'payload',
-  JSON.stringify({
-    envelopeId: 'envelope_template123',
-    externalId: 'contract-2025-001',
-    recipients: [
-      {
-        id: 1,
-        email: 'john.doe@example.com',
-        name: 'John Doe',
-      },
-    ],
-    prefillFields: [
-      {
-        id: 101,
-        type: 'text',
-        value: 'Senior Software Engineer',
-      },
-    ],
-    distributeDocument: false,
-  }),
-);
-
-const response = await fetch('https://app.documenso.com/api/v2/envelope/use', {
-  method: 'POST',
-  headers: {
-    Authorization: 'api_xxxxxxxxxxxxxxxx',
-  },
-  body: form,
-});
-
-const document = await response.json();
-console.log('Created document envelope:', document.id);
-```
-</Tab>
-</Tabs>
-
-### Response
-
-```json
-{
-  "id": "envelope_document123",
-  "recipients": [
-    {
-      "id": 1,
-      "name": "John Doe",
-      "email": "john.doe@example.com",
-      "token": "recipient_token",
-      "role": "SIGNER",
-      "signingOrder": 1,
-      "signingUrl": "https://app.documenso.com/sign/recipient_token"
-    }
-  ]
-}
-```
-
-### Distribute the Created Envelope
-
-If you leave `distributeDocument` unset or set it to `false`, distribute the created document with
-`POST /envelope/distribute`. Its response confirms delivery and includes each recipient's signing URL.
-
-```typescript
-const distributionResponse = await fetch(
-  'https://app.documenso.com/api/v2/envelope/distribute',
-  {
-    method: 'POST',
-    headers: {
-      Authorization: 'api_xxxxxxxxxxxxxxxx',
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      envelopeId: document.id,
-    }),
-  },
-);
-
-const distribution = await distributionResponse.json();
-console.log('Signing URL:', distribution.recipients[0].signingUrl);
-```
-
-```json
-{
-  "success": true,
-  "id": "envelope_document123",
-  "recipients": [
-    {
-      "id": 1,
-      "name": "John Doe",
-      "email": "john.doe@example.com",
-      "token": "recipient_token",
-      "role": "SIGNER",
-      "signingOrder": 1,
-      "signingUrl": "https://app.documenso.com/sign/recipient_token"
-    }
-  ]
-}
-```
-
----
-
-## Deprecated Template Endpoint Reference
-
-<Callout type="warn">
-  Every `/template/*` endpoint below is deprecated. Use the Envelope API for new integrations and
-  follow [Migrating to Envelopes](/docs/developers/api/migrate-to-envelopes) to replace existing calls.
-  The legacy reference remains here to support migrations.
-</Callout>
-
-## Legacy Template Object
+## Template Object
 
 A template object contains the following properties:
 
@@ -278,7 +91,7 @@ A template object contains the following properties:
 }
 ```
 
-## List Templates (Deprecated)
+## List Templates
 
 Retrieve a paginated list of templates.
 
@@ -326,8 +139,8 @@ const response = await fetch(`${BASE_URL}/template`, {
   },
 });
 
-const { data, count } = await response.json();
-console.log(`Found ${count} templates`);
+const { data, pagination } = await response.json();
+console.log(`Found ${pagination.totalItems} templates`);
 
 // Filter by type
 const privateResponse = await fetch(
@@ -368,16 +181,18 @@ const privateTemplates = await privateResponse.json();
       ]
     }
   ],
-  "count": 25,
-  "currentPage": 1,
-  "perPage": 10,
-  "totalPages": 3
+  "pagination": {
+    "page": 1,
+    "perPage": 10,
+    "totalPages": 3,
+    "totalItems": 25
+  }
 }
 ```
 
 ---
 
-## Get Template (Deprecated)
+## Get Template
 
 Retrieve a single template by ID.
 
@@ -423,9 +238,9 @@ Returns the full template object including recipients, fields, and metadata.
 
 ---
 
-## Create Document from Template (Deprecated)
+## Create Document from Template
 
-Create a new document using the deprecated template endpoint.
+Create a new document using a template. This is the primary way to use templates programmatically.
 
 <Callout type="info">
   This endpoint does not support [PDF placeholder parsing](/docs/users/documents/advanced/pdf-placeholders). Use `POST /envelope/create` for placeholder-based field positioning.
@@ -600,57 +415,32 @@ const prefilledDocument = await prefillResponse.json();
 
 ### Response
 
-The endpoint returns the full legacy document object. The selected fields below show both the numeric
-legacy `id` and canonical `envelopeId`. Recipient entries do not include a `signingUrl`.
+Returns the created document object with recipients and signing URLs.
 
 ```json
 {
-  "id": 789,
-  "envelopeId": "envelope_xyz789",
+  "id": "envelope_xyz789",
+  "type": "DOCUMENT",
   "status": "PENDING",
-  "source": "TEMPLATE",
   "title": "Employment Contract",
+  "source": "TEMPLATE",
   "externalId": "contract-2025-001",
   "recipients": [
     {
       "id": 1,
-      "envelopeId": "envelope_xyz789",
-      "documentId": 789,
-      "templateId": null,
       "email": "john.doe@example.com",
       "name": "John Doe",
       "role": "SIGNER",
       "signingStatus": "NOT_SIGNED",
-      "signingOrder": 1
+      "signingUrl": "https://app.documenso.com/sign/abc123"
     }
   ]
 }
-```
-
-To send a document created with `distributeDocument: false` and receive signing links, call
-`POST /envelope/distribute` with its `envelopeId`:
-
-```typescript
-const document = await response.json();
-
-const distributionResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-  method: 'POST',
-  headers: {
-    Authorization: API_TOKEN,
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({
-    envelopeId: document.envelopeId,
-  }),
-});
-
-const distribution = await distributionResponse.json();
-console.log('Signing URL:', distribution.recipients[0].signingUrl);
-```
+````
 
 ---
 
-## Override Template Settings (Deprecated)
+## Override Template Settings
 
 When creating a document from a template, you can override various settings:
 
@@ -698,7 +488,7 @@ const response = await fetch(`${BASE_URL}/template/use`, {
 
 ---
 
-## Prefill Fields (Deprecated)
+## Prefill Fields
 
 Prefill field values when creating a document from a template. This is useful for populating known data before sending.
 
@@ -787,7 +577,7 @@ const response = await fetch(`${BASE_URL}/template/use`, {
 
 ---
 
-## Update Template (Deprecated)
+## Update Template
 
 Update a template's properties.
 
@@ -853,7 +643,7 @@ const template = await response.json();
 
 ---
 
-## Duplicate Template (Deprecated)
+## Duplicate Template
 
 Create a copy of an existing template.
 
@@ -905,7 +695,7 @@ console.log('New template ID:', duplicatedTemplate.id);
 
 ---
 
-## Delete Template (Deprecated)
+## Delete Template
 
 Delete a template.
 
@@ -964,7 +754,7 @@ const { success } = await response.json();
 
 ---
 
-## Direct Link Templates (Deprecated)
+## Direct Link Templates
 
 Direct link templates allow recipients to create and sign documents without requiring you to explicitly create each document. When a recipient visits the direct link, a new document is automatically created from the template.
 
@@ -1108,7 +898,7 @@ const { success } = await response.json();
 
 ---
 
-## Custom Document Data (Deprecated)
+## Custom Document Data
 
 When creating a document from a template, you can replace the template's PDF with a custom PDF by using the `customDocumentData` parameter. This is useful when you need to generate the PDF dynamically while reusing the template's recipient and field configuration.
 
@@ -1123,7 +913,7 @@ See the [OpenAPI Reference](https://openapi.documenso.com) for the full request
 
 ---
 
-## Template Types (Legacy)
+## Template Types
 
 | Type      | Description                                                        |
 | --------- | ------------------------------------------------------------------ |
@@ -1132,7 +922,7 @@ See the [OpenAPI Reference](https://openapi.documenso.com) for the full request
 
 ---
 
-## Complete Legacy Example: Contract Workflow (Deprecated)
+## Complete Example: Contract Workflow
 
 This example demonstrates a complete workflow for using templates to send contracts.
 
@@ -1206,29 +996,16 @@ async function sendEmploymentContract(employeeData: {
         subject: `Employment Contract for ${employeeData.name}`,
         message: `Hi ${employeeData.name},\n\nPlease review and sign your employment contract.`,
       },
-      distributeDocument: false,
+      distributeDocument: true,
       externalId: `emp-contract-${Date.now()}`,
     }),
   });
 
   const document = await documentResponse.json();
 
-  // 5. Distribute the envelope and get recipient signing links
-  const distributionResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-    method: 'POST',
-    headers: {
-      Authorization: API_TOKEN,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      envelopeId: document.envelopeId,
-    }),
-  });
-  const distribution = await distributionResponse.json();
-
   return {
-    envelopeId: document.envelopeId,
-    signingUrl: distribution.recipients[0].signingUrl,
+    documentId: document.id,
+    signingUrl: document.recipients[0].signingUrl,
   };
 }
 
@@ -1241,7 +1018,7 @@ const result = await sendEmploymentContract({
   startDate: '2025-03-01',
 });
 
-console.log('Document created:', result.envelopeId);
+console.log('Document created:', result.documentId);
 console.log('Signing URL:', result.signingUrl);
 ````
 

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

@@ -51,7 +51,6 @@ async function createAndSendDocument(
   pdfBuffer: Buffer,
   filename: string,
   title: string,
-  externalId: string,
   recipients: Recipient[],
 ): Promise<CreateAndSendResult> {
   const recipientPayload = recipients.map((recipient, index) => ({
@@ -90,7 +89,6 @@ async function createAndSendDocument(
     JSON.stringify({
       type: 'DOCUMENT',
       title,
-      externalId,
       recipients: recipientPayload,
       meta: {
         subject: `Please sign: ${title}`,
@@ -147,7 +145,6 @@ const result = await createAndSendDocument(
   pdfBuffer,
   'contract.pdf',
   'Service Agreement',
-  'nda-contract-ndac214',
   [
     { email: 'client@example.com', name: 'John Smith', role: 'SIGNER' },
     { email: 'manager@company.com', name: 'Jane Doe', role: 'SIGNER' },
@@ -175,7 +172,6 @@ ENVELOPE_RESPONSE=$(curl -s -X POST "${BASE_URL}/envelope/create" \
   -F 'payload={
     "type": "DOCUMENT",
     "title": "Service Agreement",
-    "externalId": "nda-contract-ndac214",
     "recipients": [
       {
         "email": "client@example.com",
@@ -245,8 +241,6 @@ echo $DISTRIBUTE_RESPONSE | jq '.recipients[] | {email, signingUrl}'
 </Tab>
 </Tabs>
 
-`externalId` is your application's own reference for this document, such as an invoice number or a database key. Documenso stores it on the envelope and repeats it in every webhook as `payload.externalId`, so your handler can match the event to your record without keeping a lookup table of Documenso IDs. To react when everyone has signed, see [Workflow 4](#workflow-4-wait-for-completion-with-webhooks). To fetch the finished PDF, see [Workflow 5](#workflow-5-download-signed-documents).
-
 ---
 
 ## Workflow 2: Create Document from Template with Custom Data
@@ -262,11 +256,8 @@ Use templates for repeatable document workflows. This example creates an employm
     Map template fields by label and build a <code>prefillFields</code> array
   </Step>
   <Step>
-    Call <code>POST /template/use</code> with recipients and prefill data
-  </Step>
-  <Step>
-    Distribute the returned envelope via <code>POST /envelope/distribute</code> and read its signing
-    links
+    Call <code>POST /template/use</code> with recipients, prefill data, and{' '}
+    <code>distributeDocument: true</code>
   </Step>
 </Steps>
 
@@ -300,7 +291,7 @@ type TemplateRecipient = {
 async function sendEmploymentContract(
   templateId: number,
   employee: EmployeeData,
-): Promise<{ documentId: number; signingUrl: string }> {
+): Promise<{ documentId: string; signingUrl: string }> {
   const templateResponse = await fetch(`${BASE_URL}/template/${templateId}`, {
     headers: { Authorization: API_TOKEN },
   });
@@ -377,6 +368,7 @@ async function sendEmploymentContract(
         subject: `Your Employment Contract at ${employee.department}`,
         message: `Hi ${employee.name},\n\nPlease review and sign your employment contract for the ${employee.position} position.\n\nStart date: ${employee.startDate}`,
       },
+      distributeDocument: true,
       externalId: `emp-${Date.now()}-${employee.email.split('@')[0]}`,
     }),
   });
@@ -388,25 +380,9 @@ async function sendEmploymentContract(
 
   const document = await createResponse.json();
 
-  const distributeResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-    method: 'POST',
-    headers: {
-      Authorization: API_TOKEN,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ envelopeId: document.envelopeId }),
-  });
-
-  if (!distributeResponse.ok) {
-    const error = await distributeResponse.json();
-    throw new Error(`Failed to send document: ${error.message}`);
-  }
-
-  const distributeResult = await distributeResponse.json();
-
   return {
     documentId: document.id,
-    signingUrl: distributeResult.recipients[0].signingUrl,
+    signingUrl: document.recipients[0].signingUrl,
   };
 }
 
@@ -471,17 +447,12 @@ RESPONSE=$(curl -s -X POST "${BASE_URL}/template/use" \
       \"subject\": \"Your Employment Contract\",
       \"message\": \"Please review and sign your employment contract.\"
     },
+    \"distributeDocument\": true,
     \"externalId\": \"emp-$(date +%s)-alice\"
   }")
 
-ENVELOPE_ID=$(echo $RESPONSE | jq -r '.envelopeId')
-DISTRIBUTE_RESPONSE=$(curl -s -X POST "${BASE_URL}/envelope/distribute" \
-  -H "Authorization: ${API_TOKEN}" \
-  -H "Content-Type: application/json" \
-  -d "{\"envelopeId\": \"${ENVELOPE_ID}\"}")
-
-echo "Document created: $(echo $RESPONSE | jq -r '.id')"
-echo "Signing URL: $(echo $DISTRIBUTE_RESPONSE | jq -r '.recipients[0].signingUrl')"
+echo "Document created:"
+echo $RESPONSE | jq '{id, signingUrl: .recipients[0].signingUrl}'
 ````
 
 </Tab>
@@ -499,10 +470,8 @@ Send the same document to multiple recipients in parallel. Useful for policy ack
     Fetch the template and get the signer recipient slot ID
   </Step>
   <Step>
-    For each recipient, call <code>POST /template/use</code>
-  </Step>
-  <Step>
-    Distribute each returned envelope via <code>POST /envelope/distribute</code>
+    For each recipient, call <code>POST /template/use</code> with{' '}
+    <code>distributeDocument: true</code>
   </Step>
   <Step>
     Process in batches with a short delay to respect rate limits (e.g. 1000 requests/minute)
@@ -565,6 +534,7 @@ async function bulkSendFromTemplate(
             recipients: [
               { id: signerSlot.id, email: recipient.email, name: recipient.name },
             ],
+            distributeDocument: true,
             externalId: `bulk-${Date.now()}-${recipient.email}`,
           }),
         });
@@ -575,26 +545,10 @@ async function bulkSendFromTemplate(
         }
 
         const document = await response.json();
-
-        const distributeResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-          method: 'POST',
-          headers: {
-            Authorization: API_TOKEN,
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({ envelopeId: document.envelopeId }),
-        });
-
-        if (!distributeResponse.ok) {
-          const error = await distributeResponse.json();
-          throw new Error(error.message || 'Failed to distribute document');
-        }
-
-        const distributeResult = await distributeResponse.json();
         return {
           email: recipient.email,
-          envelopeId: document.envelopeId,
-          signingUrl: distributeResult.recipients[0].signingUrl,
+          envelopeId: document.id,
+          signingUrl: document.recipients[0].signingUrl,
         };
       }),
     );
@@ -667,24 +621,14 @@ for RECIPIENT in "${RECIPIENTS[@]}"; do
         \"email\": \"${EMAIL}\",
         \"name\": \"${NAME}\"
       }],
+      \"distributeDocument\": true,
       \"externalId\": \"bulk-$(date +%s)-${EMAIL}\"
     }")
 
-  if echo $RESPONSE | jq -e '.envelopeId' > /dev/null 2>&1; then
-    ENVELOPE_ID=$(echo $RESPONSE | jq -r '.envelopeId')
-    DISTRIBUTE_RESPONSE=$(curl -s -X POST "${BASE_URL}/envelope/distribute" \
-      -H "Authorization: ${API_TOKEN}" \
-      -H "Content-Type: application/json" \
-      -d "{\"envelopeId\": \"${ENVELOPE_ID}\"}")
-
-    if echo $DISTRIBUTE_RESPONSE | jq -e '.success' > /dev/null 2>&1; then
-      echo "  Success: ${ENVELOPE_ID}"
-      echo "  Signing URL: $(echo $DISTRIBUTE_RESPONSE | jq -r '.recipients[0].signingUrl')"
-    else
-      echo "  Failed to distribute: $(echo $DISTRIBUTE_RESPONSE | jq -r '.message')"
-    fi
+  if echo $RESPONSE | jq -e '.id' > /dev/null 2>&1; then
+    echo "  Success: $(echo $RESPONSE | jq -r '.id')"
   else
-    echo "  Failed to create: $(echo $RESPONSE | jq -r '.message')"
+    echo "  Failed: $(echo $RESPONSE | jq -r '.message')"
   fi
 
   # Rate limiting delay
@@ -887,15 +831,13 @@ After a document is completed, download the signed PDF with all signatures embed
   </Step>
 </Steps>
 
-The `version` query parameter accepts `original`, `pending`, or `signed`.
-
 <Tabs items={['TypeScript', 'curl']}>
 <Tab value="TypeScript">
 ```typescript
 const API_TOKEN = process.env.DOCUMENSO_API_TOKEN;
 const BASE_URL = 'https://app.documenso.com/api/v2';
 
-type DownloadVersion = 'original' | 'pending' | 'signed';
+type DownloadVersion = 'signed' | 'original';
 
 async function downloadDocument(
   envelopeId: string,
@@ -949,7 +891,7 @@ async function downloadAllCompletedDocuments(outputDir: string): Promise<void> {
       { headers: { Authorization: API_TOKEN } },
     );
 
-    const { data, count, currentPage, perPage, totalPages } = await response.json();
+    const { data, pagination } = await response.json();
 
     for (const envelope of data) {
       try {
@@ -963,8 +905,8 @@ async function downloadAllCompletedDocuments(outputDir: string): Promise<void> {
       await new Promise((resolve) => setTimeout(resolve, 500));
     }
 
-    hasMore = currentPage < totalPages;
-    page = currentPage + 1;
+    hasMore = page < pagination.totalPages;
+    page++;
   }
 }
 
@@ -1058,12 +1000,9 @@ async function fetchWithRetry(
       // Retry on rate limit
       if (response.status === 429) {
         const retryAfter = response.headers.get('Retry-After');
-        // Honor Retry-After exactly; the cap only applies to the exponential fallback.
-        const delay = retryAfter
-          ? parseInt(retryAfter) * 1000
-          : Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
+        const delay = retryAfter ? parseInt(retryAfter) * 1000 : baseDelayMs * Math.pow(2, attempt);
         console.log(`Rate limited, waiting ${delay}ms...`);
-        await new Promise((resolve) => setTimeout(resolve, delay));
+        await new Promise((resolve) => setTimeout(resolve, Math.min(delay, maxDelayMs)));
         continue;
       }
 

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

@@ -24,18 +24,20 @@ import { Step, Steps } from 'fumadocs-ui/components/steps';
 {/* prettier-ignore */}
 <Steps>
 <Step>
-### Select a team
+### Open settings
 
-Log in to Documenso and open the team that the integration should access. API tokens are scoped to a
-team.
+- Log in to your Documenso account
+- Click your avatar in the top right corner
+- Select **Settings** from the dropdown menu
+
+![User dropdown menu](/public-api-images/documenso-user-dropdown-menu.webp)
 
 </Step>
 
 <Step>
-### Open API Tokens
+### Navigate to the API Tokens tab
 
-Go to **Team Settings** → **API Tokens**, or open
-`/t/{teamUrl}/settings/tokens` after replacing `{teamUrl}` with your team's URL.
+Go to **Settings** and open the **API Tokens** tab.
 
 ![API tokens page](/public-api-images/api-tokens-page-documenso.webp)
 
@@ -46,7 +48,7 @@ Go to **Team Settings** → **API Tokens**, or open
 
 - Click **Create Token**
 - Enter a descriptive name (e.g., `production-backend`, `zapier-integration`)
-- Select an expiration period: 7 days, 1 month, 3 months, 6 months, 12 months, or Never
+- Select an expiration period: never expires, 7 days, 1 month, 3 months, 6 months, or 1 year
 - Click **Create Token**
 
 </Step>
@@ -73,21 +75,21 @@ Include the token in the `Authorization` header of your HTTP requests.
 ### cURL
 
 ```bash
-curl https://app.documenso.com/api/v2/envelope \
+curl https://app.documenso.com/api/v2/document \
   -H "Authorization: api_xxxxxxxxxxxxxxxx"
 ```
 
 ### JavaScript / TypeScript
 
 ```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope', {
+const response = await fetch('https://app.documenso.com/api/v2/document', {
   method: 'GET',
   headers: {
     Authorization: 'api_xxxxxxxxxxxxxxxx',
   },
 });
 
-const envelopes = await response.json();
+const documents = await response.json();
 ```
 
 ### Using the TypeScript SDK
@@ -127,7 +129,7 @@ SDKs are available for [TypeScript](https://github.com/documenso/sdk-typescript)
 
 ## Token Security
 
-API tokens grant full API access to the team they were created for. Follow these practices to keep them secure:
+API tokens grant full access to your account. Follow these practices to keep them secure:
 
 - **Never commit tokens to version control.** Use environment variables instead.
 - **Use descriptive names.** Names like `zapier-prod` or `backend-staging` help you identify token usage.
@@ -153,11 +155,12 @@ const client = new Documenso({
 
 ## Token Scope
 
-API tokens have full API access to the team they were created for, including:
+API tokens have full access to your account, including:
 
 - Creating, reading, updating, and deleting documents
 - Managing recipients and fields
 - Accessing templates
+- Managing team resources (if the token owner has team access)
 
 There is currently no way to create tokens with limited scopes or permissions.
 
@@ -168,7 +171,7 @@ To revoke a token:
 {/* prettier-ignore */}
 <Steps>
   <Step>
-    Go to **Team Settings** → **API Tokens**
+    Go to **Settings** > **API Tokens**
   </Step>
   <Step>
     Find the token you want to revoke
@@ -191,7 +194,7 @@ Revoked tokens stop working immediately. Any integrations using that token will
   </Accordion>
   <Accordion title="401 Unauthorized — Expired token">Create a new token in settings.</Accordion>
   <Accordion title="403 Forbidden — Token doesn't have access to the resource">
-    Ensure you're accessing resources owned by the token's team.
+    Ensure you're accessing resources owned by the token's account.
   </Accordion>
 </Accordions>
 

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

@@ -78,10 +78,12 @@ A successful response returns a list of your documents (envelopes):
       "createdAt": "2025-01-15T10:30:00.000Z"
     }
   ],
-  "count": 1,
-  "currentPage": 1,
-  "perPage": 10,
-  "totalPages": 1
+  "pagination": {
+    "page": 1,
+    "perPage": 10,
+    "totalPages": 1,
+    "totalItems": 1
+  }
 }
 ````
 
@@ -226,12 +228,9 @@ After creating a document, it's in `DRAFT` status. To send it to recipients, use
 <Tabs items={['curl', 'JavaScript']}>
 <Tab value="curl">
 ```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/distribute" \
+curl -X POST "https://app.documenso.com/api/v2/envelope/envelope_abc123/distribute" \
   -H "Authorization: YOUR_API_TOKEN" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "envelopeId": "envelope_abc123"
-  }'
+  -H "Content-Type: application/json"
 ````
 
 </Tab>
@@ -239,14 +238,16 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/distribute" \
 ```javascript
 const envelopeId = 'envelope_abc123';
 
-const response = await fetch('https://app.documenso.com/api/v2/envelope/distribute', {
-  method: 'POST',
-  headers: {
-    Authorization: 'YOUR_API_TOKEN',
-    'Content-Type': 'application/json',
+const response = await fetch(
+  `https://app.documenso.com/api/v2/envelope/${envelopeId}/distribute`,
+  {
+    method: 'POST',
+    headers: {
+      Authorization: 'YOUR_API_TOKEN',
+      'Content-Type': 'application/json',
+    },
   },
-  body: JSON.stringify({ envelopeId }),
-});
+);
 
 const data = await response.json();
 console.log('Document sent:', data);
@@ -336,14 +337,16 @@ async function createAndSendDocument(pdfPath, recipientEmail, recipientName) {
   console.log('Created envelope:', envelope.id);
 
   // Step 2: Send the document for signing
-  const distributeResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-    method: 'POST',
-    headers: {
-      'Authorization': API_TOKEN,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ envelopeId: envelope.id }),
-  });
+  const distributeResponse = await fetch(
+    `${BASE_URL}/envelope/${envelope.id}/distribute`,
+    {
+      method: 'POST',
+      headers: {
+        'Authorization': API_TOKEN,
+        'Content-Type': 'application/json',
+      },
+    }
+  );
 
   if (!distributeResponse.ok) {
     const error = await distributeResponse.json();
@@ -419,12 +422,9 @@ echo "Created envelope: ${ENVELOPE_ID}"
 # Step 2: Send the document for signing
 
 echo "Sending document..."
-curl -s -X POST "${BASE_URL}/envelope/distribute" \
+curl -s -X POST "${BASE_URL}/envelope/${ENVELOPE_ID}/distribute" \
   -H "Authorization: ${API_TOKEN}" \
-  -H "Content-Type: application/json" \
-  -d "{
-    \"envelopeId\": \"${ENVELOPE_ID}\"
-  }"
+  -H "Content-Type: application/json"
 
 echo "Document sent for signing!"
 
@@ -441,7 +441,7 @@ The API returns standard HTTP status codes and JSON error responses:
 | `400` | Bad request - check your request payload |
 | `401` | Unauthorized - invalid or missing API token |
 | `404` | Not found - resource doesn't exist |
-| `429` | Rate limit or plan quota. If `Retry-After` is present, retry the request. |
+| `429` | Rate limited - wait 60 seconds and retry |
 | `500` | Server error - retry or contact support |
 
 ### Error Response Format
@@ -485,9 +485,7 @@ The API returns standard HTTP status codes and JSON error responses:
 
 ### Handling Rate Limits
 
-The API has a limit of 1000 requests per minute for each IP address, and your organisation can have a lower limit. Each response includes `X-RateLimit-Remaining` and `X-RateLimit-Reset` (an epoch timestamp in seconds). A windowed rate-limit `429` response includes `Retry-After`. Wait for that number of seconds before you send the request again. A quota `429` response does not include `Retry-After` because a wait cannot correct the quota error. If `Retry-After` is not present, do not send the request again automatically.
-
-Refer to [Error Handling Patterns](/docs/developers/examples/common-workflows#error-handling-patterns) for more retry information.
+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:
 
 ```javascript
 async function fetchWithRetry(url, options, maxRetries = 3) {
@@ -495,15 +493,8 @@ async function fetchWithRetry(url, options, maxRetries = 3) {
     const response = await fetch(url, options);
 
     if (response.status === 429) {
-      const retryAfter = response.headers.get('Retry-After');
-
-      if (!retryAfter) {
-        return response;
-      }
-
-      const retryAfterSeconds = Number.parseInt(retryAfter, 10);
-      console.log(`Rate limit. Wait ${retryAfterSeconds} seconds...`);
-      await new Promise((resolve) => setTimeout(resolve, retryAfterSeconds * 1000));
+      console.log('Rate limited, waiting 60 seconds...');
+      await new Promise((resolve) => setTimeout(resolve, 60000));
       continue;
     }
 

apps/docs/content/docs/self-hosting/deployment/docker.mdx

@@ -102,7 +102,7 @@ See [Email Configuration](/docs/self-hosting/configuration/email) for other tran
 | Variable                                    | Description                                                    | Default                   |
 | ------------------------------------------- | -------------------------------------------------------------- | ------------------------- |
 | `PORT`                                      | Port the application listens on                                | `3000`                    |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`      | Path to signing certificate inside container — set to the volume-mount path (e.g. `/opt/documenso/cert.p12`). Only Docker Compose defaults this; plain `docker run` must set it explicitly | -                         |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`      | Path to signing certificate inside container                   | `/opt/documenso/cert.p12` |
 | `NEXT_PRIVATE_SIGNING_PASSPHRASE`           | Passphrase for the signing certificate                         | -                         |
 | `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`  | Base64-encoded `.p12` certificate (alternative to file path)   | -                         |
 | `NEXT_PUBLIC_UPLOAD_TRANSPORT`              | Document storage: `database` or `s3`                           | `database`                |
@@ -136,7 +136,6 @@ docker run -d \
   -e NEXT_PUBLIC_WEBAPP_URL="https://sign.example.com" \
   -e NEXT_PRIVATE_INTERNAL_WEBAPP_URL="http://localhost:3000" \
   -e NEXT_PRIVATE_DATABASE_URL="postgresql://user:password@db-host:5432/documenso" \
-  -e NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH="/opt/documenso/cert.p12" \
   -e NEXT_PRIVATE_SIGNING_PASSPHRASE="your-certificate-password" \
   -e NEXT_PRIVATE_SMTP_TRANSPORT="smtp-auth" \
   -e NEXT_PRIVATE_SMTP_HOST="smtp.example.com" \
@@ -155,12 +154,6 @@ A signing certificate is required for document signing. You have two options for
 - **Volume mount** — mount a `.p12` file from the host into the container at `/opt/documenso/cert.p12` (shown above). This is the simplest approach for small to moderate deployments.
 - **Base64-encoded contents** — set `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS` with the base64-encoded certificate string. Use this when file mounting is not available (e.g., Railway, Vercel).
 
-<Callout type="warn">
-  Plain `docker run` deployments must set `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH` explicitly. This
-  prevents production deployments from accidentally using the insecure example certificate.
-  Docker Compose sets the file path for you.
-</Callout>
-
 For production deployments that require Adobe Approved Trust List recognition, consider using a [Google Cloud HSM](/docs/self-hosting/configuration/signing-certificate/google-cloud-hsm) or another external HSM.
 
 <Callout type="warn">
@@ -185,7 +178,6 @@ NEXT_PUBLIC_WEBAPP_URL=https://sign.example.com
 NEXT_PRIVATE_INTERNAL_WEBAPP_URL=http://localhost:3000
 NEXT_PRIVATE_DATABASE_URL=postgresql://user:password@db-host:5432/documenso
 NEXT_PRIVATE_DIRECT_DATABASE_URL=postgresql://user:password@db-host:5432/documenso
-NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=/opt/documenso/cert.p12
 NEXT_PRIVATE_SIGNING_PASSPHRASE=your-certificate-password
 NEXT_PRIVATE_SMTP_TRANSPORT=smtp-auth
 NEXT_PRIVATE_SMTP_HOST=smtp.example.com
@@ -211,12 +203,6 @@ docker run -d \
 
 Documenso provides health check endpoints for monitoring:
 
-<Callout type="info">
-  If a certificate is mounted but signing fails, ensure `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`
-  explicitly points to its path inside the container. Production does not use the development
-  example certificate as a fallback.
-</Callout>
-
 | Endpoint                  | Purpose                                                        |
 | ------------------------- | -------------------------------------------------------------- |
 | `/api/health`             | Checks database connectivity and certificate status            |

apps/docs/content/docs/self-hosting/deployment/manual.mdx

@@ -14,8 +14,8 @@ import { Step, Steps } from 'fumadocs-ui/components/steps';
 
 ## Prerequisites
 
-- Node.js 24 or later
-- npm 11.17 or later
+- Node.js 22 or later
+- npm 11 or later
 - PostgreSQL 14 or later
 - A Linux server (for systemd service setup)
 

apps/docs/content/docs/self-hosting/getting-started/requirements.mdx

@@ -141,8 +141,8 @@ If building from source (not using Docker images):
 
 | Requirement | Version |
 | ----------- | ------- |
-| Node.js     | 24+     |
-| npm         | 11.17+  |
+| Node.js     | 22+     |
+| npm         | 11+     |
 
 ---
 
@@ -169,7 +169,7 @@ Documenso runs on:
 | MySQL/MariaDB  | PostgreSQL-specific features required |
 | SQLite         | Not suitable for production workloads |
 | MongoDB        | Relational database required          |
-| Node.js < 24   | Modern JavaScript features required   |
+| Node.js < 22   | Modern JavaScript features required   |
 
 ---
 

apps/docs/content/docs/users/organisations/preferences/document.mdx

@@ -34,7 +34,7 @@ To access the preferences, navigate to either the organisation or teams settings
 | **Default Recipients**               | Recipients that are automatically added to new documents. Can be overridden per document.                                       |
 | **Default Envelope Expiration**      | How long recipients have to sign before the signing link expires. See [recipient expiration](/docs/users/documents/advanced/recipient-expiration). |
 | **Default Signing Reminders**        | When and how often to email recipients who have not yet signed. See [signing reminders](/docs/users/documents/advanced/signing-reminders). |
-| **Delegate Document Ownership**      | By default, documents created with a team API token are owned by the user who created the token. Enable this setting to let supported API requests assign ownership to another team member.                                                    |
+| **Delegate Document Ownership**      | Allow team API tokens to delegate document ownership to another team member.                                                    |
 | **AI Features**                      | Enable AI-powered features such as automatic recipient detection. Only shown if AI features are configured on the instance.     |
 
 Document visibility, language, and signature settings can be overridden per document.

apps/docs/package.json

@@ -10,12 +10,13 @@
     "postinstall": "fumadocs-mdx"
   },
   "dependencies": {
-    "fumadocs-core": "16.14.3",
-    "fumadocs-mdx": "15.2.3",
-    "fumadocs-ui": "16.14.3",
+    "@radix-ui/react-tabs": "^1.1.13",
+    "fumadocs-core": "16.5.0",
+    "fumadocs-mdx": "14.2.6",
+    "fumadocs-ui": "16.5.0",
     "lucide-react": "^0.563.0",
     "mermaid": "^11.12.2",
-    "next": "^16.3.3",
+    "next": "16.2.6",
     "next-plausible": "^3.12.5",
     "next-themes": "^0.4.6",
     "react": "^19.2.4",

apps/openpage-api/lib/cors.ts

@@ -1,23 +1,142 @@
 /**
- * Apply the public statistics API's wildcard CORS policy, without credentials.
+ * Multi purpose CORS lib.
+ * Note: Based on the `cors` package in npm but using only web APIs.
+ * Taken from: https://github.com/vercel/examples/blob/main/edge-functions/cors/lib/cors.ts
  */
-export default async function cors(req: Request, res: Response): Promise<Response> {
+
+type StaticOrigin = boolean | string | RegExp | (boolean | string | RegExp)[];
+
+type OriginFn = (origin: string | undefined, req: Request) => StaticOrigin | Promise<StaticOrigin>;
+
+interface CorsOptions {
+  origin?: StaticOrigin | OriginFn;
+  methods?: string | string[];
+  allowedHeaders?: string | string[];
+  exposedHeaders?: string | string[];
+  credentials?: boolean;
+  maxAge?: number;
+  preflightContinue?: boolean;
+  optionsSuccessStatus?: number;
+}
+
+const defaultOptions: CorsOptions = {
+  origin: '*',
+  methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
+  preflightContinue: false,
+  optionsSuccessStatus: 204,
+};
+
+function isOriginAllowed(origin: string, allowed: StaticOrigin): boolean {
+  return Array.isArray(allowed)
+    ? allowed.some((o) => isOriginAllowed(origin, o))
+    : typeof allowed === 'string'
+      ? origin === allowed
+      : allowed instanceof RegExp
+        ? allowed.test(origin)
+        : !!allowed;
+}
+
+function getOriginHeaders(reqOrigin: string | undefined, origin: StaticOrigin) {
+  const headers = new Headers();
+
+  if (origin === '*') {
+    headers.set('Access-Control-Allow-Origin', '*');
+  } else if (typeof origin === 'string') {
+    headers.set('Access-Control-Allow-Origin', origin);
+    headers.append('Vary', 'Origin');
+  } else {
+    const allowed = isOriginAllowed(reqOrigin ?? '', origin);
+
+    if (allowed && reqOrigin) {
+      headers.set('Access-Control-Allow-Origin', reqOrigin);
+    }
+    headers.append('Vary', 'Origin');
+  }
+
+  return headers;
+}
+
+async function originHeadersFromReq(req: Request, origin: StaticOrigin | OriginFn) {
+  const reqOrigin = req.headers.get('Origin') || undefined;
+  const value = typeof origin === 'function' ? await origin(reqOrigin, req) : origin;
+
+  if (!value) {
+    return;
+  }
+  return getOriginHeaders(reqOrigin, value);
+}
+
+function getAllowedHeaders(req: Request, allowed?: string | string[]) {
+  const headers = new Headers();
+
+  if (!allowed) {
+    allowed = req.headers.get('Access-Control-Request-Headers')!;
+    headers.append('Vary', 'Access-Control-Request-Headers');
+  } else if (Array.isArray(allowed)) {
+    allowed = allowed.join(',');
+  }
+  if (allowed) {
+    headers.set('Access-Control-Allow-Headers', allowed);
+  }
+
+  return headers;
+}
+
+export default async function cors(req: Request, res: Response, options?: CorsOptions) {
+  const opts = { ...defaultOptions, ...options };
   const { headers } = res;
-  headers.set('Access-Control-Allow-Origin', '*');
+  const originHeaders = await originHeadersFromReq(req, opts.origin ?? false);
+  const mergeHeaders = (v: string, k: string) => {
+    if (k === 'Vary') {
+      headers.append(k, v);
+    } else {
+      headers.set(k, v);
+    }
+  };
 
+  // If there's no origin we won't touch the response
+  if (!originHeaders) {
+    return res;
+  }
+
+  originHeaders.forEach(mergeHeaders);
+
+  if (opts.credentials) {
+    headers.set('Access-Control-Allow-Credentials', 'true');
+  }
+
+  const exposed = Array.isArray(opts.exposedHeaders) ? opts.exposedHeaders.join(',') : opts.exposedHeaders;
+
+  if (exposed) {
+    headers.set('Access-Control-Expose-Headers', exposed);
+  }
+
+  // Handle the preflight request
   if (req.method === 'OPTIONS') {
-    headers.set('Access-Control-Allow-Methods', 'GET,HEAD,PUT,PATCH,POST,DELETE');
-    headers.set('Vary', 'Access-Control-Request-Headers');
+    if (opts.methods) {
+      const methods = Array.isArray(opts.methods) ? opts.methods.join(',') : opts.methods;
 
-    const allowedHeaders = req.headers.get('Access-Control-Request-Headers');
+      headers.set('Access-Control-Allow-Methods', methods);
+    }
 
-    if (allowedHeaders) {
-      headers.set('Access-Control-Allow-Headers', allowedHeaders);
+    getAllowedHeaders(req, opts.allowedHeaders).forEach(mergeHeaders);
+
+    if (typeof opts.maxAge === 'number') {
+      headers.set('Access-Control-Max-Age', String(opts.maxAge));
+    }
+
+    if (opts.preflightContinue) {
+      return res;
     }
 
     headers.set('Content-Length', '0');
-    return new Response(null, { status: 204, headers });
+    return new Response(null, { status: opts.optionsSuccessStatus, headers });
   }
 
+  // If we got here, it's a normal request
   return res;
 }
+
+export function initCors(options?: CorsOptions) {
+  return async (req: Request, res: Response) => cors(req, res, options);
+}

apps/openpage-api/package.json

@@ -12,11 +12,11 @@
   "dependencies": {
     "@documenso/prisma": "*",
     "luxon": "^3.7.2",
-    "next": "^16.3.3"
+    "next": "16.2.6"
   },
   "devDependencies": {
     "@types/node": "^20",
-    "@types/react": "^19.2.17",
+    "@types/react": "18.3.27",
     "typescript": "5.6.2"
   }
 }

apps/remix/Dockerfile.bun

@@ -0,0 +1,25 @@
+FROM oven/bun:1 AS dependencies-env
+COPY . /app
+
+FROM dependencies-env AS development-dependencies-env
+COPY ./package.json bun.lockb /app/
+WORKDIR /app
+RUN bun i --frozen-lockfile
+
+FROM dependencies-env AS production-dependencies-env
+COPY ./package.json bun.lockb /app/
+WORKDIR /app
+RUN bun i --production
+
+FROM dependencies-env AS build-env
+COPY ./package.json bun.lockb /app/
+COPY --from=development-dependencies-env /app/node_modules /app/node_modules
+WORKDIR /app
+RUN bun run build
+
+FROM dependencies-env
+COPY ./package.json bun.lockb /app/
+COPY --from=production-dependencies-env /app/node_modules /app/node_modules
+COPY --from=build-env /app/build /app/build
+WORKDIR /app
+CMD ["bun", "run", "start"]

apps/remix/Dockerfile.pnpm

@@ -0,0 +1,26 @@
+FROM node:20-alpine AS dependencies-env
+RUN npm i -g pnpm
+COPY . /app
+
+FROM dependencies-env AS development-dependencies-env
+COPY ./package.json pnpm-lock.yaml /app/
+WORKDIR /app
+RUN pnpm i --frozen-lockfile
+
+FROM dependencies-env AS production-dependencies-env
+COPY ./package.json pnpm-lock.yaml /app/
+WORKDIR /app
+RUN pnpm i --prod --frozen-lockfile
+
+FROM dependencies-env AS build-env
+COPY ./package.json pnpm-lock.yaml /app/
+COPY --from=development-dependencies-env /app/node_modules /app/node_modules
+WORKDIR /app
+RUN pnpm build
+
+FROM dependencies-env
+COPY ./package.json pnpm-lock.yaml /app/
+COPY --from=production-dependencies-env /app/node_modules /app/node_modules
+COPY --from=build-env /app/build /app/build
+WORKDIR /app
+CMD ["pnpm", "start"]

apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
@@ -72,7 +71,6 @@ export const EnvelopeDistributeDialog = ({
   const { toast } = useToast();
   const { t, i18n } = useLingui();
   const navigate = useNavigate();
-  const analytics = useAnalytics();
 
   const [isOpen, setIsOpen] = useState(false);
   const [isSyncing, setIsSyncing] = useState(false);
@@ -202,12 +200,6 @@ export const EnvelopeDistributeDialog = ({
     } catch (err) {
       const error = AppError.parseError(err);
 
-      analytics.captureException(err, {
-        source: 'editor',
-        location: 'distribute_document',
-        envelopeId: envelope.id,
-      });
-
       const errorMessage = getDistributeErrorMessage(error.code);
 
       toast({

apps/remix/app/components/dialogs/envelope-download-dialog.tsx

@@ -36,12 +36,6 @@ type EnvelopeDownloadDialogProps = {
   isLegacy?: boolean;
   envelopeItems?: EnvelopeItemToDownload[];
 
-  /**
-   * Used as the display/download name for single-item envelopes, since item titles
-   * are never updated when the envelope is renamed.
-   */
-  envelopeTitle: string;
-
   /**
    * The recipient token to download the document.
    *
@@ -56,7 +50,6 @@ export const EnvelopeDownloadDialog = ({
   envelopeStatus,
   isLegacy,
   envelopeItems: initialEnvelopeItems,
-  envelopeTitle,
   token,
   trigger,
 }: EnvelopeDownloadDialogProps) => {
@@ -111,8 +104,6 @@ export const EnvelopeDownloadDialog = ({
 
   const envelopeItems = envelopeItemsPayload?.data || [];
 
-  const getItemTitle = (item: EnvelopeItemToDownload) => (envelopeItems.length === 1 ? envelopeTitle : item.title);
-
   const onDownload = async (envelopeItem: EnvelopeItemToDownload, version: 'original' | 'signed' | 'pending') => {
     const { id: envelopeItemId } = envelopeItem;
 
@@ -129,7 +120,7 @@ export const EnvelopeDownloadDialog = ({
       await downloadPDF({
         envelopeItem,
         token,
-        fileName: getItemTitle(envelopeItem),
+        fileName: envelopeItem.title,
         version,
       });
 
@@ -195,8 +186,8 @@ export const EnvelopeDownloadDialog = ({
 
                   <div className="min-w-0 flex-1">
                     {/* Todo: Envelopes - Fix overflow */}
-                    <h4 className="truncate font-medium text-foreground text-sm" title={getItemTitle(item)}>
-                      {getItemTitle(item)}
+                    <h4 className="truncate font-medium text-foreground text-sm" title={item.title}>
+                      {item.title}
                     </h4>
                     <p className="mt-0.5 text-muted-foreground text-xs">
                       <Trans>PDF Document</Trans>

apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
 import { AppError } from '@documenso/lib/errors/app-error';
 import type { TEnvelope } from '@documenso/lib/types/envelope';
@@ -52,7 +51,6 @@ export const EnvelopeRedistributeDialog = ({ envelope, envelopeType, trigger }:
 
   const { toast } = useToast();
   const { t, i18n } = useLingui();
-  const analytics = useAnalytics();
 
   const [isOpen, setIsOpen] = useState(false);
 
@@ -97,13 +95,6 @@ export const EnvelopeRedistributeDialog = ({ envelope, envelopeType, trigger }:
       setIsOpen(false);
     } catch (err) {
       const error = AppError.parseError(err);
-
-      analytics.captureException(err, {
-        source: 'editor',
-        location: 'redistribute_document',
-        envelopeId: envelope.id,
-      });
-
       const errorMessage = getDistributeErrorMessage(error.code);
 
       toast({

apps/remix/app/components/dialogs/envelopes-bulk-delete-dialog.tsx

@@ -44,10 +44,7 @@ export const EnvelopesBulkDeleteDialog = ({
       if (isDocument) {
         await trpcUtils.document.findDocumentsInternal.invalidate();
       } else {
-        await Promise.all([
-          trpcUtils.template.findTemplates.invalidate(),
-          trpcUtils.template.findTemplatesInternal.invalidate(),
-        ]);
+        await trpcUtils.template.findTemplates.invalidate();
       }
 
       if (result.failedIds.length > 0) {

apps/remix/app/components/dialogs/envelopes-bulk-download-dialog.tsx

@@ -171,7 +171,7 @@ export const EnvelopesBulkDownloadDialog = ({
             const { filename, blob } = await fetchPDF({
               envelopeItem,
               token: undefined,
-              fileName: envelopeItems.length === 1 ? envelope.title : envelopeItem.title,
+              fileName: envelopeItem.title,
               version: downloadVersion,
             });
 
@@ -290,11 +290,10 @@ export const EnvelopesBulkDownloadDialog = ({
         {isOverDownloadLimit && (
           <Alert variant="warning">
             <AlertDescription>
-              <Plural
-                value={MAX_BULK_DOWNLOAD_ENVELOPES}
-                one="You can download up to # document at a time. Deselect some documents to continue."
-                other="You can download up to # documents at a time. Deselect some documents to continue."
-              />
+              <Trans>
+                You can download up to {MAX_BULK_DOWNLOAD_ENVELOPES} documents at a time. Deselect some documents to
+                continue.
+              </Trans>
             </AlertDescription>
           </Alert>
         )}

apps/remix/app/components/dialogs/envelopes-bulk-move-dialog.tsx

@@ -96,10 +96,7 @@ export const EnvelopesBulkMoveDialog = ({
       if (isDocument) {
         await trpcUtils.document.findDocumentsInternal.invalidate();
       } else {
-        await Promise.all([
-          trpcUtils.template.findTemplates.invalidate(),
-          trpcUtils.template.findTemplatesInternal.invalidate(),
-        ]);
+        await trpcUtils.template.findTemplates.invalidate();
       }
 
       await onSuccess?.(data.folderId);

apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx

@@ -1,7 +1,4 @@
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import type { TBulkSendCsvError } from '@documenso/lib/server-only/template/validate-bulk-send-csv';
 import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import {
@@ -18,11 +15,9 @@ 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 { Plural, Trans } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
 import { File as FileIcon, Upload, X } from 'lucide-react';
-import { useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
 import { z } from 'zod';
 
 import { useCurrentTeam } from '~/providers/team';
@@ -34,8 +29,6 @@ const ZBulkSendFormSchema = z.object({
 
 type TBulkSendFormSchema = z.infer<typeof ZBulkSendFormSchema>;
 
-type TBulkSendValidationError = TBulkSendCsvError | { type: 'UPLOAD_ERROR'; code: string };
-
 export type TemplateBulkSendDialogProps = {
   templateId: number;
   recipients: Array<{ email: string; name?: string | null }>;
@@ -49,9 +42,6 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
 
   const team = useCurrentTeam();
 
-  const [open, setOpen] = useState(false);
-  const [validationError, setValidationError] = useState<TBulkSendValidationError | null>(null);
-
   const form = useForm<TBulkSendFormSchema>({
     resolver: zodResolver(ZBulkSendFormSchema),
     defaultValues: {
@@ -61,20 +51,6 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
 
   const { mutateAsync: uploadBulkSend } = trpc.template.uploadBulkSend.useMutation();
 
-  const onOpenChange = (value: boolean) => {
-    if (form.formState.isSubmitting) {
-      return;
-    }
-
-    setOpen(value);
-
-    if (!value) {
-      setValidationError(null);
-
-      form.reset();
-    }
-  };
-
   const onDownloadTemplate = () => {
     const headers = recipients.flatMap((_, index) => [`recipient_${index + 1}_email`, `recipient_${index + 1}_name`]);
 
@@ -95,44 +71,36 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
   };
 
   const onSubmit = async (values: TBulkSendFormSchema) => {
-    setValidationError(null);
-
     try {
       const csv = await values.file.text();
 
-      const result = await uploadBulkSend({
+      await uploadBulkSend({
         templateId,
         teamId: team?.id,
         csv: csv,
         sendImmediately: values.sendImmediately,
       });
 
-      if (!result.success) {
-        setValidationError(result.error);
-
-        return;
-      }
-
       toast({
         title: _(msg`Success`),
         description: _(msg`Your bulk send has been initiated. You will receive an email notification upon completion.`),
       });
 
-      setOpen(false);
       form.reset();
-
       onSuccess?.();
     } catch (err) {
       console.error(err);
 
-      const error = AppError.parseError(err);
-
-      setValidationError({ type: 'UPLOAD_ERROR', code: error.code });
+      toast({
+        title: _(msg`Error`),
+        description: _(msg`Failed to upload CSV. Please check the file format and try again.`),
+        variant: 'destructive',
+      });
     }
   };
 
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
+    <Dialog>
       <DialogTrigger asChild>
         {trigger ?? (
           <Button variant="outline" className="shrink-0" size="sm">
@@ -206,10 +174,7 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
                             className="hidden"
                             onChange={(e) => {
                               const file = e.target.files?.[0];
-
                               if (file) {
-                                setValidationError(null);
-
                                 onChange(file);
                               }
                             }}
@@ -230,11 +195,7 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
                           type="button"
                           variant="link"
                           className="p-0 text-destructive text-xs hover:text-destructive"
-                          onClick={() => {
-                            setValidationError(null);
-
-                            form.resetField('file');
-                          }}
+                          onClick={() => onChange(null)}
                           disabled={form.formState.isSubmitting}
                         >
                           <X className="h-4 w-4" />
@@ -257,72 +218,6 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
               )}
             />
 
-            {validationError !== null && (
-              <Alert variant="destructive">
-                <AlertDescription className="max-h-32 overflow-y-auto">
-                  {match(validationError)
-                    .with({ type: 'PARSE_ERROR' }, () => (
-                      <Trans>The CSV could not be parsed. Please check the file format and try again.</Trans>
-                    ))
-                    .with({ type: 'EMPTY' }, () => (
-                      <Trans>
-                        The CSV does not contain any rows. Please add at least one row of recipient details.
-                      </Trans>
-                    ))
-                    .with({ type: 'ROW_LIMIT_EXCEEDED' }, ({ rowCount, maxRows }) => (
-                      <Trans>
-                        <Plural value={rowCount} one="The CSV contains # row." other="The CSV contains # rows." />{' '}
-                        <Plural
-                          value={maxRows}
-                          one="A maximum of # row is allowed per upload."
-                          other="A maximum of # rows is allowed per upload."
-                        />
-                      </Trans>
-                    ))
-                    .with({ type: 'MISSING_COLUMNS' }, ({ missingColumns }) => (
-                      <>
-                        <Trans>
-                          The CSV is missing the following required columns. Please download the template CSV for the
-                          correct format.
-                        </Trans>
-
-                        <ul className="mt-1 list-inside list-disc">
-                          {missingColumns.map((column) => (
-                            <li key={column} className="font-mono">
-                              {column}
-                            </li>
-                          ))}
-                        </ul>
-                      </>
-                    ))
-                    .with({ type: 'INVALID_RECIPIENTS' }, ({ rowErrors }) => (
-                      <>
-                        <Trans>The CSV contains invalid recipient emails. Please fix the following rows:</Trans>
-
-                        <ul className="mt-1 list-inside list-disc">
-                          {rowErrors.map((rowError, index) => (
-                            <li key={index}>
-                              <Trans>
-                                Row {rowError.row}: <span className="font-mono">{rowError.column}</span> must be a valid
-                                email or empty
-                              </Trans>
-                            </li>
-                          ))}
-                        </ul>
-                      </>
-                    ))
-                    .with({ type: 'UPLOAD_ERROR' }, ({ code }) =>
-                      code === AppErrorCode.LIMIT_EXCEEDED ? (
-                        <Trans>The CSV exceeds the maximum file size.</Trans>
-                      ) : (
-                        <Trans>Failed to upload CSV. Please check the file format and try again.</Trans>
-                      ),
-                    )
-                    .exhaustive()}
-                </AlertDescription>
-              </Alert>
-            )}
-
             <FormField
               control={form.control}
               name="sendImmediately"
@@ -345,12 +240,7 @@ export const TemplateBulkSendDialog = ({ templateId, recipients, trigger, onSucc
             />
 
             <DialogFooter className="mt-4">
-              <Button
-                variant="secondary"
-                onClick={() => onOpenChange(false)}
-                disabled={form.formState.isSubmitting}
-                type="button"
-              >
+              <Button variant="secondary" onClick={() => form.reset()} type="button">
                 <Trans>Cancel</Trans>
               </Button>
 

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';
@@ -40,64 +38,27 @@ import { useNavigate } from 'react-router';
 import * as z from 'zod';
 import { getTemplateUseErrorMessage } from '~/utils/toast-error-messages';
 
-const DOCUMENT_NAME_SOURCE = {
-  TEMPLATE: 'template',
-  UPLOAD: 'upload',
-  CUSTOM: 'custom',
-} as const;
-
-const getUploadedDocumentTitle = (file: File) => {
-  return file.name.replace(/\.[^/.]+$/, '').trim();
-};
-
-/**
- * Whether the file name can be used as a document title.
- */
-const isUploadedFileNameUsable = (file?: File): file is File => {
-  if (!file) {
-    return false;
-  }
-
-  const title = getUploadedDocumentTitle(file);
-
-  return title.length > 0 && title.length <= DOCUMENT_TITLE_MAX_LENGTH;
-};
-
-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()
-      .trim()
-      .max(DOCUMENT_TITLE_MAX_LENGTH, { message: msg`Document name is too long`.id }),
-    customDocumentData: z
-      .array(
-        z.object({
-          title: z.string(),
-          data: z.instanceof(File).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(),
       }),
-    ),
-  })
-  .refine((data) => data.documentNameSource !== DOCUMENT_NAME_SOURCE.CUSTOM || data.customDocumentName.length > 0, {
-    message: msg`Document name is required`.id,
-    path: ['customDocumentName'],
-  });
+    )
+    .optional(),
+  recipients: z.array(
+    z.object({
+      id: z.number(),
+      email: ZRecipientEmailSchema,
+      name: z.string(),
+      signingOrder: z.number().optional(),
+    }),
+  ),
+});
 
 type TAddRecipientsForNewDocumentSchema = z.infer<typeof ZAddRecipientsForNewDocumentSchema>;
 
@@ -126,7 +87,6 @@ export function TemplateUseDialog({
   const navigate = useNavigate();
 
   const [open, setOpen] = useState(false);
-  const [lastUploadedFile, setLastUploadedFile] = useState<File>();
 
   const { data: response, isLoading: isLoadingEnvelopeItems } = trpc.envelope.item.getMany.useQuery(
     {
@@ -146,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,
@@ -182,39 +140,11 @@ export function TemplateUseDialog({
 
   const { mutateAsync: createDocumentFromTemplate } = trpc.template.createDocumentFromTemplate.useMutation();
 
-  /**
-   * Track the most recently uploaded file so its name can be used as the document name.
-   * Files with an unusable name are ignored, and the document name source is reset if
-   * no usable file remains.
-   */
-  const updateLastUploadedFile = (file?: File) => {
-    const usableFile = isUploadedFileNameUsable(file) ? file : undefined;
-
-    setLastUploadedFile(usableFile);
-
-    if (!usableFile && form.getValues('documentNameSource') === DOCUMENT_NAME_SOURCE.UPLOAD) {
-      form.setValue('documentNameSource', DOCUMENT_NAME_SOURCE.TEMPLATE);
-    }
-  };
-
-  const getDocumentTitle = (data: TAddRecipientsForNewDocumentSchema) => {
-    if (data.documentNameSource === DOCUMENT_NAME_SOURCE.CUSTOM) {
-      return data.customDocumentName;
-    }
-
-    if (data.documentNameSource === DOCUMENT_NAME_SOURCE.UPLOAD && lastUploadedFile) {
-      return getUploadedDocumentTitle(lastUploadedFile);
-    }
-
-    return undefined;
-  };
-
   const onSubmit = async (data: TAddRecipientsForNewDocumentSchema) => {
     try {
-      const documentTitle = getDocumentTitle(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(
@@ -233,7 +163,6 @@ export function TemplateUseDialog({
         recipients: data.recipients,
         distributeDocument: data.distributeDocument,
         customDocumentData,
-        ...(documentTitle ? { override: { title: documentTitle } } : {}),
       });
 
       toast({
@@ -266,14 +195,9 @@ export function TemplateUseDialog({
     name: 'recipients',
   });
 
-  const useCustomDocument = form.watch('useCustomDocument');
-  const documentNameSource = form.watch('documentNameSource');
-  const canUseUploadedDocumentName = Boolean(lastUploadedFile);
-
   useEffect(() => {
     if (open) {
       form.reset(generateDefaultFormValues());
-      setLastUploadedFile(undefined);
     }
   }, [open, form]);
 
@@ -314,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 && (
@@ -477,17 +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');
-                              updateLastUploadedFile(undefined);
+                              form.setValue('customDocumentData', undefined);
                             }
                           }}
                         />
@@ -514,7 +428,7 @@ export function TemplateUseDialog({
                   )}
                 />
 
-                {useCustomDocument && (
+                {form.watch('useCustomDocument') && (
                   <div className="my-4 space-y-2">
                     {isLoadingEnvelopeItems ? (
                       <SpinnerBox className="py-16" />
@@ -529,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">
@@ -537,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>
                                       )}
@@ -563,18 +475,6 @@ export function TemplateUseDialog({
                                           onClick={(e) => {
                                             e.preventDefault();
                                             field.onChange(undefined);
-
-                                            if (field.value === lastUploadedFile) {
-                                              // Fall back to any other uploaded file so the option stays available.
-                                              const remainingUploadedFile = form
-                                                .getValues('customDocumentData')
-                                                ?.find(
-                                                  (item) =>
-                                                    item.data !== field.value && isUploadedFileNameUsable(item.data),
-                                                )?.data;
-
-                                              updateLastUploadedFile(remainingUploadedFile);
-                                            }
                                           }}
                                         >
                                           <X className="mr-2 h-4 w-4" />
@@ -617,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`),
                                           });
@@ -626,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`,
@@ -637,8 +537,6 @@ export function TemplateUseDialog({
                                         }
 
                                         field.onChange(file);
-                                        form.clearErrors(`customDocumentData.${i}.data`);
-                                        updateLastUploadedFile(file);
                                       }}
                                     />
                                   </div>
@@ -652,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/embed/authoring/configure-document-recipients.tsx

@@ -18,8 +18,6 @@ import { useCallback, useRef } from 'react';
 import type { Control } from 'react-hook-form';
 import { useFieldArray, useFormContext, useFormState } from 'react-hook-form';
 
-import { useCspNonce } from '~/utils/nonce';
-
 import { useConfigureDocument } from './configure-document-context';
 import type { TConfigureEmbedFormSchema } from './configure-document-view.types';
 
@@ -34,7 +32,6 @@ export interface ConfigureDocumentRecipientsProps {
 export const ConfigureDocumentRecipients = ({ control, isSubmitting }: ConfigureDocumentRecipientsProps) => {
   const { _ } = useLingui();
   const { isTemplate } = useConfigureDocument();
-  const cspNonce = useCspNonce();
 
   const $sensorApi = useRef<SensorAPI | null>(null);
 
@@ -215,7 +212,6 @@ export const ConfigureDocumentRecipients = ({ control, isSubmitting }: Configure
       />
 
       <DragDropContext
-        nonce={cspNonce}
         onDragEnd={onDragEnd}
         sensors={[
           (api: SensorAPI) => {

apps/remix/app/components/embed/embed-direct-template-client-page.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn';
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';
@@ -78,7 +77,6 @@ export const EmbedDirectTemplateClientPage = ({
 }: EmbedDirectTemplateClientPageProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const [searchParams] = useSearchParams();
 
@@ -266,13 +264,6 @@ export const EmbedDirectTemplateClientPage = ({
       const error = AppError.parseError(err);
       const errorMessage = getDirectTemplateErrorMessage(error.code);
 
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'direct_template',
-        recipientId: recipient.id,
-        envelopeId,
-      });
-
       toast({
         title: _(errorMessage.title),
         description: _(errorMessage.description),
@@ -317,14 +308,6 @@ export const EmbedDirectTemplateClientPage = ({
       }
     } catch (err) {
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'embed_init',
-        recipientId: recipient.id,
-        envelopeId,
-      });
-
       setHasFinishedInit(true);
     }
 

apps/remix/app/components/embed/embed-document-signing-page-v1.tsx

@@ -1,8 +1,6 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn';
 import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
-import { AppError } from '@documenso/lib/errors/app-error';
 import { ZSignDocumentEmbedDataSchema } from '@documenso/lib/types/embed-document-sign-schema';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { getDocumentDataUrlForPdfViewer } from '@documenso/lib/utils/envelope-download';
@@ -34,7 +32,6 @@ import { useEffect, useId, useLayoutEffect, useMemo, useState } from 'react';
 import { BrandingLogo } from '~/components/general/branding-logo';
 import PDFViewerLazy from '~/components/general/pdf-viewer/pdf-viewer-lazy';
 import { injectCss } from '~/utils/css-vars';
-import { getSigningCompletionErrorMessage } from '~/utils/toast-error-messages';
 
 import { DocumentSigningAttachmentsPopover } from '../general/document-signing/document-signing-attachments-popover';
 import { useRequiredDocumentSigningContext } from '../general/document-signing/document-signing-provider';
@@ -76,7 +73,6 @@ export const EmbedSignDocumentV1ClientPage = ({
 }: EmbedSignDocumentV1ClientPageProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const { fullName, email, signature, setFullName, setEmail, setSignature } = useRequiredDocumentSigningContext();
 
@@ -156,14 +152,6 @@ export const EmbedSignDocumentV1ClientPage = ({
 
       setHasCompletedDocument(true);
     } catch (err) {
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'complete_document',
-        recipientId: recipient.id,
-        documentId,
-        envelopeId,
-      });
-
       if (window.parent) {
         window.parent.postMessage(
           {
@@ -174,12 +162,9 @@ export const EmbedSignDocumentV1ClientPage = ({
         );
       }
 
-      const error = AppError.parseError(err);
-      const toastMessage = getSigningCompletionErrorMessage(error.code);
-
       toast({
-        title: _(toastMessage.title),
-        description: _(toastMessage.description),
+        title: _(msg`Something went wrong`),
+        description: _(msg`We were unable to submit this document at this time. Please try again later.`),
         variant: 'destructive',
       });
     }
@@ -246,15 +231,6 @@ export const EmbedSignDocumentV1ClientPage = ({
       }
     } catch (err) {
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'embed_init',
-        recipientId: recipient.id,
-        documentId,
-        envelopeId,
-      });
-
       setHasFinishedInit(true);
     }
 

apps/remix/app/components/embed/embed-document-signing-page-v2.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';
 import { ZSignDocumentEmbedDataSchema } from '@documenso/lib/types/embed-document-sign-schema';
 import { mapSecondaryIdToDocumentId } from '@documenso/lib/utils/envelope';
@@ -26,7 +25,6 @@ export const EmbedSignDocumentV2ClientPage = ({
   allowWhitelabelling = false,
 }: EmbedSignDocumentV2ClientPageProps) => {
   const { _ } = useLingui();
-  const analytics = useAnalytics();
 
   const { envelope, recipient, envelopeData, setFullName, setEmail, fullName, email } =
     useRequiredEnvelopeSigningContext();
@@ -172,14 +170,6 @@ export const EmbedSignDocumentV2ClientPage = ({
       }
     } catch (err) {
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'embed_init',
-        recipientId: recipient.id,
-        envelopeId: envelope.id,
-      });
-
       setHasFinishedInit(true);
     }
 

apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getDocumentDataUrlForPdfViewer } from '@documenso/lib/utils/envelope-download';
@@ -27,7 +26,6 @@ import { useState } from 'react';
 import { match, P } from 'ts-pattern';
 
 import PDFViewerLazy from '~/components/general/pdf-viewer/pdf-viewer-lazy';
-import { getSigningCompletionErrorMessage } from '~/utils/toast-error-messages';
 
 import { useRequiredDocumentSigningContext } from '../../general/document-signing/document-signing-provider';
 import { DocumentSigningRejectDialog } from '../../general/document-signing/document-signing-reject-dialog';
@@ -58,7 +56,6 @@ export const MultiSignDocumentSigningView = ({
 }: MultiSignDocumentSigningViewProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const { fullName, email, signature, setFullName, setSignature } = useRequiredDocumentSigningContext();
 
@@ -103,13 +100,6 @@ export const MultiSignDocumentSigningView = ({
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'sign_field',
-        recipientId,
-        documentId: document?.id,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while signing the document.`),
@@ -129,13 +119,6 @@ export const MultiSignDocumentSigningView = ({
       }
 
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'remove_field',
-        recipientId,
-        documentId: document?.id,
-      });
     }
   };
 
@@ -156,21 +139,11 @@ export const MultiSignDocumentSigningView = ({
         recipientId,
       });
     } catch (err) {
-      analytics.captureException(err, {
-        source: 'embed',
-        location: 'complete_document',
-        recipientId,
-        documentId: document?.id,
-      });
-
       onDocumentError?.();
 
-      const error = AppError.parseError(err);
-      const toastMessage = getSigningCompletionErrorMessage(error.code);
-
       toast({
-        title: _(toastMessage.title),
-        description: _(toastMessage.description),
+        title: _(msg`Error`),
+        description: _(msg`Failed to complete the document. Please try again.`),
         variant: 'destructive',
       });
     } finally {

apps/remix/app/components/forms/2fa/two-factor-code-dialog.tsx

@@ -1,158 +0,0 @@
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { FormControl, FormField, FormItem, FormLabel, FormMessage } from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { PinInput, PinInputGroup, PinInputSlot } from '@documenso/ui/primitives/pin-input';
-import { Trans } from '@lingui/react/macro';
-import type React from 'react';
-import { useState } from 'react';
-import { type FieldValues, type Path, useFormContext } from 'react-hook-form';
-import { z } from 'zod';
-
-/**
- * Schema for forms that accept a two factor code. Compose with `.extend()` or `.merge()`.
- */
-export const ZTwoFactorCodeFieldSchema = z.object({
-  totpCode: z.string().trim().optional(),
-  backupCode: z.string().trim().optional(),
-});
-
-export type TTwoFactorCodeFieldSchema = z.infer<typeof ZTwoFactorCodeFieldSchema>;
-
-export const hasTwoFactorCode = (data: TTwoFactorCodeFieldSchema) => !!data.totpCode || !!data.backupCode;
-
-type TwoFactorMethod = 'totp' | 'backup';
-
-export type TwoFactorCodeDialogProps = {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  isSubmitting?: boolean;
-  submitLabel: React.ReactNode;
-
-  /**
-   * Called when the user submits the code. Typically the parent form's submit handler.
-   */
-  onSubmit: () => void;
-};
-
-/**
- * Collects a TOTP or backup code on top of an existing form, mirroring the
- * sign in and disable 2FA dialogs.
- *
- * Must be rendered inside a `<Form>` whose values include `totpCode` and `backupCode`.
- */
-export const TwoFactorCodeDialog = <T extends FieldValues & TTwoFactorCodeFieldSchema>({
-  open,
-  onOpenChange,
-  isSubmitting,
-  submitLabel,
-  onSubmit,
-}: TwoFactorCodeDialogProps) => {
-  const form = useFormContext<T>();
-
-  const [method, setMethod] = useState<TwoFactorMethod>('totp');
-
-  const totpCodeName = 'totpCode' as Path<T>;
-  const backupCodeName = 'backupCode' as Path<T>;
-
-  const onToggleMethod = () => {
-    form.resetField(totpCodeName);
-    form.resetField(backupCodeName);
-
-    setMethod((current) => (current === 'totp' ? 'backup' : 'totp'));
-  };
-
-  const handleOpenChange = (value: boolean) => {
-    if (isSubmitting) {
-      return;
-    }
-
-    if (!value) {
-      form.resetField(totpCodeName);
-      form.resetField(backupCodeName);
-      setMethod('totp');
-    }
-
-    onOpenChange(value);
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={handleOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Two-Factor Authentication</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            {method === 'totp' ? (
-              <Trans>Enter the code from your authenticator app to continue.</Trans>
-            ) : (
-              <Trans>Enter one of your backup codes to continue.</Trans>
-            )}
-          </DialogDescription>
-        </DialogHeader>
-
-        <fieldset disabled={isSubmitting}>
-          {method === 'totp' && (
-            <FormField
-              control={form.control}
-              name={totpCodeName}
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <PinInput {...field} value={field.value ?? ''} maxLength={6} autoFocus>
-                      {Array(6)
-                        .fill(null)
-                        .map((_, i) => (
-                          <PinInputGroup key={i}>
-                            <PinInputSlot index={i} />
-                          </PinInputGroup>
-                        ))}
-                    </PinInput>
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          )}
-
-          {method === 'backup' && (
-            <FormField
-              control={form.control}
-              name={backupCodeName}
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>
-                    <Trans>Backup Code</Trans>
-                  </FormLabel>
-                  <FormControl>
-                    <Input type="text" autoComplete="off" autoFocus {...field} value={field.value ?? ''} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          )}
-
-          <DialogFooter className="mt-4">
-            <Button type="button" variant="secondary" onClick={onToggleMethod}>
-              {method === 'totp' ? <Trans>Use Backup Code</Trans> : <Trans>Use Authenticator</Trans>}
-            </Button>
-
-            <Button type="button" loading={isSubmitting} onClick={onSubmit}>
-              {submitLabel}
-            </Button>
-          </DialogFooter>
-        </fieldset>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/remix/app/components/forms/password-setup-request-button.tsx

@@ -1,53 +0,0 @@
-import { usePasswordSetupRequest } from '@documenso/lib/client-only/hooks/use-password-setup-request';
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { CheckIcon } from 'lucide-react';
-import { match } from 'ts-pattern';
-
-/**
- * Compact "send me a setup link" button that reports via toast, for settings
- * cards where the surrounding layout provides the explanation.
- */
-export const PasswordSetupRequestButton = () => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-  const { user } = useSession();
-
-  const { requestSetupLink, isPending, isSuccess } = usePasswordSetupRequest({
-    onSuccess: () => {
-      toast({
-        title: _(msg`Check your email`),
-        description: _(msg`We've sent a link to ${user.email}. Follow it to set your password.`),
-        duration: 5000,
-      });
-    },
-    onError: (errorCode) => {
-      toast({
-        title: _(msg`An error occurred`),
-        description: match(errorCode)
-          .with('SIGNIN_DISABLED', () => _(msg`Password sign in is disabled for this instance.`))
-          .otherwise(() => _(msg`We were unable to send the email. Please try again later.`)),
-        variant: 'destructive',
-      });
-    },
-  });
-
-  if (isSuccess) {
-    return (
-      <Button variant="outline" className="flex-shrink-0 bg-background" disabled>
-        <CheckIcon className="mr-2 h-4 w-4" />
-        <Trans>Link sent</Trans>
-      </Button>
-    );
-  }
-
-  return (
-    <Button variant="outline" className="flex-shrink-0 bg-background" loading={isPending} onClick={requestSetupLink}>
-      <Trans>Send setup link</Trans>
-    </Button>
-  );
-};

apps/remix/app/components/forms/password-setup-request.tsx

@@ -1,61 +0,0 @@
-import { usePasswordSetupRequest } from '@documenso/lib/client-only/hooks/use-password-setup-request';
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { match } from 'ts-pattern';
-
-export type PasswordSetupRequestProps = {
-  className?: string;
-};
-
-/**
- * Inline "send me a setup link" control with its own sent/error states, for
- * contexts like dialogs where a toast would be missed.
- */
-export const PasswordSetupRequest = ({ className }: PasswordSetupRequestProps) => {
-  const { _ } = useLingui();
-  const { user } = useSession();
-
-  const { requestSetupLink, isPending, isSuccess, errorCode } = usePasswordSetupRequest();
-
-  if (isSuccess) {
-    return (
-      <Alert className={className} variant="neutral">
-        <AlertTitle>
-          <Trans>Check your email</Trans>
-        </AlertTitle>
-        <AlertDescription>
-          <Trans>
-            We've sent a link to {user.email}. Follow it to set your password, then sign in again to continue.
-          </Trans>
-        </AlertDescription>
-      </Alert>
-    );
-  }
-
-  return (
-    <div className={className}>
-      {errorCode && (
-        <Alert className="mb-4" variant="destructive">
-          <AlertTitle>
-            <Trans>An error occurred</Trans>
-          </AlertTitle>
-          <AlertDescription>
-            {match(errorCode)
-              .with('SIGNIN_DISABLED', () =>
-                _(msg`Password sign in is disabled for this instance. Please contact support.`),
-              )
-              .otherwise(() => _(msg`We were unable to send the email. Please try again or contact support.`))}
-          </AlertDescription>
-        </Alert>
-      )}
-
-      <Button type="button" loading={isPending} onClick={requestSetupLink}>
-        <Trans>Send setup link</Trans>
-      </Button>
-    </div>
-  );
-};

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

@@ -1,6 +1,6 @@
 import { authClient } from '@documenso/auth/client';
 import type { SessionUser } from '@documenso/auth/server/lib/session/session';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { AppError } from '@documenso/lib/errors/app-error';
 import { ZCurrentPasswordSchema, ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -11,21 +11,20 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
-import type { z } from 'zod';
+import { z } from 'zod';
 
-import { hasTwoFactorCode, TwoFactorCodeDialog, ZTwoFactorCodeFieldSchema } from './2fa/two-factor-code-dialog';
-
-export const ZPasswordFormSchema = ZTwoFactorCodeFieldSchema.extend({
-  currentPassword: ZCurrentPasswordSchema,
-  password: ZPasswordSchema,
-  repeatedPassword: ZPasswordSchema,
-}).refine((data) => data.password === data.repeatedPassword, {
-  message: 'Passwords do not match',
-  path: ['repeatedPassword'],
-});
+export const ZPasswordFormSchema = z
+  .object({
+    currentPassword: ZCurrentPasswordSchema,
+    password: ZPasswordSchema,
+    repeatedPassword: ZPasswordSchema,
+  })
+  .refine((data) => data.password === data.repeatedPassword, {
+    message: 'Passwords do not match',
+    path: ['repeatedPassword'],
+  });
 
 export type TPasswordFormSchema = z.infer<typeof ZPasswordFormSchema>;
 
@@ -34,51 +33,29 @@ export type PasswordFormProps = {
   user: SessionUser;
 };
 
-export const PasswordForm = ({ className, user }: PasswordFormProps) => {
+export const PasswordForm = ({ className }: PasswordFormProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const [isTwoFactorDialogOpen, setIsTwoFactorDialogOpen] = useState(false);
-
   const form = useForm<TPasswordFormSchema>({
     values: {
       currentPassword: '',
       password: '',
       repeatedPassword: '',
-      totpCode: '',
-      backupCode: '',
     },
     resolver: zodResolver(ZPasswordFormSchema),
   });
 
   const isSubmitting = form.formState.isSubmitting;
 
-  const onFormSubmit = async (values: TPasswordFormSchema) => {
-    const { currentPassword, password, totpCode, backupCode } = values;
-
-    // Collect the 2FA code in a dialog once the password fields are valid.
-    if (user.twoFactorEnabled && !hasTwoFactorCode(values)) {
-      if (isTwoFactorDialogOpen) {
-        const message = _(msg`A code is required`);
-
-        form.setError('totpCode', { message });
-        form.setError('backupCode', { message });
-      }
-
-      setIsTwoFactorDialogOpen(true);
-      return;
-    }
-
+  const onFormSubmit = async ({ currentPassword, password }: TPasswordFormSchema) => {
     try {
       await authClient.emailPassword.updatePassword({
         currentPassword,
         password,
-        totpCode: totpCode || undefined,
-        backupCode: backupCode || undefined,
       });
 
       form.reset();
-      setIsTwoFactorDialogOpen(false);
 
       toast({
         title: _(msg`Password updated`),
@@ -89,14 +66,9 @@ export const PasswordForm = ({ className, user }: PasswordFormProps) => {
       const error = AppError.parseError(err);
 
       const errorMessage = match(error.code)
-        .with(AppErrorCode.NO_PASSWORD, () => msg`User has no password.`)
-        .with(AppErrorCode.INCORRECT_PASSWORD, () => msg`Current password is incorrect.`)
-        .with(AppErrorCode.SAME_PASSWORD, () => msg`Your new password cannot be the same as your old password.`)
-        .with(
-          AppErrorCode.INCORRECT_TWO_FACTOR_CODE,
-          AppErrorCode.TWO_FACTOR_MISSING_CREDENTIALS,
-          () => msg`The two factor code you provided is invalid. Please try again.`,
-        )
+        .with('NO_PASSWORD', () => msg`User has no password.`)
+        .with('INCORRECT_PASSWORD', () => msg`Current password is incorrect.`)
+        .with('SAME_PASSWORD', () => msg`Your new password cannot be the same as your old password.`)
         .otherwise(
           () => msg`We encountered an unknown error while attempting to update your password. Please try again later.`,
         );
@@ -111,12 +83,7 @@ export const PasswordForm = ({ className, user }: PasswordFormProps) => {
 
   return (
     <Form {...form}>
-      {/* method="post" so a pre-hydration native submit can't leak passwords into the URL. */}
-      <form
-        method="post"
-        className={cn('flex w-full flex-col gap-y-4', className)}
-        onSubmit={form.handleSubmit(onFormSubmit)}
-      >
+      <form className={cn('flex w-full flex-col gap-y-4', className)} onSubmit={form.handleSubmit(onFormSubmit)}>
         <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
           <FormField
             control={form.control}
@@ -173,14 +140,6 @@ export const PasswordForm = ({ className, user }: PasswordFormProps) => {
           </Button>
         </div>
       </form>
-
-      <TwoFactorCodeDialog<TPasswordFormSchema>
-        open={isTwoFactorDialogOpen}
-        onOpenChange={setIsTwoFactorDialogOpen}
-        isSubmitting={isSubmitting}
-        submitLabel={<Trans>Update password</Trans>}
-        onSubmit={form.handleSubmit(onFormSubmit)}
-      />
     </Form>
   );
 };

apps/remix/app/components/general/app-command-menu.tsx

@@ -17,9 +17,9 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Plural, Trans } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
 import { keepPreviousData } from '@tanstack/react-query';
-import { defaultFilter as commandScore } from 'cmdk';
+import { commandScore } from 'cmdk/dist/command-score';
 import {
   ArrowLeftIcon,
   CheckIcon,
@@ -596,13 +596,9 @@ export const AppCommandMenu = ({ open, onOpenChange }: AppCommandMenuProps) => {
 
             <span className="ml-auto text-muted-foreground text-xs">
               {hasValidSearch ? (
-                isVisibleCountCapped ? (
-                  <Trans>{formatChipCount(totalVisibleCount, isVisibleCountCapped)} results</Trans>
-                ) : (
-                  <Plural value={totalVisibleCount} one="# result" other="# results" />
-                )
+                <Trans>{formatChipCount(totalVisibleCount, isVisibleCountCapped)} results</Trans>
               ) : (
-                <Plural value={totalVisibleCount} one="# item" other="# items" />
+                <Trans>{totalVisibleCount} items</Trans>
               )}
             </span>
           </div>

apps/remix/app/components/general/avatar-with-recipient.tsx

@@ -0,0 +1,66 @@
+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
+import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
+import type { TRecipientLite } from '@documenso/lib/types/recipient';
+import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
+import { cn } from '@documenso/ui/lib/utils';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { DocumentStatus } from '@prisma/client';
+
+import { StackAvatar } from './stack-avatar';
+
+export type AvatarWithRecipientProps = {
+  recipient: TRecipientLite;
+  documentStatus: DocumentStatus;
+};
+
+export function AvatarWithRecipient({ recipient, documentStatus }: AvatarWithRecipientProps) {
+  const [, copy] = useCopyToClipboard();
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const signingToken = documentStatus === DocumentStatus.PENDING ? recipient.token : null;
+
+  const onRecipientClick = () => {
+    if (!signingToken) {
+      return;
+    }
+
+    void copy(`${NEXT_PUBLIC_WEBAPP_URL()}/sign/${signingToken}`).then(() => {
+      toast({
+        title: _(msg`Copied to clipboard`),
+        description: _(msg`The signing link has been copied to your clipboard.`),
+      });
+    });
+  };
+
+  return (
+    <div
+      className={cn('my-1 flex items-center gap-2', {
+        'cursor-pointer hover:underline': signingToken,
+      })}
+      role={signingToken ? 'button' : undefined}
+      title={signingToken ? _(msg`Click to copy signing link for sending to recipient`) : undefined}
+      onClick={onRecipientClick}
+    >
+      <StackAvatar
+        first={true}
+        key={recipient.id}
+        type={getRecipientType(recipient)}
+        fallbackText={recipientAbbreviation(recipient)}
+      />
+
+      <div
+        className="text-muted-foreground text-sm"
+        title={signingToken ? _(msg`Click to copy signing link for sending to recipient`) : undefined}
+      >
+        <p>{recipient.email || recipient.name}</p>
+        <p className="text-muted-foreground/70 text-xs">{_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}</p>
+      </div>
+    </div>
+  );
+}

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

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import { AppError } from '@documenso/lib/errors/app-error';
 import type { TTemplate } from '@documenso/lib/types/template';
@@ -42,7 +41,6 @@ export const DirectTemplatePageView = ({
 
   const { _ } = useLingui();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const { email, fullName, setEmail } = useRequiredDocumentSigningContext();
   const { recipient, setRecipient } = useRequiredDocumentSigningAuthContext();
@@ -126,13 +124,6 @@ export const DirectTemplatePageView = ({
       const error = AppError.parseError(err);
       const errorMessage = getDirectTemplateErrorMessage(error.code);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'direct_template',
-        recipientId: directTemplateRecipient.id,
-        envelopeId: template.envelopeId,
-      });
-
       toast({
         title: _(errorMessage.title),
         description: _(errorMessage.description),

apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx

@@ -1,7 +1,5 @@
 import { AppError } from '@documenso/lib/errors/app-error';
 import { DocumentAuth, type TRecipientActionAuth } from '@documenso/lib/types/document-auth';
-import { UserAuthMethod } from '@documenso/lib/types/user-auth-method';
-import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import { DialogFooter } from '@documenso/ui/primitives/dialog';
@@ -9,13 +7,11 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '
 import { Input } from '@documenso/ui/primitives/input';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, useLingui } from '@lingui/react/macro';
-import { Loader2Icon } from 'lucide-react';
 import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
 import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-provider';
-import { DocumentSigningAuthSetPassword } from './document-signing-auth-set-password';
 
 export type DocumentSigningAuthPasswordProps = {
   open: boolean;
@@ -39,12 +35,8 @@ export const DocumentSigningAuthPassword = ({
 }: DocumentSigningAuthPasswordProps) => {
   const { t } = useLingui();
 
-  const { user, isCurrentlyAuthenticating, setIsCurrentlyAuthenticating } = useRequiredDocumentSigningAuthContext();
-
-  // Fetched on demand since this is only needed once the user opts for password auth.
-  const { data: authMethodsData, isPending: isAuthMethodsPending } = trpc.auth.getAuthMethods.useQuery(undefined, {
-    enabled: !!user,
-  });
+  const { recipient, isCurrentlyAuthenticating, setIsCurrentlyAuthenticating } =
+    useRequiredDocumentSigningAuthContext();
 
   const form = useForm<TPasswordAuthFormSchema>({
     resolver: zodResolver(ZPasswordAuthFormSchema),
@@ -55,10 +47,6 @@ export const DocumentSigningAuthPassword = ({
 
   const [formErrorCode, setFormErrorCode] = useState<string | null>(null);
 
-  // If the query fails we fall through to the regular password form rather than blocking.
-  const isPasswordSetupRequired =
-    !!user && !!authMethodsData && !authMethodsData.authMethods.includes(UserAuthMethod.PASSWORD);
-
   const onFormSubmit = async ({ password }: TPasswordAuthFormSchema) => {
     try {
       setIsCurrentlyAuthenticating(true);
@@ -76,6 +64,8 @@ export const DocumentSigningAuthPassword = ({
 
       const error = AppError.parseError(err);
       setFormErrorCode(error.code);
+
+      // Todo: Alert.
     }
   };
 
@@ -89,22 +79,9 @@ export const DocumentSigningAuthPassword = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open]);
 
-  if (user && isAuthMethodsPending) {
-    return (
-      <div className="flex items-center justify-center py-8">
-        <Loader2Icon className="h-6 w-6 animate-spin text-muted-foreground" />
-      </div>
-    );
-  }
-
-  if (isPasswordSetupRequired) {
-    return <DocumentSigningAuthSetPassword onOpenChange={onOpenChange} />;
-  }
-
   return (
     <Form {...form}>
-      {/* method="post" so a pre-hydration native submit can't leak the password into the URL. */}
-      <form method="post" onSubmit={form.handleSubmit(onFormSubmit)}>
+      <form onSubmit={form.handleSubmit(onFormSubmit)}>
         <fieldset disabled={isCurrentlyAuthenticating}>
           <div className="space-y-4">
             {formErrorCode && (

apps/remix/app/components/general/document-signing/document-signing-auth-set-password.tsx

@@ -1,63 +0,0 @@
-import { isSigninEnabledForProvider } from '@documenso/lib/constants/auth';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import { DialogFooter } from '@documenso/ui/primitives/dialog';
-import { Trans } from '@lingui/react/macro';
-
-import { PasswordSetupRequest } from '~/components/forms/password-setup-request';
-
-export type DocumentSigningAuthSetPasswordProps = {
-  onOpenChange: (value: boolean) => void;
-};
-
-/**
- * Shown in place of the password reauth form when the signed in user has no
- * password (e.g. they signed up via OAuth or a passkey).
- *
- * Password based action auth is meant to prove more than possession of a session,
- * so rather than letting the session set a password inline we send the user the
- * verified reset link and ask them to come back.
- */
-export const DocumentSigningAuthSetPassword = ({ onOpenChange }: DocumentSigningAuthSetPasswordProps) => {
-  const isEmailPasswordSigninEnabled = isSigninEnabledForProvider('email');
-
-  return (
-    <div className="space-y-4">
-      {isEmailPasswordSigninEnabled ? (
-        <>
-          <Alert variant="neutral">
-            <AlertTitle>
-              <Trans>No password set</Trans>
-            </AlertTitle>
-            <AlertDescription>
-              <Trans>
-                Signing this field requires a password, but your account does not have one. We can email you a link to
-                set one. Once done, sign in again and return to this document to continue.
-              </Trans>
-            </AlertDescription>
-          </Alert>
-
-          <PasswordSetupRequest />
-        </>
-      ) : (
-        <Alert variant="warning">
-          <AlertTitle>
-            <Trans>Password authentication unavailable</Trans>
-          </AlertTitle>
-          <AlertDescription>
-            <Trans>
-              Your account does not have a password and password sign in is disabled for this instance. Please contact
-              the document sender to use a different authentication method.
-            </Trans>
-          </AlertDescription>
-        </Alert>
-      )}
-
-      <DialogFooter>
-        <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
-          <Trans>Close</Trans>
-        </Button>
-      </DialogFooter>
-    </div>
-  );
-};

apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -40,7 +39,6 @@ export const DocumentSigningCheckboxField = ({
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
 
@@ -128,13 +126,6 @@ export const DocumentSigningCheckboxField = ({
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -166,13 +157,6 @@ export const DocumentSigningCheckboxField = ({
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),
@@ -232,13 +216,6 @@ export const DocumentSigningCheckboxField = ({
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while updating the signature.`),

apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { type TRecipientAccessAuth, ZDocumentAccessAuthSchema } from '@documenso/lib/types/document-auth';
 import { fieldsContainUnsignedRequiredField } from '@documenso/lib/utils/advanced-fields-helpers';
@@ -15,7 +14,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 { useToast } from '@documenso/ui/primitives/use-toast';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, useLingui } from '@lingui/react/macro';
 import type { Field, Recipient } from '@prisma/client';
@@ -29,8 +27,6 @@ import { useEmbedSigningContext } from '~/components/embed/embed-signing-context
 import { AccessAuth2FAForm } from '~/components/general/document-signing/access-auth-2fa-form';
 import { DocumentSigningDisclosure } from '~/components/general/document-signing/document-signing-disclosure';
 
-import { getSigningCompletionErrorMessage } from '~/utils/toast-error-messages';
-
 import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-provider';
 
 export type DocumentSigningCompleteDialogProps = {
@@ -89,9 +85,7 @@ export const DocumentSigningCompleteDialog = ({
   position,
   disableNameInput = false,
 }: DocumentSigningCompleteDialogProps) => {
-  const analytics = useAnalytics();
-  const { t, i18n } = useLingui();
-  const { toast } = useToast();
+  const { t } = useLingui();
 
   const [showDialog, setShowDialog] = useState(false);
 
@@ -180,23 +174,6 @@ export const DocumentSigningCompleteDialog = ({
 
         return;
       }
-
-      analytics.captureException(error, {
-        source: 'signing',
-        location: 'complete_document',
-      });
-
-      // This dialog owns the completion error toast for every signing surface
-      // so the user gets a specific, actionable message. Callers should run
-      // their own side effects (e.g. embeds posting document-error) and
-      // rethrow rather than toasting themselves.
-      const toastMessage = getSigningCompletionErrorMessage(err.code);
-
-      toast({
-        title: i18n._(toastMessage.title),
-        description: i18n._(toastMessage.description),
-        variant: 'destructive',
-      });
     }
   };
 

apps/remix/app/components/general/document-signing/document-signing-date-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { convertToLocalSystemFormat, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
@@ -40,7 +39,6 @@ export const DocumentSigningDateField = ({
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
 
@@ -87,13 +85,6 @@ export const DocumentSigningDateField = ({
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -122,13 +113,6 @@ export const DocumentSigningDateField = ({
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -36,7 +35,6 @@ export const DocumentSigningDropdownField = ({
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
 
@@ -88,13 +86,6 @@ export const DocumentSigningDropdownField = ({
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -129,13 +120,6 @@ export const DocumentSigningDropdownField = ({
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document-signing/document-signing-email-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -34,7 +33,6 @@ export const DocumentSigningEmailField = ({ field, onSignField, onUnsignField }:
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { email: providedEmail } = useRequiredDocumentSigningContext();
 
@@ -80,13 +78,6 @@ export const DocumentSigningEmailField = ({ field, onSignField, onUnsignField }:
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -115,13 +106,6 @@ export const DocumentSigningEmailField = ({ field, onSignField, onUnsignField }:
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document-signing/document-signing-form.tsx

@@ -1,4 +1,3 @@
-import { AppError } from '@documenso/lib/errors/app-error';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
 import type { TRecipientAccessAuth } from '@documenso/lib/types/document-auth';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
@@ -20,8 +19,6 @@ import { useId, useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 
-import { getSigningCompletionErrorMessage } from '~/utils/toast-error-messages';
-
 import { AssistantConfirmationDialog, type NextSigner } from '../../dialogs/assistant-confirmation-dialog';
 import { DocumentSigningCompleteDialog } from './document-signing-complete-dialog';
 import { useRequiredDocumentSigningContext } from './document-signing-provider';
@@ -103,12 +100,9 @@ export const DocumentSigningForm = ({
     try {
       await completeDocument({ nextSigner });
     } catch (err) {
-      const error = AppError.parseError(err);
-      const toastMessage = getSigningCompletionErrorMessage(error.code);
-
       toast({
-        title: _(toastMessage.title),
-        description: _(toastMessage.description),
+        title: _(msg`Error`),
+        description: _(msg`An error occurred while completing the document. Please try again.`),
         variant: 'destructive',
       });
 

apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -39,7 +38,6 @@ export const DocumentSigningInitialsField = ({
   const { toast } = useToast();
   const { _ } = useLingui();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { fullName } = useRequiredDocumentSigningContext();
   const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
@@ -86,13 +84,6 @@ export const DocumentSigningInitialsField = ({
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -121,13 +112,6 @@ export const DocumentSigningInitialsField = ({
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document-signing/document-signing-name-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -40,7 +39,6 @@ export const DocumentSigningNameField = ({ field, onSignField, onUnsignField }:
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { fullName: providedFullName, setFullName: setProvidedFullName } = useRequiredDocumentSigningContext();
 
@@ -118,13 +116,6 @@ export const DocumentSigningNameField = ({ field, onSignField, onUnsignField }:
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -153,13 +144,6 @@ export const DocumentSigningNameField = ({ field, onSignField, onUnsignField }:
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document-signing/document-signing-number-field.tsx

@@ -1,5 +1,4 @@
 import { validateNumberField } from '@documenso/lib/advanced-fields-validation/validate-number';
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -48,7 +47,6 @@ export const DocumentSigningNumberField = ({ field, onSignField, onUnsignField }
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
 
@@ -144,13 +142,6 @@ export const DocumentSigningNumberField = ({ field, onSignField, onUnsignField }
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -202,13 +193,6 @@ export const DocumentSigningNumberField = ({ field, onSignField, onUnsignField }
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document-signing/document-signing-page-view-v1.tsx

@@ -1,3 +1,4 @@
+import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
@@ -82,6 +83,8 @@ export const DocumentSigningPageViewV1 = ({
     ? authUser.twoFactorEnabled && authUser.email === recipient.email
     : false;
 
+  const analytics = useAnalytics();
+
   const [selectedSignerId, setSelectedSignerId] = useState<number | null>(allRecipients?.[0]?.id);
   const [isExpanded, setIsExpanded] = useState(false);
 
@@ -115,6 +118,12 @@ export const DocumentSigningPageViewV1 = ({
 
     await completeDocumentWithToken(payload);
 
+    analytics.capture('App: Recipient has completed signing', {
+      signerId: recipient.id,
+      documentId: document.id,
+      timestamp: new Date().toISOString(),
+    });
+
     if (documentMeta?.redirectUrl) {
       window.location.href = documentMeta.redirectUrl;
     } else {

apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx

@@ -184,7 +184,6 @@ export const DocumentSigningPageViewV2 = () => {
                   envelopeId={envelope.id}
                   envelopeStatus={envelope.status}
                   envelopeItems={envelope.envelopeItems}
-                  envelopeTitle={envelope.title}
                   token={recipient.token}
                   trigger={
                     <Button variant="ghost" size="sm" className="w-full justify-start">

apps/remix/app/components/general/document-signing/document-signing-radio-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -32,7 +31,6 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient, targetSigner, isAssistantMode } = useDocumentSigningRecipientContext();
 
@@ -93,13 +91,6 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -129,13 +120,6 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the selection.`),
@@ -162,17 +146,14 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
       {isLoading && <DocumentSigningFieldsLoader />}
 
       {!field.inserted && (
-        <RadioGroup
-          value={selectedOption}
-          onValueChange={(value) => handleSelectItem(value)}
-          className="z-10 my-0.5 gap-y-1"
-        >
+        <RadioGroup onValueChange={(value) => handleSelectItem(value)} className="z-10 my-0.5 gap-y-1">
           {values?.map((item, index) => (
             <div key={index} className="flex items-center">
               <RadioGroupItem
                 className="h-3 w-3 shrink-0"
                 value={item.value}
                 id={`option-${field.id}-${item.id}`}
+                checked={item.checked}
                 disabled={isReadOnly}
               />
               {!item.value.includes('empty-value-') && item.value && (
@@ -186,13 +167,14 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
       )}
 
       {field.inserted && (
-        <RadioGroup value={field.customText ?? ''} className="my-0.5 gap-y-1">
+        <RadioGroup className="my-0.5 gap-y-1">
           {values?.map((item, index) => (
             <div key={index} className="flex items-center">
               <RadioGroupItem
                 className="h-3 w-3"
                 value={item.value}
                 id={`option-${field.id}-${item.id}`}
+                checked={item.value === field.customText}
                 disabled={isReadOnly}
               />
               {!item.value.includes('empty-value-') && item.value && (

apps/remix/app/components/general/document-signing/document-signing-reject-dialog.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -42,7 +41,6 @@ export function DocumentSigningRejectDialog({
 }: DocumentSigningRejectDialogProps) {
   const { t } = useLingui();
   const { toast } = useToast();
-  const analytics = useAnalytics();
   const [searchParams] = useSearchParams();
 
   const [isOpen, setIsOpen] = useState(false);
@@ -78,12 +76,6 @@ export function DocumentSigningRejectDialog({
         window.location.href = `/sign/${token}/rejected`;
       }
     } catch (err) {
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'reject_document',
-        documentId,
-      });
-
       toast({
         title: t`Error`,
         description: t`An error occurred while rejecting the document. Please try again.`,

apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -48,7 +47,6 @@ export const DocumentSigningSignatureField = ({
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient } = useDocumentSigningRecipientContext();
 
@@ -159,13 +157,6 @@ export const DocumentSigningSignatureField = ({
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while signing the document.`),
@@ -192,13 +183,6 @@ export const DocumentSigningSignatureField = ({
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the signature.`),

apps/remix/app/components/general/document-signing/document-signing-text-field.tsx

@@ -1,5 +1,4 @@
 import { validateTextField } from '@documenso/lib/advanced-fields-validation/validate-text';
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -51,7 +50,6 @@ export const DocumentSigningTextField = ({ field, onSignField, onUnsignField }:
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
-  const analytics = useAnalytics();
 
   const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
 
@@ -172,13 +170,6 @@ export const DocumentSigningTextField = ({ field, onSignField, onUnsignField }:
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: isAssistantMode
@@ -209,13 +200,6 @@ export const DocumentSigningTextField = ({ field, onSignField, onUnsignField }:
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'remove_field',
-        fieldType: field.type,
-        recipientId: field.recipientId,
-      });
-
       toast({
         title: _(msg`Error`),
         description: _(msg`An error occurred while removing the field.`),

apps/remix/app/components/general/document/document-certificate-qr-view.tsx

@@ -135,7 +135,6 @@ export const DocumentCertificateQRView = ({
               envelopeId={envelopeItems[0].envelopeId}
               envelopeStatus={DocumentStatus.COMPLETED}
               envelopeItems={envelopeItems}
-              envelopeTitle={title}
               token={token}
               trigger={
                 <Button type="button" variant="outline" className="w-fit">
@@ -196,7 +195,6 @@ const DocumentCertificateQrV2 = ({ title, recipientCount, formattedDate, token }
           envelopeId={envelopeItems[0].envelopeId}
           envelopeStatus={DocumentStatus.COMPLETED}
           envelopeItems={envelopeItems}
-          envelopeTitle={title}
           token={token}
           trigger={
             <Button type="button" variant="outline" className="w-fit">

apps/remix/app/components/general/document/document-edit-form.tsx

@@ -28,7 +28,6 @@ import { useNavigate, useSearchParams } from 'react-router';
 import { z } from 'zod';
 import PDFViewerLazy from '~/components/general/pdf-viewer/pdf-viewer-lazy';
 import { useCurrentTeam } from '~/providers/team';
-import { useCspNonce } from '~/utils/nonce';
 import { getDistributeErrorMessage } from '~/utils/toast-error-messages';
 
 export type DocumentEditFormProps = {
@@ -43,7 +42,6 @@ const EditDocumentSteps: EditDocumentStep[] = ['settings', 'signers', 'fields',
 export const DocumentEditForm = ({ className, initialDocument, documentRootPath }: DocumentEditFormProps) => {
   const { toast } = useToast();
   const { _ } = useLingui();
-  const cspNonce = useCspNonce();
 
   const navigate = useNavigate();
 
@@ -475,7 +473,6 @@ export const DocumentEditForm = ({ className, initialDocument, documentRootPath
               onSubmit={onAddSignersFormSubmit}
               onAutoSave={onAddSignersFormAutoSave}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
-              nonce={cspNonce}
             />
 
             <AddFieldsFormPartial

apps/remix/app/components/general/document/document-page-view-button.tsx

@@ -73,7 +73,6 @@ export const DocumentPageViewButton = ({ envelope }: DocumentPageViewButtonProps
         envelopeId={envelope.id}
         envelopeStatus={envelope.status}
         envelopeItems={envelope.envelopeItems}
-        envelopeTitle={envelope.title}
         token={recipient?.token}
         trigger={
           <Button className="w-full">

apps/remix/app/components/general/document/document-page-view-dropdown.tsx

@@ -101,7 +101,6 @@ export const DocumentPageViewDropdown = ({ envelope }: DocumentPageViewDropdownP
           isLegacy={envelope.internalVersion === 1}
           token={canManageDocument ? undefined : recipient?.token}
           envelopeItems={envelope.envelopeItems}
-          envelopeTitle={envelope.title}
           trigger={
             <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
               <div>

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

@@ -2,7 +2,7 @@ import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounce
 import { Input } from '@documenso/ui/primitives/input';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { useQueryStates } from 'nuqs';
+import { useQueryState } from 'nuqs';
 import { useEffect, useState } from 'react';
 
 import { documentsSearchParams } from '~/utils/documents-search-params';
@@ -10,26 +10,16 @@ import { documentsSearchParams } from '~/utils/documents-search-params';
 export const DocumentSearch = () => {
   const { _ } = useLingui();
 
-  const [{ query }, setSearchParams] = useQueryStates(
-    {
-      query: documentsSearchParams.query,
-      page: documentsSearchParams.page,
-    },
-    { history: 'push' },
-  );
+  const [query, setQuery] = useQueryState('query', documentsSearchParams.query);
 
   const [searchTerm, setSearchTerm] = useState(query ?? '');
   const debouncedSearchTerm = useDebouncedValue(searchTerm, 500);
 
   useEffect(() => {
     if (debouncedSearchTerm !== (query ?? '')) {
-      // Reset pagination so a new search never lands on an empty page.
-      void setSearchParams({
-        query: debouncedSearchTerm || null,
-        page: null,
-      });
+      void setQuery(debouncedSearchTerm || null);
     }
-  }, [debouncedSearchTerm, query, setSearchParams]);
+  }, [debouncedSearchTerm, query, setQuery]);
 
   return (
     <Input

apps/remix/app/components/general/document/document-upload-button-legacy.tsx

@@ -1,4 +1,5 @@
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
+import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
@@ -37,6 +38,7 @@ export const DocumentUploadButtonLegacy = ({ className, type }: DocumentUploadBu
   const team = useCurrentTeam();
 
   const navigate = useNavigate();
+  const analytics = useAnalytics();
   const organisation = useCurrentOrganisation();
 
   const userTimezone =
@@ -101,6 +103,12 @@ export const DocumentUploadButtonLegacy = ({ className, type }: DocumentUploadBu
           description: _(msg`Your document has been uploaded successfully.`),
           duration: 5000,
         });
+
+        analytics.capture('App: Document Uploaded', {
+          userId: user.id,
+          documentId: id,
+          timestamp: new Date().toISOString(),
+        });
       }
 
       // Handle legacy template creation.

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

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
 import type { TLocalField } from '@documenso/lib/client-only/hooks/use-editor-fields';
 import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
@@ -38,12 +37,8 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { fieldButtonList } from './envelope-editor-fields-drag-drop';
 import { EnvelopeRecipientSelectorCommand } from './envelope-recipient-selector';
 
-/** How far past a resize handle you can still grab it, in screen pixels. */
-const TRANSFORMER_ANCHOR_HIT_STROKE_PX = 24;
-
 export const EnvelopeEditorFieldsPageRenderer = ({ pageData }: { pageData: PageRenderData }) => {
   const { t, i18n } = useLingui();
-  const analytics = useAnalytics();
   const { envelope, editorFields, getRecipientColorKey } = useCurrentEnvelopeEditor();
   const { currentEnvelopeItem, setRenderError } = useCurrentEnvelopeRender();
 
@@ -281,13 +276,6 @@ export const EnvelopeEditorFieldsPageRenderer = ({ pageData }: { pageData: PageR
       unsafeRenderFieldOnLayer(field);
     } catch (err) {
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'editor',
-        location: 'envelope_page_render',
-        envelopeId: envelope.id,
-      });
-
       setRenderError(true);
     }
   };
@@ -362,9 +350,6 @@ export const EnvelopeEditorFieldsPageRenderer = ({ pageData }: { pageData: PageR
       shouldOverdrawWholeArea: true,
       ignoreStroke: true,
       flipEnabled: false,
-      anchorStyleFunc: (anchor) => {
-        anchor.hitStrokeWidth(TRANSFORMER_ANCHOR_HIT_STROKE_PX / scale);
-      },
       boundBoxFunc: (oldBox, newBox) => {
         // Enforce minimum size
         if (newBox.width < 30 || newBox.height < 20) {

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

@@ -45,7 +45,6 @@ import { isDeepEqual } from 'remeda';
 import { AiFeaturesEnableDialog } from '~/components/dialogs/ai-features-enable-dialog';
 import { AiRecipientDetectionDialog } from '~/components/dialogs/ai-recipient-detection-dialog';
 import { useCurrentTeam } from '~/providers/team';
-import { useCspNonce } from '~/utils/nonce';
 
 export const EnvelopeEditorRecipientForm = () => {
   const { envelope, setRecipientsDebounced, updateEnvelope, editorRecipients, isEmbedded, editorConfig } =
@@ -53,7 +52,6 @@ export const EnvelopeEditorRecipientForm = () => {
 
   const organisation = useCurrentOrganisation();
   const team = useCurrentTeam();
-  const cspNonce = useCspNonce();
 
   const { t } = useLingui();
   const { toast } = useToast();
@@ -797,7 +795,6 @@ export const EnvelopeEditorRecipientForm = () => {
           </div>
 
           <DragDropContext
-            nonce={cspNonce}
             onDragEnd={onDragEnd}
             sensors={[
               (api: SensorAPI) => {

apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx

@@ -16,7 +16,7 @@ import {
   ZDocumentMetaTimezoneSchema,
 } from '@documenso/lib/types/document-meta';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { isHttpUrl } from '@documenso/lib/utils/is-http-url';
+import { isValidRedirectUrl } from '@documenso/lib/utils/is-valid-redirect-url';
 import { canAccessTeamDocument, DocumentSignatureType, extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import { zEmail } from '@documenso/lib/utils/zod';
 import { trpc } from '@documenso/trpc/react';
@@ -97,7 +97,7 @@ export const ZAddSettingsFormSchema = z.object({
     redirectUrl: z
       .string()
       .optional()
-      .refine((value) => value === undefined || value === '' || isHttpUrl(value), {
+      .refine((value) => value === undefined || value === '' || isValidRedirectUrl(value), {
         message: 'Please enter a valid URL, make sure you include http:// or https:// part of the url.',
       }),
     language: z

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

@@ -1,5 +1,4 @@
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useEnvelopeAutosave } from '@documenso/lib/client-only/hooks/use-envelope-autosave';
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
@@ -26,7 +25,6 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { ErrorCode as DropzoneErrorCode, type FileRejection, useDropzone } from 'react-dropzone';
 
 import { EnvelopeItemDeleteDialog } from '~/components/dialogs/envelope-item-delete-dialog';
-import { useCspNonce } from '~/utils/nonce';
 
 import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeEditorRecipientForm } from './envelope-editor-recipient-form';
@@ -43,12 +41,10 @@ type LocalFile = {
 
 export const EnvelopeEditorUploadPage = () => {
   const organisation = useCurrentOrganisation();
-  const cspNonce = useCspNonce();
 
   const { t, i18n } = useLingui();
   const { maximumEnvelopeItemCount, remaining } = useLimits();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const {
     envelope,
@@ -217,12 +213,6 @@ export const EnvelopeEditorUploadPage = () => {
     const { data } = await createPromise.catch((error) => {
       console.error(error);
 
-      analytics.captureException(error, {
-        source: isEmbedded ? 'embed' : 'editor',
-        location: 'create_envelope_items',
-        envelopeId: envelope.id,
-      });
-
       // Set error state on files in batch upload.
       setLocalFiles((prev) =>
         prev.map((uploadingFile) =>
@@ -300,12 +290,6 @@ export const EnvelopeEditorUploadPage = () => {
     } catch (error) {
       console.error(error);
 
-      analytics.captureException(error, {
-        source: isEmbedded ? 'embed' : 'editor',
-        location: 'replace_pdf',
-        envelopeId: envelope.id,
-      });
-
       toast({
         title: t`Replace failed`,
         description: t`Something went wrong while replacing the PDF`,
@@ -496,7 +480,7 @@ export const EnvelopeEditorUploadPage = () => {
 
           {/* Uploaded Files List */}
           <div className="mt-4">
-            <DragDropContext nonce={cspNonce} onDragEnd={onDragEnd}>
+            <DragDropContext onDragEnd={onDragEnd}>
               <Droppable droppableId="files">
                 {(provided) => (
                   <div

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

@@ -440,7 +440,6 @@ export const EnvelopeEditor = () => {
                 envelopeStatus={envelope.status}
                 isLegacy={envelope.internalVersion === 1}
                 envelopeItems={envelope.envelopeItems}
-                envelopeTitle={envelope.title}
                 trigger={
                   <Button variant="ghost" size="sm" className="w-full justify-start" title={t(msg`Download PDF`)}>
                     <DownloadCloudIcon className="h-4 w-4" />

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

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
 import {
   type PageRenderData,
@@ -19,7 +18,6 @@ type GenericLocalField = TEnvelope['fields'][number] & {
 
 export const EnvelopeGenericPageRenderer = ({ pageData }: { pageData: PageRenderData }) => {
   const { i18n } = useLingui();
-  const analytics = useAnalytics();
 
   const {
     envelopeStatus,
@@ -116,13 +114,6 @@ export const EnvelopeGenericPageRenderer = ({ pageData }: { pageData: PageRender
       unsafeRenderFieldOnLayer(field);
     } catch (err) {
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'editor',
-        location: 'envelope_page_render',
-        envelopeId: currentEnvelopeItem?.envelopeId,
-      });
-
       setRenderError(true);
     }
   };

apps/remix/app/components/general/envelope-signing/envelope-signer-header.tsx

@@ -102,7 +102,6 @@ const MobileDropdownMenu = () => {
           envelopeId={envelope.id}
           envelopeStatus={envelope.status}
           envelopeItems={envelope.envelopeItems}
-          envelopeTitle={envelope.title}
           token={recipient.token}
           trigger={
             <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>

apps/remix/app/components/general/envelope-signing/envelope-signer-page-renderer.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
 import {
   type PageRenderData,
@@ -54,7 +53,6 @@ export const EnvelopeSignerPageRenderer = ({ pageData }: { pageData: PageRenderD
 
   const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const {
     envelopeData,
@@ -428,14 +426,6 @@ export const EnvelopeSignerPageRenderer = ({ pageData }: { pageData: PageRenderD
       unsafeRenderFieldOnLayer(unparsedField, fieldCanvasStyleCache);
     } catch (err) {
       console.error(err);
-
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'page_render',
-        recipientId: recipient.id,
-        envelopeId: envelope.id,
-      });
-
       setRenderError(true);
     }
   };
@@ -517,14 +507,6 @@ export const EnvelopeSignerPageRenderer = ({ pageData }: { pageData: PageRenderD
     } catch (err) {
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'sign_field',
-        fieldType: payload.type,
-        recipientId: recipient.id,
-        envelopeId: envelope.id,
-      });
-
       toast({
         title: t`Error`,
         description: t`An error occurred while signing the field.`,

apps/remix/app/components/general/envelope-signing/envelope-signing-complete-dialog.tsx

@@ -118,6 +118,12 @@ export const EnvelopeSignerCompleteDialog = () => {
           title: t`Document already signed`,
           description: t`This document was already signed and no further action was taken.`,
         });
+      } else {
+        analytics.capture('App: Recipient has completed signing', {
+          signerId: recipient.id,
+          documentId: envelope.id,
+          timestamp: new Date().toISOString(),
+        });
       }
 
       if (onDocumentCompleted) {
@@ -142,18 +148,15 @@ export const EnvelopeSignerCompleteDialog = () => {
       const error = AppError.parseError(err);
 
       if (error.code !== AppErrorCode.TWO_FACTOR_AUTH_FAILED) {
-        analytics.captureException(err, {
-          source: 'signing',
-          location: 'complete_document',
-          recipientId: recipient.id,
-          envelopeId: envelope.id,
+        toast({
+          title: t`Something went wrong`,
+          description: t`We were unable to submit this document at this time. Please try again later.`,
+          variant: 'destructive',
         });
 
         onDocumentError?.();
       }
 
-      // Rethrow so DocumentSigningCompleteDialog can handle 2FA retries and
-      // toast a specific completion error message.
       throw err;
     }
   };
@@ -221,18 +224,14 @@ export const EnvelopeSignerCompleteDialog = () => {
       }
     } catch (err) {
       console.log('err', err);
-
-      analytics.captureException(err, {
-        source: 'signing',
-        location: 'complete_document_next_signer',
-        recipientId: recipient.id,
-        envelopeId: envelope.id,
+      toast({
+        title: t`Something went wrong`,
+        description: t`We were unable to submit this document at this time. Please try again later.`,
+        variant: 'destructive',
       });
 
       onDocumentError?.();
 
-      // Rethrow so DocumentSigningCompleteDialog can toast a specific
-      // completion error message.
       throw err;
     }
   };

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

@@ -93,6 +93,14 @@ export const EnvelopeDropZoneWrapper = ({ children, type, className }: EnvelopeD
         duration: 5000,
       });
 
+      if (type === EnvelopeType.DOCUMENT) {
+        analytics.capture('App: Document Uploaded', {
+          userId: user.id,
+          documentId: id,
+          timestamp: new Date().toISOString(),
+        });
+      }
+
       const pathPrefix = type === EnvelopeType.DOCUMENT ? formatDocumentsPath(team.url) : formatTemplatesPath(team.url);
 
       const aiQueryParam = team.preferences.aiFeaturesEnabled ? '?ai=true' : '';
@@ -101,11 +109,6 @@ export const EnvelopeDropZoneWrapper = ({ children, type, className }: EnvelopeD
     } catch (err) {
       const error = AppError.parseError(err);
 
-      analytics.captureException(err, {
-        source: 'editor',
-        location: 'upload_document',
-      });
-
       const errorMessage = getUploadErrorMessage(error.code);
 
       toast({

apps/remix/app/components/general/envelope/envelope-upload-button.tsx

@@ -1,5 +1,4 @@
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { TIME_ZONES } from '@documenso/lib/constants/time-zones';
@@ -35,7 +34,6 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
   const { t, i18n } = useLingui();
   const { toast } = useToast();
   const { user } = useSession();
-  const analytics = useAnalytics();
 
   const team = useCurrentTeam();
 
@@ -114,11 +112,6 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
 
       console.error(err);
 
-      analytics.captureException(err, {
-        source: 'editor',
-        location: 'upload_document',
-      });
-
       const errorMessage = getUploadErrorMessage(error.code);
 
       toast({

apps/remix/app/components/general/pdf-viewer/pdf-viewer.tsx

@@ -1,4 +1,3 @@
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import type { ImageLoadingState, PageRenderData } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { PDF_VIEWER_PAGE_CLASSNAME } from '@documenso/lib/constants/pdf-viewer';
 import { cn } from '@documenso/ui/lib/utils';
@@ -69,7 +68,6 @@ export default function PDFViewer({
 }: PDFViewerProps) {
   const { t } = useLingui();
   const { toast } = useToast();
-  const analytics = useAnalytics();
 
   const $el = useRef<HTMLDivElement>(null);
 
@@ -152,11 +150,6 @@ export default function PDFViewer({
         console.error(err);
         setLoadingState('error');
 
-        analytics.captureException(err, {
-          source: 'pdf_viewer',
-          location: 'pdf_load',
-        });
-
         toast({
           title: t`Error`,
           description: t`An error occurred while loading the document.`,
@@ -222,7 +215,7 @@ export default function PDFViewer({
 
 type VirtualizedPageListProps = {
   scrollParentRef: ScrollTarget;
-  constraintRef: React.RefObject<HTMLDivElement | null>;
+  constraintRef: React.RefObject<HTMLDivElement>;
   pages: PageMeta[];
   numPages: number;
   pdf: pdfjsLib.PDFDocumentProxy;
@@ -373,8 +366,6 @@ const PdfViewerPage = ({
  * Manages rendering a page from a pdf.
  */
 const usePdfPageImage = ({ pageNumber, pdf, scale, scaledWidth, scaledHeight }: PdfViewerPageProps) => {
-  const analytics = useAnalytics();
-
   const [imageLoadingState, setImageLoadingState] = useState<ImageLoadingState>('loading');
 
   const [imageUrl, setImageUrl] = useState('');
@@ -466,12 +457,6 @@ const usePdfPageImage = ({ pageNumber, pdf, scale, scaledWidth, scaledHeight }:
 
         if (!isCancelled) {
           console.error(err);
-
-          analytics.captureException(err, {
-            source: 'pdf_viewer',
-            location: 'pdf_page_render',
-          });
-
           setImageLoadingState('error');
         }
       } finally {

apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx

@@ -0,0 +1,37 @@
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { Trans } from '@lingui/react/macro';
+import { ChevronLeft, Loader } from 'lucide-react';
+import { Link } from 'react-router';
+
+export default function DocumentEditSkeleton() {
+  return (
+    <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">
+      <Link to="/" className="flex grow-0 items-center text-documenso-700 hover:opacity-80">
+        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+        <Trans>Documents</Trans>
+      </Link>
+
+      <h1 className="mt-4 grow-0 truncate font-semibold text-2xl md:text-3xl">
+        <Trans>Loading Document...</Trans>
+      </h1>
+
+      <div className="flex h-10 items-center">
+        <Skeleton className="my-6 h-4 w-24 rounded-2xl" />
+      </div>
+
+      <div className="mt-4 grid h-[80vh] max-h-[60rem] w-full grid-cols-12 gap-x-8">
+        <div className="col-span-12 rounded-xl border-2 border-border bg-white/50 p-2 before:rounded-xl lg:col-span-6 xl:col-span-7 dark:bg-background">
+          <div className="flex h-[80vh] max-h-[60rem] flex-col items-center justify-center">
+            <Loader className="h-12 w-12 animate-spin text-documenso" />
+
+            <p className="mt-4 text-muted-foreground">
+              <Trans>Loading document...</Trans>
+            </p>
+          </div>
+        </div>
+
+        <div className="col-span-12 rounded-xl border-2 border-border bg-background before:rounded-xl lg:col-span-6 xl:col-span-5" />
+      </div>
+    </div>
+  );
+}

apps/remix/app/components/general/stack-avatar.tsx

@@ -1,5 +1,4 @@
 import { RecipientStatusType } from '@documenso/lib/client-only/recipient-type';
-import { cn } from '@documenso/ui/lib/utils';
 import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';
 
 const ZIndexes: { [key: string]: string } = {
@@ -15,10 +14,9 @@ export type StackAvatarProps = {
   zIndex?: string;
   fallbackText?: string;
   type: RecipientStatusType;
-  className?: string;
 };
 
-export const StackAvatar = ({ first, zIndex, fallbackText = '', type, className }: StackAvatarProps) => {
+export const StackAvatar = ({ first, zIndex, fallbackText = '', type }: StackAvatarProps) => {
   let classes = '';
   let zIndexClass = '';
   const firstClass = first ? '' : '-ml-3';
@@ -48,14 +46,7 @@ export const StackAvatar = ({ first, zIndex, fallbackText = '', type, className
   }
 
   return (
-    <Avatar
-      className={cn(
-        zIndexClass,
-        firstClass,
-        'h-10 w-10 border-2 border-white border-solid dark:border-border',
-        className,
-      )}
-    >
+    <Avatar className={` ${zIndexClass} ${firstClass} h-10 w-10 border-2 border-white border-solid dark:border-border`}>
       <AvatarFallback className={classes}>{fallbackText}</AvatarFallback>
     </Avatar>
   );

apps/remix/app/components/general/stack-avatars-with-tooltip.tsx

@@ -1,33 +1,16 @@
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import {
-  getExtraRecipientsType,
-  getRecipientType,
-  RecipientStatusType,
-} from '@documenso/lib/client-only/recipient-type';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { getRecipientType, RecipientStatusType } from '@documenso/lib/client-only/recipient-type';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import type { TRecipientLite } from '@documenso/lib/types/recipient';
 import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import { cn } from '@documenso/ui/lib/utils';
 import { PopoverHover } from '@documenso/ui/primitives/popover';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { DocumentStatus } from '@prisma/client';
-import type { LucideIcon } from 'lucide-react';
-import {
-  CheckIcon,
-  CircleCheckIcon,
-  CircleDashedIcon,
-  CircleXIcon,
-  ClockIcon,
-  CopyIcon,
-  MailOpenIcon,
-} from 'lucide-react';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { Trans } from '@lingui/react/macro';
+import type { DocumentStatus } from '@prisma/client';
+import { useMemo } from 'react';
 
+import { AvatarWithRecipient } from './avatar-with-recipient';
 import { StackAvatar } from './stack-avatar';
+import { StackAvatars } from './stack-avatars';
 
 export type StackAvatarsWithTooltipProps = {
   documentStatus: DocumentStatus;
@@ -44,238 +27,125 @@ export const StackAvatarsWithTooltip = ({
 }: StackAvatarsWithTooltipProps) => {
   const { _ } = useLingui();
 
-  const sections = useMemo(() => {
-    const groups = groupRecipientsByStatus(recipients);
+  const waitingRecipients = recipients.filter(
+    (recipient) => getRecipientType(recipient) === RecipientStatusType.WAITING,
+  );
 
-    return RECIPIENT_STATUS_SECTIONS.map((section) => ({
-      ...section,
-      recipients: groups[section.type],
-    })).filter((section) => section.recipients.length > 0);
+  const openedRecipients = recipients.filter((recipient) => getRecipientType(recipient) === RecipientStatusType.OPENED);
+
+  const completedRecipients = recipients.filter(
+    (recipient) => getRecipientType(recipient) === RecipientStatusType.COMPLETED,
+  );
+
+  const uncompletedRecipients = recipients.filter(
+    (recipient) => getRecipientType(recipient) === RecipientStatusType.UNSIGNED,
+  );
+
+  const rejectedRecipients = recipients.filter(
+    (recipient) => getRecipientType(recipient) === RecipientStatusType.REJECTED,
+  );
+
+  const sortedRecipients = useMemo(() => {
+    const otherRecipients = recipients.filter(
+      (recipient) => getRecipientType(recipient) !== RecipientStatusType.REJECTED,
+    );
+
+    return [
+      ...rejectedRecipients.sort((a, b) => a.id - b.id),
+      ...otherRecipients.sort((a, b) => {
+        return a.id - b.id;
+      }),
+    ];
   }, [recipients]);
 
-  const canCopySigningLink = documentStatus === DocumentStatus.PENDING;
-
   return (
     <PopoverHover
-      trigger={children || <RecipientAvatarStack recipients={recipients} />}
+      trigger={children || <StackAvatars recipients={sortedRecipients} />}
       contentProps={{
-        className:
-          'max-h-[var(--radix-popover-content-available-height)] w-72 divide-y divide-border/50 overflow-y-auto p-0 text-sm',
+        className: 'flex flex-col gap-y-5 py-2',
         side: position,
-        // Keep clear of the sticky app header (h-16, z-[60]) which paints above popovers.
-        collisionPadding: { top: 72, bottom: 8, left: 8, right: 8 },
-        // Opened via hover, so don't steal focus from wherever the user was.
-        onOpenAutoFocus: (event) => event.preventDefault(),
       }}
     >
-      {sections.map((section) => (
-        <div key={section.type} className="px-3 py-2">
-          <div className={cn('flex items-center gap-1.5 font-medium text-xs', section.className)}>
-            <section.icon className="h-3.5 w-3.5 shrink-0" strokeWidth={2} />
-            <span>{_(section.label)}</span>
-            <span>{section.recipients.length}</span>
-          </div>
-
-          <div className="mt-1">
-            {section.recipients.map((recipient) => (
-              <RecipientRow
+      {completedRecipients.length > 0 && (
+        <div>
+          <h1 className="font-medium text-base">
+            <Trans>Completed</Trans>
+          </h1>
+          {completedRecipients.map((recipient) => (
+            <div key={recipient.id} className="my-1 flex items-center gap-2">
+              <StackAvatar
+                first={true}
                 key={recipient.id}
-                recipient={recipient}
-                signingToken={canCopySigningLink && section.hasSigningLink ? recipient.token : null}
+                type={getRecipientType(recipient)}
+                fallbackText={recipientAbbreviation(recipient)}
               />
-            ))}
-          </div>
+              <div>
+                <p className="text-muted-foreground text-sm">{recipient.email || recipient.name}</p>
+                <p className="text-muted-foreground/70 text-xs">
+                  {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
+                </p>
+              </div>
+            </div>
+          ))}
         </div>
-      ))}
+      )}
+
+      {rejectedRecipients.length > 0 && (
+        <div>
+          <h1 className="font-medium text-base">
+            <Trans>Rejected</Trans>
+          </h1>
+          {rejectedRecipients.map((recipient) => (
+            <div key={recipient.id} className="my-1 flex items-center gap-2">
+              <StackAvatar
+                first={true}
+                key={recipient.id}
+                type={getRecipientType(recipient)}
+                fallbackText={recipientAbbreviation(recipient)}
+              />
+              <div>
+                <p className="text-muted-foreground text-sm">{recipient.email || recipient.name}</p>
+                <p className="text-muted-foreground/70 text-xs">
+                  {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
+                </p>
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
+
+      {waitingRecipients.length > 0 && (
+        <div>
+          <h1 className="font-medium text-base">
+            <Trans>Waiting</Trans>
+          </h1>
+          {waitingRecipients.map((recipient) => (
+            <AvatarWithRecipient key={recipient.id} recipient={recipient} documentStatus={documentStatus} />
+          ))}
+        </div>
+      )}
+
+      {openedRecipients.length > 0 && (
+        <div>
+          <h1 className="font-medium text-base">
+            <Trans>Opened</Trans>
+          </h1>
+          {openedRecipients.map((recipient) => (
+            <AvatarWithRecipient key={recipient.id} recipient={recipient} documentStatus={documentStatus} />
+          ))}
+        </div>
+      )}
+
+      {uncompletedRecipients.length > 0 && (
+        <div>
+          <h1 className="font-medium text-base">
+            <Trans>Uncompleted</Trans>
+          </h1>
+          {uncompletedRecipients.map((recipient) => (
+            <AvatarWithRecipient key={recipient.id} recipient={recipient} documentStatus={documentStatus} />
+          ))}
+        </div>
+      )}
     </PopoverHover>
   );
 };
-
-type RecipientRowProps = {
-  recipient: TRecipientLite;
-  signingToken: string | null;
-};
-
-const RecipientRow = ({ recipient, signingToken }: RecipientRowProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const [, copy] = useCopyToClipboard();
-
-  const [isCopied, setIsCopied] = useState(false);
-  const copiedTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  useEffect(() => () => clearTimeout(copiedTimeoutRef.current ?? undefined), []);
-
-  const onCopySigningLink = () => {
-    if (!signingToken) {
-      return;
-    }
-
-    void copy(`${NEXT_PUBLIC_WEBAPP_URL()}/sign/${signingToken}`).then(() => {
-      setIsCopied(true);
-
-      clearTimeout(copiedTimeoutRef.current ?? undefined);
-      copiedTimeoutRef.current = setTimeout(() => setIsCopied(false), COPIED_INDICATOR_DURATION_MS);
-
-      toast({
-        title: _(msg`Copied to clipboard`),
-        description: _(msg`The signing link has been copied to your clipboard.`),
-      });
-    });
-  };
-
-  const content = (
-    <>
-      <StackAvatar
-        first={true}
-        type={getRecipientType(recipient)}
-        fallbackText={recipientAbbreviation(recipient)}
-        className="h-6 w-6 shrink-0 border-0 text-[10px]"
-      />
-
-      <div className="min-w-0 flex-1 text-xs leading-snug">
-        <p className="truncate text-foreground">{recipient.email || recipient.name}</p>
-        <p className="truncate text-muted-foreground">{_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}</p>
-      </div>
-    </>
-  );
-
-  if (!signingToken) {
-    return <div className={recipientRowClassName}>{content}</div>;
-  }
-
-  return (
-    <button
-      type="button"
-      className={cn(
-        recipientRowClassName,
-        'group w-[calc(100%+1rem)] cursor-pointer text-left transition-colors duration-300 hover:bg-muted',
-      )}
-      title={_(msg`Click to copy signing link for sending to recipient`)}
-      onClick={onCopySigningLink}
-    >
-      {content}
-
-      {isCopied ? (
-        <CheckIcon className="h-3 w-3 shrink-0 text-green-600 dark:text-green-400" />
-      ) : (
-        <CopyIcon className="h-3 w-3 shrink-0 text-muted-foreground opacity-0 transition-opacity duration-300 group-hover:opacity-100" />
-      )}
-    </button>
-  );
-};
-
-const RecipientAvatarStack = ({ recipients }: { recipients: TRecipientLite[] }) => {
-  const sortedRecipients = useMemo(() => {
-    const byId = (a: TRecipientLite, b: TRecipientLite) => a.id - b.id;
-
-    const rejected = recipients.filter((r) => getRecipientType(r) === RecipientStatusType.REJECTED);
-    const others = recipients.filter((r) => getRecipientType(r) !== RecipientStatusType.REJECTED);
-
-    return [...rejected.sort(byId), ...others.sort(byId)];
-  }, [recipients]);
-
-  const visibleRecipients = sortedRecipients.slice(0, MAX_VISIBLE_AVATARS);
-  const hiddenRecipients = sortedRecipients.slice(MAX_VISIBLE_AVATARS);
-
-  return (
-    <>
-      {visibleRecipients.map((recipient, index) => {
-        const isOverflowSlot = index === MAX_VISIBLE_AVATARS - 1 && hiddenRecipients.length > 0;
-        const zIndex = String(50 - index * 10);
-
-        if (isOverflowSlot) {
-          return (
-            <StackAvatar
-              key="extra-recipients"
-              first={index === 0}
-              zIndex={zIndex}
-              type={getExtraRecipientsType(sortedRecipients.slice(index))}
-              fallbackText={`+${hiddenRecipients.length + 1}`}
-            />
-          );
-        }
-
-        return (
-          <StackAvatar
-            key={recipient.id}
-            first={index === 0}
-            zIndex={zIndex}
-            type={getRecipientType(recipient)}
-            fallbackText={recipientAbbreviation(recipient)}
-          />
-        );
-      })}
-    </>
-  );
-};
-
-const groupRecipientsByStatus = (recipients: TRecipientLite[]) => {
-  const groups: Record<RecipientStatusType, TRecipientLite[]> = {
-    [RecipientStatusType.COMPLETED]: [],
-    [RecipientStatusType.REJECTED]: [],
-    [RecipientStatusType.WAITING]: [],
-    [RecipientStatusType.OPENED]: [],
-    [RecipientStatusType.UNSIGNED]: [],
-  };
-
-  for (const recipient of recipients) {
-    groups[getRecipientType(recipient)].push(recipient);
-  }
-
-  return groups;
-};
-
-const MAX_VISIBLE_AVATARS = 5;
-
-const COPIED_INDICATOR_DURATION_MS = 2000;
-
-const recipientRowClassName = '-mx-2 flex items-center gap-2 rounded-md px-2 py-1';
-
-type RecipientStatusSection = {
-  type: RecipientStatusType;
-  label: MessageDescriptor;
-  icon: LucideIcon;
-  className: string;
-  /** Whether recipients in this section still need to sign, so a signing link can be copied. */
-  hasSigningLink: boolean;
-};
-
-const RECIPIENT_STATUS_SECTIONS: RecipientStatusSection[] = [
-  {
-    type: RecipientStatusType.COMPLETED,
-    label: msg`Completed`,
-    icon: CircleCheckIcon,
-    className: 'text-green-600 dark:text-green-400',
-    hasSigningLink: false,
-  },
-  {
-    type: RecipientStatusType.REJECTED,
-    label: msg`Rejected`,
-    icon: CircleXIcon,
-    className: 'text-red-600 dark:text-red-400',
-    hasSigningLink: false,
-  },
-  {
-    type: RecipientStatusType.WAITING,
-    label: msg`Waiting`,
-    icon: ClockIcon,
-    className: 'text-blue-600 dark:text-blue-400',
-    hasSigningLink: true,
-  },
-  {
-    type: RecipientStatusType.OPENED,
-    label: msg`Opened`,
-    icon: MailOpenIcon,
-    className: 'text-amber-600 dark:text-amber-400',
-    hasSigningLink: true,
-  },
-  {
-    type: RecipientStatusType.UNSIGNED,
-    label: msg`Uncompleted`,
-    icon: CircleDashedIcon,
-    className: 'text-muted-foreground',
-    hasSigningLink: true,
-  },
-];

apps/remix/app/components/general/stack-avatars.tsx

@@ -0,0 +1,41 @@
+import { getExtraRecipientsType, getRecipientType } from '@documenso/lib/client-only/recipient-type';
+import type { TRecipientLite } from '@documenso/lib/types/recipient';
+import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
+
+import { StackAvatar } from './stack-avatar';
+
+export function StackAvatars({ recipients }: { recipients: TRecipientLite[] }) {
+  const renderStackAvatars = (recipients: TRecipientLite[]) => {
+    const zIndex = 50;
+    const itemsToRender = recipients.slice(0, 5);
+    const remainingItems = recipients.length - itemsToRender.length;
+
+    return itemsToRender.map((recipient, index: number) => {
+      const first = index === 0;
+
+      if (index === 4 && remainingItems > 0) {
+        return (
+          <StackAvatar
+            key="extra-recipient"
+            first={first}
+            zIndex={String(zIndex - index * 10)}
+            type={getExtraRecipientsType(recipients.slice(4))}
+            fallbackText={`+${remainingItems + 1}`}
+          />
+        );
+      }
+
+      return (
+        <StackAvatar
+          key={recipient.id}
+          first={first}
+          zIndex={String(zIndex - index * 10)}
+          type={getRecipientType(recipient)}
+          fallbackText={recipientAbbreviation(recipient)}
+        />
+      );
+    });
+  };
+
+  return <>{renderStackAvatars(recipients)}</>;
+}