chore: add v1 API deprecation callouts and clean up imports

Add deprecation warning callouts to public API documentation pages.
Remove unused imports from webhook router and hooks.

.agents/plans/bold-emerald-earth-pdf-placeholder-field-positioning.md

@@ -1,161 +0,0 @@
----
-date: 2026-01-28
-title: Pdf Placeholder Field Positioning
----
-
-## Overview
-
-This feature enables automatic field placement in PDFs using placeholder text, eliminating the need for manual coordinate-based positioning. It supports two complementary workflows:
-
-1. **Automatic detection on upload** - PDFs containing structured placeholders like `{{signature, r1}}` have fields created automatically when uploaded
-2. **API placeholder positioning** - Developers can reference any text in a PDF to position fields instead of calculating coordinates
-
-## Goals
-
-- Allow users to prepare documents in Word/Google Docs with placeholders that become signature fields
-- Reduce friction for document preparation workflows
-- Provide API developers with a simpler alternative to coordinate-based field positioning
-- Support documents with repeated placeholders (e.g., initials on every page)
-
-## Placeholder Format (Automatic Detection)
-
-```
-{{FIELD_TYPE, RECIPIENT, option1=value1, option2=value2}}
-```
-
-### Components
-
-- **FIELD_TYPE** (required): One of `signature`, `initials`, `name`, `email`, `date`, `text`, `number`, `radio`, `checkbox`, `dropdown`
-- **RECIPIENT** (required): `r1`, `r2`, `r3`, etc. - identifies which recipient the field belongs to
-- **OPTIONS** (optional): Key-value pairs like `required=true`, `fontSize=14`, `readOnly=true`
-
-### Examples
-
-- `{{signature, r1}}` - Signature field for first recipient
-- `{{text, r1, required=true, label=Company Name}}` - Required text field with label
-- `{{number, r2, minValue=0, maxValue=100}}` - Number field with validation
-
-### Behavior
-
-- Placeholders without recipient identifiers (e.g., `{{signature}}`) are skipped during automatic detection - reserved for API use
-- Invalid field types are silently skipped
-- Placeholder text is covered with white rectangles after field creation
-
-## API Placeholder Positioning
-
-The `/api/v2/envelope/field/create-many` endpoint accepts `placeholder` as an alternative to coordinates:
-
-```json
-{
-  "recipientId": 123,
-  "type": "SIGNATURE",
-  "placeholder": "{{signature}}"
-}
-```
-
-### Parameters
-
-| Parameter     | Type    | Description                                  |
-| ------------- | ------- | -------------------------------------------- |
-| `placeholder` | string  | Text to search for in the PDF                |
-| `width`       | number  | Optional override (percentage)               |
-| `height`      | number  | Optional override (percentage)               |
-| `matchAll`    | boolean | When true, creates fields at ALL occurrences |
-
-### matchAll Behavior
-
-- Default (`false`): Only first occurrence gets a field
-- `true`: Creates a field at every occurrence of the placeholder text
-
-This is useful for documents requiring initials on every page.
-
-## Implementation Components
-
-### Core Functions
-
-- `extractPlaceholdersFromPDF()` - Scans PDF for `{{...}}` patterns with recipient identifiers
-- `removePlaceholdersFromPDF()` - Covers placeholder text with white rectangles
-- `whiteoutRegions()` - Low-level helper for drawing white boxes on PDF pages
-- `parseFieldTypeFromPlaceholder()` - Converts placeholder field type to FieldType enum
-- `parseFieldMetaFromPlaceholder()` - Parses options into fieldMeta format
-
-### Integration Points
-
-1. **Upload flow** (`create-envelope.ts`, `create-envelope-items.ts`)
-   - Extract placeholders at upload time (before saving to storage)
-   - Pass placeholders in-memory to envelope creation
-   - Create placeholder recipients if none provided
-   - Create fields within the same transaction
-
-2. **API field creation** (`create-envelope-fields.ts`)
-   - Accept `placeholder` as alternative to coordinates
-   - Search PDF for placeholder text
-   - Resolve position from bounding box
-   - Support `matchAll` for multiple occurrences
-
-### Field Meta Parsing
-
-The following properties are explicitly parsed:
-
-- `required`, `readOnly` → boolean
-- `fontSize`, `minValue`, `maxValue`, `characterLimit` → number
-- Other properties pass through as strings
-
-Note: Signature fields do not support fieldMeta options.
-
-## Testing
-
-### E2E Tests
-
-**UI Tests** (`e2e/auto-placing-fields/`):
-
-- Single recipient placeholder detection
-- Multiple recipient placeholder detection
-- Field configuration from placeholder options
-- Skipping placeholders without recipient identifiers
-- Skipping invalid field types
-
-**API Tests** (`e2e/api/v2/placeholder-fields-api.spec.ts`):
-
-- Placeholder-based field positioning
-- Width/height overrides
-- Error on placeholder not found
-- Mixed coordinate and placeholder positioning
-- First occurrence only (default)
-- All occurrences with `matchAll: true`
-
-## Documentation
-
-### User Documentation
-
-`/users/documents/pdf-placeholders` - Explains:
-
-- Placeholder format and syntax
-- Supported field types
-- Recipient identifiers
-- Available options per field type
-- Troubleshooting
-
-### Developer Documentation
-
-`/developers/public-api/reference` - Documents:
-
-- Coordinate-based positioning (existing)
-- Placeholder-based positioning (new)
-- matchAll parameter
-- Mixing both methods
-
-## Edge Cases Handled
-
-1. **No placeholders found** - Original PDF returned unchanged
-2. **Placeholder not found (API)** - Returns error with placeholder text
-3. **Multiple occurrences** - First only by default, all with `matchAll: true`
-4. **No recipient identifier** - Skipped during auto-detection, works for API
-5. **Invalid field type** - Skipped during auto-detection
-6. **Signature field with options** - Options ignored (signature doesn't support fieldMeta)
-
-## Future Considerations
-
-- Support for placeholder text styles (bold, underline) to indicate field properties
-- Template-level placeholder mapping for reusable configurations
-- Placeholder validation in document editor before sending

.agents/plans/clear-amber-light-validate-signer-fields-on-distribute.md

@@ -1,76 +0,0 @@
----
-date: 2026-01-26
-title: Validate Signer Fields On Distribute
----
-
-## Summary
-
-Validate that signers have at least one signature field before allowing document/envelope distribution via API, matching the existing UI behavior.
-
-## Background
-
-The API originally allowed distributing documents/envelopes without validating that signers had signature fields assigned. This was intentional - we thought API users might have specific flows where this flexibility was needed.
-
-However, after running it this way for a while, we've observed that more often than not, API users inadvertently send documents without fields assigned. This causes confusion for their recipients (who receive a document with nothing to sign) and breaks their own systems expecting a completed signing flow.
-
-## Problem
-
-The API allowed distributing documents/envelopes even when signers had no signature fields assigned. This was inconsistent with the UI which validates this condition before allowing distribution.
-
-## Solution
-
-### 1. Create centralized validation helper
-
-**File**: `packages/lib/utils/recipients.ts`
-
-- Added `RECIPIENT_ROLES_THAT_REQUIRE_FIELDS` constant (currently only `SIGNER`)
-- Added `getRecipientsWithMissingFields()` function that returns recipients missing required fields
-- Uses existing `isSignatureFieldType` guard from `packages/prisma/guards/is-signature-field.ts`
-
-### 2. Add server-side validation
-
-**File**: `packages/lib/server-only/document/send-document.ts`
-
-- Added validation check that throws `AppError` with `INVALID_REQUEST` code when signers are missing signature fields
-- This blocks both v1 and v2 API distribution endpoints since they both use `sendDocument()`
-
-### 3. Fix v1 API error handling
-
-**File**: `packages/api/v1/implementation.ts`
-
-- Changed `sendDocument` endpoint to use `AppError.toRestAPIError(err)` instead of always returning 500
-- Now returns 400 for validation errors
-
-### 4. Update UI to use shared helper
-
-**Files**:
-
-- `apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx`
-- `packages/ui/primitives/document-flow/add-fields.tsx`
-
-### 5. Consolidate `hasSignatureField` checks
-
-Updated to use `isSignatureFieldType` guard (checks both `SIGNATURE` and `FREE_SIGNATURE`):
-
-- `apps/remix/app/components/general/document-signing/document-signing-form.tsx`
-- `apps/remix/app/components/general/envelope-signing/envelope-signer-form.tsx`
-- `apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx`
-- `apps/remix/app/components/embed/embed-direct-template-client-page.tsx`
-- `apps/remix/app/components/embed/embed-document-signing-page-v1.tsx`
-
-### 6. Add E2E tests
-
-**Files**:
-
-- `packages/app-tests/e2e/api/v1/document-sending.spec.ts` - 5 new tests
-- `packages/app-tests/e2e/api/v2/distribute-validation.spec.ts` - 8 new tests
-
-## Test Coverage
-
-- Distribution fails when signer has no fields
-- Distribution fails when signer has only non-signature fields
-- Distribution succeeds with SIGNATURE field
-- Distribution succeeds with FREE_SIGNATURE field (v1 only via Prisma)
-- Distribution succeeds when VIEWER/CC/APPROVER have no fields
-- Distribution fails when one of multiple signers is missing signature field
-- Distribution succeeds when all signers have signature fields

.agents/plans/fresh-gold-rock-cert-page-width-mismatch.md

@@ -1,168 +0,0 @@
----
-date: 2026-02-11
-title: Cert Page Width Mismatch
----
-
-## Problem
-
-Certificate and audit log pages are generated with hardcoded A4 dimensions (`PDF_SIZE_A4_72PPI`: 595×842) regardless of the actual document page sizes. When the source document uses a different page size (e.g., Letter, Legal, or custom dimensions), the certificate/audit log pages end up with a different width than the document pages. This causes problems with courts that expect uniform page dimensions throughout a PDF.
-
-**Both width and height must match** the last page of the document so the entire PDF prints uniformly.
-
-**Root cause**: In `seal-document.handler.ts` (lines 186-187), the certificate payload always uses:
-
-```ts
-pageWidth: PDF_SIZE_A4_72PPI.width,  // 595
-pageHeight: PDF_SIZE_A4_72PPI.height, // 842
-```
-
-These hardcoded values flow into `generateCertificatePdf`, `generateAuditLogPdf`, `renderCertificate`, and `renderAuditLogs` — all of which use `pageWidth`/`pageHeight` to set Konva stage dimensions and layout content.
-
-## Key Files
-
-| File                                                                    | Role                                                                                  |
-| ----------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| `packages/lib/jobs/definitions/internal/seal-document.handler.ts`       | Orchestrates sealing; passes page dimensions to cert/audit generators                 |
-| `packages/lib/constants/pdf.ts`                                         | Defines `PDF_SIZE_A4_72PPI` (595×842)                                                 |
-| `packages/lib/server-only/pdf/generate-certificate-pdf.ts`              | Generates certificate PDF; accepts `pageWidth`/`pageHeight`                           |
-| `packages/lib/server-only/pdf/generate-audit-log-pdf.ts`                | Generates audit log PDF; accepts `pageWidth`/`pageHeight`                             |
-| `packages/lib/server-only/pdf/render-certificate.ts`                    | Renders certificate pages via Konva; uses `pageWidth`/`pageHeight` for stage + layout |
-| `packages/lib/server-only/pdf/render-audit-logs.ts`                     | Renders audit log pages via Konva; uses `pageWidth`/`pageHeight` for stage + layout   |
-| `packages/lib/server-only/pdf/get-page-size.ts`                         | Existing utility — extend with `@libpdf/core` version                                 |
-| `packages/trpc/server/document-router/download-document-certificate.ts` | Standalone certificate download (also hardcodes A4)                                   |
-| `packages/trpc/server/document-router/download-document-audit-logs.ts`  | Standalone audit log download (also hardcodes A4)                                     |
-
-## Architecture
-
-### Current Flow
-
-1. **One cert PDF + one audit log PDF** generated per envelope with hardcoded A4 dims
-2. Both appended to **every** envelope item (document) via `decorateAndSignPdf` → `pdfDoc.copyPagesFrom()`
-3. The audit log is envelope-level (all recipients, all events across all docs) — one per envelope, not per document
-
-### Multi-Document Envelopes
-
-- V1 envelopes: single document only
-- V2 envelopes: support multiple documents (envelope items)
-- Each envelope item gets both cert + audit log pages appended to it
-- If documents have different page sizes → need size-matched cert/audit for each
-
-### Reading Page Dimensions (`@libpdf/core` only)
-
-Use `@libpdf/core`'s `PDF` class — NOT `@cantoo/pdf-lib`:
-
-```ts
-const pdfDoc = await PDF.load(pdfData);
-const lastPage = pdfDoc.getPage(pdfDoc.getPageCount() - 1);
-const { width, height } = lastPage; // e.g. 612, 792 for Letter
-```
-
-Already used this way in `seal-document.handler.ts` lines 403-410 for V2 field insertion.
-"Last page" = last page of the original document, before cert/audit pages are appended.
-
-### Content Layout Adaptation
-
-Both renderers already handle variable dimensions gracefully:
-
-- **Width**: `render-certificate.ts:713` / `render-audit-logs.ts:588` — `Math.min(pageWidth - minimumMargin * 2, contentMaxWidth)` with `contentMaxWidth = 768`. Wider pages get more margin, narrower pages tighter margins.
-- **Height**: Both renderers paginate content into pages using `groupRowsIntoPages()` which respects `pageHeight` via `maxTableHeight = pageHeight - pageTopMargin - pageBottomMargin`. Shorter pages just mean more pages; taller pages fit more rows per page.
-
-### Playwright PDF Path — Out of Scope
-
-The `NEXT_PRIVATE_USE_PLAYWRIGHT_PDF` toggle enables a deprecated Playwright-based PDF generation path (`get-certificate-pdf.ts`, `get-audit-logs-pdf.ts`) that also hardcodes `format: 'A4'` in `page.pdf()`. This path is **not being updated** as part of this fix:
-
-- Both files are marked `@deprecated`
-- The Konva-based path is the default and recommended path
-- The Playwright path is behind a feature flag and will be removed
-
-No changes needed. Add a code comment noting the A4 limitation if the Playwright path is ever re-enabled.
-
-## Plan
-
-### 1. Extend `get-page-size.ts` with `@libpdf/core` utility
-
-Add a `getLastPageDimensions` function to the existing `packages/lib/server-only/pdf/get-page-size.ts` file. This consolidates page-size logic in one place (the file already has the legacy `@cantoo/pdf-lib` version).
-
-```ts
-export const getLastPageDimensions = (pdfDoc: PDF): { width: number; height: number } => {
-  const lastPage = pdfDoc.getPage(pdfDoc.getPageCount() - 1);
-  const width = Math.round(lastPage.width);
-  const height = Math.round(lastPage.height);
-
-  if (width < MIN_CERT_PAGE_WIDTH || height < MIN_CERT_PAGE_HEIGHT) {
-    return { width: PDF_SIZE_A4_72PPI.width, height: PDF_SIZE_A4_72PPI.height };
-  }
-
-  return { width, height };
-};
-```
-
-**Dimension rounding**: `Math.round()` both width and height. PDF points at 72ppi are typically whole numbers; rounding avoids spurious float-precision mismatches (e.g., 612.0 vs 612.00001) that would cause unnecessary duplicate cert/audit PDF generation.
-
-**Minimum page dimensions**: Enforce a minimum threshold (e.g., 300pt for both width and height). If either dimension falls below the minimum, fall back to A4 (595×842). The certificate and audit log renderers have headers, table rows, margins, and QR codes that require a minimum viable area.
-
-### 2. Read last page dimensions from each envelope item's PDF
-
-In `seal-document.handler.ts`, before generating cert/audit PDFs:
-
-- For each `envelopeItem`, load the PDF and read the **last page's width and height** using `getLastPageDimensions`
-- Use `PDF.load()` then pass the loaded doc to the utility
-
-**Resealing consideration**: When `isResealing` is true, envelope items are remapped to use `initialData` (lines 152-158) before this point. Page-size extraction must operate on the same data source that `decorateAndSignPdf` will use. Since the `envelopeItems` array is already remapped by the time we read dimensions, reading from `envelopeItem.documentData` will naturally give the correct (initial) data. No special handling needed beyond ensuring the dimension read happens **after** the resealing remap.
-
-### 3. Generate cert/audit PDFs per unique page size
-
-Current flow generates one cert + one audit log doc per envelope. Change to:
-
-1. Collect `{ width, height }` of the last page for each envelope item
-2. Deduplicate by `"${width}x${height}"` key (using the already-rounded integers)
-3. For each unique size, generate cert PDF and audit log PDF with those dimensions
-4. Store in a `Map<string, { certificateDoc, auditLogDoc }>` keyed by `"${width}x${height}"`
-
-For the common single-document case, this is one generation — same perf as today.
-
-### 4. Thread the correct docs into `decorateAndSignPdf`
-
-In the envelope item loop, look up the item's last-page dimensions in the map and pass the matching cert/audit docs. Signature of `decorateAndSignPdf` doesn't change — it still receives a single `certificateDoc` and `auditLogDoc`, just the right ones per item.
-
-### 5. Update standalone download routes
-
-`download-document-certificate.ts` and `download-document-audit-logs.ts` also hardcode A4:
-
-- Both routes have `documentId` which maps to a specific envelope item
-- Fetch **that specific document's** PDF data, load it, read last page width + height via `getLastPageDimensions`
-- Pass `{ pageWidth, pageHeight }` to the generator
-- This ensures the standalone download matches the dimensions the user would see in the sealed PDF for that document
-
-### 6. Edge cases
-
-| Scenario                                | Behavior                                                                                    |
-| --------------------------------------- | ------------------------------------------------------------------------------------------- |
-| Mixed page sizes within one PDF         | Use last page's dimensions (per spec)                                                       |
-| Page dimensions below minimum threshold | Fall back to A4 (595×842)                                                                   |
-| Landscape pages                         | width/height just swap roles; renderers adapt via `Math.min()` capping. No special handling |
-| Fallback if page dims unreadable        | Default to A4 (595×842)                                                                     |
-| Resealing                               | Dimensions read after `initialData` remap — correct source automatically                    |
-| Playwright PDF path enabled             | Remains A4 — out of scope, deprecated                                                       |
-| Single-doc envelope (most common)       | One generation, same perf as today                                                          |
-| Multi-doc envelope, same page sizes     | Dedup key matches → one generation                                                          |
-| Multi-doc envelope, different sizes     | One generation per unique size                                                              |
-
-### 7. Tests
-
-- Add assertion-based E2E test (no visual regression / reference images needed)
-- Seal a Letter-size (612×792) PDF through the full flow
-- Load the sealed output and assert all pages (document + cert + audit) have matching width/height
-- Can be added to `envelope-alignment.spec.ts` or as a new focused test
-
-## Implementation Steps
-
-1. **Extend `get-page-size.ts`** — add `getLastPageDimensions(pdfDoc: PDF): { width: number; height: number }` using `@libpdf/core`, with `Math.round()` and minimum dimension enforcement
-2. **In `seal-document.handler.ts`**:
-   a. After the resealing remap (line ~159), load each envelope item's PDF via `PDF.load()` and collect last page `{ width, height }` using `getLastPageDimensions`
-   b. Deduplicate by `"${width}x${height}"` key
-   c. Generate cert/audit PDFs per unique size (parallel via `Promise.all`)
-   d. In envelope item loop, look up matching cert/audit doc by size key
-3. **Fix `download-document-certificate.ts`** — load the specific document's PDF, read last page dims via `getLastPageDimensions`, pass to generator
-4. **Fix `download-document-audit-logs.ts`** — same as above, using the specific `documentId`'s PDF
-5. **Add E2E test** — assertion-based test with a Letter-size document verifying all page dimensions match after sealing

.agents/scratches/v1-api-legacy-deprecation-spec.md

@@ -0,0 +1,103 @@
+# V1 API Legacy Deprecation Specification
+
+## Overview
+
+Mark all V1 API endpoints as legacy/deprecated in the OpenAPI documentation to signal that users should migrate to the V2 API.
+
+## Decision Summary
+
+| Decision | Choice |
+|----------|--------|
+| Deprecation Scope | All V1 endpoints |
+| Message Style | Generic for all endpoints |
+| Sunset Timeline | No specific date |
+| V2 API Status | V2 exists now |
+| OpenAPI Info | Update to include deprecation notice |
+
+## Implementation Details
+
+### Files to Modify
+
+1. `packages/api/v1/contract.ts` - Add `deprecated: true` and `description` to all endpoints
+2. `packages/api/v1/openapi.ts` - Update the OpenAPI info description
+
+### Documentation Files to Modify
+
+1. `apps/documentation/pages/developers/public-api/index.mdx` - Add deprecation `<Callout type="warning">` under "API V1 - Deprecated" section:
+   ```
+   <Callout type="warning">
+     V1 API is deprecated and will be removed in a future release. Please migrate to V2.
+   </Callout>
+   ```
+
+2. `apps/documentation/pages/developers/public-api/versioning.mdx` - Add callout after "current version is v2" stating V1 is deprecated:
+   ```
+   <Callout type="warning">
+     V1 API is deprecated. Please migrate to V2.
+   </Callout>
+   ```
+
+### Deprecation Message
+
+**Per-endpoint message:**
+```
+Deprecated. Please migrate to the V2 API.
+```
+
+**OpenAPI info description:**
+```
+[DEPRECATED] The Documenso API for retrieving, creating, updating and deleting documents. Please migrate to V2.
+```
+
+### Endpoints to Update (19 total)
+
+| Endpoint | Method | Path | Action |
+|----------|--------|------|--------|
+| getDocuments | GET | /api/v1/documents | Add deprecation |
+| getDocument | GET | /api/v1/documents/:id | Add deprecation |
+| downloadSignedDocument | GET | /api/v1/documents/:id/download | Add deprecation |
+| createDocument | POST | /api/v1/documents | Add deprecation |
+| createTemplate | POST | /api/v1/templates | Add deprecation |
+| deleteTemplate | DELETE | /api/v1/templates/:id | Add deprecation |
+| getTemplate | GET | /api/v1/templates/:id | Add deprecation |
+| getTemplates | GET | /api/v1/templates | Add deprecation |
+| createDocumentFromTemplate | POST | /api/v1/templates/:templateId/create-document | Update existing deprecation message |
+| generateDocumentFromTemplate | POST | /api/v1/templates/:templateId/generate-document | Add deprecation |
+| sendDocument | POST | /api/v1/documents/:id/send | Add deprecation |
+| resendDocument | POST | /api/v1/documents/:id/resend | Add deprecation |
+| deleteDocument | DELETE | /api/v1/documents/:id | Add deprecation |
+| createRecipient | POST | /api/v1/documents/:id/recipients | Add deprecation |
+| updateRecipient | PATCH | /api/v1/documents/:id/recipients/:recipientId | Add deprecation |
+| deleteRecipient | DELETE | /api/v1/documents/:id/recipients/:recipientId | Add deprecation |
+| createField | POST | /api/v1/documents/:id/fields | Add deprecation |
+| updateField | PATCH | /api/v1/documents/:id/fields/:fieldId | Add deprecation |
+| deleteField | DELETE | /api/v1/documents/:id/fields/:fieldId | Add deprecation |
+
+## Changes Required
+
+### contract.ts Changes
+
+For each endpoint, add:
+```typescript
+deprecated: true,
+description: 'Deprecated. Please migrate to the V2 API.',
+```
+
+For endpoints that already have a description, prepend the deprecation notice.
+
+### openapi.ts Changes
+
+Update the info block description from:
+```typescript
+description: 'The Documenso API for retrieving, creating, updating and deleting documents.',
+```
+to:
+```typescript
+description: '[DEPRECATED] The Documenso API for retrieving, creating, updating and deleting documents. Please migrate to V2.',
+```
+
+## Notes
+
+- The `createDocumentFromTemplate` endpoint's existing deprecation message (pointing to `generateDocumentFromTemplate`) will be replaced with the generic V2 migration message
+- No sunset date is included - endpoints are marked deprecated but without a removal timeline
+- The V2 API is available and ready for users to migrate to

.env.example

@@ -1,6 +1,3 @@
-# The license key to enable enterprise features for self hosters
-NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY=
-
 # [[AUTH]]
 NEXTAUTH_SECRET="secret"
 
@@ -62,18 +59,6 @@ NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_PATH=
 NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_CONTENTS=
 # OPTIONAL: The path to the Google Cloud Credentials file to use for the gcloud-hsm signing transport.
 NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS=
-# OPTIONAL: The path to the certificate chain file for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_HSM_CERT_CHAIN_FILE_PATH=
-# OPTIONAL: The base64-encoded contents of the certificate chain for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_HSM_CERT_CHAIN_CONTENTS=
-# OPTIONAL: The Google Secret Manager path to retrieve the certificate for the gcloud-hsm signing transport.
-NEXT_PRIVATE_SIGNING_GCLOUD_HSM_SECRET_MANAGER_CERT_PATH=
-# OPTIONAL: Comma-separated list of timestamp authority URLs for PDF signing (enables LTV and archival timestamps).
-NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY=
-# 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.
-NEXT_PRIVATE_USE_LEGACY_SIGNING_SUBFILTER=
 
 # [[STORAGE]]
 # OPTIONAL: Defines the storage transport to use. Available options: database (default) | s3

.github/workflows/publish.yml

@@ -3,12 +3,6 @@ name: Publish Docker
 on:
   push:
     branches: ['release']
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Git tag to build and publish (e.g., v1.0.0)'
-        required: true
-        type: string
 
 jobs:
   build_and_publish_platform_containers:
@@ -24,7 +18,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.tag || github.ref }}
           fetch-tags: true
 
       - name: Login to DockerHub
@@ -45,11 +38,8 @@ jobs:
           BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
           NEXT_PRIVATE_TELEMETRY_KEY: ${{ secrets.NEXT_PRIVATE_TELEMETRY_KEY }}
           NEXT_PRIVATE_TELEMETRY_HOST: ${{ secrets.NEXT_PRIVATE_TELEMETRY_HOST }}
-          APP_VERSION: ${{ inputs.tag || '' }}
         run: |
-          if [ -z "$APP_VERSION" ]; then
-            APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
-          fi
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
           GIT_SHA="$(git rev-parse HEAD)"
 
           docker build \
@@ -75,6 +65,47 @@ jobs:
         env:
           BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
 
+      - name: Build the chromium docker image
+        env:
+          BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
+        run: |
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
+          GIT_SHA="$(git rev-parse HEAD)"
+
+          docker build \
+            -f ./docker/Dockerfile.chromium \
+            --progress=plain \
+            --build-arg TAG="$GIT_SHA" \
+            -t "documenso/documenso-$BUILD_PLATFORM:latest-chromium" \
+            -t "documenso/documenso-$BUILD_PLATFORM:$GIT_SHA-chromium" \
+            -t "documenso/documenso-$BUILD_PLATFORM:$APP_VERSION-chromium" \
+            -t "ghcr.io/documenso/documenso-$BUILD_PLATFORM:latest-chromium" \
+            -t "ghcr.io/documenso/documenso-$BUILD_PLATFORM:$GIT_SHA-chromium" \
+            -t "ghcr.io/documenso/documenso-$BUILD_PLATFORM:$APP_VERSION-chromium" \
+            .
+
+      - name: Push the chromium docker image to DockerHub
+        env:
+          BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
+        run: |
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
+          GIT_SHA="$(git rev-parse HEAD)"
+
+          docker push "documenso/documenso-$BUILD_PLATFORM:latest-chromium"
+          docker push "documenso/documenso-$BUILD_PLATFORM:$GIT_SHA-chromium"
+          docker push "documenso/documenso-$BUILD_PLATFORM:$APP_VERSION-chromium" \
+
+      - name: Push the chromium docker image to GitHub Container Registry
+        env:
+          BUILD_PLATFORM: ${{ matrix.os == 'warp-ubuntu-latest-arm64-4x' && 'arm64' || 'amd64' }}
+        run: |
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
+          GIT_SHA="$(git rev-parse HEAD)"
+
+          docker push "ghcr.io/documenso/documenso-$BUILD_PLATFORM:latest-chromium"
+          docker push "ghcr.io/documenso/documenso-$BUILD_PLATFORM:$GIT_SHA-chromium"
+          docker push "ghcr.io/documenso/documenso-$BUILD_PLATFORM:$APP_VERSION-chromium"
+
   create_and_publish_manifest:
     name: Create and publish manifest
     runs-on: ubuntu-latest
