feat: add formdata endpoints for documents,envelopes,templates

Adds the missing endpoints for documents, envelopes and templates supporting file uploads in a singular request. Also updates frontend components that would use the prior hidden endpoints.
feat: allow multipart requests for public api
2025-11-13 16:23:06 +10:00 · 2025-11-03 15:07:15 +11:00 · 2025-11-02 23:26:43 +11:00
117 changed files with 2221 additions and 3993 deletions
--- a/.env.example
+++ b/.env.example
@ -29,10 +29,6 @@ NEXT_PUBLIC_WEBAPP_URL="http://localhost:3000"
 # URL used by the web app to request itself (e.g. local background jobs)
 NEXT_PRIVATE_INTERNAL_WEBAPP_URL="http://localhost:3000"
 # [[SERVER]]
 # OPTIONAL: The port the server will listen on. Defaults to 3000.
 PORT=3000
 # [[DATABASE]]
 NEXT_PRIVATE_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documenso"
 # Defines the URL to use for the database when running migrations and other commands that won't work with a connection pool.
--- a/CODE_STYLE.md
+++ b/CODE_STYLE.md
@ -1,692 +0,0 @@
 # Documenso Code Style Guide
 This document captures the code style, patterns, and conventions used in the Documenso codebase. It covers both enforceable rules and subjective "taste" elements that make our code consistent and maintainable.
 ## Table of Contents
 1. [General Principles](#general-principles)
 2. [TypeScript Conventions](#typescript-conventions)
 3. [Imports & Dependencies](#imports--dependencies)
 4. [Functions & Methods](#functions--methods)
 5. [React & Components](#react--components)
 6. [Error Handling](#error-handling)
 7. [Async/Await Patterns](#asyncawait-patterns)
 8. [Whitespace & Formatting](#whitespace--formatting)
 9. [Naming Conventions](#naming-conventions)
 10. [Pattern Matching](#pattern-matching)
 11. [Database & Prisma](#database--prisma)
 12. [TRPC Patterns](#trpc-patterns)
 ---
 ## General Principles
 - **Functional over Object-Oriented**: Prefer functional programming patterns over classes
 - **Explicit over Implicit**: Be explicit about types, return values, and error cases
 - **Early Returns**: Use guard clauses and early returns to reduce nesting
 - **Immutability**: Favor `const` over `let`; avoid mutation where possible
 ---
 ## TypeScript Conventions
 ### Type Definitions
 ```typescript
 // ✅ Prefer `type` over `interface`
 type CreateDocumentOptions = {
  templateId: number;
  userId: number;
  recipients: Recipient[];
 };
 // ❌ Avoid interfaces unless absolutely necessary
 interface CreateDocumentOptions {
  templateId: number;
 }
 ```
 ### Type Imports
 ```typescript
 // ✅ Use `type` keyword for type-only imports
 import type { Document, Recipient } from '@prisma/client';
 import { DocumentStatus } from '@prisma/client';
 // Types in function signatures
 export const findDocuments = async ({ userId, teamId }: FindDocumentsOptions) => {
  // ...
 };
 ```
 ### Inline Types for Function Parameters
 ```typescript
 // ✅ Extract inline types to named types
 type FinalRecipient = Pick<Recipient, 'name' | 'email' | 'role' | 'authOptions'> & {
  templateRecipientId: number;
  fields: Field[];
 };
 const finalRecipients: FinalRecipient[] = [];
 ```
 ---
 ## Imports & Dependencies
 ### Import Organization
 Imports should be organized in the following order with blank lines between groups:
 ```typescript
 // 1. React imports
 import { useCallback, useEffect, useMemo } from 'react';
 // 2. Third-party library imports (alphabetically)
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans } from '@lingui/react/macro';
 import type { Document, Recipient } from '@prisma/client';
 import { DocumentStatus, RecipientRole } from '@prisma/client';
 import { match } from 'ts-pattern';
 // 3. Internal package imports (from @documenso/*)
 import { AppError } from '@documenso/lib/errors/app-error';
 import { prisma } from '@documenso/prisma';
 import { Button } from '@documenso/ui/primitives/button';
 // 4. Relative imports
 import { getTeamById } from '../team/get-team';
 import type { FindResultResponse } from './types';
 ```
 ### Destructuring Imports
 ```typescript
 // ✅ Destructure specific exports
 // ✅ Use type imports for types
 import type { Document } from '@prisma/client';
 import { Button } from '@documenso/ui/primitives/button';
 import { Input } from '@documenso/ui/primitives/input';
 ```
 ---
 ## Functions & Methods
 ### Arrow Functions
 ```typescript
 // ✅ Always use arrow functions for functions
 export const createDocument = async ({
  userId,
  title,
 }: CreateDocumentOptions) => {
  // ...
 };
 // ✅ Callbacks and handlers
 const onSubmit = useCallback(async () => {
  // ...
 }, [dependencies]);
 // ❌ Avoid regular function declarations
 function createDocument() {
  // ...
 }
 ```
 ### Function Parameters
 ```typescript
 // ✅ Use destructured object parameters for multiple params
 export const findDocuments = async ({
  userId,
  teamId,
  status = ExtendedDocumentStatus.ALL,
  page = 1,
  perPage = 10,
 }: FindDocumentsOptions) => {
  // ...
 };
 // ✅ Destructure on separate line when needed
 const onFormSubmit = form.handleSubmit(onSubmit);
 // ✅ Deconstruct nested properties explicitly
 const { user } = ctx;
 const { templateId } = input;
 ```
 ---
 ## React & Components
 ### Component Definition
 ```typescript
 // ✅ Use const with arrow function
 export const AddSignersFormPartial = ({
  documentFlow,
  recipients,
  fields,
  onSubmit,
 }: AddSignersFormProps) => {
  // ...
 };
 // ❌ Never use classes
 class MyComponent extends React.Component {
  // ...
 }
 ```
 ### Hooks
 ```typescript
 // ✅ Group related hooks together with blank line separation
 const { _ } = useLingui();
 const { toast } = useToast();
 const { currentStep, totalSteps, previousStep } = useStep();
 const form = useForm<TFormSchema>({
  resolver: zodResolver(ZFormSchema),
  defaultValues: {
    // ...
  },
 });
 ```
 ### Event Handlers
 ```typescript
 // ✅ Use arrow functions with descriptive names
 const onFormSubmit = async () => {
  await form.trigger();
  // ...
 };
 const onFieldCopy = useCallback(
  (event?: KeyboardEvent | null) => {
    event?.preventDefault();
    // ...
  },
  [dependencies],
 );
 // ✅ Inline handlers for simple operations
 <Button onClick={() => setOpen(false)}>Close</Button>
 ```
 ### State Management
 ```typescript
 // ✅ Descriptive state names with auxiliary verbs
 const [isLoading, setIsLoading] = useState(false);
 const [hasError, setHasError] = useState(false);
 const [showAdvancedSettings, setShowAdvancedSettings] = useState(false);
 // ✅ Complex state in single useState when related
 const [coords, setCoords] = useState({
  x: 0,
  y: 0,
 });
 ```
 ---
 ## Error Handling
 ### Try-Catch Blocks
 ```typescript
 // ✅ Use try-catch for operations that might fail
 try {
  const document = await getDocumentById({
    documentId: Number(documentId),
    userId: user.id,
  });
  return {
    status: 200,
    body: document,
  };
 } catch (err) {
  return {
    status: 404,
    body: {
      message: 'Document not found',
    },
  };
 }
 ```
 ### Throwing Errors
 ```typescript
 // ✅ Use AppError for application errors
 throw new AppError(AppErrorCode.NOT_FOUND, {
  message: 'Template not found',
 });
 // ✅ Use descriptive error messages
 if (!template) {
  throw new AppError(AppErrorCode.NOT_FOUND, {
    message: `Template with ID ${templateId} not found`,
  });
 }
 ```
 ### Error Parsing on Frontend
 ```typescript
 // ✅ Parse errors on the frontend
 try {
  await updateOrganisation({ organisationId, data });
 } catch (err) {
  const error = AppError.parseError(err);
  console.error(error);
  toast({
    title: t`An error occurred`,
    description: error.message,
    variant: 'destructive',
  });
 }
 ```
 ---
 ## Async/Await Patterns
 ### Async Function Definitions
 ```typescript
 // ✅ Mark async functions clearly
 export const createDocument = async ({
  userId,
  title,
 }: Options): Promise<Document> => {
  // ...
 };
 // ✅ Use await for promises
 const document = await prisma.document.create({ data });
 // ✅ Use Promise.all for parallel operations
 const [document, recipients] = await Promise.all([
  getDocumentById({ documentId }),
  getRecipientsForDocument({ documentId }),
 ]);
 ```
 ### Void for Fire-and-Forget
 ```typescript
 // ✅ Use void for intentionally unwaited promises
 void handleAutoSave();
 // ✅ Or in event handlers
 onClick={() => void onFormSubmit()}
 ```
 ---
 ## Whitespace & Formatting
 ### Blank Lines Between Concepts
 ```typescript
 // ✅ Blank line after imports
 import { prisma } from '@documenso/prisma';
 export const findDocuments = async () => {
  // ...
 };
 // ✅ Blank line between logical sections
 const user = await prisma.user.findFirst({ where: { id: userId } });
 let team = null;
 if (teamId !== undefined) {
  team = await getTeamById({ userId, teamId });
 }
 // ✅ Blank line before return statements
 const result = await someOperation();
 return result;
 ```
 ### Function/Method Spacing
 ```typescript
 // ✅ No blank lines between chained methods in same operation
 const documents = await prisma.document
  .findMany({ where: { userId } })
  .then((docs) => docs.map(maskTokens));
 // ✅ Blank line between different operations
 const document = await createDocument({ userId });
 await sendDocument({ documentId: document.id });
 return document;
 ```
 ### Object and Array Formatting
 ```typescript
 // ✅ Multi-line when complex
 const options = {
  userId,
  teamId,
  status: ExtendedDocumentStatus.ALL,
  page: 1,
 };
 // ✅ Single line when simple
 const coords = { x: 0, y: 0 };
 // ✅ Array items on separate lines when objects
 const recipients = [
  {
    name: 'John',
    email: 'john@example.com',
  },
  {
    name: 'Jane',
    email: 'jane@example.com',
  },
 ];
 ```
 ---
 ## Naming Conventions
 ### Variables
 ```typescript
 // ✅ camelCase for variables and functions
 const documentId = 123;
 const onSubmit = () => {};
 // ✅ Descriptive names with auxiliary verbs for booleans
 const isLoading = false;
 const hasError = false;
 const canEdit = true;
 const shouldRender = true;
 // ✅ Prefix with $ for DOM elements
 const $page = document.querySelector('.page');
 const $inputRef = useRef<HTMLInputElement>(null);
 ```
 ### Types and Schemas
 ```typescript
 // ✅ PascalCase for types
 type CreateDocumentOptions = {
  userId: number;
 };
 // ✅ Prefix Zod schemas with Z
 const ZCreateDocumentSchema = z.object({
  title: z.string(),
 });
 // ✅ Prefix type from Zod schema with T
 type TCreateDocumentSchema = z.infer<typeof ZCreateDocumentSchema>;
 ```
 ### Constants
 ```typescript
 // ✅ UPPER_SNAKE_CASE for true constants
 const DEFAULT_DOCUMENT_DATE_FORMAT = 'dd/MM/yyyy';
 const MAX_FILE_SIZE = 1024 * 1024 * 5;
 // ✅ camelCase for const variables that aren't "constants"
 const userId = await getUserId();
 ```
 ### Functions
 ```typescript
 // ✅ Verb-based names for functions
 const createDocument = async () => {};
 const findDocuments = async () => {};
 const updateDocument = async () => {};
 const deleteDocument = async () => {};
 // ✅ On prefix for event handlers
 const onSubmit = () => {};
 const onClick = () => {};
 const onFieldCopy = () => {}; // 'on' is also acceptable
 ```
 ### Clarity Over Brevity
 ```typescript
 // ✅ Prefer descriptive names over abbreviations
 const superLongMethodThatIsCorrect = () => {};
 const recipientAuthenticationOptions = {};
 const documentMetadata = {};
 // ❌ Avoid abbreviations that sacrifice clarity
 const supLongMethThatIsCorrect = () => {};
 const recipAuthOpts = {};
 const docMeta = {};
 // ✅ Common abbreviations that are widely understood are acceptable
 const userId = 123;
 const htmlElement = document.querySelector('div');
 const apiResponse = await fetch('/api');
 ```
 ---
 ## Pattern Matching
 ### Using ts-pattern
 ```typescript
 import { match } from 'ts-pattern';
 // ✅ Use match for complex conditionals
 const result = match(status)
  .with(ExtendedDocumentStatus.DRAFT, () => ({
    status: 'draft',
  }))
  .with(ExtendedDocumentStatus.PENDING, () => ({
    status: 'pending',
  }))
  .with(ExtendedDocumentStatus.COMPLETED, () => ({
    status: 'completed',
  }))
  .exhaustive();
 // ✅ Use .otherwise() for default case when not exhaustive
 const value = match(type)
  .with('text', () => 'Text field')
  .with('number', () => 'Number field')
  .otherwise(() => 'Unknown field');
 ```
 ---
 ## Database & Prisma
 ### Query Structure
 ```typescript
 // ✅ Destructure commonly used fields
 const { id, email, name } = user;
 // ✅ Use select to limit returned fields
 const user = await prisma.user.findFirst({
  where: { id: userId },
  select: {
    id: true,
    email: true,
    name: true,
  },
 });
 // ✅ Use include for relations
 const document = await prisma.document.findFirst({
  where: { id: documentId },
  include: {
    recipients: true,
    fields: true,
  },
 });
 ```
 ### Transactions
 ```typescript
 // ✅ Use transactions for related operations
 return await prisma.$transaction(async (tx) => {
  const document = await tx.document.create({ data });
  await tx.field.createMany({ data: fieldsData });
  await tx.documentAuditLog.create({ data: auditData });
  return document;
 });
 ```
 ### Where Clauses
 ```typescript
 // ✅ Build complex where clauses separately
 const whereClause: Prisma.DocumentWhereInput = {
  AND: [
    { userId: user.id },
    { deletedAt: null },
    { status: { in: [DocumentStatus.DRAFT, DocumentStatus.PENDING] } },
  ],
 };
 const documents = await prisma.document.findMany({
  where: whereClause,
 });
 ```
 ---
 ## TRPC Patterns
 ### Router Structure
 ```typescript
 // ✅ Destructure context and input at start
 .query(async ({ input, ctx }) => {
  const { teamId } = ctx;
  const { templateId } = input;
  ctx.logger.info({
    input: { templateId },
  });
  return await getTemplateById({
    id: templateId,
    userId: ctx.user.id,
    teamId,
  });
 });
 ```
 ### Request/Response Schemas
 ```typescript
 // ✅ Name schemas clearly
 const ZCreateDocumentRequestSchema = z.object({
  title: z.string(),
  recipients: z.array(ZRecipientSchema),
 });
 const ZCreateDocumentResponseSchema = z.object({
  documentId: z.number(),
  status: z.string(),
 });
 ```
 ### Error Handling in TRPC
 ```typescript
 // ✅ Catch and transform errors appropriately
 try {
  const result = await createDocument({ userId, data });
  return result;
 } catch (err) {
  return AppError.toRestAPIError(err);
 }
 // ✅ Or throw AppError directly
 if (!template) {
  throw new AppError(AppErrorCode.NOT_FOUND, {
    message: 'Template not found',
  });
 }
 ```
 ---
 ## Additional Patterns
 ### Optional Chaining
 ```typescript
 // ✅ Use optional chaining for potentially undefined values
 const email = user?.email;
 const recipientToken = recipient?.token ?? '';
 // ✅ Use nullish coalescing for defaults
 const pageSize = perPage ?? 10;
 const status = documentStatus ?? DocumentStatus.DRAFT;
 ```
 ### Array Operations
 ```typescript
 // ✅ Use functional array methods
 const activeRecipients = recipients.filter((r) => r.signingStatus === 'SIGNED');
 const recipientEmails = recipients.map((r) => r.email);
 const hasSignedRecipients = recipients.some((r) => r.signingStatus === 'SIGNED');
 // ✅ Use find instead of filter + [0]
 const recipient = recipients.find((r) => r.id === recipientId);
 ```
 ### Conditional Rendering
 ```typescript
 // ✅ Use && for conditional rendering
 {isLoading && <Loader />}
 // ✅ Use ternary for either/or
 {isLoading ? <Loader /> : <Content />}
 // ✅ Extract complex conditions to variables
 const shouldShowAdvanced = isAdmin && hasPermission && !isDisabled;
 {shouldShowAdvanced && <AdvancedSettings />}
 ```
 ---
 ## When in Doubt
 - **Consistency**: Follow the patterns you see in similar files
 - **Readability**: Favor code that's easy to read over clever one-liners
 - **Explicitness**: Be explicit rather than implicit
 - **Whitespace**: Use blank lines to separate logical sections
 - **Early Returns**: Use guard clauses to reduce nesting
 - **Functional**: Prefer functional patterns over imperative ones
--- a/apps/openpage-api/package.json
+++ b/apps/openpage-api/package.json
@ -5,7 +5,7 @@
  "scripts": {
    "dev": "next dev -p 3003",
    "build": "next build",
-    "start": "next start -p 3003",
+    "start": "next start",
    "lint:fix": "next lint --fix",
    "clean": "rimraf .next && rimraf node_modules"
  },
--- a/apps/remix/app/components/dialogs/admin-organisation-member-update-dialog.tsx
+++ b/apps/remix/app/components/dialogs/admin-organisation-member-update-dialog.tsx
@ -1,218 +0,0 @@
 import { useEffect, useState } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
 import { OrganisationMemberRole } from '@prisma/client';
 import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 import { match } from 'ts-pattern';
 import { z } from 'zod';
 import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisations';
 import { trpc } from '@documenso/trpc/react';
 import type { TGetAdminOrganisationResponse } from '@documenso/trpc/server/admin-router/get-admin-organisation.types';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
  DialogContent,
  DialogDescription,
  DialogFooter,
  DialogHeader,
  DialogTitle,
  DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
 import {
  Form,
  FormControl,
  FormField,
  FormItem,
  FormLabel,
  FormMessage,
 } from '@documenso/ui/primitives/form/form';
 import {
  Select,
  SelectContent,
  SelectItem,
  SelectTrigger,
  SelectValue,
 } from '@documenso/ui/primitives/select';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 export type AdminOrganisationMemberUpdateDialogProps = {
  trigger?: React.ReactNode;
  organisationId: string;
  organisationMember: TGetAdminOrganisationResponse['members'][number];
  isOwner: boolean;
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 const ZUpdateOrganisationMemberFormSchema = z.object({
  role: z.enum(['OWNER', 'ADMIN', 'MANAGER', 'MEMBER']),
 });
 type ZUpdateOrganisationMemberSchema = z.infer<typeof ZUpdateOrganisationMemberFormSchema>;
 export const AdminOrganisationMemberUpdateDialog = ({
  trigger,
  organisationId,
  organisationMember,
  isOwner,
  ...props
 }: AdminOrganisationMemberUpdateDialogProps) => {
  const [open, setOpen] = useState(false);
  const { t } = useLingui();
  const { toast } = useToast();
  const navigate = useNavigate();
  // Determine the current role value for the form
  const currentRoleValue = isOwner
    ? 'OWNER'
    : getHighestOrganisationRoleInGroup(
        organisationMember.organisationGroupMembers.map((ogm) => ogm.group),
      );
  const organisationMemberName = organisationMember.user.name ?? organisationMember.user.email;
  const form = useForm<ZUpdateOrganisationMemberSchema>({
    resolver: zodResolver(ZUpdateOrganisationMemberFormSchema),
    defaultValues: {
      role: currentRoleValue,
    },
  });
  const { mutateAsync: updateOrganisationMemberRole } =
    trpc.admin.organisationMember.updateRole.useMutation();
  const onFormSubmit = async ({ role }: ZUpdateOrganisationMemberSchema) => {
    try {
      await updateOrganisationMemberRole({
        organisationId,
        userId: organisationMember.userId,
        role,
      });
      const roleLabel = match(role)
        .with('OWNER', () => t`Owner`)
        .with(OrganisationMemberRole.ADMIN, () => t`Admin`)
        .with(OrganisationMemberRole.MANAGER, () => t`Manager`)
        .with(OrganisationMemberRole.MEMBER, () => t`Member`)
        .exhaustive();
      toast({
        title: t`Success`,
        description:
          role === 'OWNER'
            ? t`Ownership transferred to ${organisationMemberName}.`
            : t`Updated ${organisationMemberName} to ${roleLabel}.`,
        duration: 5000,
      });
      setOpen(false);
      // Refresh the page to show updated data
      await navigate(0);
    } catch (err) {
      console.error(err);
      toast({
        title: t`An unknown error occurred`,
        description: t`We encountered an unknown error while attempting to update this organisation member. Please try again later.`,
        variant: 'destructive',
      });
    }
  };
  useEffect(() => {
    if (!open) {
      return;
    }
    form.reset({
      role: currentRoleValue,
    });
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [open, currentRoleValue, form]);
  return (
    <Dialog
      {...props}
      open={open}
      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
    >
      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
        {trigger ?? (
          <Button variant="secondary">
            <Trans>Update role</Trans>
          </Button>
        )}
      </DialogTrigger>
      <DialogContent position="center">
        <DialogHeader>
          <DialogTitle>
            <Trans>Update organisation member</Trans>
          </DialogTitle>
          <DialogDescription className="mt-4">
            <Trans>
              You are currently updating{' '}
              <span className="font-bold">{organisationMemberName}.</span>
            </Trans>
          </DialogDescription>
        </DialogHeader>
        <Form {...form}>
          <form onSubmit={form.handleSubmit(onFormSubmit)}>
            <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
              <FormField
                control={form.control}
                name="role"
                render={({ field }) => (
                  <FormItem className="w-full">
                    <FormLabel required>
                      <Trans>Role</Trans>
                    </FormLabel>
                    <FormControl>
                      <Select {...field} onValueChange={field.onChange}>
                        <SelectTrigger className="text-muted-foreground">
                          <SelectValue />
                        </SelectTrigger>
                        <SelectContent className="w-full" position="popper">
                          <SelectItem value="OWNER">
                            <Trans>Owner</Trans>
                          </SelectItem>
                          <SelectItem value={OrganisationMemberRole.ADMIN}>
                            <Trans>Admin</Trans>
                          </SelectItem>
                          <SelectItem value={OrganisationMemberRole.MANAGER}>
                            <Trans>Manager</Trans>
                          </SelectItem>
                          <SelectItem value={OrganisationMemberRole.MEMBER}>
                            <Trans>Member</Trans>
                          </SelectItem>
                        </SelectContent>
                      </Select>
                    </FormControl>
                    <FormMessage />
                  </FormItem>
                )}
              />
              <DialogFooter className="mt-4">
                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
                  <Trans>Cancel</Trans>
                </Button>
                <Button type="submit" loading={form.formState.isSubmitting}>
                  <Trans>Update</Trans>
                </Button>
              </DialogFooter>
            </fieldset>
          </form>
        </Form>
      </DialogContent>
    </Dialog>
  );
 };
--- a/apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
+++ b/apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
@ -15,16 +15,18 @@ import {
 import { AnimatePresence, motion } from 'framer-motion';
 import { InfoIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 import { match } from 'ts-pattern';
 import * as z from 'zod';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import type { TEnvelope } from '@documenso/lib/types/envelope';
 import { formatSigningLink } from '@documenso/lib/utils/recipients';
 import { trpc, trpc as trpcReact } from '@documenso/trpc/react';
 import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
 import { DocumentSendEmailMessageHelper } from '@documenso/ui/components/document/document-send-email-message-helper';
 import { cn } from '@documenso/ui/lib/utils';
 import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
@ -63,7 +65,6 @@ export type EnvelopeDistributeDialogProps = {
    fields: Pick<Field, 'type' | 'recipientId'>[];
  };
  onDistribute?: () => Promise<void>;
  documentRootPath: string;
  trigger?: React.ReactNode;
 };
@ -88,7 +89,6 @@ export type TEnvelopeDistributeFormSchema = z.infer<typeof ZEnvelopeDistributeFo
 export const EnvelopeDistributeDialog = ({
  envelope,
  trigger,
  documentRootPath,
  onDistribute,
 }: EnvelopeDistributeDialogProps) => {
  const organisation = useCurrentOrganisation();
@ -97,7 +97,6 @@ export const EnvelopeDistributeDialog = ({
  const { toast } = useToast();
  const { t } = useLingui();
  const navigate = useNavigate();
  const [isOpen, setIsOpen] = useState(false);
@ -164,14 +163,6 @@ export const EnvelopeDistributeDialog = ({
      await onDistribute?.();
      let redirectPath = `${documentRootPath}/${envelope.id}`;
      if (meta.distributionMethod === DocumentDistributionMethod.NONE) {
        redirectPath += '?action=copy-links';
      }
      await navigate(redirectPath);
      toast({
        title: t`Envelope distributed`,
        description: t`Your envelope has been distributed successfully.`,
@ -207,7 +198,6 @@ export const EnvelopeDistributeDialog = ({
            <Trans>Recipients will be able to sign the document once sent</Trans>
          </DialogDescription>
        </DialogHeader>
        {!invalidEnvelopeCode ? (
          <Form {...form}>
            <form onSubmit={handleSubmit(onFormSubmit)}>
@ -230,11 +220,7 @@ export const EnvelopeDistributeDialog = ({
                  </TabsList>
                </Tabs>
-                <div
+                <div className="min-h-72">
                  className={cn('min-h-72', {
                    'min-h-[23rem]': organisation.organisationClaim.flags.emailDomains,
                  })}
                >
                  <AnimatePresence initial={false} mode="wait">
                    {distributionMethod === DocumentDistributionMethod.EMAIL && (
                      <motion.div
@ -369,18 +355,73 @@ export const EnvelopeDistributeDialog = ({
                        exit={{ opacity: 0, transition: { duration: 0.15 } }}
                        className="min-h-60 rounded-lg border"
                      >
-                        <div className="text-muted-foreground py-24 text-center text-sm">
+                        {envelope.status === DocumentStatus.DRAFT ? (
-                          <p>
+                          <div className="text-muted-foreground py-24 text-center text-sm">
-                            <Trans>We won't send anything to notify recipients.</Trans>
+                            <p>
-                          </p>
+                              <Trans>We won't send anything to notify recipients.</Trans>
                            </p>
-                          <p className="mt-2">
+                            <p className="mt-2">
-                            <Trans>
+                              <Trans>
-                              We will generate signing links for you, which you can send to the
+                                We will generate signing links for you, which you can send to the
-                              recipients through your method of choice.
+                                recipients through your method of choice.
-                            </Trans>
+                              </Trans>
-                          </p>
+                            </p>
-                        </div>
+                          </div>
                        ) : (
                          <ul className="text-muted-foreground divide-y">
                            {/* Todo: Envelopes - I don't think this section shows up */}
                            {recipients.length === 0 && (
                              <li className="flex flex-col items-center justify-center py-6 text-sm">
                                <Trans>No recipients</Trans>
                              </li>
                            )}
                            {recipients.map((recipient) => (
                              <li
                                key={recipient.id}
                                className="flex items-center justify-between px-4 py-3 text-sm"
                              >
                                <AvatarWithText
                                  avatarFallback={recipient.email.slice(0, 1).toUpperCase()}
                                  primaryText={
                                    <p className="text-muted-foreground text-sm">
                                      {recipient.email}
                                    </p>
                                  }
                                  secondaryText={
                                    <p className="text-muted-foreground/70 text-xs">
                                      {t(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
                                    </p>
                                  }
                                />
                                {recipient.role !== RecipientRole.CC && (
                                  <CopyTextButton
                                    value={formatSigningLink(recipient.token)}
                                    onCopySuccess={() => {
                                      toast({
                                        title: t`Copied to clipboard`,
                                        description: t`The signing link has been copied to your clipboard.`,
                                      });
                                    }}
                                    badgeContentUncopied={
                                      <p className="ml-1 text-xs">
                                        <Trans>Copy</Trans>
                                      </p>
                                    }
                                    badgeContentCopied={
                                      <p className="ml-1 text-xs">
                                        <Trans>Copied</Trans>
                                      </p>
                                    }
                                  />
                                )}
                              </li>
                            ))}
                          </ul>
                        )}
                      </motion.div>
                    )}
                  </AnimatePresence>
--- a/apps/remix/app/components/dialogs/envelope-download-dialog.tsx
+++ b/apps/remix/app/components/dialogs/envelope-download-dialog.tsx
@ -213,6 +213,8 @@ export const EnvelopeDownloadDialog = ({
              </div>
            ))
          )}
          {/* Todo: Envelopes - Download all button */}
        </div>
      </DialogContent>
    </Dialog>
--- a/apps/remix/app/components/dialogs/template-create-dialog.tsx
+++ b/apps/remix/app/components/dialogs/template-create-dialog.tsx
@ -7,9 +7,9 @@ import { FilePlus, Loader } from 'lucide-react';
 import { useNavigate } from 'react-router';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import type { TCreateTemplatePayloadSchema } from '@documenso/trpc/server/template-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
@ -54,13 +54,17 @@ export const TemplateCreateDialog = ({ folderId }: TemplateCreateDialogProps) =>
    setIsUploadingFile(true);
    try {
-      const response = await putPdfFile(file);
+      const payload = {
      const { legacyTemplateId: id } = await createTemplate({
        title: file.name,
        templateDocumentDataId: response.id,
        folderId: folderId,
-      });
+      } satisfies TCreateTemplatePayloadSchema;
      const formData = new FormData();
      formData.append('payload', JSON.stringify(payload));
      formData.append('file', file);
      const { envelopeId: id } = await createTemplate(formData);
      toast({
        title: _(msg`Template document uploaded`),
--- a/apps/remix/app/components/forms/editor/editor-field-signature-form.tsx
+++ b/apps/remix/app/components/forms/editor/editor-field-signature-form.tsx
@ -1,7 +1,6 @@
 import { useEffect } from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans } from '@lingui/react/macro';
 import { useForm, useWatch } from 'react-hook-form';
 import type { z } from 'zod';
@ -61,12 +60,7 @@ export const EditorFieldSignatureForm = ({
    <Form {...form}>
      <form>
        <fieldset className="flex flex-col gap-2">
-          <div>
+          <EditorGenericFontSizeField formControl={form.control} />
            <EditorGenericFontSizeField formControl={form.control} />
            <p className="text-muted-foreground mt-0.5 text-xs">
              <Trans>The typed signature font size</Trans>
            </p>
          </div>
        </fieldset>
      </form>
    </Form>
--- a/apps/remix/app/components/general/direct-template/direct-template-page.tsx
+++ b/apps/remix/app/components/general/direct-template/direct-template-page.tsx
@ -89,10 +89,7 @@ export const DirectTemplatePageView = ({
    setStep('sign');
  };
-  const onSignDirectTemplateSubmit = async (
+  const onSignDirectTemplateSubmit = async (fields: DirectTemplateLocalField[]) => {
    fields: DirectTemplateLocalField[],
    nextSigner?: { name: string; email: string },
  ) => {
    try {
      let directTemplateExternalId = searchParams?.get('externalId') || undefined;
@ -101,7 +98,6 @@ export const DirectTemplatePageView = ({
      }
      const { token } = await createDocumentFromDirectTemplate({
        nextSigner,
        directTemplateToken,
        directTemplateExternalId,
        directRecipientName: fullName,
--- a/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
+++ b/apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
@ -55,13 +55,10 @@ import { DocumentSigningRecipientProvider } from '../document-signing/document-s
 export type DirectTemplateSigningFormProps = {
  flowStep: DocumentFlowStep;
-  directRecipient: Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token' | 'id'>;
+  directRecipient: Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token'>;
  directRecipientFields: Field[];
  template: Omit<TTemplate, 'user'>;
-  onSubmit: (
+  onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
    _data: DirectTemplateLocalField[],
    _nextSigner?: { name: string; email: string },
  ) => Promise<void>;
 };
 export type DirectTemplateLocalField = Field & {
@ -152,7 +149,7 @@ export const DirectTemplateSigningForm = ({
    validateFieldsInserted(fieldsRequiringValidation);
  };
-  const handleSubmit = async (nextSigner?: { name: string; email: string }) => {
+  const handleSubmit = async () => {
    setValidateUninsertedFields(true);
    const isFieldsValid = validateFieldsInserted(fieldsRequiringValidation);
@ -164,7 +161,7 @@ export const DirectTemplateSigningForm = ({
    setIsSubmitting(true);
    try {
-      await onSubmit(localFields, nextSigner);
+      await onSubmit(localFields);
    } catch {
      setIsSubmitting(false);
    }
@ -221,30 +218,6 @@ export const DirectTemplateSigningForm = ({
    setLocalFields(updatedFields);
  }, []);
  const nextRecipient = useMemo(() => {
    if (
      !template.templateMeta?.signingOrder ||
      template.templateMeta.signingOrder !== 'SEQUENTIAL' ||
      !template.templateMeta.allowDictateNextSigner
    ) {
      return undefined;
    }
    const sortedRecipients = template.recipients.sort((a, b) => {
      // Sort by signingOrder first (nulls last), then by id
      if (a.signingOrder === null && b.signingOrder === null) return a.id - b.id;
      if (a.signingOrder === null) return 1;
      if (b.signingOrder === null) return -1;
      if (a.signingOrder === b.signingOrder) return a.id - b.id;
      return a.signingOrder - b.signingOrder;
    });
    const currentIndex = sortedRecipients.findIndex((r) => r.id === directRecipient.id);
    return currentIndex !== -1 && currentIndex < sortedRecipients.length - 1
      ? sortedRecipients[currentIndex + 1]
      : undefined;
  }, [template.templateMeta?.signingOrder, template.recipients, directRecipient.id]);
  return (
    <DocumentSigningRecipientProvider recipient={directRecipient}>
      <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
@ -444,15 +417,11 @@ export const DirectTemplateSigningForm = ({
          <DocumentSigningCompleteDialog
            isSubmitting={isSubmitting}
-            onSignatureComplete={async (nextSigner) => handleSubmit(nextSigner)}
+            onSignatureComplete={async () => handleSubmit()}
            documentTitle={template.title}
            fields={localFields}
            fieldsValidated={fieldsValidated}
            recipient={directRecipient}
            allowDictateNextSigner={nextRecipient && template.templateMeta?.allowDictateNextSigner}
            defaultNextSigner={
              nextRecipient ? { name: nextRecipient.name, email: nextRecipient.email } : undefined
            }
          />
        </div>
      </DocumentFlowFormContainerFooter>
--- a/apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
@ -8,13 +8,11 @@ import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitive
 export type DocumentSigningAttachmentsPopoverProps = {
  envelopeId: string;
  token: string;
  trigger?: React.ReactNode;
 };
 export const DocumentSigningAttachmentsPopover = ({
  envelopeId,
  token,
  trigger,
 }: DocumentSigningAttachmentsPopoverProps) => {
  const { data: attachments } = trpc.envelope.attachment.find.useQuery({
    envelopeId,
@ -28,17 +26,15 @@ export const DocumentSigningAttachmentsPopover = ({
  return (
    <Popover>
      <PopoverTrigger asChild>
-        {trigger ?? (
+        <Button variant="outline" className="gap-2">
-          <Button variant="outline" className="gap-2">
+          <PaperclipIcon className="h-4 w-4" />
-            <PaperclipIcon className="h-4 w-4" />
+          <span>
-            <span>
+            <Trans>Attachments</Trans>{' '}
-              <Trans>Attachments</Trans>{' '}
+            {attachments && attachments.data.length > 0 && (
-              {attachments && attachments.data.length > 0 && (
+              <span className="ml-1">({attachments.data.length})</span>
-                <span className="ml-1">({attachments.data.length})</span>
+            )}
-              )}
+          </span>
-            </span>
+        </Button>
          </Button>
        )}
      </PopoverTrigger>
      <PopoverContent className="w-96" align="start">
--- a/apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
@ -9,7 +9,7 @@ import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 export type DocumentSigningAuthPageViewProps = {
-  email?: string;
+  email: string;
  emailHasAccount?: boolean;
 };
@ -22,18 +22,12 @@ export const DocumentSigningAuthPageView = ({
  const [isSigningOut, setIsSigningOut] = useState(false);
-  const handleChangeAccount = async (email?: string) => {
+  const handleChangeAccount = async (email: string) => {
    try {
      setIsSigningOut(true);
      let redirectPath = '/signin';
      if (email) {
        redirectPath = emailHasAccount ? `/signin#email=${email}` : `/signup#email=${email}`;
      }
      await authClient.signOut({
-        redirectPath,
+        redirectPath: emailHasAccount ? `/signin#email=${email}` : `/signup#email=${email}`,
      });
    } catch {
      toast({
@ -55,13 +49,9 @@ export const DocumentSigningAuthPageView = ({
        </h1>
        <p className="text-muted-foreground mt-2 text-sm">
-          {email ? (
+          <Trans>
-            <Trans>
+            You need to be logged in as <strong>{email}</strong> to view this page.
-              You need to be logged in as <strong>{email}</strong> to view this page.
+          </Trans>
            </Trans>
          ) : (
            <Trans>You need to be logged in to view this page.</Trans>
          )}
        </p>
        <Button
--- a/apps/remix/app/components/general/document-signing/document-signing-auth-provider.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-auth-provider.tsx
@ -24,10 +24,7 @@ type PasskeyData = {
  isError: boolean;
 };
-type SigningAuthRecipient = Pick<
+type SigningAuthRecipient = Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token'>;
  Recipient,
  'authOptions' | 'email' | 'role' | 'name' | 'token' | 'id'
 >;
 export type DocumentSigningAuthContextValue = {
  executeActionAuthProcedure: (_value: ExecuteActionAuthProcedureOptions) => Promise<void>;
--- a/apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@ -304,6 +304,7 @@ export const DocumentSigningCompleteDialog = ({
                <form onSubmit={form.handleSubmit(onFormSubmit)}>
                  {allowDictateNextSigner && defaultNextSigner && (
                    <div className="mb-4 flex flex-col gap-4">
                      {/* Todo: Envelopes - Should we say "The next recipient to sign this document will be"? */}
                      <div className="flex flex-col gap-4 md:flex-row">
                        <FormField
                          control={form.control}
--- a/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
@ -3,7 +3,7 @@ import { lazy, useMemo } from 'react';
 import { Plural, Trans } from '@lingui/react/macro';
 import { EnvelopeType, RecipientRole } from '@prisma/client';
 import { motion } from 'framer-motion';
-import { ArrowLeftIcon, BanIcon, DownloadCloudIcon, PaperclipIcon } from 'lucide-react';
+import { ArrowLeftIcon, BanIcon, DownloadCloudIcon } from 'lucide-react';
 import { Link } from 'react-router';
 import { match } from 'ts-pattern';
@ -75,7 +75,7 @@ export const DocumentSigningPageViewV2 = () => {
      <EnvelopeSignerHeader />
      {/* Main Content Area */}
-      <div className="flex h-[calc(100vh-4rem)] w-screen">
+      <div className="flex h-[calc(100vh-73px)] w-screen">
        {/* Left Section - Step Navigation */}
        <div className="bg-background border-border hidden w-80 flex-shrink-0 flex-col overflow-y-auto border-r py-4 lg:flex">
          <div className="px-4">
@ -121,16 +121,12 @@ export const DocumentSigningPageViewV2 = () => {
                <Trans>Actions</Trans>
              </h4>
-              <DocumentSigningAttachmentsPopover
+              <div className="w-full">
-                envelopeId={envelope.id}
+                <DocumentSigningAttachmentsPopover
-                token={recipient.token}
+                  envelopeId={envelope.id}
-                trigger={
+                  token={recipient.token}
-                  <Button variant="ghost" size="sm" className="w-full justify-start">
+                />
-                    <PaperclipIcon className="mr-2 h-4 w-4" />
+              </div>
                    <Trans>Attachments</Trans>
                  </Button>
                }
              />
              <EnvelopeDownloadDialog
                envelopeId={envelope.id}
--- a/apps/remix/app/components/general/document-signing/envelope-signing-provider.tsx
+++ b/apps/remix/app/components/general/document-signing/envelope-signing-provider.tsx
@ -8,7 +8,6 @@ import {
  RecipientRole,
  SigningStatus,
 } from '@prisma/client';
 import { prop, sortBy } from 'remeda';
 import { isBase64Image } from '@documenso/lib/constants/signatures';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
@ -166,29 +165,7 @@ export const EnvelopeSigningProvider = ({
   * The fields that are still required to be signed by the actual recipient.
   */
  const recipientFieldsRemaining = useMemo(() => {
-    const requiredFields = envelopeData.recipient.fields
+    return envelopeData.recipient.fields.filter((field) => isFieldUnsignedAndRequired(field));
      .filter((field) => isFieldUnsignedAndRequired(field))
      .map((field) => {
        const envelopeItem = envelope.envelopeItems.find(
          (item) => item.id === field.envelopeItemId,
        );
        if (!envelopeItem) {
          throw new Error('Missing envelope item');
        }
        return {
          ...field,
          envelopeItemOrder: envelopeItem.order,
        };
      });
    return sortBy(
      requiredFields,
      [prop('envelopeItemOrder'), 'asc'],
      [prop('page'), 'asc'],
      [prop('positionY'), 'asc'],
    );
  }, [envelopeData.recipient.fields]);
  /**
@ -285,6 +262,8 @@ export const EnvelopeSigningProvider = ({
  }, [envelope.documentMeta?.signingOrder, envelope.recipients, recipient.id]);
  const signField = async (fieldId: number, fieldValue: TSignEnvelopeFieldValue) => {
    console.log('insertField', fieldId, fieldValue);
    // Set the field locally for direct templates.
    if (isDirectTemplate) {
      handleDirectTemplateFieldInsertion(fieldId, fieldValue);
--- a/apps/remix/app/components/general/document/document-certificate-qr-view.tsx
+++ b/apps/remix/app/components/general/document/document-certificate-qr-view.tsx
@ -4,10 +4,7 @@ import { Trans } from '@lingui/react/macro';
 import type { DocumentData, EnvelopeItem } from '@prisma/client';
 import { DateTime } from 'luxon';
-import {
+import { EnvelopeRenderProvider } from '@documenso/lib/client-only/providers/envelope-render-provider';
  EnvelopeRenderProvider,
  useCurrentEnvelopeRender,
 } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import PDFViewerKonvaLazy from '@documenso/ui/components/pdf-viewer/pdf-viewer-konva-lazy';
@ -95,60 +92,6 @@ export const DocumentCertificateQRView = ({
        </Dialog>
      )}
      {internalVersion === 2 ? (
        <EnvelopeRenderProvider envelope={{ envelopeItems }}>
          <DocumentCertificateQrV2
            title={title}
            recipientCount={recipientCount}
            formattedDate={formattedDate}
          />
        </EnvelopeRenderProvider>
      ) : (
        <>
          <div className="flex w-full flex-col justify-between gap-4 md:flex-row md:items-end">
            <div className="space-y-1">
              <h1 className="text-xl font-medium">{title}</h1>
              <div className="text-muted-foreground flex flex-col gap-0.5 text-sm">
                <p>
                  <Trans>{recipientCount} recipients</Trans>
                </p>
                <p>
                  <Trans>Completed on {formattedDate}</Trans>
                </p>
              </div>
            </div>
            <ShareDocumentDownloadButton
              title={title}
              documentData={envelopeItems[0].documentData}
            />
          </div>
          <div className="mt-12 w-full">
            <PDFViewer key={envelopeItems[0].id} documentData={envelopeItems[0].documentData} />
          </div>
        </>
      )}
    </div>
  );
 };
 type DocumentCertificateQrV2Props = {
  title: string;
  recipientCount: number;
  formattedDate: string;
 };
 const DocumentCertificateQrV2 = ({
  title,
  recipientCount,
  formattedDate,
 }: DocumentCertificateQrV2Props) => {
  const { currentEnvelopeItem } = useCurrentEnvelopeRender();
  return (
    <div className="flex min-h-screen flex-col items-start">
      <div className="flex w-full flex-col justify-between gap-4 md:flex-row md:items-end">
        <div className="space-y-1">
          <h1 className="text-xl font-medium">{title}</h1>
@ -163,18 +106,21 @@ const DocumentCertificateQrV2 = ({
          </div>
        </div>
-        {currentEnvelopeItem && (
+        <ShareDocumentDownloadButton title={title} documentData={envelopeItems[0].documentData} />
          <ShareDocumentDownloadButton
            title={title}
            documentData={currentEnvelopeItem.documentData}
          />
        )}
      </div>
      <div className="mt-12 w-full">
-        <EnvelopeRendererFileSelector className="mb-4 p-0" fields={[]} secondaryOverride={''} />
+        {internalVersion === 2 ? (
          <EnvelopeRenderProvider envelope={{ envelopeItems }}>
            <EnvelopeRendererFileSelector className="mb-4 p-0" fields={[]} secondaryOverride={''} />
-        <PDFViewerKonvaLazy customPageRenderer={EnvelopeGenericPageRenderer} />
+            <PDFViewerKonvaLazy customPageRenderer={EnvelopeGenericPageRenderer} />
          </EnvelopeRenderProvider>
        ) : (
          <>
            <PDFViewer key={envelopeItems[0].id} documentData={envelopeItems[0].documentData} />
          </>
        )}
      </div>
    </div>
  );
--- a/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+++ b/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
@ -16,9 +16,9 @@ import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/l
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import type { TCreateDocumentPayloadSchema } from '@documenso/trpc/server/document-router/create-document.types';
 import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@ -62,14 +62,18 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
    try {
      setIsLoading(true);
-      const response = await putPdfFile(file);
+      const payload = {
      const { legacyDocumentId: id } = await createDocument({
        title: file.name,
-        documentDataId: response.id,
+        timezone: userTimezone,
        timezone: userTimezone, // Note: When migrating to v2 document upload remember to pass this through as a 'userTimezone' field.
        folderId: folderId ?? undefined,
-      });
+      } satisfies TCreateDocumentPayloadSchema;
      const formData = new FormData();
      formData.append('payload', JSON.stringify(payload));
      formData.append('file', file);
      const { envelopeId: id } = await createDocument(formData);
      void refreshLimits();
--- a/apps/remix/app/components/general/document/document-page-view-recipients.tsx
+++ b/apps/remix/app/components/general/document/document-page-view-recipients.tsx
@ -1,10 +1,7 @@
 import { useEffect, useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@prisma/client';
 import { TooltipArrow } from '@radix-ui/react-tooltip';
 import {
  AlertTriangle,
  CheckIcon,
@ -15,7 +12,7 @@ import {
  PlusIcon,
  UserIcon,
 } from 'lucide-react';
-import { Link, useSearchParams } from 'react-router';
+import { Link } from 'react-router';
 import { match } from 'ts-pattern';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
@ -27,12 +24,6 @@ import { SignatureIcon } from '@documenso/ui/icons/signature';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import { Badge } from '@documenso/ui/primitives/badge';
 import { PopoverHover } from '@documenso/ui/primitives/popover';
 import {
  Tooltip,
  TooltipContent,
  TooltipProvider,
  TooltipTrigger,
 } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 export type DocumentPageViewRecipientsProps = {
@ -46,24 +37,8 @@ export const DocumentPageViewRecipients = ({
 }: DocumentPageViewRecipientsProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
  const [searchParams, setSearchParams] = useSearchParams();
  const recipients = envelope.recipients;
  const [shouldHighlightCopyButtons, setShouldHighlightCopyButtons] = useState(false);
  // Check for action=view-tokens query parameter and set highlighting state
  useEffect(() => {
    const hasViewTokensAction = searchParams.get('action') === 'copy-links';
    if (hasViewTokensAction) {
      setShouldHighlightCopyButtons(true);
      // Remove the query parameter immediately
      const params = new URLSearchParams(searchParams);
      params.delete('action');
      setSearchParams(params);
    }
  }, [searchParams, setSearchParams]);
  return (
    <section className="dark:bg-background border-border bg-widget flex flex-col rounded-xl border">
@ -94,7 +69,7 @@ export const DocumentPageViewRecipients = ({
          </li>
        )}
-        {recipients.map((recipient, i) => (
+        {recipients.map((recipient) => (
          <li key={recipient.id} className="flex items-center justify-between px-4 py-2.5 text-sm">
            <AvatarWithText
              avatarFallback={recipient.email.slice(0, 1).toUpperCase()}
@ -184,33 +159,15 @@ export const DocumentPageViewRecipients = ({
              {envelope.status === DocumentStatus.PENDING &&
                recipient.signingStatus === SigningStatus.NOT_SIGNED &&
                recipient.role !== RecipientRole.CC && (
-                  <TooltipProvider>
+                  <CopyTextButton
-                    <Tooltip open={shouldHighlightCopyButtons && i === 0}>
+                    value={formatSigningLink(recipient.token)}
-                      <TooltipTrigger asChild>
+                    onCopySuccess={() => {
-                        <div
+                      toast({
-                          className={shouldHighlightCopyButtons ? 'animate-pulse' : ''}
+                        title: _(msg`Copied to clipboard`),
-                          onClick={() => setShouldHighlightCopyButtons(false)}
+                        description: _(msg`The signing link has been copied to your clipboard.`),
-                        >
+                      });
-                          <CopyTextButton
+                    }}
-                            value={formatSigningLink(recipient.token)}
+                  />
                            onCopySuccess={() => {
                              toast({
                                title: _(msg`Copied to clipboard`),
                                description: _(
                                  msg`The signing link has been copied to your clipboard.`,
                                ),
                              });
                              setShouldHighlightCopyButtons(false);
                            }}
                          />
                        </div>
                      </TooltipTrigger>
                      <TooltipContent sideOffset={2}>
                        <Trans>Copy Signing Links</Trans>
                        <TooltipArrow className="fill-background" />
                      </TooltipContent>
                    </Tooltip>
                  </TooltipProvider>
                )}
            </div>
          </li>
--- a/apps/remix/app/components/general/document/document-upload-button.tsx
+++ b/apps/remix/app/components/general/document/document-upload-button.tsx
@ -13,9 +13,9 @@ import { useSession } from '@documenso/lib/client-only/providers/session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import type { TCreateDocumentPayloadSchema } from '@documenso/trpc/server/document-router/create-document.types';
 import { cn } from '@documenso/ui/lib/utils';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-upload';
 import {
@ -73,14 +73,18 @@ export const DocumentUploadButton = ({ className }: DocumentUploadButtonProps) =
    try {
      setIsLoading(true);
-      const response = await putPdfFile(file);
+      const payload = {
      const { legacyDocumentId: id } = await createDocument({
        title: file.name,
        documentDataId: response.id,
        timezone: userTimezone,
        folderId: folderId ?? undefined,
-      });
+      } satisfies TCreateDocumentPayloadSchema;
      const formData = new FormData();
      formData.append('payload', JSON.stringify(payload));
      formData.append('file', file);
      const { envelopeId: id } = await createDocument(formData);
      void refreshLimits();
--- a/apps/remix/app/components/general/document/envelope-upload-button.tsx
+++ b/apps/remix/app/components/general/document/envelope-upload-button.tsx
@ -14,9 +14,9 @@ import { useSession } from '@documenso/lib/client-only/providers/session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import type { TCreateEnvelopePayload } from '@documenso/trpc/server/envelope-router/create-envelope.types';
 import { cn } from '@documenso/ui/lib/utils';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-upload';
 import {
@ -78,35 +78,24 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
    try {
      setIsLoading(true);
-      const result = await Promise.all(
+      const payload = {
        files.map(async (file) => {
          try {
            const response = await putPdfFile(file);
            return {
              title: file.name,
              documentDataId: response.id,
            };
          } catch (err) {
            console.error(err);
            throw new Error('Failed to upload document');
          }
        }),
      );
      const envelopeItemsToCreate = result.filter(
        (item): item is { title: string; documentDataId: string } => item !== undefined,
      );
      const { id } = await createEnvelope({
        folderId,
        type,
        title: files[0].name,
        items: envelopeItemsToCreate,
        meta: {
          timezone: userTimezone,
        },
-      }).catch((error) => {
+      } satisfies TCreateEnvelopePayload;
      const formData = new FormData();
      formData.append('payload', JSON.stringify(payload));
      for (const file of files) {
        formData.append('files', file);
      }
      const { id } = await createEnvelope(formData).catch((error) => {
        console.error(error);
        throw error;
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx
@ -57,6 +57,8 @@ export default function EnvelopeEditorFieldsPageRenderer() {
  );
  const handleResizeOrMove = (event: KonvaEventObject<Event>) => {
    console.log('Field resized or moved');
    const { current: container } = canvasElement;
    if (!container) {
@ -271,6 +273,9 @@ export default function EnvelopeEditorFieldsPageRenderer() {
        return;
      }
      console.log(`pointerPosition.x: ${pointerPosition.x}`);
      console.log(`pointerPosition.y: ${pointerPosition.y}`);
      x1 = pointerPosition.x / scale;
      y1 = pointerPosition.y / scale;
      x2 = pointerPosition.x / scale;
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
@ -5,7 +5,6 @@ import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { FieldType, RecipientRole } from '@prisma/client';
 import { FileTextIcon } from 'lucide-react';
 import { Link } from 'react-router';
 import { isDeepEqual } from 'remeda';
 import { match } from 'ts-pattern';
@ -21,7 +20,6 @@ import type {
  TNameFieldMeta,
  TNumberFieldMeta,
  TRadioFieldMeta,
  TSignatureFieldMeta,
  TTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
 import { canRecipientFieldsBeModified } from '@documenso/lib/utils/recipients';
@ -39,7 +37,6 @@ import { EditorFieldInitialsForm } from '~/components/forms/editor/editor-field-
 import { EditorFieldNameForm } from '~/components/forms/editor/editor-field-name-form';
 import { EditorFieldNumberForm } from '~/components/forms/editor/editor-field-number-form';
 import { EditorFieldRadioForm } from '~/components/forms/editor/editor-field-radio-form';
 import { EditorFieldSignatureForm } from '~/components/forms/editor/editor-field-signature-form';
 import { EditorFieldTextForm } from '~/components/forms/editor/editor-field-text-form';
 import { EnvelopeEditorFieldDragDrop } from './envelope-editor-fields-drag-drop';
@ -64,7 +61,7 @@ const FieldSettingsTypeTranslations: Record<FieldType, MessageDescriptor> = {
 };
 export const EnvelopeEditorFieldsPage = () => {
-  const { envelope, editorFields, relativePath } = useCurrentEnvelopeEditor();
+  const { envelope, editorFields } = useCurrentEnvelopeEditor();
  const { currentEnvelopeItem } = useCurrentEnvelopeRender();
@ -107,12 +104,12 @@ export const EnvelopeEditorFieldsPage = () => {
  return (
    <div className="relative flex h-full">
-      <div className="flex w-full flex-col overflow-y-auto">
+      <div className="flex w-full flex-col">
        {/* Horizontal envelope item selector */}
        <EnvelopeRendererFileSelector fields={editorFields.localFields} />
        {/* Document View */}
-        <div className="mt-4 flex h-full justify-center p-4">
+        <div className="mt-4 flex justify-center p-4">
          {currentEnvelopeItem !== null ? (
            <PDFViewerKonvaLazy customPageRenderer={EnvelopeEditorFieldsPageRenderer} />
          ) : (
@ -131,7 +128,7 @@ export const EnvelopeEditorFieldsPage = () => {
      {/* Right Section - Form Fields Panel */}
      {currentEnvelopeItem && (
-        <div className="bg-background border-border sticky top-0 h-full w-80 flex-shrink-0 overflow-y-auto border-l py-4">
+        <div className="bg-background border-border sticky top-0 h-[calc(100vh-73px)] w-80 flex-shrink-0 overflow-y-auto border-l py-4">
          {/* Recipient selector section. */}
          <section className="px-4">
            <h3 className="text-foreground mb-2 text-sm font-semibold">
@ -140,14 +137,8 @@ export const EnvelopeEditorFieldsPage = () => {
            {envelope.recipients.length === 0 ? (
              <Alert variant="warning">
-                <AlertDescription className="flex flex-col gap-2">
+                <AlertDescription>
                  <Trans>You need at least one recipient to add fields</Trans>
                  <Link to={`${relativePath.editorPath}`} className="text-sm">
                    <p>
                      <Trans>Click here to add a recipient</Trans>
                    </p>
                  </Link>
                </AlertDescription>
              </Alert>
            ) : (
@ -191,7 +182,7 @@ export const EnvelopeEditorFieldsPage = () => {
          {/* Field details section. */}
          <AnimateGenericFadeInOut key={editorFields.selectedField?.formId}>
-            {selectedField && (
+            {selectedField && selectedField.type !== FieldType.SIGNATURE && (
              <section>
                <Separator className="my-4" />
@ -201,12 +192,6 @@ export const EnvelopeEditorFieldsPage = () => {
                  </h3>
                  {match(selectedField.type)
                    .with(FieldType.SIGNATURE, () => (
                      <EditorFieldSignatureForm
                        value={selectedField?.fieldMeta as TSignatureFieldMeta | undefined}
                        onValueChange={(value) => updateSelectedFieldMeta(value)}
                      />
                    ))
                    .with(FieldType.CHECKBOX, () => (
                      <EditorFieldCheckboxForm
                        value={selectedField?.fieldMeta as TCheckboxFieldMeta | undefined}
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx
@ -37,6 +37,7 @@ export default function EnvelopeEditorHeader() {
    updateEnvelope,
    autosaveError,
    relativePath,
    syncEnvelope,
    editorFields,
  } = useCurrentEnvelopeEditor();
@ -151,7 +152,7 @@ export default function EnvelopeEditorHeader() {
                  ...envelope,
                  fields: editorFields.localFields,
                }}
-                documentRootPath={relativePath.documentRootPath}
+                onDistribute={syncEnvelope}
                trigger={
                  <Button size="sm">
                    <SendIcon className="mr-2 h-4 w-4" />
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-preview-page.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-preview-page.tsx
@ -33,7 +33,7 @@ export const EnvelopeEditorPreviewPage = () => {
  return (
    <div className="relative flex h-full">
-      <div className="flex w-full flex-col overflow-y-auto">
+      <div className="flex w-full flex-col">
        {/* Horizontal envelope item selector */}
        <EnvelopeRendererFileSelector fields={editorFields.localFields} />
@ -82,7 +82,7 @@ export const EnvelopeEditorPreviewPage = () => {
      {/* Right Section - Form Fields Panel */}
      {currentEnvelopeItem && false && (
-        <div className="sticky top-0 h-full w-80 flex-shrink-0 overflow-y-auto border-l border-gray-200 bg-white py-4">
+        <div className="sticky top-0 h-[calc(100vh-73px)] w-80 flex-shrink-0 overflow-y-auto border-l border-gray-200 bg-white py-4">
          {/* Add fields section. */}
          <section className="px-4">
            {/* <h3 className="mb-2 text-sm font-semibold text-gray-900">
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx
@ -14,7 +14,7 @@ import { DocumentSigningOrder, EnvelopeType, RecipientRole, SendStatus } from '@
 import { motion } from 'framer-motion';
 import { GripVerticalIcon, HelpCircleIcon, PlusIcon, TrashIcon } from 'lucide-react';
 import { useFieldArray, useForm, useWatch } from 'react-hook-form';
-import { isDeepEqual, prop, sortBy } from 'remeda';
+import { prop, sortBy } from 'remeda';
 import { z } from 'zod';
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
@ -148,7 +148,8 @@ export const EnvelopeEditorRecipientForm = () => {
    },
  });
-  const recipientHasAuthSettings = useMemo(() => {
+  // Always show advanced settings if any recipient has auth options.
  const alwaysShowAdvancedSettings = useMemo(() => {
    const recipientHasAuthOptions = recipients.find((recipient) => {
      const recipientAuthOptions = ZRecipientAuthOptionsSchema.parse(recipient.authOptions);
@ -164,7 +165,7 @@ export const EnvelopeEditorRecipientForm = () => {
    return recipientHasAuthOptions !== undefined || formHasActionAuth !== undefined;
  }, [recipients, form]);
-  const [showAdvancedSettings, setShowAdvancedSettings] = useState(recipientHasAuthSettings);
+  const [showAdvancedSettings, setShowAdvancedSettings] = useState(alwaysShowAdvancedSettings);
  const [showSigningOrderConfirmation, setShowSigningOrderConfirmation] = useState(false);
  const {
@ -463,7 +464,7 @@ export const EnvelopeEditorRecipientForm = () => {
    const formValueSigners = formValues.signers || [];
    // Remove the last signer if it's empty.
-    const nonEmptyRecipients = formValueSigners.filter((signer, i) => {
+    const recipients = formValueSigners.filter((signer, i) => {
      if (i === formValueSigners.length - 1 && signer.email === '') {
        return false;
      }
@ -473,48 +474,26 @@ export const EnvelopeEditorRecipientForm = () => {
    const validatedFormValues = ZEnvelopeRecipientsForm.safeParse({
      ...formValues,
-      signers: nonEmptyRecipients,
+      signers: recipients,
    });
-    if (!validatedFormValues.success) {
+    if (validatedFormValues.success) {
-      return;
+      console.log('validatedFormValues', validatedFormValues);
    }
    const { data } = validatedFormValues;
    const hasSigningOrderChanged = envelope.documentMeta.signingOrder !== data.signingOrder;
    const hasAllowDictateNextSignerChanged =
      envelope.documentMeta.allowDictateNextSigner !== data.allowDictateNextSigner;
    const hasSignersChanged =
      data.signers.length !== recipients.length ||
      data.signers.some((signer) => {
        const recipient = recipients.find((recipient) => recipient.id === signer.id);
        if (!recipient) {
          return true;
        }
        return (
          signer.email !== recipient.email ||
          signer.name !== recipient.name ||
          signer.role !== recipient.role ||
          signer.signingOrder !== recipient.signingOrder ||
          !isDeepEqual(signer.actionAuth, recipient.authOptions?.actionAuth)
        );
      });
    if (hasSignersChanged) {
      setRecipientsDebounced(validatedFormValues.data.signers);
    }
-    if (hasSigningOrderChanged || hasAllowDictateNextSignerChanged) {
+      if (
-      updateEnvelope({
+        validatedFormValues.data.signingOrder !== envelope.documentMeta.signingOrder ||
-        meta: {
+        validatedFormValues.data.allowDictateNextSigner !==
-          signingOrder: validatedFormValues.data.signingOrder,
+          envelope.documentMeta.allowDictateNextSigner
-          allowDictateNextSigner: validatedFormValues.data.allowDictateNextSigner,
+      ) {
-        },
+        updateEnvelope({
-      });
+          meta: {
            signingOrder: validatedFormValues.data.signingOrder,
            allowDictateNextSigner: validatedFormValues.data.allowDictateNextSigner,
          },
        });
      }
    }
  }, [formValues]);
@ -555,16 +534,17 @@ export const EnvelopeEditorRecipientForm = () => {
        <AnimateGenericFadeInOut motionKey={showAdvancedSettings ? 'Show' : 'Hide'}>
          <Form {...form}>
            <div className="bg-accent/50 -mt-2 mb-2 space-y-4 rounded-md p-4">
-              {organisation.organisationClaim.flags.cfr21 && (
+              {!alwaysShowAdvancedSettings && organisation.organisationClaim.flags.cfr21 && (
                <div className="flex flex-row items-center">
                  <Checkbox
                    id="showAdvancedRecipientSettings"
                    className="h-5 w-5"
                    checked={showAdvancedSettings}
                    onCheckedChange={(value) => setShowAdvancedSettings(Boolean(value))}
                  />
                  <label
-                    className="ml-2 text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                    className="text-muted-foreground ml-2 text-sm"
                    htmlFor="showAdvancedRecipientSettings"
                  >
                    <Trans>Show advanced settings</Trans>
@ -723,48 +703,171 @@ export const EnvelopeEditorRecipientForm = () => {
                            <motion.fieldset
                              data-native-id={signer.id}
                              disabled={isSubmitting || !canRecipientBeModified(signer.id)}
-                              className={cn('pb-2', {
+                              className={cn('grid grid-cols-10 items-end gap-2 pb-2', {
-                                'border-b pb-4':
+                                'border-b pt-2': showAdvancedSettings,
-                                  showAdvancedSettings && index !== signers.length - 1,
+                                'grid-cols-12 pr-3': isSigningOrderSequential,
                                'pt-2': showAdvancedSettings && index === 0,
                                'pr-3': isSigningOrderSequential,
                              })}
                            >
-                              <div className="flex flex-row items-center gap-x-2">
+                              {isSigningOrderSequential && (
-                                {isSigningOrderSequential && (
+                                <FormField
                                  control={form.control}
                                  name={`signers.${index}.signingOrder`}
                                  render={({ field }) => (
                                    <FormItem
                                      className={cn(
                                        'col-span-1 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-full 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', {
                                      'mb-6':
                                        form.formState.errors.signers?.[index] &&
                                        !form.formState.errors.signers[index]?.email,
                                      'col-span-4': !showAdvancedSettings,
                                      'col-span-5': showAdvancedSettings,
                                    })}
                                  >
                                    {!showAdvancedSettings && index === 0 && (
                                      <FormLabel required>
                                        <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({
                                      'mb-6':
                                        form.formState.errors.signers?.[index] &&
                                        !form.formState.errors.signers[index]?.name,
                                      'col-span-4': !showAdvancedSettings,
                                      'col-span-5': showAdvancedSettings,
                                    })}
                                  >
                                    {!showAdvancedSettings && index === 0 && (
                                      <FormLabel>
                                        <Trans>Name</Trans>
                                      </FormLabel>
                                    )}
                                    <FormControl>
                                      <RecipientAutoCompleteInput
                                        type="text"
                                        placeholder={t`Name`}
                                        {...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>
                                )}
                              />
                              {showAdvancedSettings &&
                                organisation.organisationClaim.flags.cfr21 && (
                                  <FormField
                                    control={form.control}
-                                    name={`signers.${index}.signingOrder`}
+                                    name={`signers.${index}.actionAuth`}
                                    render={({ field }) => (
                                      <FormItem
-                                        className={cn(
+                                        className={cn('col-span-8', {
-                                          'mt-auto flex items-center gap-x-1 space-y-0',
+                                          'mb-6':
-                                          {
+                                            form.formState.errors.signers?.[index] &&
-                                            'mb-6':
+                                            !form.formState.errors.signers[index]?.actionAuth,
-                                              form.formState.errors.signers?.[index] &&
+                                          'col-span-10': isSigningOrderSequential,
-                                              !form.formState.errors.signers[index]?.signingOrder,
+                                        })}
                                          },
                                        )}
                                      >
                                        <GripVerticalIcon className="h-5 w-5 flex-shrink-0 opacity-40" />
                                        <FormControl>
-                                          <Input
+                                          <RecipientActionAuthSelect
                                            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) => {
+                                            onValueChange={field.onChange}
                                              field.onChange(e);
                                              handleSigningOrderChange(index, e.target.value);
                                            }}
                                            onBlur={(e) => {
                                              field.onBlur();
                                              handleSigningOrderChange(index, e.target.value);
                                            }}
                                            disabled={
                                              snapshot.isDragging ||
                                              isSubmitting ||
@ -772,109 +875,20 @@ export const EnvelopeEditorRecipientForm = () => {
                                            }
                                          />
                                        </FormControl>
                                        <FormMessage />
                                      </FormItem>
                                    )}
                                  />
                                )}
-                                <FormField
+                              <div className="col-span-2 flex gap-x-2">
                                  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 required>
                                          <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`Name`}
                                          {...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', {
+                                      className={cn('mt-auto', {
                                        'mb-6':
                                          form.formState.errors.signers?.[index] &&
                                          !form.formState.errors.signers[index]?.role,
@ -902,11 +916,14 @@ export const EnvelopeEditorRecipientForm = () => {
                                  )}
                                />
-                                <Button
+                                <button
-                                  variant="ghost"
+                                  type="button"
-                                  className={cn('mt-auto px-2', {
+                                  className={cn(
-                                    'mb-6': form.formState.errors.signers?.[index],
+                                    'mt-auto inline-flex h-10 w-10 items-center justify-center hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50',
-                                  })}
+                                    {
                                      'mb-6': form.formState.errors.signers?.[index],
                                    },
                                  )}
                                  data-testid="remove-signer-button"
                                  disabled={
                                    snapshot.isDragging ||
@ -917,40 +934,8 @@ export const EnvelopeEditorRecipientForm = () => {
                                  onClick={() => onRemoveSigner(index)}
                                >
                                  <TrashIcon className="h-4 w-4" />
-                                </Button>
+                                </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>
                        )}
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
@ -355,7 +355,7 @@ export const EnvelopeEditorSettingsDialog = ({
          <Form {...form}>
            <form onSubmit={form.handleSubmit(onFormSubmit)}>
              <fieldset
-                className="flex h-[45rem] max-h-[calc(100vh-14rem)] w-full flex-col space-y-6 overflow-y-auto px-6 pt-6"
+                className="flex min-h-[45rem] w-full flex-col space-y-6 px-6 pt-6"
                disabled={form.formState.isSubmitting}
                key={activeTab}
              >
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor.tsx
@ -81,6 +81,7 @@ export default function EnvelopeEditor() {
    isAutosaving,
    flushAutosave,
    relativePath,
    syncEnvelope,
    editorFields,
  } = useCurrentEnvelopeEditor();
@ -156,7 +157,7 @@ export default function EnvelopeEditor() {
      <EnvelopeEditorHeader />
      {/* Main Content Area */}
-      <div className="flex h-[calc(100vh-4rem)] w-screen">
+      <div className="flex h-[calc(100vh-73px)] w-screen">
        {/* Left Section - Step Navigation */}
        <div className="bg-background border-border flex w-80 flex-shrink-0 flex-col overflow-y-auto border-r py-4">
          {/* Left section step selector. */}
@ -250,7 +251,7 @@ export default function EnvelopeEditor() {
                  ...envelope,
                  fields: editorFields.localFields,
                }}
-                documentRootPath={relativePath.documentRootPath}
+                onDistribute={syncEnvelope}
                trigger={
                  <Button variant="ghost" size="sm" className="w-full justify-start">
                    <SendIcon className="mr-2 h-4 w-4" />
@ -368,14 +369,16 @@ export default function EnvelopeEditor() {
        </div>
        {/* Main Content - Changes based on current step */}
-        <AnimateGenericFadeInOut className="flex-1 overflow-y-auto" key={currentStep}>
+        <div className="flex-1 overflow-y-auto">
-          {match({ currentStep, isStepLoading })
+          <AnimateGenericFadeInOut key={currentStep}>
-            .with({ isStepLoading: true }, () => <SpinnerBox className="py-32" />)
+            {match({ currentStep, isStepLoading })
-            .with({ currentStep: 'upload' }, () => <EnvelopeEditorUploadPage />)
+              .with({ isStepLoading: true }, () => <SpinnerBox className="py-32" />)
-            .with({ currentStep: 'addFields' }, () => <EnvelopeEditorFieldsPage />)
+              .with({ currentStep: 'upload' }, () => <EnvelopeEditorUploadPage />)
-            .with({ currentStep: 'preview' }, () => <EnvelopeEditorPreviewPage />)
+              .with({ currentStep: 'addFields' }, () => <EnvelopeEditorFieldsPage />)
-            .exhaustive()}
+              .with({ currentStep: 'preview' }, () => <EnvelopeEditorPreviewPage />)
-        </AnimateGenericFadeInOut>
+              .exhaustive()}
          </AnimateGenericFadeInOut>
        </div>
      </div>
    </div>
  );
--- a/apps/remix/app/components/general/envelope-editor/envelope-file-selector.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-file-selector.tsx
@ -20,8 +20,7 @@ export const EnvelopeItemSelector = ({
 }: EnvelopeItemSelectorProps) => {
  return (
    <button
-      title={typeof primaryText === 'string' ? primaryText : undefined}
+      className={`flex min-w-0 flex-shrink-0 cursor-pointer items-center space-x-3 rounded-lg border px-4 py-3 transition-colors ${
      className={`flex h-fit max-w-72 flex-shrink-0 cursor-pointer items-center space-x-3 rounded-lg border px-4 py-3 transition-colors ${
        isSelected
          ? 'border-green-200 bg-green-50 text-green-900 dark:border-green-400/30 dark:bg-green-400/10 dark:text-green-400'
          : 'border-border bg-muted/50 hover:bg-muted/70'
@ -40,7 +39,7 @@ export const EnvelopeItemSelector = ({
        <div className="text-xs text-gray-500">{secondaryText}</div>
      </div>
      <div
-        className={cn('h-2 w-2 flex-shrink-0 rounded-full', {
+        className={cn('h-2 w-2 rounded-full', {
          'bg-green-500': isSelected,
        })}
      ></div>
@ -62,7 +61,7 @@ export const EnvelopeRendererFileSelector = ({
  const { envelopeItems, currentEnvelopeItem, setCurrentEnvelopeItem } = useCurrentEnvelopeRender();
  return (
-    <div className={cn('flex h-fit flex-shrink-0 space-x-2 overflow-x-auto p-4', className)}>
+    <div className={cn('flex h-fit space-x-2 overflow-x-auto p-4', className)}>
      {envelopeItems.map((doc, i) => (
        <EnvelopeItemSelector
          key={doc.id}
--- a/apps/remix/app/components/general/envelope-editor/envelope-generic-page-renderer.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-generic-page-renderer.tsx
@ -12,7 +12,7 @@ import { getClientSideFieldTranslations } from '@documenso/lib/utils/fields';
 export default function EnvelopeGenericPageRenderer() {
  const { i18n } = useLingui();
-  const { currentEnvelopeItem, fields, getRecipientColorKey } = useCurrentEnvelopeRender();
+  const { currentEnvelopeItem, fields } = useCurrentEnvelopeRender();
  const {
    stage,
@ -60,7 +60,8 @@ export default function EnvelopeGenericPageRenderer() {
      translations: getClientSideFieldTranslations(i18n),
      pageWidth: unscaledViewport.width,
      pageHeight: unscaledViewport.height,
-      color: getRecipientColorKey(field.recipientId),
+      // color: getRecipientColorKey(field.recipientId),
      color: 'purple', // Todo
      editable: false,
      mode: 'sign',
    });
@ -79,7 +80,7 @@ export default function EnvelopeGenericPageRenderer() {
  };
  /**
-   * Render fields when they are added or removed
+   * Render fields when they are added or removed from the localFields.
   */
  useEffect(() => {
    if (!pageLayer.current || !stage.current) {
@ -92,12 +93,14 @@ export default function EnvelopeGenericPageRenderer() {
        group.name() === 'field-group' &&
        !localPageFields.some((field) => field.id.toString() === group.id())
      ) {
        console.log('Field removed, removing from canvas');
        group.destroy();
      }
    });
    // If it exists, rerender.
    localPageFields.forEach((field) => {
      console.log('Field created/updated, rendering on canvas');
      renderFieldOnLayer(field);
    });
--- a/apps/remix/app/components/general/envelope-signing/envelope-signing-complete-dialog.tsx
+++ b/apps/remix/app/components/general/envelope-signing/envelope-signing-complete-dialog.tsx
@ -127,7 +127,6 @@ export const EnvelopeSignerCompleteDialog = () => {
            isBase64,
          };
        }),
        nextSigner,
      });
      const redirectUrl = envelope.documentMeta.redirectUrl;
--- a/apps/remix/app/components/general/folder/folder-grid.tsx
+++ b/apps/remix/app/components/general/folder/folder-grid.tsx
@ -6,7 +6,6 @@ import { FolderIcon, HomeIcon } from 'lucide-react';
 import { Link } from 'react-router';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { IS_ENVELOPES_ENABLED } from '@documenso/lib/constants/app';
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
@ -99,7 +98,7 @@ export const FolderGrid = ({ type, parentId }: FolderGridProps) => {
        </div>
        <div className="flex gap-4 sm:flex-row sm:justify-end">
-          {(IS_ENVELOPES_ENABLED || organisation.organisationClaim.flags.allowEnvelopes) && (
+          {organisation.organisationClaim.flags.allowEnvelopes && (
            <EnvelopeUploadButton type={type} folderId={parentId || undefined} />
          )}
--- a/apps/remix/app/components/general/share-document-download-button.tsx
+++ b/apps/remix/app/components/general/share-document-download-button.tsx
@ -15,6 +15,7 @@ export type ShareDocumentDownloadButtonProps = {
  documentData: DocumentData;
 };
 // Todo: Envelopes - Support multiple item downloads.
 export const ShareDocumentDownloadButton = ({
  title,
  documentData,
--- a/apps/remix/app/components/general/template/template-drop-zone-wrapper.tsx
+++ b/apps/remix/app/components/general/template/template-drop-zone-wrapper.tsx
@ -10,9 +10,9 @@ import { match } from 'ts-pattern';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import type { TCreateTemplatePayloadSchema } from '@documenso/trpc/server/template-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@ -40,13 +40,17 @@ export const TemplateDropZoneWrapper = ({ children, className }: TemplateDropZon
    try {
      setIsLoading(true);
-      const documentData = await putPdfFile(file);
+      const payload = {
      const { legacyTemplateId: id } = await createTemplate({
        title: file.name,
        templateDocumentDataId: documentData.id,
        folderId: folderId ?? undefined,
-      });
+      } satisfies TCreateTemplatePayloadSchema;
      const formData = new FormData();
      formData.append('payload', JSON.stringify(payload));
      formData.append('file', file);
      const { envelopeId: id } = await createTemplate(formData);
      toast({
        title: _(msg`Template uploaded`),
--- a/apps/remix/app/routes/_authenticated+/_layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/_layout.tsx
@ -116,7 +116,7 @@ export default function Layout({ loaderData, params, matches }: Route.ComponentP
        {!user.emailVerified && <VerifyEmailBanner email={user.email} />}
-        {banner && !hideHeader && <AppBanner banner={banner} />}
+        {banner && <AppBanner banner={banner} />}
        {!hideHeader && <Header />}
--- a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
@ -34,7 +34,6 @@ import { Input } from '@documenso/ui/primitives/input';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 import { AdminOrganisationMemberUpdateDialog } from '~/components/dialogs/admin-organisation-member-update-dialog';
 import { GenericErrorLayout } from '~/components/general/generic-error-layout';
 import { SettingsHeader } from '~/components/general/settings-header';
@ -72,6 +71,23 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen
      },
    });
  const { mutateAsync: promoteToOwner, isPending: isPromotingToOwner } =
    trpc.admin.organisationMember.promoteToOwner.useMutation({
      onSuccess: () => {
        toast({
          title: t`Success`,
          description: t`Member promoted to owner successfully`,
        });
      },
      onError: () => {
        toast({
          title: t`Error`,
          description: t`We couldn't promote the member to owner. Please try again.`,
          variant: 'destructive',
        });
      },
    });
  const teamsColumns = useMemo(() => {
    return [
      {
@ -104,24 +120,23 @@ export default function OrganisationGroupSettingsPage({ params }: Route.Componen
      },
      {
        header: t`Actions`,
-        cell: ({ row }) => {
+        cell: ({ row }) => (
-          const isOwner = row.original.userId === organisation?.ownerUserId;
+          <div className="flex justify-end space-x-2">
-
+            <Button
-          return (
+              variant="outline"
-            <div className="flex justify-end space-x-2">
+              disabled={row.original.userId === organisation?.ownerUserId}
-              <AdminOrganisationMemberUpdateDialog
+              loading={isPromotingToOwner}
-                trigger={
+              onClick={async () =>
-                  <Button variant="outline">
+                promoteToOwner({
-                    <Trans>Update role</Trans>
+                  organisationId,
-                  </Button>
+                  userId: row.original.userId,
-                }
+                })
-                organisationId={organisationId}
+              }
-                organisationMember={row.original}
+            >
-                isOwner={isOwner}
+              <Trans>Promote to owner</Trans>
-              />
+            </Button>
-            </div>
+          </div>
-          );
+        ),
        },
      },
    ] satisfies DataTableColumnDef<TGetAdminOrganisationResponse['members'][number]>[];
  }, [organisation]);
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
@ -148,7 +148,6 @@ export default function DocumentPage({ params }: Route.ComponentProps) {
            <EnvelopeRenderProvider
              envelope={envelope}
              fields={envelope.status == DocumentStatus.COMPLETED ? [] : envelope.fields}
              recipientIds={envelope.recipients.map((recipient) => recipient.id)}
            >
              {isMultiEnvelopeItem && (
                <EnvelopeRendererFileSelector fields={envelope.fields} className="mb-4 p-0" />
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
@ -99,11 +99,7 @@ export default function EnvelopeEditorPage({ params }: Route.ComponentProps) {
  return (
    <EnvelopeEditorProvider initialEnvelope={envelope}>
-      <EnvelopeRenderProvider
+      <EnvelopeRenderProvider envelope={envelope}>
        envelope={envelope}
        fields={envelope.fields}
        recipientIds={envelope.recipients.map((recipient) => recipient.id)}
      >
        <EnvelopeEditor />
      </EnvelopeRenderProvider>
    </EnvelopeEditorProvider>
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
@ -168,11 +168,7 @@ export default function TemplatePage({ params }: Route.ComponentProps) {
      <div className="mt-6 grid w-full grid-cols-12 gap-8">
        {envelope.internalVersion === 2 ? (
          <div className="relative col-span-12 lg:col-span-6 xl:col-span-7">
-            <EnvelopeRenderProvider
+            <EnvelopeRenderProvider envelope={envelope} fields={envelope.fields}>
              envelope={envelope}
              fields={envelope.fields}
              recipientIds={envelope.recipients.map((recipient) => recipient.id)}
            >
              {isMultiEnvelopeItem && (
                <EnvelopeRendererFileSelector fields={envelope.fields} className="mb-4 p-0" />
              )}
--- a/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx
+++ b/apps/remix/app/routes/_recipient+/d.$token+/_index.tsx
@ -8,6 +8,7 @@ import { EnvelopeRenderProvider } from '@documenso/lib/client-only/providers/env
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/envelope/get-envelope-for-direct-template-signing';
 import { getEnvelopeRequiredAccessData } from '@documenso/lib/server-only/envelope/get-envelope-required-access-data';
 import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
@ -97,12 +98,15 @@ const handleV2Loader = async ({ params, request }: Route.LoaderArgs) => {
        envelopeForSigning,
      } as const;
    })
-    .catch((e) => {
+    .catch(async (e) => {
      const error = AppError.parseError(e);
      if (error.code === AppErrorCode.UNAUTHORIZED) {
        const requiredAccessData = await getEnvelopeRequiredAccessData({ token });
        return {
          isDocumentAccessValid: false,
          ...requiredAccessData,
        } as const;
      }
@ -222,21 +226,20 @@ const DirectSigningPageV2 = ({ data }: { data: Awaited<ReturnType<typeof handleV
  const user = sessionData?.user;
  if (!data.isDocumentAccessValid) {
-    return <DocumentSigningAuthPageView email={''} emailHasAccount={true} />;
+    return (
      <DocumentSigningAuthPageView
        email={data.recipientEmail}
        emailHasAccount={!!data.recipientHasAccount}
      />
    );
  }
  const { envelope, recipient } = data.envelopeForSigning;
  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
    documentAuth: envelope.authOptions,
  });
  const isEmailForced = derivedRecipientAccessAuth.includes(DocumentAccessAuth.ACCOUNT);
  return (
    <EnvelopeSigningProvider
      envelopeData={data.envelopeForSigning}
-      email={isEmailForced ? user?.email || '' : ''} // Doing this allows us to let users change the email if they want to for non-auth templates.
+      email={''} // Doing this allows us to let users change the email if they want to.
      fullName={user?.name}
      signature={user?.signature}
    >
--- a/apps/remix/server/main.js
+++ b/apps/remix/server/main.js
@ -30,6 +30,4 @@ server.use(
 const handler = handle(build, server);
-const port = parseInt(process.env.PORT || '3000', 10);
+serve({ fetch: handler.fetch, port: 3000 });
 serve({ fetch: handler.fetch, port });
--- a/apps/remix/server/trpc/hono-trpc-open-api.ts
+++ b/apps/remix/server/trpc/hono-trpc-open-api.ts
@ -1,10 +1,10 @@
 import type { Context } from 'hono';
 import { createOpenApiFetchHandler } from 'trpc-to-openapi';
 import { API_V2_BETA_URL } from '@documenso/lib/constants/app';
 import { AppError, genericErrorCodeToTrpcErrorCodeMap } from '@documenso/lib/errors/app-error';
 import { createTrpcContext } from '@documenso/trpc/server/context';
 import { appRouter } from '@documenso/trpc/server/router';
 import { createOpenApiFetchHandler } from '@documenso/trpc/utils/openapi-fetch-handler';
 import { handleTrpcRouterError } from '@documenso/trpc/utils/trpc-error-handler';
 export const openApiTrpcServerHandler = async (c: Context) => {
--- a/apps/remix/vite.config.ts
+++ b/apps/remix/vite.config.ts
@ -21,7 +21,7 @@ export default defineConfig({
    },
  },
  server: {
-    port: parseInt(process.env.PORT || '3000', 10),
+    port: 3000,
    strictPort: true,
  },
  plugins: [
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -44,7 +44,7 @@
    "@commitlint/cli": "^17.7.1",
    "@commitlint/config-conventional": "^17.7.0",
    "@lingui/cli": "^5.2.0",
-    "@prisma/client": "^6.8.2",
+    "@prisma/client": "^6.18.0",
    "dotenv": "^16.5.0",
    "dotenv-cli": "^8.0.0",
    "eslint": "^8.40.0",
@ -54,11 +54,21 @@
    "nodemailer": "^6.10.1",
    "playwright": "1.52.0",
    "prettier": "^3.3.3",
-    "prisma": "^6.8.2",
+    "prisma": "^6.18.0",
    "prisma-extension-kysely": "^3.0.0",
    "prisma-kysely": "^1.8.0",
    "rimraf": "^5.0.1",
    "turbo": "^1.9.3",
    "@trpc/client": "11.7.0",
    "@trpc/react-query": "11.7.0",
    "@trpc/server": "11.7.0",
    "superjson": "^2.2.5",
    "trpc-to-openapi": "2.4.0",
    "zod-openapi": "^4.2.4",
    "@ts-rest/core": "^3.52.1",
    "@ts-rest/open-api": "^3.52.1",
    "@ts-rest/serverless": "^3.52.1",
    "zod-prisma-types": "3.3.5",
    "vite": "^6.3.5"
  },
  "name": "@documenso/root",
@ -74,13 +84,12 @@
    "inngest-cli": "^0.29.1",
    "luxon": "^3.5.0",
    "mupdf": "^1.0.0",
    "pdf2json": "^4.0.0",
    "react": "^18",
    "typescript": "5.6.2",
-    "zod": "3.24.1"
+    "zod": "^3.25.76"
  },
  "overrides": {
-    "zod": "3.24.1"
+    "zod": "^3.25.76"
  },
  "trigger.dev": {
    "endpointId": "documenso-app"
--- a/packages/api/package.json
+++ b/packages/api/package.json
@ -17,14 +17,14 @@
  "dependencies": {
    "@documenso/lib": "*",
    "@documenso/prisma": "*",
-    "@ts-rest/core": "^3.30.5",
+    "@ts-rest/core": "^3.52.0",
-    "@ts-rest/open-api": "^3.33.0",
+    "@ts-rest/open-api": "^3.52.0",
-    "@ts-rest/serverless": "^3.30.5",
+    "@ts-rest/serverless": "^3.52.0",
    "@types/swagger-ui-react": "^5.18.0",
    "luxon": "^3.4.0",
-    "superjson": "^1.13.1",
+    "superjson": "^2.2.5",
    "swagger-ui-react": "^5.21.0",
    "ts-pattern": "^5.0.5",
-    "zod": "3.24.1"
+    "zod": "^3.25.76"
  }
 }
--- a/packages/app-tests/e2e/admin/organisations/update-organisation-member-role.spec.ts
+++ b/packages/app-tests/e2e/admin/organisations/update-organisation-member-role.spec.ts
@ -68,29 +68,15 @@ test('[ADMIN]: promote member to owner', async ({ page }) => {
  // Test promoting a MEMBER to owner
  const memberRow = page.getByRole('row', { name: memberUser.email });
-  // Find and click the "Update role" button for the member
+  // Find and click the "Promote to owner" button for the member
-  const updateRoleButton = memberRow.getByRole('button', {
+  const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await expect(promoteButton).toBeVisible();
-  });
+  await expect(promoteButton).not.toBeDisabled();
  await expect(updateRoleButton).toBeVisible();
  await expect(updateRoleButton).not.toBeDisabled();
-  await updateRoleButton.click();
+  await promoteButton.click();
-  // Wait for dialog to open and select Owner role
+  // Verify success toast appears
-  await expect(page.getByRole('dialog')).toBeVisible();
+  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  // Reload the page to see the changes
  await page.reload();
@ -103,18 +89,12 @@ test('[ADMIN]: promote member to owner', async ({ page }) => {
  const previousOwnerRow = page.getByRole('row', { name: ownerUser.email });
  await expect(previousOwnerRow.getByRole('status').filter({ hasText: 'Owner' })).not.toBeVisible();
-  // Verify that the Update role button exists for the new owner and shows Owner as current role
+  // Verify that the promote button is now disabled for the new owner
-  const newOwnerUpdateButton = newOwnerRow.getByRole('button', {
+  const newOwnerPromoteButton = newOwnerRow.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await expect(newOwnerPromoteButton).toBeDisabled();
  });
  await expect(newOwnerUpdateButton).toBeVisible();
-  // Verify clicking it shows the dialog with Owner already selected
+  // Test that we can't promote the current owner (button should be disabled)
-  await newOwnerUpdateButton.click();
+  await expect(newOwnerPromoteButton).toHaveAttribute('disabled');
  await expect(page.getByRole('dialog')).toBeVisible();
  // Close the dialog without making changes
  await page.getByRole('button', { name: 'Cancel' }).click();
 });
 test('[ADMIN]: promote manager to owner', async ({ page }) => {
@ -150,26 +130,10 @@ test('[ADMIN]: promote manager to owner', async ({ page }) => {
  // Promote the manager to owner
  const managerRow = page.getByRole('row', { name: managerUser.email });
-  const updateRoleButton = managerRow.getByRole('button', {
+  const promoteButton = managerRow.getByRole('button', { name: 'Promote to owner' });
    name: 'Update role',
  });
-  await updateRoleButton.click();
+  await promoteButton.click();
-
+  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible();
  // Wait for dialog to open and select Owner role
  await expect(page.getByRole('dialog')).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  // Reload and verify the change
  await page.reload();
@ -209,27 +173,14 @@ test('[ADMIN]: promote admin member to owner', async ({ page }) => {
  // Promote the admin member to owner
  const adminMemberRow = page.getByRole('row', { name: adminMemberUser.email });
-  const updateRoleButton = adminMemberRow.getByRole('button', {
+  const promoteButton = adminMemberRow.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+
  await promoteButton.click();
  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({
    timeout: 10_000,
  });
  await updateRoleButton.click();
  // Wait for dialog to open and select Owner role
  await expect(page.getByRole('dialog')).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  // Reload and verify the change
  await page.reload();
  await expect(adminMemberRow.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();
@ -298,25 +249,11 @@ test('[ADMIN]: verify role hierarchy after promotion', async ({ page }) => {
  await expect(memberRow.getByRole('status').filter({ hasText: 'Owner' })).not.toBeVisible();
  // Promote member to owner
-  const updateRoleButton = memberRow.getByRole('button', {
+  const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await promoteButton.click();
  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({
    timeout: 10_000,
  });
  await updateRoleButton.click();
  // Wait for dialog to open and select Owner role
  await expect(page.getByRole('dialog')).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  // Reload page to see updated state
  await page.reload();
@ -325,11 +262,9 @@ test('[ADMIN]: verify role hierarchy after promotion', async ({ page }) => {
  memberRow = page.getByRole('row', { name: memberUser.email });
  await expect(memberRow.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();
-  // Verify the Update role button exists and shows Owner as current role
+  // Verify the promote button is now disabled for the new owner
-  const newOwnerUpdateButton = memberRow.getByRole('button', {
+  const newOwnerPromoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await expect(newOwnerPromoteButton).toBeDisabled();
  });
  await expect(newOwnerUpdateButton).toBeVisible();
  // Sign in as the newly promoted user to verify they have owner permissions
  await apiSignin({
@ -401,56 +336,28 @@ test('[ADMIN]: multiple promotions in sequence', async ({ page }) => {
  // First promotion: Member 1 becomes owner
  let member1Row = page.getByRole('row', { name: member1User.email });
-  let updateRoleButton1 = member1Row.getByRole('button', {
+  let promoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await promoteButton1.click();
  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({
    timeout: 10_000,
  });
  await updateRoleButton1.click();
  // Wait for dialog to open and select Owner role
  await expect(page.getByRole('dialog')).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  await page.reload();
-  // Verify Member 1 is now owner
+  // Verify Member 1 is now owner and button is disabled
  member1Row = page.getByRole('row', { name: member1User.email });
  await expect(member1Row.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();
-  updateRoleButton1 = member1Row.getByRole('button', { name: 'Update role' });
+  promoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });
-  await expect(updateRoleButton1).toBeVisible();
+  await expect(promoteButton1).toBeDisabled();
  // Second promotion: Member 2 becomes the new owner
  const member2Row = page.getByRole('row', { name: member2User.email });
-  const updateRoleButton2 = member2Row.getByRole('button', {
+  const promoteButton2 = member2Row.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await expect(promoteButton2).not.toBeDisabled();
  await promoteButton2.click();
  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({
    timeout: 10_000,
  });
  await expect(updateRoleButton2).toBeVisible();
  await updateRoleButton2.click();
  // Wait for dialog to open and select Owner role
  await expect(page.getByRole('dialog')).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  await page.reload();
@ -458,11 +365,9 @@ test('[ADMIN]: multiple promotions in sequence', async ({ page }) => {
  await expect(member2Row.getByRole('status').filter({ hasText: 'Owner' })).toBeVisible();
  await expect(member1Row.getByRole('status').filter({ hasText: 'Owner' })).not.toBeVisible();
-  // Verify Member 1's Update role button is still visible
+  // Verify Member 1's promote button is now enabled again
-  const newUpdateButton1 = member1Row.getByRole('button', {
+  const newPromoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await expect(newPromoteButton1).not.toBeDisabled();
  });
  await expect(newUpdateButton1).toBeVisible();
 });
 test('[ADMIN]: verify organisation access after ownership change', async ({ page }) => {
@ -497,25 +402,11 @@ test('[ADMIN]: verify organisation access after ownership change', async ({ page
  });
  const memberRow = page.getByRole('row', { name: memberUser.email });
-  const updateRoleButton = memberRow.getByRole('button', {
+  const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
-    name: 'Update role',
+  await promoteButton.click();
  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible({
    timeout: 10_000,
  });
  await updateRoleButton.click();
  // Wait for dialog to open and select Owner role
  await expect(page.getByRole('dialog')).toBeVisible();
  // Find and click the select trigger - it's a button with role="combobox"
  await page.getByRole('dialog').locator('button[role="combobox"]').click();
  // Select "Owner" from the dropdown options
  await page.getByRole('option', { name: 'Owner' }).click();
  // Click Update button
  await page.getByRole('dialog').getByRole('button', { name: 'Update' }).click();
  // Wait for dialog to close (indicates success)
  await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 10_000 });
  // Test that the new owner can access organisation settings
  await apiSignin({
--- a/packages/app-tests/e2e/auto-placing-fields/auto-place-fields-document.spec.ts
+++ b/packages/app-tests/e2e/auto-placing-fields/auto-place-fields-document.spec.ts
@ -1,98 +0,0 @@
 import { expect, test } from '@playwright/test';
 import path from 'path';
 import { seedUser } from '@documenso/prisma/seed/users';
 import { apiSignin } from '../fixtures/authentication';
 const PLACEHOLDER_PDF_PATH = path.join(
  __dirname,
  '../../../assets/project-proposal-single-recipient.pdf',
 );
 test.describe('PDF Placeholders with single recipient', () => {
  test('[AUTO_PLACING_FIELDS]: should automatically create recipients from PDF placeholders', async ({
    page,
  }) => {
    const { user, team } = await seedUser();
    await apiSignin({
      page,
      email: user.email,
      redirectPath: `/t/${team.url}/documents`,
    });
    const fileInput = page.locator('input[type="file"]').nth(1);
    await fileInput.waitFor({ state: 'attached' });
    await fileInput.setInputFiles(PLACEHOLDER_PDF_PATH);
    await page.waitForTimeout(3000);
    await page.getByRole('button', { name: 'Continue' }).click();
    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
    await expect(page.getByPlaceholder('Email')).toHaveValue('recipient.1@documenso.com');
    await expect(page.getByPlaceholder('Name')).toHaveValue('Recipient 1');
  });
  test('[AUTO_PLACING_FIELDS]: should automatically place fields from PDF placeholders', async ({
    page,
  }) => {
    const { user, team } = await seedUser();
    await apiSignin({
      page,
      email: user.email,
      redirectPath: `/t/${team.url}/documents`,
    });
    const fileInput = page.locator('input[type="file"]').nth(1);
    await fileInput.waitFor({ state: 'attached' });
    await fileInput.setInputFiles(PLACEHOLDER_PDF_PATH);
    await page.waitForTimeout(3000);
    await page.getByRole('button', { name: 'Continue' }).click();
    await page.getByRole('button', { name: 'Continue' }).click();
    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
    await expect(page.locator('[data-field-type="SIGNATURE"]')).toBeVisible();
    await expect(page.locator('[data-field-type="EMAIL"]')).toBeVisible();
    await expect(page.locator('[data-field-type="NAME"]')).toBeVisible();
    await expect(page.locator('[data-field-type="TEXT"]')).toBeVisible();
  });
  test('[AUTO_PLACING_FIELDS]: should automatically configure fields from PDF placeholders', async ({
    page,
  }) => {
    const { user, team } = await seedUser();
    await apiSignin({
      page,
      email: user.email,
      redirectPath: `/t/${team.url}/documents`,
    });
    const fileInput = page.locator('input[type="file"]').nth(1);
    await fileInput.waitFor({ state: 'attached' });
    await fileInput.setInputFiles(PLACEHOLDER_PDF_PATH);
    await page.waitForTimeout(3000);
    await page.getByRole('button', { name: 'Continue' }).click();
    await page.getByRole('button', { name: 'Continue' }).click();
    await page.getByText('Text').nth(1).click();
    await page.getByRole('button', { name: 'Advanced settings' }).click();
    await expect(page.getByRole('heading', { name: 'Advanced settings' })).toBeVisible();
    await expect(
      page
        .locator('div')
        .filter({ hasText: /^Required field$/ })
        .getByRole('switch'),
    ).toBeChecked();
    await expect(page.getByRole('combobox')).toHaveText('Right');
  });
 });
--- a/packages/app-tests/e2e/templates/direct-templates.spec.ts
+++ b/packages/app-tests/e2e/templates/direct-templates.spec.ts
@ -1,12 +1,9 @@
 import { expect, test } from '@playwright/test';
 import { DocumentSigningOrder, RecipientRole } from '@prisma/client';
 import { customAlphabet } from 'nanoid';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { createDocumentAuthOptions } from '@documenso/lib/utils/document-auth';
 import { mapSecondaryIdToTemplateId } from '@documenso/lib/utils/envelope';
 import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
 import { prisma } from '@documenso/prisma';
 import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedDirectTemplate, seedTemplate } from '@documenso/prisma/seed/templates';
 import { seedTestEmail, seedUser } from '@documenso/prisma/seed/users';
@ -124,7 +121,7 @@ test('[DIRECT_TEMPLATES]: delete direct template link', async ({ page }) => {
  await expect(page.getByText('404 not found')).toBeVisible();
 });
-test('[DIRECT_TEMPLATES]: V1 direct template link auth access', async ({ page }) => {
+test('[DIRECT_TEMPLATES]: direct template link auth access', async ({ page }) => {
  const { user, team } = await seedUser();
  const directTemplateWithAuth = await seedDirectTemplate({
@ -156,53 +153,6 @@ test('[DIRECT_TEMPLATES]: V1 direct template link auth access', async ({ page })
  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
  await expect(page.getByLabel('Email')).toBeDisabled();
  await page.getByRole('button', { name: 'Continue' }).click();
  await page.getByRole('button', { name: 'Complete' }).click();
  await page.getByRole('button', { name: 'Sign' }).click();
  await page.waitForURL(/\/sign/);
  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
 });
 test('[DIRECT_TEMPLATES]: V2 direct template link auth access', async ({ page }) => {
  const { user, team } = await seedUser();
  const directTemplateWithAuth = await seedDirectTemplate({
    title: 'Personal direct template link',
    userId: user.id,
    teamId: team.id,
    internalVersion: 2,
    createTemplateOptions: {
      authOptions: createDocumentAuthOptions({
        globalAccessAuth: ['ACCOUNT'],
        globalActionAuth: [],
      }),
    },
  });
  const directTemplatePath = formatDirectTemplatePath(
    directTemplateWithAuth.directLink?.token || '',
  );
  await page.goto(directTemplatePath);
  await expect(page.getByText('Authentication required')).toBeVisible();
  await apiSignin({
    page,
    email: user.email,
  });
  await page.goto(directTemplatePath);
  await expect(page.getByRole('heading', { name: 'Personal direct template link' })).toBeVisible();
  await page.getByRole('button', { name: 'Complete' }).click();
  await expect(page.getByLabel('Your Email')).not.toBeVisible();
  await page.getByRole('button', { name: 'Sign' }).click();
  await page.waitForURL(/\/sign/);
  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
 });
 test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ page }) => {
@ -225,9 +175,6 @@ test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ p
  await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
  await page.getByRole('button', { name: 'Continue' }).click();
  await expect(page.getByText('Next Recipient Name')).not.toBeVisible();
  await page.getByRole('button', { name: 'Complete' }).click();
  await page.getByRole('button', { name: 'Sign' }).click();
  await page.waitForURL(/\/sign/);
@ -236,173 +183,3 @@ test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ p
  // Add a longer waiting period to ensure document status is updated
  await page.waitForTimeout(3000);
 });
 test('[DIRECT_TEMPLATES]: V1 use direct template link with 2 recipients with next signer dictation', async ({
  page,
 }) => {
  const { team, owner, organisation } = await seedTeam({
    createTeamMembers: 1,
  });
  // Should be visible to team members.
  const template = await seedDirectTemplate({
    title: 'Team direct template link 1',
    userId: owner.id,
    teamId: team.id,
  });
  await prisma.documentMeta.update({
    where: {
      id: template.documentMetaId,
    },
    data: {
      allowDictateNextSigner: true,
      signingOrder: DocumentSigningOrder.SEQUENTIAL,
    },
  });
  const originalName = 'Signer 2';
  const originalSecondSignerEmail = seedTestEmail();
  // Add another signer
  await prisma.recipient.create({
    data: {
      signingOrder: 2,
      envelopeId: template.id,
      email: originalSecondSignerEmail,
      name: originalName,
      token: Math.random().toString().slice(2, 7),
      role: RecipientRole.SIGNER,
    },
  });
  // Check that the direct template link is accessible.
  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
  await page.waitForTimeout(100);
  await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
  await page.getByRole('button', { name: 'Continue' }).click();
  await page.getByRole('button', { name: 'Complete' }).click();
  await expect(page.getByText('Next Recipient Name')).toBeVisible();
  const nextRecipientNameInputValue = await page.getByLabel('Next Recipient Name').inputValue();
  expect(nextRecipientNameInputValue).toBe(originalName);
  const nextRecipientEmailInputValue = await page.getByLabel('Next Recipient Email').inputValue();
  expect(nextRecipientEmailInputValue).toBe(originalSecondSignerEmail);
  const newName = 'Hello';
  const newSecondSignerEmail = seedTestEmail();
  await page.getByLabel('Next Recipient Email').fill(newSecondSignerEmail);
  await page.getByLabel('Next Recipient Name').fill(newName);
  await page.getByRole('button', { name: 'Sign' }).click();
  await page.waitForURL(/\/sign/);
  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
  const createdEnvelopeRecipients = await prisma.recipient.findMany({
    where: {
      envelope: {
        templateId: mapSecondaryIdToTemplateId(template.secondaryId),
      },
    },
  });
  const updatedSecondRecipient = createdEnvelopeRecipients.find(
    (recipient) => recipient.signingOrder === 2,
  );
  expect(updatedSecondRecipient?.name).toBe(newName);
  expect(updatedSecondRecipient?.email).toBe(newSecondSignerEmail);
 });
 test('[DIRECT_TEMPLATES]: V2 use direct template link with 2 recipients with next signer dictation', async ({
  page,
 }) => {
  const { team, owner, organisation } = await seedTeam({
    createTeamMembers: 1,
  });
  // Should be visible to team members.
  const template = await seedDirectTemplate({
    title: 'Team direct template link 1',
    userId: owner.id,
    teamId: team.id,
    internalVersion: 2,
  });
  await prisma.documentMeta.update({
    where: {
      id: template.documentMetaId,
    },
    data: {
      allowDictateNextSigner: true,
      signingOrder: DocumentSigningOrder.SEQUENTIAL,
    },
  });
  const originalName = 'Signer 2';
  const originalSecondSignerEmail = seedTestEmail();
  // Add another signer
  await prisma.recipient.create({
    data: {
      signingOrder: 2,
      envelopeId: template.id,
      email: originalSecondSignerEmail,
      name: originalName,
      token: Math.random().toString().slice(2, 7),
      role: RecipientRole.SIGNER,
    },
  });
  // Check that the direct template link is accessible.
  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
  await expect(page.getByRole('heading', { name: 'Team direct template link 1' })).toBeVisible();
  await page.waitForTimeout(100);
  await page.getByRole('button', { name: 'Complete' }).click();
  const currentName = 'John Doe';
  const currentEmail = seedTestEmail();
  await page.getByPlaceholder('Enter Your Name').fill(currentName);
  await page.getByPlaceholder('Enter Your Email').fill(currentEmail);
  await expect(page.getByText('Next Recipient Name')).toBeVisible();
  const nextRecipientNameInputValue = await page.getByLabel('Next Recipient Name').inputValue();
  expect(nextRecipientNameInputValue).toBe(originalName);
  const nextRecipientEmailInputValue = await page.getByLabel('Next Recipient Email').inputValue();
  expect(nextRecipientEmailInputValue).toBe(originalSecondSignerEmail);
  const newName = 'Hello';
  const newSecondSignerEmail = seedTestEmail();
  await page.getByLabel('Next Recipient Email').fill(newSecondSignerEmail);
  await page.getByLabel('Next Recipient Name').fill(newName);
  await page.getByRole('button', { name: 'Sign' }).click();
  await page.waitForURL(/\/sign/);
  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
  const createdEnvelopeRecipients = await prisma.recipient.findMany({
    where: {
      envelope: {
        templateId: mapSecondaryIdToTemplateId(template.secondaryId),
      },
    },
  });
  const updatedSecondRecipient = createdEnvelopeRecipients.find(
    (recipient) => recipient.signingOrder === 2,
  );
  expect(updatedSecondRecipient?.name).toBe(newName);
  expect(updatedSecondRecipient?.email).toBe(newSecondSignerEmail);
 });
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -20,6 +20,6 @@
    "luxon": "^3.5.0",
    "nanoid": "^5.1.5",
    "ts-pattern": "^5.0.5",
-    "zod": "3.24.1"
+    "zod": "^3.25.76"
  }
 }
--- a/packages/ee/package.json
+++ b/packages/ee/package.json
@ -19,6 +19,6 @@
    "micro": "^10.0.1",
    "react": "^18",
    "ts-pattern": "^5.0.5",
-    "zod": "3.24.1"
+    "zod": "^3.25.76"
  }
 }
--- a/packages/lib/client-only/hooks/use-editor-fields.ts
+++ b/packages/lib/client-only/hooks/use-editor-fields.ts
@ -50,7 +50,6 @@ type UseEditorFieldsResponse = {
  // Field operations
  addField: (field: Omit<TLocalField, 'formId'>) => TLocalField;
  setFieldId: (formId: string, id: number) => void;
  removeFieldsByFormId: (formIds: string[]) => void;
  updateFieldByFormId: (formId: string, updates: Partial<TLocalField>) => void;
  duplicateField: (field: TLocalField, recipientId?: number) => TLocalField;
@ -161,17 +160,6 @@ export const useEditorFields = ({
    [localFields, remove, triggerFieldsUpdate],
  );
  const setFieldId = (formId: string, id: number) => {
    const index = localFields.findIndex((field) => field.formId === formId);
    if (index !== -1) {
      update(index, {
        ...localFields[index],
        id,
      });
    }
  };
  const updateFieldByFormId = useCallback(
    (formId: string, updates: Partial<TLocalField>) => {
      const index = localFields.findIndex((field) => field.formId === formId);
@ -281,7 +269,6 @@ export const useEditorFields = ({
    // Field operations
    addField,
    setFieldId,
    removeFieldsByFormId,
    updateFieldByFormId,
    duplicateField,
--- a/packages/lib/client-only/providers/envelope-editor-provider.tsx
+++ b/packages/lib/client-only/providers/envelope-editor-provider.tsx
@ -97,11 +97,6 @@ export const EnvelopeEditorProvider = ({
  const [envelope, setEnvelope] = useState(initialEnvelope);
  const [autosaveError, setAutosaveError] = useState<boolean>(false);
  const editorFields = useEditorFields({
    envelope,
    handleFieldsUpdate: (fields) => setFieldsDebounced(fields),
  });
  const envelopeUpdateMutationQuery = trpc.envelope.update.useMutation({
    onSuccess: (response, input) => {
      setEnvelope({
@ -189,24 +184,13 @@ export const EnvelopeEditorProvider = ({
    triggerSave: setFieldsDebounced,
    flush: setFieldsAsync,
    isPending: isFieldsMutationPending,
-  } = useEnvelopeAutosave(async (localFields: TLocalField[]) => {
+  } = useEnvelopeAutosave(async (fields: TLocalField[]) => {
-    const envelopeFields = await envelopeFieldSetMutationQuery.mutateAsync({
+    await envelopeFieldSetMutationQuery.mutateAsync({
      envelopeId: envelope.id,
      envelopeType: envelope.type,
-      fields: localFields,
+      fields,
    });
-
+  }, 1000);
    // Insert the IDs into the local fields.
    envelopeFields.fields.forEach((field) => {
      const localField = localFields.find((localField) => localField.formId === field.formId);
      if (localField && !localField.id) {
        localField.id = field.id;
        editorFields.setFieldId(localField.formId, field.id);
      }
    });
  }, 2000);
  const {
    triggerSave: setEnvelopeDebounced,
@ -237,6 +221,11 @@ export const EnvelopeEditorProvider = ({
    setEnvelopeDebounced(envelopeUpdates);
  };
  const editorFields = useEditorFields({
    envelope,
    handleFieldsUpdate: (fields) => setFieldsDebounced(fields),
  });
  const getRecipientColorKey = useCallback(
    (recipientId: number) => {
      const recipientIndex = envelope.recipients.findIndex(
--- a/packages/lib/client-only/providers/envelope-render-provider.tsx
+++ b/packages/lib/client-only/providers/envelope-render-provider.tsx
@ -3,9 +3,6 @@ import React from 'react';
 import type { DocumentData } from '@prisma/client';
 import type { TRecipientColor } from '@documenso/ui/lib/recipient-colors';
 import { AVAILABLE_RECIPIENT_COLORS } from '@documenso/ui/lib/recipient-colors';
 import type { TEnvelope } from '../../types/envelope';
 import { getFile } from '../../universal/upload/get-file';
@ -26,7 +23,6 @@ type EnvelopeRenderProviderValue = {
  currentEnvelopeItem: EnvelopeRenderItem | null;
  setCurrentEnvelopeItem: (envelopeItemId: string) => void;
  fields: TEnvelope['fields'];
  getRecipientColorKey: (recipientId: number) => TRecipientColor;
 };
 interface EnvelopeRenderProviderProps {
@ -39,13 +35,6 @@ interface EnvelopeRenderProviderProps {
   * Only pass if the CustomRenderer you are passing in wants fields.
   */
  fields?: TEnvelope['fields'];
  /**
   * Optional recipient IDs used to determine the color of the fields.
   *
   * Only required for generic page renderers.
   */
  recipientIds?: number[];
 }
 const EnvelopeRenderContext = createContext<EnvelopeRenderProviderValue | null>(null);
@ -67,7 +56,6 @@ export const EnvelopeRenderProvider = ({
  children,
  envelope,
  fields,
  recipientIds = [],
 }: EnvelopeRenderProviderProps) => {
  // Indexed by documentDataId.
  const [files, setFiles] = useState<Record<string, FileData>>({});
@ -144,17 +132,6 @@ export const EnvelopeRenderProvider = ({
    }
  }, [envelope.envelopeItems]);
  const getRecipientColorKey = useCallback(
    (recipientId: number) => {
      const recipientIndex = recipientIds.findIndex((id) => id === recipientId);
      return AVAILABLE_RECIPIENT_COLORS[
        Math.max(recipientIndex, 0) % AVAILABLE_RECIPIENT_COLORS.length
      ];
    },
    [recipientIds],
  );
  return (
    <EnvelopeRenderContext.Provider
      value={{
@ -163,7 +140,6 @@ export const EnvelopeRenderProvider = ({
        currentEnvelopeItem: currentItem,
        setCurrentEnvelopeItem,
        fields: fields ?? [],
        getRecipientColorKey,
      }}
    >
      {children}
--- a/packages/lib/constants/app.ts
+++ b/packages/lib/constants/app.ts
@ -14,5 +14,3 @@ export const IS_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED
 export const API_V2_BETA_URL = '/api/v2-beta';
 export const SUPPORT_EMAIL = env('NEXT_PUBLIC_SUPPORT_EMAIL') ?? 'support@documenso.com';
 export const IS_ENVELOPES_ENABLED = env('NEXT_PUBLIC_FEATURE_ENVELOPES_ENABLED') === 'true';
--- a/packages/lib/jobs/definitions/internal/seal-document.handler.ts
+++ b/packages/lib/jobs/definitions/internal/seal-document.handler.ts
@ -189,6 +189,7 @@ export const run = async ({
    settings,
  });
  // Todo: Envelopes - Is it okay to have dynamic IDs?
  const newDocumentData = await Promise.all(
    envelopeItems.map(async (envelopeItem) =>
      io.runTask(`decorate-and-sign-envelope-item-${envelopeItem.id}`, async () => {
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@ -55,7 +55,7 @@
    "skia-canvas": "^3.0.8",
    "stripe": "^12.7.0",
    "ts-pattern": "^5.0.5",
-    "zod": "3.24.1"
+    "zod": "^3.25.76"
  },
  "devDependencies": {
    "@playwright/browser-chromium": "1.52.0",
--- a/packages/lib/server-only/document/get-stats.ts
+++ b/packages/lib/server-only/document/get-stats.ts
@ -1,5 +1,7 @@
 import { EnvelopeType, TeamMemberRole } from '@prisma/client';
 import type { Prisma, User } from '@prisma/client';
-import { DocumentVisibility, EnvelopeType, SigningStatus, TeamMemberRole } from '@prisma/client';
+import { SigningStatus } from '@prisma/client';
 import { DocumentVisibility } from '@prisma/client';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';
@ -213,14 +215,13 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
    ],
  };
  const rootPageFilter = folderId === undefined ? { folderId: null } : {};
  let ownerCountsWhereInput: Prisma.EnvelopeWhereInput = {
    type: EnvelopeType.DOCUMENT,
    userId: userIdWhereClause,
    createdAt,
    teamId,
    deletedAt: null,
    folderId,
  };
  let notSignedCountsGroupByArgs = null;
@ -264,16 +265,8 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
  ownerCountsWhereInput = {
    ...ownerCountsWhereInput,
-    AND: [
+    ...visibilityFiltersWhereInput,
-      ...(Array.isArray(visibilityFiltersWhereInput.AND)
+    ...searchFilter,
        ? visibilityFiltersWhereInput.AND
        : visibilityFiltersWhereInput.AND
          ? [visibilityFiltersWhereInput.AND]
          : []),
      searchFilter,
      rootPageFilter,
      folderId ? { folderId } : {},
    ],
  };
  if (teamEmail) {
@ -292,7 +285,6 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        },
      ],
      deletedAt: null,
      AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],
    };
    notSignedCountsGroupByArgs = {
@ -304,6 +296,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        type: EnvelopeType.DOCUMENT,
        userId: userIdWhereClause,
        createdAt,
        folderId,
        status: ExtendedDocumentStatus.PENDING,
        recipients: {
          some: {
@ -313,7 +306,6 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
          },
        },
        deletedAt: null,
        AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],
      },
    } satisfies Prisma.EnvelopeGroupByArgs;
@ -326,6 +318,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
        type: EnvelopeType.DOCUMENT,
        userId: userIdWhereClause,
        createdAt,
        folderId,
        OR: [
          {
            status: ExtendedDocumentStatus.PENDING,
@ -349,7 +342,6 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
            },
          },
        ],
        AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],
      },
    } satisfies Prisma.EnvelopeGroupByArgs;
  }
--- a/packages/lib/server-only/document/send-document.ts
+++ b/packages/lib/server-only/document/send-document.ts
@ -256,10 +256,11 @@ export const sendDocument = async ({
      });
    }
    // Todo: Envelopes - [AUDIT_LOGS]
    if (envelope.internalVersion === 2) {
-      const autoInsertedFields = await Promise.all(
+      await Promise.all(
        fieldsToAutoInsert.map(async (field) => {
-          return await tx.field.update({
+          await tx.field.update({
            where: {
              id: field.fieldId,
            },
@ -270,21 +271,6 @@ export const sendDocument = async ({
          });
        }),
      );
      await tx.documentAuditLog.create({
        data: createDocumentAuditLogData({
          type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELDS_AUTO_INSERTED,
          envelopeId: envelope.id,
          data: {
            fields: autoInsertedFields.map((field) => ({
              fieldId: field.id,
              fieldType: field.type,
              recipientId: field.recipientId,
            })),
          },
          // Don't put metadata or user here since it's a system event.
        }),
      });
    }
    return await tx.envelope.update({
--- a/packages/lib/server-only/envelope/create-envelope.ts
+++ b/packages/lib/server-only/envelope/create-envelope.ts
@ -10,18 +10,22 @@ import {
 } from '@prisma/client';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { insertFieldsFromPlaceholdersInPDF } from '@documenso/lib/server-only/pdf/auto-place-fields';
 import { normalizePdf as makeNormalizedPdf } from '@documenso/lib/server-only/pdf/normalize-pdf';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { nanoid, prefixedId } from '@documenso/lib/universal/id';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
 import type { TCreateEnvelopeRequest } from '@documenso/trpc/server/envelope-router/create-envelope.types';
-import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
+import type {
  TDocumentAccessAuthTypes,
  TDocumentActionAuthTypes,
  TRecipientAccessAuthTypes,
  TRecipientActionAuthTypes,
 } from '../../types/document-auth';
 import type { TDocumentFormValues } from '../../types/document-form-values';
 import type { TEnvelopeAttachmentType } from '../../types/envelope-attachment';
 import type { TFieldAndMeta } from '../../types/field-meta';
 import {
  ZWebhookDocumentSchema,
  mapEnvelopeToWebhookDocumentPayload,
@ -35,6 +39,25 @@ import { incrementDocumentId, incrementTemplateId } from '../envelope/increment-
 import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 type CreateEnvelopeRecipientFieldOptions = TFieldAndMeta & {
  documentDataId: string;
  page: number;
  positionX: number;
  positionY: number;
  width: number;
  height: number;
 };
 type CreateEnvelopeRecipientOptions = {
  email: string;
  name: string;
  role: RecipientRole;
  signingOrder?: number;
  accessAuth?: TRecipientAccessAuthTypes[];
  actionAuth?: TRecipientActionAuthTypes[];
  fields?: CreateEnvelopeRecipientFieldOptions[];
 };
 export type CreateEnvelopeOptions = {
  userId: number;
  teamId: number;
@ -57,7 +80,7 @@ export type CreateEnvelopeOptions = {
    visibility?: DocumentVisibility;
    globalAccessAuth?: TDocumentAccessAuthTypes[];
    globalActionAuth?: TDocumentActionAuthTypes[];
-    recipients?: TCreateEnvelopeRequest['recipients'];
+    recipients?: CreateEnvelopeRecipientOptions[];
    folderId?: string;
  };
  attachments?: Array<{
@ -234,7 +257,7 @@ export const createEnvelope = async ({
      ? await incrementDocumentId().then((v) => v.formattedDocumentId)
      : await incrementTemplateId().then((v) => v.formattedTemplateId);
-  const createdEnvelope = await prisma.$transaction(async (tx) => {
+  return await prisma.$transaction(async (tx) => {
    const envelope = await tx.envelope.create({
      data: {
        id: prefixedId('envelope'),
@ -354,12 +377,8 @@ export const createEnvelope = async ({
        recipients: true,
        fields: true,
        folder: true,
        envelopeItems: true,
        envelopeAttachments: true,
        envelopeItems: {
          include: {
            documentData: true,
          },
        },
      },
    });
@ -395,51 +414,4 @@ export const createEnvelope = async ({
    return createdEnvelope;
  });
  for (const envelopeItem of createdEnvelope.envelopeItems) {
    const buffer = await getFileServerSide(envelopeItem.documentData);
    // Use normalized PDF if normalizePdf was true, otherwise use original
    const pdfToProcess = normalizePdf
      ? await makeNormalizedPdf(Buffer.from(buffer))
      : Buffer.from(buffer);
    await insertFieldsFromPlaceholdersInPDF(
      pdfToProcess,
      userId,
      teamId,
      {
        type: 'envelopeId',
        id: createdEnvelope.id,
      },
      requestMetadata,
      envelopeItem.id,
    );
  }
  const finalEnvelope = await prisma.envelope.findFirst({
    where: {
      id: createdEnvelope.id,
    },
    include: {
      documentMeta: true,
      recipients: true,
      fields: true,
      folder: true,
      envelopeAttachments: true,
      envelopeItems: {
        include: {
          documentData: true,
        },
      },
    },
  });
  if (!finalEnvelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Envelope not found',
    });
  }
  return finalEnvelope;
 };
--- a/packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.ts
+++ b/packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.ts
@ -1,11 +1,10 @@
 import { DocumentStatus, EnvelopeType } from '@prisma/client';
 import { match } from 'ts-pattern';
 import { prisma } from '@documenso/prisma';
 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DocumentAccessAuth, type TDocumentAuthMethods } from '../../types/document-auth';
+import type { TDocumentAuthMethods } from '../../types/document-auth';
-import { extractDocumentAuthMethods } from '../../utils/document-auth';
+import { isRecipientAuthorized } from '../document/is-recipient-authorized';
 import { getTeamSettings } from '../team/get-team-settings';
 import type { EnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';
 import { ZEnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';
@ -99,28 +98,14 @@ export const getEnvelopeForDirectTemplateSigning = async ({
    });
  }
-  // Currently not using this since for direct templates "User" access means they just need to be
+  const documentAccessValid = await isRecipientAuthorized({
-  // logged in.
+    type: 'ACCESS',
-  // const documentAccessValid = await isRecipientAuthorized({
+    documentAuthOptions: envelope.authOptions,
-  //   type: 'ACCESS',
+    recipient,
-  //   documentAuthOptions: envelope.authOptions,
+    userId,
-  //   recipient,
+    authOptions: accessAuth,
  //   userId,
  //   authOptions: accessAuth,
  // });
  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
    documentAuth: envelope.authOptions,
  });
  // Ensure typesafety when we add more options.
  const documentAccessValid = derivedRecipientAccessAuth.every((auth) =>
    match(auth)
      .with(DocumentAccessAuth.ACCOUNT, () => Boolean(userId))
      .with(DocumentAccessAuth.TWO_FACTOR_AUTH, () => true)
      .exhaustive(),
  );
  if (!documentAccessValid) {
    throw new AppError(AppErrorCode.UNAUTHORIZED, {
      message: 'Invalid access values',
--- a/packages/lib/server-only/envelope/get-envelope-required-access-data.ts
+++ b/packages/lib/server-only/envelope/get-envelope-required-access-data.ts
@ -54,3 +54,54 @@ export const getEnvelopeRequiredAccessData = async ({ token }: { token: string }
    recipientHasAccount: Boolean(recipientUserAccount),
  } as const;
 };
 export const getEnvelopeDirectTemplateRequiredAccessData = async ({ token }: { token: string }) => {
  const envelope = await prisma.envelope.findFirst({
    where: {
      type: EnvelopeType.TEMPLATE,
      directLink: {
        enabled: true,
        token,
      },
      status: DocumentStatus.DRAFT,
    },
    include: {
      recipients: {
        where: {
          token,
        },
      },
      directLink: true,
    },
  });
  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Envelope not found',
    });
  }
  const recipient = envelope.recipients.find(
    (r) => r.id === envelope.directLink?.directTemplateRecipientId,
  );
  if (!recipient) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Recipient not found',
    });
  }
  const recipientUserAccount = await prisma.user.findFirst({
    where: {
      email: recipient.email.toLowerCase(),
    },
    select: {
      id: true,
    },
  });
  return {
    recipientEmail: recipient.email,
    recipientHasAccount: Boolean(recipientUserAccount),
  } as const;
 };
--- a/packages/lib/server-only/field/set-fields-for-document.ts
+++ b/packages/lib/server-only/field/set-fields-for-document.ts
@ -306,10 +306,7 @@ export const setFieldsForDocument = async ({
          });
        }
-        return {
+        return upsertedField;
          ...upsertedField,
          formId: field.formId,
        };
      }),
    );
  });
@ -343,25 +340,17 @@ export const setFieldsForDocument = async ({
  }
  // Filter out fields that have been removed or have been updated.
-  const mappedFilteredFields = existingFields
+  const filteredFields = existingFields.filter((field) => {
-    .filter((field) => {
+    const isRemoved = removedFields.find((removedField) => removedField.id === field.id);
-      const isRemoved = removedFields.find((removedField) => removedField.id === field.id);
+    const isUpdated = persistedFields.find((persistedField) => persistedField.id === field.id);
      const isUpdated = persistedFields.find((persistedField) => persistedField.id === field.id);
-      return !isRemoved && !isUpdated;
+    return !isRemoved && !isUpdated;
-    })
+  });
    .map((field) => ({
      ...mapFieldToLegacyField(field, envelope),
      formId: undefined,
    }));
  const mappedPersistentFields = persistedFields.map((field) => ({
    ...mapFieldToLegacyField(field, envelope),
    formId: field?.formId,
  }));
  return {
-    fields: [...mappedFilteredFields, ...mappedPersistentFields],
+    fields: [...filteredFields, ...persistedFields].map((field) =>
      mapFieldToLegacyField(field, envelope),
    ),
  };
 };
@ -370,7 +359,6 @@ export const setFieldsForDocument = async ({
 */
 type FieldData = {
  id?: number | null;
  formId?: string;
  envelopeItemId: string;
  type: FieldType;
  recipientId: number;
--- a/packages/lib/server-only/field/set-fields-for-template.ts
+++ b/packages/lib/server-only/field/set-fields-for-template.ts
@ -27,7 +27,6 @@ export type SetFieldsForTemplateOptions = {
  id: EnvelopeIdOptions;
  fields: {
    id?: number | null;
    formId?: string;
    envelopeItemId: string;
    type: FieldType;
    recipientId: number;
@ -112,10 +111,10 @@ export const setFieldsForTemplate = async ({
    };
  });
-  const persistedFields = await Promise.all(
+  const persistedFields = await prisma.$transaction(
    // Disabling as wrapping promises here causes type issues
    // eslint-disable-next-line @typescript-eslint/promise-function-async
-    linkedFields.map(async (field) => {
+    linkedFields.map((field) => {
      const parsedFieldMeta = field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined;
      if (field.type === FieldType.TEXT && field.fieldMeta) {
@ -177,7 +176,7 @@ export const setFieldsForTemplate = async ({
      }
      // Proceed with upsert operation
-      const upsertedField = await prisma.field.upsert({
+      return prisma.field.upsert({
        where: {
          id: field._persisted?.id ?? -1,
          envelopeId: envelope.id,
@ -220,11 +219,6 @@ export const setFieldsForTemplate = async ({
          },
        },
      });
      return {
        ...upsertedField,
        formId: field.formId,
      };
    }),
  );
@ -246,17 +240,9 @@ export const setFieldsForTemplate = async ({
    return !isRemoved && !isUpdated;
  });
  const mappedFilteredFields = filteredFields.map((field) => ({
    ...mapFieldToLegacyField(field, envelope),
    formId: undefined,
  }));
  const mappedPersistentFields = persistedFields.map((field) => ({
    ...mapFieldToLegacyField(field, envelope),
    formId: field?.formId,
  }));
  return {
-    fields: [...mappedFilteredFields, ...mappedPersistentFields],
+    fields: [...filteredFields, ...persistedFields].map((field) =>
      mapFieldToLegacyField(field, envelope),
    ),
  };
 };
--- a/packages/lib/server-only/pdf/auto-place-fields.ts
+++ b/packages/lib/server-only/pdf/auto-place-fields.ts
@ -1,517 +0,0 @@
 import { PDFDocument, rgb } from '@cantoo/pdf-lib';
 import type { Recipient } from '@prisma/client';
 import { EnvelopeType, FieldType, RecipientRole } from '@prisma/client';
 import PDFParser from 'pdf2json';
 import { match } from 'ts-pattern';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getEnvelopeWhereInput } from '@documenso/lib/server-only/envelope/get-envelope-by-id';
 import { createEnvelopeFields } from '@documenso/lib/server-only/field/create-envelope-fields';
 import { createDocumentRecipients } from '@documenso/lib/server-only/recipient/create-document-recipients';
 import { createTemplateRecipients } from '@documenso/lib/server-only/recipient/create-template-recipients';
 import { type TFieldAndMeta, ZFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import type { EnvelopeIdOptions } from '@documenso/lib/utils/envelope';
 import { mapSecondaryIdToTemplateId } from '@documenso/lib/utils/envelope';
 import { prisma } from '@documenso/prisma';
 import { getPageSize } from './get-page-size';
 type TextPosition = {
  text: string;
  x: number;
  y: number;
  w: number;
 };
 type CharIndexMapping = {
  textPositionIndex: number;
 };
 type PlaceholderInfo = {
  placeholder: string;
  recipient: string;
  fieldAndMeta: TFieldAndMeta;
  page: number;
  x: number;
  y: number;
  width: number;
  height: number;
  pageWidth: number;
  pageHeight: number;
 };
 type FieldToCreate = TFieldAndMeta & {
  envelopeItemId?: string;
  recipientId: number;
  pageNumber: number;
  pageX: number;
  pageY: number;
  width: number;
  height: number;
 };
 type RecipientPlaceholderInfo = {
  email: string;
  name: string;
  recipientIndex: number;
 };
 /*
  Questions for later:
    - Does it handle multi-page PDFs? ✅ YES! ✅
    - Does it handle multiple recipients on the same page? ✅ YES! ✅
    - Does it handle multiple recipients on multiple pages? ✅ YES! ✅
    - What happens with incorrect placeholders? E.g. those containing non-accepted properties.
    - The placeholder data is dynamic. How to handle this parsing? Perhaps we need to do it similar to the fieldMeta parsing. ✅
    - Need to handle envelopes with multiple items. ✅
 */
 /*
  Parse field type string to FieldType enum.
  Normalizes the input (uppercase, trim) and validates it's a valid field type.
  This ensures we handle case variations and whitespace, and provides clear error messages.
 */
 const parseFieldType = (fieldTypeString: string): FieldType => {
  const normalizedType = fieldTypeString.toUpperCase().trim();
  return match(normalizedType)
    .with('SIGNATURE', () => FieldType.SIGNATURE)
    .with('FREE_SIGNATURE', () => FieldType.FREE_SIGNATURE)
    .with('INITIALS', () => FieldType.INITIALS)
    .with('NAME', () => FieldType.NAME)
    .with('EMAIL', () => FieldType.EMAIL)
    .with('DATE', () => FieldType.DATE)
    .with('TEXT', () => FieldType.TEXT)
    .with('NUMBER', () => FieldType.NUMBER)
    .with('RADIO', () => FieldType.RADIO)
    .with('CHECKBOX', () => FieldType.CHECKBOX)
    .with('DROPDOWN', () => FieldType.DROPDOWN)
    .otherwise(() => {
      throw new AppError(AppErrorCode.INVALID_BODY, {
        message: `Invalid field type: ${fieldTypeString}`,
      });
    });
 };
 /*
  Transform raw field metadata from placeholder format to schema format.
  Users should provide properly capitalized property names (e.g., readOnly, fontSize, textAlign).
  Converts string values to proper types (booleans, numbers).
 */
 const parseFieldMeta = (
  rawFieldMeta: Record<string, string>,
  fieldType: FieldType,
 ): Record<string, unknown> | undefined => {
  if (fieldType === FieldType.SIGNATURE || fieldType === FieldType.FREE_SIGNATURE) {
    return;
  }
  if (Object.keys(rawFieldMeta).length === 0) {
    return;
  }
  const fieldTypeString = String(fieldType).toLowerCase();
  const parsedFieldMeta: Record<string, boolean | number | string> = {
    type: fieldTypeString,
  };
  /*
    rawFieldMeta is an object with string keys and string values.
    It contains string values because the PDF parser returns the values as strings.
    E.g. { 'required': 'true', 'fontSize': '12', 'maxValue': '100', 'minValue': '0', 'characterLimit': '100' }
  */
  const rawFieldMetaEntries = Object.entries(rawFieldMeta);
  for (const [property, value] of rawFieldMetaEntries) {
    if (property === 'readOnly' || property === 'required') {
      parsedFieldMeta[property] = value === 'true';
    } else if (
      property === 'fontSize' ||
      property === 'maxValue' ||
      property === 'minValue' ||
      property === 'characterLimit'
    ) {
      const numValue = Number(value);
      if (!Number.isNaN(numValue)) {
        parsedFieldMeta[property] = numValue;
      }
    } else {
      parsedFieldMeta[property] = value;
    }
  }
  return parsedFieldMeta;
 };
 export const extractPlaceholdersFromPDF = async (pdf: Buffer): Promise<PlaceholderInfo[]> => {
  return new Promise((resolve, reject) => {
    const parser = new PDFParser(null, true);
    parser.on('pdfParser_dataError', (errData) => {
      reject(errData);
    });
    parser.on('pdfParser_dataReady', (pdfData) => {
      const placeholders: PlaceholderInfo[] = [];
      pdfData.Pages.forEach((page, pageIndex) => {
        /*
          pdf2json returns the PDF page content as an array of characters.
          We need to concatenate the characters to get the full text.
          We also need to get the position of the text so we can place the placeholders in the correct position.
          Page dimensions from PDF2JSON are in "page units" (relative coordinates)
        */
        let pageText = '';
        const textPositions: TextPosition[] = [];
        const charIndexMappings: CharIndexMapping[] = [];
        page.Texts.forEach((text) => {
          /*
            R is an array of objects containing each character, its position and styling information.
            The decodedText stores the characters, without any other information.
            textPositions stores each character and its position on the page.
          */
          const decodedText = text.R.map((run) => decodeURIComponent(run.T)).join('');
          /*
            For each character in the decodedText, we store its position in the textPositions array.
            This allows us to quickly find the position of a character in the textPositions array by its index.
          */
          for (let i = 0; i < decodedText.length; i++) {
            charIndexMappings.push({
              textPositionIndex: textPositions.length,
            });
          }
          pageText += decodedText;
          textPositions.push({
            text: decodedText,
            x: text.x,
            y: text.y,
            w: text.w || 0,
          });
        });
        const placeholderMatches = pageText.matchAll(/{{([^}]+)}}/g);
        /*
          A placeholder match has the following format:
          [
            '{{fieldType,recipient,fieldMeta}}',
            'fieldType,recipient,fieldMeta',
            'index: <number>',
            'input: <pdf-text>'
          ]
        */
        for (const placeholderMatch of placeholderMatches) {
          const placeholder = placeholderMatch[0];
          const placeholderData = placeholderMatch[1].split(',').map((property) => property.trim());
          const [fieldTypeString, recipient, ...fieldMetaData] = placeholderData;
          const rawFieldMeta = Object.fromEntries(
            fieldMetaData.map((property) => property.split('=')),
          );
          const fieldType = parseFieldType(fieldTypeString);
          const parsedFieldMeta = parseFieldMeta(rawFieldMeta, fieldType);
          const fieldAndMeta: TFieldAndMeta = ZFieldAndMetaSchema.parse({
            type: fieldType,
            fieldMeta: parsedFieldMeta,
          });
          /*
            Find the position of where the placeholder starts and ends in the text.
            Then find the position of the characters in the textPositions array.
            This allows us to quickly find the position of a character in the textPositions array by its index.
          */
          if (placeholderMatch.index === undefined) {
            console.error('Placeholder match index is undefined for placeholder', placeholder);
            continue;
          }
          const placeholderEndCharIndex = placeholderMatch.index + placeholder.length;
          /*
            Get the index of the placeholder's first and last character in the textPositions array.
            Used to retrieve the character information from the textPositions array.
            Example:
              startTextPosIndex - 1
              endTextPosIndex - 40
          */
          const startTextPosIndex = charIndexMappings[placeholderMatch.index].textPositionIndex;
          const endTextPosIndex = charIndexMappings[placeholderEndCharIndex - 1].textPositionIndex;
          /*
            Get the placeholder's first and last character information from the textPositions array.
            Example:
              placeholderStart = { text: '{', x: 100, y: 100, w: 100 }
              placeholderEnd = { text: '}', x: 200, y: 100, w: 100 }
          */
          const placeholderStart = textPositions[startTextPosIndex];
          const placeholderEnd = textPositions[endTextPosIndex];
          const width = placeholderEnd.x + placeholderEnd.w * 0.1 - placeholderStart.x;
          placeholders.push({
            placeholder,
            recipient,
            fieldAndMeta,
            page: pageIndex + 1,
            x: placeholderStart.x,
            y: placeholderStart.y,
            width,
            height: 1,
            pageWidth: page.Width,
            pageHeight: page.Height,
          });
        }
      });
      resolve(placeholders);
    });
    parser.parseBuffer(pdf);
  });
 };
 export const replacePlaceholdersInPDF = async (pdf: Buffer): Promise<Buffer> => {
  const placeholders = await extractPlaceholdersFromPDF(pdf);
  const pdfDoc = await PDFDocument.load(new Uint8Array(pdf));
  const pages = pdfDoc.getPages();
  for (const placeholder of placeholders) {
    const pageIndex = placeholder.page - 1;
    const page = pages[pageIndex];
    const { width: pdfLibPageWidth, height: pdfLibPageHeight } = getPageSize(page);
    /*
      Convert PDF2JSON coordinates to pdf-lib coordinates:
      PDF2JSON uses relative "page units":
      - x, y, width, height are in page units
      - Page dimensions (Width, Height) are also in page units
      pdf-lib uses absolute points (1 point = 1/72 inch):
      - Need to convert from page units to points
      - Y-axis in pdf-lib is bottom-up (origin at bottom-left)
      - Y-axis in PDF2JSON is top-down (origin at top-left)
    */
    const xPoints = (placeholder.x / placeholder.pageWidth) * pdfLibPageWidth;
    const yPoints = pdfLibPageHeight - (placeholder.y / placeholder.pageHeight) * pdfLibPageHeight;
    const widthPoints = (placeholder.width / placeholder.pageWidth) * pdfLibPageWidth;
    const heightPoints = (placeholder.height / placeholder.pageHeight) * pdfLibPageHeight;
    page.drawRectangle({
      x: xPoints,
      y: yPoints - heightPoints, // Adjust for height since y is at baseline
      width: widthPoints,
      height: heightPoints,
      color: rgb(1, 1, 1),
      borderColor: rgb(1, 1, 1),
      borderWidth: 2,
    });
  }
  const modifiedPdfBytes = await pdfDoc.save();
  return Buffer.from(modifiedPdfBytes);
 };
 const extractRecipientPlaceholder = (placeholder: string): RecipientPlaceholderInfo => {
  const indexMatch = placeholder.match(/^r(\d+)$/i);
  if (!indexMatch) {
    throw new AppError(AppErrorCode.INVALID_BODY, {
      message: `Invalid recipient placeholder format: ${placeholder}. Expected format: r1, r2, r3, etc.`,
    });
  }
  const recipientIndex = Number(indexMatch[1]);
  return {
    email: `recipient.${recipientIndex}@documenso.com`,
    name: `Recipient ${recipientIndex}`,
    recipientIndex,
  };
 };
 export const insertFieldsFromPlaceholdersInPDF = async (
  pdf: Buffer,
  userId: number,
  teamId: number,
  envelopeId: EnvelopeIdOptions,
  requestMetadata: ApiRequestMetadata,
  envelopeItemId?: string,
 ): Promise<Buffer> => {
  const placeholders = await extractPlaceholdersFromPDF(pdf);
  if (placeholders.length === 0) {
    return pdf;
  }
  /*
    A structure that maps the recipient index to the recipient name.
    Example: 1 => 'Recipient 1'
  */
  const recipientPlaceholders = new Map<number, string>();
  for (const placeholder of placeholders) {
    const { name, recipientIndex } = extractRecipientPlaceholder(placeholder.recipient);
    recipientPlaceholders.set(recipientIndex, name);
  }
  /*
    Create a list of recipients to create.
    Example: [{ email: 'recipient.1@documenso.com', name: 'Recipient 1', role: 'SIGNER', signingOrder: 1 }]
  */
  const recipientsToCreate = Array.from(
    recipientPlaceholders.entries(),
    ([recipientIndex, name]) => {
      return {
        email: `recipient.${recipientIndex}@documenso.com`,
        name,
        role: RecipientRole.SIGNER,
        signingOrder: recipientIndex,
      };
    },
  );
  const { envelopeWhereInput } = await getEnvelopeWhereInput({
    id: envelopeId,
    userId,
    teamId,
    type: null,
  });
  const envelope = await prisma.envelope.findFirst({
    where: envelopeWhereInput,
    select: {
      id: true,
      type: true,
      secondaryId: true,
    },
  });
  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
      message: 'Envelope not found',
    });
  }
  const existingRecipients = await prisma.recipient.findMany({
    where: {
      envelopeId: envelope.id,
    },
    select: {
      id: true,
      email: true,
    },
  });
  const existingEmails = new Set(existingRecipients.map((r) => r.email));
  const recipientsToCreateFiltered = recipientsToCreate.filter(
    (recipient) => !existingEmails.has(recipient.email),
  );
  let createdRecipients: Pick<Recipient, 'id' | 'email'>[] = existingRecipients;
  if (recipientsToCreateFiltered.length > 0) {
    if (envelope.type === EnvelopeType.DOCUMENT) {
      const { recipients } = await createDocumentRecipients({
        userId,
        teamId,
        id: envelopeId,
        recipients: recipientsToCreateFiltered,
        requestMetadata,
      });
      createdRecipients = [...existingRecipients, ...recipients];
    } else if (envelope.type === EnvelopeType.TEMPLATE) {
      const templateId =
        envelopeId.type === 'templateId'
          ? envelopeId.id
          : mapSecondaryIdToTemplateId(envelope.secondaryId);
      const { recipients } = await createTemplateRecipients({
        userId,
        teamId,
        templateId,
        recipients: recipientsToCreateFiltered,
      });
      createdRecipients = [...existingRecipients, ...recipients];
    } else {
      throw new AppError(AppErrorCode.INVALID_BODY, {
        message: `Invalid envelope type: ${envelope.type}`,
      });
    }
  }
  const fieldsToCreate: FieldToCreate[] = [];
  for (const placeholder of placeholders) {
    /*
      Convert PDF2JSON coordinates to percentage-based coordinates (0-100)
      The UI expects positionX and positionY as percentages, not absolute points
      PDF2JSON uses relative coordinates: x/pageWidth and y/pageHeight give us the percentage
    */
    const xPercent = (placeholder.x / placeholder.pageWidth) * 100;
    const yPercent = (placeholder.y / placeholder.pageHeight) * 100;
    const widthPercent = (placeholder.width / placeholder.pageWidth) * 100;
    const heightPercent = (placeholder.height / placeholder.pageHeight) * 100;
    const { email } = extractRecipientPlaceholder(placeholder.recipient);
    const recipient = createdRecipients.find((r) => r.email === email);
    if (!recipient) {
      throw new AppError(AppErrorCode.INVALID_BODY, {
        message: `Could not find recipient ID for placeholder: ${placeholder.placeholder}`,
      });
    }
    const recipientId = recipient.id;
    // Default height percentage if too small (use 2% as a reasonable default)
    const finalHeightPercent = heightPercent > 0.01 ? heightPercent : 2;
    fieldsToCreate.push({
      ...placeholder.fieldAndMeta,
      envelopeItemId,
      recipientId,
      pageNumber: placeholder.page,
      pageX: xPercent,
      pageY: yPercent,
      width: widthPercent,
      height: finalHeightPercent,
    });
  }
  await createEnvelopeFields({
    userId,
    teamId,
    id: envelopeId,
    fields: fieldsToCreate,
    requestMetadata,
  });
  return pdf;
 };
--- a/packages/lib/server-only/pdf/normalize-pdf.ts
+++ b/packages/lib/server-only/pdf/normalize-pdf.ts
@ -1,20 +1,27 @@
 import { PDFDocument } from '@cantoo/pdf-lib';
-import { replacePlaceholdersInPDF } from './auto-place-fields';
+import { AppError } from '../../errors/app-error';
 import { flattenAnnotations } from './flatten-annotations';
 import { flattenForm, removeOptionalContentGroups } from './flatten-form';
 export const normalizePdf = async (pdf: Buffer) => {
-  const pdfDoc = await PDFDocument.load(pdf).catch(() => null);
+  const pdfDoc = await PDFDocument.load(pdf).catch((e) => {
    console.error(`PDF normalization error: ${e.message}`);
-  if (!pdfDoc) {
+    throw new AppError('INVALID_DOCUMENT_FILE', {
-    return pdf;
+      message: 'The document is not a valid PDF',
    });
  });
  if (pdfDoc.isEncrypted) {
    throw new AppError('INVALID_DOCUMENT_FILE', {
      message: 'The document is encrypted',
    });
  }
  removeOptionalContentGroups(pdfDoc);
  await flattenForm(pdfDoc);
  flattenAnnotations(pdfDoc);
  const pdfWithoutPlaceholders = await replacePlaceholdersInPDF(pdf);
-  return pdfWithoutPlaceholders;
+  return Buffer.from(await pdfDoc.save());
 };
--- a/packages/lib/server-only/template/create-document-from-direct-template.ts
+++ b/packages/lib/server-only/template/create-document-from-direct-template.ts
@ -3,7 +3,6 @@ import { createElement } from 'react';
 import { msg } from '@lingui/core/macro';
 import type { Field, Signature } from '@prisma/client';
 import {
  DocumentSigningOrder,
  DocumentSource,
  DocumentStatus,
  EnvelopeType,
@ -27,7 +26,7 @@ import type { TSignFieldWithTokenMutationSchema } from '@documenso/trpc/server/f
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DOCUMENT_AUDIT_LOG_TYPE, RECIPIENT_DIFF_TYPE } from '../../types/document-audit-logs';
+import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import type { TRecipientActionAuthTypes } from '../../types/document-auth';
 import { DocumentAccessAuth, ZRecipientAuthOptionsSchema } from '../../types/document-auth';
 import { ZFieldMetaSchema } from '../../types/field-meta';
@ -69,10 +68,6 @@ export type CreateDocumentFromDirectTemplateOptions = {
    name?: string;
    email: string;
  };
  nextSigner?: {
    email: string;
    name: string;
  };
 };
 type CreatedDirectRecipientField = {
@ -97,7 +92,6 @@ export const createDocumentFromDirectTemplate = async ({
  directTemplateExternalId,
  signedFieldValues,
  templateUpdatedAt,
  nextSigner,
  requestMetadata,
  user,
 }: CreateDocumentFromDirectTemplateOptions): Promise<TCreateDocumentFromDirectTemplateResponse> => {
@ -134,17 +128,6 @@ export const createDocumentFromDirectTemplate = async ({
    throw new AppError(AppErrorCode.INVALID_REQUEST, { message: 'Invalid or missing template' });
  }
  if (
    nextSigner &&
    (!directTemplateEnvelope.documentMeta?.allowDictateNextSigner ||
      directTemplateEnvelope.documentMeta?.signingOrder !== DocumentSigningOrder.SEQUENTIAL)
  ) {
    throw new AppError(AppErrorCode.INVALID_REQUEST, {
      message:
        'You need to enable allowDictateNextSigner and sequential signing to dictate the next signer',
    });
  }
  const directTemplateEnvelopeLegacyId = mapSecondaryIdToTemplateId(
    directTemplateEnvelope.secondaryId,
  );
@ -647,77 +630,6 @@ export const createDocumentFromDirectTemplate = async ({
      }),
    ];
    if (nextSigner) {
      const pendingRecipients = await tx.recipient.findMany({
        select: {
          id: true,
          signingOrder: true,
          name: true,
          email: true,
          role: true,
        },
        where: {
          envelopeId: createdEnvelope.id,
          signingStatus: {
            not: SigningStatus.SIGNED,
          },
          role: {
            not: RecipientRole.CC,
          },
        },
        // Composite sort so our next recipient is always the one with the lowest signing order or id
        // if there is a tie.
        orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
      });
      const nextRecipient = pendingRecipients[0];
      if (nextRecipient) {
        auditLogsToCreate.push(
          createDocumentAuditLogData({
            type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED,
            envelopeId: createdEnvelope.id,
            user: {
              name: user?.name || directRecipientName || '',
              email: user?.email || directRecipientEmail,
            },
            metadata: requestMetadata,
            data: {
              recipientEmail: nextRecipient.email,
              recipientName: nextRecipient.name,
              recipientId: nextRecipient.id,
              recipientRole: nextRecipient.role,
              changes: [
                {
                  type: RECIPIENT_DIFF_TYPE.NAME,
                  from: nextRecipient.name,
                  to: nextSigner.name,
                },
                {
                  type: RECIPIENT_DIFF_TYPE.EMAIL,
                  from: nextRecipient.email,
                  to: nextSigner.email,
                },
              ],
            },
          }),
        );
        await tx.recipient.update({
          where: { id: nextRecipient.id },
          data: {
            sendStatus: SendStatus.SENT,
            ...(nextSigner && documentMeta?.allowDictateNextSigner
              ? {
                  name: nextSigner.name,
                  email: nextSigner.email,
                }
              : {}),
          },
        });
      }
    }
    await tx.documentAuditLog.createMany({
      data: auditLogsToCreate,
    });
--- a/packages/lib/translations/de/web.po
+++ b/packages/lib/translations/de/web.po
@ -262,20 +262,10 @@ msgstr "{prefix} hat ein Feld hinzugefügt"
 msgid "{prefix} added a recipient"
 msgstr "{prefix} hat einen Empfänger hinzugefügt"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created the document"
 msgstr "{prefix} hat das Dokument erstellt"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted the document"
 msgstr "{prefix} hat das Dokument gelöscht"
@ -366,7 +356,6 @@ msgstr "{recipientActionVerb} Dokument"
 msgid "{recipientActionVerb} the document to complete the process."
 msgstr "{recipientActionVerb} das Dokument, um den Prozess abzuschließen."
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "{recipientCount} recipients"
 msgstr "{recipientCount} Empfänger"
@ -1753,9 +1742,8 @@ msgstr ""
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
 msgid "Attachment removed successfully."
-msgstr "<<<<<<< Updated upstream======="
+msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
@ -2170,10 +2158,6 @@ msgstr "Filter löschen"
 msgid "Clear Signature"
 msgstr "Unterschrift löschen"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
 msgid "Click here to add a recipient"
 msgstr ""
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "Click here to get started"
 msgstr "Klicken Sie hier, um zu beginnen"
@ -2296,7 +2280,6 @@ msgstr "Abgeschlossene Dokumente"
 msgid "Completed Documents"
 msgstr "Abgeschlossene Dokumente"
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Completed on {formattedDate}"
 msgstr "Abgeschlossen am {formattedDate}"
@ -2496,6 +2479,7 @@ msgid "Controls which signatures are allowed to be used when signing a document.
 msgstr "Bestimmt, welche Signaturen beim Unterschreiben eines Dokuments verwendet werden dürfen."
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copied"
 msgstr "Kopiert"
@ -2513,12 +2497,14 @@ msgstr "Kopiert"
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/components/document/document-share-button.tsx
 msgid "Copied to clipboard"
 msgstr "In die Zwischenablage kopiert"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copy"
 msgstr "Kopieren"
@ -2536,7 +2522,6 @@ msgid "Copy Shareable Link"
 msgstr "Kopiere den teilbaren Link"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 msgid "Copy Signing Links"
 msgstr "Signierlinks kopieren"
@ -3661,6 +3646,7 @@ msgstr "Legen Sie Ihr Dokument hier ab"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 #: packages/lib/utils/fields.ts
 msgid "Dropdown"
 msgstr "Dropdown"
@ -4049,14 +4035,6 @@ msgstr ""
 msgid "Envelope Item Count"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item created"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item deleted"
 msgstr ""
 #: apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
 msgid "Envelope resent"
 msgstr ""
@ -5566,6 +5544,7 @@ msgstr "Kein passender Empfänger mit dieser Beschreibung gefunden."
 #: apps/remix/app/components/general/template/template-page-view-recipients.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "No recipients"
 msgstr "Keine Empfänger"
@ -7087,10 +7066,6 @@ msgstr "Wählen Sie Mitglieder oder Gruppen von Mitgliedern, die dem Team hinzug
 msgid "Select members to add to this team"
 msgstr "Wählen Sie Mitglieder aus, die diesem Team hinzugefügt werden sollen"
 #: packages/lib/utils/fields.ts
 msgid "Select Option"
 msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Passkey auswählen"
@ -7895,15 +7870,6 @@ msgstr "E-Mail-Domains synchronisieren"
 msgid "Sync failed, changes not saved"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgctxt "Audit log format"
 msgid "System auto inserted fields"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "System auto inserted fields"
 msgstr ""
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "System Requirements"
 msgstr "Systemanforderungen"
@ -8446,6 +8412,7 @@ msgstr "Der Name des Unterzeichners"
 #: apps/remix/app/components/general/avatar-with-recipient.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "The signing link has been copied to your clipboard."
 msgstr "Der Signierlink wurde in die Zwischenablage kopiert."
--- a/packages/lib/translations/en/web.po
+++ b/packages/lib/translations/en/web.po
@ -257,20 +257,10 @@ msgstr "{prefix} added a field"
 msgid "{prefix} added a recipient"
 msgstr "{prefix} added a recipient"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created an envelope item with title {0}"
 msgstr "{prefix} created an envelope item with title {0}"
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created the document"
 msgstr "{prefix} created the document"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted an envelope item with title {0}"
 msgstr "{prefix} deleted an envelope item with title {0}"
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted the document"
 msgstr "{prefix} deleted the document"
@ -361,7 +351,6 @@ msgstr "{recipientActionVerb} document"
 msgid "{recipientActionVerb} the document to complete the process."
 msgstr "{recipientActionVerb} the document to complete the process."
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "{recipientCount} recipients"
 msgstr "{recipientCount} recipients"
@ -1748,9 +1737,8 @@ msgstr "Attachment added successfully."
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
 msgid "Attachment removed successfully."
-msgstr "Attachment removed successfully.<<<<<<< Updated upstream======="
+msgstr "Attachment removed successfully."
 #: apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
@ -2165,10 +2153,6 @@ msgstr "Clear filters"
 msgid "Clear Signature"
 msgstr "Clear Signature"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
 msgid "Click here to add a recipient"
 msgstr "Click here to add a recipient"
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "Click here to get started"
 msgstr "Click here to get started"
@ -2291,7 +2275,6 @@ msgstr "Completed documents"
 msgid "Completed Documents"
 msgstr "Completed Documents"
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Completed on {formattedDate}"
 msgstr "Completed on {formattedDate}"
@ -2491,6 +2474,7 @@ msgid "Controls which signatures are allowed to be used when signing a document.
 msgstr "Controls which signatures are allowed to be used when signing a document."
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copied"
 msgstr "Copied"
@ -2508,12 +2492,14 @@ msgstr "Copied"
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/components/document/document-share-button.tsx
 msgid "Copied to clipboard"
 msgstr "Copied to clipboard"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copy"
 msgstr "Copy"
@ -2531,7 +2517,6 @@ msgid "Copy Shareable Link"
 msgstr "Copy Shareable Link"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 msgid "Copy Signing Links"
 msgstr "Copy Signing Links"
@ -3656,6 +3641,7 @@ msgstr "Drop your document here"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 #: packages/lib/utils/fields.ts
 msgid "Dropdown"
 msgstr "Dropdown"
@ -4044,14 +4030,6 @@ msgstr "Envelope ID"
 msgid "Envelope Item Count"
 msgstr "Envelope Item Count"
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item created"
 msgstr "Envelope item created"
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item deleted"
 msgstr "Envelope item deleted"
 #: apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
 msgid "Envelope resent"
 msgstr "Envelope resent"
@ -5561,6 +5539,7 @@ msgstr "No recipient matching this description was found."
 #: apps/remix/app/components/general/template/template-page-view-recipients.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "No recipients"
 msgstr "No recipients"
@ -7082,10 +7061,6 @@ msgstr "Select members or groups of members to add to the team."
 msgid "Select members to add to this team"
 msgstr "Select members to add to this team"
 #: packages/lib/utils/fields.ts
 msgid "Select Option"
 msgstr "Select Option"
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Select passkey"
@ -7890,15 +7865,6 @@ msgstr "Sync Email Domains"
 msgid "Sync failed, changes not saved"
 msgstr "Sync failed, changes not saved"
 #: packages/lib/utils/document-audit-logs.ts
 msgctxt "Audit log format"
 msgid "System auto inserted fields"
 msgstr "System auto inserted fields"
 #: packages/lib/utils/document-audit-logs.ts
 msgid "System auto inserted fields"
 msgstr "System auto inserted fields"
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "System Requirements"
 msgstr "System Requirements"
@ -8451,6 +8417,7 @@ msgstr "The signer's name"
 #: apps/remix/app/components/general/avatar-with-recipient.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "The signing link has been copied to your clipboard."
 msgstr "The signing link has been copied to your clipboard."
--- a/packages/lib/translations/es/web.po
+++ b/packages/lib/translations/es/web.po
@ -262,20 +262,10 @@ msgstr "{prefix} agregó un campo"
 msgid "{prefix} added a recipient"
 msgstr "{prefix} agregó un destinatario"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created the document"
 msgstr "{prefix} creó el documento"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted the document"
 msgstr "{prefix} eliminó el documento"
@ -366,7 +356,6 @@ msgstr "{recipientActionVerb} documento"
 msgid "{recipientActionVerb} the document to complete the process."
 msgstr "{recipientActionVerb} el documento para completar el proceso."
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "{recipientCount} recipients"
 msgstr "{recipientCount} destinatarios"
@ -1753,9 +1742,8 @@ msgstr ""
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
 msgid "Attachment removed successfully."
-msgstr "<<<<<<< Updated upstream======="
+msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
@ -2170,10 +2158,6 @@ msgstr "Limpiar filtros"
 msgid "Clear Signature"
 msgstr "Limpiar firma"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
 msgid "Click here to add a recipient"
 msgstr ""
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "Click here to get started"
 msgstr "Haga clic aquí para comenzar"
@ -2296,7 +2280,6 @@ msgstr "Documentos completados"
 msgid "Completed Documents"
 msgstr "Documentos Completados"
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Completed on {formattedDate}"
 msgstr "Completado el {formattedDate}"
@ -2496,6 +2479,7 @@ msgid "Controls which signatures are allowed to be used when signing a document.
 msgstr "Controla qué firmas están permitidas al firmar un documento."
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copied"
 msgstr "Copiado"
@ -2513,12 +2497,14 @@ msgstr "Copiado"
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/components/document/document-share-button.tsx
 msgid "Copied to clipboard"
 msgstr "Copiado al portapapeles"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copy"
 msgstr "Copiar"
@ -2536,7 +2522,6 @@ msgid "Copy Shareable Link"
 msgstr "Copiar enlace compartible"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 msgid "Copy Signing Links"
 msgstr "Copiar enlaces de firma"
@ -3661,6 +3646,7 @@ msgstr "Suelta tu documento aquí"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 #: packages/lib/utils/fields.ts
 msgid "Dropdown"
 msgstr "Menú desplegable"
@ -4049,14 +4035,6 @@ msgstr ""
 msgid "Envelope Item Count"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item created"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item deleted"
 msgstr ""
 #: apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
 msgid "Envelope resent"
 msgstr ""
@ -5566,6 +5544,7 @@ msgstr "No se encontró ningún destinatario que coincidiera con esta descripci
 #: apps/remix/app/components/general/template/template-page-view-recipients.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "No recipients"
 msgstr "Sin destinatarios"
@ -7087,10 +7066,6 @@ msgstr "Seleccione miembros o grupos de miembros para agregar al equipo."
 msgid "Select members to add to this team"
 msgstr "Seleccione los miembros para añadir a este equipo"
 #: packages/lib/utils/fields.ts
 msgid "Select Option"
 msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Seleccionar clave de acceso"
@ -7895,15 +7870,6 @@ msgstr "Sincronizar dominios de correo electrónico"
 msgid "Sync failed, changes not saved"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgctxt "Audit log format"
 msgid "System auto inserted fields"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "System auto inserted fields"
 msgstr ""
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "System Requirements"
 msgstr "Requisitos del Sistema"
@ -8446,6 +8412,7 @@ msgstr "El nombre del firmante"
 #: apps/remix/app/components/general/avatar-with-recipient.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "The signing link has been copied to your clipboard."
 msgstr "El enlace de firma ha sido copiado a tu portapapeles."
--- a/packages/lib/translations/fr/web.po
+++ b/packages/lib/translations/fr/web.po
@ -262,20 +262,10 @@ msgstr "{prefix} a ajouté un champ"
 msgid "{prefix} added a recipient"
 msgstr "{prefix} a ajouté un destinataire"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created the document"
 msgstr "{prefix} a créé le document"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted the document"
 msgstr "{prefix} a supprimé le document"
@ -366,7 +356,6 @@ msgstr "{recipientActionVerb} document"
 msgid "{recipientActionVerb} the document to complete the process."
 msgstr "{recipientActionVerb} the document to complete the process."
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "{recipientCount} recipients"
 msgstr "{recipientCount} destinataires"
@ -1753,9 +1742,8 @@ msgstr ""
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
 msgid "Attachment removed successfully."
-msgstr "<<<<<<< Updated upstream======="
+msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
@ -2170,10 +2158,6 @@ msgstr "Effacer les filtres"
 msgid "Clear Signature"
 msgstr "Effacer la signature"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
 msgid "Click here to add a recipient"
 msgstr ""
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "Click here to get started"
 msgstr "Cliquez ici pour commencer"
@ -2296,7 +2280,6 @@ msgstr "Documents complétés"
 msgid "Completed Documents"
 msgstr "Documents Complétés"
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Completed on {formattedDate}"
 msgstr "Terminé le {formattedDate}"
@ -2496,6 +2479,7 @@ msgid "Controls which signatures are allowed to be used when signing a document.
 msgstr "Contrôle quelles signatures sont autorisées lors de la signature d'un document."
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copied"
 msgstr "Copié"
@ -2513,12 +2497,14 @@ msgstr "Copié"
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/components/document/document-share-button.tsx
 msgid "Copied to clipboard"
 msgstr "Copié dans le presse-papiers"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copy"
 msgstr "Copier"
@ -2536,7 +2522,6 @@ msgid "Copy Shareable Link"
 msgstr "Copier le lien partageable"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 msgid "Copy Signing Links"
 msgstr "Copier les liens de signature"
@ -3661,6 +3646,7 @@ msgstr "Déposez votre document ici"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 #: packages/lib/utils/fields.ts
 msgid "Dropdown"
 msgstr "Liste déroulante"
@ -4049,14 +4035,6 @@ msgstr ""
 msgid "Envelope Item Count"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item created"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item deleted"
 msgstr ""
 #: apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
 msgid "Envelope resent"
 msgstr ""
@ -5566,6 +5544,7 @@ msgstr "Aucun destinataire correspondant à cette description n'a été trouvé.
 #: apps/remix/app/components/general/template/template-page-view-recipients.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "No recipients"
 msgstr "Aucun destinataire"
@ -7087,10 +7066,6 @@ msgstr "Sélectionnez des membres ou groupes de membres à ajouter à l'équipe.
 msgid "Select members to add to this team"
 msgstr "Sélectionnez des membres à ajouter à cette équipe"
 #: packages/lib/utils/fields.ts
 msgid "Select Option"
 msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Sélectionner la clé d'authentification"
@ -7895,15 +7870,6 @@ msgstr "Synchroniser les domaines de messagerie"
 msgid "Sync failed, changes not saved"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgctxt "Audit log format"
 msgid "System auto inserted fields"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "System auto inserted fields"
 msgstr ""
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "System Requirements"
 msgstr "Exigences du système"
@ -8446,6 +8412,7 @@ msgstr "Le nom du signataire"
 #: apps/remix/app/components/general/avatar-with-recipient.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "The signing link has been copied to your clipboard."
 msgstr "Le lien de signature a été copié dans votre presse-papiers."
--- a/packages/lib/translations/it/web.po
+++ b/packages/lib/translations/it/web.po
@ -262,20 +262,10 @@ msgstr "{prefix} ha aggiunto un campo"
 msgid "{prefix} added a recipient"
 msgstr "{prefix} ha aggiunto un destinatario"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created the document"
 msgstr "{prefix} ha creato il documento"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted the document"
 msgstr "{prefix} ha eliminato il documento"
@ -366,7 +356,6 @@ msgstr "{recipientActionVerb} documento"
 msgid "{recipientActionVerb} the document to complete the process."
 msgstr "{recipientActionVerb} il documento per completare il processo."
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "{recipientCount} recipients"
 msgstr "{recipientCount} destinatari"
@ -1753,9 +1742,8 @@ msgstr ""
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
 msgid "Attachment removed successfully."
-msgstr "<<<<<<< Updated upstream======="
+msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
@ -2170,10 +2158,6 @@ msgstr "Cancella filtri"
 msgid "Clear Signature"
 msgstr "Cancella firma"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
 msgid "Click here to add a recipient"
 msgstr ""
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "Click here to get started"
 msgstr "Clicca qui per iniziare"
@ -2296,7 +2280,6 @@ msgstr "Documenti Completati"
 msgid "Completed Documents"
 msgstr "Documenti Completati"
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Completed on {formattedDate}"
 msgstr "Completato il {formattedDate}"
@ -2496,6 +2479,7 @@ msgid "Controls which signatures are allowed to be used when signing a document.
 msgstr "Controlla quali firme sono consentite per firmare un documento."
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copied"
 msgstr "Copiato"
@ -2513,12 +2497,14 @@ msgstr "Copiato"
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/components/document/document-share-button.tsx
 msgid "Copied to clipboard"
 msgstr "Copiato negli appunti"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copy"
 msgstr "Copia"
@ -2536,7 +2522,6 @@ msgid "Copy Shareable Link"
 msgstr "Copia il Link Condivisibile"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 msgid "Copy Signing Links"
 msgstr "Copia link di firma"
@ -3661,6 +3646,7 @@ msgstr "Rilascia qui il tuo documento"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 #: packages/lib/utils/fields.ts
 msgid "Dropdown"
 msgstr "Menu a tendina"
@ -4049,14 +4035,6 @@ msgstr ""
 msgid "Envelope Item Count"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item created"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item deleted"
 msgstr ""
 #: apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
 msgid "Envelope resent"
 msgstr ""
@ -5566,6 +5544,7 @@ msgstr "Nessun destinatario corrispondente a questa descrizione è stato trovato
 #: apps/remix/app/components/general/template/template-page-view-recipients.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "No recipients"
 msgstr "Nessun destinatario"
@ -7087,10 +7066,6 @@ msgstr "Seleziona membri o gruppi di membri da aggiungere al team."
 msgid "Select members to add to this team"
 msgstr "Seleziona membri da aggiungere a questo team"
 #: packages/lib/utils/fields.ts
 msgid "Select Option"
 msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Seleziona una chiave di accesso"
@ -7895,15 +7870,6 @@ msgstr "Sincronizza Domini Email"
 msgid "Sync failed, changes not saved"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgctxt "Audit log format"
 msgid "System auto inserted fields"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "System auto inserted fields"
 msgstr ""
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "System Requirements"
 msgstr "Requisiti di sistema"
@ -8454,6 +8420,7 @@ msgstr "Il nome del firmatario"
 #: apps/remix/app/components/general/avatar-with-recipient.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "The signing link has been copied to your clipboard."
 msgstr "Il link di firma è stato copiato negli appunti."
--- a/packages/lib/translations/pl/web.po
+++ b/packages/lib/translations/pl/web.po
@ -262,20 +262,10 @@ msgstr "Użytkownik {prefix} dodał pole"
 msgid "{prefix} added a recipient"
 msgstr "Użytkownik {prefix} dodał odbiorcę"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} created the document"
 msgstr "Użytkownik {prefix} utworzył dokument"
 #. placeholder {0}: data.envelopeItemTitle
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted an envelope item with title {0}"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} deleted the document"
 msgstr "Użytkownik {prefix} usunął dokument"
@ -366,7 +356,6 @@ msgstr "{recipientActionVerb} dokument"
 msgid "{recipientActionVerb} the document to complete the process."
 msgstr "Sprawdź i {recipientActionVerb} dokument, aby zakończyć proces."
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "{recipientCount} recipients"
 msgstr "{recipientCount} odbiorców"
@ -1753,9 +1742,8 @@ msgstr ""
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
 msgid "Attachment removed successfully."
-msgstr "<<<<<<< Updated upstream======="
+msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-attachments-popover.tsx
 #: apps/remix/app/components/general/document/document-attachments-popover.tsx
@ -2170,10 +2158,6 @@ msgstr "Wyczyść filtry"
 msgid "Clear Signature"
 msgstr "Wyczyść podpis"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx
 msgid "Click here to add a recipient"
 msgstr ""
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "Click here to get started"
 msgstr "Kliknij, aby rozpocząć"
@ -2296,7 +2280,6 @@ msgstr "Dokumenty zakończone"
 msgid "Completed Documents"
 msgstr "Zakończone dokumenty"
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Completed on {formattedDate}"
 msgstr "Zakończono {formattedDate}"
@ -2496,6 +2479,7 @@ msgid "Controls which signatures are allowed to be used when signing a document.
 msgstr "Kontroluje, które podpisy są dozwolone do użycia podczas podpisywania dokumentu."
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copied"
 msgstr "Skopiowano"
@ -2513,12 +2497,14 @@ msgstr "Skopiowano"
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/organisation-email-domain-records-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/components/document/document-share-button.tsx
 msgid "Copied to clipboard"
 msgstr "Skopiowano do schowka"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Copy"
 msgstr "Kopiuj"
@ -2536,7 +2522,6 @@ msgid "Copy Shareable Link"
 msgstr "Kopiuj udostępniany link"
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 msgid "Copy Signing Links"
 msgstr "Kopiuj linki do podpisania"
@ -3661,6 +3646,7 @@ msgstr "Upuść swój dokument tutaj"
 #: apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 #: packages/lib/utils/fields.ts
 msgid "Dropdown"
 msgstr "Lista rozwijana"
@ -4049,14 +4035,6 @@ msgstr ""
 msgid "Envelope Item Count"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item created"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "Envelope item deleted"
 msgstr ""
 #: apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
 msgid "Envelope resent"
 msgstr ""
@ -5566,6 +5544,7 @@ msgstr "Nie znaleziono odbiorcy pasującego do tego opisu."
 #: apps/remix/app/components/general/template/template-page-view-recipients.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "No recipients"
 msgstr "Brak odbiorców"
@ -7087,10 +7066,6 @@ msgstr "Wybierz członków lub grupy członków, aby dodać do zespołu."
 msgid "Select members to add to this team"
 msgstr "Wybierz członków, aby dodać do tego zespołu"
 #: packages/lib/utils/fields.ts
 msgid "Select Option"
 msgstr ""
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Wybierz klucz uwierzytelniający"
@ -7895,15 +7870,6 @@ msgstr "Synchronizuj domeny e-mail"
 msgid "Sync failed, changes not saved"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgctxt "Audit log format"
 msgid "System auto inserted fields"
 msgstr ""
 #: packages/lib/utils/document-audit-logs.ts
 msgid "System auto inserted fields"
 msgstr ""
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "System Requirements"
 msgstr "Wymagania systemowe"
@ -8446,6 +8412,7 @@ msgstr "Nazwa podpisującego"
 #: apps/remix/app/components/general/avatar-with-recipient.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "The signing link has been copied to your clipboard."
 msgstr "Link do podpisu został skopiowany do schowka."
--- a/packages/lib/types/document-audit-logs.ts
+++ b/packages/lib/types/document-audit-logs.ts
@ -21,14 +21,10 @@ export const ZDocumentAuditLogTypeSchema = z.enum([
  'RECIPIENT_DELETED',
  'RECIPIENT_UPDATED',
  'ENVELOPE_ITEM_CREATED',
  'ENVELOPE_ITEM_DELETED',
  // Document events.
  'DOCUMENT_COMPLETED', // When the document is sealed and fully completed.
  'DOCUMENT_CREATED', // When the document is created.
  'DOCUMENT_DELETED', // When the document is soft deleted.
  'DOCUMENT_FIELDS_AUTO_INSERTED', // When a field is auto inserted during send due to default values (radio/dropdown/checkbox).
  'DOCUMENT_FIELD_INSERTED', // When a field is inserted (signed/approved/etc) by a recipient.
  'DOCUMENT_FIELD_UNINSERTED', // When a field is uninserted by a recipient.
  'DOCUMENT_FIELD_PREFILLED', // When a field is prefilled by an assistant.
@ -185,28 +181,6 @@ const ZBaseRecipientDataSchema = z.object({
  recipientRole: z.string(),
 });
 /**
 * Event: Envelope item created.
 */
 export const ZDocumentAuditLogEventEnvelopeItemCreatedSchema = z.object({
  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.ENVELOPE_ITEM_CREATED),
  data: z.object({
    envelopeItemId: z.string(),
    envelopeItemTitle: z.string(),
  }),
 });
 /**
 * Event: Envelope item deleted.
 */
 export const ZDocumentAuditLogEventEnvelopeItemDeletedSchema = z.object({
  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.ENVELOPE_ITEM_DELETED),
  data: z.object({
    envelopeItemId: z.string(),
    envelopeItemTitle: z.string(),
  }),
 });
 /**
 * Event: Email sent.
 */
@ -341,22 +315,6 @@ export const ZDocumentAuditLogEventDocumentFieldInsertedSchema = z.object({
  }),
 });
 /**
 * Event: Document field auto inserted.
 */
 export const ZDocumentAuditLogEventDocumentFieldsAutoInsertedSchema = z.object({
  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELDS_AUTO_INSERTED),
  data: z.object({
    fields: z.array(
      z.object({
        fieldId: z.number(),
        fieldType: z.nativeEnum(FieldType),
        recipientId: z.number(),
      }),
    ),
  }),
 });
 /**
 * Event: Document field uninserted.
 */
@ -694,14 +652,11 @@ export const ZDocumentAuditLogBaseSchema = z.object({
 export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and(
  z.union([
    ZDocumentAuditLogEventEnvelopeItemCreatedSchema,
    ZDocumentAuditLogEventEnvelopeItemDeletedSchema,
    ZDocumentAuditLogEventEmailSentSchema,
    ZDocumentAuditLogEventDocumentCompletedSchema,
    ZDocumentAuditLogEventDocumentCreatedSchema,
    ZDocumentAuditLogEventDocumentDeletedSchema,
    ZDocumentAuditLogEventDocumentMovedToTeamSchema,
    ZDocumentAuditLogEventDocumentFieldsAutoInsertedSchema,
    ZDocumentAuditLogEventDocumentFieldInsertedSchema,
    ZDocumentAuditLogEventDocumentFieldUninsertedSchema,
    ZDocumentAuditLogEventDocumentFieldPrefilledSchema,
--- a/packages/lib/types/field.ts
+++ b/packages/lib/types/field.ts
@ -71,6 +71,7 @@ export const ZFieldHeightSchema = z.number().min(1).describe('The height of the
 // ---------------------------------------------
 // Todo: Envelopes - dunno man
 const PrismaDecimalSchema = z.preprocess(
  (val) => (typeof val === 'string' ? new Prisma.Decimal(val) : val),
  z.instanceof(Prisma.Decimal, { message: 'Must be a Decimal' }),
--- a/packages/lib/universal/field-renderer/field-generic-items.ts
+++ b/packages/lib/universal/field-renderer/field-generic-items.ts
@ -129,58 +129,3 @@ export const createSpinner = ({
  return loadingGroup;
 };
 type CreateFieldHoverInteractionOptions = {
  options: RenderFieldElementOptions;
  fieldGroup: Konva.Group;
  fieldRect: Konva.Rect;
 };
 /**
 * Adds smooth transition-like behavior for hover effects to the field group and rectangle.
 */
 export const createFieldHoverInteraction = ({
  options,
  fieldGroup,
  fieldRect,
 }: CreateFieldHoverInteractionOptions) => {
  const { mode } = options;
  if (mode === 'export' || !options.color) {
    return;
  }
  const hoverColor = RECIPIENT_COLOR_STYLES[options.color].baseRingHover;
  fieldGroup.on('mouseover', () => {
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
      fill: hoverColor,
    }).play();
  });
  fieldGroup.on('mouseout', () => {
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
      fill: DEFAULT_RECT_BACKGROUND,
    }).play();
  });
  fieldGroup.on('transformstart', () => {
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
      fill: hoverColor,
    }).play();
  });
  fieldGroup.on('transformend', () => {
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
      fill: DEFAULT_RECT_BACKGROUND,
    }).play();
  });
 };
--- a/packages/lib/universal/field-renderer/render-checkbox-field.ts
+++ b/packages/lib/universal/field-renderer/render-checkbox-field.ts
@ -4,7 +4,6 @@ import { match } from 'ts-pattern';
 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TCheckboxFieldMeta } from '../../types/field-meta';
 import {
  createFieldHoverInteraction,
  konvaTextFill,
  konvaTextFontFamily,
  upsertFieldGroup,
@ -27,27 +26,25 @@ export const renderCheckboxFieldElement = (
 ) => {
  const { pageWidth, pageHeight, pageLayer, mode } = options;
-  const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
+  const isFirstRender = !pageLayer.findOne(`#${field.renderId}`);
  const fieldGroup = upsertFieldGroup(field, options);
  // Clear previous children and listeners to re-render fresh.
  fieldGroup.removeChildren();
  fieldGroup.off('transform');
  fieldGroup.add(upsertFieldRect(field, options));
  const checkboxMeta: TCheckboxFieldMeta | null = (field.fieldMeta as TCheckboxFieldMeta) || null;
  const checkboxValues = checkboxMeta?.values || [];
-  const isFirstRender = !pageLayer.findOne(`#${field.renderId}`);
+  const fontSize = checkboxMeta?.fontSize || DEFAULT_STANDARD_FONT_SIZE;
  // Clear previous children and listeners to re-render fresh.
  const fieldGroup = upsertFieldGroup(field, options);
  fieldGroup.removeChildren();
  fieldGroup.off('transform');
  if (isFirstRender) {
    pageLayer.add(fieldGroup);
  }
  const fieldRect = upsertFieldRect(field, options);
  fieldGroup.add(fieldRect);
  const fontSize = checkboxMeta?.fontSize || DEFAULT_STANDARD_FONT_SIZE;
  // Handle rescaling items during transforms.
  fieldGroup.on('transform', () => {
    const groupScaleX = fieldGroup.scaleX();
@ -130,9 +127,11 @@ export const renderCheckboxFieldElement = (
    pageLayer.batchDraw();
  });
  const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
  const checkedValues: number[] = field.customText ? JSON.parse(field.customText) : [];
-  checkboxValues.forEach(({ value, checked }, index) => {
+  checkboxValues.forEach(({ id, value, checked }, index) => {
    const isCheckboxChecked = match(mode)
      .with('edit', () => checked)
      .with('sign', () => checkedValues.includes(index))
@ -146,6 +145,8 @@ export const renderCheckboxFieldElement = (
      })
      .exhaustive();
    console.log('wtf?');
    const itemSize = calculateCheckboxSize(fontSize);
    const { itemInputX, itemInputY, textX, textY, textWidth, textHeight } =
@ -210,8 +211,6 @@ export const renderCheckboxFieldElement = (
    fieldGroup.add(text);
  });
  createFieldHoverInteraction({ fieldGroup, fieldRect, options });
  return {
    fieldGroup,
    isFirstRender,
--- a/packages/lib/universal/field-renderer/render-dropdown-field.ts
+++ b/packages/lib/universal/field-renderer/render-dropdown-field.ts
@ -1,10 +1,8 @@
 import { FieldType } from '@prisma/client';
 import Konva from 'konva';
 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TDropdownFieldMeta } from '../../types/field-meta';
 import {
  createFieldHoverInteraction,
  konvaTextFill,
  konvaTextFontFamily,
  upsertFieldGroup,
@ -50,30 +48,79 @@ export const renderDropdownFieldElement = (
  field: FieldToRender,
  options: RenderFieldElementOptions,
 ) => {
-  const { pageWidth, pageHeight, pageLayer, mode, translations } = options;
+  const { pageWidth, pageHeight, pageLayer, mode } = options;
  const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
  const dropdownMeta: TDropdownFieldMeta | null = (field.fieldMeta as TDropdownFieldMeta) || null;
  let selectedValue = translations?.[FieldType.DROPDOWN] || 'Select Option';
  const isFirstRender = !pageLayer.findOne(`#${field.renderId}`);
  // Clear previous children to re-render fresh.
  const fieldGroup = upsertFieldGroup(field, options);
  fieldGroup.removeChildren();
  fieldGroup.off('transform');
-  const fieldRect = upsertFieldRect(field, options);
+  // Clear previous children to re-render fresh.
-  fieldGroup.add(fieldRect);
+  fieldGroup.removeChildren();
  fieldGroup.add(upsertFieldRect(field, options));
  if (isFirstRender) {
    pageLayer.add(fieldGroup);
    fieldGroup.on('transform', () => {
      const groupScaleX = fieldGroup.scaleX();
      const groupScaleY = fieldGroup.scaleY();
      const fieldRect = fieldGroup.findOne('.field-rect');
      const text = fieldGroup.findOne('.dropdown-selected-text');
      const arrow = fieldGroup.findOne('.dropdown-arrow');
      if (!fieldRect || !text || !arrow) {
        console.log('fieldRect or text or arrow not found');
        return;
      }
      const rectWidth = fieldRect.width() * groupScaleX;
      const rectHeight = fieldRect.height() * groupScaleY;
      const { arrowX, arrowY, textX, textY, textWidth, textHeight } = calculateDropdownPosition({
        fieldWidth: rectWidth,
        fieldHeight: rectHeight,
      });
      arrow.setAttrs({
        x: arrowX,
        y: arrowY,
        scaleX: 1,
        scaleY: 1,
      });
      text.setAttrs({
        scaleX: 1,
        scaleY: 1,
        x: textX,
        y: textY,
        width: textWidth,
        height: textHeight,
      });
      fieldRect.setAttrs({
        width: rectWidth,
        height: rectHeight,
      });
      fieldGroup.scale({
        x: 1,
        y: 1,
      });
      pageLayer.batchDraw();
    });
  }
  const dropdownMeta: TDropdownFieldMeta | null = (field.fieldMeta as TDropdownFieldMeta) || null;
  const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
  const fontSize = dropdownMeta?.fontSize || DEFAULT_STANDARD_FONT_SIZE;
  // Todo: Envelopes - Translations
  let selectedValue = 'Select Option';
  if (field.inserted) {
    selectedValue = field.customText;
  }
@ -111,63 +158,27 @@ export const renderDropdownFieldElement = (
    visible: mode !== 'export',
  });
  // Add hover state for dropdown
  fieldGroup.on('mouseenter', () => {
    // dropdownContainer.stroke('#2563EB');
    // dropdownContainer.strokeWidth(2);
    document.body.style.cursor = 'pointer';
    pageLayer.batchDraw();
  });
  fieldGroup.on('mouseleave', () => {
    // dropdownContainer.stroke('#374151');
    // dropdownContainer.strokeWidth(2);
    document.body.style.cursor = 'default';
    pageLayer.batchDraw();
  });
  fieldGroup.add(selectedText);
  if (!field.inserted || mode === 'export') {
    fieldGroup.add(arrow);
  }
  fieldGroup.on('transform', () => {
    const groupScaleX = fieldGroup.scaleX();
    const groupScaleY = fieldGroup.scaleY();
    const fieldRect = fieldGroup.findOne('.field-rect');
    const text = fieldGroup.findOne('.dropdown-selected-text');
    const arrow = fieldGroup.findOne('.dropdown-arrow');
    if (!fieldRect || !text || !arrow) {
      return;
    }
    const rectWidth = fieldRect.width() * groupScaleX;
    const rectHeight = fieldRect.height() * groupScaleY;
    const { arrowX, arrowY, textX, textY, textWidth, textHeight } = calculateDropdownPosition({
      fieldWidth: rectWidth,
      fieldHeight: rectHeight,
    });
    arrow.setAttrs({
      x: arrowX,
      y: arrowY,
      scaleX: 1,
      scaleY: 1,
    });
    text.setAttrs({
      scaleX: 1,
      scaleY: 1,
      x: textX,
      y: textY,
      width: textWidth,
      height: textHeight,
    });
    fieldRect.setAttrs({
      width: rectWidth,
      height: rectHeight,
    });
    fieldGroup.scale({
      x: 1,
      y: 1,
    });
    pageLayer.batchDraw();
  });
  createFieldHoverInteraction({ fieldGroup, fieldRect, options });
  return {
    fieldGroup,
    isFirstRender,
--- a/packages/lib/universal/field-renderer/render-radio-field.ts
+++ b/packages/lib/universal/field-renderer/render-radio-field.ts
@ -4,7 +4,6 @@ import { match } from 'ts-pattern';
 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TRadioFieldMeta } from '../../types/field-meta';
 import {
  createFieldHoverInteraction,
  konvaTextFill,
  konvaTextFontFamily,
  upsertFieldGroup,
@ -27,24 +26,25 @@ export const renderRadioFieldElement = (
 ) => {
  const { pageWidth, pageHeight, pageLayer, mode } = options;
  const isFirstRender = !pageLayer.findOne(`#${field.renderId}`);
  const fieldGroup = upsertFieldGroup(field, options);
  // Clear previous children to re-render fresh
  fieldGroup.removeChildren();
  fieldGroup.add(upsertFieldRect(field, options));
  const radioMeta: TRadioFieldMeta | null = (field.fieldMeta as TRadioFieldMeta) || null;
  const radioValues = radioMeta?.values || [];
-  const isFirstRender = !pageLayer.findOne(`#${field.renderId}`);
+  const fontSize = radioMeta?.fontSize || DEFAULT_STANDARD_FONT_SIZE;
  // Clear previous children and listeners to re-render fresh
  const fieldGroup = upsertFieldGroup(field, options);
  fieldGroup.removeChildren();
  fieldGroup.off('transform');
  if (isFirstRender) {
    pageLayer.add(fieldGroup);
  }
-  const fieldRect = upsertFieldRect(field, options);
+  fieldGroup.off('transform');
  fieldGroup.add(fieldRect);
  const fontSize = radioMeta?.fontSize || DEFAULT_STANDARD_FONT_SIZE;
  // Handle rescaling items during transforms.
  fieldGroup.on('transform', () => {
@ -195,8 +195,6 @@ export const renderRadioFieldElement = (
    fieldGroup.add(text);
  });
  createFieldHoverInteraction({ fieldGroup, fieldRect, options });
  return {
    fieldGroup,
    isFirstRender,
--- a/packages/lib/universal/field-renderer/render-signature-field.ts
+++ b/packages/lib/universal/field-renderer/render-signature-field.ts
@ -1,12 +1,13 @@
 import Konva from 'konva';
 import {
  DEFAULT_RECT_BACKGROUND,
  RECIPIENT_COLOR_STYLES,
 } from '@documenso/ui/lib/recipient-colors';
 import { DEFAULT_SIGNATURE_TEXT_FONT_SIZE } from '../../constants/pdf';
 import { AppError } from '../../errors/app-error';
-import {
+import { upsertFieldGroup, upsertFieldRect } from './field-generic-items';
  createFieldHoverInteraction,
  upsertFieldGroup,
  upsertFieldRect,
 } from './field-generic-items';
 import { calculateFieldPosition } from './field-renderer';
 import type { FieldToRender, RenderFieldElementOptions } from './field-renderer';
@ -211,7 +212,33 @@ export const renderSignatureFieldElement = (
    fieldRect.opacity(0);
  }
-  createFieldHoverInteraction({ fieldGroup, fieldRect, options });
+  // Todo: Doesn't work.
  if (mode !== 'export') {
    const hoverColor = options.color
      ? RECIPIENT_COLOR_STYLES[options.color].baseRingHover
      : '#e5e7eb';
    // Todo: Envelopes - On hover add text color
    // Add smooth transition-like behavior for hover effects
    fieldGroup.on('mouseover', () => {
      new Konva.Tween({
        node: fieldRect,
        duration: 0.3,
        fill: hoverColor,
      }).play();
    });
    fieldGroup.on('mouseout', () => {
      new Konva.Tween({
        node: fieldRect,
        duration: 0.3,
        fill: DEFAULT_RECT_BACKGROUND,
      }).play();
    });
    fieldGroup.add(fieldRect);
  }
  return {
    fieldGroup,
--- a/packages/lib/universal/field-renderer/render-text-field.ts
+++ b/packages/lib/universal/field-renderer/render-text-field.ts
@ -1,9 +1,13 @@
 import Konva from 'konva';
 import {
  DEFAULT_RECT_BACKGROUND,
  RECIPIENT_COLOR_STYLES,
 } from '@documenso/ui/lib/recipient-colors';
 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TTextFieldMeta } from '../../types/field-meta';
 import {
  createFieldHoverInteraction,
  konvaTextFill,
  konvaTextFontFamily,
  upsertFieldGroup,
@ -15,12 +19,12 @@ import { calculateFieldPosition } from './field-renderer';
 const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOptions): Konva.Text => {
  const { pageWidth, pageHeight, mode = 'edit', pageLayer, translations } = options;
  const fieldTypeName = translations?.[field.type] || field.type;
  const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
  const textMeta = field.fieldMeta as TTextFieldMeta | undefined;
  const fieldTypeName = translations?.[field.type] || field.type;
  const fieldText: Konva.Text =
    pageLayer.findOne(`#${field.renderId}-text`) ||
    new Konva.Text({
@ -114,8 +118,9 @@ export const renderTextFieldElement = (
  const isFirstRender = !pageLayer.findOne(`#${field.renderId}`);
  // Clear previous children and listeners to re-render fresh.
  const fieldGroup = upsertFieldGroup(field, options);
  // Clear previous children and listeners to re-render fresh.
  fieldGroup.removeChildren();
  fieldGroup.off('transform');
@ -178,7 +183,33 @@ export const renderTextFieldElement = (
    fieldRect.opacity(0);
  }
-  createFieldHoverInteraction({ fieldGroup, fieldRect, options });
+  // Todo: Doesn't work.
  if (mode !== 'export') {
    const hoverColor = options.color
      ? RECIPIENT_COLOR_STYLES[options.color].baseRingHover
      : '#e5e7eb';
    // Todo: Envelopes - On hover add text color
    // Add smooth transition-like behavior for hover effects
    fieldGroup.on('mouseover', () => {
      new Konva.Tween({
        node: fieldRect,
        duration: 0.3,
        fill: hoverColor,
      }).play();
    });
    fieldGroup.on('mouseout', () => {
      new Konva.Tween({
        node: fieldRect,
        duration: 0.3,
        fill: DEFAULT_RECT_BACKGROUND,
      }).play();
    });
    fieldGroup.add(fieldRect);
  }
  return {
    fieldGroup,
--- a/packages/lib/universal/upload/put-file.server.ts
+++ b/packages/lib/universal/upload/put-file.server.ts
@ -7,6 +7,7 @@ import { env } from '@documenso/lib/utils/env';
 import { AppError } from '../../errors/app-error';
 import { createDocumentData } from '../../server-only/document-data/create-document-data';
 import { normalizePdf } from '../../server-only/pdf/normalize-pdf';
 import { uploadS3File } from './server-actions';
 type File = {
@ -43,6 +44,28 @@ export const putPdfFileServerSide = async (file: File) => {
  return await createDocumentData({ type, data });
 };
 /**
 * Uploads a pdf file and normalizes it.
 */
 export const putNormalizedPdfFileServerSide = async (file: File) => {
  const buffer = Buffer.from(await file.arrayBuffer());
  const normalized = await normalizePdf(buffer);
  const fileName = file.name.endsWith('.pdf') ? file.name : `${file.name}.pdf`;
  const documentData = await putFileServerSide({
    name: fileName,
    type: 'application/pdf',
    arrayBuffer: async () => Promise.resolve(normalized),
  });
  return await createDocumentData({
    type: documentData.type,
    data: documentData.data,
  });
 };
 /**
 * Uploads a file to the appropriate storage location.
 */
--- a/packages/lib/utils/document-audit-logs.ts
+++ b/packages/lib/utils/document-audit-logs.ts
@ -353,13 +353,6 @@ export const formatDocumentAuditLogAction = (
      }),
      identified: msg`${prefix} deleted the document`,
    }))
    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELDS_AUTO_INSERTED }, () => ({
      anonymous: msg({
        message: `System auto inserted fields`,
        context: `Audit log format`,
      }),
      identified: msg`System auto inserted fields`,
    }))
    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED }, () => ({
      anonymous: msg({
        message: `Field signed`,
@ -522,14 +515,6 @@ export const formatDocumentAuditLogAction = (
        context: `Audit log format`,
      }),
    }))
    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.ENVELOPE_ITEM_CREATED }, ({ data }) => ({
      anonymous: msg`Envelope item created`,
      identified: msg`${prefix} created an envelope item with title ${data.envelopeItemTitle}`,
    }))
    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.ENVELOPE_ITEM_DELETED }, ({ data }) => ({
      anonymous: msg`Envelope item deleted`,
      identified: msg`${prefix} deleted an envelope item with title ${data.envelopeItemTitle}`,
    }))
    .exhaustive();
  return {
--- a/packages/lib/utils/fields.ts
+++ b/packages/lib/utils/fields.ts
@ -101,7 +101,7 @@ export const getClientSideFieldTranslations = ({ t }: I18n): Record<FieldType, s
    [FieldType.TEXT]: t(msg`Text`),
    [FieldType.CHECKBOX]: t(msg`Checkbox`),
    [FieldType.RADIO]: t(msg`Radio`),
-    [FieldType.DROPDOWN]: t(msg`Select Option`),
+    [FieldType.DROPDOWN]: t(msg`Dropdown`),
    [FieldType.SIGNATURE]: t(msg`Signature`),
    [FieldType.FREE_SIGNATURE]: t(msg`Free Signature`),
    [FieldType.INITIALS]: t(msg`Initials`),
--- a/packages/prisma/package.json
+++ b/packages/prisma/package.json
@ -21,14 +21,14 @@
    "seed": "tsx ./seed-database.ts"
  },
  "dependencies": {
-    "@prisma/client": "^6.8.2",
+    "@prisma/client": "^6.18.0",
    "kysely": "0.26.3",
-    "prisma": "^6.8.2",
+    "prisma": "^6.18.0",
    "prisma-extension-kysely": "^3.0.0",
    "prisma-kysely": "^1.8.0",
-    "prisma-json-types-generator": "^3.2.2",
+    "prisma-json-types-generator": "^3.6.2",
    "ts-pattern": "^5.0.6",
-    "zod-prisma-types": "3.2.4"
+    "zod-prisma-types": "3.3.5"
  },
  "devDependencies": {
    "dotenv": "^16.5.0",
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@ -134,8 +134,8 @@ model Passkey {
  createdAt            DateTime  @default(now())
  updatedAt            DateTime  @default(now())
  lastUsedAt           DateTime?
-  credentialId         Bytes
+  credentialId         Bytes /// @zod.custom.use(z.instanceof(Uint8Array))
-  credentialPublicKey  Bytes
+  credentialPublicKey  Bytes /// @zod.custom.use(z.instanceof(Uint8Array))
  counter              BigInt
  credentialDeviceType String
  credentialBackedUp   Boolean
--- a/packages/prisma/seed/templates.ts
+++ b/packages/prisma/seed/templates.ts
@ -28,7 +28,6 @@ type SeedTemplateOptions = {
  title?: string;
  userId: number;
  teamId: number;
  internalVersion?: 1 | 2;
  createTemplateOptions?: Partial<Prisma.EnvelopeUncheckedCreateInput>;
 };
@ -168,7 +167,7 @@ export const seedDirectTemplate = async (options: SeedTemplateOptions) => {
    data: {
      id: prefixedId('envelope'),
      secondaryId: templateId.formattedTemplateId,
-      internalVersion: options.internalVersion ?? 1,
+      internalVersion: 1,
      type: EnvelopeType.TEMPLATE,
      title,
      envelopeItems: {
@ -185,7 +184,6 @@ export const seedDirectTemplate = async (options: SeedTemplateOptions) => {
      teamId,
      recipients: {
        create: {
          signingOrder: 1,
          email: DIRECT_TEMPLATE_RECIPIENT_EMAIL,
          name: DIRECT_TEMPLATE_RECIPIENT_NAME,
          token: Math.random().toString().slice(2, 7),
--- a/packages/trpc/client/index.ts
+++ b/packages/trpc/client/index.ts
@ -1,17 +1,23 @@
-import { createTRPCClient, httpBatchLink, httpLink, splitLink } from '@trpc/client';
+import {
-import SuperJSON from 'superjson';
+  createTRPCClient,
  httpBatchLink,
  httpLink,
  isNonJsonSerializable,
  splitLink,
 } from '@trpc/client';
 import { getBaseUrl } from '@documenso/lib/universal/get-base-url';
 import type { AppRouter } from '../server/router';
 import { dataTransformer } from '../utils/data-transformer';
 export const trpc = createTRPCClient<AppRouter>({
  links: [
    splitLink({
-      condition: (op) => op.context.skipBatch === true,
+      condition: (op) => op.context.skipBatch === true || isNonJsonSerializable(op.input),
      true: httpLink({
        url: `${getBaseUrl()}/api/trpc`,
-        transformer: SuperJSON,
+        transformer: dataTransformer,
        headers: (opts) => {
          if (typeof opts.op.context.teamId === 'string') {
            return {
@ -24,7 +30,7 @@ export const trpc = createTRPCClient<AppRouter>({
      }),
      false: httpBatchLink({
        url: `${getBaseUrl()}/api/trpc`,
-        transformer: SuperJSON,
+        transformer: dataTransformer,
        headers: (opts) => {
          const operationWithTeamId = opts.opList.find(
            (op) => op.context.teamId && typeof op.context.teamId === 'string',
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@ -12,15 +12,21 @@
  "dependencies": {
    "@documenso/lib": "*",
    "@documenso/prisma": "*",
-    "@tanstack/react-query": "5.59.15",
+    "@tanstack/react-query": "5.90.5",
-    "@trpc/client": "11.0.0-rc.648",
+    "@trpc/client": "11.7.0",
-    "@trpc/react-query": "11.0.0-rc.648",
+    "@trpc/react-query": "11.7.0",
-    "@trpc/server": "11.0.0-rc.648",
+    "@trpc/server": "11.7.0",
-    "@ts-rest/core": "^3.30.5",
+    "@ts-rest/core": "^3.52.0",
    "formidable": "^3.5.4",
    "luxon": "^3.4.0",
-    "superjson": "^1.13.1",
+    "superjson": "^2.2.5",
-    "trpc-to-openapi": "2.0.4",
+    "trpc-to-openapi": "2.4.0",
    "ts-pattern": "^5.0.5",
-    "zod": "3.24.1"
+    "zod": "^3.25.76",
    "zod-form-data": "^2.0.8",
    "zod-openapi": "^4.2.4"
  },
  "devDependencies": {
    "@types/formidable": "^3.4.6"
  }
 }
--- a/packages/trpc/react/index.tsx
+++ b/packages/trpc/react/index.tsx
@ -1,13 +1,13 @@
 import { useMemo, useState } from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { httpBatchLink, httpLink, splitLink } from '@trpc/client';
+import { httpBatchLink, httpLink, isNonJsonSerializable, splitLink } from '@trpc/client';
 import { createTRPCReact } from '@trpc/react-query';
 import SuperJSON from 'superjson';
 import { getBaseUrl } from '@documenso/lib/universal/get-base-url';
 import type { AppRouter } from '../server/router';
 import { dataTransformer } from '../utils/data-transformer';
 export { getQueryKey } from '@trpc/react-query';
@ -44,16 +44,16 @@ export function TrpcProvider({ children, headers }: TrpcProviderProps) {
      trpc.createClient({
        links: [
          splitLink({
-            condition: (op) => op.context.skipBatch === true,
+            condition: (op) => op.context.skipBatch === true || isNonJsonSerializable(op.input),
            true: httpLink({
              url: `${getBaseUrl()}/api/trpc`,
              headers,
-              transformer: SuperJSON,
+              transformer: dataTransformer,
            }),
            false: httpBatchLink({
              url: `${getBaseUrl()}/api/trpc`,
              headers,
-              transformer: SuperJSON,
+              transformer: dataTransformer,
            }),
          }),
        ],
--- a/packages/trpc/server/admin-router/get-admin-organisation.ts
+++ b/packages/trpc/server/admin-router/get-admin-organisation.ts
@ -39,11 +39,6 @@ export const getAdminOrganisation = async ({ organisationId }: GetOrganisationOp
      teams: true,
      members: {
        include: {
          organisationGroupMembers: {
            include: {
              group: true,
            },
          },
          user: {
            select: {
              id: true,
--- a/packages/trpc/server/admin-router/get-admin-organisation.types.ts
+++ b/packages/trpc/server/admin-router/get-admin-organisation.types.ts
@ -3,8 +3,6 @@ import { z } from 'zod';
 import { ZOrganisationSchema } from '@documenso/lib/types/organisation';
 import OrganisationClaimSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationClaimSchema';
 import OrganisationGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGlobalSettingsSchema';
 import OrganisationGroupMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGroupMemberSchema';
 import OrganisationGroupSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGroupSchema';
 import OrganisationMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';
 import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
 import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
@ -32,18 +30,6 @@ export const ZGetAdminOrganisationResponseSchema = ZOrganisationSchema.extend({
      email: true,
      name: true,
    }),
    organisationGroupMembers: z.array(
      OrganisationGroupMemberSchema.pick({
        id: true,
        groupId: true,
      }).extend({
        group: OrganisationGroupSchema.pick({
          id: true,
          type: true,
          organisationRole: true,
        }),
      }),
    ),
  }).array(),
  subscription: SubscriptionSchema.nullable(),
  organisationClaim: OrganisationClaimSchema,
--- a/packages/trpc/server/admin-router/router.ts
+++ b/packages/trpc/server/admin-router/router.ts
@ -17,7 +17,6 @@ import { promoteMemberToOwnerRoute } from './promote-member-to-owner';
 import { resealDocumentRoute } from './reseal-document';
 import { resetTwoFactorRoute } from './reset-two-factor-authentication';
 import { updateAdminOrganisationRoute } from './update-admin-organisation';
 import { updateOrganisationMemberRoleRoute } from './update-organisation-member-role';
 import { updateRecipientRoute } from './update-recipient';
 import { updateSiteSettingRoute } from './update-site-setting';
 import { updateSubscriptionClaimRoute } from './update-subscription-claim';
@ -32,7 +31,6 @@ export const adminRouter = router({
  },
  organisationMember: {
    promoteToOwner: promoteMemberToOwnerRoute,
    updateRole: updateOrganisationMemberRoleRoute,
  },
  claims: {
    find: findSubscriptionClaimsRoute,
--- a/packages/trpc/server/admin-router/update-organisation-member-role.ts
+++ b/packages/trpc/server/admin-router/update-organisation-member-role.ts
@ -1,220 +0,0 @@
 import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { generateDatabaseId } from '@documenso/lib/universal/id';
 import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisations';
 import { prisma } from '@documenso/prisma';
 import { adminProcedure } from '../trpc';
 import {
  ZUpdateOrganisationMemberRoleRequestSchema,
  ZUpdateOrganisationMemberRoleResponseSchema,
 } from './update-organisation-member-role.types';
 /**
 * Admin mutation to update organisation member role or transfer ownership.
 *
 * This mutation handles two scenarios:
 * 1. When role='OWNER': Transfers organisation ownership and promotes to ADMIN
 * 2. When role=ADMIN/MANAGER/MEMBER: Updates group membership
 *
 * Admin privileges bypass normal hierarchy restrictions.
 */
 export const updateOrganisationMemberRoleRoute = adminProcedure
  .input(ZUpdateOrganisationMemberRoleRequestSchema)
  .output(ZUpdateOrganisationMemberRoleResponseSchema)
  .mutation(async ({ input, ctx }) => {
    const { organisationId, userId, role } = input;
    ctx.logger.info({
      input: {
        organisationId,
        userId,
        role,
      },
    });
    const organisation = await prisma.organisation.findUnique({
      where: {
        id: organisationId,
      },
      include: {
        groups: {
          where: {
            type: OrganisationGroupType.INTERNAL_ORGANISATION,
          },
        },
        members: {
          where: {
            userId,
          },
          include: {
            organisationGroupMembers: {
              include: {
                group: true,
              },
            },
          },
        },
      },
    });
    if (!organisation) {
      throw new AppError(AppErrorCode.NOT_FOUND, {
        message: 'Organisation not found',
      });
    }
    const [member] = organisation.members;
    if (!member) {
      throw new AppError(AppErrorCode.NOT_FOUND, {
        message: 'User is not a member of this organisation',
      });
    }
    const currentOrganisationRole = getHighestOrganisationRoleInGroup(
      member.organisationGroupMembers.flatMap((member) => member.group),
    );
    if (role === 'OWNER') {
      if (organisation.ownerUserId === userId) {
        throw new AppError(AppErrorCode.INVALID_REQUEST, {
          message: 'User is already the owner of this organisation',
        });
      }
      const currentMemberGroup = organisation.groups.find(
        (group) => group.organisationRole === currentOrganisationRole,
      );
      const adminGroup = organisation.groups.find(
        (group) => group.organisationRole === OrganisationMemberRole.ADMIN,
      );
      if (!currentMemberGroup) {
        ctx.logger.error({
          message: '[CRITICAL]: Missing internal group',
          organisationId,
          userId,
          role: currentOrganisationRole,
        });
        throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
          message: 'Current member group not found',
        });
      }
      if (!adminGroup) {
        ctx.logger.error({
          message: '[CRITICAL]: Missing internal group',
          organisationId,
          userId,
          targetRole: 'ADMIN',
        });
        throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
          message: 'Admin group not found',
        });
      }
      await prisma.$transaction(async (tx) => {
        await tx.organisation.update({
          where: {
            id: organisationId,
          },
          data: {
            ownerUserId: userId,
          },
        });
        if (currentOrganisationRole !== OrganisationMemberRole.ADMIN) {
          await tx.organisationGroupMember.delete({
            where: {
              organisationMemberId_groupId: {
                organisationMemberId: member.id,
                groupId: currentMemberGroup.id,
              },
            },
          });
          await tx.organisationGroupMember.create({
            data: {
              id: generateDatabaseId('group_member'),
              organisationMemberId: member.id,
              groupId: adminGroup.id,
            },
          });
        }
      });
      return;
    }
    const targetRole = role as OrganisationMemberRole;
    if (currentOrganisationRole === targetRole) {
      throw new AppError(AppErrorCode.INVALID_REQUEST, {
        message: 'User already has this role',
      });
    }
    if (userId === organisation.ownerUserId && targetRole !== OrganisationMemberRole.ADMIN) {
      throw new AppError(AppErrorCode.INVALID_REQUEST, {
        message: 'Organisation owner must be an admin. Transfer ownership first.',
      });
    }
    const currentMemberGroup = organisation.groups.find(
      (group) => group.organisationRole === currentOrganisationRole,
    );
    const newMemberGroup = organisation.groups.find(
      (group) => group.organisationRole === targetRole,
    );
    if (!currentMemberGroup) {
      ctx.logger.error({
        message: '[CRITICAL]: Missing internal group',
        organisationId,
        userId,
        role: currentOrganisationRole,
      });
      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
        message: 'Current member group not found',
      });
    }
    if (!newMemberGroup) {
      ctx.logger.error({
        message: '[CRITICAL]: Missing internal group',
        organisationId,
        userId,
        targetRole,
      });
      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
        message: 'New member group not found',
      });
    }
    await prisma.$transaction(async (tx) => {
      await tx.organisationGroupMember.delete({
        where: {
          organisationMemberId_groupId: {
            organisationMemberId: member.id,
            groupId: currentMemberGroup.id,
          },
        },
      });
      await tx.organisationGroupMember.create({
        data: {
          id: generateDatabaseId('group_member'),
          organisationMemberId: member.id,
          groupId: newMemberGroup.id,
        },
      });
    });
  });
--- a/packages/trpc/server/admin-router/update-organisation-member-role.types.ts
+++ b/packages/trpc/server/admin-router/update-organisation-member-role.types.ts
@ -1,30 +0,0 @@
 import { OrganisationMemberRole } from '@prisma/client';
 import { z } from 'zod';
 /**
 * Admin-only role selection that includes OWNER as a special case.
 * OWNER is not a database role but triggers ownership transfer.
 */
 export const ZAdminRoleSelection = z.enum([
  'OWNER',
  OrganisationMemberRole.ADMIN,
  OrganisationMemberRole.MANAGER,
  OrganisationMemberRole.MEMBER,
 ]);
 export type TAdminRoleSelection = z.infer<typeof ZAdminRoleSelection>;
 export const ZUpdateOrganisationMemberRoleRequestSchema = z.object({
  organisationId: z.string().min(1),
  userId: z.number().min(1),
  role: ZAdminRoleSelection,
 });
 export const ZUpdateOrganisationMemberRoleResponseSchema = z.void();
 export type TUpdateOrganisationMemberRoleRequest = z.infer<
  typeof ZUpdateOrganisationMemberRoleRequestSchema
 >;
 export type TUpdateOrganisationMemberRoleResponse = z.infer<
  typeof ZUpdateOrganisationMemberRoleResponseSchema
 >;
--- a/packages/trpc/server/document-router/create-document-formdata.ts
+++ b/packages/trpc/server/document-router/create-document-formdata.ts
@ -0,0 +1,136 @@
 import { EnvelopeType } from '@prisma/client';
 import { getServerLimits } from '@documenso/ee/server-only/limits/server';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { createEnvelope } from '@documenso/lib/server-only/envelope/create-envelope';
 import { putPdfFileServerSide } from '@documenso/lib/universal/upload/put-file.server';
 import { mapSecondaryIdToDocumentId } from '@documenso/lib/utils/envelope';
 import { prisma } from '@documenso/prisma';
 import { authenticatedProcedure } from '../trpc';
 import {
  ZCreateDocumentFormDataRequestSchema,
  ZCreateDocumentFormDataResponseSchema,
  createDocumentFormDataMeta,
 } from './create-document-formdata.types';
 /**
 * Temporary endpoint for V2 Beta until we allow passthrough documents on create.
 *
 * @public
 */
 export const createDocumentFormDataRoute = authenticatedProcedure
  .meta(createDocumentFormDataMeta)
  .input(ZCreateDocumentFormDataRequestSchema)
  .output(ZCreateDocumentFormDataResponseSchema)
  .mutation(async ({ input, ctx }) => {
    const { teamId, user } = ctx;
    const { payload, file } = input;
    const {
      title,
      externalId,
      visibility,
      globalAccessAuth,
      globalActionAuth,
      recipients,
      meta,
      folderId,
      attachments,
    } = payload;
    const { remaining } = await getServerLimits({ userId: user.id, teamId });
    if (remaining.documents <= 0) {
      throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
        message: 'You have reached your document limit for this month. Please upgrade your plan.',
        statusCode: 400,
      });
    }
    const documentData = await putPdfFileServerSide(file);
    const createdEnvelope = await createEnvelope({
      userId: ctx.user.id,
      teamId,
      normalizePdf: false, // Not normalizing because of presigned URL.
      internalVersion: 1,
      data: {
        type: EnvelopeType.DOCUMENT,
        title,
        externalId,
        visibility,
        globalAccessAuth,
        globalActionAuth,
        recipients: (recipients || []).map((recipient) => ({
          ...recipient,
          fields: (recipient.fields || []).map((field) => ({
            ...field,
            page: field.pageNumber,
            positionX: field.pageX,
            positionY: field.pageY,
            documentDataId: documentData.id,
          })),
        })),
        folderId,
        envelopeItems: [
          {
            // If you ever allow more than 1 in this endpoint, make sure to use `maximumEnvelopeItemCount` to limit it.
            documentDataId: documentData.id,
          },
        ],
      },
      attachments,
      meta: {
        ...meta,
        emailSettings: meta?.emailSettings ?? undefined,
      },
      requestMetadata: ctx.metadata,
    });
    const envelopeItems = await prisma.envelopeItem.findMany({
      where: {
        envelopeId: createdEnvelope.id,
      },
      include: {
        documentData: true,
      },
    });
    const legacyDocumentId = mapSecondaryIdToDocumentId(createdEnvelope.secondaryId);
    const firstDocumentData = envelopeItems[0].documentData;
    if (!firstDocumentData) {
      throw new Error('Document data not found');
    }
    return {
      document: {
        ...createdEnvelope,
        envelopeId: createdEnvelope.id,
        documentDataId: firstDocumentData.id,
        documentData: {
          ...firstDocumentData,
          envelopeItemId: envelopeItems[0].id,
        },
        documentMeta: {
          ...createdEnvelope.documentMeta,
          documentId: legacyDocumentId,
        },
        id: legacyDocumentId,
        fields: createdEnvelope.fields.map((field) => ({
          ...field,
          documentId: legacyDocumentId,
          templateId: null,
        })),
        recipients: createdEnvelope.recipients.map((recipient) => ({
          ...recipient,
          documentId: legacyDocumentId,
          templateId: null,
        })),
      },
      folder: createdEnvelope.folder, // Todo: Remove this prior to api-v2 release.
    };
  });
--- a/packages/trpc/server/document-router/create-document-formdata.types.ts
+++ b/packages/trpc/server/document-router/create-document-formdata.types.ts
@ -0,0 +1,97 @@
 import { z } from 'zod';
 import { zfd } from 'zod-form-data';
 import { ZDocumentSchema } from '@documenso/lib/types/document';
 import {
  ZDocumentAccessAuthTypesSchema,
  ZDocumentActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
 import { ZDocumentFormValuesSchema } from '@documenso/lib/types/document-form-values';
 import { ZDocumentMetaCreateSchema } from '@documenso/lib/types/document-meta';
 import { ZEnvelopeAttachmentTypeSchema } from '@documenso/lib/types/envelope-attachment';
 import {
  ZFieldHeightSchema,
  ZFieldPageNumberSchema,
  ZFieldPageXSchema,
  ZFieldPageYSchema,
  ZFieldWidthSchema,
 } from '@documenso/lib/types/field';
 import { ZFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
 import { zodFormData } from '../../utils/zod-form-data';
 import { ZCreateRecipientSchema } from '../recipient-router/schema';
 import type { TrpcRouteMeta } from '../trpc';
 import {
  ZDocumentExternalIdSchema,
  ZDocumentTitleSchema,
  ZDocumentVisibilitySchema,
 } from './schema';
 export const createDocumentFormDataMeta: TrpcRouteMeta = {
  openapi: {
    method: 'POST',
    path: '/document/create/formdata',
    contentTypes: ['multipart/form-data'],
    summary: 'Create document',
    description: 'Create a document using form data.',
    tags: ['Document'],
  },
 };
 const ZCreateDocumentFormDataPayloadRequestSchema = z.object({
  title: ZDocumentTitleSchema,
  externalId: ZDocumentExternalIdSchema.optional(),
  visibility: ZDocumentVisibilitySchema.optional(),
  globalAccessAuth: z.array(ZDocumentAccessAuthTypesSchema).optional(),
  globalActionAuth: z.array(ZDocumentActionAuthTypesSchema).optional(),
  formValues: ZDocumentFormValuesSchema.optional(),
  folderId: z
    .string()
    .describe(
      'The ID of the folder to create the document in. If not provided, the document will be created in the root folder.',
    )
    .optional(),
  recipients: z
    .array(
      ZCreateRecipientSchema.extend({
        fields: ZFieldAndMetaSchema.and(
          z.object({
            pageNumber: ZFieldPageNumberSchema,
            pageX: ZFieldPageXSchema,
            pageY: ZFieldPageYSchema,
            width: ZFieldWidthSchema,
            height: ZFieldHeightSchema,
          }),
        )
          .array()
          .optional(),
      }),
    )
    .optional(),
  attachments: z
    .array(
      z.object({
        label: z.string().min(1, 'Label is required'),
        data: z.string().url('Must be a valid URL'),
        type: ZEnvelopeAttachmentTypeSchema.optional().default('link'),
      }),
    )
    .optional(),
  meta: ZDocumentMetaCreateSchema.optional(),
 });
 // !: Can't use zfd.formData() here because it receives `undefined`
 // !: somewhere in the pipeline of our openapi schema generation and throws
 // !: an error.
 export const ZCreateDocumentFormDataRequestSchema = zodFormData({
  payload: zfd.json(ZCreateDocumentFormDataPayloadRequestSchema),
  file: zfd.file(),
 });
 export const ZCreateDocumentFormDataResponseSchema = z.object({
  document: ZDocumentSchema,
 });
 export type TCreateDocumentFormDataRequest = z.infer<typeof ZCreateDocumentFormDataRequestSchema>;
 export type TCreateDocumentFormDataResponse = z.infer<typeof ZCreateDocumentFormDataResponseSchema>;
--- a/packages/trpc/server/document-router/create-document.ts
+++ b/packages/trpc/server/document-router/create-document.ts
@ -3,6 +3,7 @@ import { EnvelopeType } from '@prisma/client';
 import { getServerLimits } from '@documenso/ee/server-only/limits/server';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { createEnvelope } from '@documenso/lib/server-only/envelope/create-envelope';
 import { putNormalizedPdfFileServerSide } from '@documenso/lib/universal/upload/put-file.server';
 import { mapSecondaryIdToDocumentId } from '@documenso/lib/utils/envelope';
 import { authenticatedProcedure } from '../trpc';
@ -16,7 +17,12 @@ export const createDocumentRoute = authenticatedProcedure
  .output(ZCreateDocumentResponseSchema)
  .mutation(async ({ input, ctx }) => {
    const { user, teamId } = ctx;
-    const { title, documentDataId, timezone, folderId, attachments } = input;
+
    const { payload, file } = input;
    const { title, timezone, folderId, attachments } = payload;
    const { id: documentDataId } = await putNormalizedPdfFileServerSide(file);
    ctx.logger.info({
      input: {
@ -55,6 +61,7 @@ export const createDocumentRoute = authenticatedProcedure
    });
    return {
      envelopeId: document.id,
      legacyDocumentId: mapSecondaryIdToDocumentId(document.secondaryId),
    };
  });
--- a/packages/trpc/server/document-router/create-document.types.ts
+++ b/packages/trpc/server/document-router/create-document.types.ts
@ -1,23 +1,27 @@
 import { z } from 'zod';
 import { zfd } from 'zod-form-data';
 import { ZDocumentMetaTimezoneSchema } from '@documenso/lib/types/document-meta';
 import { ZEnvelopeAttachmentTypeSchema } from '@documenso/lib/types/envelope-attachment';
 import { zodFormData } from '../../utils/zod-form-data';
 import type { TrpcRouteMeta } from '../trpc';
 import { ZDocumentTitleSchema } from './schema';
 // Currently not in use until we allow passthrough documents on create.
-// export const createDocumentMeta: TrpcRouteMeta = {
+export const createDocumentMeta: TrpcRouteMeta = {
-//   openapi: {
+  openapi: {
-//     method: 'POST',
+    method: 'POST',
-//     path: '/document/create',
+    path: '/document/create',
-//     summary: 'Create document',
+    contentTypes: ['multipart/form-data'],
-//     tags: ['Document'],
+    summary: 'Create document',
-//   },
+    description: 'Create a document using form data.',
-// };
+    tags: ['Document'],
  },
 };
-export const ZCreateDocumentRequestSchema = z.object({
+export const ZCreateDocumentPayloadSchema = z.object({
  title: ZDocumentTitleSchema,
  documentDataId: z.string().min(1),
  timezone: ZDocumentMetaTimezoneSchema.optional(),
  folderId: z.string().describe('The ID of the folder to create the document in').optional(),
  attachments: z
@ -31,9 +35,16 @@ export const ZCreateDocumentRequestSchema = z.object({
    .optional(),
 });
 export const ZCreateDocumentRequestSchema = zodFormData({
  payload: zfd.json(ZCreateDocumentPayloadSchema),
  file: zfd.file(),
 });
 export const ZCreateDocumentResponseSchema = z.object({
  envelopeId: z.string(),
  legacyDocumentId: z.number(),
 });
 export type TCreateDocumentPayloadSchema = z.infer<typeof ZCreateDocumentPayloadSchema>;
 export type TCreateDocumentRequest = z.infer<typeof ZCreateDocumentRequestSchema>;
 export type TCreateDocumentResponse = z.infer<typeof ZCreateDocumentResponseSchema>;
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@ -5,6 +5,7 @@ import { deleteAttachmentRoute } from './attachment/delete-attachment';
 import { findAttachmentsRoute } from './attachment/find-attachments';
 import { updateAttachmentRoute } from './attachment/update-attachment';
 import { createDocumentRoute } from './create-document';
 import { createDocumentFormDataRoute } from './create-document-formdata';
 import { createDocumentTemporaryRoute } from './create-document-temporary';
 import { deleteDocumentRoute } from './delete-document';
 import { distributeDocumentRoute } from './distribute-document';
@ -40,6 +41,7 @@ export const documentRouter = router({
  // Temporary v2 beta routes to be removed once V2 is fully released.
  download: downloadDocumentRoute,
  createDocumentTemporary: createDocumentTemporaryRoute,
  createDocumentFormData: createDocumentFormDataRoute,
  // Internal document routes for custom frontend requests.
  getDocumentByToken: getDocumentByTokenRoute,
--- a/Show More
+++ b/Show More