@@ -83,7 +114,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.tag || github.ref }}
           fetch-tags: true
 
       - name: Login to DockerHub
@@ -100,12 +130,8 @@ jobs:
           password: ${{ secrets.GH_TOKEN }}
 
       - name: Create and push DockerHub manifest
-        env:
-          APP_VERSION: ${{ inputs.tag || '' }}
         run: |
-          if [ -z "$APP_VERSION" ]; then
-            APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
-          fi
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
           GIT_SHA="$(git rev-parse HEAD)"
 
           # Check if the version is stable (no rc or beta in the version)
@@ -140,13 +166,46 @@ jobs:
           docker manifest push documenso/documenso:$GIT_SHA
           docker manifest push documenso/documenso:$APP_VERSION
 
-      - name: Create and push Github Container Registry manifest
-        env:
-          APP_VERSION: ${{ inputs.tag || '' }}
+      - name: Create and push DockerHub chromium manifest
         run: |
-          if [ -z "$APP_VERSION" ]; then
-            APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
+          GIT_SHA="$(git rev-parse HEAD)"
+
+          # Check if the version is stable (no rc or beta in the version)
+          if [[ "$APP_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            docker manifest create \
+              documenso/documenso:latest-chromium \
+              --amend documenso/documenso-amd64:latest-chromium \
+              --amend documenso/documenso-arm64:latest-chromium
+
+            docker manifest push documenso/documenso:latest-chromium
           fi
+
+          if [[ "$APP_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
+            docker manifest create \
+              documenso/documenso:rc-chromium \
+              --amend documenso/documenso-amd64:rc-chromium \
+              --amend documenso/documenso-arm64:rc-chromium
+
+            docker manifest push documenso/documenso:rc-chromium
+          fi
+
+          docker manifest create \
+            documenso/documenso:$GIT_SHA-chromium \
+            --amend documenso/documenso-amd64:$GIT_SHA-chromium \
+            --amend documenso/documenso-arm64:$GIT_SHA-chromium
+
+          docker manifest create \
+            documenso/documenso:$APP_VERSION-chromium \
+            --amend documenso/documenso-amd64:$APP_VERSION-chromium \
+            --amend documenso/documenso-arm64:$APP_VERSION-chromium
+
+          docker manifest push documenso/documenso:$GIT_SHA-chromium
+          docker manifest push documenso/documenso:$APP_VERSION-chromium
+
+      - name: Create and push Github Container Registry manifest
+        run: |
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
           GIT_SHA="$(git rev-parse HEAD)"
 
           # Check if the version is stable (no rc or beta in the version)
@@ -180,3 +239,40 @@ jobs:
 
           docker manifest push ghcr.io/documenso/documenso:$GIT_SHA
           docker manifest push ghcr.io/documenso/documenso:$APP_VERSION
+
+      - name: Create and push Github Container Registry chromium manifest
+        run: |
+          APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
+          GIT_SHA="$(git rev-parse HEAD)"
+
+          # Check if the version is stable (no rc or beta in the version)
+          if [[ "$APP_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            docker manifest create \
+              ghcr.io/documenso/documenso:latest-chromium \
+              --amend ghcr.io/documenso/documenso-amd64:latest-chromium \
+              --amend ghcr.io/documenso/documenso-arm64:latest-chromium
+
+            docker manifest push ghcr.io/documenso/documenso:latest-chromium
+          fi
+
+          if [[ "$APP_VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
+            docker manifest create \
+              ghcr.io/documenso/documenso:rc-chromium \
+              --amend ghcr.io/documenso/documenso-amd64:rc-chromium \
+              --amend ghcr.io/documenso/documenso-arm64:rc-chromium
+
+            docker manifest push ghcr.io/documenso/documenso:rc-chromium
+          fi
+
+          docker manifest create \
+            ghcr.io/documenso/documenso:$GIT_SHA-chromium \
+            --amend ghcr.io/documenso/documenso-amd64:$GIT_SHA-chromium \
+            --amend ghcr.io/documenso/documenso-arm64:$GIT_SHA-chromium
+
+          docker manifest create \
+            ghcr.io/documenso/documenso:$APP_VERSION-chromium \
+            --amend ghcr.io/documenso/documenso-amd64:$APP_VERSION-chromium \
+            --amend ghcr.io/documenso/documenso-arm64:$APP_VERSION-chromium
+
+          docker manifest push ghcr.io/documenso/documenso:$GIT_SHA-chromium
+          docker manifest push ghcr.io/documenso/documenso:$APP_VERSION-chromium

.gitignore

@@ -63,7 +63,3 @@ CLAUDE.md
 
 # scripts
 scripts/output*
-
-# license
-.documenso-license.json
-.documenso-license-backup.json

apps/documentation/pages/developers/_meta.js

@@ -13,7 +13,6 @@ export default {
     title: 'API & Integration Guides',
   },
   'public-api': 'Public API',
-  embedding: 'Embedded Signing',
-  'embedded-authoring': 'Embedded Authoring',
+  embedding: 'Embedding',
   webhooks: 'Webhooks',
 };

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

@@ -7,4 +7,5 @@ export default {
   preact: 'Preact Integration',
   angular: 'Angular Integration',
   'css-variables': 'CSS Variables',
+  authoring: 'Authoring',
 };

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

@@ -1,25 +1,12 @@
 ---
-title: Embedded Authoring
+title: Authoring
 description: Learn how to use embedded authoring to create documents and templates in your application
 ---
 
-import { Callout } from 'nextra/components';
-
-<Callout type="info">
-  The embedded authoring feature is an enterprise only feature. Please contact us if you are
-  interested in using it.
-</Callout>
-
 # Embedded Authoring
 
 In addition to embedding signing experiences, Documenso now supports embedded authoring, allowing you to integrate document and template creation and editing directly within your application.
 
-## Embedded Signing vs Embedded Authoring
-
-Embedded signing allows you to embed your Documenso documents into your application for signing. Your users will be able to sign the document directly in your application.
-
-Embedded authoring allows you to integrate Documenso's document and template creation and editing into your application. You will be able to create and edit documents and templates directly in your application.
-
 ## How Embedded Authoring Works
 
 The embedded authoring feature enables your users to create and edit documents and templates without leaving your application. This process works through secure presign tokens that authenticate the embedding session and manage permissions.

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

@@ -3,16 +3,10 @@ title: Get Started
 description: Learn how to use embedding to bring signing to your own website or application
 ---
 
-# Embedded Signing
+# Embedding
 
 Our embedding feature lets you integrate our document signing experience into your own application or website. Whether you're building with React, Preact, Vue, Svelte, Solid, Angular, or using generalized web components, this guide will help you get started with embedding Documenso.
 
-## Embedded Signing vs Embedded Authoring
-
-Embedded signing allows you to embed your Documenso documents into your application for signing. Your users will be able to sign the document directly in your application.
-
-Embedded authoring allows you to integrate Documenso's document and template creation and editing into your application. You will be able to create and edit documents and templates directly in your application.
-
 ## Availability
 
 Embedding is currently available for all users on a **Teams Plan** and above, as well as **Early Adopter's** within a team (Early Adopters can create a team for free).

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

@@ -32,18 +32,13 @@ Our new API V2 supports the following typed SDKs:
 ## API V1 - Deprecated
 
 <Callout type="warning">
-  <strong>API V1 is deprecated.</strong>
-  <br />
-  The V1 API will continue to be supported for the foreseeable future, but it is limited to
-  <strong>Legacy Documents</strong> (Documents created using the old non-envelope editor).
-
-  <strong>Important:</strong> To work with the new <strong>Envelope</strong> document system, you
-  must use the
-  <strong> V2 API</strong>.
+  v1 API is deprecated and will be removed in a future release. Please migrate to v2.
 </Callout>
 
 Check out the [API V1 documentation](https://app.documenso.com/api/v1/openapi) for details about the API endpoints, request parameters, response formats, and authentication methods.
 
+📖 [Documentation](https://documen.so/api-v2-docs)
+
 ## Availability
 
 The API is available to individual users, teams and higher plans. [Fair Use](https://documen.so/fair) applies.

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

@@ -316,8 +316,6 @@ Before adding fields to an envelope, you will need the following details:
 
 See the [Get Envelope](#get-envelope) section for more details on how to retrieve these details.
 
-### Coordinate-Based Positioning
-
 The following is an example of a request which creates 2 new fields on the first page of the envelope.
 
 Note that width, height, positionX and positionY are percentage numbers between 0 and 100, which scale the field relative to the size of the PDF.
@@ -362,95 +360,6 @@ curl https://app.documenso.com/api/v2/envelope/field/create-many \
   }'
 ```
 
-### Placeholder-Based Positioning
-
-Instead of specifying exact coordinates, you can position fields using placeholder text in the PDF. The API will search for the text and place the field at that location.
-
-This is useful when:
-
-- You have PDFs with designated placeholder text (e.g., `{{signature}}`, `[SIGN HERE]`)
-- You want field positions to adapt to document content changes
-- You're working with templated documents generated from other systems
-
-```sh
-curl https://app.documenso.com/api/v2/envelope/field/create-many \
-  --request POST \
-  --header 'Authorization: api_xxxxxxxxxxxxxx' \
-  --header 'Content-Type: application/json' \
-  --data '{
-    "envelopeId": "envelope_xxxxxxxxxx",
-    "data": [
-      {
-        "recipientId": recipient_id_here,
-        "type": "SIGNATURE",
-        "placeholder": "{{signature}}"
-      },
-      {
-        "recipientId": recipient_id_here,
-        "type": "NAME",
-        "placeholder": "{{name}}",
-        "width": 30,
-        "height": 5
-      }
-    ]
-  }'
-```
-
-#### Placeholder Parameters
-
-| Parameter     | Type    | Required | Description                                                                                                      |
-| ------------- | ------- | -------- | ---------------------------------------------------------------------------------------------------------------- |
-| `placeholder` | string  | Yes      | Text to search for in the PDF. The field is placed at the location of this text.                                 |
-| `width`       | number  | No       | Override the field width (percentage). If omitted, uses the placeholder text width.                              |
-| `height`      | number  | No       | Override the field height (percentage). If omitted, uses the placeholder text height.                            |
-| `matchAll`    | boolean | No       | When `true`, creates a field at every occurrence of the placeholder. Default is `false` (first occurrence only). |
-
-<Callout type="info">
-  The placeholder text is automatically covered with a white rectangle after field creation, so it
-  won't appear in the final signed document.
-</Callout>
-
-#### Multiple Occurrences
-
-If your PDF contains the same placeholder text multiple times (e.g., initials on every page), use `matchAll: true` to create fields at all occurrences:
-
-```json
-{
-  "recipientId": 123,
-  "type": "INITIALS",
-  "placeholder": "{{initials}}",
-  "matchAll": true
-}
-```
-
-This will create one INITIALS field for each occurrence of `{{initials}}` in the PDF.
-
-#### Mixing Positioning Methods
-
-You can combine coordinate-based and placeholder-based positioning in the same request:
-
-```json
-{
-  "envelopeId": "envelope_xxxxxxxxxx",
-  "data": [
-    {
-      "recipientId": 123,
-      "type": "SIGNATURE",
-      "placeholder": "{{signature}}"
-    },
-    {
-      "recipientId": 123,
-      "type": "DATE",
-      "page": 1,
-      "positionX": 70,
-      "positionY": 85,
-      "width": 20,
-      "height": 3
-    }
-  ]
-}
-```
-
 Field meta allows you to further configure fields, for example it will allow you to add multiple items for checkboxes or radios.
 
 A successful request will return a JSON response with the newly added fields.

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

@@ -11,6 +11,8 @@ Documenso uses API versioning to manage changes to the public API. This allows u
 
 <Callout type="info">The current version of the API is `v2`.</Callout>
 
+<Callout type="warning">v1 API is deprecated. Please migrate to v2.</Callout>
+
 The API version is specified in the URL. For example, the base URL for the `v2` API is `https://app.documenso.com/api/v2`.
 
 We may make changes to the API without incrementing the version number. We will always try to avoid breaking changes, but in some cases, it may be necessary to make changes that are not backward compatible. In these cases, we will increment the version number and provide information about the changes in the release notes.

apps/documentation/pages/developers/self-hosting/how-to.mdx

@@ -291,13 +291,10 @@ For AI setup specifics, see the [AI Recipient & Field Detection (Self-hosting)](
 | `NEXT_PUBLIC_SUPPORT_EMAIL`                  | The support email address displayed to users (default `support@documenso.com`).                                                                         |
 | `NEXT_PRIVATE_DATABASE_URL`                  | The URL for the primary database connection (with connection pooling).                                                                                  |
 | `NEXT_PRIVATE_DIRECT_DATABASE_URL`           | The URL for the direct database connection (without connection pooling).                                                                                |
-| `NEXT_PRIVATE_SIGNING_TRANSPORT`             | The signing transport to use. Available options: local (default), gcloud-hsm                                                                            |
+| `NEXT_PRIVATE_SIGNING_TRANSPORT`             | The signing transport to use. Available options: local (default)                                                                                        |
 | `NEXT_PRIVATE_SIGNING_PASSPHRASE`            | The passphrase for the key file.                                                                                                                        |
 | `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`   | The base64-encoded contents of the key file will be used instead of the file path.                                                                      |
 | `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`       | The path to the key file, default `/opt/documenso/cert.p12`.                                                                                            |
-| `NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY`   | Comma-separated list of timestamp authority URLs for PDF signing. Enables LTV and archival timestamps.                                                  |
-| `NEXT_PUBLIC_SIGNING_CONTACT_INFO`           | Contact info to embed in PDF signatures. Defaults to the webapp URL.                                                                                    |
-| `NEXT_PRIVATE_USE_LEGACY_SIGNING_SUBFILTER`  | Set to "true" to use the legacy adbe.pkcs7.detached subfilter instead of ETSI.CAdES.detached.                                                           |
 | `NEXT_PUBLIC_UPLOAD_TRANSPORT`               | The transport for file uploads (database or s3).                                                                                                        |
 | `NEXT_PRIVATE_UPLOAD_ENDPOINT`               | The endpoint for the S3 storage transport (for third-party S3-compatible providers).                                                                    |
 | `NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE`       | Whether to force path-style URLs for the S3 storage transport.                                                                                          |

apps/documentation/pages/developers/self-hosting/signing-certificate.mdx

@@ -53,21 +53,15 @@ Have the Certificate Authority sign the Certificate Signing Request.
 
 Configure your instance to use the new certificate by configuring the following environment variables in your `.env` file:
 
-| Environment Variable                                           | Description                                                                                                                               |
-| :------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
-| `NEXT_PRIVATE_SIGNING_TRANSPORT`                               | The transport used for document signing. Available options: local (default), gcloud-hsm                                                   |
-| `NEXT_PRIVATE_SIGNING_PASSPHRASE`                              | The passphrase for the local file-based signing transport. This field is optional.                                                        |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`                         | The local file path to the .p12 file to use for the local signing transport. This field is optional.                                      |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`                     | The base64-encoded contents of the .p12 file to use for the local signing transport. This field is optional.                              |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_KEY_PATH`                     | The Google Cloud HSM key path for the gcloud-hsm signing transport. This field is optional.                                               |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_PATH`         | The path to the Google Cloud HSM public certificate file to use for the gcloud-hsm signing transport. This field is optional.             |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_CONTENTS`     | The base64-encoded contents of the Google Cloud HSM public certificate file for the gcloud-hsm signing transport. This field is optional. |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS` | The base64-encoded Google Cloud Credentials for the gcloud-hsm signing transport. This field is optional.                                 |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_CERT_CHAIN_FILE_PATH`         | The path to the certificate chain file for the gcloud-hsm signing transport. This field is optional.                                      |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_CERT_CHAIN_CONTENTS`          | The base64-encoded contents of the certificate chain for the gcloud-hsm signing transport. This field is optional.                        |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_SECRET_MANAGER_CERT_PATH`     | The Google Secret Manager path to retrieve the certificate for the gcloud-hsm signing transport. This field is optional.                  |
-| `NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY`                     | Comma-separated list of timestamp authority URLs for PDF signing. Enables LTV and archival timestamps. This field is optional.            |
-| `NEXT_PUBLIC_SIGNING_CONTACT_INFO`                             | Contact info to embed in PDF signatures. Defaults to the webapp URL. This field is optional.                                              |
-| `NEXT_PRIVATE_USE_LEGACY_SIGNING_SUBFILTER`                    | Set to "true" to use the legacy adbe.pkcs7.detached subfilter instead of ETSI.CAdES.detached. This field is optional.                     |
+| Environment Variable                                            | Description                                                                                                                               |
+| :-------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
+| `NEXT_PRIVATE_SIGNING_TRANSPORT`                                | The transport used for document signing. Available options: local (default), gcloud-hsm                                                   |
+| `NEXT_PRIVATE_SIGNING_PASSPHRASE`                               | The passphrase for the local file-based signing transport. This field is optional.                                                        |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`                          | The local file path to the .p12 file to use for the local signing transport. This field is optional.                                      |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`                      | The base64-encoded contents of the .p12 file to use for the local signing transport. This field is optional.                              |
+| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_KEY_PATH`                      | The Google Cloud HSM key path for the gcloud-hsm signing transport. This field is optional.                                               |
+| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM _PUBLIC_CRT_FILE_PATH`         | The path to the Google Cloud HSM public certificate file to use for the gcloud-hsm signing transport. This field is optional.             |
+| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM _PUBLIC_CRT_FILE_CONTENTS`     | The base64-encoded contents of the Google Cloud HSM public certificate file for the gcloud-hsm signing transport. This field is optional. |
+| `NEXT_PRIVATE_SIGNING_GCLOUD_ APPLICATION_CREDENTIALS_CONTENTS` | The Google Cloud Credentials file path for the gcloud-hsm signing transport. This field is optional.                                      |
 
 </Steps>

apps/documentation/pages/developers/webhooks.mdx

@@ -544,7 +544,7 @@ Example payload for the `document.rejected` event:
 }
 ```
 
-Example payload for the `document.cancelled` event:
+Example payload for the `document.rejected` event:
 
 ```json
 {

apps/documentation/pages/users/documents/_meta.js

@@ -3,8 +3,6 @@ export default {
   'document-preferences': 'Document Preferences',
   'document-visibility': 'Document Visibility',
   fields: 'Document Fields',
-  'pdf-placeholders': 'PDF Placeholders',
   'email-preferences': 'Email Preferences',
   'ai-detection': 'AI Recipient & Field Detection',
-  'default-recipients': 'Default Recipients',
 };

apps/documentation/pages/users/documents/default-recipients.mdx

@@ -1,45 +0,0 @@
----
-title: Default Document Recipients
-description: Learn how to set default recipients with various roles for your documents.
----
-
-import { Callout, Steps } from 'nextra/components';
-
-# Default Document Recipients
-
-Documenso allows you to set default recipients for your documents. This is useful when you require specific recipients to be added to every document you send.
-
-You can add default recipients with the same roles as the recipients you can add when sending a document:
-
-- **Signer** - The recipient will be required to sign the document.
-- **Approver** - The recipient will be required to approve the document.
-- **Viewer** - The recipient will be required to view the document.
-- **CC** - The recipient will receive a copy of the document.
-
-You can set default recipients at the organisation or team level.
-
-### Organisation level
-
-To set default recipients at the organisation level, navigate to the organisation settings page and click the "Document" tab under the "Preferences" section.
-
-Then scroll down to the "Default Recipients" section and add the recipients you want to be included in every document you send.
-
-![A screenshot of the organisation's default recipients page](/default-recipients/organisation-default-recipients-select-step.webp)
-
-The recipients are added with the "CC" role by default, but you can select a different role for each recipient.
-
-![A screenshot of the organisation's default recipients page when selecting the role of the recipient](/default-recipients/organisation-default-recipients-role-step.webp)
-
-### Team level
-
-Setting the default recipients at the team level follows the same process as setting them at the organisation level.
-
-<Callout type="info">
-  Setting the default recipients at the team level will override organisation-level defaults.
-</Callout>
-
-To set default recipients at the team level, navigate to the team settings page and click the "Document" tab under the "Preferences" section.
-
-Then scroll down to the "Default Recipients" section. By default, the team will inherit the default recipients from the organisation. You can override these defaults by adding the recipients you want to be added to every document you send.
-
-![A screenshot of the team's default recipients page](/default-recipients/team-default-recipients.webp)

apps/documentation/pages/users/documents/pdf-placeholders.mdx

@@ -1,179 +0,0 @@
----
-title: PDF Placeholders
-description: Learn how to use placeholder text in your PDFs for automatic field placement in Documenso.
----
-
-import { Callout } from 'nextra/components';
-
-# PDF Placeholders
-
-Documenso can automatically detect placeholder text in your PDF documents and create fields at those locations. This allows you to prepare documents in your preferred editing tool (Word, Google Docs, etc.) with placeholders that become signature fields when uploaded.
-
-## How It Works
-
-When you upload a PDF, Documenso scans for text matching the placeholder pattern `{{...}}`. Each placeholder can specify:
-
-1. **Field type** - What kind of field to create (signature, name, email, etc.)
-2. **Recipient** - Which signer the field belongs to (r1, r2, etc.)
-3. **Options** - Additional settings like required, read-only, font size, etc.
-
-The placeholder text is automatically hidden after fields are created, so your final document looks clean.
-
-## Placeholder Format
-
-The basic format is:
-
-```
-{{FIELD_TYPE, RECIPIENT, option1=value1, option2=value2}}
-```
-
-### Examples
-
-| Placeholder                   | Description                         |
-| ----------------------------- | ----------------------------------- |
-| `{{signature, r1}}`           | Signature field for recipient 1     |
-| `{{name, r1}}`                | Name field for recipient 1          |
-| `{{email, r2}}`               | Email field for recipient 2         |
-| `{{date, r1}}`                | Date field for recipient 1          |
-| `{{text, r1, required=true}}` | Required text field for recipient 1 |
-| `{{initials, r1}}`            | Initials field for recipient 1      |
-
-## Supported Field Types
-
-The following field types are supported in placeholders:
-
-| Field Type | Placeholder Value |
-| ---------- | ----------------- |
-| Signature  | `signature`       |
-| Initials   | `initials`        |
-| Name       | `name`            |
-| Email      | `email`           |
-| Date       | `date`            |
-| Text       | `text`            |
-| Number     | `number`          |
-| Radio      | `radio`           |
-| Checkbox   | `checkbox`        |
-| Dropdown   | `dropdown`        |
-
-<Callout type="info">
-  Field types are case-insensitive. `{{ SIGNATURE, r1 }}` and `{{ signature, r1 }}` are equivalent.
-</Callout>
-
-## Recipient Identifiers
-
-Recipients are identified using `r1`, `r2`, `r3`, etc. The number corresponds to the order in which recipients are created:
-
-- `r1` - First recipient
-- `r2` - Second recipient
-- `r3` - Third recipient
-
-When you upload a PDF with placeholders, Documenso will:
-
-1. Create placeholder recipients for each unique identifier found (e.g., `r1`, `r2`)
-2. You can then update these with real email addresses before sending
-
-<Callout type="warning">
-  Placeholders without a recipient identifier (e.g., `{{ signature }}` without `r1`) are reserved
-  for API use and will not create fields during upload.
-</Callout>
-
-## Field Options
-
-You can customize fields by adding options after the recipient identifier:
-
-### Common Options
-
-| Option      | Values                    | Description                                |
-| ----------- | ------------------------- | ------------------------------------------ |
-| `required`  | `true`, `false`           | Whether the field must be filled           |
-| `readOnly`  | `true`, `false`           | Whether the field is pre-filled and locked |
-| `fontSize`  | Number (e.g., `12`)       | Font size in points                        |
-| `textAlign` | `left`, `center`, `right` | Horizontal text alignment                  |
-
-### Text Field Options
-
-| Option           | Values | Description                           |
-| ---------------- | ------ | ------------------------------------- |
-| `label`          | Text   | Label shown in the field              |
-| `placeholder`    | Text   | Placeholder text shown before signing |
-| `text`           | Text   | Pre-filled text value                 |
-| `characterLimit` | Number | Maximum characters allowed            |
-
-### Number Field Options
-
-| Option         | Values        | Description           |
-| -------------- | ------------- | --------------------- |
-| `value`        | Number        | Pre-filled value      |
-| `minValue`     | Number        | Minimum allowed value |
-| `maxValue`     | Number        | Maximum allowed value |
-| `numberFormat` | Format string | Number display format |
-
-### Examples with Options
-
-```
-{{text, r1, required=true, label=Company Name}}
-{{number, r1, minValue=0, maxValue=100, value=50}}
-{{name, r1, fontSize=14}}
-{{text, r2, readOnly=true, text=Contract #12345}}
-```
-
-<Callout type="info">
-  Signature and Free Signature fields do not support additional options beyond the field type and
-  recipient.
-</Callout>
-
-## Multiple Recipients Example
-
-Here's how a document might look with placeholders for two signers:
-
-```
-AGREEMENT
-
-Party A Signature: {{signature, r1}}
-Party A Name: {{name, r1}}
-Party A Date: {{date, r1}}
-
-Party B Signature: {{signature, r2}}
-Party B Name: {{name, r2}}
-Party B Date: {{date, r2}}
-```
-
-When uploaded, this creates:
-
-- 3 fields assigned to recipient 1 (Party A)
-- 3 fields assigned to recipient 2 (Party B)
-- 2 placeholder recipients that you can update with real email addresses
-
-## Tips for Creating Documents
-
-1. **Use a readable font** - Placeholders need to be readable by the PDF parser. Standard fonts like Arial, Helvetica, or Times New Roman work best.
-
-2. **Don't split placeholders** - Ensure the entire placeholder text `{{...}}` is on a single line and not broken across text boxes.
-
-3. **Size matters** - The field will be sized to match the placeholder text width. Use spaces or longer placeholder text if you need wider fields.
-
-4. **Test with a draft** - Upload your document as a draft first to verify fields are detected correctly before sending.
-
-<Callout type="info">
-  Placeholder detection happens automatically when you upload a PDF. You can review and adjust the
-  created fields in the document editor before sending.
-</Callout>
-
-## Troubleshooting
-
-### Placeholders Not Detected
-
-- Ensure placeholders use double curly braces: `{{...}}`
-- Check that the placeholder includes a recipient identifier (e.g., `r1`)
-- Verify the field type is spelled correctly
-- Try using a standard font in your source document
-
-### Wrong Field Position
-
-- The field is placed at the exact location of the placeholder text
-- If the position seems off, check that your PDF wasn't scaled or reformatted when exported
-
-### Placeholder Text Still Visible
-
-- Placeholder text is covered with a white rectangle after field creation
-- If you see the text, try re-uploading the document

apps/documentation/pages/users/fair-use.mdx

@@ -7,41 +7,28 @@ import { Callout } from 'nextra/components';
 
 # Fair Use Policy
 
-We like to overdeliver, but we cannot overcommit.
+We offer our plans without any limits on volume because we want our users and customers to make the most of their accounts. Estimating volume is incredibly hard, especially for shorter intervals like a quarter. We are not interested in selling volume packages our customers end up not using.
 
-Our plans are designed to be generous and flexible without forcing customers into rigid volume limits they may never use. At the same time, estimating usage at scale is hard, especially over short periods. This fair use policy exists to keep plans sustainable while allowing us to add more value wherever possible without overformalizing restrictions.
-
-We offer our plans without any limits on volume because we want users and customers to make the most of their accounts. Estimating volume is incredibly hard, especially for shorter intervals like a quarter. We are not interested in selling volume packages our customers end up not using.
-
-This is why our plans not include a limit on signing or API volume. If you are a customer of these plans, we ask you to abide by this fair use policy.
+This is why the individual plan and the team plan do not include a limit on signing or API volume. If you are a customer of these [plans](https://documen.so/pricing), we ask you to abide by this fair use policy:
 
 ### Spirit of the Plan
 
-Use the limitless plans as much as you like. They are meant to offer a lot. Please respect the spirit and intended scope of the account.
+Use the limitless accounts as much as you like (they are meant to offer a lot) while respecting the spirit and intended scope of the account.
 
 <Callout type="info">
-  What happens if I go beyond the scope of this policy? We will ask you to upgrade to a fitting plan
-  or custom pricing. We will not block your account without reaching out. You can message us for
-  questions.
+  What happens if I violate this policy? We will ask you to upgrade to a fitting plan or custom
+  pricing. We won’t block your account without reaching out. You can [message
+  us](mailto:support@documenso.com) for questions.
 </Callout>
 
-### Fair Support
-
-We believe in fair support as much as fair usage.
-
-Fair support includes reasonable and within reason application level help for self hosted users. We will help you get unstuck and point you in the right direction when issues come up. Support is provided in good faith and within reasonable time and effort limits. We are not your operations team and cannot take responsibility for running, monitoring, or maintaining your infrastructure.
-
-If you are unsure whether something falls within fair use or fair support, reach out. We are happy to talk it through.
-
 ### DO
 
-- Sign as many documents as you need with the individual plan for your single business or organization
-- Use the API and automation tools to automate your signing workflows
-- Experiment with plans and integrations while testing what you want to build
+- Sign as many documents as you need with the individual plan for your single business or organization you are part of
+- Use the API and automation tools to automate all your signing workflows
+- Experiment with the plans and integrations, testing what you want to build
 
 ### DON'T
 
-- Use an individual account API to power a platform or product
-- Run a large company signing thousands of documents per day on a small team plan
-- Expect enterprise level support for fair support plan
-- Overthink this policy. If you are a paying customer, we want you to win
+- Use the individual account's API to power a platform
+- Run a huge company, signing thousands of documents per day on a two-user team plan using the API
+- Let this policy make you overthink. If you are a paying customer, we want you to win

apps/documentation/pages/users/licenses/enterprise-edition.mdx

@@ -7,51 +7,20 @@ import { Callout } from 'nextra/components';
 
 # Enterprise Edition
 
+The Documenso Enterprise Edition is our license for self-hosters that need the full range of support and compliance. Everything in the EE folder and all features listed [here](https://github.com/documenso/documenso/blob/main/packages/ee/FEATURES) can be used after acquiring a paid license.
+
+## Includes
+
+- Self-Host Documenso in any context.
+- Premium Support via Slack, Discord and Email.
+- Flexible Licensing (e.g. MIT) for deeper custom integration (if needed).
+- Access to all Enterprise-grade compliance and administration features.
+
+## Limitations
+
+The Enterprise Edition currently has no limitations except custom contract terms.
+
 <Callout type="info">
   The Enterprise Edition requires a paid subscription. [Contact us for a
   quote](https://documen.so/enterprise).
 </Callout>
-
-The Documenso Enterprise Edition is our license for self-hosters that need the full range of support and compliance.
-
-The following features are included in the Enterprise Edition:
-
-{/* Keep this synced with the packages/ee/FEATURES file */}
-
-- The Stripe Billing Module
-- Organisation Authentication Portal
-- Document Action Reauthentication (Passkeys and 2FA)
-- 21 CFR
-- Email domains
-- Embed authoring
-- Embed authoring white label
-
-In addition, you will receive:
-
-- Premium Support via Slack, Discord and Email.
-- Flexible Licensing (e.g. MIT) for deeper custom integration (if needed).
-- Access to Enterprise-grade compliance and administration features.
-- Permission to self-Host Documenso in any context.
-
-The Enterprise Edition currently has no limitations except custom contract terms.
-
-## Getting a License
-
-To acquire an Enterprise Edition license, please [contact our sales team](https://documen.so/enterprise) for a quote. Our team will work with you to understand your requirements and provide a license that fits your needs.
-
-## Using Your License
-
-Once you have acquired an Enterprise Edition license:
-
-1. Access your license key at [license.documenso.com](https://license.documenso.com)
-2. Set the `NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY` environment variable in your Documenso instance with your license key
-
-```bash
-NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY="your-license-key-here"
-```
-
-3. You can verify your license status in the Admin Panel under the Stats section.
-
-![Admin License Status](/images/admin-license-status.webp)
-
-Your license will be verified on startup and periodically to ensure continued access to Enterprise features.

apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx

@@ -116,11 +116,9 @@ export function AssistantConfirmationDialog({
                     {!isEditingNextSigner && (
                       <div>
                         <p className="text-muted-foreground text-sm">
-                          <Trans>
-                            The next recipient to sign this document will be{' '}
-                            <span className="font-semibold">{form.watch('name')}</span> (
-                            <span className="font-semibold">{form.watch('email')}</span>).
-                          </Trans>
+                          The next recipient to sign this document will be{' '}
+                          <span className="font-semibold">{form.watch('name')}</span> (
+                          <span className="font-semibold">{form.watch('email')}</span>).
                         </p>
 
                         <Button

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

@@ -3,7 +3,6 @@ import { useState } from 'react';
 import { Trans, useLingui } from '@lingui/react/macro';
 import type { z } from 'zod';
 
-import type { TLicenseClaim } from '@documenso/lib/types/license';
 import { generateDefaultSubscriptionClaim } from '@documenso/lib/utils/organisations-claims';
 import { trpc } from '@documenso/trpc/react';
 import type { ZCreateSubscriptionClaimRequestSchema } from '@documenso/trpc/server/admin-router/create-subscription-claim.types';
@@ -23,11 +22,7 @@ import { SubscriptionClaimForm } from '../forms/subscription-claim-form';
 
 export type CreateClaimFormValues = z.infer<typeof ZCreateSubscriptionClaimRequestSchema>;
 
-type ClaimCreateDialogProps = {
-  licenseFlags?: TLicenseClaim;
-};
-
-export const ClaimCreateDialog = ({ licenseFlags }: ClaimCreateDialogProps) => {
+export const ClaimCreateDialog = () => {
   const { t } = useLingui();
   const { toast } = useToast();
 
@@ -72,7 +67,6 @@ export const ClaimCreateDialog = ({ licenseFlags }: ClaimCreateDialogProps) => {
             ...generateDefaultSubscriptionClaim(),
           }}
           onFormSubmit={createClaim}
-          licenseFlags={licenseFlags}
           formSubmitTrigger={
             <DialogFooter>
               <Button

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

@@ -2,7 +2,6 @@ import { useState } from 'react';
 
 import { Trans, useLingui } from '@lingui/react/macro';
 
-import type { TLicenseClaim } from '@documenso/lib/types/license';
 import { trpc } from '@documenso/trpc/react';
 import type { TFindSubscriptionClaimsResponse } from '@documenso/trpc/server/admin-router/find-subscription-claims.types';
 import { Button } from '@documenso/ui/primitives/button';
@@ -22,10 +21,9 @@ import { SubscriptionClaimForm } from '../forms/subscription-claim-form';
 export type ClaimUpdateDialogProps = {
   claim: TFindSubscriptionClaimsResponse['data'][number];
   trigger: React.ReactNode;
-  licenseFlags?: TLicenseClaim;
 };
 
-export const ClaimUpdateDialog = ({ claim, trigger, licenseFlags }: ClaimUpdateDialogProps) => {
+export const ClaimUpdateDialog = ({ claim, trigger }: ClaimUpdateDialogProps) => {
   const { t } = useLingui();
   const { toast } = useToast();
 
@@ -71,7 +69,6 @@ export const ClaimUpdateDialog = ({ claim, trigger, licenseFlags }: ClaimUpdateD
               data,
             })
           }
-          licenseFlags={licenseFlags}
           formSubmitTrigger={
             <DialogFooter>
               <Button

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

@@ -3,7 +3,13 @@ import { useEffect, useMemo, useState } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
-import { DocumentDistributionMethod, DocumentStatus, EnvelopeType } from '@prisma/client';
+import {
+  DocumentDistributionMethod,
+  DocumentStatus,
+  EnvelopeType,
+  FieldType,
+  RecipientRole,
+} from '@prisma/client';
 import { AnimatePresence, motion } from 'framer-motion';
 import { InfoIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
@@ -14,7 +20,6 @@ import * as z from 'zod';
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { getRecipientsWithMissingFields } from '@documenso/lib/utils/recipients';
 import { trpc, trpc as trpcReact } from '@documenso/trpc/react';
 import { DocumentSendEmailMessageHelper } from '@documenso/ui/components/document/document-send-email-message-helper';
 import { cn } from '@documenso/ui/lib/utils';
@@ -135,7 +140,14 @@ export const EnvelopeDistributeDialog = ({
   );
 
   const recipientsMissingSignatureFields = useMemo(
-    () => getRecipientsWithMissingFields(recipientsWithIndex, envelope.fields),
+    () =>
+      recipientsWithIndex.filter(
+        (recipient) =>
+          recipient.role === RecipientRole.SIGNER &&
+          !envelope.fields.some(
+            (field) => field.type === FieldType.SIGNATURE && field.recipientId === recipient.id,
+          ),
+      ),
     [recipientsWithIndex, envelope.fields],
   );
 
@@ -258,10 +270,10 @@ export const EnvelopeDistributeDialog = ({
                 >
                   <TabsList className="w-full">
                     <TabsTrigger className="w-full" value={DocumentDistributionMethod.EMAIL}>
-                      <Trans>Email</Trans>
+                      Email
                     </TabsTrigger>
                     <TabsTrigger className="w-full" value={DocumentDistributionMethod.NONE}>
-                      <Trans>None</Trans>
+                      None
                     </TabsTrigger>
                   </TabsList>
                 </Tabs>

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

@@ -1,175 +0,0 @@
-import { plural } from '@lingui/core/macro';
-import { Plural, useLingui } from '@lingui/react/macro';
-import { Trans } from '@lingui/react/macro';
-import { EnvelopeType } from '@prisma/client';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-
-import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type EnvelopesBulkDeleteDialogProps = {
-  envelopeIds: string[];
-  envelopeType: EnvelopeType;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  onSuccess?: () => void;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-export const EnvelopesBulkDeleteDialog = ({
-  envelopeIds,
-  envelopeType,
-  open,
-  onOpenChange,
-  onSuccess,
-  ...props
-}: EnvelopesBulkDeleteDialogProps) => {
-  const { t } = useLingui();
-  const { toast } = useToast();
-
-  const trpcUtils = trpc.useUtils();
-
-  const isDocument = envelopeType === EnvelopeType.DOCUMENT;
-
-  const { mutateAsync: bulkDeleteEnvelopes, isPending } = trpc.envelope.bulk.delete.useMutation({
-    onSuccess: async (result) => {
-      // Invalidate the appropriate query based on envelope type.
-      if (isDocument) {
-        await trpcUtils.document.findDocumentsInternal.invalidate();
-      } else {
-        await trpcUtils.template.findTemplates.invalidate();
-      }
-
-      if (result.failedIds.length > 0) {
-        toast({
-          title: isDocument ? t`Documents partially deleted` : t`Templates partially deleted`,
-          description: t`${plural(result.deletedCount, {
-            one: '# item deleted.',
-            other: '# items deleted.',
-          })} ${plural(result.failedIds.length, {
-            one: '# item could not be deleted.',
-            other: '# items could not be deleted.',
-          })}`,
-          variant: 'destructive',
-        });
-      } else {
-        toast({
-          title: isDocument ? t`Documents deleted` : t`Templates deleted`,
-          description: plural(result.deletedCount, {
-            one: '# item has been deleted.',
-            other: '# items have been deleted.',
-          }),
-          variant: 'default',
-        });
-      }
-
-      onSuccess?.();
-      onOpenChange(false);
-    },
-    onError: () => {
-      toast({
-        title: t`Error`,
-        description: t`An error occurred while deleting the items.`,
-        variant: 'destructive',
-      });
-    },
-  });
-
-  return (
-    <Dialog {...props} open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            {isDocument ? <Trans>Delete Documents</Trans> : <Trans>Delete Templates</Trans>}
-          </DialogTitle>
-
-          <DialogDescription>
-            {isDocument ? (
-              <Plural
-                value={envelopeIds.length}
-                one="You are about to delete the selected document."
-                other="You are about to delete # documents."
-              />
-            ) : (
-              <Plural
-                value={envelopeIds.length}
-                one="You are about to delete the selected template."
-                other="You are about to delete # templates."
-              />
-            )}
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="warning">
-          <AlertDescription>
-            <p>
-              <Trans>
-                Please note that this action is <strong>irreversible</strong>.
-              </Trans>
-            </p>
-
-            <p className="mt-1">
-              <Trans>Once confirmed, the following will occur:</Trans>
-            </p>
-
-            <ul className="mt-0.5 list-inside list-disc">
-              {isDocument ? (
-                <>
-                  <li>
-                    <Trans>Selected documents will be permanently deleted</Trans>
-                  </li>
-                  <li>
-                    <Trans>Pending documents will have their signing process cancelled</Trans>
-                  </li>
-                  <li>
-                    <Trans>All recipients will be notified</Trans>
-                  </li>
-                </>
-              ) : (
-                <>
-                  <li>
-                    <Trans>Selected templates will be permanently deleted</Trans>
-                  </li>
-                  <li>
-                    <Trans>Direct links associated with templates will be removed</Trans>
-                  </li>
-                </>
-              )}
-            </ul>
-          </AlertDescription>
-        </Alert>
-
-        <DialogFooter>
-          <Button
-            type="button"
-            variant="secondary"
-            onClick={() => onOpenChange(false)}
-            disabled={isPending}
-          >
-            <Trans>Cancel</Trans>
-          </Button>
-
-          <Button
-            onClick={(e) => {
-              e.preventDefault();
-              void bulkDeleteEnvelopes({ envelopeIds });
-            }}
-            loading={isPending}
-            variant="destructive"
-          >
-            <Trans>Delete</Trans>
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};

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

@@ -1,256 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Plural, useLingui } from '@lingui/react/macro';
-import { Trans } from '@lingui/react/macro';
-import { EnvelopeType } from '@prisma/client';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { FolderIcon, HomeIcon, Loader2, Search } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
-import { z } from 'zod';
-
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} 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';
-
-export type EnvelopesBulkMoveDialogProps = {
-  envelopeIds: string[];
-  envelopeType: EnvelopeType;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  currentFolderId?: string;
-  onSuccess?: () => void;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const ZBulkMoveFormSchema = z.object({
-  folderId: z.string().nullable(),
-});
-
-type TBulkMoveFormSchema = z.infer<typeof ZBulkMoveFormSchema>;
-
-export const EnvelopesBulkMoveDialog = ({
-  envelopeIds,
-  envelopeType,
-  open,
-  onOpenChange,
-  currentFolderId,
-  onSuccess,
-  ...props
-}: EnvelopesBulkMoveDialogProps) => {
-  const { t } = useLingui();
-  const { toast } = useToast();
-
-  const [searchTerm, setSearchTerm] = useState('');
-
-  const form = useForm<TBulkMoveFormSchema>({
-    resolver: zodResolver(ZBulkMoveFormSchema),
-    defaultValues: {
-      folderId: currentFolderId ?? null,
-    },
-  });
-
-  const isDocument = envelopeType === EnvelopeType.DOCUMENT;
-
-  const { data: folders, isLoading: isFoldersLoading } = trpc.folder.findFoldersInternal.useQuery(
-    {
-      parentId: currentFolderId,
-      type: envelopeType,
-    },
-    {
-      enabled: open,
-    },
-  );
-
-  const { mutateAsync: bulkMoveEnvelopes } = trpc.envelope.bulk.move.useMutation();
-
-  const trpcUtils = trpc.useUtils();
-
-  useEffect(() => {
-    if (open) {
-      setSearchTerm('');
-
-      form.reset({
-        folderId: currentFolderId,
-      });
-    }
-  }, [open, currentFolderId]);
-
-  const onSubmit = async (data: TBulkMoveFormSchema) => {
-    try {
-      await bulkMoveEnvelopes({
-        envelopeIds,
-        folderId: data.folderId,
-        envelopeType,
-      });
-
-      // Invalidate the appropriate query based on envelope type.
-      if (isDocument) {
-        await trpcUtils.document.findDocumentsInternal.invalidate();
-      } else {
-        await trpcUtils.template.findTemplates.invalidate();
-      }
-
-      toast({
-        description: t`Selected items have been moved.`,
-      });
-
-      onSuccess?.();
-      onOpenChange(false);
-    } catch (err) {
-      const error = AppError.parseError(err);
-
-      const errorMessage = match(error.code)
-        .with(
-          AppErrorCode.NOT_FOUND,
-          () => t`The folder you are trying to move the items to does not exist.`,
-        )
-        .with(AppErrorCode.UNAUTHORIZED, () => t`You are not allowed to move these items.`)
-        .with(AppErrorCode.INVALID_BODY, () => t`All items must be of the same type.`)
-        .otherwise(() => t`An error occurred while moving the items.`);
-
-      toast({
-        description: errorMessage,
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const filteredFolders = folders?.data.filter((folder) =>
-    folder.name.toLowerCase().includes(searchTerm.toLowerCase()),
-  );
-
-  return (
-    <Dialog {...props} open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            {isDocument ? (
-              <Trans>Move Documents to Folder</Trans>
-            ) : (
-              <Trans>Move Templates to Folder</Trans>
-            )}
-          </DialogTitle>
-
-          <DialogDescription>
-            {isDocument ? (
-              <Plural
-                value={envelopeIds.length}
-                one="Select a folder to move the selected document to."
-                other="Select a folder to move the # selected documents to."
-              />
-            ) : (
-              <Plural
-                value={envelopeIds.length}
-                one="Select a folder to move the selected template to."
-                other="Select a folder to move the # selected templates to."
-              />
-            )}
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className="relative">
-          <Search className="absolute left-2 top-3 h-4 w-4 text-muted-foreground" />
-          <Input
-            placeholder={t`Search folders...`}
-            value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
-            className="pl-8"
-          />
-        </div>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-y-4">
-            <FormField
-              control={form.control}
-              name="folderId"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>
-                    <Trans>Folder</Trans>
-                  </FormLabel>
-
-                  <FormControl>
-                    <div className="max-h-96 space-y-2 overflow-y-auto">
-                      {isFoldersLoading ? (
-                        <div className="flex h-10 items-center justify-center">
-                          <Loader2 className="h-4 w-4 animate-spin" />
-                        </div>
-                      ) : (
-                        <>
-                          <Button
-                            type="button"
-                            variant={field.value === null ? 'default' : 'outline'}
-                            className="w-full justify-start"
-                            onClick={() => field.onChange(null)}
-                            disabled={currentFolderId === undefined}
-                          >
-                            <HomeIcon className="mr-2 h-4 w-4" />
-                            <Trans>Home (No Folder)</Trans>
-                          </Button>
-
-                          {filteredFolders?.map((folder) => (
-                            <Button
-                              key={folder.id}
-                              type="button"
-                              variant={field.value === folder.id ? 'default' : 'outline'}
-                              className="w-full justify-start"
-                              onClick={() => field.onChange(folder.id)}
-                              disabled={currentFolderId === folder.id}
-                            >
-                              <FolderIcon className="mr-2 h-4 w-4" />
-                              {folder.name}
-                            </Button>
-                          ))}
-
-                          {searchTerm && filteredFolders?.length === 0 && (
-                            <div className="px-2 py-2 text-center text-sm text-muted-foreground">
-                              <Trans>No folders found</Trans>
-                            </div>
-                          )}
-                        </>
-                      )}
-                    </div>
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <DialogFooter>
-              <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
-                <Trans>Cancel</Trans>
-              </Button>
-
-              <Button
-                type="submit"
-                disabled={isFoldersLoading || form.formState.isSubmitting}
-                loading={form.formState.isSubmitting}
-              >
-                <Trans>Move</Trans>
-              </Button>
-            </DialogFooter>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};

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

@@ -77,7 +77,7 @@ export const OrganisationGroupDeleteDialog = ({
           </DialogTitle>
 
           <DialogDescription className="mt-4">
-            <Trans context="Removing group from organisation">
+            <Trans>
               You are about to remove the following group from{' '}
               <span className="font-semibold">{organisation.name}</span>.
             </Trans>

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

@@ -127,11 +127,7 @@ export const TeamCreateDialog = ({ trigger, onCreated, ...props }: TeamCreateDia
   };
 
   const mapTextToUrl = (text: string) => {
-    return text
-      .normalize('NFD')
-      .replace(/[\u0300-\u036f]/g, '')
-      .toLowerCase()
-      .replace(/\s+/g, '-');
+    return text.toLowerCase().replace(/\s+/g, '-');
   };
 
   const dialogState = useMemo(() => {
@@ -264,7 +260,7 @@ export const TeamCreateDialog = ({ trigger, onCreated, ...props }: TeamCreateDia
                         <Input className="bg-background" {...field} />
                       </FormControl>
                       {!form.formState.errors.teamUrl && (
-                        <span className="text-xs font-normal text-foreground/50">
+                        <span className="text-foreground/50 text-xs font-normal">
                           {field.value ? (
                             `${NEXT_PUBLIC_WEBAPP_URL()}/t/${field.value}`
                           ) : (
@@ -292,7 +288,7 @@ export const TeamCreateDialog = ({ trigger, onCreated, ...props }: TeamCreateDia
                           />
 
                           <label
-                            className="ml-2 text-sm text-muted-foreground"
+                            className="text-muted-foreground ml-2 text-sm"
                             htmlFor="inherit-members"
                           >
                             <Trans>Allow all organisation members to access this team</Trans>

apps/remix/app/components/dialogs/team-group-delete-dialog.tsx

@@ -81,7 +81,7 @@ export const TeamGroupDeleteDialog = ({
           </DialogTitle>
 
           <DialogDescription className="mt-4">
-            <Trans context="Removing group from team">
+            <Trans>
               You are about to remove the following group from{' '}
               <span className="font-semibold">{team.name}</span>.
             </Trans>

apps/remix/app/components/dialogs/team-member-create-dialog.tsx

@@ -1,10 +1,10 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { TeamMemberRole } from '@prisma/client';
 import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { InfoIcon, UserPlusIcon } from 'lucide-react';
+import { InfoIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { Link } from 'react-router';
 import { match } from 'ts-pattern';
@@ -13,7 +13,6 @@ import { z } from 'zod';
 import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';
 import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
 import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
@@ -45,7 +44,6 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { OrganisationMemberInviteDialog } from '~/components/dialogs/organisation-member-invite-dialog';
 import { useCurrentTeam } from '~/providers/team';
 
 export type TeamMemberCreateDialogProps = {
@@ -66,14 +64,11 @@ type TAddTeamMembersFormSchema = z.infer<typeof ZAddTeamMembersFormSchema>;
 export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDialogProps) => {
   const [open, setOpen] = useState(false);
   const [step, setStep] = useState<'SELECT' | 'MEMBERS'>('SELECT');
-  const [inviteDialogOpen, setInviteDialogOpen] = useState(false);
-  const prevInviteDialogOpenRef = useRef(false);
 
   const { t } = useLingui();
   const { toast } = useToast();
 
   const team = useCurrentTeam();
-  const utils = trpc.useUtils();
 
   const form = useForm<TAddTeamMembersFormSchema>({
     resolver: zodResolver(ZAddTeamMembersFormSchema),
@@ -101,29 +96,7 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
     );
   }, [organisationMemberQuery, teamMemberQuery]);
 
-  const hasNoAvailableMembers =
-    !organisationMemberQuery.isLoading && avaliableOrganisationMembers.length === 0;
-
   const onFormSubmit = async ({ members }: TAddTeamMembersFormSchema) => {
-    if (members.length === 0) {
-      if (hasNoAvailableMembers) {
-        setInviteDialogOpen(true);
-        return;
-      }
-
-      // Don't show error if on SELECT step - the disabled Next button already communicates this
-      if (step === 'SELECT') {
-        return;
-      }
-
-      toast({
-        title: t`No members selected`,
-        description: t`Please select at least one member to add to the team.`,
-        variant: 'destructive',
-      });
-      return;
-    }
-
     try {
       await createTeamMembers({
         teamId: team.id,
@@ -150,20 +123,9 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
     if (!open) {
       form.reset();
       setStep('SELECT');
-      setInviteDialogOpen(false);
     }
   }, [open, form]);
 
-  // Invalidate queries when invite dialog closes (transitions from true to false) to refresh available members
-  useEffect(() => {
-    if (prevInviteDialogOpenRef.current && !inviteDialogOpen) {
-      void utils.organisation.member.find.invalidate({
-        organisationId: team.organisationId,
-      });
-    }
-    prevInviteDialogOpenRef.current = inviteDialogOpen;
-  }, [inviteDialogOpen, utils, team.organisationId]);
-
   return (
     <Dialog
       {...props}
@@ -172,11 +134,9 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
       // Since it would be annoying to redo the whole process.
     >
       <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
-        {trigger ?? (
-          <Button variant="secondary" onClick={() => setOpen(true)}>
-            <Trans>Add members</Trans>
-          </Button>
-        )}
+        <Button variant="secondary" onClick={() => setOpen(true)}>
+          <Trans>Add members</Trans>
+        </Button>
       </DialogTrigger>
 
       <DialogContent hideClose={true} position="center">
@@ -189,7 +149,7 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
                   <TooltipTrigger asChild>
                     <InfoIcon className="mx-2 h-4 w-4" />
                   </TooltipTrigger>
-                  <TooltipContent className="z-[99999] max-w-xs text-muted-foreground">
+                  <TooltipContent className="text-muted-foreground z-[99999] max-w-xs">
                     <Trans>
                       To be able to add members to a team, you must first add them to the
                       organisation. For more information, please see the{' '}
@@ -226,18 +186,7 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
           .exhaustive()}
 
         <Form {...form}>
-          <form
-            onSubmit={form.handleSubmit(onFormSubmit)}
-            onKeyDown={(e) => {
-              if (e.key === 'Enter' && form.getValues('members').length === 0) {
-                e.preventDefault();
-                if (hasNoAvailableMembers) {
-                  setInviteDialogOpen(true);
-                }
-                // Don't show toast - the disabled Next button already communicates this
-              }
-            }}
-          >
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
             <fieldset disabled={form.formState.isSubmitting}>
               {step === 'SELECT' && (
                 <>
@@ -245,102 +194,46 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
                     control={form.control}
                     name="members"
                     render={({ field }) => (
-                      <FormItem className="space-y-2">
+                      <FormItem>
                         <FormLabel>
                           <Trans>Members</Trans>
                         </FormLabel>
 
                         <FormControl>
-                          {hasNoAvailableMembers ? (
-                            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed border-muted-foreground/25 bg-muted/30 px-6 py-12 text-center">
-                              <div className="mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-muted">
-                                <UserPlusIcon className="h-6 w-6 text-muted-foreground" />
-                              </div>
-                              <h3 className="mb-2 text-sm font-semibold">
-                                <Trans>No organisation members available</Trans>
-                              </h3>
-                              <p className="mb-6 max-w-sm text-sm text-muted-foreground">
-                                <Trans>
-                                  To add members to this team, you must first add them to the
-                                  organisation.
-                                </Trans>
-                              </p>
-                              <OrganisationMemberInviteDialog
-                                open={inviteDialogOpen}
-                                onOpenChange={setInviteDialogOpen}
-                                trigger={
-                                  <Button type="button" variant="default">
-                                    <UserPlusIcon className="mr-2 h-4 w-4" />
-                                    <Trans>Invite organisation members</Trans>
-                                  </Button>
-                                }
-                              />
-                            </div>
-                          ) : (
-                            <MultiSelectCombobox
-                              options={avaliableOrganisationMembers.map((member) => ({
-                                label: member.name,
-                                value: member.id,
-                              }))}
-                              loading={organisationMemberQuery.isLoading}
-                              selectedValues={field.value.map(
-                                (member) => member.organisationMemberId,
-                              )}
-                              onChange={(value) => {
-                                field.onChange(
-                                  value.map((organisationMemberId) => ({
-                                    organisationMemberId,
-                                    teamRole:
-                                      field.value.find(
-                                        (member) =>
-                                          member.organisationMemberId === organisationMemberId,
-                                      )?.teamRole || TeamMemberRole.MEMBER,
-                                  })),
-                                );
-                              }}
-                              className="w-full bg-background"
-                              emptySelectionPlaceholder={t`Select members`}
-                            />
-                          )}
+                          <MultiSelectCombobox
+                            options={avaliableOrganisationMembers.map((member) => ({
+                              label: member.name,
+                              value: member.id,
+                            }))}
+                            loading={organisationMemberQuery.isLoading}
+                            selectedValues={field.value.map(
+                              (member) => member.organisationMemberId,
+                            )}
+                            onChange={(value) => {
+                              field.onChange(
+                                value.map((organisationMemberId) => ({
+                                  organisationMemberId,
+                                  teamRole:
+                                    field.value.find(
+                                      (member) =>
+                                        member.organisationMemberId === organisationMemberId,
+                                    )?.teamRole || TeamMemberRole.MEMBER,
+                                })),
+                              );
+                            }}
+                            className="bg-background w-full"
+                            emptySelectionPlaceholder={t`Select members`}
+                          />
                         </FormControl>
 
-                        {!hasNoAvailableMembers && (
-                          <>
-                            <FormDescription>
-                              <Trans>Select members to add to this team</Trans>
-                            </FormDescription>
-
-                            <Alert
-                              variant="neutral"
-                              className="mt-2 flex items-center gap-2 space-y-0"
-                            >
-                              <div>
-                                <UserPlusIcon className="h-5 w-5 text-muted-foreground" />
-                              </div>
-                              <AlertDescription className="mt-0 flex-1">
-                                <Trans>Can't find someone?</Trans>{' '}
-                                <OrganisationMemberInviteDialog
-                                  open={inviteDialogOpen}
-                                  onOpenChange={setInviteDialogOpen}
-                                  trigger={
-                                    <Button
-                                      type="button"
-                                      variant="link"
-                                      className="h-auto p-0 text-sm font-medium text-documenso-700 hover:text-documenso-600"
-                                    >
-                                      <Trans>Invite them to the organisation first</Trans>
-                                    </Button>
-                                  }
-                                />
-                              </AlertDescription>
-                            </Alert>
-                          </>
-                        )}
+                        <FormDescription>
+                          <Trans>Select members to add to this team</Trans>
+                        </FormDescription>
                       </FormItem>
                     )}
                   />
 
-                  <DialogFooter className="mt-4">
+                  <DialogFooter>
                     <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
                       <Trans>Cancel</Trans>
                     </Button>

apps/remix/app/components/dialogs/template-direct-link-dialog.tsx

@@ -54,8 +54,6 @@ type TemplateDirectLinkDialogProps = {
   directLink?: Pick<TemplateDirectLink, 'token' | 'enabled'> | null;
   recipients: Recipient[];
   trigger?: React.ReactNode;
-  onCreateSuccess?: () => Promise<void> | void;
-  onDeleteSuccess?: () => Promise<void> | void;
 };
 
 type TemplateDirectLinkStep = 'ONBOARD' | 'SELECT_RECIPIENT' | 'MANAGE' | 'CONFIRM_DELETE';
@@ -65,8 +63,6 @@ export const TemplateDirectLinkDialog = ({
   directLink,
   recipients,
   trigger,
-  onCreateSuccess,
-  onDeleteSuccess,
 }: TemplateDirectLinkDialogProps) => {
   const { toast } = useToast();
   const { quota, remaining } = useLimits();
@@ -101,7 +97,6 @@ export const TemplateDirectLinkDialog = ({
   } = trpcReact.template.createTemplateDirectLink.useMutation({
     onSuccess: async (data) => {
       await revalidate();
-      await onCreateSuccess?.();
 
       setToken(data.token);
       setIsEnabled(data.enabled);
@@ -147,7 +142,6 @@ export const TemplateDirectLinkDialog = ({
     trpcReact.template.deleteTemplateDirectLink.useMutation({
       onSuccess: async () => {
         await revalidate();
-        await onDeleteSuccess?.();
 
         setOpen(false);
         setToken(null);
@@ -240,7 +234,7 @@ export const TemplateDirectLinkDialog = ({
                         </div>
 
                         <h3 className="font-semibold">{_(step.title)}</h3>
-                        <p className="mt-1 text-sm text-muted-foreground">{_(step.description)}</p>
+                        <p className="text-muted-foreground mt-1 text-sm">{_(step.description)}</p>
                       </li>
                     ))}
                   </ul>
@@ -326,13 +320,13 @@ export const TemplateDirectLinkDialog = ({
                             onClick={async () => onRecipientTableRowClick(row.id)}
                           >
                             <TableCell>
-                              <div className="text-sm text-muted-foreground">
+                              <div className="text-muted-foreground text-sm">
                                 <p>{row.name}</p>
-                                <p className="text-xs text-muted-foreground/70">{row.email}</p>
+                                <p className="text-muted-foreground/70 text-xs">{row.email}</p>
                               </div>
                             </TableCell>
 
-                            <TableCell className="text-sm text-muted-foreground">
+                            <TableCell className="text-muted-foreground text-sm">
                               {_(RECIPIENT_ROLES_DESCRIPTION[row.role].roleName)}
                             </TableCell>
 
@@ -356,7 +350,7 @@ export const TemplateDirectLinkDialog = ({
                     <DialogFooter className="mx-auto">
                       <div className="flex flex-col items-center justify-center">
                         {validDirectTemplateRecipients.length !== 0 && (
-                          <p className="text-sm text-muted-foreground">
+                          <p className="text-muted-foreground text-sm">
                             <Trans>Or</Trans>
                           </p>
                         )}
@@ -398,7 +392,7 @@ export const TemplateDirectLinkDialog = ({
                           <TooltipTrigger tabIndex={-1} className="ml-2">
                             <InfoIcon className="h-4 w-4" />
                           </TooltipTrigger>
-                          <TooltipContent className="z-9999 max-w-md p-4 text-foreground">
+                          <TooltipContent className="text-foreground z-9999 max-w-md p-4">
                             <Trans>
                               Disabling direct link signing will prevent anyone from accessing the
                               link.

apps/remix/app/components/embed/embed-client-loading.tsx

@@ -1,4 +1,3 @@
-import { Trans } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
 
 export const EmbedClientLoading = () => {
@@ -6,9 +5,7 @@ export const EmbedClientLoading = () => {
     <div className="bg-background fixed left-0 top-0 z-[9999] flex h-full w-full items-center justify-center">
       <Loader className="mr-2 h-4 w-4 animate-spin" />
 
-      <span>
-        <Trans>Loading...</Trans>
-      </span>
+      <span>Loading...</span>
     </div>
   );
 };

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

@@ -3,14 +3,8 @@ import { useEffect, useLayoutEffect, useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import {
-  type DocumentMeta,
-  type EnvelopeItem,
-  type Field,
-  FieldType,
-  type Recipient,
-  type Signature,
-} from '@prisma/client';
+import type { DocumentMeta, EnvelopeItem, Recipient, Signature } from '@prisma/client';
+import { type Field, FieldType } from '@prisma/client';
 import { LucideChevronDown, LucideChevronUp } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { useSearchParams } from 'react-router';
@@ -24,7 +18,6 @@ import {
   isRequiredField,
 } from '@documenso/lib/utils/advanced-fields-helpers';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
-import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
 import { trpc } from '@documenso/trpc/react';
 import type {
   TRemovedSignedFieldWithTokenMutationSchema,
@@ -103,7 +96,7 @@ export const EmbedDirectTemplateClientPage = ({
 
   const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));
 
-  const hasSignatureField = localFields.some((field) => isSignatureFieldType(field.type));
+  const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
 
   const signatureValid = !hasSignatureField || (signature && signature.trim() !== '');
 
@@ -499,9 +492,7 @@ export const EmbedDirectTemplateClientPage = ({
 
       {!hidePoweredBy && (
         <div className="fixed bottom-0 left-0 z-40 rounded-tr bg-primary px-2 py-1 text-xs font-medium text-primary-foreground opacity-60 hover:opacity-100">
-          <span>
-            <Trans>Powered by</Trans>
-          </span>
+          <span>Powered by</span>
           <BrandingLogo className="ml-2 inline-block h-[14px]" />
         </div>
       )}

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

@@ -4,14 +4,13 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import type { DocumentMeta, EnvelopeItem } from '@prisma/client';
-import { type Field, RecipientRole, SigningStatus } from '@prisma/client';
+import { type Field, FieldType, RecipientRole, SigningStatus } from '@prisma/client';
 import { LucideChevronDown, LucideChevronUp } from 'lucide-react';
 
 import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
-import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { trpc } from '@documenso/trpc/react';
 import {
@@ -116,7 +115,7 @@ export const EmbedSignDocumentV1ClientPage = ({
     [fields],
   );
 
-  const hasSignatureField = fields.some((field) => isSignatureFieldType(field.type));
+  const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
 
   const signatureValid = !hasSignatureField || (signature && signature.trim() !== '');
 
@@ -510,9 +509,7 @@ export const EmbedSignDocumentV1ClientPage = ({
 
         {!hidePoweredBy && (
           <div className="fixed bottom-0 left-0 z-40 rounded-tr bg-primary px-2 py-1 text-xs font-medium text-primary-foreground opacity-60 hover:opacity-100">
-            <span>
-              <Trans>Powered by</Trans>
-            </span>
+            <span>Powered by</span>
             <BrandingLogo className="ml-2 inline-block h-[14px]" />
           </div>
         )}

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

@@ -1,7 +1,6 @@
 import { useEffect, useLayoutEffect, useState } from 'react';
 
 import { useLingui } from '@lingui/react';
-import { EnvelopeType } from '@prisma/client';
 
 import { mapSecondaryIdToDocumentId } from '@documenso/lib/utils/envelope';
 
@@ -26,7 +25,7 @@ export const EmbedSignDocumentV2ClientPage = ({
 }: EmbedSignDocumentV2ClientPageProps) => {
   const { _ } = useLingui();
 
-  const { envelope, recipient, envelopeData, setFullName, setEmail, fullName } =
+  const { envelope, recipient, envelopeData, setFullName, fullName } =
     useRequiredEnvelopeSigningContext();
 
   const { isCompleted, isRejected, recipientSignature } = envelopeData;
@@ -36,7 +35,6 @@ export const EmbedSignDocumentV2ClientPage = ({
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [allowDocumentRejection, setAllowDocumentRejection] = useState(false);
   const [isNameLocked, setIsNameLocked] = useState(false);
-  const [isEmailLocked, setIsEmailLocked] = useState(envelope.type === EnvelopeType.DOCUMENT);
 
   const onDocumentCompleted = (data: {
     token: string;
@@ -134,17 +132,6 @@ export const EmbedSignDocumentV2ClientPage = ({
       // Since a recipient can be provided a name we can lock it without requiring
       // a to be provided by the parent application, unlike direct templates.
       setIsNameLocked(!!data.lockName);
-
-      if (envelope.type === EnvelopeType.TEMPLATE) {
-        if (!isCompleted && data.email) {
-          setEmail(data.email);
-        }
-
-        if (data.email) {
-          setIsEmailLocked(!!data.lockEmail);
-        }
-      }
-
       setAllowDocumentRejection(!!data.allowDocumentRejection);
 
       if (data.darkModeDisabled) {
@@ -226,7 +213,6 @@ export const EmbedSignDocumentV2ClientPage = ({
   return (
     <EmbedSigningProvider
       isNameLocked={isNameLocked}
-      isEmailLocked={isEmailLocked}
       hidePoweredBy={hidePoweredBy}
       allowDocumentRejection={allowDocumentRejection}
       onDocumentCompleted={onDocumentCompleted}

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

@@ -3,13 +3,12 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { DocumentStatus, SigningStatus } from '@prisma/client';
+import { DocumentStatus, FieldType, SigningStatus } from '@prisma/client';
 import { Loader, LucideChevronDown, LucideChevronUp, X } from 'lucide-react';
 import { P, match } from 'ts-pattern';
 
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
 import { trpc } from '@documenso/trpc/react';
 import type {
   TRemovedSignedFieldWithTokenMutationSchema,
@@ -84,7 +83,7 @@ export const MultiSignDocumentSigningView = ({
   const { mutateAsync: completeDocumentWithToken } =
     trpc.recipient.completeDocumentWithToken.useMutation();
 
-  const hasSignatureField = document?.fields.some((field) => isSignatureFieldType(field.type));
+  const hasSignatureField = document?.fields.some((field) => field.type === FieldType.SIGNATURE);
 
   const [pendingFields, completedFields] = [
     document?.fields.filter((field) => field.recipient.signingStatus !== SigningStatus.SIGNED) ??

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

@@ -402,7 +402,7 @@ export const SignUpForm = ({
               size="lg"
               className="mt-6 w-full"
             >
-              <Trans>Create account</Trans>
+              <Trans>Complete</Trans>
             </Button>
           </form>
         </Form>

apps/remix/app/components/forms/subscription-claim-form.tsx

@@ -2,13 +2,10 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, useLingui } from '@lingui/react/macro';
 import type { SubscriptionClaim } from '@prisma/client';
 import { useForm } from 'react-hook-form';
-import { Link } from 'react-router';
 import type { z } from 'zod';
 
-import type { TLicenseClaim } from '@documenso/lib/types/license';
 import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
 import { ZCreateSubscriptionClaimRequestSchema } from '@documenso/trpc/server/admin-router/create-subscription-claim.types';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import {
   Form,
@@ -27,22 +24,15 @@ type SubscriptionClaimFormProps = {
   subscriptionClaim: Omit<SubscriptionClaim, 'id' | 'createdAt' | 'updatedAt'>;
   onFormSubmit: (data: SubscriptionClaimFormValues) => Promise<void>;
   formSubmitTrigger?: React.ReactNode;
-  licenseFlags?: TLicenseClaim;
 };
 
 export const SubscriptionClaimForm = ({
   subscriptionClaim,
   onFormSubmit,
   formSubmitTrigger,
-  licenseFlags,
 }: SubscriptionClaimFormProps) => {
   const { t } = useLingui();
 
-  const hasRestrictedEnterpriseFeatures = Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).some(
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    (flag) => flag.isEnterprise && !licenseFlags?.[flag.key as keyof TLicenseClaim],
-  );
-
   const form = useForm<SubscriptionClaimFormValues>({
     resolver: zodResolver(ZCreateSubscriptionClaimRequestSchema),
     defaultValues: {
@@ -152,59 +142,34 @@ export const SubscriptionClaimForm = ({
             </FormLabel>
 
             <div className="mt-2 space-y-2 rounded-md border p-4">
-              {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(
-                ({ key, label, isEnterprise }) => {
-                  const isRestrictedFeature =
-                    isEnterprise && !licenseFlags?.[key as keyof TLicenseClaim]; // eslint-disable-line @typescript-eslint/consistent-type-assertions
+              {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(({ key, label }) => (
+                <FormField
+                  key={key}
+                  control={form.control}
+                  name={`flags.${key}`}
+                  render={({ field }) => (
+                    <FormItem className="flex items-center space-x-2">
+                      <FormControl>
+                        <div className="flex items-center">
+                          <Checkbox
+                            id={`flag-${key}`}
+                            checked={field.value}
+                            onCheckedChange={field.onChange}
+                          />
 
-                  return (
-                    <FormField
-                      key={key}
-                      control={form.control}
-                      name={`flags.${key}`}
-                      render={({ field }) => (
-                        <FormItem className="flex items-center space-x-2">
-                          <FormControl>
-                            <div className="flex items-center">
-                              <Checkbox
-                                id={`flag-${key}`}
-                                checked={field.value}
-                                onCheckedChange={field.onChange}
-                                disabled={isRestrictedFeature && !field.value} // Allow disabling of restricted features.
-                              />
-
-                              <label
-                                className="ml-2 flex flex-row items-center text-sm text-muted-foreground"
-                                htmlFor={`flag-${key}`}
-                              >
-                                {label}
-                                {isRestrictedFeature && ' ¹'}
-                              </label>
-                            </div>
-                          </FormControl>
-                        </FormItem>
-                      )}
-                    />
-                  );
-                },
-              )}
+                          <label
+                            className="text-muted-foreground ml-2 flex flex-row items-center text-sm"
+                            htmlFor={`flag-${key}`}
+                          >
+                            {label}
+                          </label>
+                        </div>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+              ))}
             </div>
-
-            {hasRestrictedEnterpriseFeatures && (
-              <Alert variant="neutral" className="mt-4">
-                <AlertDescription>
-                  <span>¹&nbsp;</span>
-                  <Trans>Your current license does not include these features.</Trans>{' '}
-                  <Link
-                    to="https://docs.documenso.com/users/licenses/enterprise-edition"
-                    target="_blank"
-                    className="text-foreground underline hover:opacity-80"
-                  >
-                    <Trans>Learn more</Trans>
-                  </Link>
-                </AlertDescription>
-              </Alert>
-            )}
           </div>
 
           {formSubmitTrigger}

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

@@ -1,212 +0,0 @@
-import { Trans, useLingui } from '@lingui/react/macro';
-import {
-  ArrowRightIcon,
-  CheckCircle2Icon,
-  KeyRoundIcon,
-  Loader2Icon,
-  RefreshCwIcon,
-  XCircleIcon,
-} from 'lucide-react';
-import { DateTime } from 'luxon';
-import { Link, useRevalidator } from 'react-router';
-import { match } from 'ts-pattern';
-
-import type { TCachedLicense } from '@documenso/lib/types/license';
-import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
-import { trpc } from '@documenso/trpc/react';
-import { Badge } from '@documenso/ui/primitives/badge';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@documenso/ui/primitives/tooltip';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { CardMetric } from './metric-card';
-
-type AdminLicenseCardProps = {
-  licenseData: TCachedLicense | null;
-};
-
-export const AdminLicenseCard = ({ licenseData }: AdminLicenseCardProps) => {
-  const { t, i18n } = useLingui();
-
-  const { license } = licenseData || {};
-
-  if (!license) {
-    return (
-      <div className="relative">
-        <div className="absolute right-3 top-3 z-10">
-          <AdminLicenseResyncButton />
-        </div>
-        <CardMetric icon={KeyRoundIcon} title={t`License`} className="h-fit max-h-fit">
-          <div className="mt-1 flex items-center justify-center gap-2">
-            <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg border border-dashed border-muted-foreground/30 bg-muted/50">
-              <KeyRoundIcon className="h-5 w-5 text-muted-foreground/50" />
-            </div>
-
-            <div className="flex flex-col gap-0.5">
-              {licenseData?.requestedLicenseKey ? (
-                <>
-                  <p className="text-sm font-medium text-destructive">
-                    <Trans>Invalid License Key</Trans>
-                  </p>
-                  <p className="text-xs text-muted-foreground">{licenseData.requestedLicenseKey}</p>
-                </>
-              ) : (
-                <p className="text-sm font-medium text-muted-foreground">
-                  <Trans>No License Configured</Trans>
-                </p>
-              )}
-
-              <Link
-                to="https://docs.documenso.com/users/licenses/enterprise-edition"
-                target="_blank"
-                className="flex flex-row items-center text-xs text-muted-foreground hover:text-muted-foreground/80"
-              >
-                <Trans>Learn more</Trans> <ArrowRightIcon className="h-3 w-3" />
-              </Link>
-            </div>
-          </div>
-        </CardMetric>
-      </div>
-    );
-  }
-
-  const enabledFlags = Object.entries(license.flags).filter(([, enabled]) => enabled);
-
-  return (
-    <div className="relative max-w-full overflow-hidden rounded-lg border border-border bg-background px-4 pb-6 pt-4 shadow shadow-transparent duration-200 hover:shadow-border/80">
-      <div className="absolute right-3 top-3">
-        <AdminLicenseResyncButton />
-      </div>
-
-      <div className="flex items-start gap-2">
-        <div className="h-4 w-4">
-          <KeyRoundIcon className="h-4 w-4 text-muted-foreground" />
-        </div>
-
-        <h3 className="text-primary-forground mb-2 flex items-end text-sm font-medium leading-tight">
-          <Trans>Documenso License</Trans>
-        </h3>
-
-        {match(license.status)
-          .with('ACTIVE', () => (
-            <Badge variant="default" size="small">
-              <CheckCircle2Icon className="mr-1 h-3 w-3" />
-              <Trans context="Subscription status">Active</Trans>
-            </Badge>
-          ))
-          .with('PAST_DUE', () => (
-            <Badge variant="warning" size="small">
-              <XCircleIcon className="mr-1 h-3 w-3" />
-              <Trans context="Subscription status">Past Due</Trans>
-            </Badge>
-          ))
-          .with('EXPIRED', () => (
-            <Badge variant="destructive" size="small">
-              <XCircleIcon className="mr-1 h-3 w-3" />
-              <Trans context="Subscription status">Expired</Trans>
-            </Badge>
-          ))
-          .otherwise(() => null)}
-      </div>
-
-      <div className="mt-4 grid grid-cols-2 gap-4">
-        <div>
-          <p className="text-sm font-medium text-foreground">
-            <Trans>License</Trans>
-          </p>
-          <p className="mt-0.5 text-xs text-muted-foreground">{license.name}</p>
-        </div>
-
-        <div>
-          <p className="text-sm font-medium text-foreground">
-            <Trans>Expires</Trans>
-          </p>
-          <p className="mt-0.5 text-xs text-muted-foreground">
-            {i18n.date(license.periodEnd, DateTime.DATE_MED)}
-          </p>
-        </div>
-
-        <div>
-          <p className="text-sm font-medium text-foreground">
-            <Trans>License Key</Trans>
-          </p>
-          <p className="mt-0.5 text-xs text-muted-foreground">{license.licenseKey}</p>
-        </div>
-
-        <div>
-          <p className="text-sm font-medium text-foreground">
-            <Trans>Features</Trans>
-          </p>
-          <p className="mt-0.5 text-xs text-muted-foreground">
-            {enabledFlags.length > 0 ? (
-              enabledFlags
-                .map(
-                  ([flag]) =>
-                    SUBSCRIPTION_CLAIM_FEATURE_FLAGS[
-                      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                      flag as keyof typeof SUBSCRIPTION_CLAIM_FEATURE_FLAGS
-                    ]?.label || flag,
-                )
-                .join(', ')
-            ) : (
-              <Trans>No features enabled</Trans>
-            )}
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-const AdminLicenseResyncButton = () => {
-  const { t } = useLingui();
-  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
-
-  const { mutate: resyncLicense, isPending: isResyncingLicense } =
-    trpc.admin.license.resync.useMutation({
-      onSuccess: async () => {
-        toast({
-          title: t`License synced`,
-        });
-
-        await revalidate();
-      },
-      onError: () => {
-        toast({
-          title: t`Failed to sync license`,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  return (
-    <TooltipProvider>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            variant="ghost"
-            size="sm"
-            className="h-8 w-8 p-0"
-            disabled={isResyncingLicense}
-            onClick={() => resyncLicense()}
-          >
-            {isResyncingLicense ? (
-              <Loader2Icon className="h-4 w-4 animate-spin" />
-            ) : (
-              <RefreshCwIcon className="h-4 w-4" />
-            )}
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>
-          <Trans>Sync license from server</Trans>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};

apps/remix/app/components/general/admin-license-status-banner.tsx

@@ -1,78 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { AlertTriangleIcon, KeyRoundIcon } from 'lucide-react';
-import { Link } from 'react-router';
-import { match } from 'ts-pattern';
-
-import type { TCachedLicense } from '@documenso/lib/types/license';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-
-export type AdminLicenseStatusBannerProps = {
-  license: TCachedLicense | null;
-};
-
-export const AdminLicenseStatusBanner = ({ license }: AdminLicenseStatusBannerProps) => {
-  const licenseStatus = license?.derivedStatus;
-
-  if (!license || licenseStatus === 'ACTIVE' || licenseStatus === 'NOT_FOUND') {
-    return null;
-  }
-
-  return (
-    <div
-      className={cn('mb-8 rounded-lg bg-yellow-200 text-yellow-900 dark:bg-yellow-400', {
-        'bg-destructive text-destructive-foreground':
-          licenseStatus === 'EXPIRED' || licenseStatus === 'UNAUTHORIZED',
-      })}
-    >
-      <div className="flex items-center justify-between gap-x-4 px-4 py-3 text-sm font-medium">
-        <div className="flex items-center">
-          <AlertTriangleIcon className="mr-2.5 h-5 w-5" />
-
-          {match(licenseStatus)
-            .with('PAST_DUE', () => (
-              <Trans>
-                License Payment Overdue - Please update your payment to avoid service disruptions.
-              </Trans>
-            ))
-            .with('EXPIRED', () => (
-              <Trans>
-                License Expired - Please renew your license to continue using enterprise features.
-              </Trans>
-            ))
-            .with('UNAUTHORIZED', () =>
-              license ? (
-                <Trans>
-                  Invalid License Type - Your Documenso instance is using features that are not part
-                  of your license.
-                </Trans>
-              ) : (
-                <Trans>
-                  Missing License - Your Documenso instance is using features that require a
-                  license.
-                </Trans>
-              ),
-            )
-            .otherwise(() => null)}
-        </div>
-
-        <Button
-          variant="outline"
-          size="sm"
-          className={cn({
-            'border-yellow-900/30 text-yellow-900 hover:bg-yellow-100 dark:hover:bg-yellow-500':
-              licenseStatus === 'PAST_DUE',
-            'border-destructive-foreground/30 text-destructive-foreground hover:bg-destructive/80':
-              licenseStatus === 'EXPIRED' || licenseStatus === 'UNAUTHORIZED',
-          })}
-          asChild
-        >
-          <Link to="https://docs.documenso.com/users/licenses/enterprise-edition" target="_blank">
-            <KeyRoundIcon className="mr-1.5 h-4 w-4" />
-            <Trans>See Documentation</Trans>
-          </Link>
-        </Button>
-      </div>
-    </div>
-  );
-};

apps/remix/app/components/general/app-nav-mobile.tsx

@@ -124,9 +124,7 @@ export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobileProps
           </div>
 
           <p className="text-muted-foreground text-sm">
-            © {new Date().getFullYear()} Documenso, Inc.
-            <br />
-            <Trans>All rights reserved.</Trans>
+            © {new Date().getFullYear()} Documenso, Inc. <br /> All rights reserved.
           </p>
         </div>
       </SheetContent>

apps/remix/app/components/general/billing-plans.tsx

@@ -118,9 +118,7 @@ export const BillingPlans = ({ plans }: BillingPlansProps) => {
 
                 {price.product.features && price.product.features.length > 0 && (
                   <div className="mt-4 text-muted-foreground">
-                    <div className="text-sm font-medium">
-                      <Trans>Includes:</Trans>
-                    </div>
+                    <div className="text-sm font-medium">Includes:</div>
 
                     <ul className="mt-1 divide-y text-sm">
                       {price.product.features.map((feature, index) => (

apps/remix/app/components/general/default-recipients-multiselect-combobox.tsx

@@ -1,13 +1,10 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Trans, useLingui as useLinguiMacro } from '@lingui/react/macro';
 import { RecipientRole } from '@prisma/client';
 
 import type { TDefaultRecipient } from '@documenso/lib/types/default-recipients';
-import { isRecipientEmailValidForSending } from '@documenso/lib/utils/recipients';
 import { trpc } from '@documenso/trpc/react';
 import { MultiSelect, type Option } from '@documenso/ui/primitives/multiselect';
-import { useToast } from '@documenso/ui/primitives/use-toast';
 
 type DefaultRecipientsMultiSelectComboboxProps = {
   listValues: TDefaultRecipient[];
@@ -23,8 +20,6 @@ export const DefaultRecipientsMultiSelectCombobox = ({
   organisationId,
 }: DefaultRecipientsMultiSelectComboboxProps) => {
   const { _ } = useLingui();
-  const { t } = useLinguiMacro();
-  const { toast } = useToast();
 
   const { data: organisationData, isLoading: isLoadingOrganisation } =
     trpc.organisation.member.find.useQuery(
@@ -65,56 +60,31 @@ export const DefaultRecipientsMultiSelectCombobox = ({
   }));
 
   const onSelectionChange = (selected: Option[]) => {
-    const invalidEmails = selected.filter(
-      (option) => !isRecipientEmailValidForSending({ email: option.value }),
-    );
+    const updatedRecipients = selected.map((option) => {
+      const existingRecipient = listValues.find((r) => r.email === option.value);
+      const member = members?.find((m) => m.email === option.value);
 
-    if (invalidEmails.length > 0) {
-      toast({
-        title: t`Invalid email`,
-        description: t`"${invalidEmails[0].value}" is not a valid email address.`,
-        variant: 'destructive',
-      });
-    }
-
-    const updatedRecipients = selected
-      .filter((option) => !invalidEmails.includes(option))
-      .map((option) => {
-        const existingRecipient = listValues.find((r) => r.email === option.value);
-        const member = members?.find((m) => m.email === option.value);
-
-        return {
-          email: option.value,
-          name: member?.name || option.value,
-          role: existingRecipient?.role ?? RecipientRole.CC,
-        };
-      });
+      return {
+        email: option.value,
+        name: member?.name || option.value,
+        role: existingRecipient?.role ?? RecipientRole.CC,
+      };
+    });
 
     onChange(updatedRecipients);
   };
 
   return (
     <MultiSelect
-      commandProps={{ label: _(msg`Select or add recipients`) }}
+      commandProps={{ label: _(msg`Select recipients`) }}
       options={options}
       value={value}
       onChange={onSelectionChange}
-      placeholder={_(msg`Select or enter email address`)}
+      placeholder={_(msg`Select recipients`)}
       hideClearAllButton
       hidePlaceholderWhenSelected
-      creatable
-      loadingIndicator={
-        isLoading ? (
-          <p className="text-center text-sm">
-            <Trans>Loading...</Trans>
-          </p>
-        ) : undefined
-      }
-      emptyIndicator={
-        <p className="text-center text-sm">
-          <Trans>Type an email address to add a recipient</Trans>
-        </p>
-      }
+      loadingIndicator={isLoading ? <p className="text-center text-sm">Loading...</p> : undefined}
+      emptyIndicator={<p className="text-center text-sm">No members found</p>}
     />
   );
 };

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

@@ -4,7 +4,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans } from '@lingui/react/macro';
 import { RecipientRole } from '@prisma/client';
 import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
 import { z } from 'zod';
 
 import { AppError } from '@documenso/lib/errors/app-error';
@@ -28,6 +27,7 @@ import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-p
 
 export type DocumentSigningAuth2FAProps = {
   actionTarget?: 'FIELD' | 'DOCUMENT';
+  actionVerb?: string;
   open: boolean;
   onOpenChange: (value: boolean) => void;
   onReauthFormSubmit: (values?: TRecipientActionAuth) => Promise<void> | void;
@@ -44,6 +44,7 @@ type T2FAAuthFormSchema = z.infer<typeof Z2FAAuthFormSchema>;
 
 export const DocumentSigningAuth2FA = ({
   actionTarget = 'FIELD',
+  actionVerb = 'sign',
   onReauthFormSubmit,
   open,
   onOpenChange,
@@ -100,39 +101,14 @@ export const DocumentSigningAuth2FA = ({
         <Alert variant="warning">
           <AlertDescription>
             <p>
-              {match({ role: recipient.role, actionTarget })
-                .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () => (
-                  <Trans>You need to setup 2FA to sign this field.</Trans>
-                ))
-                .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () => (
-                  <Trans>You need to setup 2FA to sign this document.</Trans>
-                ))
-                .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () => (
-                  <Trans>You need to setup 2FA to approve this field.</Trans>
-                ))
-                .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () => (
-                  <Trans>You need to setup 2FA to approve this document.</Trans>
-                ))
-                .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () => (
-                  <Trans>You need to setup 2FA to view this field.</Trans>
-                ))
-                .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () => (
-                  <Trans>You need to setup 2FA to mark this document as viewed.</Trans>
-                ))
-                .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () => (
-                  <Trans>You need to setup 2FA to view this field.</Trans>
-                ))
-                .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () => (
-                  <Trans>You need to setup 2FA to view this document.</Trans>
-                ))
-                .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () => (
-                  <Trans>You need to setup 2FA to assist with this field.</Trans>
-                ))
-                .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () => (
-                  <Trans>You need to setup 2FA to assist with this document.</Trans>
-                ))
-                .exhaustive()}
+              {recipient.role === RecipientRole.VIEWER && actionTarget === 'DOCUMENT' ? (
+                <Trans>You need to setup 2FA to mark this document as viewed.</Trans>
+              ) : (
+                // Todo: Translate
+                `You need to setup 2FA to ${actionVerb.toLowerCase()} this ${actionTarget.toLowerCase()}.`
+              )}
             </p>
+
             <p className="mt-2">
               <Trans>
                 By enabling 2FA, you will be required to enter a code from your authenticator app
@@ -162,9 +138,7 @@ export const DocumentSigningAuth2FA = ({
               name="token"
               render={({ field }) => (
                 <FormItem>
-                  <FormLabel required>
-                    <Trans>2FA token</Trans>
-                  </FormLabel>
+                  <FormLabel required>2FA token</FormLabel>
 
                   <FormControl>
                     <PinInput {...field} value={field.value ?? ''} maxLength={6}>

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

@@ -2,7 +2,6 @@ import { useState } from 'react';
 
 import { Trans, useLingui } from '@lingui/react/macro';
 import { RecipientRole } from '@prisma/client';
-import { match } from 'ts-pattern';
 
 import { authClient } from '@documenso/auth/client';
 import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
@@ -14,11 +13,13 @@ import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-p
 
 export type DocumentSigningAuthAccountProps = {
   actionTarget?: 'FIELD' | 'DOCUMENT';
+  actionVerb?: string;
   onOpenChange: (value: boolean) => void;
 };
 
 export const DocumentSigningAuthAccount = ({
   actionTarget = 'FIELD',
+  actionVerb = 'sign',
   onOpenChange,
 }: DocumentSigningAuthAccountProps) => {
   const { recipient, isDirectTemplate } = useRequiredDocumentSigningAuthContext();
@@ -54,110 +55,32 @@ export const DocumentSigningAuthAccount = ({
     <fieldset disabled={isSigningOut} className="space-y-4">
       <Alert variant="warning">
         <AlertDescription>
-          <span>
-            {match({ role: recipient.role, actionTarget })
-              .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To sign this field, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To sign this field, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To sign this document, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To sign this document, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To approve this field, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To approve this field, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To approve this document, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To approve this document, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To view this field, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To view this field, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To mark this document as viewed, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To mark this document as viewed, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To view this field, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To view this field, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To view this document, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To view this document, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To assist with this field, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To assist with this field, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () =>
-                isDirectTemplate ? (
-                  <Trans>To assist with this document, you need to be logged in.</Trans>
-                ) : (
-                  <Trans>
-                    To assist with this document, you need to be logged in as{' '}
-                    <strong>{recipient.email}</strong>
-                  </Trans>
-                ),
-              )
-              .exhaustive()}
-          </span>
+          {actionTarget === 'DOCUMENT' && recipient.role === RecipientRole.VIEWER ? (
+            <span>
+              {isDirectTemplate ? (
+                <Trans>To mark this document as viewed, you need to be logged in.</Trans>
+              ) : (
+                <Trans>
+                  To mark this document as viewed, you need to be logged in as{' '}
+                  <strong>{recipient.email}</strong>
+                </Trans>
+              )}
+            </span>
+          ) : (
+            <span>
+              {isDirectTemplate ? (
+                <Trans>
+                  To {actionVerb.toLowerCase()} this {actionTarget.toLowerCase()}, you need to be
+                  logged in.
+                </Trans>
+              ) : (
+                <Trans>
+                  To {actionVerb.toLowerCase()} this {actionTarget.toLowerCase()}, you need to be
+                  logged in as <strong>{recipient.email}</strong>
+                </Trans>
+              )}
+            </span>
+          )}
         </AlertDescription>
       </Alert>
 

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

@@ -8,7 +8,6 @@ import { RecipientRole } from '@prisma/client';
 import { browserSupportsWebAuthn, startAuthentication } from '@simplewebauthn/browser';
 import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
 import { z } from 'zod';
 
 import { AppError } from '@documenso/lib/errors/app-error';
@@ -39,6 +38,7 @@ import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-p
 
 export type DocumentSigningAuthPasskeyProps = {
   actionTarget?: 'FIELD' | 'DOCUMENT';
+  actionVerb?: string;
   open: boolean;
   onOpenChange: (value: boolean) => void;
   onReauthFormSubmit: (values?: TRecipientActionAuth) => Promise<void> | void;
@@ -52,6 +52,7 @@ type TPasskeyAuthFormSchema = z.infer<typeof ZPasskeyAuthFormSchema>;
 
 export const DocumentSigningAuthPasskey = ({
   actionTarget = 'FIELD',
+  actionVerb = 'sign',
   onReauthFormSubmit,
   open,
   onOpenChange,
@@ -127,62 +128,9 @@ export const DocumentSigningAuthPasskey = ({
       <div className="space-y-4">
         <Alert variant="warning">
           <AlertDescription>
-            {match({ role: recipient.role, actionTarget })
-              .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to sign this field.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to sign this document.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to approve this field.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to approve this
-                  document.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to view this field.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to mark this document as
-                  viewed.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to view this field.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to view this document.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to assist with this
-                  field.
-                </Trans>
-              ))
-              .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>
-                  Your browser does not support passkeys, which is required to assist with this
-                  document.
-                </Trans>
-              ))
-              .exhaustive()}
+            {/* Todo: Translate */}
+            Your browser does not support passkeys, which is required to {actionVerb.toLowerCase()}{' '}
+            this {actionTarget.toLowerCase()}.
           </AlertDescription>
         </Alert>
 
@@ -230,38 +178,10 @@ export const DocumentSigningAuthPasskey = ({
       <div className="space-y-4">
         <Alert variant="warning">
           <AlertDescription>
-            {match({ role: recipient.role, actionTarget })
-              .with({ role: RecipientRole.SIGNER, actionTarget: 'FIELD' }, () => (
-                <Trans>You need to setup a passkey to sign this field.</Trans>
-              ))
-              .with({ role: RecipientRole.SIGNER, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>You need to setup a passkey to sign this document.</Trans>
-              ))
-              .with({ role: RecipientRole.APPROVER, actionTarget: 'FIELD' }, () => (
-                <Trans>You need to setup a passkey to approve this field.</Trans>
-              ))
-              .with({ role: RecipientRole.APPROVER, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>You need to setup a passkey to approve this document.</Trans>
-              ))
-              .with({ role: RecipientRole.VIEWER, actionTarget: 'FIELD' }, () => (
-                <Trans>You need to setup a passkey to view this field.</Trans>
-              ))
-              .with({ role: RecipientRole.VIEWER, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>You need to setup a passkey to mark this document as viewed.</Trans>
-              ))
-              .with({ role: RecipientRole.CC, actionTarget: 'FIELD' }, () => (
-                <Trans>You need to setup a passkey to view this field.</Trans>
-              ))
-              .with({ role: RecipientRole.CC, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>You need to setup a passkey to view this document.</Trans>
-              ))
-              .with({ role: RecipientRole.ASSISTANT, actionTarget: 'FIELD' }, () => (
-                <Trans>You need to setup a passkey to assist with this field.</Trans>
-              ))
-              .with({ role: RecipientRole.ASSISTANT, actionTarget: 'DOCUMENT' }, () => (
-                <Trans>You need to setup a passkey to assist with this document.</Trans>
-              ))
-              .exhaustive()}
+            {/* Todo: Translate */}
+            {recipient.role === RecipientRole.VIEWER && actionTarget === 'DOCUMENT'
+              ? 'You need to setup a passkey to mark this document as viewed.'
+              : `You need to setup a passkey to ${actionVerb.toLowerCase()} this ${actionTarget.toLowerCase()}.`}
           </AlertDescription>
         </Alert>
 
@@ -293,9 +213,7 @@ export const DocumentSigningAuthPasskey = ({
               name="passkeyId"
               render={({ field }) => (
                 <FormItem>
-                  <FormLabel required>
-                    <Trans>Passkey</Trans>
-                  </FormLabel>
+                  <FormLabel required>Passkey</FormLabel>
 
                   <FormControl>
                     <Select {...field} onValueChange={field.onChange}>
@@ -323,24 +241,20 @@ export const DocumentSigningAuthPasskey = ({
 
             {formErrorCode && (
               <Alert variant="destructive">
-                <AlertTitle>
-                  <Trans>Unauthorized</Trans>
-                </AlertTitle>
+                <AlertTitle>Unauthorized</AlertTitle>
                 <AlertDescription>
-                  <Trans>
-                    We were unable to verify your details. Please try again or contact support
-                  </Trans>
+                  We were unable to verify your details. Please try again or contact support
                 </AlertDescription>
               </Alert>
             )}
 
             <DialogFooter>
               <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
-                <Trans>Cancel</Trans>
+                Cancel
               </Button>
 
               <Button type="submit" loading={isCurrentlyAuthenticating}>
-                <Trans>Sign</Trans>
+                Sign
               </Button>
             </DialogFooter>
           </div>

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

@@ -23,6 +23,8 @@ import { Input } from '@documenso/ui/primitives/input';
 import { useRequiredDocumentSigningAuthContext } from './document-signing-auth-provider';
 
 export type DocumentSigningAuthPasswordProps = {
+  actionTarget?: 'FIELD' | 'DOCUMENT';
+  actionVerb?: string;
   open: boolean;
   onOpenChange: (value: boolean) => void;
   onReauthFormSubmit: (values?: TRecipientActionAuth) => Promise<void> | void;
@@ -38,6 +40,8 @@ const ZPasswordAuthFormSchema = z.object({
 type TPasswordAuthFormSchema = z.infer<typeof ZPasswordAuthFormSchema>;
 
 export const DocumentSigningAuthPassword = ({
+  actionTarget = 'FIELD',
+  actionVerb = 'sign',
   onReauthFormSubmit,
   open,
   onOpenChange,

apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx

@@ -162,9 +162,7 @@ export const DocumentSigningAutoSign = ({ recipient, fields }: DocumentSigningAu
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>
-            <Trans>Automatically sign fields</Trans>
-          </DialogTitle>
+          <DialogTitle>Automatically sign fields</DialogTitle>
         </DialogHeader>
 
         <div className="text-muted-foreground max-w-[50ch]">

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

@@ -3,7 +3,7 @@ import { useId, useMemo, useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { type Field, type Recipient, RecipientRole } from '@prisma/client';
+import { type Field, FieldType, type Recipient, RecipientRole } from '@prisma/client';
 import { Controller, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 
@@ -11,7 +11,6 @@ import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-
 import type { TRecipientAccessAuth } from '@documenso/lib/types/document-auth';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { sortFieldsByPosition } from '@documenso/lib/utils/fields';
-import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
@@ -79,7 +78,7 @@ export const DocumentSigningForm = ({
     [fields],
   );
 
-  const hasSignatureField = fields.some((field) => isSignatureFieldType(field.type));
+  const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
 
   const uninsertedFields = useMemo(() => {
     return sortFieldsByPosition(fieldsRequiringValidation.filter((field) => !field.inserted));

apps/remix/app/components/general/document-signing/document-signing-mobile-widget.tsx

@@ -122,9 +122,7 @@ export const DocumentSigningMobileWidget = () => {
 
               {!hidePoweredBy && (
                 <div className="mt-2 inline-block rounded bg-primary px-2 py-1 text-xs font-medium text-primary-foreground opacity-60 hover:opacity-100 lg:hidden">
-                  <span>
-                    <Trans>Powered by</Trans>
-                  </span>
+                  <span>Powered by</span>
                   <BrandingLogo className="ml-2 inline-block h-[14px]" />
                 </div>
               )}

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

@@ -252,9 +252,7 @@ export const DocumentSigningPageViewV2 = () => {
                   target="_blank"
                   className="fixed bottom-0 right-0 z-40 hidden cursor-pointer rounded-tl bg-primary px-2 py-1 text-xs font-medium text-primary-foreground opacity-60 hover:opacity-100 lg:block"
                 >
-                  <span>
-                    <Trans>Powered by</Trans>
-                  </span>
+                  <span>Powered by</span>
                   <BrandingLogo className="ml-2 inline-block h-[14px]" />
                 </a>
               )}

apps/remix/app/components/general/document/document-audit-log-download-button.tsx

@@ -3,8 +3,6 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { DownloadIcon } from 'lucide-react';
 
-import { downloadFile } from '@documenso/lib/client-only/download-file';
-import { base64 } from '@documenso/lib/universal/base64';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -27,15 +25,36 @@ export const DocumentAuditLogDownloadButton = ({
 
   const onDownloadAuditLogsClick = async () => {
     try {
-      const { data, envelopeTitle } = await downloadAuditLogs({ documentId });
+      const { url } = await downloadAuditLogs({ documentId });
 
-      const buffer = new Uint8Array(base64.decode(data));
-      const blob = new Blob([buffer], { type: 'application/pdf' });
-
-      downloadFile({
-        data: blob,
-        filename: `${envelopeTitle} - Audit Logs.pdf`,
+      const iframe = Object.assign(document.createElement('iframe'), {
+        src: url,
       });
+
+      Object.assign(iframe.style, {
+        position: 'fixed',
+        top: '0',
+        left: '0',
+        width: '0',
+        height: '0',
+      });
+
+      const onLoaded = () => {
+        if (iframe.contentDocument?.readyState === 'complete') {
+          iframe.contentWindow?.print();
+
+          iframe.contentWindow?.addEventListener('afterprint', () => {
+            document.body.removeChild(iframe);
+          });
+        }
+      };
+
+      // When the iframe has loaded, print the iframe and remove it from the dom
+      iframe.addEventListener('load', onLoaded);
+
+      document.body.appendChild(iframe);
+
+      onLoaded();
     } catch (error) {
       console.error(error);
 

apps/remix/app/components/general/document/document-certificate-download-button.tsx

@@ -4,8 +4,6 @@ import { Trans } from '@lingui/react/macro';
 import type { DocumentStatus } from '@prisma/client';
 import { DownloadIcon } from 'lucide-react';
 
-import { downloadFile } from '@documenso/lib/client-only/download-file';
-import { base64 } from '@documenso/lib/universal/base64';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -31,15 +29,36 @@ export const DocumentCertificateDownloadButton = ({
 
   const onDownloadCertificatesClick = async () => {
     try {
-      const { data, envelopeTitle } = await downloadCertificate({ documentId });
+      const { url } = await downloadCertificate({ documentId });
 
-      const buffer = new Uint8Array(base64.decode(data));
-      const blob = new Blob([buffer], { type: 'application/pdf' });
-
-      downloadFile({
-        data: blob,
-        filename: `${envelopeTitle} - Certificate.pdf`,
+      const iframe = Object.assign(document.createElement('iframe'), {
+        src: url,
       });
+
+      Object.assign(iframe.style, {
+        position: 'fixed',
+        top: '0',
+        left: '0',
+        width: '0',
+        height: '0',
+      });
+
+      const onLoaded = () => {
+        if (iframe.contentDocument?.readyState === 'complete') {
+          iframe.contentWindow?.print();
+
+          iframe.contentWindow?.addEventListener('afterprint', () => {
+            document.body.removeChild(iframe);
+          });
+        }
+      };
+
+      // When the iframe has loaded, print the iframe and remove it from the dom
+      iframe.addEventListener('load', onLoaded);
+
+      document.body.appendChild(iframe);
+
+      onLoaded();
     } catch (error) {
       console.error(error);
 

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

@@ -434,31 +434,15 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       renderFieldOnLayer(field);
     });
 
-    // Reconcile selection state with live field nodes after flush/sync updates.
-    const liveSelectedFieldGroups = selectedKonvaFieldGroups.filter((fieldGroup) => {
-      if (!fieldGroup.getStage() || !fieldGroup.getParent()) {
-        return false;
-      }
-
-      return localPageFields.some((field) => field.formId === fieldGroup.id());
-    });
-
-    if (liveSelectedFieldGroups.length !== selectedKonvaFieldGroups.length) {
-      setSelectedFields(liveSelectedFieldGroups);
-    }
-
     // Rerender the transformer
     interactiveTransformer.current?.forceUpdate();
 
     pageLayer.current.batchDraw();
-  }, [localPageFields, selectedKonvaFieldGroups]);
+  }, [localPageFields]);
 
   const setSelectedFields = (nodes: Konva.Node[]) => {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const fieldGroups = nodes.filter(
-      (node) =>
-        node.hasName('field-group') && Boolean(node.getStage()) && Boolean(node.getParent()),
-    ) as Konva.Group[];
+    const fieldGroups = nodes.filter((node) => node.hasName('field-group')) as Konva.Group[];
 
     interactiveTransformer.current?.nodes(fieldGroups);
     setSelectedKonvaFieldGroups(fieldGroups);
@@ -690,10 +674,6 @@ const FieldActionButtons = ({
       selectedFieldFormId.includes(field.formId),
     );
 
-    if (fields.length === 0) {
-      return null;
-    }
-
     const recipient = envelope.recipients.find(
       (recipient) => recipient.id === fields[0].recipientId,
     );
@@ -709,7 +689,7 @@ const FieldActionButtons = ({
     }
 
     return null;
-  }, [editorFields.localFields, envelope.recipients, selectedFieldFormId]);
+  }, [editorFields.localFields]);
 
   return (
     <div className="flex flex-col items-center" {...props}>

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

@@ -296,31 +296,19 @@ export const EnvelopeEditorFieldsPage = () => {
 
                       <div className="space-y-2 rounded-md border border-border bg-muted/50 p-3 text-sm text-foreground">
                         <p>
-                          <span className="min-w-12 text-muted-foreground">
-                            <Trans>Pos X:</Trans>
-                          </span>
-                          &nbsp;
+                          <span className="min-w-12 text-muted-foreground">Pos X:&nbsp;</span>
                           {selectedField.positionX.toFixed(2)}
                         </p>
                         <p>
-                          <span className="min-w-12 text-muted-foreground">
-                            <Trans>Pos Y:</Trans>
-                          </span>
-                          &nbsp;
+                          <span className="min-w-12 text-muted-foreground">Pos Y:&nbsp;</span>
                           {selectedField.positionY.toFixed(2)}
                         </p>
                         <p>
-                          <span className="min-w-12 text-muted-foreground">
-                            <Trans>Width:</Trans>
-                          </span>
-                          &nbsp;
+                          <span className="min-w-12 text-muted-foreground">Width:&nbsp;</span>
                           {selectedField.width.toFixed(2)}
                         </p>
                         <p>
-                          <span className="min-w-12 text-muted-foreground">
-                            <Trans>Height:</Trans>
-                          </span>
-                          &nbsp;
+                          <span className="min-w-12 text-muted-foreground">Height:&nbsp;</span>
                           {selectedField.height.toFixed(2)}
                         </p>
                       </div>

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

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
 
 import {
   DragDropContext,
@@ -7,23 +7,28 @@ import {
   Droppable,
   type SensorAPI,
 } from '@hello-pangea/dnd';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { plural } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { DocumentSigningOrder, EnvelopeType, RecipientRole, SendStatus } from '@prisma/client';
 import { motion } from 'framer-motion';
 import { GripVerticalIcon, HelpCircleIcon, PlusIcon, SparklesIcon, TrashIcon } from 'lucide-react';
-import { useFieldArray, useWatch } from 'react-hook-form';
+import { useFieldArray, useForm, useWatch } from 'react-hook-form';
 import { useRevalidator, useSearchParams } from 'react-router';
-import { isDeepEqual } from 'remeda';
+import { isDeepEqual, prop, sortBy } from 'remeda';
+import { z } from 'zod';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
-import { ZEditorRecipientsFormSchema } from '@documenso/lib/client-only/hooks/use-editor-recipients';
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import type { TDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
-import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
+import {
+  ZRecipientActionAuthTypesSchema,
+  ZRecipientAuthOptionsSchema,
+} from '@documenso/lib/types/document-auth';
+import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { nanoid } from '@documenso/lib/universal/id';
 import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
 import { trpc } from '@documenso/trpc/react';
@@ -62,9 +67,26 @@ import { AiFeaturesEnableDialog } from '~/components/dialogs/ai-features-enable-
 import { AiRecipientDetectionDialog } from '~/components/dialogs/ai-recipient-detection-dialog';
 import { useCurrentTeam } from '~/providers/team';
 
+const ZEnvelopeRecipientsForm = z.object({
+  signers: z.array(
+    z.object({
+      formId: z.string().min(1),
+      id: z.number().optional(),
+      email: ZRecipientEmailSchema,
+      name: z.string(),
+      role: z.nativeEnum(RecipientRole),
+      signingOrder: z.number().optional(),
+      actionAuth: z.array(ZRecipientActionAuthTypesSchema).optional().default([]),
+    }),
+  ),
+  signingOrder: z.nativeEnum(DocumentSigningOrder),
+  allowDictateNextSigner: z.boolean().default(false),
+});
+
+type TEnvelopeRecipientsForm = z.infer<typeof ZEnvelopeRecipientsForm>;
+
 export const EnvelopeEditorRecipientForm = () => {
-  const { envelope, setRecipientsDebounced, updateEnvelope, editorRecipients } =
-    useCurrentEnvelopeEditor();
+  const { envelope, setRecipientsDebounced, updateEnvelope } = useCurrentEnvelopeEditor();
 
   const organisation = useCurrentOrganisation();
   const team = useCurrentTeam();
@@ -123,6 +145,7 @@ export const EnvelopeEditorRecipientForm = () => {
 
   const debouncedRecipientSearchQuery = useDebouncedValue(recipientSearchQuery, 500);
 
+  const initialId = useId();
   const $sensorApi = useRef<SensorAPI | null>(null);
   const isFirstRender = useRef(true);
   const { recipients, fields } = envelope;
@@ -138,7 +161,42 @@ export const EnvelopeEditorRecipientForm = () => {
 
   const recipientSuggestions = recipientSuggestionsData?.results || [];
 
-  const { form } = editorRecipients;
+  const defaultRecipients = [
+    {
+      formId: initialId,
+      name: '',
+      email: '',
+      role: RecipientRole.SIGNER,
+      signingOrder: 1,
+      actionAuth: [],
+    },
+  ];
+
+  const form = useForm<TEnvelopeRecipientsForm>({
+    resolver: zodResolver(ZEnvelopeRecipientsForm),
+    mode: 'onChange', // Used for autosave purposes, maybe can try onBlur instead?
+    defaultValues: {
+      signers:
+        recipients.length > 0
+          ? sortBy(
+              recipients.map((recipient, index) => ({
+                id: recipient.id,
+                formId: String(recipient.id),
+                name: recipient.name,
+                email: recipient.email,
+                role: recipient.role,
+                signingOrder: recipient.signingOrder ?? index + 1,
+                actionAuth:
+                  ZRecipientAuthOptionsSchema.parse(recipient.authOptions)?.actionAuth ?? undefined,
+              })),
+              [prop('signingOrder'), 'asc'],
+              [prop('id'), 'asc'],
+            )
+          : defaultRecipients,
+      signingOrder: envelope.documentMeta.signingOrder,
+      allowDictateNextSigner: envelope.documentMeta.allowDictateNextSigner,
+    },
+  });
 
   const recipientHasAuthSettings = useMemo(() => {
     const recipientHasAuthOptions = recipients.find((recipient) => {
@@ -530,7 +588,7 @@ export const EnvelopeEditorRecipientForm = () => {
       return;
     }
 
-    const validatedFormValues = ZEditorRecipientsFormSchema.safeParse(formValues);
+    const validatedFormValues = ZEnvelopeRecipientsForm.safeParse(formValues);
 
     if (!validatedFormValues.success) {
       return;
@@ -594,12 +652,8 @@ export const EnvelopeEditorRecipientForm = () => {
     <Card backdropBlur={false} className="border">
       <CardHeader className="flex flex-row justify-between">
         <div>
-          <CardTitle>
-            <Trans>Recipients</Trans>
-          </CardTitle>
-          <CardDescription className="mt-1.5">
-            <Trans>Add recipients to your document</Trans>
-          </CardDescription>
+          <CardTitle>Recipients</CardTitle>
+          <CardDescription className="mt-1.5">Add recipients to your document</CardDescription>
         </div>
 
         <div className="flex flex-row items-center space-x-2">
@@ -794,205 +848,246 @@ export const EnvelopeEditorRecipientForm = () => {
                     ref={provided.innerRef}
                     className="flex w-full flex-col gap-y-2"
                   >
-                    {signers.map((signer, index) => {
-                      const isDirectRecipient =
-                        envelope.type === EnvelopeType.TEMPLATE &&
-                        envelope.directLink !== null &&
-                        signer.id === envelope.directLink.directTemplateRecipientId;
-
-                      return (
-                        <Draggable
-                          key={`${signer.nativeId}-${signer.signingOrder}`}
-                          draggableId={signer['nativeId']}
-                          index={index}
-                          isDragDisabled={
-                            !isSigningOrderSequential ||
-                            isSubmitting ||
-                            !canRecipientBeModified(signer.id) ||
-                            !signer.signingOrder
-                          }
-                        >
-                          {(provided, snapshot) => (
-                            <div
-                              ref={provided.innerRef}
-                              {...provided.draggableProps}
-                              {...provided.dragHandleProps}
-                              className={cn('py-1', {
-                                'pointer-events-none rounded-md bg-widget-foreground pt-2':
-                                  snapshot.isDragging,
+                    {signers.map((signer, index) => (
+                      <Draggable
+                        key={`${signer.nativeId}-${signer.signingOrder}`}
+                        draggableId={signer['nativeId']}
+                        index={index}
+                        isDragDisabled={
+                          !isSigningOrderSequential ||
+                          isSubmitting ||
+                          !canRecipientBeModified(signer.id) ||
+                          !signer.signingOrder
+                        }
+                      >
+                        {(provided, snapshot) => (
+                          <div
+                            ref={provided.innerRef}
+                            {...provided.draggableProps}
+                            {...provided.dragHandleProps}
+                            className={cn('py-1', {
+                              'pointer-events-none rounded-md bg-widget-foreground pt-2':
+                                snapshot.isDragging,
+                            })}
+                          >
+                            <motion.fieldset
+                              data-native-id={signer.id}
+                              disabled={isSubmitting || !canRecipientBeModified(signer.id)}
+                              className={cn('pb-2', {
+                                'border-b pb-4':
+                                  showAdvancedSettings && index !== signers.length - 1,
+                                'pt-2': showAdvancedSettings && index === 0,
+                                'pr-3': isSigningOrderSequential,
                               })}
                             >
-                              <motion.fieldset
-                                data-native-id={signer.id}
-                                disabled={isSubmitting || !canRecipientBeModified(signer.id)}
-                                className={cn('pb-2', {
-                                  'border-b pb-4':
-                                    showAdvancedSettings && index !== signers.length - 1,
-                                  'pt-2': showAdvancedSettings && index === 0,
-                                  'pr-3': isSigningOrderSequential,
-                                })}
-                              >
-                                <div className="flex flex-row items-center gap-x-2">
-                                  {isSigningOrderSequential && (
-                                    <FormField
-                                      control={form.control}
-                                      name={`signers.${index}.signingOrder`}
-                                      render={({ field }) => (
-                                        <FormItem
-                                          className={cn(
-                                            'mt-auto flex items-center gap-x-1 space-y-0',
-                                            {
-                                              'mb-6':
-                                                form.formState.errors.signers?.[index] &&
-                                                !form.formState.errors.signers[index]?.signingOrder,
-                                            },
-                                          )}
-                                        >
-                                          <GripVerticalIcon className="h-5 w-5 flex-shrink-0 opacity-40" />
-                                          <FormControl>
-                                            <Input
-                                              type="number"
-                                              max={signers.length}
-                                              data-testid="signing-order-input"
-                                              className={cn(
-                                                'w-10 text-center',
-                                                '[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none',
-                                              )}
-                                              {...field}
-                                              onChange={(e) => {
-                                                field.onChange(e);
-                                                handleSigningOrderChange(index, e.target.value);
-                                              }}
-                                              onBlur={(e) => {
-                                                field.onBlur();
-                                                handleSigningOrderChange(index, e.target.value);
-                                              }}
-                                              disabled={
-                                                snapshot.isDragging ||
-                                                isSubmitting ||
-                                                !canRecipientBeModified(signer.id)
-                                              }
-                                            />
-                                          </FormControl>
-                                          <FormMessage />
-                                        </FormItem>
+                              <div className="flex flex-row items-center gap-x-2">
+                                {isSigningOrderSequential && (
+                                  <FormField
+                                    control={form.control}
+                                    name={`signers.${index}.signingOrder`}
+                                    render={({ field }) => (
+                                      <FormItem
+                                        className={cn(
+                                          'mt-auto flex items-center gap-x-1 space-y-0',
+                                          {
+                                            'mb-6':
+                                              form.formState.errors.signers?.[index] &&
+                                              !form.formState.errors.signers[index]?.signingOrder,
+                                          },
+                                        )}
+                                      >
+                                        <GripVerticalIcon className="h-5 w-5 flex-shrink-0 opacity-40" />
+                                        <FormControl>
+                                          <Input
+                                            type="number"
+                                            max={signers.length}
+                                            data-testid="signing-order-input"
+                                            className={cn(
+                                              'w-10 text-center',
+                                              '[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none',
+                                            )}
+                                            {...field}
+                                            onChange={(e) => {
+                                              field.onChange(e);
+                                              handleSigningOrderChange(index, e.target.value);
+                                            }}
+                                            onBlur={(e) => {
+                                              field.onBlur();
+                                              handleSigningOrderChange(index, e.target.value);
+                                            }}
+                                            disabled={
+                                              snapshot.isDragging ||
+                                              isSubmitting ||
+                                              !canRecipientBeModified(signer.id)
+                                            }
+                                          />
+                                        </FormControl>
+                                        <FormMessage />
+                                      </FormItem>
+                                    )}
+                                  />
+                                )}
+
+                                <FormField
+                                  control={form.control}
+                                  name={`signers.${index}.email`}
+                                  render={({ field }) => (
+                                    <FormItem
+                                      className={cn('relative w-full', {
+                                        'mb-6':
+                                          form.formState.errors.signers?.[index] &&
+                                          !form.formState.errors.signers[index]?.email,
+                                      })}
+                                    >
+                                      {!showAdvancedSettings && index === 0 && (
+                                        <FormLabel>
+                                          <Trans>Email</Trans>
+                                        </FormLabel>
                                       )}
-                                    />
+
+                                      <FormControl>
+                                        <RecipientAutoCompleteInput
+                                          type="email"
+                                          placeholder={t`Email`}
+                                          value={field.value}
+                                          disabled={
+                                            snapshot.isDragging ||
+                                            isSubmitting ||
+                                            !canRecipientBeModified(signer.id)
+                                          }
+                                          options={recipientSuggestions}
+                                          onSelect={(suggestion) =>
+                                            handleRecipientAutoCompleteSelect(index, suggestion)
+                                          }
+                                          onSearchQueryChange={(query) => {
+                                            field.onChange(query);
+                                            setRecipientSearchQuery(query);
+                                          }}
+                                          loading={isLoading}
+                                          data-testid="signer-email-input"
+                                          maxLength={254}
+                                        />
+                                      </FormControl>
+
+                                      <FormMessage />
+                                    </FormItem>
                                   )}
+                                />
 
+                                <FormField
+                                  control={form.control}
+                                  name={`signers.${index}.name`}
+                                  render={({ field }) => (
+                                    <FormItem
+                                      className={cn('w-full', {
+                                        'mb-6':
+                                          form.formState.errors.signers?.[index] &&
+                                          !form.formState.errors.signers[index]?.name,
+                                      })}
+                                    >
+                                      {!showAdvancedSettings && index === 0 && (
+                                        <FormLabel>
+                                          <Trans>Name</Trans>
+                                        </FormLabel>
+                                      )}
+
+                                      <FormControl>
+                                        <RecipientAutoCompleteInput
+                                          type="text"
+                                          placeholder={t`Recipient ${index + 1}`}
+                                          {...field}
+                                          disabled={
+                                            snapshot.isDragging ||
+                                            isSubmitting ||
+                                            !canRecipientBeModified(signer.id)
+                                          }
+                                          options={recipientSuggestions}
+                                          onSelect={(suggestion) =>
+                                            handleRecipientAutoCompleteSelect(index, suggestion)
+                                          }
+                                          onSearchQueryChange={(query) => {
+                                            field.onChange(query);
+                                            setRecipientSearchQuery(query);
+                                          }}
+                                          loading={isLoading}
+                                          maxLength={255}
+                                        />
+                                      </FormControl>
+
+                                      <FormMessage />
+                                    </FormItem>
+                                  )}
+                                />
+
+                                <FormField
+                                  control={form.control}
+                                  name={`signers.${index}.role`}
+                                  render={({ field }) => (
+                                    <FormItem
+                                      className={cn('mt-auto w-fit', {
+                                        'mb-6':
+                                          form.formState.errors.signers?.[index] &&
+                                          !form.formState.errors.signers[index]?.role,
+                                      })}
+                                    >
+                                      <FormControl>
+                                        <RecipientRoleSelect
+                                          {...field}
+                                          isAssistantEnabled={isSigningOrderSequential}
+                                          onValueChange={(value) => {
+                                            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+                                            handleRoleChange(index, value as RecipientRole);
+                                            field.onChange(value);
+                                          }}
+                                          disabled={
+                                            snapshot.isDragging ||
+                                            isSubmitting ||
+                                            !canRecipientBeModified(signer.id)
+                                          }
+                                        />
+                                      </FormControl>
+
+                                      <FormMessage />
+                                    </FormItem>
+                                  )}
+                                />
+
+                                <Button
+                                  variant="ghost"
+                                  className={cn('mt-auto px-2', {
+                                    'mb-6': form.formState.errors.signers?.[index],
+                                  })}
+                                  data-testid="remove-signer-button"
+                                  disabled={
+                                    snapshot.isDragging ||
+                                    isSubmitting ||
+                                    !canRecipientBeModified(signer.id) ||
+                                    signers.length === 1
+                                  }
+                                  onClick={() => onRemoveSigner(index)}
+                                >
+                                  <TrashIcon className="h-4 w-4" />
+                                </Button>
+                              </div>
+
+                              {showAdvancedSettings &&
+                                organisation.organisationClaim.flags.cfr21 && (
                                   <FormField
                                     control={form.control}
-                                    name={`signers.${index}.email`}
+                                    name={`signers.${index}.actionAuth`}
                                     render={({ field }) => (
                                       <FormItem
-                                        className={cn('relative w-full', {
+                                        className={cn('mt-2 w-full', {
                                           'mb-6':
                                             form.formState.errors.signers?.[index] &&
-                                            !form.formState.errors.signers[index]?.email,
+                                            !form.formState.errors.signers[index]?.actionAuth,
+                                          'pl-6': isSigningOrderSequential,
                                         })}
                                       >
-                                        {!showAdvancedSettings && index === 0 && (
-                                          <FormLabel>
-                                            <Trans>Email</Trans>
-                                          </FormLabel>
-                                        )}
-
                                         <FormControl>
-                                          <RecipientAutoCompleteInput
-                                            type="email"
-                                            placeholder={t`Email`}
-                                            value={field.value}
-                                            disabled={
-                                              snapshot.isDragging ||
-                                              isSubmitting ||
-                                              !canRecipientBeModified(signer.id) ||
-                                              isDirectRecipient
-                                            }
-                                            options={recipientSuggestions}
-                                            onSelect={(suggestion) =>
-                                              handleRecipientAutoCompleteSelect(index, suggestion)
-                                            }
-                                            onSearchQueryChange={(query) => {
-                                              field.onChange(query);
-                                              setRecipientSearchQuery(query);
-                                            }}
-                                            loading={isLoading}
-                                            data-testid="signer-email-input"
-                                            maxLength={254}
-                                          />
-                                        </FormControl>
-
-                                        <FormMessage />
-                                      </FormItem>
-                                    )}
-                                  />
-
-                                  <FormField
-                                    control={form.control}
-                                    name={`signers.${index}.name`}
-                                    render={({ field }) => (
-                                      <FormItem
-                                        className={cn('w-full', {
-                                          'mb-6':
-                                            form.formState.errors.signers?.[index] &&
-                                            !form.formState.errors.signers[index]?.name,
-                                        })}
-                                      >
-                                        {!showAdvancedSettings && index === 0 && (
-                                          <FormLabel>
-                                            <Trans>Name</Trans>
-                                          </FormLabel>
-                                        )}
-
-                                        <FormControl>
-                                          <RecipientAutoCompleteInput
-                                            type="text"
-                                            placeholder={t`Recipient ${index + 1}`}
+                                          <RecipientActionAuthSelect
                                             {...field}
-                                            disabled={
-                                              snapshot.isDragging ||
-                                              isSubmitting ||
-                                              !canRecipientBeModified(signer.id) ||
-                                              isDirectRecipient
-                                            }
-                                            options={recipientSuggestions}
-                                            onSelect={(suggestion) =>
-                                              handleRecipientAutoCompleteSelect(index, suggestion)
-                                            }
-                                            onSearchQueryChange={(query) => {
-                                              field.onChange(query);
-                                              setRecipientSearchQuery(query);
-                                            }}
-                                            loading={isLoading}
-                                            maxLength={255}
-                                          />
-                                        </FormControl>
-
-                                        <FormMessage />
-                                      </FormItem>
-                                    )}
-                                  />
-
-                                  <FormField
-                                    control={form.control}
-                                    name={`signers.${index}.role`}
-                                    render={({ field }) => (
-                                      <FormItem
-                                        className={cn('mt-auto w-fit', {
-                                          'mb-6':
-                                            form.formState.errors.signers?.[index] &&
-                                            !form.formState.errors.signers[index]?.role,
-                                        })}
-                                      >
-                                        <FormControl>
-                                          <RecipientRoleSelect
-                                            {...field}
-                                            isAssistantEnabled={isSigningOrderSequential}
-                                            onValueChange={(value) => {
-                                              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                                              handleRoleChange(index, value as RecipientRole);
-                                              field.onChange(value);
-                                            }}
+                                            onValueChange={field.onChange}
                                             disabled={
                                               snapshot.isDragging ||
                                               isSubmitting ||
@@ -1005,63 +1100,12 @@ export const EnvelopeEditorRecipientForm = () => {
                                       </FormItem>
                                     )}
                                   />
-
-                                  <Button
-                                    variant="ghost"
-                                    className={cn('mt-auto px-2', {
-                                      'mb-6': form.formState.errors.signers?.[index],
-                                    })}
-                                    data-testid="remove-signer-button"
-                                    disabled={
-                                      snapshot.isDragging ||
-                                      isSubmitting ||
-                                      !canRecipientBeModified(signer.id) ||
-                                      signers.length === 1 ||
-                                      isDirectRecipient
-                                    }
-                                    onClick={() => onRemoveSigner(index)}
-                                  >
-                                    <TrashIcon className="h-4 w-4" />
-                                  </Button>
-                                </div>
-
-                                {showAdvancedSettings &&
-                                  organisation.organisationClaim.flags.cfr21 && (
-                                    <FormField
-                                      control={form.control}
-                                      name={`signers.${index}.actionAuth`}
-                                      render={({ field }) => (
-                                        <FormItem
-                                          className={cn('mt-2 w-full', {
-                                            'mb-6':
-                                              form.formState.errors.signers?.[index] &&
-                                              !form.formState.errors.signers[index]?.actionAuth,
-                                            'pl-6': isSigningOrderSequential,
-                                          })}
-                                        >
-                                          <FormControl>
-                                            <RecipientActionAuthSelect
-                                              {...field}
-                                              onValueChange={field.onChange}
-                                              disabled={
-                                                snapshot.isDragging ||
-                                                isSubmitting ||
-                                                !canRecipientBeModified(signer.id)
-                                              }
-                                            />
-                                          </FormControl>
-
-                                          <FormMessage />
-                                        </FormItem>
-                                      )}
-                                    />
-                                  )}
-                              </motion.fieldset>
-                            </div>
-                          )}
-                        </Draggable>
-                      );
-                    })}
+                                )}
+                            </motion.fieldset>
+                          </div>
+                        )}
+                      </Draggable>
+                    ))}
 
                     {provided.placeholder}
                   </div>

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

@@ -81,7 +81,7 @@ export default function EnvelopeEditor() {
     isAutosaving,
     flushAutosave,
     relativePath,
-    syncEnvelope,
+    editorFields,
   } = useCurrentEnvelopeEditor();
 
   const [searchParams, setSearchParams] = useSearchParams();
@@ -278,8 +278,6 @@ export default function EnvelopeEditor() {
                 templateId={mapSecondaryIdToTemplateId(envelope.secondaryId)}
                 directLink={envelope.directLink}
                 recipients={envelope.recipients}
-                onCreateSuccess={async () => await syncEnvelope()}
-                onDeleteSuccess={async () => await syncEnvelope()}
                 trigger={
                   <Button variant="ghost" size="sm" className="w-full justify-start">
                     <LinkIcon className="mr-2 h-4 w-4" />

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

@@ -1,9 +1,8 @@
 import { useMemo } from 'react';
 
 import { Plural, Trans } from '@lingui/react/macro';
-import { RecipientRole } from '@prisma/client';
+import { FieldType, RecipientRole } from '@prisma/client';
 
-import { isSignatureFieldType } from '@documenso/prisma/guards/is-signature-field';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
@@ -31,7 +30,7 @@ export default function EnvelopeSignerForm() {
   const { isNameLocked, isEmailLocked } = useEmbedSigningContext() || {};
 
   const hasSignatureField = useMemo(() => {
-    return recipientFields.some((field) => isSignatureFieldType(field.type));
+    return recipientFields.some((field) => field.type === FieldType.SIGNATURE);
   }, [recipientFields]);
 
   const isSubmitting = false;

apps/remix/app/components/general/metric-card.tsx

@@ -5,16 +5,15 @@ import { cn } from '@documenso/ui/lib/utils';
 export type CardMetricProps = {
   icon?: LucideIcon;
   title: string;
-  value?: string | number;
+  value: string | number;
   className?: string;
-  children?: React.ReactNode;
 };
 
-export const CardMetric = ({ icon: Icon, title, value, className, children }: CardMetricProps) => {
+export const CardMetric = ({ icon: Icon, title, value, className }: CardMetricProps) => {
   return (
     <div
       className={cn(
-        'h-32 max-h-32 max-w-full overflow-hidden rounded-lg border border-border bg-background shadow shadow-transparent duration-200 hover:shadow-border/80',
+        'border-border bg-background hover:shadow-border/80 h-32 max-h-32 max-w-full overflow-hidden rounded-lg border shadow shadow-transparent duration-200',
         className,
       )}
     >
@@ -22,7 +21,7 @@ export const CardMetric = ({ icon: Icon, title, value, className, children }: Ca
         <div className="flex items-start">
           {Icon && (
             <div className="mr-2 h-4 w-4">
-              <Icon className="h-4 w-4 text-muted-foreground" />
+              <Icon className="text-muted-foreground h-4 w-4" />
             </div>
           )}
 
@@ -31,11 +30,9 @@ export const CardMetric = ({ icon: Icon, title, value, className, children }: Ca
           </h3>
         </div>
 
-        {children || (
-          <p className="mt-auto text-4xl font-semibold leading-8 text-foreground">
-            {typeof value === 'number' ? value.toLocaleString('en-US') : value}
-          </p>
-        )}
+        <p className="text-foreground mt-auto text-4xl font-semibold leading-8">
+          {typeof value === 'number' ? value.toLocaleString('en-US') : value}
+        </p>
       </div>
     </div>
   );

apps/remix/app/components/general/user-profile-skeleton.tsx

@@ -51,7 +51,7 @@ export const UserProfileSkeleton = ({ className, user, rows = 2 }: UserProfileSk
       <div className="mt-8 w-full">
         <div className="dark:divide-foreground/30 dark:border-foreground/30 divide-y-2 divide-neutral-200 overflow-hidden rounded-lg border-2 border-neutral-200">
           <div className="text-muted-foreground dark:bg-foreground/20 bg-neutral-50 p-4 font-medium">
-            <Trans>Documents</Trans>
+            Documents
           </div>
 
           {Array(rows)

apps/remix/app/components/general/webhook-multiselect-combobox.tsx

@@ -1,6 +1,5 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
 import { WebhookTriggerEvents } from '@prisma/client';
 
 import { toFriendlyWebhookEventName } from '@documenso/lib/universal/webhook/to-friendly-webhook-event-name';
@@ -42,11 +41,7 @@ export const WebhookMultiSelectCombobox = ({
       placeholder={_(msg`Select triggers`)}
       hideClearAllButton
       hidePlaceholderWhenSelected
-      emptyIndicator={
-        <p className="text-center text-sm">
-          <Trans>No triggers available</Trans>
-        </p>
-      }
+      emptyIndicator={<p className="text-center text-sm">No triggers available</p>}
     />
   );
 };

apps/remix/app/components/tables/admin-claims-table.tsx

@@ -6,7 +6,6 @@ import { EditIcon, MoreHorizontalIcon, Trash2Icon } from 'lucide-react';
 import { Link, useSearchParams } from 'react-router';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import type { TLicenseClaim } from '@documenso/lib/types/license';
 import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
 import { trpc } from '@documenso/trpc/react';
@@ -28,11 +27,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 import { ClaimDeleteDialog } from '../dialogs/claim-delete-dialog';
 import { ClaimUpdateDialog } from '../dialogs/claim-update-dialog';
 
-type AdminClaimsTableProps = {
-  licenseFlags?: TLicenseClaim;
-};
-
-export const AdminClaimsTable = ({ licenseFlags }: AdminClaimsTableProps) => {
+export const AdminClaimsTable = () => {
   const { t } = useLingui();
   const { toast } = useToast();
 
@@ -102,11 +97,11 @@ export const AdminClaimsTable = ({ licenseFlags }: AdminClaimsTableProps) => {
           );
 
           if (flags.length === 0) {
-            return <p className="text-xs text-muted-foreground">{t`None`}</p>;
+            return <p className="text-muted-foreground text-xs">{t`None`}</p>;
           }
 
           return (
-            <ul className="list-disc space-y-1 text-xs text-muted-foreground">
+            <ul className="text-muted-foreground list-disc space-y-1 text-xs">
               {flags.map(({ key, label }) => (
                 <li key={key}>{label}</li>
               ))}
@@ -119,7 +114,7 @@ export const AdminClaimsTable = ({ licenseFlags }: AdminClaimsTableProps) => {
         cell: ({ row }) => (
           <DropdownMenu>
             <DropdownMenuTrigger>
-              <MoreHorizontalIcon className="h-5 w-5 text-muted-foreground" />
+              <MoreHorizontalIcon className="text-muted-foreground h-5 w-5" />
             </DropdownMenuTrigger>
 
             <DropdownMenuContent className="w-52" align="start" forceMount>
@@ -129,7 +124,6 @@ export const AdminClaimsTable = ({ licenseFlags }: AdminClaimsTableProps) => {
 
               <ClaimUpdateDialog
                 claim={row.original}
-                licenseFlags={licenseFlags}
                 trigger={
                   <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
                     <div>

apps/remix/app/components/tables/admin-document-logs-table.tsx

@@ -96,9 +96,7 @@ export const AdminDocumentLogsTable = ({ envelopeId }: AdminDocumentLogsTablePro
               )}
             </div>
           ) : (
-            <p>
-              <Trans>N/A</Trans>
-            </p>
+            <p>N/A</p>
           ),
       },
       {

apps/remix/app/components/tables/admin-user-teams-table.tsx

@@ -1,146 +0,0 @@
-import { useMemo } from 'react';
-
-import { useLingui } from '@lingui/react';
-import { useLingui as useLinguiMacro } from '@lingui/react/macro';
-import { Link, useSearchParams } from 'react-router';
-
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
-import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
-import type { TeamMemberRole } from '@documenso/prisma/generated/types';
-import { trpc } from '@documenso/trpc/react';
-import { Badge } from '@documenso/ui/primitives/badge';
-import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { HoverCard, HoverCardContent, HoverCardTrigger } from '@documenso/ui/primitives/hover-card';
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-import { TableCell } from '@documenso/ui/primitives/table';
-
-type AdminUserTeamsTableProps = {
-  userId: number;
-};
-
-export const AdminUserTeamsTable = ({ userId }: AdminUserTeamsTableProps) => {
-  const { i18n } = useLingui();
-  const { t } = useLinguiMacro();
-
-  const [searchParams] = useSearchParams();
-  const updateSearchParams = useUpdateSearchParams();
-
-  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
-
-  const { data, isLoading, isLoadingError } = trpc.admin.user.findTeams.useQuery({
-    userId,
-    query: parsedSearchParams.query,
-    page: parsedSearchParams.page,
-    perPage: parsedSearchParams.perPage,
-  });
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    updateSearchParams({
-      page,
-      perPage,
-    });
-  };
-
-  const results = data ?? {
-    data: [],
-    perPage: 10,
-    currentPage: 1,
-    totalPages: 1,
-  };
-
-  const columns = useMemo(() => {
-    return [
-      {
-        header: t`Team`,
-        accessorKey: 'name',
-        cell: ({ row }) => (
-          <HoverCard>
-            <HoverCardTrigger className="cursor-default underline decoration-dotted underline-offset-4">
-              {row.original.name}
-            </HoverCardTrigger>
-            <HoverCardContent
-              className="w-auto font-mono text-xs text-muted-foreground"
-              align="start"
-            >
-              <dl className="grid grid-cols-[auto_1fr] gap-x-3 gap-y-1">
-                <dt>id</dt>
-                <dd>{row.original.id}</dd>
-                <dt>url</dt>
-                <dd>{row.original.url}</dd>
-              </dl>
-            </HoverCardContent>
-          </HoverCard>
-        ),
-      },
-      {
-        header: t`Organisation`,
-        accessorKey: 'organisation',
-        cell: ({ row }) => (
-          <Link
-            to={`/admin/organisations/${row.original.organisation.id}`}
-            className="hover:underline"
-          >
-            {row.original.organisation.name}
-          </Link>
-        ),
-      },
-      {
-        header: t`Role`,
-        accessorKey: 'teamRole',
-        cell: ({ row }) => (
-          <Badge variant="neutral">
-            {i18n._(TEAM_MEMBER_ROLE_MAP[row.original.teamRole as TeamMemberRole])}
-          </Badge>
-        ),
-      },
-      {
-        header: t`Created At`,
-        accessorKey: 'createdAt',
-        cell: ({ row }) => i18n.date(row.original.createdAt),
-      },
-    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
-  }, []);
-
-  return (
-    <DataTable
-      columns={columns}
-      data={results.data}
-      perPage={results.perPage}
-      currentPage={results.currentPage}
-      totalPages={results.totalPages}
-      onPaginationChange={onPaginationChange}
-      error={{
-        enable: isLoadingError,
-      }}
-      skeleton={{
-        enable: isLoading,
-        rows: 3,
-        component: (
-          <>
-            <TableCell className="py-4 pr-4">
-              <Skeleton className="h-4 w-20 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-20 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-12 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-16 rounded-full" />
-            </TableCell>
-          </>
-        ),
-      }}
-    >
-      {(table) =>
-        table.getPageCount() > 1 ? (
-          <DataTablePagination additionalInformation="VisibleCount" table={table} />
-        ) : null
-      }
-    </DataTable>
-  );
-};

apps/remix/app/components/tables/document-logs-table.tsx

@@ -2,7 +2,6 @@ import { useMemo } from 'react';
 
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
 import { DateTime } from 'luxon';
 import type { DateTimeFormatOptions } from 'luxon';
 import { useSearchParams } from 'react-router';
@@ -89,9 +88,7 @@ export const DocumentLogsTable = ({ documentId, userId }: DocumentLogsTableProps
               )}
             </div>
           ) : (
-            <p>
-              <Trans>N/A</Trans>
-            </p>
+            <p>N/A</p>
           ),
       },
       {

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

@@ -12,8 +12,7 @@ import { useSession } from '@documenso/lib/client-only/providers/session';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { TFindDocumentsResponse } from '@documenso/trpc/server/document-router/find-documents.types';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
-import type { DataTableColumnDef, RowSelectionState } from '@documenso/ui/primitives/data-table';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
@@ -31,9 +30,6 @@ export type DocumentsTableProps = {
   isLoading?: boolean;
   isLoadingError?: boolean;
   onMoveDocument?: (documentId: number) => void;
-  enableSelection?: boolean;
-  rowSelection?: RowSelectionState;
-  onRowSelectionChange?: (selection: RowSelectionState) => void;
 };
 
 type DocumentsTableRow = TFindDocumentsResponse['data'][number];
@@ -43,9 +39,6 @@ export const DocumentsTable = ({
   isLoading,
   isLoadingError,
   onMoveDocument,
-  enableSelection,
-  rowSelection,
-  onRowSelectionChange,
 }: DocumentsTableProps) => {
   const { _, i18n } = useLingui();
 
@@ -55,34 +48,7 @@ export const DocumentsTable = ({
   const updateSearchParams = useUpdateSearchParams();
 
   const columns = useMemo(() => {
-    const cols: DataTableColumnDef<DocumentsTableRow>[] = [];
-
-    if (enableSelection) {
-      cols.push({
-        id: 'select',
-        header: ({ table }) => (
-          <Checkbox
-            checked={table.getIsAllPageRowsSelected()}
-            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-            aria-label={_(msg`Select all`)}
-            onClick={(e) => e.stopPropagation()}
-          />
-        ),
-        cell: ({ row }) => (
-          <Checkbox
-            checked={row.getIsSelected()}
-            onCheckedChange={(value) => row.toggleSelected(!!value)}
-            aria-label={_(msg`Select row`)}
-            onClick={(e) => e.stopPropagation()}
-          />
-        ),
-        enableSorting: false,
-        enableHiding: false,
-        size: 40,
-      });
-    }
-
-    cols.push(
+    return [
       {
         header: _(msg`Created`),
         accessorKey: 'createdAt',
@@ -127,10 +93,8 @@ export const DocumentsTable = ({
             </div>
           ),
       },
-    );
-
-    return cols;
-  }, [team, onMoveDocument, enableSelection]);
+    ] satisfies DataTableColumnDef<DocumentsTableRow>[];
+  }, [team, onMoveDocument]);
 
   const onPaginationChange = (page: number, perPage: number) => {
     startTransition(() => {
@@ -168,11 +132,6 @@ export const DocumentsTable = ({
           rows: 5,
           component: (
             <>
-              {enableSelection && (
-                <TableCell>
-                  <Skeleton className="h-4 w-4 rounded" />
-                </TableCell>
-              )}
               <TableCell>
                 <Skeleton className="h-4 w-40 rounded-full" />
               </TableCell>
@@ -193,17 +152,13 @@ export const DocumentsTable = ({
             </>
           ),
         }}
-        enableRowSelection={enableSelection}
-        rowSelection={rowSelection}
-        onRowSelectionChange={onRowSelectionChange}
-        getRowId={(row) => row.envelopeId}
       >
         {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
       </DataTable>
 
       {isPending && (
-        <div className="absolute inset-0 flex items-center justify-center bg-background/50">
-          <Loader className="h-8 w-8 animate-spin text-muted-foreground" />
+        <div className="bg-background/50 absolute inset-0 flex items-center justify-center">
+          <Loader className="text-muted-foreground h-8 w-8 animate-spin" />
         </div>
       )}
     </div>

apps/remix/app/components/tables/envelopes-table-bulk-action-bar.tsx

@@ -1,49 +0,0 @@
-import { useLingui } from '@lingui/react/macro';
-import { Trans } from '@lingui/react/macro';
-import { FolderInputIcon, Trash2Icon, XIcon } from 'lucide-react';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export type EnvelopesTableBulkActionBarProps = {
-  selectedCount: number;
-  onMoveClick: () => void;
-  onDeleteClick: () => void;
-  onClearSelection: () => void;
-};
-
-export const EnvelopesTableBulkActionBar = ({
-  selectedCount,
-  onMoveClick,
-  onDeleteClick,
-  onClearSelection,
-}: EnvelopesTableBulkActionBarProps) => {
-  const { t } = useLingui();
-
-  if (selectedCount === 0) {
-    return null;
-  }
-
-  return (
-    <div className="fixed bottom-4 left-1/2 z-50 flex -translate-x-1/2 items-center gap-x-4 rounded-lg border border-border bg-background px-4 py-3 shadow-lg">
-      <span className="text-sm font-medium">
-        <Trans>{selectedCount} selected</Trans>
-      </span>
-
-      <div className="h-6 w-px bg-border" />
-
-      <Button type="button" variant="outline" size="sm" onClick={onMoveClick}>
-        <FolderInputIcon className="mr-2 h-4 w-4" />
-        <Trans>Move to Folder</Trans>
-      </Button>
-
-      <Button type="button" variant="destructive" size="sm" onClick={onDeleteClick}>
-        <Trash2Icon className="mr-2 h-4 w-4" />
-        <Trans>Delete</Trans>
-      </Button>
-
-      <Button variant="ghost" size="sm" onClick={onClearSelection} aria-label={t`Clear selection`}>
-        <XIcon className="h-4 w-4" />
-      </Button>
-    </div>
-  );
-};

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

@@ -12,8 +12,7 @@ import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/org
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import type { TFindTemplatesResponse } from '@documenso/trpc/server/template-router/schema';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
-import type { DataTableColumnDef, RowSelectionState } from '@documenso/ui/primitives/data-table';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
@@ -33,9 +32,6 @@ type TemplatesTableProps = {
   isLoadingError?: boolean;
   documentRootPath: string;
   templateRootPath: string;
-  enableSelection?: boolean;
-  rowSelection?: RowSelectionState;
-  onRowSelectionChange?: (selection: RowSelectionState) => void;
 };
 
 type TemplatesTableRow = TFindTemplatesResponse['data'][number];
@@ -46,9 +42,6 @@ export const TemplatesTable = ({
   isLoadingError,
   documentRootPath,
   templateRootPath,
-  enableSelection,
-  rowSelection,
-  onRowSelectionChange,
 }: TemplatesTableProps) => {
   const { _, i18n } = useLingui();
   const { remaining } = useLimits();
@@ -67,34 +60,7 @@ export const TemplatesTable = ({
   };
 
   const columns = useMemo(() => {
-    const cols: DataTableColumnDef<TemplatesTableRow>[] = [];
-
-    if (enableSelection) {
-      cols.push({
-        id: 'select',
-        header: ({ table }) => (
-          <Checkbox
-            checked={table.getIsAllPageRowsSelected()}
-            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-            aria-label={_(msg`Select all`)}
-            onClick={(e) => e.stopPropagation()}
-          />
-        ),
-        cell: ({ row }) => (
-          <Checkbox
-            checked={row.getIsSelected()}
-            onCheckedChange={(value) => row.toggleSelected(!!value)}
-            aria-label={_(msg`Select row`)}
-            onClick={(e) => e.stopPropagation()}
-          />
-        ),
-        enableSorting: false,
-        enableHiding: false,
-        size: 40,
-      });
-    }
-
-    cols.push(
+    return [
       {
         header: _(msg`Created`),
         accessorKey: 'createdAt',
@@ -120,8 +86,8 @@ export const TemplatesTable = ({
                 <InfoIcon className="mx-2 h-4 w-4" />
               </TooltipTrigger>
 
-              <TooltipContent className="max-w-md space-y-2 !p-0 text-foreground">
-                <ul className="space-y-0.5 divide-y text-muted-foreground [&>li]:p-4">
+              <TooltipContent className="text-foreground max-w-md space-y-2 !p-0">
+                <ul className="text-muted-foreground space-y-0.5 divide-y [&>li]:p-4">
                   <li>
                     <h2 className="mb-2 flex flex-row items-center font-semibold">
                       <Globe2Icon className="mr-2 h-5 w-5 text-green-500 dark:text-green-300" />
@@ -210,10 +176,8 @@ export const TemplatesTable = ({
           );
         },
       },
-    );
-
-    return cols;
-  }, [documentRootPath, team?.id, templateRootPath, enableSelection]);
+    ] satisfies DataTableColumnDef<TemplatesTableRow>[];
+  }, [documentRootPath, team?.id, templateRootPath]);
 
   const onPaginationChange = (page: number, perPage: number) => {
     startTransition(() => {
@@ -260,10 +224,6 @@ export const TemplatesTable = ({
         currentPage={results.currentPage}
         totalPages={results.totalPages}
         onPaginationChange={onPaginationChange}
-        enableRowSelection={enableSelection}
-        rowSelection={rowSelection}
-        onRowSelectionChange={onRowSelectionChange}
-        getRowId={(row) => row.envelopeId}
         error={{
           enable: isLoadingError || false,
         }}
@@ -272,11 +232,6 @@ export const TemplatesTable = ({
           rows: 5,
           component: (
             <>
-              {enableSelection && (
-                <TableCell className="w-10">
-                  <Skeleton className="h-4 w-4 rounded" />
-                </TableCell>
-              )}
               <TableCell>
                 <Skeleton className="h-4 w-40 rounded-full" />
               </TableCell>

apps/remix/app/root.tsx

@@ -7,6 +7,7 @@ import {
   data,
   isRouteErrorResponse,
   useLoaderData,
+  useLocation,
 } from 'react-router';
 import { PreventFlashOnWrongTheme, ThemeProvider, useTheme } from 'remix-themes';
 
@@ -86,6 +87,8 @@ export async function loader({ request }: Route.LoaderArgs) {
 export function Layout({ children }: { children: React.ReactNode }) {
   const { theme } = useLoaderData<typeof loader>() || {};
 
+  const location = useLocation();
+
   return (
     <ThemeProvider specifiedTheme={theme} themeAction="/api/theme">
       <LayoutContent>{children}</LayoutContent>
@@ -126,18 +129,6 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {
         <script>0</script>
       </head>
       <body>
-        {/* Global license banner currently disabled. Need to wait until after a few releases. */}
-        {/* {licenseStatus === '?' && (
-          <div className="bg-destructive text-destructive-foreground">
-            <div className="mx-auto flex h-auto max-w-screen-xl items-center justify-center px-4 py-3 text-sm font-medium">
-              <div className="flex items-center">
-                <AlertTriangleIcon className="mr-2 h-4 w-4" />
-                <Trans>This is an expired license instance of Documenso</Trans>
-              </div>
-            </div>
-          </div>
-        )} */}
-
         <SessionProvider initialSession={session}>
           <TooltipProvider>
             <TrpcProvider>

apps/remix/app/routes/_authenticated+/admin+/_layout.tsx

@@ -11,37 +11,25 @@ import {
 import { Link, Outlet, redirect, useLocation } from 'react-router';
 
 import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { LicenseClient } from '@documenso/lib/server-only/license/license-client';
 import { isAdmin } from '@documenso/lib/utils/is-admin';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
-import { AdminLicenseStatusBanner } from '~/components/general/admin-license-status-banner';
-
 import type { Route } from './+types/_layout';
 
 export async function loader({ request }: Route.LoaderArgs) {
   const { user } = await getSession(request);
 
-  const license = await LicenseClient.getInstance()?.getCachedLicense();
-
   if (!user || !isAdmin(user)) {
     throw redirect('/');
   }
-
-  return {
-    license: license || null,
-  };
 }
 
-export default function AdminLayout({ loaderData }: Route.ComponentProps) {
-  const { license } = loaderData;
+export default function AdminLayout() {
   const { pathname } = useLocation();
 
   return (
     <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
-      <AdminLicenseStatusBanner license={license} />
-
       <h1 className="text-4xl font-semibold">
         <Trans>Admin Panel</Trans>
       </h1>

apps/remix/app/routes/_authenticated+/admin+/claims.tsx

@@ -4,26 +4,13 @@ import { useLingui } from '@lingui/react/macro';
 import { useLocation, useSearchParams } from 'react-router';
 
 import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
-import { LicenseClient } from '@documenso/lib/server-only/license/license-client';
 import { Input } from '@documenso/ui/primitives/input';
 
 import { ClaimCreateDialog } from '~/components/dialogs/claim-create-dialog';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { AdminClaimsTable } from '~/components/tables/admin-claims-table';
 
-import type { Route } from './+types/claims';
-
-export async function loader() {
-  const licenseData = await LicenseClient.getInstance()?.getCachedLicense();
-
-  return {
-    licenseFlags: licenseData?.license?.flags,
-  };
-}
-
-export default function Claims({ loaderData }: Route.ComponentProps) {
-  const { licenseFlags } = loaderData;
-
+export default function Claims() {
   const { t } = useLingui();
 
   const [searchParams, setSearchParams] = useSearchParams();
@@ -60,7 +47,7 @@ export default function Claims({ loaderData }: Route.ComponentProps) {
         subtitle={t`Manage all subscription claims`}
         hideDivider
       >
-        <ClaimCreateDialog licenseFlags={licenseFlags} />
+        <ClaimCreateDialog />
       </SettingsHeader>
 
       <div className="mt-4">
@@ -71,7 +58,7 @@ export default function Claims({ loaderData }: Route.ComponentProps) {
           className="mb-4"
         />
 
-        <AdminClaimsTable licenseFlags={licenseFlags} />
+        <AdminClaimsTable />
       </div>
     </div>
   );

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

@@ -12,8 +12,6 @@ import type { z } from 'zod';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { SUBSCRIPTION_STATUS_MAP } from '@documenso/lib/constants/billing';
 import { AppError } from '@documenso/lib/errors/app-error';
-import { LicenseClient } from '@documenso/lib/server-only/license/license-client';
-import type { TLicenseClaim } from '@documenso/lib/types/license';
 import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
 import { trpc } from '@documenso/trpc/react';
 import type { TGetAdminOrganisationResponse } from '@documenso/trpc/server/admin-router/get-admin-organisation.types';
@@ -42,20 +40,7 @@ import { SettingsHeader } from '~/components/general/settings-header';
 
 import type { Route } from './+types/organisations.$id';
 
-export async function loader() {
-  const licenseData = await LicenseClient.getInstance()?.getCachedLicense();
-
-  return {
-    licenseFlags: licenseData?.license?.flags,
-  };
-}
-
-export default function OrganisationGroupSettingsPage({
-  params,
-  loaderData,
-}: Route.ComponentProps) {
-  const { licenseFlags } = loaderData;
-
+export default function OrganisationGroupSettingsPage({ params }: Route.ComponentProps) {
   const { t } = useLingui();
   const { toast } = useToast();
 
@@ -107,11 +92,7 @@ export default function OrganisationGroupSettingsPage({
         cell: ({ row }) => (
           <div className="flex items-center gap-2">
             <Link to={`/admin/users/${row.original.user.id}`}>{row.original.user.name}</Link>
-            {row.original.user.id === organisation?.ownerUserId && (
-              <Badge>
-                <Trans>Owner</Trans>
-              </Badge>
-            )}
+            {row.original.user.id === organisation?.ownerUserId && <Badge>Owner</Badge>}
           </div>
         ),
       },
@@ -148,7 +129,7 @@ export default function OrganisationGroupSettingsPage({
   if (isLoadingOrganisation) {
     return (
       <div className="flex items-center justify-center rounded-lg py-32">
-        <Loader className="h-6 w-6 animate-spin text-muted-foreground" />
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
       </div>
     );
   }
@@ -212,9 +193,7 @@ export default function OrganisationGroupSettingsPage({
                 {SUBSCRIPTION_STATUS_MAP[organisation.subscription.status]} subscription found
               </span>
             ) : (
-              <span>
-                <Trans>No subscription found</Trans>
-              </span>
+              <span>No subscription found</span>
             )}
           </AlertDescription>
         </div>
@@ -260,7 +239,7 @@ export default function OrganisationGroupSettingsPage({
         )}
       </Alert>
 
-      <OrganisationAdminForm organisation={organisation} licenseFlags={licenseFlags} />
+      <OrganisationAdminForm organisation={organisation} />
 
       <div className="mt-16 space-y-10">
         <div>
@@ -299,7 +278,6 @@ type TUpdateGenericOrganisationDataFormSchema = z.infer<
 
 type OrganisationAdminFormOptions = {
   organisation: TGetAdminOrganisationResponse;
-  licenseFlags?: TLicenseClaim;
 };
 
 const GenericOrganisationAdminForm = ({ organisation }: OrganisationAdminFormOptions) => {
@@ -371,7 +349,7 @@ const GenericOrganisationAdminForm = ({ organisation }: OrganisationAdminFormOpt
                 <Input {...field} />
               </FormControl>
               {!form.formState.errors.url && (
-                <span className="text-xs font-normal text-foreground/50">
+                <span className="text-foreground/50 text-xs font-normal">
                   {field.value ? (
                     `${NEXT_PUBLIC_WEBAPP_URL()}/o/${field.value}`
                   ) : (
@@ -403,17 +381,12 @@ const ZUpdateOrganisationBillingFormSchema = ZUpdateAdminOrganisationRequestSche
 
 type TUpdateOrganisationBillingFormSchema = z.infer<typeof ZUpdateOrganisationBillingFormSchema>;
 
-const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdminFormOptions) => {
+const OrganisationAdminForm = ({ organisation }: OrganisationAdminFormOptions) => {
   const { toast } = useToast();
   const { t } = useLingui();
 
   const { mutateAsync: updateOrganisation } = trpc.admin.organisation.update.useMutation();
 
-  const hasRestrictedEnterpriseFeatures = Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).some(
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    (flag) => flag.isEnterprise && !licenseFlags?.[flag.key as keyof TLicenseClaim],
-  );
-
   const form = useForm<TUpdateOrganisationBillingFormSchema>({
     resolver: zodResolver(ZUpdateOrganisationBillingFormSchema),
     defaultValues: {
@@ -467,7 +440,7 @@ const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdmin
                     <InfoIcon className="mx-2 h-4 w-4" />
                   </TooltipTrigger>
 
-                  <TooltipContent className="max-w-md space-y-2 p-4 text-foreground">
+                  <TooltipContent className="text-foreground max-w-md space-y-2 p-4">
                     <h2>
                       <strong>
                         <Trans>Inherited subscription claim</Trans>
@@ -520,7 +493,7 @@ const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdmin
                 <Link
                   target="_blank"
                   to={`https://dashboard.stripe.com/customers/${field.value}`}
-                  className="text-xs font-normal text-foreground/50"
+                  className="text-foreground/50 text-xs font-normal"
                 >
                   {`https://dashboard.stripe.com/customers/${field.value}`}
                 </Link>
@@ -609,57 +582,34 @@ const OrganisationAdminForm = ({ organisation, licenseFlags }: OrganisationAdmin
           </FormLabel>
 
           <div className="mt-2 space-y-2 rounded-md border p-4">
-            {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(({ key, label, isEnterprise }) => {
-              const isRestrictedFeature =
-                isEnterprise && !licenseFlags?.[key as keyof TLicenseClaim]; // eslint-disable-line @typescript-eslint/consistent-type-assertions
+            {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(({ key, label }) => (
+              <FormField
+                key={key}
+                control={form.control}
+                name={`claims.flags.${key}`}
+                render={({ field }) => (
+                  <FormItem className="flex items-center space-x-2">
+                    <FormControl>
+                      <div className="flex items-center">
+                        <Checkbox
+                          id={`flag-${key}`}
+                          checked={field.value}
+                          onCheckedChange={field.onChange}
+                        />
 
-              return (
-                <FormField
-                  key={key}
-                  control={form.control}
-                  name={`claims.flags.${key}`}
-                  render={({ field }) => (
-                    <FormItem className="flex items-center space-x-2">
-                      <FormControl>
-                        <div className="flex items-center">
-                          <Checkbox
-                            id={`flag-${key}`}
-                            checked={field.value}
-                            onCheckedChange={field.onChange}
-                            disabled={isRestrictedFeature && !field.value} // Allow disabling of restricted features.
-                          />
-
-                          <label
-                            className="ml-2 flex flex-row items-center text-sm text-muted-foreground"
-                            htmlFor={`flag-${key}`}
-                          >
-                            {label}
-                            {isRestrictedFeature && ' ¹'}
-                          </label>
-                        </div>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-              );
-            })}
+                        <label
+                          className="text-muted-foreground ml-2 flex flex-row items-center text-sm"
+                          htmlFor={`flag-${key}`}
+                        >
+                          {label}
+                        </label>
+                      </div>
+                    </FormControl>
+                  </FormItem>
+                )}
+              />
+            ))}
           </div>
-
-          {hasRestrictedEnterpriseFeatures && (
-            <Alert variant="neutral" className="mt-4">
-              <AlertDescription>
-                <span>¹&nbsp;</span>
-                <Trans>Your current license does not include these features.</Trans>{' '}
-                <Link
-                  to="https://docs.documenso.com/users/licenses/enterprise-edition"
-                  target="_blank"
-                  className="text-foreground underline hover:opacity-80"
-                >
-                  <Trans>Learn more</Trans>
-                </Link>
-              </AlertDescription>
-            </Alert>
-          )}
         </div>
 
         <div className="flex justify-end">

apps/remix/app/routes/_authenticated+/admin+/stats.tsx

@@ -23,10 +23,8 @@ import {
   getUserWithSignedDocumentMonthlyGrowth,
   getUsersCount,
 } from '@documenso/lib/server-only/admin/get-users-stats';
-import { LicenseClient } from '@documenso/lib/server-only/license/license-client';
 import { getSignerConversionMonthly } from '@documenso/lib/server-only/user/get-signer-conversion';
 
-import { AdminLicenseCard } from '~/components/general/admin-license-card';
 import { MonthlyActiveUsersChart } from '~/components/general/admin-monthly-active-user-charts';
 import { AdminStatsSignerConversionChart } from '~/components/general/admin-stats-signer-conversion-chart';
 import { AdminStatsUsersWithDocumentsChart } from '~/components/general/admin-stats-users-with-documents';
@@ -44,7 +42,6 @@ export async function loader() {
     signerConversionMonthly,
     monthlyUsersWithDocuments,
     monthlyActiveUsers,
-    licenseData,
   ] = await Promise.all([
     getUsersCount(),
     getOrganisationsWithSubscriptionsCount(),
@@ -53,7 +50,6 @@ export async function loader() {
     getSignerConversionMonthly(),
     getUserWithSignedDocumentMonthlyGrowth(),
     getMonthlyActiveUsers(),
-    LicenseClient.getInstance()?.getCachedLicense(),
   ]);
 
   return {
@@ -64,7 +60,6 @@ export async function loader() {
     signerConversionMonthly,
     monthlyUsersWithDocuments,
     monthlyActiveUsers,
-    licenseData: licenseData || null,
   };
 }
 
@@ -79,7 +74,6 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
     signerConversionMonthly,
     monthlyUsersWithDocuments,
     monthlyActiveUsers,
-    licenseData,
   } = loaderData;
 
   return (
@@ -100,10 +94,6 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
         <CardMetric icon={FileCog} title={_(msg`App Version`)} value={`v${version}`} />
       </div>
 
-      <div className="mb-8 mt-4">
-        <AdminLicenseCard licenseData={licenseData} />
-      </div>
-
       <div className="mt-16 gap-8">
         <div>
           <h3 className="text-3xl font-semibold">

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

@@ -10,12 +10,6 @@ import type { z } from 'zod';
 import { trpc } from '@documenso/trpc/react';
 import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
 import { ZUpdateUserRequestSchema } from '@documenso/trpc/server/admin-router/update-user.types';
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from '@documenso/ui/primitives/accordion';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Form,
@@ -36,7 +30,6 @@ import { AdminUserEnableDialog } from '~/components/dialogs/admin-user-enable-di
 import { AdminUserResetTwoFactorDialog } from '~/components/dialogs/admin-user-reset-two-factor-dialog';
 import { GenericErrorLayout } from '~/components/general/generic-error-layout';
 import { AdminOrganisationsTable } from '~/components/tables/admin-organisations-table';
-import { AdminUserTeamsTable } from '~/components/tables/admin-user-teams-table';
 
 import { MultiSelectRoleCombobox } from '../../../components/general/multiselect-role-combobox';
 
@@ -204,7 +197,7 @@ const AdminUserPage = ({ user }: { user: TGetUserResponse }) => {
             <h3 className="text-lg font-semibold leading-none tracking-tight">
               <Trans>User Organisations</Trans>
             </h3>
-            <p className="mt-1.5 text-sm text-muted-foreground">
+            <p className="text-muted-foreground mt-1.5 text-sm">
               <Trans>Organisations that the user is a member of.</Trans>
             </p>
           </div>
@@ -226,28 +219,6 @@ const AdminUserPage = ({ user }: { user: TGetUserResponse }) => {
         />
       </div>
 
-      <hr className="my-8" />
-
-      <Accordion type="single" collapsible>
-        <AccordionItem value="team-memberships" className="border-b-0">
-          <AccordionTrigger className="py-0">
-            <div className="text-left">
-              <h3 className="text-lg font-semibold leading-none tracking-tight">
-                <Trans>Team Memberships</Trans>
-              </h3>
-              <p className="mt-1.5 text-sm font-normal text-muted-foreground">
-                <Trans>Teams that this user is a member of and their roles.</Trans>
-              </p>
-            </div>
-          </AccordionTrigger>
-          <AccordionContent>
-            <div className="mt-4">
-              <AdminUserTeamsTable userId={user.id} />
-            </div>
-          </AccordionContent>
-        </AccordionItem>
-      </Accordion>
-
       <div className="mt-16 flex flex-col gap-4">
         {user && user.twoFactorEnabled && <AdminUserResetTwoFactorDialog user={user} />}
         {user && user.disabled && <AdminUserEnableDialog userToEnable={user} />}

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

@@ -179,9 +179,7 @@ export default function DocumentsLogsPage({ loaderData }: Route.ComponentProps)
           ))}
 
           <div className="text-sm text-foreground">
-            <h3 className="font-semibold">
-              <Trans>Recipients</Trans>
-            </h3>
+            <h3 className="font-semibold">Recipients</h3>
             <ul className="list-inside list-disc text-muted-foreground">
               {recipients.map((recipient) => (
                 <li key={`recipient-${recipient.id}`}>

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

@@ -7,7 +7,6 @@ import { useParams, useSearchParams } from 'react-router';
 import { Link } from 'react-router';
 import { z } from 'zod';
 
-import { useSessionStorage } from '@documenso/lib/client-only/hooks/use-session-storage';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { parseToIntegerArray } from '@documenso/lib/utils/params';
@@ -17,12 +16,9 @@ import { trpc } from '@documenso/trpc/react';
 import type { TFindDocumentsInternalResponse } from '@documenso/trpc/server/document-router/find-documents-internal.types';
 import { ZFindDocumentsInternalRequestSchema } from '@documenso/trpc/server/document-router/find-documents-internal.types';
 import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import type { RowSelectionState } from '@documenso/ui/primitives/data-table';
 import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 
 import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
-import { EnvelopesBulkDeleteDialog } from '~/components/dialogs/envelopes-bulk-delete-dialog';
-import { EnvelopesBulkMoveDialog } from '~/components/dialogs/envelopes-bulk-move-dialog';
 import { DocumentSearch } from '~/components/general/document/document-search';
 import { DocumentStatus } from '~/components/general/document/document-status';
 import { EnvelopeDropZoneWrapper } from '~/components/general/envelope/envelope-drop-zone-wrapper';
@@ -31,7 +27,6 @@ import { PeriodSelector } from '~/components/general/period-selector';
 import { DocumentsTable } from '~/components/tables/documents-table';
 import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
 import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
-import { EnvelopesTableBulkActionBar } from '~/components/tables/envelopes-table-bulk-action-bar';
 import { useCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
 
@@ -59,17 +54,6 @@ export default function DocumentsPage() {
   const [isMovingDocument, setIsMovingDocument] = useState(false);
   const [documentToMove, setDocumentToMove] = useState<number | null>(null);
 
-  const [rowSelection, setRowSelection] = useSessionStorage<RowSelectionState>(
-    'documents-bulk-selection',
-    {},
-  );
-  const [isBulkMoveDialogOpen, setIsBulkMoveDialogOpen] = useState(false);
-  const [isBulkDeleteDialogOpen, setIsBulkDeleteDialogOpen] = useState(false);
-
-  const selectedEnvelopeIds = useMemo(() => {
-    return Object.keys(rowSelection).filter((id) => rowSelection[id]);
-  }, [rowSelection]);
-
   const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({
     [ExtendedDocumentStatus.DRAFT]: 0,
     [ExtendedDocumentStatus.PENDING]: 0,
@@ -132,9 +116,9 @@ export default function DocumentsPage() {
 
         <div className="mt-8 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">
           <div className="flex flex-row items-center">
-            <Avatar className="mr-3 h-12 w-12 border-2 border-solid border-white dark:border-border">
+            <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
               {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
-              <AvatarFallback className="text-xs text-muted-foreground">
+              <AvatarFallback className="text-muted-foreground text-xs">
                 {team.name.slice(0, 1)}
               </AvatarFallback>
             </Avatar>
@@ -164,7 +148,7 @@ export default function DocumentsPage() {
                   .map((value) => (
                     <TabsTrigger
                       key={value}
-                      className="min-w-[60px] hover:text-foreground"
+                      className="hover:text-foreground min-w-[60px]"
                       value={value}
                       asChild
                     >
@@ -206,9 +190,6 @@ export default function DocumentsPage() {
                   setDocumentToMove(documentId);
                   setIsMovingDocument(true);
                 }}
-                enableSelection
-                rowSelection={rowSelection}
-                onRowSelectionChange={setRowSelection}
               />
             )}
           </div>
@@ -228,30 +209,6 @@ export default function DocumentsPage() {
             }}
           />
         )}
-
-        <EnvelopesTableBulkActionBar
-          selectedCount={selectedEnvelopeIds.length}
-          onMoveClick={() => setIsBulkMoveDialogOpen(true)}
-          onDeleteClick={() => setIsBulkDeleteDialogOpen(true)}
-          onClearSelection={() => setRowSelection({})}
-        />
-
-        <EnvelopesBulkMoveDialog
-          envelopeIds={selectedEnvelopeIds}
-          envelopeType={EnvelopeType.DOCUMENT}
-          open={isBulkMoveDialogOpen}
-          currentFolderId={folderId}
-          onOpenChange={setIsBulkMoveDialogOpen}
-          onSuccess={() => setRowSelection({})}
-        />
-
-        <EnvelopesBulkDeleteDialog
-          envelopeIds={selectedEnvelopeIds}
-          envelopeType={EnvelopeType.DOCUMENT}
-          open={isBulkDeleteDialogOpen}
-          onOpenChange={setIsBulkDeleteDialogOpen}
-          onSuccess={() => setRowSelection({})}
-        />
       </div>
     </EnvelopeDropZoneWrapper>
   );

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

@@ -66,9 +66,7 @@ export default function DocumentsFoldersPage() {
             onClick={() => navigateToFolder(null)}
           >
             <HomeIcon className="h-4 w-4" />
-            <span>
-              <Trans>Home</Trans>
-            </span>
+            <span>Home</span>
           </Button>
         </div>
 

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx

@@ -207,9 +207,7 @@ export default function PublicProfilePage({ loaderData }: Route.ComponentProps)
             directTemplates={enabledPrivateDirectTemplates}
             trigger={
               <Button variant="outline">
-                <Trans context="Action button to link template to public profile">
-                  Link template
-                </Trans>
+                <Trans>Link template</Trans>
               </Button>
             }
           />

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

@@ -1,23 +1,16 @@
-import { useMemo, useState } from 'react';
-
 import { Trans } from '@lingui/react/macro';
 import { EnvelopeType } from '@prisma/client';
 import { Bird } from 'lucide-react';
 import { useParams, useSearchParams } from 'react-router';
 
-import { useSessionStorage } from '@documenso/lib/client-only/hooks/use-session-storage';
 import { FolderType } from '@documenso/lib/types/folder-type';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import type { RowSelectionState } from '@documenso/ui/primitives/data-table';
 
-import { EnvelopesBulkDeleteDialog } from '~/components/dialogs/envelopes-bulk-delete-dialog';
-import { EnvelopesBulkMoveDialog } from '~/components/dialogs/envelopes-bulk-move-dialog';
 import { EnvelopeDropZoneWrapper } from '~/components/general/envelope/envelope-drop-zone-wrapper';
 import { FolderGrid } from '~/components/general/folder/folder-grid';
-import { EnvelopesTableBulkActionBar } from '~/components/tables/envelopes-table-bulk-action-bar';
 import { TemplatesTable } from '~/components/tables/templates-table';
 import { useCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
@@ -35,17 +28,6 @@ export default function TemplatesPage() {
   const page = Number(searchParams.get('page')) || 1;
   const perPage = Number(searchParams.get('perPage')) || 10;
 
-  const [rowSelection, setRowSelection] = useSessionStorage<RowSelectionState>(
-    'templates-bulk-selection',
-    {},
-  );
-  const [isBulkMoveDialogOpen, setIsBulkMoveDialogOpen] = useState(false);
-  const [isBulkDeleteDialogOpen, setIsBulkDeleteDialogOpen] = useState(false);
-
-  const selectedEnvelopeIds = useMemo(() => {
-    return Object.keys(rowSelection).filter((id) => rowSelection[id]);
-  }, [rowSelection]);
-
   const documentRootPath = formatDocumentsPath(team.url);
   const templateRootPath = formatTemplatesPath(team.url);
 
@@ -62,9 +44,9 @@ export default function TemplatesPage() {
 
         <div className="mt-8">
           <div className="flex flex-row items-center">
-            <Avatar className="mr-3 h-12 w-12 border-2 border-solid border-white dark:border-border">
+            <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
               {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
-              <AvatarFallback className="text-xs text-muted-foreground">
+              <AvatarFallback className="text-muted-foreground text-xs">
                 {team.name.slice(0, 1)}
               </AvatarFallback>
             </Avatar>
@@ -76,7 +58,7 @@ export default function TemplatesPage() {
 
           <div className="mt-8">
             {data && data.count === 0 ? (
-              <div className="flex h-96 flex-col items-center justify-center gap-y-4 text-muted-foreground/60">
+              <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">
                 <Bird className="h-12 w-12" strokeWidth={1.5} />
 
                 <div className="text-center">
@@ -99,37 +81,10 @@ export default function TemplatesPage() {
                 isLoadingError={isLoadingError}
                 documentRootPath={documentRootPath}
                 templateRootPath={templateRootPath}
-                enableSelection
-                rowSelection={rowSelection}
-                onRowSelectionChange={setRowSelection}
               />
             )}
           </div>
         </div>
-
-        <EnvelopesTableBulkActionBar
-          selectedCount={selectedEnvelopeIds.length}
-          onMoveClick={() => setIsBulkMoveDialogOpen(true)}
-          onDeleteClick={() => setIsBulkDeleteDialogOpen(true)}
-          onClearSelection={() => setRowSelection({})}
-        />
-
-        <EnvelopesBulkMoveDialog
-          envelopeIds={selectedEnvelopeIds}
-          envelopeType={EnvelopeType.TEMPLATE}
-          open={isBulkMoveDialogOpen}
-          currentFolderId={folderId}
-          onOpenChange={setIsBulkMoveDialogOpen}
-          onSuccess={() => setRowSelection({})}
-        />
-
-        <EnvelopesBulkDeleteDialog
-          envelopeIds={selectedEnvelopeIds}
-          envelopeType={EnvelopeType.TEMPLATE}
-          open={isBulkDeleteDialogOpen}
-          onOpenChange={setIsBulkDeleteDialogOpen}
-          onSuccess={() => setRowSelection({})}
-        />
       </div>
     </EnvelopeDropZoneWrapper>
   );

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

@@ -66,9 +66,7 @@ export default function TemplatesFoldersPage() {
             onClick={() => navigateToFolder(null)}
           >
             <HomeIcon className="h-4 w-4" />
-            <span>
-              <Trans>Home</Trans>
-            </span>
+            <span>Home</span>
           </Button>
         </div>
 

apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx

@@ -1,6 +1,5 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
 import { EnvelopeType, FieldType, SigningStatus } from '@prisma/client';
 import { DateTime } from 'luxon';
 import { redirect } from 'react-router';
@@ -291,9 +290,7 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                           </p>
                         </>
                       ) : (
-                        <p className="text-muted-foreground">
-                          <Trans>N/A</Trans>
-                        </p>
+                        <p className="text-muted-foreground">N/A</p>
                       )}
 
                       <p className="mt-2 text-sm text-muted-foreground print:text-xs">

apps/remix/app/routes/embed+/_v0+/_layout.tsx

@@ -1,4 +1,3 @@
-import { Trans } from '@lingui/react/macro';
 import { Outlet, isRouteErrorResponse, useRouteError } from 'react-router';
 
 import {
@@ -90,9 +89,5 @@ export function ErrorBoundary({ loaderData }: Route.ErrorBoundaryProps) {
     }
   }
 
-  return (
-    <div>
-      <Trans>Not Found</Trans>
-    </div>
-  );
+  return <div>Not Found</div>;
 }

apps/remix/app/routes/embed+/v1+/authoring+/_layout.tsx

@@ -1,6 +1,5 @@
 import { useLayoutEffect } from 'react';
 
-import { Trans } from '@lingui/react/macro';
 import { Outlet, useLoaderData } from 'react-router';
 
 import { verifyEmbeddingPresignToken } from '@documenso/lib/server-only/embedding-presign/verify-embedding-presign-token';
@@ -76,11 +75,7 @@ export default function AuthoringLayout() {
   }, []);
 
   if (!hasValidToken) {
-    return (
-      <div>
-        <Trans>Invalid embedding presign token provided</Trans>
-      </div>
-    );
+    return <div>Invalid embedding presign token provided</div>;
   }
 
   return (

apps/remix/app/routes/embed+/v1+/multisign+/_index.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useLayoutEffect, useState } from 'react';
 
-import { Trans } from '@lingui/react/macro';
 import { SigningStatus } from '@prisma/client';
 import { useRevalidator } from 'react-router';
 
@@ -284,9 +283,7 @@ export default function MultisignPage() {
 
         {!hidePoweredBy && (
           <div className="bg-primary text-primary-foreground fixed bottom-0 left-0 z-40 rounded-tr px-2 py-1 text-xs font-medium opacity-60 hover:opacity-100">
-            <span>
-              <Trans>Powered by</Trans>
-            </span>
+            <span>Powered by</span>
             <BrandingLogo className="ml-2 inline-block h-[14px]" />
           </div>
         )}
@@ -301,9 +298,7 @@ export default function MultisignPage() {
 
       {!hidePoweredBy && (
         <div className="bg-primary text-primary-foreground fixed bottom-0 left-0 z-40 rounded-tr px-2 py-1 text-xs font-medium opacity-60 hover:opacity-100">
-          <span>
-            <Trans>Powered by</Trans>
-          </span>
+          <span>Powered by</span>
           <BrandingLogo className="ml-2 inline-block h-[14px]" />
         </div>
       )}

apps/remix/package.json

@@ -106,5 +106,5 @@
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "2.6.1"
+  "version": "2.4.0"
 }

apps/remix/server/main.js

@@ -17,7 +17,7 @@ server.use(
   serveStatic({
     root: 'build/client',
     onFound: (path, c) => {
-      if (path.startsWith('build/client/assets')) {
+      if (path.startsWith('./build/client/assets')) {
         // Hard cache assets with hashed file names.
         c.header('Cache-Control', 'public, immutable, max-age=31536000');
       } else {

apps/remix/server/router.ts

@@ -10,10 +10,7 @@ import { tsRestHonoApp } from '@documenso/api/hono';
 import { auth } from '@documenso/auth/server';
 import { API_V2_BETA_URL, API_V2_URL } from '@documenso/lib/constants/app';
 import { jobsClient } from '@documenso/lib/jobs/client';
-import { LicenseClient } from '@documenso/lib/server-only/license/license-client';
 import { TelemetryClient } from '@documenso/lib/server-only/telemetry/telemetry-client';
-import { migrateDeletedAccountServiceAccount } from '@documenso/lib/server-only/user/service-accounts/deleted-account';
-import { migrateLegacyServiceAccount } from '@documenso/lib/server-only/user/service-accounts/legacy-service-account';
 import { getIpAddress } from '@documenso/lib/universal/get-ip-address';
 import { env } from '@documenso/lib/utils/env';
 import { logger } from '@documenso/lib/utils/logger';
@@ -143,10 +140,4 @@ if (env('NODE_ENV') !== 'development') {
   void TelemetryClient.start();
 }
 
-// Start license client to verify license on startup.
-void LicenseClient.start();
-
-void migrateDeletedAccountServiceAccount();
-void migrateLegacyServiceAccount();
-
 export default app;

apps/remix/vite.config.ts

@@ -67,6 +67,7 @@ export default defineConfig({
       'node_modules',
       '@napi-rs/canvas',
       '@node-rs/bcrypt',
+      '@documenso/pdf-sign',
       'sharp',
       'playwright',
       'playwright-core',
@@ -97,6 +98,7 @@ export default defineConfig({
       external: [
         '@napi-rs/canvas',
         '@node-rs/bcrypt',
+        '@documenso/pdf-sign',
         '@aws-sdk/cloudfront-signer',
         'nodemailer',
         /playwright/,

assets/a4-size.pdf

@@ -1,51 +0,0 @@
-%PDF-1.7
-%âãÏÓ
-1 0 obj
-<<
-/Type /Pages
-/Kids [4 0 R]
-/Count 1
->>
-endobj
-2 0 obj
-<<
-/Type /Catalog
-/Pages 1 0 R
->>
-endobj
-3 0 obj
-<<
-/Title (Untitled)
-/Author (Unknown)
-/Creator (@libpdf/core)
-/Producer (@libpdf/core)
-/CreationDate (D:20260211083727Z)
-/ModDate (D:20260211083727Z)
->>
-endobj
-4 0 obj
-<<
-/Type /Page
-/MediaBox [0 0 595 842]
-/Resources <<
->>
-/Parent 1 0 R
->>
-endobj
-xref
-0 5
-0000000000 65535 f
-0000000015 00000 n
-0000000072 00000 n
-0000000121 00000 n
-0000000290 00000 n
-trailer
-<<
-/Size 5
-/Root 2 0 R
-/Info 3 0 R
-/ID [<B051F100F1EED01A592FC6119F589603> <B051F100F1EED01A592FC6119F589603>]
->>
-startxref
-378
-%%EOF

assets/letter-size.pdf

@@ -1,51 +0,0 @@
-%PDF-1.7
-%âãÏÓ
-1 0 obj
-<<
-/Type /Pages
-/Kids [4 0 R]
-/Count 1
->>
-endobj
-2 0 obj
-<<
-/Type /Catalog
-/Pages 1 0 R
->>
-endobj
-3 0 obj
-<<
-/Title (Untitled)
-/Author (Unknown)
-/Creator (@libpdf/core)
-/Producer (@libpdf/core)
-/CreationDate (D:20260211081729Z)
-/ModDate (D:20260211081729Z)
->>
-endobj
-4 0 obj
-<<
-/Type /Page
-/MediaBox [0 0 612 792]
-/Resources <<
->>
-/Parent 1 0 R
->>
-endobj
-xref
-0 5
-0000000000 65535 f
-0000000015 00000 n
-0000000072 00000 n
-0000000121 00000 n
-0000000290 00000 n
-trailer
-<<
-/Size 5
-/Root 2 0 R
-/Info 3 0 R
-/ID [<94A5FB5DCF5A94AD8C472C493420962C> <94A5FB5DCF5A94AD8C472C493420962C>]
->>
-startxref
-378
-%%EOF

assets/tabloid-landscape.pdf

@@ -1,51 +0,0 @@
-%PDF-1.7
-%âãÏÓ
-1 0 obj
-<<
-/Type /Pages
-/Kids [4 0 R]
-/Count 1
->>
-endobj
-2 0 obj
-<<
-/Type /Catalog
-/Pages 1 0 R
->>
-endobj
-3 0 obj
-<<
-/Title (Untitled)
-/Author (Unknown)
-/Creator (@libpdf/core)
-/Producer (@libpdf/core)
-/CreationDate (D:20260211084535Z)
-/ModDate (D:20260211084535Z)
->>
-endobj
-4 0 obj
-<<
-/Type /Page
-/MediaBox [0 0 1224 792]
-/Resources <<
->>
-/Parent 1 0 R
->>
-endobj
-xref
-0 5
-0000000000 65535 f
-0000000015 00000 n
-0000000072 00000 n
-0000000121 00000 n
-0000000290 00000 n
-trailer
-<<
-/Size 5
-/Root 2 0 R
-/Info 3 0 R
-/ID [<694452F2208AC8E3DD2D2488544F9F0C> <694452F2208AC8E3DD2D2488544F9F0C>]
->>
-startxref
-379
-%%EOF

docker/README.md

@@ -42,17 +42,16 @@ NEXT_PRIVATE_SIGNING_PASSPHRASE="<your-certificate-password>"
 4. Set up your signing certificate. You have three options:
 
    **Option A: Generate Certificate Inside Container (Recommended)**
-
+   
    Start your containers first, then generate a self-signed certificate:
-
    ```bash
    # Start containers
    docker-compose up -d
-
+   
    # Set certificate password securely (won't appear in command history)
    read -s -p "Enter certificate password: " CERT_PASS
    echo
-
+   
    # Generate certificate inside container using environment variable
    docker exec -e CERT_PASS="$CERT_PASS" -it documenso-production-documenso-1 bash -c "
      openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
@@ -64,19 +63,19 @@ NEXT_PRIVATE_SIGNING_PASSPHRASE="<your-certificate-password>"
        -passout env:CERT_PASS && \
      rm /tmp/private.key /tmp/certificate.crt
    "
-
+   
    # Restart container
    docker-compose restart documenso
    ```
-
+   
    **Option B: Use Existing Certificate**
-
+   
    If you have an existing `.p12` certificate, update the volume binding in `compose.yml`:
-
    ```yaml
    volumes:
      - /path/to/your/cert.p12:/opt/documenso/cert.p12:ro
    ```
+   
 
 5. Run the following command to start the containers:
 
@@ -158,6 +157,7 @@ If you encounter errors related to certificate access, here are common solutions
    docker exec -it <container_name> ls -la /opt/documenso/cert.p12
    ```
 
+
 ### Container Logs
 
 Check application logs for detailed error information:
@@ -202,55 +202,45 @@ The environment variables listed above are a subset of those that are available
 
 Here's a markdown table documenting all the provided environment variables:
 
-| Variable                                                       | Description                                                                                         |
-| -------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
-| `PORT`                                                         | The port to run the Documenso application on, defaults to `3000`.                                   |
-| `NEXTAUTH_SECRET`                                              | The secret key used by NextAuth.js for encryption and signing.                                      |
-| `NEXT_PRIVATE_ENCRYPTION_KEY`                                  | The primary encryption key for symmetric encryption and decryption (at least 32 characters).        |
-| `NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY`                        | The secondary encryption key for symmetric encryption and decryption (at least 32 characters).      |
-| `NEXT_PRIVATE_GOOGLE_CLIENT_ID`                                | The Google client ID for Google authentication (optional).                                          |
-| `NEXT_PRIVATE_GOOGLE_CLIENT_SECRET`                            | The Google client secret for Google authentication (optional).                                      |
-| `NEXT_PUBLIC_WEBAPP_URL`                                       | The URL for the web application.                                                                    |
-| `NEXT_PRIVATE_DATABASE_URL`                                    | The URL for the primary database connection (with connection pooling).                              |
-| `NEXT_PRIVATE_DIRECT_DATABASE_URL`                             | The URL for the direct database connection (without connection pooling).                            |
-| `NEXT_PRIVATE_SIGNING_TRANSPORT`                               | The signing transport to use. Available options: local (default), gcloud-hsm                        |
-| `NEXT_PRIVATE_SIGNING_PASSPHRASE`                              | The passphrase for the key file.                                                                    |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`                     | The base64-encoded contents of the key file, will be used instead of file path.                     |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`                         | The path to the key file, default `/opt/documenso/cert.p12`.                                        |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_KEY_PATH`                     | The Google Cloud HSM key path for the gcloud-hsm signing transport.                                 |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_PATH`         | The path to the Google Cloud HSM public certificate file for the gcloud-hsm transport.              |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_CONTENTS`     | The base64-encoded Google Cloud HSM public certificate for the gcloud-hsm transport.                |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS` | The base64-encoded Google Cloud Credentials for the gcloud-hsm transport.                           |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_CERT_CHAIN_FILE_PATH`         | The path to the certificate chain file for the gcloud-hsm transport.                                |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_CERT_CHAIN_CONTENTS`          | The base64-encoded certificate chain for the gcloud-hsm transport.                                  |
-| `NEXT_PRIVATE_SIGNING_GCLOUD_HSM_SECRET_MANAGER_CERT_PATH`     | The Google Secret Manager path to retrieve the certificate for the gcloud-hsm transport.            |
-| `NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY`                     | Comma-separated list of timestamp authority URLs for PDF signing (enables LTV).                     |
-| `NEXT_PUBLIC_SIGNING_CONTACT_INFO`                             | Contact info to embed in PDF signatures. Defaults to the webapp URL.                                |
-| `NEXT_PRIVATE_USE_LEGACY_SIGNING_SUBFILTER`                    | Set to "true" to use legacy adbe.pkcs7.detached subfilter instead of ETSI.CAdES.detached.           |
-| `NEXT_PUBLIC_UPLOAD_TRANSPORT`                                 | The transport to use for file uploads (database or s3).                                             |
-| `NEXT_PRIVATE_UPLOAD_ENDPOINT`                                 | The endpoint for the S3 storage transport (for third-party S3-compatible providers).                |
-| `NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE`                         | Whether to force path-style URLs for the S3 storage transport.                                      |
-| `NEXT_PRIVATE_UPLOAD_REGION`                                   | The region for the S3 storage transport (defaults to us-east-1).                                    |
-| `NEXT_PRIVATE_UPLOAD_BUCKET`                                   | The bucket to use for the S3 storage transport.                                                     |
-| `NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID`                            | The access key ID for the S3 storage transport.                                                     |
-| `NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY`                        | The secret access key for the S3 storage transport.                                                 |
-| `NEXT_PRIVATE_SMTP_TRANSPORT`                                  | The transport to use for sending emails (smtp-auth, smtp-api, resend, or mailchannels).             |
-| `NEXT_PRIVATE_SMTP_HOST`                                       | The host for the SMTP server for SMTP transports.                                                   |
-| `NEXT_PRIVATE_SMTP_PORT`                                       | The port for the SMTP server for SMTP transports.                                                   |
-| `NEXT_PRIVATE_SMTP_USERNAME`                                   | The username for the SMTP server for the `smtp-auth` transport.                                     |
-| `NEXT_PRIVATE_SMTP_PASSWORD`                                   | The password for the SMTP server for the `smtp-auth` transport.                                     |
-| `NEXT_PRIVATE_SMTP_APIKEY_USER`                                | The API key user for the SMTP server for the `smtp-api` transport.                                  |
-| `NEXT_PRIVATE_SMTP_APIKEY`                                     | The API key for the SMTP server for the `smtp-api` transport.                                       |
-| `NEXT_PRIVATE_SMTP_SECURE`                                     | Whether to force the use of TLS for the SMTP server for SMTP transports.                            |
-| `NEXT_PRIVATE_SMTP_UNSAFE_IGNORE_TLS`                          | If true, then no TLS will be used (even if STARTTLS is supported)                                   |
-| `NEXT_PRIVATE_SMTP_FROM_ADDRESS`                               | The email address for the "from" address.                                                           |
-| `NEXT_PRIVATE_SMTP_FROM_NAME`                                  | The sender name for the "from" address.                                                             |
-| `NEXT_PRIVATE_RESEND_API_KEY`                                  | The API key for Resend.com for the `resend` transport.                                              |
-| `NEXT_PRIVATE_MAILCHANNELS_API_KEY`                            | The optional API key for MailChannels (if using a proxy) for the `mailchannels` transport.          |
-| `NEXT_PRIVATE_MAILCHANNELS_ENDPOINT`                           | The optional endpoint for the MailChannels API (if using a proxy) for the `mailchannels` transport. |
-| `NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN`                        | The domain for DKIM signing with MailChannels for the `mailchannels` transport.                     |
-| `NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR`                      | The selector for DKIM signing with MailChannels for the `mailchannels` transport.                   |
-| `NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY`                   | The private key for DKIM signing with MailChannels for the `mailchannels` transport.                |
-| `NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT`                       | The maximum document upload limit displayed to the user (in MB).                                    |
-| `NEXT_PUBLIC_POSTHOG_KEY`                                      | The optional PostHog key for analytics and feature flags.                                           |
-| `NEXT_PUBLIC_DISABLE_SIGNUP`                                   | Whether to disable user signups through the /signup page.                                           |
+| Variable                                     | Description                                                                                         |
+| -------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `PORT`                                       | The port to run the Documenso application on, defaults to `3000`.                                   |
+| `NEXTAUTH_SECRET`                            | The secret key used by NextAuth.js for encryption and signing.                                      |
+| `NEXT_PRIVATE_ENCRYPTION_KEY`                | The primary encryption key for symmetric encryption and decryption (at least 32 characters).        |
+| `NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY`      | The secondary encryption key for symmetric encryption and decryption (at least 32 characters).      |
+| `NEXT_PRIVATE_GOOGLE_CLIENT_ID`              | The Google client ID for Google authentication (optional).                                          |
+| `NEXT_PRIVATE_GOOGLE_CLIENT_SECRET`          | The Google client secret for Google authentication (optional).                                      |
+| `NEXT_PUBLIC_WEBAPP_URL`                     | The URL for the web application.                                                                    |
+| `NEXT_PRIVATE_DATABASE_URL`                  | The URL for the primary database connection (with connection pooling).                              |
+| `NEXT_PRIVATE_DIRECT_DATABASE_URL`           | The URL for the direct database connection (without connection pooling).                            |
+| `NEXT_PRIVATE_SIGNING_TRANSPORT`             | The signing transport to use. Available options: local (default)                                    |
+| `NEXT_PRIVATE_SIGNING_PASSPHRASE`            | The passphrase for the key file.                                                                    |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`   | The base64-encoded contents of the key file, will be used instead of file path.                     |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`       | The path to the key file, default `/opt/documenso/cert.p12`.                                        |
+| `NEXT_PUBLIC_UPLOAD_TRANSPORT`               | The transport to use for file uploads (database or s3).                                             |
+| `NEXT_PRIVATE_UPLOAD_ENDPOINT`               | The endpoint for the S3 storage transport (for third-party S3-compatible providers).                |
+| `NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE`       | Whether to force path-style URLs for the S3 storage transport.                                      |
+| `NEXT_PRIVATE_UPLOAD_REGION`                 | The region for the S3 storage transport (defaults to us-east-1).                                    |
+| `NEXT_PRIVATE_UPLOAD_BUCKET`                 | The bucket to use for the S3 storage transport.                                                     |
+| `NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID`          | The access key ID for the S3 storage transport.                                                     |
+| `NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY`      | The secret access key for the S3 storage transport.                                                 |
+| `NEXT_PRIVATE_SMTP_TRANSPORT`                | The transport to use for sending emails (smtp-auth, smtp-api, resend, or mailchannels).             |
+| `NEXT_PRIVATE_SMTP_HOST`                     | The host for the SMTP server for SMTP transports.                                                   |
+| `NEXT_PRIVATE_SMTP_PORT`                     | The port for the SMTP server for SMTP transports.                                                   |
+| `NEXT_PRIVATE_SMTP_USERNAME`                 | The username for the SMTP server for the `smtp-auth` transport.                                     |
+| `NEXT_PRIVATE_SMTP_PASSWORD`                 | The password for the SMTP server for the `smtp-auth` transport.                                     |
+| `NEXT_PRIVATE_SMTP_APIKEY_USER`              | The API key user for the SMTP server for the `smtp-api` transport.                                  |
+| `NEXT_PRIVATE_SMTP_APIKEY`                   | The API key for the SMTP server for the `smtp-api` transport.                                       |
+| `NEXT_PRIVATE_SMTP_SECURE`                   | Whether to force the use of TLS for the SMTP server for SMTP transports.                            |
+| `NEXT_PRIVATE_SMTP_UNSAFE_IGNORE_TLS`        | If true, then no TLS will be used (even if STARTTLS is supported)                                   |
+| `NEXT_PRIVATE_SMTP_FROM_ADDRESS`             | The email address for the "from" address.                                                           |
+| `NEXT_PRIVATE_SMTP_FROM_NAME`                | The sender name for the "from" address.                                                             |
+| `NEXT_PRIVATE_RESEND_API_KEY`                | The API key for Resend.com for the `resend` transport.                                              |
+| `NEXT_PRIVATE_MAILCHANNELS_API_KEY`          | The optional API key for MailChannels (if using a proxy) for the `mailchannels` transport.          |
+| `NEXT_PRIVATE_MAILCHANNELS_ENDPOINT`         | The optional endpoint for the MailChannels API (if using a proxy) for the `mailchannels` transport. |
+| `NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN`      | The domain for DKIM signing with MailChannels for the `mailchannels` transport.                     |
+| `NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR`    | The selector for DKIM signing with MailChannels for the `mailchannels` transport.                   |
+| `NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY` | The private key for DKIM signing with MailChannels for the `mailchannels` transport.                |
+| `NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT`     | The maximum document upload limit displayed to the user (in MB).                                    |
+| `NEXT_PUBLIC_POSTHOG_KEY`                    | The optional PostHog key for analytics and feature flags.                                           |
+| `NEXT_PUBLIC_DISABLE_SIGNUP`                 | Whether to disable user signups through the /signup page.                                           |

docker/start.sh

@@ -11,7 +11,7 @@ CERT_PATH="${NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH:-/opt/documenso/cert.p12}"
 if [ -f "$CERT_PATH" ] && [ -r "$CERT_PATH" ]; then
     printf "✅ Certificate file found and readable - document signing is ready!\n"
 else
-    printf "⚠️ Certificate not found or not readable\n"
+    printf "⚠️  Certificate not found or not readable\n"
     printf "💡 Tip: Documenso will still start, but document signing will be unavailable\n"
     printf "🔧 Check: http://localhost:3000/api/certificate-status for detailed status\n"
 fi