Merge branch 'main' into feat/unlink-documents-deleted-org

chore: merge main
chore: return minimal data
2025-11-13 00:03:33 +10:00 · 2025-10-28 21:04:54 +11:00 · 2025-09-11 17:20:24 +03:00 · 2025-09-01 14:20:15 +03:00 · 2025-09-01 14:01:42 +03:00 · 2025-09-01 13:56:21 +03:00
177 changed files with 1683 additions and 8560 deletions
--- 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/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-download-dialog.tsx
+++ b/apps/remix/app/components/dialogs/envelope-download-dialog.tsx
@ -6,7 +6,7 @@ import { type DocumentData, DocumentStatus, type EnvelopeItem } from '@prisma/cl
 import { DownloadIcon, FileTextIcon } from 'lucide-react';

 import { downloadFile } from '@documenso/lib/client-only/download-file';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@ -87,11 +87,17 @@ export const EnvelopeDownloadDialog = ({
    }));

    try {
-      const downloadUrl = token
-        ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/files/token/${token}/envelopeItem/${envelopeItemId}/download/${version}`
-        : `${NEXT_PUBLIC_WEBAPP_URL()}/api/files/envelope/${envelopeId}/envelopeItem/${envelopeItemId}/download/${version}`;
+      const data = await getFile({
+        type: envelopeItem.documentData.type,
+        data:
+          version === 'signed'
+            ? envelopeItem.documentData.data
+            : envelopeItem.documentData.initialData,
+      });

-      const blob = await fetch(downloadUrl).then(async (res) => await res.blob());
+      const blob = new Blob([data], {
+        type: 'application/pdf',
+      });

      const baseTitle = envelopeItem.title.replace(/\.pdf$/, '');
      const suffix = version === 'signed' ? '_signed.pdf' : '.pdf';
--- 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,17 +54,13 @@ export const TemplateCreateDialog = ({ folderId }: TemplateCreateDialogProps) =>
    setIsUploadingFile(true);

    try {
-      const payload = {
+      const response = await putPdfFile(file);
+
+      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/branding-preferences-form.tsx
+++ b/apps/remix/app/components/forms/branding-preferences-form.tsx
@ -1,14 +1,14 @@
 import { useEffect, useState } from 'react';

 import { zodResolver } from '@hookform/resolvers/zod';
-import { Trans, useLingui } from '@lingui/react/macro';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
 import type { TeamGlobalSettings } from '@prisma/client';
 import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';

-import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@ -29,8 +29,6 @@ import {
 } from '@documenso/ui/primitives/select';
 import { Textarea } from '@documenso/ui/primitives/textarea';

-import { useOptionalCurrentTeam } from '~/providers/team';
-
 const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
 const ACCEPTED_FILE_TYPES = ['image/jpeg', 'image/png', 'image/webp'];

@ -70,9 +68,6 @@ export function BrandingPreferencesForm({
 }: BrandingPreferencesFormProps) {
  const { t } = useLingui();

-  const team = useOptionalCurrentTeam();
-  const organisation = useCurrentOrganisation();
-
  const [previewUrl, setPreviewUrl] = useState<string>('');
  const [hasLoadedPreview, setHasLoadedPreview] = useState(false);

@ -93,13 +88,14 @@ export function BrandingPreferencesForm({
      const file = JSON.parse(settings.brandingLogo);

      if ('type' in file && 'data' in file) {
-        const logoUrl =
-          context === 'Team'
-            ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/branding/logo/team/${team?.id}`
-            : `${NEXT_PUBLIC_WEBAPP_URL()}/api/branding/logo/organisation/${organisation?.id}`;
+        void getFile(file).then((binaryData) => {
+          const objectUrl = URL.createObjectURL(new Blob([binaryData]));

-        setPreviewUrl(logoUrl);
+          setPreviewUrl(objectUrl);
          setHasLoadedPreview(true);
+        });
+
+        return;
      }
    }

--- a/apps/remix/app/components/forms/editor/editor-field-text-form.tsx
+++ b/apps/remix/app/components/forms/editor/editor-field-text-form.tsx
@ -152,18 +152,6 @@ export const EditorFieldTextForm = ({
                    className="h-auto"
                    placeholder={t`Add text to the field`}
                    {...field}
-                    onChange={(e) => {
-                      const values = form.getValues();
-                      const characterLimit = values.characterLimit || 0;
-                      let textValue = e.target.value;
-
-                      if (characterLimit > 0 && textValue.length > characterLimit) {
-                        textValue = textValue.slice(0, characterLimit);
-                      }
-
-                      e.target.value = textValue;
-                      field.onChange(e);
-                    }}
                    rows={1}
                  />
                </FormControl>
@ -187,18 +175,6 @@ export const EditorFieldTextForm = ({
                    className="bg-background"
                    placeholder={t`Field character limit`}
                    {...field}
-                    onChange={(e) => {
-                      field.onChange(e);
-
-                      const values = form.getValues();
-                      const characterLimit = parseInt(e.target.value, 10) || 0;
-
-                      const textValue = values.text || '';
-
-                      if (characterLimit > 0 && textValue.length > characterLimit) {
-                        form.setValue('text', textValue.slice(0, characterLimit));
-                      }
-                    }}
                  />
                </FormControl>
                <FormMessage />
--- 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 (
-    fields: DirectTemplateLocalField[],
-    nextSigner?: { name: string; email: string },
-  ) => {
+  const onSignDirectTemplateSubmit = async (fields: DirectTemplateLocalField[]) => {
    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: (
-    _data: DirectTemplateLocalField[],
-    _nextSigner?: { name: string; email: string },
-  ) => Promise<void>;
+  onSubmit: (_data: DirectTemplateLocalField[]) => 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-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>
            You need to be logged in as <strong>{email}</strong> to view this page.
          </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<
-  Recipient,
-  'authOptions' | 'email' | 'role' | 'name' | 'token' | 'id'
->;
+type SigningAuthRecipient = Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token'>;

 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
@ -205,7 +205,6 @@ export const DocumentSigningPageViewV2 = () => {
            <div className="flex flex-col items-center justify-center p-2 sm:mt-4 sm:p-4">
              {currentEnvelopeItem ? (
                <PDFViewerKonvaLazy
-                  renderer="signing"
                  key={currentEnvelopeItem.id}
                  documentDataId={currentEnvelopeItem.documentDataId}
                  customPageRenderer={EnvelopeSignerPageRenderer}
--- a/apps/remix/app/components/general/document-signing/envelope-signing-provider.tsx
+++ b/apps/remix/app/components/general/document-signing/envelope-signing-provider.tsx
@ -13,7 +13,6 @@ import { prop, sortBy } from 'remeda';
 import { isBase64Image } from '@documenso/lib/constants/signatures';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import type { EnvelopeForSigningResponse } from '@documenso/lib/server-only/envelope/get-envelope-for-recipient-signing';
-import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import {
  isFieldUnsignedAndRequired,
  isRequiredField,
@ -52,11 +51,7 @@ export type EnvelopeSigningContextValue = {
  setSelectedAssistantRecipientId: (_value: number | null) => void;
  selectedAssistantRecipient: EnvelopeForSigningResponse['envelope']['recipients'][number] | null;

-  signField: (
-    _fieldId: number,
-    _value: TSignEnvelopeFieldValue,
-    authOptions?: TRecipientActionAuth,
-  ) => Promise<void>;
+  signField: (_fieldId: number, _value: TSignEnvelopeFieldValue) => Promise<void>;
 };

 const EnvelopeSigningContext = createContext<EnvelopeSigningContextValue | null>(null);
@ -289,11 +284,9 @@ export const EnvelopeSigningProvider = ({
      : null;
  }, [envelope.documentMeta?.signingOrder, envelope.recipients, recipient.id]);

-  const signField = async (
-    fieldId: number,
-    fieldValue: TSignEnvelopeFieldValue,
-    authOptions?: TRecipientActionAuth,
-  ) => {
+  const signField = async (fieldId: number, fieldValue: TSignEnvelopeFieldValue) => {
+    console.log('insertField', fieldId, fieldValue);
+
    // Set the field locally for direct templates.
    if (isDirectTemplate) {
      handleDirectTemplateFieldInsertion(fieldId, fieldValue);
@ -304,7 +297,7 @@ export const EnvelopeSigningProvider = ({
      token: envelopeData.recipient.token,
      fieldId,
      fieldValue,
-      authOptions,
+      authOptions: undefined,
    });
  };

--- a/apps/remix/app/components/general/document/document-certificate-qr-view.tsx
+++ b/apps/remix/app/components/general/document/document-certificate-qr-view.tsx
@ -174,7 +174,7 @@ const DocumentCertificateQrV2 = ({
      <div className="mt-12 w-full">
        <EnvelopeRendererFileSelector className="mb-4 p-0" fields={[]} secondaryOverride={''} />

-        <PDFViewerKonvaLazy renderer="preview" customPageRenderer={EnvelopeGenericPageRenderer} />
+        <PDFViewerKonvaLazy customPageRenderer={EnvelopeGenericPageRenderer} />
      </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,18 +62,14 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
    try {
      setIsLoading(true);

-      const payload = {
+      const response = await putPdfFile(file);
+
+      const { legacyDocumentId: id } = await createDocument({
        title: file.name,
-        timezone: userTimezone,
+        documentDataId: response.id,
+        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-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,18 +73,14 @@ export const DocumentUploadButton = ({ className }: DocumentUploadButtonProps) =
    try {
      setIsLoading(true);

-      const payload = {
+      const response = await putPdfFile(file);
+
+      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,24 +78,35 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
    try {
      setIsLoading(true);

-      const payload = {
+      const result = await Promise.all(
+        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,
        },
-      } 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) => {
+      }).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
@ -26,7 +26,7 @@ import { fieldButtonList } from './envelope-editor-fields-drag-drop';
 export default function EnvelopeEditorFieldsPageRenderer() {
  const { t, i18n } = useLingui();
  const { envelope, editorFields, getRecipientColorKey } = useCurrentEnvelopeEditor();
-  const { currentEnvelopeItem, setRenderError } = useCurrentEnvelopeRender();
+  const { currentEnvelopeItem } = useCurrentEnvelopeRender();

  const interactiveTransformer = useRef<Transformer | null>(null);

@ -103,6 +103,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
      fieldUpdates.height = fieldPageHeight;
    }

+    // Todo: envelopes Use id
    editorFields.updateFieldByFormId(fieldFormId, fieldUpdates);

    // Select the field if it is not already selected.
@ -113,7 +114,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
    pageLayer.current?.batchDraw();
  };

-  const unsafeRenderFieldOnLayer = (field: TLocalField) => {
+  const renderFieldOnLayer = (field: TLocalField) => {
    if (!pageLayer.current) {
      return;
    }
@ -159,15 +160,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
    fieldGroup.on('dragend', handleResizeOrMove);
  };

-  const renderFieldOnLayer = (field: TLocalField) => {
-    try {
-      unsafeRenderFieldOnLayer(field);
-    } catch (err) {
-      console.error(err);
-      setRenderError(true);
-    }
-  };
-
  /**
   * Initialize the Konva page canvas and all fields and interactions.
   */
--- 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
@ -27,8 +27,7 @@ import type {
 import { canRecipientFieldsBeModified } from '@documenso/lib/utils/recipients';
 import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 import PDFViewerKonvaLazy from '@documenso/ui/components/pdf-viewer/pdf-viewer-konva-lazy';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { RecipientSelector } from '@documenso/ui/primitives/recipient-selector';
 import { Separator } from '@documenso/ui/primitives/separator';

@ -113,34 +112,9 @@ export const EnvelopeEditorFieldsPage = () => {
        <EnvelopeRendererFileSelector fields={editorFields.localFields} />

        {/* Document View */}
-        <div className="mt-4 flex flex-col items-center justify-center">
-          {envelope.recipients.length === 0 && (
-            <Alert
-              variant="neutral"
-              className="border-border bg-background mb-4 flex max-w-[800px] flex-row items-center justify-between space-y-0 rounded-sm border"
-            >
-              <div className="flex flex-col gap-1">
-                <AlertTitle>
-                  <Trans>Missing Recipients</Trans>
-                </AlertTitle>
-                <AlertDescription>
-                  <Trans>You need at least one recipient to add fields</Trans>
-                </AlertDescription>
-              </div>
-
-              <Button asChild variant="outline">
-                <Link to={`${relativePath.editorPath}`}>
-                  <Trans>Add Recipients</Trans>
-                </Link>
-              </Button>
-            </Alert>
-          )}
-
+        <div className="mt-4 flex h-full justify-center p-4">
          {currentEnvelopeItem !== null ? (
-            <PDFViewerKonvaLazy
-              renderer="editor"
-              customPageRenderer={EnvelopeEditorFieldsPageRenderer}
-            />
+            <PDFViewerKonvaLazy customPageRenderer={EnvelopeEditorFieldsPageRenderer} />
          ) : (
            <div className="flex flex-col items-center justify-center py-32">
              <FileTextIcon className="text-muted-foreground h-10 w-10" />
@ -156,7 +130,7 @@ export const EnvelopeEditorFieldsPage = () => {
      </div>

      {/* Right Section - Form Fields Panel */}
-      {currentEnvelopeItem && envelope.recipients.length > 0 && (
+      {currentEnvelopeItem && (
        <div className="bg-background border-border sticky top-0 h-full w-80 flex-shrink-0 overflow-y-auto border-l py-4">
          {/* Recipient selector section. */}
          <section className="px-4">
@ -164,6 +138,19 @@ export const EnvelopeEditorFieldsPage = () => {
              <Trans>Selected Recipient</Trans>
            </h3>

+            {envelope.recipients.length === 0 ? (
+              <Alert variant="warning">
+                <AlertDescription className="flex flex-col gap-2">
+                  <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>
+            ) : (
              <RecipientSelector
                selectedRecipient={editorFields.selectedRecipient}
                onSelectedRecipientChange={(recipient) =>
@ -173,6 +160,7 @@ export const EnvelopeEditorFieldsPage = () => {
                className="w-full"
                align="end"
              />
+            )}

            {editorFields.selectedRecipient &&
              !canRecipientFieldsBeModified(editorFields.selectedRecipient, envelope.fields) && (
--- 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
@ -229,6 +229,7 @@ export const EnvelopeEditorSettingsDialog = ({

  const emails = emailData?.data || [];

+  // Todo: Envelopes this doesn't make sense (look at previous)
  const canUpdateVisibility = canAccessTeamDocument(team.currentTeamRole, envelope.visibility);

  const onFormSubmit = async (data: TAddSettingsFormSchema) => {
@ -241,6 +242,7 @@ export const EnvelopeEditorSettingsDialog = ({
    try {
      await updateEnvelope({
        envelopeId: envelope.id,
+        envelopeType: envelope.type,
        data: {
          externalId: data.externalId || null,
          visibility: data.visibility,
@ -321,7 +323,7 @@ export const EnvelopeEditorSettingsDialog = ({

      <DialogContent className="flex w-full !max-w-5xl flex-row gap-0 p-0">
        {/* Sidebar. */}
-        <div className="bg-accent/20 flex w-80 flex-col border-r">
+        <div className="flex w-80 flex-col border-r bg-gray-50">
          <DialogHeader className="p-6 pb-4">
            <DialogTitle>Document Settings</DialogTitle>
          </DialogHeader>
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-upload-page.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-upload-page.tsx
@ -142,7 +142,7 @@ export const EnvelopeEditorUploadPage = () => {

    const { createdEnvelopeItems } = await createEnvelopeItems({
      envelopeId: envelope.id,
-      data: envelopeItemsToCreate,
+      items: envelopeItemsToCreate,
    }).catch((error) => {
      console.error(error);

@ -203,6 +203,7 @@ export const EnvelopeEditorUploadPage = () => {
    debouncedUpdateEnvelopeItems(items);
  };

+  // Todo: Envelopes - Sync into envelopes data
  const debouncedUpdateEnvelopeItems = useDebounceFunction((files: LocalFile[]) => {
    void updateEnvelopeItems({
      envelopeId: envelope.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,8 +12,7 @@ import { getClientSideFieldTranslations } from '@documenso/lib/utils/fields';
 export default function EnvelopeGenericPageRenderer() {
  const { i18n } = useLingui();

-  const { currentEnvelopeItem, fields, getRecipientColorKey, setRenderError } =
-    useCurrentEnvelopeRender();
+  const { currentEnvelopeItem, fields, getRecipientColorKey } = useCurrentEnvelopeRender();

  const {
    stage,
@ -38,7 +37,7 @@ export default function EnvelopeGenericPageRenderer() {
    [fields, pageContext.pageNumber],
  );

-  const unsafeRenderFieldOnLayer = (field: TEnvelope['fields'][number]) => {
+  const renderFieldOnLayer = (field: TEnvelope['fields'][number]) => {
    if (!pageLayer.current) {
      console.error('Layer not loaded yet');
      return;
@ -67,15 +66,6 @@ export default function EnvelopeGenericPageRenderer() {
    });
  };

-  const renderFieldOnLayer = (field: TEnvelope['fields'][number]) => {
-    try {
-      unsafeRenderFieldOnLayer(field);
-    } catch (err) {
-      console.error(err);
-      setRenderError(true);
-    }
-  };
-
  /**
   * Initialize the Konva page canvas and all fields and interactions.
   */
--- a/apps/remix/app/components/general/envelope-signing/envelope-signer-page-renderer.tsx
+++ b/apps/remix/app/components/general/envelope-signing/envelope-signer-page-renderer.tsx
@ -10,17 +10,14 @@ import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-rende
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import { DIRECT_TEMPLATE_RECIPIENT_EMAIL } from '@documenso/lib/constants/direct-templates';
-import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZFullFieldSchema } from '@documenso/lib/types/field';
 import { createSpinner } from '@documenso/lib/universal/field-renderer/field-generic-items';
 import { renderField } from '@documenso/lib/universal/field-renderer/render-field';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { getClientSideFieldTranslations } from '@documenso/lib/utils/fields';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import type { TSignEnvelopeFieldValue } from '@documenso/trpc/server/envelope-router/sign-envelope-field.types';
 import { EnvelopeFieldToolTip } from '@documenso/ui/components/field/envelope-field-tooltip';
 import type { TRecipientColor } from '@documenso/ui/lib/recipient-colors';
-import { useToast } from '@documenso/ui/primitives/use-toast';

 import { handleCheckboxFieldClick } from '~/utils/field-signing/checkbox-field';
 import { handleDropdownFieldClick } from '~/utils/field-signing/dropdown-field';
@ -31,24 +28,20 @@ import { handleNumberFieldClick } from '~/utils/field-signing/number-field';
 import { handleSignatureFieldClick } from '~/utils/field-signing/signature-field';
 import { handleTextFieldClick } from '~/utils/field-signing/text-field';

-import { useRequiredDocumentSigningAuthContext } from '../document-signing/document-signing-auth-provider';
 import { useRequiredEnvelopeSigningContext } from '../document-signing/envelope-signing-provider';

 export default function EnvelopeSignerPageRenderer() {
-  const { t, i18n } = useLingui();
-  const { currentEnvelopeItem, setRenderError } = useCurrentEnvelopeRender();
+  const { i18n } = useLingui();
+  const { currentEnvelopeItem } = useCurrentEnvelopeRender();
  const { sessionData } = useOptionalSession();

-  const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext();
-  const { toast } = useToast();
-
  const {
    envelopeData,
    recipient,
    recipientFields,
    recipientFieldsRemaining,
    showPendingFieldTooltip,
-    signField: signFieldInternal,
+    signField,
    email,
    setEmail,
    fullName,
@ -87,7 +80,7 @@ export default function EnvelopeSignerPageRenderer() {
    );
  }, [recipientFields, selectedAssistantRecipientFields, pageContext.pageNumber]);

-  const unsafeRenderFieldOnLayer = (unparsedField: Field & { signature?: Signature | null }) => {
+  const renderFieldOnLayer = (unparsedField: Field & { signature?: Signature | null }) => {
    if (!pageLayer.current) {
      console.error('Layer not loaded yet');
      return;
@ -244,7 +237,7 @@ export default function EnvelopeSignerPageRenderer() {
            .then(async (payload) => {
              if (payload) {
                fieldGroup.add(loadingSpinnerGroup);
-                await signField(field.id, payload);
+                await signField(field.id, payload); // Todo: Envelopes - Handle errors
              }

              if (payload?.value) {
@ -325,6 +318,7 @@ export default function EnvelopeSignerPageRenderer() {
         * SIGNATURE FIELD.
         */
        .with({ type: FieldType.SIGNATURE }, (field) => {
+          // Todo: Envelopes - Reauth
          handleSignatureFieldClick({
            field,
            signature,
@ -335,21 +329,11 @@ export default function EnvelopeSignerPageRenderer() {
            .then(async (payload) => {
              if (payload) {
                fieldGroup.add(loadingSpinnerGroup);
-
-                if (payload.value) {
-                  void executeActionAuthProcedure({
-                    onReauthFormSubmit: async (authOptions) => {
-                      await signField(field.id, payload, authOptions);
-
-                      loadingSpinnerGroup.destroy();
-                    },
-                    actionTarget: field.type,
-                  });
-
-                  setSignature(payload.value);
-                } else {
                await signField(field.id, payload);
              }
+
+              if (payload?.value) {
+                setSignature(payload.value);
              }
            })
            .finally(() => {
@ -363,42 +347,13 @@ export default function EnvelopeSignerPageRenderer() {
    fieldGroup.on('pointerdown', handleFieldGroupClick);
  };

-  const renderFieldOnLayer = (unparsedField: Field & { signature?: Signature | null }) => {
-    try {
-      unsafeRenderFieldOnLayer(unparsedField);
-    } catch (err) {
-      console.error(err);
-      setRenderError(true);
-    }
-  };
-
-  const signField = async (
-    fieldId: number,
-    payload: TSignEnvelopeFieldValue,
-    authOptions?: TRecipientActionAuth,
-  ) => {
-    try {
-      await signFieldInternal(fieldId, payload, authOptions);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: t`Error`,
-        description: t`An error occurred while signing the field.`,
-        variant: 'destructive',
-      });
-
-      throw err;
-    }
-  };
-
  /**
   * Initialize the Konva page canvas and all fields and interactions.
   */
  const createPageCanvas = (currentStage: Konva.Stage, currentPageLayer: Konva.Layer) => {
    // Render the fields.
    for (const field of localPageFields) {
-      renderFieldOnLayer(field);
+      renderFieldOnLayer(field); // Todo: Envelopes - [CRITICAL] Handle errors which prevent rendering
    }

    currentPageLayer.batchDraw();
@ -414,7 +369,7 @@ export default function EnvelopeSignerPageRenderer() {

    localPageFields.forEach((field) => {
      console.log('Field changed/inserted, rendering on canvas');
-      renderFieldOnLayer(field);
+      renderFieldOnLayer(field); // Todo: Envelopes - [CRITICAL] Handle errors which prevent rendering
    });

    pageLayer.current.batchDraw();
@ -432,7 +387,7 @@ export default function EnvelopeSignerPageRenderer() {
    pageLayer.current.destroyChildren();

    localPageFields.forEach((field) => {
-      renderFieldOnLayer(field);
+      renderFieldOnLayer(field); // Todo: Envelopes - [CRITICAL] Handle errors which prevent rendering
    });

    pageLayer.current.batchDraw();
--- 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/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,17 +40,13 @@ export const TemplateDropZoneWrapper = ({ children, className }: TemplateDropZon
    try {
      setIsLoading(true);

-      const payload = {
+      const documentData = await putPdfFile(file);
+
+      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+/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 }) => {
-          const isOwner = row.original.userId === organisation?.ownerUserId;
-
-          return (
+        cell: ({ row }) => (
          <div className="flex justify-end space-x-2">
-              <AdminOrganisationMemberUpdateDialog
-                trigger={
-                  <Button variant="outline">
-                    <Trans>Update role</Trans>
-                  </Button>
+            <Button
+              variant="outline"
+              disabled={row.original.userId === organisation?.ownerUserId}
+              loading={isPromotingToOwner}
+              onClick={async () =>
+                promoteToOwner({
+                  organisationId,
+                  userId: row.original.userId,
+                })
              }
-                organisationId={organisationId}
-                organisationMember={row.original}
-                isOwner={isOwner}
-              />
+            >
+              <Trans>Promote to owner</Trans>
+            </Button>
          </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
@ -156,10 +156,7 @@ export default function DocumentPage({ params }: Route.ComponentProps) {

              <Card className="rounded-xl before:rounded-xl" gradient>
                <CardContent className="p-2">
-                  <PDFViewerKonvaLazy
-                    renderer="preview"
-                    customPageRenderer={EnvelopeGenericPageRenderer}
-                  />
+                  <PDFViewerKonvaLazy customPageRenderer={EnvelopeGenericPageRenderer} />
                </CardContent>
              </Card>
            </EnvelopeRenderProvider>
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
@ -179,10 +179,7 @@ export default function TemplatePage({ params }: Route.ComponentProps) {

              <Card className="rounded-xl before:rounded-xl" gradient>
                <CardContent className="p-2">
-                  <PDFViewerKonvaLazy
-                    renderer="preview"
-                    customPageRenderer={EnvelopeGenericPageRenderer}
-                  />
+                  <PDFViewerKonvaLazy customPageRenderer={EnvelopeGenericPageRenderer} />
                </CardContent>
              </Card>
            </EnvelopeRenderProvider>
--- 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/app/utils/field-signing/checkbox-field.ts
+++ b/apps/remix/app/utils/field-signing/checkbox-field.ts
@ -1,6 +1,5 @@
 import { FieldType } from '@prisma/client';

-import { validateCheckboxLength } from '@documenso/lib/advanced-fields-validation/validate-checkbox';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TFieldCheckbox } from '@documenso/lib/types/field';
 import { parseCheckboxCustomText } from '@documenso/lib/utils/fields';
@ -45,13 +44,6 @@ export const handleCheckboxFieldClick = async (

  let checkedValues: number[] | null = newValues.filter((v) => v.isChecked).map((v) => v.index);

-  if (checkedValues.length === 0) {
-    return {
-      type: FieldType.CHECKBOX,
-      value: [],
-    };
-  }
-
  if (validationRule && validationLength) {
    const checkboxValidationRule = checkboxValidationSigns.find(
      (sign) => sign.label === validationRule,
@ -63,34 +55,13 @@ export const handleCheckboxFieldClick = async (
      });
    }

-    // Custom logic to make it flow better.
-    // If "at most" OR "exactly" 1 value then just return the new selected value if exists.
-    if (
-      (checkboxValidationRule.value === '=' || checkboxValidationRule.value === '<=') &&
-      validationLength === 1
-    ) {
-      return {
-        type: FieldType.CHECKBOX,
-        value: [clickedCheckboxIndex],
-      };
-    }
-
-    const isValid = validateCheckboxLength(
-      checkedValues.length,
-      checkboxValidationRule.value,
-      validationLength,
-    );
-
-    // Only render validation dialog if validation is invalid.
-    if (!isValid) {
    checkedValues = await SignFieldCheckboxDialog.call({
      fieldMeta: field.fieldMeta,
      validationRule: checkboxValidationRule.value,
      validationLength,
-        preselectedIndices: checkedValues,
+      preselectedIndices: currentCheckedIndices,
    });
  }
-  }

  if (!checkedValues) {
    return null;
--- a/apps/remix/server/api/files.helpers.ts
+++ b/apps/remix/server/api/files.helpers.ts
@ -1,82 +0,0 @@
-import { type DocumentDataType, DocumentStatus } from '@prisma/client';
-import { type Context } from 'hono';
-
-import { sha256 } from '@documenso/lib/universal/crypto';
-import { getFileServerSide } from '@documenso/lib/universal/upload/get-file.server';
-
-import type { HonoEnv } from '../router';
-
-type HandleEnvelopeItemFileRequestOptions = {
-  title: string;
-  status: DocumentStatus;
-  documentData: {
-    type: DocumentDataType;
-    data: string;
-    initialData: string;
-  };
-  version: 'signed' | 'original';
-  isDownload: boolean;
-  context: Context<HonoEnv>;
-};
-
-/**
- * Helper function to handle envelope item file requests (both view and download)
- */
-export const handleEnvelopeItemFileRequest = async ({
-  title,
-  status,
-  documentData,
-  version,
-  isDownload,
-  context: c,
-}: HandleEnvelopeItemFileRequestOptions) => {
-  const documentDataToUse = version === 'signed' ? documentData.data : documentData.initialData;
-
-  const etag = Buffer.from(sha256(documentDataToUse)).toString('hex');
-
-  if (c.req.header('If-None-Match') === etag) {
-    return c.body(null, 304);
-  }
-
-  const file = await getFileServerSide({
-    type: documentData.type,
-    data: documentDataToUse,
-  }).catch((error) => {
-    console.error(error);
-
-    return null;
-  });
-
-  if (!file) {
-    return c.json({ error: 'File not found' }, 404);
-  }
-
-  c.header('Content-Type', 'application/pdf');
-  c.header('Content-Length', file.length.toString());
-  c.header('ETag', etag);
-
-  if (!isDownload) {
-    if (status === DocumentStatus.COMPLETED) {
-      c.header('Cache-Control', 'public, max-age=31536000, immutable');
-    } else {
-      // Set a tiny 1 minute cache, with must-revalidate to ensure the client always checks for updates.
-      c.header('Cache-Control', 'public, max-age=60, must-revalidate');
-    }
-  }
-
-  if (isDownload) {
-    // Generate filename following the pattern from envelope-download-dialog.tsx
-    const baseTitle = title.replace(/\.pdf$/, '');
-    const suffix = version === 'signed' ? '_signed.pdf' : '.pdf';
-    const filename = `${baseTitle}${suffix}`;
-
-    c.header('Content-Disposition', `attachment; filename="${filename}"`);
-
-    // For downloads, prevent caching to ensure fresh data
-    c.header('Cache-Control', 'no-cache, no-store, must-revalidate');
-    c.header('Pragma', 'no-cache');
-    c.header('Expires', '0');
-  }
-
-  return c.body(file);
-};
--- a/apps/remix/server/api/files.ts
+++ b/apps/remix/server/api/files.ts
@ -1,22 +1,21 @@
+import { PDFDocument } from '@cantoo/pdf-lib';
 import { sValidator } from '@hono/standard-validator';
 import { Hono } from 'hono';

-import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-import { putNormalizedPdfFileServerSide } from '@documenso/lib/universal/upload/put-file.server';
-import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions';
-import { prisma } from '@documenso/prisma';
+import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
+import { putFileServerSide } from '@documenso/lib/universal/upload/put-file.server';
+import {
+  getPresignGetUrl,
+  getPresignPostUrl,
+} from '@documenso/lib/universal/upload/server-actions';

 import type { HonoEnv } from '../router';
-import { handleEnvelopeItemFileRequest } from './files.helpers';
 import {
+  type TGetPresignedGetUrlResponse,
  type TGetPresignedPostUrlResponse,
-  ZGetEnvelopeItemFileDownloadRequestParamsSchema,
-  ZGetEnvelopeItemFileRequestParamsSchema,
-  ZGetEnvelopeItemFileTokenDownloadRequestParamsSchema,
-  ZGetEnvelopeItemFileTokenRequestParamsSchema,
+  ZGetPresignedGetUrlRequestSchema,
  ZGetPresignedPostUrlRequestSchema,
  ZUploadPdfRequestSchema,
 } from './files.types';
@ -43,7 +42,29 @@ export const filesRoute = new Hono<HonoEnv>()
        return c.json({ error: 'File too large' }, 400);
      }

-      const result = await putNormalizedPdfFileServerSide(file);
+      const arrayBuffer = await file.arrayBuffer();
+
+      const pdf = await PDFDocument.load(arrayBuffer).catch((e) => {
+        console.error(`PDF upload parse error: ${e.message}`);
+
+        throw new AppError('INVALID_DOCUMENT_FILE');
+      });
+
+      if (pdf.isEncrypted) {
+        throw new AppError('INVALID_DOCUMENT_FILE');
+      }
+
+      // Todo: (RR7) Test this.
+      if (!file.name.endsWith('.pdf')) {
+        Object.defineProperty(file, 'name', {
+          writable: true,
+          value: `${file.name}.pdf`,
+        });
+      }
+
+      const { type, data } = await putFileServerSide(file);
+
+      const result = await createDocumentData({ type, data });

      return c.json(result);
    } catch (error) {
@ -51,6 +72,19 @@ export const filesRoute = new Hono<HonoEnv>()
      return c.json({ error: 'Upload failed' }, 500);
    }
  })
+  .post('/presigned-get-url', sValidator('json', ZGetPresignedGetUrlRequestSchema), async (c) => {
+    const { key } = await c.req.json();
+
+    try {
+      const { url } = await getPresignGetUrl(key || '');
+
+      return c.json({ url } satisfies TGetPresignedGetUrlResponse);
+    } catch (err) {
+      console.error(err);
+
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR);
+    }
+  })
  .post('/presigned-post-url', sValidator('json', ZGetPresignedPostUrlRequestSchema), async (c) => {
    const { fileName, contentType } = c.req.valid('json');

@ -63,222 +97,4 @@ export const filesRoute = new Hono<HonoEnv>()

      throw new AppError(AppErrorCode.UNKNOWN_ERROR);
    }
-  })
-  .get(
-    '/envelope/:envelopeId/envelopeItem/:envelopeItemId',
-    sValidator('param', ZGetEnvelopeItemFileRequestParamsSchema),
-    async (c) => {
-      const { envelopeId, envelopeItemId } = c.req.valid('param');
-
-      const session = await getOptionalSession(c);
-
-      if (!session.user) {
-        return c.json({ error: 'Unauthorized' }, 401);
-      }
-
-      const envelope = await prisma.envelope.findFirst({
-        where: {
-          id: envelopeId,
-        },
-        include: {
-          envelopeItems: {
-            where: {
-              id: envelopeItemId,
-            },
-            include: {
-              documentData: true,
-            },
-          },
-        },
  });
-
-      if (!envelope) {
-        return c.json({ error: 'Envelope not found' }, 404);
-      }
-
-      const [envelopeItem] = envelope.envelopeItems;
-
-      if (!envelopeItem) {
-        return c.json({ error: 'Envelope item not found' }, 404);
-      }
-
-      const team = await getTeamById({
-        userId: session.user.id,
-        teamId: envelope.teamId,
-      }).catch((error) => {
-        console.error(error);
-
-        return null;
-      });
-
-      if (!team) {
-        return c.json(
-          { error: 'User does not have access to the team that this envelope is associated with' },
-          403,
-        );
-      }
-
-      if (!envelopeItem.documentData) {
-        return c.json({ error: 'Document data not found' }, 404);
-      }
-
-      return await handleEnvelopeItemFileRequest({
-        title: envelopeItem.title,
-        status: envelope.status,
-        documentData: envelopeItem.documentData,
-        version: 'signed',
-        isDownload: false,
-        context: c,
-      });
-    },
-  )
-  .get(
-    '/envelope/:envelopeId/envelopeItem/:envelopeItemId/download/:version?',
-    sValidator('param', ZGetEnvelopeItemFileDownloadRequestParamsSchema),
-    async (c) => {
-      const { envelopeId, envelopeItemId, version } = c.req.valid('param');
-
-      const session = await getOptionalSession(c);
-
-      if (!session.user) {
-        return c.json({ error: 'Unauthorized' }, 401);
-      }
-
-      const envelope = await prisma.envelope.findFirst({
-        where: {
-          id: envelopeId,
-        },
-        include: {
-          envelopeItems: {
-            where: {
-              id: envelopeItemId,
-            },
-            include: {
-              documentData: true,
-            },
-          },
-        },
-      });
-
-      if (!envelope) {
-        return c.json({ error: 'Envelope not found' }, 404);
-      }
-
-      const [envelopeItem] = envelope.envelopeItems;
-
-      if (!envelopeItem) {
-        return c.json({ error: 'Envelope item not found' }, 404);
-      }
-
-      const team = await getTeamById({
-        userId: session.user.id,
-        teamId: envelope.teamId,
-      }).catch((error) => {
-        console.error(error);
-
-        return null;
-      });
-
-      if (!team) {
-        return c.json(
-          { error: 'User does not have access to the team that this envelope is associated with' },
-          403,
-        );
-      }
-
-      if (!envelopeItem.documentData) {
-        return c.json({ error: 'Document data not found' }, 404);
-      }
-
-      return await handleEnvelopeItemFileRequest({
-        title: envelopeItem.title,
-        status: envelope.status,
-        documentData: envelopeItem.documentData,
-        version,
-        isDownload: true,
-        context: c,
-      });
-    },
-  )
-  .get(
-    '/token/:token/envelopeItem/:envelopeItemId',
-    sValidator('param', ZGetEnvelopeItemFileTokenRequestParamsSchema),
-    async (c) => {
-      const { token, envelopeItemId } = c.req.valid('param');
-
-      const envelopeItem = await prisma.envelopeItem.findFirst({
-        where: {
-          id: envelopeItemId,
-          envelope: {
-            recipients: {
-              some: {
-                token,
-              },
-            },
-          },
-        },
-        include: {
-          envelope: true,
-          documentData: true,
-        },
-      });
-
-      if (!envelopeItem) {
-        return c.json({ error: 'Envelope item not found' }, 404);
-      }
-
-      if (!envelopeItem.documentData) {
-        return c.json({ error: 'Document data not found' }, 404);
-      }
-
-      return await handleEnvelopeItemFileRequest({
-        title: envelopeItem.title,
-        status: envelopeItem.envelope.status,
-        documentData: envelopeItem.documentData,
-        version: 'signed',
-        isDownload: false,
-        context: c,
-      });
-    },
-  )
-  .get(
-    '/token/:token/envelopeItem/:envelopeItemId/download/:version?',
-    sValidator('param', ZGetEnvelopeItemFileTokenDownloadRequestParamsSchema),
-    async (c) => {
-      const { token, envelopeItemId, version } = c.req.valid('param');
-
-      const envelopeItem = await prisma.envelopeItem.findFirst({
-        where: {
-          id: envelopeItemId,
-          envelope: {
-            recipients: {
-              some: {
-                token,
-              },
-            },
-          },
-        },
-        include: {
-          envelope: true,
-          documentData: true,
-        },
-      });
-
-      if (!envelopeItem) {
-        return c.json({ error: 'Envelope item not found' }, 404);
-      }
-
-      if (!envelopeItem.documentData) {
-        return c.json({ error: 'Document data not found' }, 404);
-      }
-
-      return await handleEnvelopeItemFileRequest({
-        title: envelopeItem.title,
-        status: envelopeItem.envelope.status,
-        documentData: envelopeItem.documentData,
-        version,
-        isDownload: true,
-        context: c,
-      });
-    },
-  );
--- a/apps/remix/server/api/files.types.ts
+++ b/apps/remix/server/api/files.types.ts
@ -24,43 +24,15 @@ export const ZGetPresignedPostUrlResponseSchema = z.object({
  url: z.string().min(1),
 });

+export const ZGetPresignedGetUrlRequestSchema = z.object({
+  key: z.string().min(1),
+});
+
+export const ZGetPresignedGetUrlResponseSchema = z.object({
+  url: z.string().min(1),
+});
+
 export type TGetPresignedPostUrlRequest = z.infer<typeof ZGetPresignedPostUrlRequestSchema>;
 export type TGetPresignedPostUrlResponse = z.infer<typeof ZGetPresignedPostUrlResponseSchema>;
-
-export const ZGetEnvelopeItemFileRequestParamsSchema = z.object({
-  envelopeId: z.string().min(1),
-  envelopeItemId: z.string().min(1),
-});
-
-export type TGetEnvelopeItemFileRequestParams = z.infer<
-  typeof ZGetEnvelopeItemFileRequestParamsSchema
->;
-
-export const ZGetEnvelopeItemFileTokenRequestParamsSchema = z.object({
-  token: z.string().min(1),
-  envelopeItemId: z.string().min(1),
-});
-
-export type TGetEnvelopeItemFileTokenRequestParams = z.infer<
-  typeof ZGetEnvelopeItemFileTokenRequestParamsSchema
->;
-
-export const ZGetEnvelopeItemFileDownloadRequestParamsSchema = z.object({
-  envelopeId: z.string().min(1),
-  envelopeItemId: z.string().min(1),
-  version: z.enum(['signed', 'original']).default('signed'),
-});
-
-export type TGetEnvelopeItemFileDownloadRequestParams = z.infer<
-  typeof ZGetEnvelopeItemFileDownloadRequestParamsSchema
->;
-
-export const ZGetEnvelopeItemFileTokenDownloadRequestParamsSchema = z.object({
-  token: z.string().min(1),
-  envelopeItemId: z.string().min(1),
-  version: z.enum(['signed', 'original']).default('signed'),
-});
-
-export type TGetEnvelopeItemFileTokenDownloadRequestParams = z.infer<
-  typeof ZGetEnvelopeItemFileTokenDownloadRequestParamsSchema
->;
+export type TGetPresignedGetUrlRequest = z.infer<typeof ZGetPresignedGetUrlRequestSchema>;
+export type TGetPresignedGetUrlResponse = z.infer<typeof ZGetPresignedGetUrlResponseSchema>;
--- a/apps/remix/server/router.ts
+++ b/apps/remix/server/router.ts
@ -8,7 +8,7 @@ import type { Logger } from 'pino';

 import { tsRestHonoApp } from '@documenso/api/hono';
 import { auth } from '@documenso/auth/server';
-import { API_V2_BETA_URL, API_V2_URL } from '@documenso/lib/constants/app';
+import { API_V2_BETA_URL } from '@documenso/lib/constants/app';
 import { jobsClient } from '@documenso/lib/jobs/client';
 import { getIpAddress } from '@documenso/lib/universal/get-ip-address';
 import { logger } from '@documenso/lib/utils/logger';
@ -89,22 +89,9 @@ app.route('/api/v1', tsRestHonoApp);
 app.use('/api/jobs/*', jobsClient.getApiHandler());
 app.use('/api/trpc/*', reactRouterTrpcServer);

-// Unstable API server routes. Order matters for these two.
-app.get(`${API_V2_URL}/openapi.json`, (c) => c.json(openApiDocument));
-app.use(`${API_V2_URL}/*`, cors());
-app.use(`${API_V2_URL}/*`, async (c) =>
-  openApiTrpcServerHandler(c, {
-    isBeta: false,
-  }),
-);
-
 // Unstable API server routes. Order matters for these two.
 app.get(`${API_V2_BETA_URL}/openapi.json`, (c) => c.json(openApiDocument));
 app.use(`${API_V2_BETA_URL}/*`, cors());
-app.use(`${API_V2_BETA_URL}/*`, async (c) =>
-  openApiTrpcServerHandler(c, {
-    isBeta: true,
-  }),
-);
+app.use(`${API_V2_BETA_URL}/*`, async (c) => openApiTrpcServerHandler(c));

 export default app;
--- a/apps/remix/server/trpc/hono-trpc-open-api.ts
+++ b/apps/remix/server/trpc/hono-trpc-open-api.ts
@ -1,22 +1,15 @@
 import type { Context } from 'hono';
+import { createOpenApiFetchHandler } from 'trpc-to-openapi';

-import { API_V2_BETA_URL, API_V2_URL } from '@documenso/lib/constants/app';
+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';

-type OpenApiTrpcServerHandlerOptions = {
-  isBeta: boolean;
-};
-
-export const openApiTrpcServerHandler = async (
-  c: Context,
-  { isBeta }: OpenApiTrpcServerHandlerOptions,
-) => {
+export const openApiTrpcServerHandler = async (c: Context) => {
  return createOpenApiFetchHandler<typeof appRouter>({
-    endpoint: isBeta ? API_V2_BETA_URL : API_V2_URL,
+    endpoint: API_V2_BETA_URL,
    router: appRouter,
    createContext: async () => createTrpcContext({ c, requestSource: 'apiV2' }),
    req: c.req.raw,
--- a/assets/field-font-alignment.pdf
+++ b/assets/field-font-alignment.pdf
--- a/assets/field-meta.pdf
+++ b/assets/field-meta.pdf
--- 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.18.0",
+    "@prisma/client": "^6.8.2",
    "dotenv": "^16.5.0",
    "dotenv-cli": "^8.0.0",
    "eslint": "^8.40.0",
@ -54,21 +54,11 @@
    "nodemailer": "^6.10.1",
    "playwright": "1.52.0",
    "prettier": "^3.3.3",
-    "prisma": "^6.18.0",
+    "prisma": "^6.8.2",
    "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",
@ -86,10 +76,10 @@
    "mupdf": "^1.0.0",
    "react": "^18",
    "typescript": "5.6.2",
-    "zod": "^3.25.76"
+    "zod": "3.24.1"
  },
  "overrides": {
-    "zod": "^3.25.76"
+    "zod": "3.24.1"
  },
  "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.52.0",
-    "@ts-rest/open-api": "^3.52.0",
-    "@ts-rest/serverless": "^3.52.0",
+    "@ts-rest/core": "^3.30.5",
+    "@ts-rest/open-api": "^3.33.0",
+    "@ts-rest/serverless": "^3.30.5",
    "@types/swagger-ui-react": "^5.18.0",
    "luxon": "^3.4.0",
-    "superjson": "^2.2.5",
+    "superjson": "^1.13.1",
    "swagger-ui-react": "^5.21.0",
    "ts-pattern": "^5.0.5",
-    "zod": "^3.25.76"
+    "zod": "3.24.1"
  }
 }
--- a/packages/api/v1/implementation.ts
+++ b/packages/api/v1/implementation.ts
@ -20,12 +20,12 @@ import {
  getEnvelopeWhereInput,
 } from '@documenso/lib/server-only/envelope/get-envelope-by-id';
 import { deleteDocumentField } from '@documenso/lib/server-only/field/delete-document-field';
-import { updateEnvelopeFields } from '@documenso/lib/server-only/field/update-envelope-fields';
+import { updateDocumentFields } from '@documenso/lib/server-only/field/update-document-fields';
 import { insertFormValuesInPdf } from '@documenso/lib/server-only/pdf/insert-form-values-in-pdf';
-import { deleteEnvelopeRecipient } from '@documenso/lib/server-only/recipient/delete-envelope-recipient';
+import { deleteDocumentRecipient } from '@documenso/lib/server-only/recipient/delete-document-recipient';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { setDocumentRecipients } from '@documenso/lib/server-only/recipient/set-document-recipients';
-import { updateEnvelopeRecipients } from '@documenso/lib/server-only/recipient/update-envelope-recipients';
+import { updateDocumentRecipients } from '@documenso/lib/server-only/recipient/update-document-recipients';
 import { createDocumentFromTemplate } from '@documenso/lib/server-only/template/create-document-from-template';
 import { deleteTemplate } from '@documenso/lib/server-only/template/delete-template';
 import { findTemplates } from '@documenso/lib/server-only/template/find-templates';
@ -1285,7 +1285,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
      };
    }

-    const updatedRecipient = await updateEnvelopeRecipients({
+    const updatedRecipient = await updateDocumentRecipients({
      userId: user.id,
      teamId: team.id,
      id: {
@ -1336,7 +1336,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
      },
    });

-    const deletedRecipient = await deleteEnvelopeRecipient({
+    const deletedRecipient = await deleteDocumentRecipient({
      userId: user.id,
      teamId: team.id,
      recipientId: Number(recipientId),
@ -1634,13 +1634,10 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
      };
    }

-    const { fields } = await updateEnvelopeFields({
+    const { fields } = await updateDocumentFields({
      userId: user.id,
      teamId: team.id,
-      id: {
-        type: 'documentId',
-        id: legacyDocumentId,
-      },
+      documentId: legacyDocumentId,
      fields: [
        {
          id: Number(fieldId),
--- a/packages/app-tests/constants/field-alignment-pdf.ts
+++ b/packages/app-tests/constants/field-alignment-pdf.ts
@ -1,498 +0,0 @@
-import { FieldType } from '@prisma/client';
-
-import type { TFieldAndMeta } from '@documenso/lib/types/field-meta';
-import { toCheckboxCustomText } from '@documenso/lib/utils/fields';
-
-export type FieldTestData = TFieldAndMeta & {
-  page: number;
-  positionX: number;
-  positionY: number;
-  width: number;
-  height: number;
-  customText: string;
-  signature?: string;
-};
-
-const columnWidth = 19.125;
-const rowHeight = 6.7;
-
-const alignmentGridStartX = 31;
-const alignmentGridStartY = 19.02;
-
-export const ALIGNMENT_TEST_FIELDS: FieldTestData[] = [
-  /**
-   * Row 1 EMAIL
-   */
-  {
-    type: FieldType.EMAIL,
-    fieldMeta: {
-      fontSize: 10,
-      textAlign: 'left',
-      type: 'email',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'admin@documenso.com',
-  },
-  {
-    type: FieldType.EMAIL,
-    fieldMeta: {
-      textAlign: 'center',
-      type: 'email',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'admin@documenso.com',
-  },
-  {
-    type: FieldType.EMAIL,
-    fieldMeta: {
-      fontSize: 20,
-      textAlign: 'right',
-      type: 'email',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'admin@documenso.com',
-  },
-  /**
-   * Row 2 NAME
-   */
-  {
-    type: FieldType.NAME,
-    fieldMeta: {
-      fontSize: 10,
-      textAlign: 'left',
-      type: 'name',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'John Doe',
-  },
-  {
-    type: FieldType.NAME,
-    fieldMeta: {
-      textAlign: 'center',
-      type: 'name',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'John Doe',
-  },
-  {
-    type: FieldType.NAME,
-    fieldMeta: {
-      fontSize: 20,
-      textAlign: 'right',
-      type: 'name',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'John Doe',
-  },
-  /**
-   * Row 3 DATE
-   */
-  {
-    type: FieldType.DATE,
-    fieldMeta: {
-      fontSize: 10,
-      textAlign: 'left',
-      type: 'date',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  {
-    type: FieldType.DATE,
-    fieldMeta: {
-      textAlign: 'center',
-      type: 'date',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  {
-    type: FieldType.DATE,
-    fieldMeta: {
-      fontSize: 20,
-      textAlign: 'right',
-      type: 'date',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  /**
-   * Row 4 TEXT
-   */
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      fontSize: 10,
-      textAlign: 'left',
-      type: 'text',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      textAlign: 'center',
-      type: 'text',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      fontSize: 20,
-      textAlign: 'right',
-      type: 'text',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  /**
-   * Row 5 NUMBER
-   */
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      fontSize: 10,
-      textAlign: 'left',
-      type: 'number',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      textAlign: 'center',
-      type: 'number',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      fontSize: 20,
-      textAlign: 'right',
-      type: 'number',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '123456789',
-  },
-  /**
-   * Row 6 Initials
-   */
-  {
-    type: FieldType.INITIALS,
-    fieldMeta: {
-      fontSize: 10,
-      textAlign: 'left',
-      type: 'initials',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'JD',
-  },
-  {
-    type: FieldType.INITIALS,
-    fieldMeta: {
-      textAlign: 'center',
-      type: 'initials',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'JD',
-  },
-  {
-    type: FieldType.INITIALS,
-    fieldMeta: {
-      fontSize: 20,
-      textAlign: 'right',
-      type: 'initials',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'JD',
-  },
-  /**
-   * Row 7 Radio
-   */
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      fontSize: 10,
-      direction: 'vertical',
-      type: 'radio',
-      values: [
-        { id: 1, checked: true, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-      ],
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '0',
-  },
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'radio',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: true, value: 'Option 2' },
-      ],
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '2',
-  },
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      fontSize: 20,
-      direction: 'horizontal',
-      type: 'radio',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-      ],
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '',
-  },
-  /**
-   * Row 8 Checkbox
-   */
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      fontSize: 10,
-      direction: 'vertical',
-      type: 'checkbox',
-      values: [
-        { id: 1, checked: true, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-      ],
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: toCheckboxCustomText([0]),
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: true, value: 'Option 2' },
-      ],
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: toCheckboxCustomText([1]),
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      fontSize: 20,
-      direction: 'horizontal',
-      type: 'checkbox',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-      ],
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '',
-  },
-  /**
-   * Row 8 Dropdown
-   */
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      fontSize: 10,
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }],
-      type: 'dropdown',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'Option 1',
-  },
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }],
-      type: 'dropdown',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'Option 1',
-  },
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      fontSize: 20,
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }, { value: 'Option 3' }],
-      type: 'dropdown',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: 'Option 1',
-  },
-  /**
-   * Row 9 Signature
-   */
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      fontSize: 10,
-      type: 'signature',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '',
-    signature: 'My Signature',
-  },
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      type: 'signature',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '',
-    signature: 'My Signature',
-  },
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      fontSize: 20,
-      type: 'signature',
-    },
-    page: 1,
-    height: rowHeight,
-    width: columnWidth,
-    positionX: 0,
-    positionY: 0,
-    customText: '',
-    signature: 'My Signature',
-  },
-] as const;
-
-export const formatAlignmentTestFields = ALIGNMENT_TEST_FIELDS.map((field, index) => {
-  const row = Math.floor(index / 3);
-  const column = index % 3;
-
-  return {
-    ...field,
-    positionX: alignmentGridStartX + column * columnWidth,
-    positionY: alignmentGridStartY + row * rowHeight,
-  };
-});
--- a/packages/app-tests/constants/field-meta-pdf.ts
+++ b/packages/app-tests/constants/field-meta-pdf.ts
@ -1,482 +0,0 @@
-import { FieldType } from '@prisma/client';
-
-import { toCheckboxCustomText } from '@documenso/lib/utils/fields';
-import {
-  CheckboxValidationRules,
-  numberFormatValues,
-} from '@documenso/ui/primitives/document-flow/field-items-advanced-settings/constants';
-
-import type { FieldTestData } from './field-alignment-pdf';
-
-const columnWidth = 20.1;
-const fullColumnWidth = 75.8;
-const rowHeight = 9.8;
-const rowPadding = 1.8;
-
-const alignmentGridStartX = 11.85;
-const alignmentGridStartY = 15.07;
-
-const calculatePosition = (row: number, column: number, width: 'full' | 'column' = 'column') => {
-  return {
-    height: rowHeight,
-    width: width === 'full' ? fullColumnWidth : columnWidth,
-    positionX: alignmentGridStartX + (column ?? 0) * columnWidth,
-    positionY: alignmentGridStartY + row * (rowHeight + rowPadding),
-  };
-};
-
-export const FIELD_META_TEST_FIELDS: FieldTestData[] = [
-  /**
-   * PAGE 2 Signature
-   */
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      type: 'signature',
-    },
-    page: 2,
-    ...calculatePosition(0, 0),
-    customText: '',
-    signature: 'My Signature',
-  },
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      type: 'signature',
-    },
-    page: 2,
-    ...calculatePosition(1, 0),
-    customText: '',
-    signature: 'My Signature',
-  },
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      type: 'signature',
-    },
-    page: 2,
-    ...calculatePosition(2, 0),
-    customText: '',
-    signature: 'My Signature',
-  },
-  {
-    type: FieldType.SIGNATURE,
-    fieldMeta: {
-      type: 'signature',
-    },
-    page: 2,
-    ...calculatePosition(3, 0),
-    customText: '',
-    signature: 'My Signature',
-  },
-
-  /**
-   * PAGE 3 TEXT
-   */
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-    },
-    page: 3,
-    ...calculatePosition(0, 0, 'full'),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-    },
-    page: 3,
-    ...calculatePosition(1, 0),
-    customText: '123456789123456789123456789123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-      characterLimit: 5,
-    },
-    page: 3,
-    ...calculatePosition(2, 0),
-    customText: '12345',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-      placeholder: 'Demo Placeholder',
-    },
-    page: 3,
-    ...calculatePosition(3, 0),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-      label: 'Demo Label',
-    },
-    page: 3,
-    ...calculatePosition(3, 1),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-      text: 'Prefilled text',
-    },
-    page: 3,
-    ...calculatePosition(3, 2),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-      required: true,
-    },
-    page: 3,
-    ...calculatePosition(4, 0),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.TEXT,
-    fieldMeta: {
-      type: 'text',
-      readOnly: true,
-      text: 'Readonly Value',
-    },
-    page: 3,
-    ...calculatePosition(4, 1),
-    customText: 'Readonly Value',
-  },
-
-  /**
-   * PAGE 4 NUMBER
-   */
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-    },
-    page: 4,
-    ...calculatePosition(0, 0, 'full'),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-    },
-    page: 4,
-    ...calculatePosition(1, 0),
-    customText: '123456789123456789123456789123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      minValue: 0,
-      maxValue: 100,
-    },
-    page: 4,
-    ...calculatePosition(2, 0),
-    customText: '50',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      numberFormat: numberFormatValues[0].value, // Todo: Envelopes - Check this.
-      value: '123,456,789.00',
-    },
-    page: 4,
-    ...calculatePosition(2, 1),
-    customText: '123,456,789.00',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      placeholder: 'Demo Placeholder',
-    },
-    page: 4,
-    ...calculatePosition(3, 0),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      label: 'Demo Label',
-    },
-    page: 4,
-    ...calculatePosition(3, 1),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      value: '123',
-    },
-    page: 4,
-    ...calculatePosition(3, 2),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      required: true,
-    },
-    page: 4,
-    ...calculatePosition(4, 0),
-    customText: '123456789',
-  },
-  {
-    type: FieldType.NUMBER,
-    fieldMeta: {
-      type: 'number',
-      readOnly: true,
-    },
-    page: 4,
-    ...calculatePosition(4, 1),
-    customText: '123456789',
-  },
-
-  /**
-   * PAGE 5 RADIO
-   */
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      direction: 'horizontal',
-      type: 'radio',
-      values: [
-        { id: 1, checked: true, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 5,
-    ...calculatePosition(0, 0, 'full'),
-    customText: '0',
-  },
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'radio',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: true, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 5,
-    ...calculatePosition(1, 0),
-    customText: '2',
-  },
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'radio',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 5,
-    ...calculatePosition(2, 0),
-    customText: '',
-  },
-  {
-    type: FieldType.RADIO,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'radio',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 5,
-    ...calculatePosition(2, 1),
-    customText: '',
-  },
-
-  /**
-   * PAGE 6 CHECKBOX
-   */
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'horizontal',
-      type: 'checkbox',
-      values: [
-        { id: 1, checked: true, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 2, checked: false, value: 'Option 3' },
-        { id: 2, checked: false, value: 'Option 4' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(0, 0, 'full'),
-    customText: toCheckboxCustomText([0]),
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: true, value: 'Option 2' },
-        { id: 2, checked: true, value: 'Option 3' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(1, 0),
-    customText: toCheckboxCustomText([1]),
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      required: true,
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(2, 0),
-    customText: '',
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      readOnly: true,
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(2, 1),
-    customText: '',
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      validationRule: CheckboxValidationRules.SELECT_AT_LEAST,
-      validationLength: 2,
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(3, 0),
-    customText: '',
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      validationRule: CheckboxValidationRules.SELECT_EXACTLY,
-      validationLength: 2,
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(3, 1),
-    customText: '',
-  },
-  {
-    type: FieldType.CHECKBOX,
-    fieldMeta: {
-      direction: 'vertical',
-      type: 'checkbox',
-      validationRule: CheckboxValidationRules.SELECT_AT_MOST,
-      validationLength: 2,
-      values: [
-        { id: 1, checked: false, value: 'Option 1' },
-        { id: 2, checked: false, value: 'Option 2' },
-        { id: 3, checked: false, value: 'Option 3' },
-      ],
-    },
-    page: 6,
-    ...calculatePosition(3, 2),
-    customText: '',
-  },
-
-  /**
-   * PAGE 7 DROPDOWN
-   */
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }],
-      type: 'dropdown',
-    },
-    page: 7,
-    ...calculatePosition(0, 0, 'full'),
-    customText: 'Option 1',
-  },
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }],
-      type: 'dropdown',
-      defaultValue: 'Option 1',
-    },
-    page: 7,
-    ...calculatePosition(1, 0),
-    customText: 'Option 1',
-  },
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }, { value: 'Option 3' }],
-      type: 'dropdown',
-      required: true,
-    },
-    page: 7,
-    ...calculatePosition(2, 0),
-    customText: 'Option 1',
-  },
-  {
-    type: FieldType.DROPDOWN,
-    fieldMeta: {
-      values: [{ value: 'Option 1' }, { value: 'Option 2' }, { value: 'Option 3' }],
-      type: 'dropdown',
-      readOnly: true,
-    },
-    page: 7,
-    ...calculatePosition(2, 1),
-    customText: 'Option 1',
-  },
-] as const;
-
-export const formatFieldMetaTestFields = FIELD_META_TEST_FIELDS.map((field, index) => {
-  return {
-    ...field,
-  };
-});
--- 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
-  const updateRoleButton = memberRow.getByRole('button', {
-    name: 'Update role',
-  });
-  await expect(updateRoleButton).toBeVisible();
-  await expect(updateRoleButton).not.toBeDisabled();
+  // Find and click the "Promote to owner" button for the member
+  const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
+  await expect(promoteButton).toBeVisible();
+  await expect(promoteButton).not.toBeDisabled();

-  await updateRoleButton.click();
+  await promoteButton.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 });
+  // Verify success toast appears
+  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible();

  // 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
-  const newOwnerUpdateButton = newOwnerRow.getByRole('button', {
-    name: 'Update role',
-  });
-  await expect(newOwnerUpdateButton).toBeVisible();
+  // Verify that the promote button is now disabled for the new owner
+  const newOwnerPromoteButton = newOwnerRow.getByRole('button', { name: 'Promote to owner' });
+  await expect(newOwnerPromoteButton).toBeDisabled();

-  // Verify clicking it shows the dialog with Owner already selected
-  await newOwnerUpdateButton.click();
-  await expect(page.getByRole('dialog')).toBeVisible();
-
-  // Close the dialog without making changes
-  await page.getByRole('button', { name: 'Cancel' }).click();
+  // Test that we can't promote the current owner (button should be disabled)
+  await expect(newOwnerPromoteButton).toHaveAttribute('disabled');
 });

 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', {
-    name: 'Update role',
-  });
+  const promoteButton = managerRow.getByRole('button', { name: 'Promote to owner' });

-  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 });
+  await promoteButton.click();
+  await expect(page.getByText('Member promoted to owner successfully').first()).toBeVisible();

  // 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', {
-    name: 'Update role',
+  const promoteButton = adminMemberRow.getByRole('button', { name: 'Promote to owner' });
+
+  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', {
-    name: 'Update role',
+  const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
+  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
-  const newOwnerUpdateButton = memberRow.getByRole('button', {
-    name: 'Update role',
-  });
-  await expect(newOwnerUpdateButton).toBeVisible();
+  // Verify the promote button is now disabled for the new owner
+  const newOwnerPromoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
+  await expect(newOwnerPromoteButton).toBeDisabled();

  // 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', {
-    name: 'Update role',
+  let promoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });
+  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' });
-  await expect(updateRoleButton1).toBeVisible();
+  promoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });
+  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', {
-    name: 'Update role',
+  const promoteButton2 = member2Row.getByRole('button', { name: 'Promote to owner' });
+  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
-  const newUpdateButton1 = member1Row.getByRole('button', {
-    name: 'Update role',
-  });
-  await expect(newUpdateButton1).toBeVisible();
+  // Verify Member 1's promote button is now enabled again
+  const newPromoteButton1 = member1Row.getByRole('button', { name: 'Promote to owner' });
+  await expect(newPromoteButton1).not.toBeDisabled();
 });

 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', {
-    name: 'Update role',
+  const promoteButton = memberRow.getByRole('button', { name: 'Promote to owner' });
+  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/api/v2/envelopes-api.spec.ts
+++ b/packages/app-tests/e2e/api/v2/envelopes-api.spec.ts
@ -1,563 +0,0 @@
-import { expect, test } from '@playwright/test';
-import type { Team, User } from '@prisma/client';
-import fs from 'node:fs';
-import path from 'node:path';
-import { pick } from 'remeda';
-
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
-import { prisma } from '@documenso/prisma';
-import {
-  DocumentDistributionMethod,
-  DocumentSigningOrder,
-  DocumentStatus,
-  DocumentVisibility,
-  EnvelopeType,
-  FieldType,
-  FolderType,
-  RecipientRole,
-} from '@documenso/prisma/client';
-import { seedUser } from '@documenso/prisma/seed/users';
-import type { TCreateEnvelopeItemsRequest } from '@documenso/trpc/server/envelope-router/create-envelope-items.types';
-import type {
-  TCreateEnvelopePayload,
-  TCreateEnvelopeResponse,
-} from '@documenso/trpc/server/envelope-router/create-envelope.types';
-import type { TCreateEnvelopeRecipientsRequest } from '@documenso/trpc/server/envelope-router/envelope-recipients/create-envelope-recipients.types';
-import type { TGetEnvelopeResponse } from '@documenso/trpc/server/envelope-router/get-envelope.types';
-import type { TUpdateEnvelopeRequest } from '@documenso/trpc/server/envelope-router/update-envelope.types';
-
-import { formatAlignmentTestFields } from '../../../constants/field-alignment-pdf';
-import { FIELD_META_TEST_FIELDS } from '../../../constants/field-meta-pdf';
-
-const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL();
-const baseUrl = `${WEBAPP_BASE_URL}/api/v2-beta`;
-
-test.describe.configure({
-  mode: 'parallel',
-});
-
-test.describe('API V2 Envelopes', () => {
-  let userA: User, teamA: Team, userB: User, teamB: Team, tokenA: string, tokenB: string;
-
-  test.beforeEach(async () => {
-    ({ user: userA, team: teamA } = await seedUser());
-    ({ token: tokenA } = await createApiToken({
-      userId: userA.id,
-      teamId: teamA.id,
-      tokenName: 'userA',
-      expiresIn: null,
-    }));
-
-    ({ user: userB, team: teamB } = await seedUser());
-    ({ token: tokenB } = await createApiToken({
-      userId: userB.id,
-      teamId: teamB.id,
-      tokenName: 'userB',
-      expiresIn: null,
-    }));
-  });
-
-  test.describe('Envelope create endpoint', () => {
-    test('should fail on invalid form', async ({ request }) => {
-      const payload = {
-        type: 'Invalid Type',
-        title: 'Test Envelope',
-      };
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const res = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenB}` },
-        multipart: formData,
-      });
-
-      expect(res.ok()).toBeFalsy();
-      expect(res.status()).toBe(400);
-    });
-
-    test('should create envelope with single file', async ({ request }) => {
-      const payload = {
-        type: EnvelopeType.TEMPLATE,
-        title: 'Test Envelope',
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'field-font-alignment.pdf',
-          data: fs.readFileSync(
-            path.join(__dirname, '../../../../../assets/field-font-alignment.pdf'),
-          ),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const res = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenB}` },
-        multipart: formData,
-      });
-
-      expect(res.ok()).toBeTruthy();
-      expect(res.status()).toBe(200);
-
-      const response = (await res.json()) as TCreateEnvelopeResponse;
-
-      const envelope = await prisma.envelope.findUnique({
-        where: {
-          id: response.id,
-        },
-        include: {
-          envelopeItems: true,
-        },
-      });
-
-      expect(envelope).toBeDefined();
-      expect(envelope?.title).toBe('Test Envelope');
-      expect(envelope?.type).toBe(EnvelopeType.TEMPLATE);
-      expect(envelope?.status).toBe(DocumentStatus.DRAFT);
-      expect(envelope?.envelopeItems.length).toBe(1);
-      expect(envelope?.envelopeItems[0].title).toBe('field-font-alignment.pdf');
-      expect(envelope?.envelopeItems[0].documentDataId).toBeDefined();
-    });
-
-    test('should create envelope with multiple file', async ({ request }) => {
-      const folder = await prisma.folder.create({
-        data: {
-          name: 'Test Folder',
-          teamId: teamA.id,
-          userId: userA.id,
-          type: FolderType.DOCUMENT,
-        },
-      });
-
-      const payload = {
-        title: 'Envelope Title',
-        type: EnvelopeType.DOCUMENT,
-        externalId: 'externalId',
-        visibility: DocumentVisibility.MANAGER_AND_ABOVE,
-        globalAccessAuth: ['ACCOUNT'],
-        formValues: {
-          hello: 'world',
-        },
-        folderId: folder.id,
-        recipients: [
-          {
-            email: userA.email,
-            name: 'Name',
-            role: RecipientRole.SIGNER,
-            accessAuth: ['TWO_FACTOR_AUTH'],
-            signingOrder: 1,
-            fields: [
-              {
-                type: FieldType.SIGNATURE,
-                identifier: 'field-font-alignment.pdf',
-                page: 1,
-                positionX: 0,
-                positionY: 0,
-                width: 0,
-                height: 0,
-              },
-              {
-                type: FieldType.SIGNATURE,
-                identifier: 0,
-                page: 1,
-                positionX: 0,
-                positionY: 0,
-                width: 0,
-                height: 0,
-              },
-            ],
-          },
-        ],
-        meta: {
-          subject: 'Subject',
-          message: 'Message',
-          timezone: 'Europe/Berlin',
-          dateFormat: 'dd.MM.yyyy',
-          distributionMethod: DocumentDistributionMethod.NONE,
-          signingOrder: DocumentSigningOrder.SEQUENTIAL,
-          allowDictateNextSigner: true,
-          redirectUrl: 'https://documenso.com',
-          language: 'de',
-          typedSignatureEnabled: true,
-          uploadSignatureEnabled: false,
-          drawSignatureEnabled: false,
-          emailReplyTo: userA.email,
-          emailSettings: {
-            recipientSigningRequest: false,
-            recipientRemoved: false,
-            recipientSigned: false,
-            documentPending: false,
-            documentCompleted: false,
-            documentDeleted: false,
-            ownerDocumentCompleted: true,
-          },
-        },
-        attachments: [
-          {
-            label: 'Test Attachment',
-            data: 'https://documenso.com',
-            type: 'link',
-          },
-        ],
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'field-meta.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/field-meta.pdf')),
-        },
-        {
-          name: 'field-font-alignment.pdf',
-          data: fs.readFileSync(
-            path.join(__dirname, '../../../../../assets/field-font-alignment.pdf'),
-          ),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      // Should error since folder is not owned by the user.
-      const invalidRes = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenB}` },
-        multipart: formData,
-      });
-
-      expect(invalidRes.ok()).toBeFalsy();
-
-      const res = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(res.ok()).toBeTruthy();
-      expect(res.status()).toBe(200);
-
-      const response = (await res.json()) as TCreateEnvelopeResponse;
-
-      const envelope = await prisma.envelope.findUniqueOrThrow({
-        where: {
-          id: response.id,
-        },
-        include: {
-          documentMeta: true,
-          envelopeItems: true,
-          recipients: true,
-          fields: true,
-          envelopeAttachments: true,
-        },
-      });
-
-      console.log(userB.email);
-
-      expect(envelope.envelopeItems.length).toBe(2);
-      expect(envelope.envelopeItems[0].title).toBe('field-meta.pdf');
-      expect(envelope.envelopeItems[1].title).toBe('field-font-alignment.pdf');
-
-      expect(envelope.title).toBe(payload.title);
-      expect(envelope.type).toBe(payload.type);
-      expect(envelope.externalId).toBe(payload.externalId);
-      expect(envelope.visibility).toBe(payload.visibility);
-      expect(envelope.authOptions).toEqual({
-        globalAccessAuth: payload.globalAccessAuth,
-        globalActionAuth: [],
-      });
-      expect(envelope.formValues).toEqual(payload.formValues);
-      expect(envelope.folderId).toBe(payload.folderId);
-
-      expect(envelope.documentMeta.subject).toBe(payload.meta.subject);
-      expect(envelope.documentMeta.message).toBe(payload.meta.message);
-      expect(envelope.documentMeta.timezone).toBe(payload.meta.timezone);
-      expect(envelope.documentMeta.dateFormat).toBe(payload.meta.dateFormat);
-      expect(envelope.documentMeta.distributionMethod).toBe(payload.meta.distributionMethod);
-      expect(envelope.documentMeta.signingOrder).toBe(payload.meta.signingOrder);
-      expect(envelope.documentMeta.allowDictateNextSigner).toBe(
-        payload.meta.allowDictateNextSigner,
-      );
-      expect(envelope.documentMeta.redirectUrl).toBe(payload.meta.redirectUrl);
-      expect(envelope.documentMeta.language).toBe(payload.meta.language);
-      expect(envelope.documentMeta.typedSignatureEnabled).toBe(payload.meta.typedSignatureEnabled);
-      expect(envelope.documentMeta.uploadSignatureEnabled).toBe(
-        payload.meta.uploadSignatureEnabled,
-      );
-      expect(envelope.documentMeta.drawSignatureEnabled).toBe(payload.meta.drawSignatureEnabled);
-      expect(envelope.documentMeta.emailReplyTo).toBe(payload.meta.emailReplyTo);
-      expect(envelope.documentMeta.emailSettings).toEqual(payload.meta.emailSettings);
-
-      expect([
-        {
-          label: envelope.envelopeAttachments[0].label,
-          data: envelope.envelopeAttachments[0].data,
-          type: envelope.envelopeAttachments[0].type,
-        },
-      ]).toEqual(payload.attachments);
-
-      const field = envelope.fields[0];
-      const recipient = envelope.recipients[0];
-
-      expect({
-        email: recipient.email,
-        name: recipient.name,
-        role: recipient.role,
-        signingOrder: recipient.signingOrder,
-        accessAuth: recipient.authOptions?.accessAuth,
-      }).toEqual(
-        pick(payload.recipients[0], ['email', 'name', 'role', 'signingOrder', 'accessAuth']),
-      );
-
-      expect({
-        type: field.type,
-        page: field.page,
-        positionX: field.positionX.toNumber(),
-        positionY: field.positionY.toNumber(),
-        width: field.width.toNumber(),
-        height: field.height.toNumber(),
-      }).toEqual(
-        pick(payload.recipients[0].fields[0], [
-          'type',
-          'page',
-          'positionX',
-          'positionY',
-          'width',
-          'height',
-        ]),
-      );
-
-      // Expect string based ID to work.
-      expect(field.envelopeItemId).toBe(
-        envelope.envelopeItems.find((item) => item.title === 'field-font-alignment.pdf')?.id,
-      );
-
-      // Expect index based ID to work.
-      expect(envelope.fields[1].envelopeItemId).toBe(
-        envelope.envelopeItems.find((item) => item.title === 'field-meta.pdf')?.id,
-      );
-    });
-  });
-
-  /**
-   * Creates envelopes with the two field test PDFs.
-   */
-  test('Envelope full test', async ({ request }) => {
-    // Step 1: Create initial envelope with Prisma (with first envelope item)
-    const alignmentPdf = fs.readFileSync(
-      path.join(__dirname, '../../../../../assets/field-font-alignment.pdf'),
-    );
-
-    const fieldMetaPdf = fs.readFileSync(
-      path.join(__dirname, '../../../../../assets/field-meta.pdf'),
-    );
-
-    const formData = new FormData();
-
-    formData.append(
-      'payload',
-      JSON.stringify({
-        type: EnvelopeType.DOCUMENT,
-        title: 'Envelope Full Field Test',
-      } satisfies TCreateEnvelopePayload),
-    );
-
-    // Only add one file for now.
-    formData.append(
-      'files',
-      new File([alignmentPdf], 'field-font-alignment.pdf', { type: 'application/pdf' }),
-    );
-
-    const createEnvelopeRequest = await request.post(`${baseUrl}/envelope/create`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-      multipart: formData,
-    });
-
-    expect(createEnvelopeRequest.ok()).toBeTruthy();
-    expect(createEnvelopeRequest.status()).toBe(200);
-
-    const { id: createdEnvelopeId }: TCreateEnvelopeResponse = await createEnvelopeRequest.json();
-
-    const getEnvelopeRequest = await request.get(`${baseUrl}/envelope/${createdEnvelopeId}`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-    });
-
-    const createdEnvelope: TGetEnvelopeResponse = await getEnvelopeRequest.json();
-
-    // Might as well testing access control here as well.
-    const unauthRequest = await request.get(`${baseUrl}/envelope/${createdEnvelopeId}`, {
-      headers: { Authorization: `Bearer ${tokenB}` },
-    });
-
-    expect(unauthRequest.ok()).toBeFalsy();
-    expect(unauthRequest.status()).toBe(404);
-
-    // Step 2: Create second envelope item via API
-    // Todo: Envelopes - Use API Route
-    const fieldMetaDocumentData = await prisma.documentData.create({
-      data: {
-        type: 'BYTES_64',
-        data: fieldMetaPdf.toString('base64'),
-        initialData: fieldMetaPdf.toString('base64'),
-      },
-    });
-
-    const createEnvelopeItemsRequest: TCreateEnvelopeItemsRequest = {
-      envelopeId: createdEnvelope.id,
-      data: [
-        {
-          title: 'Field Meta Test',
-          documentDataId: fieldMetaDocumentData.id,
-        },
-      ],
-    };
-
-    const createItemsRes = await request.post(`${baseUrl}/envelope/item/create-many`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-      data: createEnvelopeItemsRequest,
-    });
-
-    expect(createItemsRes.ok()).toBeTruthy();
-    expect(createItemsRes.status()).toBe(200);
-
-    // Step 3: Update envelope via API
-    const updateEnvelopeRequest: TUpdateEnvelopeRequest = {
-      envelopeId: createdEnvelope.id,
-      data: {
-        title: 'Envelope Full Field Test',
-        visibility: DocumentVisibility.MANAGER_AND_ABOVE,
-      },
-    };
-
-    const updateRes = await request.post(`${baseUrl}/envelope/update`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-      data: updateEnvelopeRequest,
-    });
-
-    expect(updateRes.ok()).toBeTruthy();
-    expect(updateRes.status()).toBe(200);
-
-    // Step 4: Create recipient via API
-    const createRecipientsRequest: TCreateEnvelopeRecipientsRequest = {
-      envelopeId: createdEnvelope.id,
-      data: [
-        {
-          email: userA.email,
-          name: userA.name || '',
-          role: RecipientRole.SIGNER,
-          accessAuth: [],
-          actionAuth: [],
-        },
-      ],
-    };
-
-    const createRecipientsRes = await request.post(`${baseUrl}/envelope/recipient/create-many`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-      data: createRecipientsRequest,
-    });
-
-    expect(createRecipientsRes.ok()).toBeTruthy();
-    expect(createRecipientsRes.status()).toBe(200);
-
-    // Step 5: Get envelope to retrieve recipients and envelope items
-    const getRes = await request.get(`${baseUrl}/envelope/${createdEnvelope.id}`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-    });
-
-    expect(getRes.ok()).toBeTruthy();
-    expect(getRes.status()).toBe(200);
-
-    const envelopeResponse = (await getRes.json()) as TGetEnvelopeResponse;
-
-    const recipientId = envelopeResponse.recipients[0].id;
-    const alignmentItem = envelopeResponse.envelopeItems.find(
-      (item: { order: number }) => item.order === 1,
-    );
-    const fieldMetaItem = envelopeResponse.envelopeItems.find(
-      (item: { order: number }) => item.order === 2,
-    );
-
-    expect(recipientId).toBeDefined();
-    expect(alignmentItem).toBeDefined();
-    expect(fieldMetaItem).toBeDefined();
-
-    if (!alignmentItem || !fieldMetaItem) {
-      throw new Error('Envelope items not found');
-    }
-
-    // Step 6: Create fields for first PDF (alignment fields)
-    const alignmentFieldsRequest = {
-      envelopeId: createdEnvelope.id,
-      data: formatAlignmentTestFields.map((field) => ({
-        recipientId,
-        envelopeItemId: alignmentItem.id,
-        type: field.type,
-        page: field.page,
-        positionX: field.positionX,
-        positionY: field.positionY,
-        width: field.width,
-        height: field.height,
-        fieldMeta: field.fieldMeta,
-      })),
-    };
-
-    const createAlignmentFieldsRes = await request.post(`${baseUrl}/envelope/field/create-many`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-      data: alignmentFieldsRequest,
-    });
-
-    expect(createAlignmentFieldsRes.ok()).toBeTruthy();
-    expect(createAlignmentFieldsRes.status()).toBe(200);
-
-    // Step 7: Create fields for second PDF (field-meta fields)
-    const fieldMetaFieldsRequest = {
-      envelopeId: createdEnvelope.id,
-      data: FIELD_META_TEST_FIELDS.map((field) => ({
-        recipientId,
-        envelopeItemId: fieldMetaItem.id,
-        type: field.type,
-        page: field.page,
-        positionX: field.positionX,
-        positionY: field.positionY,
-        width: field.width,
-        height: field.height,
-        fieldMeta: field.fieldMeta,
-      })),
-    };
-
-    const createFieldMetaFieldsRes = await request.post(`${baseUrl}/envelope/field/create-many`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-      data: fieldMetaFieldsRequest,
-    });
-
-    expect(createFieldMetaFieldsRes.ok()).toBeTruthy();
-    expect(createFieldMetaFieldsRes.status()).toBe(200);
-
-    // Step 8: Verify final envelope structure
-    const finalGetRes = await request.get(`${baseUrl}/envelope/${createdEnvelope.id}`, {
-      headers: { Authorization: `Bearer ${tokenA}` },
-    });
-
-    expect(finalGetRes.ok()).toBeTruthy();
-    const finalEnvelope = (await finalGetRes.json()) as TGetEnvelopeResponse;
-
-    // Verify structure
-    expect(finalEnvelope.envelopeItems.length).toBe(2);
-    expect(finalEnvelope.recipients.length).toBe(1);
-    expect(finalEnvelope.fields.length).toBe(
-      formatAlignmentTestFields.length + FIELD_META_TEST_FIELDS.length,
-    );
-    expect(finalEnvelope.title).toBe('Envelope Full Field Test');
-    expect(finalEnvelope.type).toBe(EnvelopeType.DOCUMENT);
-  });
-});
--- a/packages/app-tests/e2e/api/v2/test-unauthorized-api-access.spec.ts
+++ b/packages/app-tests/e2e/api/v2/test-unauthorized-api-access.spec.ts
--- a/packages/app-tests/e2e/envelopes/envelope-alignment.spec.ts
+++ b/packages/app-tests/e2e/envelopes/envelope-alignment.spec.ts
@ -1,282 +0,0 @@
-// sort-imports-ignore
-
-// ---- PATCH pdfjs-dist's canvas require BEFORE importing it ----
-import Module from 'module';
-import { Canvas, Image } from 'skia-canvas';
-
-// Intercept require('canvas') and return skia-canvas equivalents
-const originalRequire = Module.prototype.require;
-Module.prototype.require = function (path: string) {
-  if (path === 'canvas') {
-    return {
-      createCanvas: (width: number, height: number) => new Canvas(width, height),
-      Image, // needed by pdfjs-dist
-    };
-  }
-  // eslint-disable-next-line prefer-rest-params, @typescript-eslint/consistent-type-assertions
-  return originalRequire.apply(this, arguments as unknown as [string]);
-};
-
-import pixelMatch from 'pixelmatch';
-import { PNG } from 'pngjs';
-import type { TestInfo } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-import { DocumentStatus } from '@prisma/client';
-import fs from 'node:fs';
-import path from 'node:path';
-import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf.js';
-
-import { getFile } from '@documenso/lib/universal/upload/get-file';
-import { prisma } from '@documenso/prisma';
-import { seedAlignmentTestDocument } from '@documenso/prisma/seed/initial-seed';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel', timeout: 60000 });
-
-test('field placement visual regression', async ({ page }, testInfo) => {
-  const { user, team } = await seedUser();
-
-  const envelope = await seedAlignmentTestDocument({
-    userId: user.id,
-    teamId: team.id,
-    recipientName: user.name || '',
-    recipientEmail: user.email,
-    insertFields: true,
-    status: DocumentStatus.PENDING,
-  });
-
-  const token = envelope.recipients[0].token;
-
-  const signUrl = `/sign/${token}`;
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: signUrl,
-  });
-
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`${signUrl}/complete`);
-
-  await expect(async () => {
-    const { status } = await prisma.envelope.findFirstOrThrow({
-      where: {
-        id: envelope.id,
-      },
-    });
-
-    expect(status).toBe(DocumentStatus.COMPLETED);
-  }).toPass({
-    timeout: 10000,
-  });
-
-  const completedDocument = await prisma.envelope.findFirstOrThrow({
-    where: {
-      id: envelope.id,
-    },
-    include: {
-      envelopeItems: {
-        orderBy: {
-          order: 'asc',
-        },
-        include: {
-          documentData: true,
-        },
-      },
-    },
-  });
-
-  const storedImages = fs.readdirSync(path.join(__dirname, '../../visual-regression'));
-
-  await Promise.all(
-    completedDocument.envelopeItems.map(async (item) => {
-      const pdfData = await getFile(item.documentData);
-
-      const loadedImages = storedImages
-        .filter((image) => image.includes(item.title))
-        .map((image) => fs.readFileSync(path.join(__dirname, '../../visual-regression', image)));
-
-      await compareSignedPdfWithImages({
-        id: item.title.replaceAll(' ', '-').toLowerCase(),
-        pdfData,
-        images: loadedImages,
-        testInfo,
-      });
-    }),
-  );
-});
-
-/**
- * Used to download the envelope images when updating the visual regression test.
- *
- * DON'T COMMIT THIS WITHOUT THE "SKIP" COMMAND.
- */
-test.skip('download envelope images', async ({ page }) => {
-  const { user, team } = await seedUser();
-
-  const envelope = await seedAlignmentTestDocument({
-    userId: user.id,
-    teamId: team.id,
-    recipientName: user.name || '',
-    recipientEmail: user.email,
-    insertFields: true,
-    status: DocumentStatus.PENDING,
-  });
-
-  const token = envelope.recipients[0].token;
-
-  const signUrl = `/sign/${token}`;
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: signUrl,
-  });
-
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`${signUrl}/complete`);
-
-  await expect(async () => {
-    const { status } = await prisma.envelope.findFirstOrThrow({
-      where: {
-        id: envelope.id,
-      },
-    });
-
-    expect(status).toBe(DocumentStatus.COMPLETED);
-  }).toPass({
-    timeout: 10000,
-  });
-
-  const completedDocument = await prisma.envelope.findFirstOrThrow({
-    where: {
-      id: envelope.id,
-    },
-    include: {
-      envelopeItems: {
-        orderBy: {
-          order: 'asc',
-        },
-        include: {
-          documentData: true,
-        },
-      },
-    },
-  });
-
-  await Promise.all(
-    completedDocument.envelopeItems.map(async (item) => {
-      const pdfData = await getFile(item.documentData);
-
-      const pdfImages = await renderPdfToImage(pdfData);
-
-      for (const [index, { image }] of pdfImages.entries()) {
-        fs.writeFileSync(
-          path.join(__dirname, '../../visual-regression', `${item.title}-${index}.png`),
-          new Uint8Array(image),
-        );
-      }
-    }),
-  );
-});
-
-async function renderPdfToImage(pdfBytes: Uint8Array) {
-  const loadingTask = pdfjsLib.getDocument({ data: pdfBytes });
-  const pdf = await loadingTask.promise;
-
-  // Increase for higher resolution
-  const scale = 4;
-
-  return await Promise.all(
-    Array.from({ length: pdf.numPages }, async (_, index) => {
-      const page = await pdf.getPage(index + 1);
-
-      const viewport = page.getViewport({ scale });
-
-      const virtualCanvas = new Canvas(viewport.width, viewport.height);
-      const context = virtualCanvas.getContext('2d');
-      context.imageSmoothingEnabled = false;
-
-      // @ts-expect-error skia-canvas context satisfies runtime requirements for pdfjs
-      await page.render({ canvasContext: context, viewport }).promise;
-
-      return {
-        image: await virtualCanvas.toBuffer('png'),
-
-        // Rounded down because the certificate page somehow gives dimensions with decimals
-        width: Math.floor(viewport.width),
-        height: Math.floor(viewport.height),
-      };
-    }),
-  );
-}
-
-type CompareSignedPdfWithImagesOptions = {
-  id: string;
-  pdfData: Uint8Array;
-  images: Buffer[];
-  testInfo: TestInfo;
-};
-
-const compareSignedPdfWithImages = async ({
-  id,
-  pdfData,
-  images,
-  testInfo,
-}: CompareSignedPdfWithImagesOptions) => {
-  const renderedImages = await renderPdfToImage(pdfData);
-
-  const blankCertificateFile = fs.readFileSync(
-    path.join(__dirname, '../../visual-regression/blank-certificate.png'),
-  );
-  const blankCertificateImage = PNG.sync.read(blankCertificateFile).data;
-
-  for (const [index, { image, width, height }] of renderedImages.entries()) {
-    const isCertificate = index === renderedImages.length - 1;
-
-    const diff = new PNG({ width, height });
-
-    const storedImage = PNG.sync.read(images[index]).data;
-
-    const newImage = PNG.sync.read(image).data;
-
-    const oldImage = isCertificate ? blankCertificateImage : storedImage;
-
-    const comparison = pixelMatch(
-      new Uint8Array(oldImage),
-      new Uint8Array(newImage),
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      diff.data as unknown as Uint8Array,
-      width,
-      height,
-      {
-        threshold: 0.25,
-        // includeAA: true, // This allows stricter testing.
-      },
-    );
-    console.log(`${id}-${index}: ${comparison}`);
-
-    const diffFilePath = path.join(testInfo.outputPath(), `${id}-${index}-diff.png`);
-    const oldFilePath = path.join(testInfo.outputPath(), `${id}-${index}-old.png`);
-    const newFilePath = path.join(testInfo.outputPath(), `${id}-${index}-new.png`);
-
-    fs.writeFileSync(diffFilePath, new Uint8Array(PNG.sync.write(diff)));
-    fs.writeFileSync(oldFilePath, new Uint8Array(images[index]));
-    fs.writeFileSync(newFilePath, new Uint8Array(image));
-
-    if (isCertificate) {
-      // Expect the certificate to NOT be blank. Since the storedImage is blank.
-      expect.soft(comparison).toBeGreaterThan(20000);
-    } else {
-      expect.soft(comparison).toEqual(0);
-    }
-  }
-};
--- a/packages/app-tests/e2e/features/include-document-certificate.spec.ts
+++ b/packages/app-tests/e2e/features/include-document-certificate.spec.ts
@ -78,6 +78,7 @@ test.describe('Signing Certificate Tests', () => {
      },
    });

+    // Todo: Envelopes
    const firstDocumentData = completedDocument.envelopeItems[0].documentData;

    const completedDocumentData = await getFile(firstDocumentData);
@ -168,6 +169,7 @@ test.describe('Signing Certificate Tests', () => {
      },
    });

+    // Todo: Envelopes
    const firstDocumentData = completedDocument.envelopeItems[0].documentData;

    const completedDocumentData = await getFile(firstDocumentData);
--- 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/app-tests/package.json
+++ b/packages/app-tests/package.json
@ -15,10 +15,7 @@
    "@documenso/lib": "*",
    "@documenso/prisma": "*",
    "@playwright/test": "1.52.0",
-    "@types/node": "^20",
-    "@types/pngjs": "^6.0.5",
-    "pixelmatch": "^7.1.0",
-    "pngjs": "^7.0.0"
+    "@types/node": "^20"
  },
  "dependencies": {
    "start-server-and-test": "^2.0.12"
--- a/packages/app-tests/visual-regression/alignment-pdf-0.png
+++ b/packages/app-tests/visual-regression/alignment-pdf-0.png
--- a/packages/app-tests/visual-regression/alignment-pdf-1.png
+++ b/packages/app-tests/visual-regression/alignment-pdf-1.png
--- a/packages/app-tests/visual-regression/blank-certificate.png
+++ b/packages/app-tests/visual-regression/blank-certificate.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-0.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-0.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-1.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-1.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-2.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-2.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-3.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-3.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-4.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-4.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-5.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-5.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-6.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-6.png
--- a/packages/app-tests/visual-regression/field-meta-pdf-7.png
+++ b/packages/app-tests/visual-regression/field-meta-pdf-7.png
--- 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.25.76"
+    "zod": "3.24.1"
  }
 }
--- 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.25.76"
+    "zod": "3.24.1"
  }
 }
--- a/packages/lib/client-only/hooks/use-editor-fields.ts
+++ b/packages/lib/client-only/hooks/use-editor-fields.ts
@ -165,7 +165,10 @@ export const useEditorFields = ({
    const index = localFields.findIndex((field) => field.formId === formId);

    if (index !== -1) {
-      form.setValue(`fields.${index}.id`, id);
+      update(index, {
+        ...localFields[index],
+        id,
+      });
    }
  };

--- a/packages/lib/client-only/hooks/use-page-renderer.ts
+++ b/packages/lib/client-only/hooks/use-page-renderer.ts
@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef } from 'react';

 import Konva from 'konva';
 import type { RenderParameters } from 'pdfjs-dist/types/src/display/api';
@ -25,8 +25,6 @@ export function usePageRenderer(renderFunction: RenderFunction) {
  const stage = useRef<Konva.Stage | null>(null);
  const pageLayer = useRef<Konva.Layer | null>(null);

-  const [renderError, setRenderError] = useState<boolean>(false);
-
  /**
   * The raw viewport with no scaling. Basically the actual PDF size.
   */
@ -124,7 +122,5 @@ export function usePageRenderer(renderFunction: RenderFunction) {
    unscaledViewport,
    scaledViewport,
    pageContext,
-    renderError,
-    setRenderError,
  };
 }
--- a/packages/lib/client-only/providers/envelope-editor-provider.tsx
+++ b/packages/lib/client-only/providers/envelope-editor-provider.tsx
@ -215,6 +215,7 @@ export const EnvelopeEditorProvider = ({
  } = useEnvelopeAutosave(async (envelopeUpdates: UpdateEnvelopePayload) => {
    await envelopeUpdateMutationQuery.mutateAsync({
      envelopeId: envelope.id,
+      envelopeType: envelope.type,
      data: envelopeUpdates.data,
      meta: envelopeUpdates.meta,
    });
--- a/packages/lib/client-only/providers/envelope-render-provider.tsx
+++ b/packages/lib/client-only/providers/envelope-render-provider.tsx
@ -27,9 +27,6 @@ type EnvelopeRenderProviderValue = {
  setCurrentEnvelopeItem: (envelopeItemId: string) => void;
  fields: TEnvelope['fields'];
  getRecipientColorKey: (recipientId: number) => TRecipientColor;
-
-  renderError: boolean;
-  setRenderError: (renderError: boolean) => void;
 };

 interface EnvelopeRenderProviderProps {
@ -77,8 +74,6 @@ export const EnvelopeRenderProvider = ({

  const [currentItem, setItem] = useState<EnvelopeRenderItem | null>(null);

-  const [renderError, setRenderError] = useState<boolean>(false);
-
  const envelopeItems = useMemo(
    () => envelope.envelopeItems.sort((a, b) => a.order - b.order),
    [envelope.envelopeItems],
@ -169,8 +164,6 @@ export const EnvelopeRenderProvider = ({
        setCurrentEnvelopeItem,
        fields: fields ?? [],
        getRecipientColorKey,
-        renderError,
-        setRenderError,
      }}
    >
      {children}
--- a/packages/lib/constants/app.ts
+++ b/packages/lib/constants/app.ts
@ -12,7 +12,6 @@ export const NEXT_PRIVATE_INTERNAL_WEBAPP_URL =
 export const IS_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED') === 'true';

 export const API_V2_BETA_URL = '/api/v2-beta';
-export const API_V2_URL = '/api/v2';

 export const SUPPORT_EMAIL = env('NEXT_PUBLIC_SUPPORT_EMAIL') ?? 'support@documenso.com';

--- 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.25.76"
+    "zod": "3.24.1"
  },
  "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: [
-      ...(Array.isArray(visibilityFiltersWhereInput.AND)
-        ? visibilityFiltersWhereInput.AND
-        : visibilityFiltersWhereInput.AND
-          ? [visibilityFiltersWhereInput.AND]
-          : []),
-      searchFilter,
-      rootPageFilter,
-      folderId ? { folderId } : {},
-    ],
+    ...visibilityFiltersWhereInput,
+    ...searchFilter,
  };

  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/handle-document-ownership-on-deletion.ts
+++ b/packages/lib/server-only/document/handle-document-ownership-on-deletion.ts
@ -0,0 +1,84 @@
+import { deletedAccountServiceAccount } from '@documenso/lib/server-only/user/service-accounts/deleted-account';
+import { prisma } from '@documenso/prisma';
+import { DocumentStatus } from '@documenso/prisma/client';
+
+type HandleDocumentOwnershipOnDeletionOptions = {
+  documentIds: number[];
+  organisationOwnerId: number;
+};
+
+export const handleDocumentOwnershipOnDeletion = async ({
+  documentIds,
+  organisationOwnerId,
+}: HandleDocumentOwnershipOnDeletionOptions) => {
+  if (documentIds.length === 0) {
+    return;
+  }
+
+  const serviceAccount = await deletedAccountServiceAccount();
+  const serviceAccountTeam = serviceAccount.ownedOrganisations[0].teams[0];
+
+  await prisma.document.deleteMany({
+    where: {
+      id: {
+        in: documentIds,
+      },
+      status: DocumentStatus.DRAFT,
+    },
+  });
+
+  const organisationOwner = await prisma.user.findUnique({
+    where: {
+      id: organisationOwnerId,
+    },
+    select: {
+      id: true,
+      ownedOrganisations: {
+        select: {
+          id: true,
+          teams: {
+            select: {
+              id: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (organisationOwner && organisationOwner.ownedOrganisations.length > 0) {
+    const ownerPersonalTeam = organisationOwner.ownedOrganisations[0].teams[0];
+
+    await prisma.document.updateMany({
+      where: {
+        id: {
+          in: documentIds,
+        },
+        status: {
+          in: [DocumentStatus.PENDING, DocumentStatus.REJECTED, DocumentStatus.COMPLETED],
+        },
+      },
+      data: {
+        userId: organisationOwner.id,
+        teamId: ownerPersonalTeam.id,
+        deletedAt: new Date(),
+      },
+    });
+  } else {
+    await prisma.document.updateMany({
+      where: {
+        id: {
+          in: documentIds,
+        },
+        status: {
+          in: [DocumentStatus.PENDING, DocumentStatus.REJECTED, DocumentStatus.COMPLETED],
+        },
+      },
+      data: {
+        userId: serviceAccount.id,
+        teamId: serviceAccountTeam.id,
+        deletedAt: new Date(),
+      },
+    });
+  }
+};
--- a/packages/lib/server-only/document/send-document.ts
+++ b/packages/lib/server-only/document/send-document.ts
@ -20,12 +20,7 @@ import { validateCheckboxLength } from '../../advanced-fields-validation/validat
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { jobs } from '../../jobs/client';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
-import {
-  ZCheckboxFieldMeta,
-  ZDropdownFieldMeta,
-  ZFieldAndMetaSchema,
-  ZRadioFieldMeta,
-} from '../../types/field-meta';
+import { ZCheckboxFieldMeta, ZDropdownFieldMeta, ZRadioFieldMeta } from '../../types/field-meta';
 import {
  ZWebhookDocumentSchema,
  mapEnvelopeToWebhookDocumentPayload,
@ -179,20 +174,9 @@ export const sendDocument = async ({

  const fieldsToAutoInsert: { fieldId: number; customText: string }[] = [];

-  // Validate and autoinsert fields for V2 envelopes.
+  // Auto insert radio and checkboxes that have default values.
  if (envelope.internalVersion === 2) {
-    for (const unknownField of envelope.fields) {
-      const parsedField = ZFieldAndMetaSchema.safeParse(unknownField);
-
-      if (parsedField.error) {
-        throw new AppError(AppErrorCode.INVALID_REQUEST, {
-          message: 'One or more fields have invalid metadata. Error: ' + parsedField.error.message,
-        });
-      }
-
-      const field = parsedField.data;
-      const fieldId = unknownField.id;
-
+    for (const field of envelope.fields) {
      if (field.type === FieldType.RADIO) {
        const { values = [] } = ZRadioFieldMeta.parse(field.fieldMeta);

@ -200,7 +184,7 @@ export const sendDocument = async ({

        if (checkedItemIndex !== -1) {
          fieldsToAutoInsert.push({
-            fieldId,
+            fieldId: field.id,
            customText: toRadioCustomText(checkedItemIndex),
          });
        }
@ -211,7 +195,7 @@ export const sendDocument = async ({

        if (defaultValue && values.some((value) => value.value === defaultValue)) {
          fieldsToAutoInsert.push({
-            fieldId,
+            fieldId: field.id,
            customText: defaultValue,
          });
        }
@ -250,9 +234,9 @@ export const sendDocument = async ({
          );
        }

-        if (isValid && checkedIndices.length > 0) {
+        if (isValid) {
          fieldsToAutoInsert.push({
-            fieldId,
+            fieldId: field.id,
            customText: toCheckboxCustomText(checkedIndices),
          });
        }
--- a/packages/lib/server-only/envelope/create-envelope.ts
+++ b/packages/lib/server-only/envelope/create-envelope.ts
@ -16,16 +16,11 @@ import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-reques
 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,
-  TRecipientAccessAuthTypes,
-  TRecipientActionAuthTypes,
-} from '../../types/document-auth';
+import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } 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,
@ -39,25 +34,6 @@ 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;
@ -70,6 +46,7 @@ export type CreateEnvelopeOptions = {
    envelopeItems: { title?: string; documentDataId: string; order?: number }[];
    formValues?: TDocumentFormValues;

+    timezone?: string;
    userTimezone?: string;

    templateType?: TemplateType;
@ -79,7 +56,7 @@ export type CreateEnvelopeOptions = {
    visibility?: DocumentVisibility;
    globalAccessAuth?: TDocumentAccessAuthTypes[];
    globalActionAuth?: TDocumentActionAuthTypes[];
-    recipients?: CreateEnvelopeRecipientOptions[];
+    recipients?: TCreateEnvelopeRequest['recipients'];
    folderId?: string;
  };
  attachments?: Array<{
@ -106,6 +83,7 @@ export const createEnvelope = async ({
    title,
    externalId,
    formValues,
+    timezone,
    userTimezone,
    folderId,
    templateType,
@ -164,7 +142,6 @@ export const createEnvelope = async ({
  let envelopeItems: { title?: string; documentDataId: string; order?: number }[] =
    data.envelopeItems;

-  // Todo: Envelopes - Remove
  if (normalizePdf) {
    envelopeItems = await Promise.all(
      data.envelopeItems.map(async (item) => {
@ -242,7 +219,7 @@ export const createEnvelope = async ({

  // userTimezone is last because it's always passed in regardless of the organisation/team settings
  // for uploads from the frontend
-  const timezoneToUse = meta?.timezone || settings.documentTimezone || userTimezone;
+  const timezoneToUse = timezone || settings.documentTimezone || userTimezone;

  const documentMeta = await prisma.documentMeta.create({
    data: extractDerivedDocumentMeta(settings, {
--- 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 { extractDocumentAuthMethods } from '../../utils/document-auth';
+import type { TDocumentAuthMethods } from '../../types/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
-  // logged in.
-  // const documentAccessValid = await isRecipientAuthorized({
-  //   type: 'ACCESS',
-  //   documentAuthOptions: envelope.authOptions,
-  //   recipient,
-  //   userId,
-  //   authOptions: accessAuth,
-  // });
-
-  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
-    documentAuth: envelope.authOptions,
+  const documentAccessValid = await isRecipientAuthorized({
+    type: 'ACCESS',
+    documentAuthOptions: envelope.authOptions,
+    recipient,
+    userId,
+    authOptions: accessAuth,
  });

-  // 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/create-envelope-fields.ts
+++ b/packages/lib/server-only/field/create-envelope-fields.ts
@ -26,9 +26,9 @@ export interface CreateEnvelopeFieldsOptions {
    envelopeItemId?: string;

    recipientId: number;
-    page: number;
-    positionX: number;
-    positionY: number;
+    pageNumber: number;
+    pageX: number;
+    pageY: number;
    width: number;
    height: number;
  })[];
@ -122,9 +122,9 @@ export const createEnvelopeFields = async ({
    const newlyCreatedFields = await tx.field.createManyAndReturn({
      data: validatedFields.map((field) => ({
        type: field.type,
-        page: field.page,
-        positionX: field.positionX,
-        positionY: field.positionY,
+        page: field.pageNumber,
+        positionX: field.pageX,
+        positionY: field.pageY,
        width: field.width,
        height: field.height,
        customText: '',
--- a/packages/lib/server-only/field/get-field-by-id.ts
+++ b/packages/lib/server-only/field/get-field-by-id.ts
@ -11,7 +11,7 @@ export type GetFieldByIdOptions = {
  userId: number;
  teamId: number;
  fieldId: number;
-  envelopeType?: EnvelopeType;
+  envelopeType: EnvelopeType;
 };

 export const getFieldById = async ({
@ -41,7 +41,7 @@ export const getFieldById = async ({
      type: 'envelopeId',
      id: field.envelopeId,
    },
-    type: envelopeType ?? null,
+    type: envelopeType,
    userId,
    teamId,
  });
--- a/packages/lib/server-only/field/set-fields-for-document.ts
+++ b/packages/lib/server-only/field/set-fields-for-document.ts
@ -158,7 +158,7 @@ export const setFieldsForDocument = async ({
          const numberFieldParsedMeta = ZNumberFieldMeta.parse(field.fieldMeta);

          const errors = validateNumberField(
-            String(numberFieldParsedMeta.value || ''),
+            String(numberFieldParsedMeta.value),
            numberFieldParsedMeta,
            false,
          );
--- a/packages/lib/server-only/field/update-document-fields.ts
+++ b/packages/lib/server-only/field/update-document-fields.ts
@ -10,21 +10,18 @@ import {
 import { prisma } from '@documenso/prisma';

 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { type EnvelopeIdOptions } from '../../utils/envelope';
 import { mapFieldToLegacyField } from '../../utils/fields';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';

-export interface UpdateEnvelopeFieldsOptions {
+export interface UpdateDocumentFieldsOptions {
  userId: number;
  teamId: number;
-  id: EnvelopeIdOptions;
-  type?: EnvelopeType | null; // Only used to enforce the type.
+  documentId: number;
  fields: {
    id: number;
    type?: FieldType;
    pageNumber?: number;
-    envelopeItemId?: string;
    pageX?: number;
    pageY?: number;
    width?: number;
@ -34,17 +31,19 @@ export interface UpdateEnvelopeFieldsOptions {
  requestMetadata: ApiRequestMetadata;
 }

-export const updateEnvelopeFields = async ({
+export const updateDocumentFields = async ({
  userId,
  teamId,
-  id,
-  type = null,
+  documentId,
  fields,
  requestMetadata,
-}: UpdateEnvelopeFieldsOptions) => {
+}: UpdateDocumentFieldsOptions) => {
  const { envelopeWhereInput } = await getEnvelopeWhereInput({
-    id,
-    type,
+    id: {
+      type: 'documentId',
+      id: documentId,
+    },
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });
@ -54,19 +53,18 @@ export const updateEnvelopeFields = async ({
    include: {
      recipients: true,
      fields: true,
-      envelopeItems: true,
    },
  });

  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Envelope not found',
+      message: 'Document not found',
    });
  }

  if (envelope.completedAt) {
    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Envelope already complete',
+      message: 'Document already complete',
    });
  }

@ -98,29 +96,6 @@ export const updateEnvelopeFields = async ({
      });
    }

-    const fieldType = field.type || originalField.type;
-    const fieldMetaType = field.fieldMeta?.type || originalField.fieldMeta?.type;
-
-    // Not going to mess with V1 envelopes.
-    if (
-      envelope.internalVersion === 2 &&
-      fieldMetaType &&
-      fieldMetaType.toLowerCase() !== fieldType.toLowerCase()
-    ) {
-      throw new AppError(AppErrorCode.INVALID_REQUEST, {
-        message: 'Field meta type does not match the field type',
-      });
-    }
-
-    if (
-      field.envelopeItemId &&
-      !envelope.envelopeItems.some((item) => item.id === field.envelopeItemId)
-    ) {
-      throw new AppError(AppErrorCode.INVALID_REQUEST, {
-        message: 'Envelope item not found',
-      });
-    }
-
    return {
      originalField,
      updateData: field,
@ -143,14 +118,12 @@ export const updateEnvelopeFields = async ({
            width: updateData.width,
            height: updateData.height,
            fieldMeta: updateData.fieldMeta,
-            envelopeItemId: updateData.envelopeItemId,
          },
        });

-        // Handle field updated audit log.
-        if (envelope.type === EnvelopeType.DOCUMENT) {
        const changes = diffFieldChanges(originalField, updatedField);

+        // Handle field updated audit log.
        if (changes.length > 0) {
          await tx.documentAuditLog.create({
            data: createDocumentAuditLogData({
@ -167,7 +140,6 @@ export const updateEnvelopeFields = async ({
            }),
          });
        }
-        }

        return updatedField;
      }),
--- a/packages/lib/server-only/field/update-template-fields.ts
+++ b/packages/lib/server-only/field/update-template-fields.ts
@ -0,0 +1,116 @@
+import { EnvelopeType, type FieldType } from '@prisma/client';
+
+import type { TFieldMetaSchema } from '@documenso/lib/types/field-meta';
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { mapFieldToLegacyField } from '../../utils/fields';
+import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
+
+export interface UpdateTemplateFieldsOptions {
+  userId: number;
+  teamId: number;
+  templateId: number;
+  fields: {
+    id: number;
+    type?: FieldType;
+    pageNumber?: number;
+    pageX?: number;
+    pageY?: number;
+    width?: number;
+    height?: number;
+    fieldMeta?: TFieldMetaSchema;
+  }[];
+}
+
+export const updateTemplateFields = async ({
+  userId,
+  teamId,
+  templateId,
+  fields,
+}: UpdateTemplateFieldsOptions) => {
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id: {
+      type: 'templateId',
+      id: templateId,
+    },
+    type: EnvelopeType.TEMPLATE,
+    userId,
+    teamId,
+  });
+
+  const envelope = await prisma.envelope.findFirst({
+    where: envelopeWhereInput,
+    include: {
+      recipients: true,
+      fields: true,
+    },
+  });
+
+  if (!envelope) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Document not found',
+    });
+  }
+
+  const fieldsToUpdate = fields.map((field) => {
+    const originalField = envelope.fields.find((existingField) => existingField.id === field.id);
+
+    if (!originalField) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: `Field with id ${field.id} not found`,
+      });
+    }
+
+    const recipient = envelope.recipients.find(
+      (recipient) => recipient.id === originalField.recipientId,
+    );
+
+    // Each field MUST have a recipient associated with it.
+    if (!recipient) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message: `Recipient attached to field ${field.id} not found`,
+      });
+    }
+
+    // Check whether the recipient associated with the field can be modified.
+    if (!canRecipientFieldsBeModified(recipient, envelope.fields)) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message:
+          'Cannot modify a field where the recipient has already interacted with the document',
+      });
+    }
+
+    return {
+      updateData: field,
+    };
+  });
+
+  const updatedFields = await prisma.$transaction(async (tx) => {
+    return await Promise.all(
+      fieldsToUpdate.map(async ({ updateData }) => {
+        const updatedField = await tx.field.update({
+          where: {
+            id: updateData.id,
+          },
+          data: {
+            type: updateData.type,
+            page: updateData.pageNumber,
+            positionX: updateData.pageX,
+            positionY: updateData.pageY,
+            width: updateData.width,
+            height: updateData.height,
+            fieldMeta: updateData.fieldMeta,
+          },
+        });
+
+        return updatedField;
+      }),
+    );
+  });
+
+  return {
+    fields: updatedFields.map((field) => mapFieldToLegacyField(field, envelope)),
+  };
+};
--- a/packages/lib/server-only/pdf/normalize-pdf.ts
+++ b/packages/lib/server-only/pdf/normalize-pdf.ts
@ -1,22 +1,13 @@
 import { PDFDocument } from '@cantoo/pdf-lib';

-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((e) => {
-    console.error(`PDF normalization error: ${e.message}`);
+  const pdfDoc = await PDFDocument.load(pdf).catch(() => null);

-    throw new AppError('INVALID_DOCUMENT_FILE', {
-      message: 'The document is not a valid PDF',
-    });
-  });
-
-  if (pdfDoc.isEncrypted) {
-    throw new AppError('INVALID_DOCUMENT_FILE', {
-      message: 'The document is encrypted',
-    });
+  if (!pdfDoc) {
+    return pdf;
  }

  removeOptionalContentGroups(pdfDoc);
--- a/packages/lib/server-only/recipient/create-document-recipients.ts
+++ b/packages/lib/server-only/recipient/create-document-recipients.ts
@ -15,7 +15,7 @@ import type { EnvelopeIdOptions } from '../../utils/envelope';
 import { mapRecipientToLegacyRecipient } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';

-export interface CreateEnvelopeRecipientsOptions {
+export interface CreateDocumentRecipientsOptions {
  userId: number;
  teamId: number;
  id: EnvelopeIdOptions;
@ -30,16 +30,16 @@ export interface CreateEnvelopeRecipientsOptions {
  requestMetadata: ApiRequestMetadata;
 }

-export const createEnvelopeRecipients = async ({
+export const createDocumentRecipients = async ({
  userId,
  teamId,
  id,
  recipients: recipientsToCreate,
  requestMetadata,
-}: CreateEnvelopeRecipientsOptions) => {
+}: CreateDocumentRecipientsOptions) => {
  const { envelopeWhereInput } = await getEnvelopeWhereInput({
    id,
-    type: null,
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });
@ -62,13 +62,13 @@ export const createEnvelopeRecipients = async ({

  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Envelope not found',
+      message: 'Document not found',
    });
  }

  if (envelope.completedAt) {
    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Envelope already complete',
+      message: 'Document already complete',
    });
  }

@ -112,7 +112,6 @@ export const createEnvelopeRecipients = async ({
        });

        // Handle recipient created audit log.
-        if (envelope.type === EnvelopeType.DOCUMENT) {
        await tx.documentAuditLog.create({
          data: createDocumentAuditLogData({
            type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_CREATED,
@ -128,7 +127,6 @@ export const createEnvelopeRecipients = async ({
            },
          }),
        });
-        }

        return createdRecipient;
      }),
--- a/packages/lib/server-only/recipient/create-template-recipients.ts
+++ b/packages/lib/server-only/recipient/create-template-recipients.ts
@ -0,0 +1,115 @@
+import { EnvelopeType, RecipientRole } from '@prisma/client';
+import { SendStatus, SigningStatus } from '@prisma/client';
+
+import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
+import { type TRecipientActionAuthTypes } from '@documenso/lib/types/document-auth';
+import { nanoid } from '@documenso/lib/universal/id';
+import { createRecipientAuthOptions } from '@documenso/lib/utils/document-auth';
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { mapRecipientToLegacyRecipient } from '../../utils/recipients';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
+
+export interface CreateTemplateRecipientsOptions {
+  userId: number;
+  teamId: number;
+  templateId: number;
+  recipients: {
+    email: string;
+    name: string;
+    role: RecipientRole;
+    signingOrder?: number | null;
+    accessAuth?: TRecipientAccessAuthTypes[];
+    actionAuth?: TRecipientActionAuthTypes[];
+  }[];
+}
+
+export const createTemplateRecipients = async ({
+  userId,
+  teamId,
+  templateId,
+  recipients: recipientsToCreate,
+}: CreateTemplateRecipientsOptions) => {
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id: {
+      type: 'templateId',
+      id: templateId,
+    },
+    type: EnvelopeType.TEMPLATE,
+    userId,
+    teamId,
+  });
+
+  const template = await prisma.envelope.findFirst({
+    where: envelopeWhereInput,
+    include: {
+      recipients: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!template) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Template not found',
+    });
+  }
+
+  const recipientsHaveActionAuth = recipientsToCreate.some(
+    (recipient) => recipient.actionAuth && recipient.actionAuth.length > 0,
+  );
+
+  // Check if user has permission to set the global action auth.
+  if (recipientsHaveActionAuth && !template.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
+    });
+  }
+
+  const normalizedRecipients = recipientsToCreate.map((recipient) => ({
+    ...recipient,
+    email: recipient.email.toLowerCase(),
+  }));
+
+  const createdRecipients = await prisma.$transaction(async (tx) => {
+    return await Promise.all(
+      normalizedRecipients.map(async (recipient) => {
+        const authOptions = createRecipientAuthOptions({
+          accessAuth: recipient.accessAuth ?? [],
+          actionAuth: recipient.actionAuth ?? [],
+        });
+
+        const createdRecipient = await tx.recipient.create({
+          data: {
+            envelopeId: template.id,
+            name: recipient.name,
+            email: recipient.email,
+            role: recipient.role,
+            signingOrder: recipient.signingOrder,
+            token: nanoid(),
+            sendStatus: recipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT,
+            signingStatus:
+              recipient.role === RecipientRole.CC ? SigningStatus.SIGNED : SigningStatus.NOT_SIGNED,
+            authOptions,
+          },
+        });
+
+        return createdRecipient;
+      }),
+    );
+  });
+
+  return {
+    recipients: createdRecipients.map((recipient) =>
+      mapRecipientToLegacyRecipient(recipient, template),
+    ),
+  };
+};
--- a/packages/lib/server-only/recipient/delete-document-recipient.ts
+++ b/packages/lib/server-only/recipient/delete-document-recipient.ts
@ -14,27 +14,26 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
-import { canRecipientBeModified } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { buildTeamWhereQuery } from '../../utils/teams';
 import { getEmailContext } from '../email/get-email-context';
-import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';

-export interface DeleteEnvelopeRecipientOptions {
+export interface DeleteDocumentRecipientOptions {
  userId: number;
  teamId: number;
  recipientId: number;
  requestMetadata: ApiRequestMetadata;
 }

-export const deleteEnvelopeRecipient = async ({
+export const deleteDocumentRecipient = async ({
  userId,
  teamId,
  recipientId,
  requestMetadata,
-}: DeleteEnvelopeRecipientOptions) => {
+}: DeleteDocumentRecipientOptions) => {
  const envelope = await prisma.envelope.findFirst({
    where: {
+      type: EnvelopeType.DOCUMENT,
      recipients: {
        some: {
          id: recipientId,
@ -49,9 +48,6 @@ export const deleteEnvelopeRecipient = async ({
        where: {
          id: recipientId,
        },
-        include: {
-          fields: true,
-        },
      },
    },
  });
@ -93,24 +89,7 @@ export const deleteEnvelopeRecipient = async ({
    });
  }

-  if (!canRecipientBeModified(recipientToDelete, recipientToDelete.fields)) {
-    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Recipient has already interacted with the document.',
-    });
-  }
-
-  const { envelopeWhereInput } = await getEnvelopeWhereInput({
-    id: {
-      type: 'envelopeId',
-      id: envelope.id,
-    },
-    type: null,
-    userId,
-    teamId,
-  });
-
  const deletedRecipient = await prisma.$transaction(async (tx) => {
-    if (envelope.type === EnvelopeType.DOCUMENT) {
    await tx.documentAuditLog.create({
      data: createDocumentAuditLogData({
        type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_DELETED,
@ -124,12 +103,10 @@ export const deleteEnvelopeRecipient = async ({
        },
      }),
    });
-    }

    return await tx.recipient.delete({
      where: {
        id: recipientId,
-        envelope: envelopeWhereInput,
      },
    });
  });
@ -139,11 +116,7 @@ export const deleteEnvelopeRecipient = async ({
  ).recipientRemoved;

  // Send email to deleted recipient.
-  if (
-    recipientToDelete.sendStatus === SendStatus.SENT &&
-    isRecipientRemovedEmailEnabled &&
-    envelope.type === EnvelopeType.DOCUMENT
-  ) {
+  if (recipientToDelete.sendStatus === SendStatus.SENT && isRecipientRemovedEmailEnabled) {
    const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';

    const template = createElement(RecipientRemovedFromDocumentTemplate, {
--- a/packages/lib/server-only/recipient/delete-template-recipient.ts
+++ b/packages/lib/server-only/recipient/delete-template-recipient.ts
@ -0,0 +1,58 @@
+import { EnvelopeType } from '@prisma/client';
+
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
+
+export interface DeleteTemplateRecipientOptions {
+  userId: number;
+  teamId: number;
+  recipientId: number;
+}
+
+export const deleteTemplateRecipient = async ({
+  userId,
+  teamId,
+  recipientId,
+}: DeleteTemplateRecipientOptions): Promise<void> => {
+  const recipientToDelete = await prisma.recipient.findFirst({
+    where: {
+      id: recipientId,
+      envelope: {
+        type: EnvelopeType.TEMPLATE,
+        team: buildTeamWhereQuery({ teamId, userId }),
+      },
+    },
+  });
+
+  if (!recipientToDelete) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Recipient not found',
+    });
+  }
+
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id: {
+      type: 'envelopeId',
+      id: recipientToDelete.envelopeId,
+    },
+    type: EnvelopeType.TEMPLATE,
+    userId,
+    teamId,
+  });
+
+  if (!recipientToDelete || recipientToDelete.id !== recipientId) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Recipient not found',
+    });
+  }
+
+  await prisma.recipient.delete({
+    where: {
+      id: recipientId,
+      envelope: envelopeWhereInput,
+    },
+  });
+};
--- a/packages/lib/server-only/recipient/update-document-recipients.ts
+++ b/packages/lib/server-only/recipient/update-document-recipients.ts
@ -1,4 +1,5 @@
-import { EnvelopeType, RecipientRole, SendStatus, SigningStatus } from '@prisma/client';
+import { EnvelopeType, RecipientRole } from '@prisma/client';
+import { SendStatus, SigningStatus } from '@prisma/client';

 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
@ -15,38 +16,29 @@ import { createRecipientAuthOptions } from '@documenso/lib/utils/document-auth';
 import { prisma } from '@documenso/prisma';

 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { extractLegacyIds } from '../../universal/id';
-import { type EnvelopeIdOptions } from '../../utils/envelope';
+import { type EnvelopeIdOptions, mapSecondaryIdToDocumentId } from '../../utils/envelope';
 import { mapFieldToLegacyField } from '../../utils/fields';
 import { canRecipientBeModified } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';

-export interface UpdateEnvelopeRecipientsOptions {
+export interface UpdateDocumentRecipientsOptions {
  userId: number;
  teamId: number;
  id: EnvelopeIdOptions;
-  recipients: {
-    id: number;
-    email?: string;
-    name?: string;
-    role?: RecipientRole;
-    signingOrder?: number | null;
-    accessAuth?: TRecipientAccessAuthTypes[];
-    actionAuth?: TRecipientActionAuthTypes[];
-  }[];
+  recipients: RecipientData[];
  requestMetadata: ApiRequestMetadata;
 }

-export const updateEnvelopeRecipients = async ({
+export const updateDocumentRecipients = async ({
  userId,
  teamId,
  id,
  recipients,
  requestMetadata,
-}: UpdateEnvelopeRecipientsOptions) => {
+}: UpdateDocumentRecipientsOptions) => {
  const { envelopeWhereInput } = await getEnvelopeWhereInput({
    id,
-    type: null,
+    type: EnvelopeType.DOCUMENT,
    userId,
    teamId,
  });
@ -70,13 +62,13 @@ export const updateEnvelopeRecipients = async ({

  if (!envelope) {
    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Envelope not found',
+      message: 'Document not found',
    });
  }

  if (envelope.completedAt) {
    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Envelope already complete',
+      message: 'Document already complete',
    });
  }

@ -168,10 +160,9 @@ export const updateEnvelopeRecipients = async ({
          });
        }

-        // Handle recipient updated audit log.
-        if (envelope.type === EnvelopeType.DOCUMENT) {
        const changes = diffRecipientChanges(originalRecipient, updatedRecipient);

+        // Handle recipient updated audit log.
        if (changes.length > 0) {
          await tx.documentAuditLog.create({
            data: createDocumentAuditLogData({
@ -188,7 +179,6 @@ export const updateEnvelopeRecipients = async ({
            }),
          });
        }
-        }

        return updatedRecipient;
      }),
@ -198,8 +188,19 @@ export const updateEnvelopeRecipients = async ({
  return {
    recipients: updatedRecipients.map((recipient) => ({
      ...recipient,
-      ...extractLegacyIds(envelope),
+      documentId: mapSecondaryIdToDocumentId(envelope.secondaryId),
+      templateId: null,
      fields: recipient.fields.map((field) => mapFieldToLegacyField(field, envelope)),
    })),
  };
 };
+
+type RecipientData = {
+  id: number;
+  email?: string;
+  name?: string;
+  role?: RecipientRole;
+  signingOrder?: number | null;
+  accessAuth?: TRecipientAccessAuthTypes[];
+  actionAuth?: TRecipientActionAuthTypes[];
+};
--- a/packages/lib/server-only/recipient/update-template-recipients.ts
+++ b/packages/lib/server-only/recipient/update-template-recipients.ts
@ -0,0 +1,168 @@
+import { EnvelopeType, RecipientRole } from '@prisma/client';
+import { SendStatus, SigningStatus } from '@prisma/client';
+
+import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
+import {
+  type TRecipientActionAuthTypes,
+  ZRecipientAuthOptionsSchema,
+} from '@documenso/lib/types/document-auth';
+import { createRecipientAuthOptions } from '@documenso/lib/utils/document-auth';
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { mapSecondaryIdToTemplateId } from '../../utils/envelope';
+import { mapFieldToLegacyField } from '../../utils/fields';
+import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
+
+export interface UpdateTemplateRecipientsOptions {
+  userId: number;
+  teamId: number;
+  templateId: number;
+  recipients: {
+    id: number;
+    email?: string;
+    name?: string;
+    role?: RecipientRole;
+    signingOrder?: number | null;
+    accessAuth?: TRecipientAccessAuthTypes[];
+    actionAuth?: TRecipientActionAuthTypes[];
+  }[];
+}
+
+export const updateTemplateRecipients = async ({
+  userId,
+  teamId,
+  templateId,
+  recipients,
+}: UpdateTemplateRecipientsOptions) => {
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id: {
+      type: 'templateId',
+      id: templateId,
+    },
+    type: EnvelopeType.TEMPLATE,
+    userId,
+    teamId,
+  });
+
+  const envelope = await prisma.envelope.findFirst({
+    where: envelopeWhereInput,
+    include: {
+      recipients: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!envelope) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Template not found',
+    });
+  }
+
+  const recipientsHaveActionAuth = recipients.some(
+    (recipient) => recipient.actionAuth && recipient.actionAuth.length > 0,
+  );
+
+  // Check if user has permission to set the global action auth.
+  if (recipientsHaveActionAuth && !envelope.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
+    });
+  }
+
+  const recipientsToUpdate = recipients.map((recipient) => {
+    const originalRecipient = envelope.recipients.find(
+      (existingRecipient) => existingRecipient.id === recipient.id,
+    );
+
+    if (!originalRecipient) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: `Recipient with id ${recipient.id} not found`,
+      });
+    }
+
+    return {
+      originalRecipient,
+      recipientUpdateData: recipient,
+    };
+  });
+
+  const updatedRecipients = await prisma.$transaction(async (tx) => {
+    return await Promise.all(
+      recipientsToUpdate.map(async ({ originalRecipient, recipientUpdateData }) => {
+        let authOptions = ZRecipientAuthOptionsSchema.parse(originalRecipient.authOptions);
+
+        if (
+          recipientUpdateData.actionAuth !== undefined ||
+          recipientUpdateData.accessAuth !== undefined
+        ) {
+          authOptions = createRecipientAuthOptions({
+            accessAuth: recipientUpdateData.accessAuth || authOptions.accessAuth,
+            actionAuth: recipientUpdateData.actionAuth || authOptions.actionAuth,
+          });
+        }
+
+        const mergedRecipient = {
+          ...originalRecipient,
+          ...recipientUpdateData,
+        };
+
+        const updatedRecipient = await tx.recipient.update({
+          where: {
+            id: originalRecipient.id,
+            envelopeId: envelope.id,
+          },
+          data: {
+            name: mergedRecipient.name,
+            email: mergedRecipient.email,
+            role: mergedRecipient.role,
+            signingOrder: mergedRecipient.signingOrder,
+            envelopeId: envelope.id,
+            sendStatus:
+              mergedRecipient.role === RecipientRole.CC ? SendStatus.SENT : SendStatus.NOT_SENT,
+            signingStatus:
+              mergedRecipient.role === RecipientRole.CC
+                ? SigningStatus.SIGNED
+                : SigningStatus.NOT_SIGNED,
+            authOptions,
+          },
+          include: {
+            fields: true,
+          },
+        });
+
+        // Clear all fields if the recipient role is changed to a type that cannot have fields.
+        if (
+          originalRecipient.role !== updatedRecipient.role &&
+          (updatedRecipient.role === RecipientRole.CC ||
+            updatedRecipient.role === RecipientRole.VIEWER)
+        ) {
+          await tx.field.deleteMany({
+            where: {
+              recipientId: updatedRecipient.id,
+            },
+          });
+        }
+
+        return updatedRecipient;
+      }),
+    );
+  });
+
+  return {
+    recipients: updatedRecipients.map((recipient) => ({
+      ...recipient,
+      documentId: null,
+      templateId: mapSecondaryIdToTemplateId(envelope.secondaryId),
+      fields: recipient.fields.map((field) => mapFieldToLegacyField(field, envelope)),
+    })),
+  };
+};
--- 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/server-only/user/service-accounts/deleted-account.ts
+++ b/packages/lib/server-only/user/service-accounts/deleted-account.ts
@ -5,6 +5,20 @@ export const deletedAccountServiceAccount = async () => {
    where: {
      email: 'deleted-account@documenso.com',
    },
+    select: {
+      id: true,
+      email: true,
+      ownedOrganisations: {
+        select: {
+          id: true,
+          teams: {
+            select: {
+              id: true,
+            },
+          },
+        },
+      },
+    },
  });

  if (!serviceAccount) {
--- a/packages/lib/types/envelope.ts
+++ b/packages/lib/types/envelope.ts
@ -37,8 +37,11 @@ export const ZEnvelopeSchema = EnvelopeSchema.pick({
  userId: true,
  teamId: true,
  folderId: true,
-  templateId: true,
 }).extend({
+  templateId: z
+    .number()
+    .nullish()
+    .describe('The ID of the template that the document was created from, if any.'),
  documentMeta: DocumentMetaSchema.pick({
    signingOrder: true,
    distributionMethod: true,
--- a/packages/lib/types/field-meta.ts
+++ b/packages/lib/types/field-meta.ts
@ -188,7 +188,7 @@ export type TFieldMetaSchema = z.infer<typeof ZFieldMetaSchema>;
 export const ZFieldAndMetaSchema = z.discriminatedUnion('type', [
  z.object({
    type: z.literal(FieldType.SIGNATURE),
-    fieldMeta: ZSignatureFieldMeta.optional(),
+    fieldMeta: z.undefined(),
  }),
  z.object({
    type: z.literal(FieldType.FREE_SIGNATURE),
--- a/packages/lib/types/field.ts
+++ b/packages/lib/types/field.ts
@ -50,11 +50,6 @@ export const ZFieldSchema = FieldSchema.pick({
  templateId: z.number().nullish(),
 });

-export const ZEnvelopeFieldSchema = ZFieldSchema.omit({
-  documentId: true,
-  templateId: true,
-});
-
 export const ZFieldPageNumberSchema = z
  .number()
  .min(1)
@ -74,30 +69,6 @@ export const ZFieldWidthSchema = z.number().min(1).describe('The width of the fi

 export const ZFieldHeightSchema = z.number().min(1).describe('The height of the field.');

-export const ZClampedFieldPositionXSchema = z
-  .number()
-  .min(0)
-  .max(100)
-  .describe('The percentage based X coordinate where the field will be placed.');
-
-export const ZClampedFieldPositionYSchema = z
-  .number()
-  .min(0)
-  .max(100)
-  .describe('The percentage based Y coordinate where the field will be placed.');
-
-export const ZClampedFieldWidthSchema = z
-  .number()
-  .min(0)
-  .max(100)
-  .describe('The percentage based width of the field on the page.');
-
-export const ZClampedFieldHeightSchema = z
-  .number()
-  .min(0)
-  .max(100)
-  .describe('The percentage based height of the field on the page.');
-
 // ---------------------------------------------

 const PrismaDecimalSchema = z.preprocess(
--- a/packages/lib/types/recipient.ts
+++ b/packages/lib/types/recipient.ts
@ -95,18 +95,3 @@ export const ZRecipientManySchema = RecipientSchema.pick({
  documentId: z.number().nullish(),
  templateId: z.number().nullish(),
 });
-
-export const ZEnvelopeRecipientSchema = ZRecipientSchema.omit({
-  documentId: true,
-  templateId: true,
-});
-
-export const ZEnvelopeRecipientLiteSchema = ZRecipientLiteSchema.omit({
-  documentId: true,
-  templateId: true,
-});
-
-export const ZEnvelopeRecipientManySchema = ZRecipientManySchema.omit({
-  documentId: true,
-  templateId: true,
-});
--- a/packages/lib/universal/crypto.ts
+++ b/packages/lib/universal/crypto.ts
@ -30,5 +30,3 @@ export const symmetricDecrypt = ({ key, data }: SymmetricDecryptOptions) => {

  return chacha.decrypt(dataAsBytes);
 };
-
-export { sha256 };
--- a/packages/lib/universal/field-renderer/field-generic-items.ts
+++ b/packages/lib/universal/field-renderer/field-generic-items.ts
@ -153,11 +153,6 @@ export const createFieldHoverInteraction = ({
  const hoverColor = RECIPIENT_COLOR_STYLES[options.color].baseRingHover;

  fieldGroup.on('mouseover', () => {
-    const layer = fieldRect.getLayer();
-    if (!layer) {
-      return;
-    }
-
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
@ -166,11 +161,6 @@ export const createFieldHoverInteraction = ({
  });

  fieldGroup.on('mouseout', () => {
-    const layer = fieldRect.getLayer();
-    if (!layer) {
-      return;
-    }
-
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
@ -179,11 +169,6 @@ export const createFieldHoverInteraction = ({
  });

  fieldGroup.on('transformstart', () => {
-    const layer = fieldRect.getLayer();
-    if (!layer) {
-      return;
-    }
-
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
@ -192,11 +177,6 @@ export const createFieldHoverInteraction = ({
  });

  fieldGroup.on('transformend', () => {
-    const layer = fieldRect.getLayer();
-    if (!layer) {
-      return;
-    }
-
    new Konva.Tween({
      node: fieldRect,
      duration: 0.3,
--- a/packages/lib/universal/field-renderer/render-checkbox-field.ts
+++ b/packages/lib/universal/field-renderer/render-checkbox-field.ts
@ -3,7 +3,6 @@ import { match } from 'ts-pattern';

 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TCheckboxFieldMeta } from '../../types/field-meta';
-import { parseCheckboxCustomText } from '../../utils/fields';
 import {
  createFieldHoverInteraction,
  konvaTextFill,
@ -63,15 +62,16 @@ export const renderCheckboxFieldElement = (
    const rectWidth = fieldRect.width() * groupScaleX;
    const rectHeight = fieldRect.height() * groupScaleY;

+    // Todo: Envelopes - check sorting more than 10
+    // arr.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }));
+
    const squares = fieldGroup
      .find('.checkbox-square')
-      .sort((a, b) => a.id().localeCompare(b.id(), undefined, { numeric: true }));
+      .sort((a, b) => a.id().localeCompare(b.id()));
    const checkmarks = fieldGroup
      .find('.checkbox-checkmark')
-      .sort((a, b) => a.id().localeCompare(b.id(), undefined, { numeric: true }));
-    const text = fieldGroup
-      .find('.checkbox-text')
-      .sort((a, b) => a.id().localeCompare(b.id(), undefined, { numeric: true }));
+      .sort((a, b) => a.id().localeCompare(b.id()));
+    const text = fieldGroup.find('.checkbox-text').sort((a, b) => a.id().localeCompare(b.id()));

    const groupedItems = squares.map((square, i) => ({
      squareElement: square,
@ -130,7 +130,7 @@ export const renderCheckboxFieldElement = (
    pageLayer.batchDraw();
  });

-  const checkedValues: number[] = field.customText ? parseCheckboxCustomText(field.customText) : [];
+  const checkedValues: number[] = field.customText ? JSON.parse(field.customText) : [];

  checkboxValues.forEach(({ value, checked }, index) => {
    const isCheckboxChecked = match(mode)
@ -170,7 +170,7 @@ export const renderCheckboxFieldElement = (
      width: itemSize,
      height: itemSize,
      stroke: '#374151',
-      strokeWidth: 1.5,
+      strokeWidth: 2,
      cornerRadius: 2,
      fill: 'white',
    });
--- a/packages/lib/universal/field-renderer/render-field.ts
+++ b/packages/lib/universal/field-renderer/render-field.ts
@ -8,9 +8,9 @@ import type { TRecipientColor } from '@documenso/ui/lib/recipient-colors';
 import type { TFieldMetaSchema } from '../../types/field-meta';
 import { renderCheckboxFieldElement } from './render-checkbox-field';
 import { renderDropdownFieldElement } from './render-dropdown-field';
-import { renderGenericTextFieldElement } from './render-generic-text-field';
 import { renderRadioFieldElement } from './render-radio-field';
 import { renderSignatureFieldElement } from './render-signature-field';
+import { renderTextFieldElement } from './render-text-field';

 export const MIN_FIELD_HEIGHT_PX = 12;
 export const MIN_FIELD_WIDTH_PX = 36;
@ -43,9 +43,9 @@ type RenderFieldOptions = {
   *
   * @default 'edit'
   *
-   * - `edit` - The field is rendered in editor page.
-   * - `sign` - The field is rendered for the signing page.
-   * - `export` - The field is rendered for exporting and sealing into the PDF. No backgrounds, interactive elements, etc.
+   * - `edit` - The field is rendered in edit mode.
+   * - `sign` - The field is rendered in sign mode. No interactive elements.
+   * - `export` - The field is rendered in export mode. No backgrounds, interactive elements, etc.
   */
  mode: 'edit' | 'sign' | 'export';

@ -76,21 +76,10 @@ export const renderField = ({
  };

  return match(field.type)
-    .with(
-      FieldType.INITIALS,
-      FieldType.NAME,
-      FieldType.EMAIL,
-      FieldType.DATE,
-      FieldType.TEXT,
-      FieldType.NUMBER,
-      () => renderGenericTextFieldElement(field, options),
-    )
+    .with(FieldType.TEXT, () => renderTextFieldElement(field, options))
    .with(FieldType.CHECKBOX, () => renderCheckboxFieldElement(field, options))
    .with(FieldType.RADIO, () => renderRadioFieldElement(field, options))
    .with(FieldType.DROPDOWN, () => renderDropdownFieldElement(field, options))
    .with(FieldType.SIGNATURE, () => renderSignatureFieldElement(field, options))
-    .with(FieldType.FREE_SIGNATURE, () => {
-      throw new Error('Free signature fields are not supported');
-    })
-    .exhaustive();
+    .otherwise(() => renderTextFieldElement(field, options)); // Todo: Envelopes
 };
--- a/packages/lib/universal/field-renderer/render-radio-field.ts
+++ b/packages/lib/universal/field-renderer/render-radio-field.ts
@ -159,7 +159,7 @@ export const renderRadioFieldElement = (
      y: itemInputY,
      radius: calculateRadioSize(fontSize) / 2,
      stroke: '#374151',
-      strokeWidth: 1.5,
+      strokeWidth: 2,
      fill: 'white',
    });

--- a/packages/lib/universal/field-renderer/render-generic-text-field.ts
+++ b/packages/lib/universal/field-renderer/render-generic-text-field.ts
@ -12,8 +12,6 @@ import {
 import type { FieldToRender, RenderFieldElementOptions } from './field-renderer';
 import { calculateFieldPosition } from './field-renderer';

-const DEFAULT_TEXT_ALIGN = 'left';
-
 const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOptions): Konva.Text => {
  const { pageWidth, pageHeight, mode = 'edit', pageLayer, translations } = options;

@ -33,8 +31,8 @@ const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOption
  // Calculate text positioning based on alignment
  const textX = 0;
  const textY = 0;
-  let textAlign: 'left' | 'center' | 'right' = textMeta?.textAlign || DEFAULT_TEXT_ALIGN;
-  const textVerticalAlign: 'top' | 'middle' | 'bottom' = 'middle';
+  let textAlign: 'left' | 'center' | 'right' = textMeta?.textAlign || 'left';
+  let textVerticalAlign: 'top' | 'middle' | 'bottom' = 'top';
  const textFontSize = textMeta?.fontSize || DEFAULT_STANDARD_FONT_SIZE;
  const textPadding = 10;

@ -42,33 +40,51 @@ const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOption

  // Handle edit mode.
  if (mode === 'edit') {
-    if (textMeta?.text) {
-      textToRender = textMeta.text;
-    } else if (textMeta?.label) {
-      textToRender = textMeta.label;
-    } else {
-      // Show field name which is centered for the edit mode if no label/text is avaliable.
    textToRender = fieldTypeName;
    textAlign = 'center';
+    textVerticalAlign = 'middle';
+
+    if (textMeta?.label) {
+      textToRender = textMeta.label;
+    } else if (textMeta?.text) {
+      textToRender = textMeta.text;
+      textAlign = textMeta.textAlign || 'center'; // Todo: Envelopes - What is the default
+
+      // Todo: Envelopes - Handle this on signatures
+      if (textMeta.characterLimit) {
+        textToRender = textToRender.slice(0, textMeta.characterLimit);
+      }
    }
  }

  // Handle sign mode.
  if (mode === 'sign' || mode === 'export') {
-    if (!field.inserted) {
-      if (textMeta?.text) {
-        textToRender = textMeta.text;
-      } else if (textMeta?.label) {
-        textToRender = textMeta.label;
-      } else if (mode === 'sign') {
-        // Only show the field name in sign mode if no text/label is avaliable.
    textToRender = fieldTypeName;
    textAlign = 'center';
+    textVerticalAlign = 'middle';
+
+    if (textMeta?.label) {
+      textToRender = textMeta.label;
+    }
+
+    if (textMeta?.text) {
+      textToRender = textMeta.text;
+      textAlign = textMeta.textAlign || 'center'; // Todo: Envelopes - What is the default
+
+      // Todo: Envelopes - Handle this on signatures
+      if (textMeta.characterLimit) {
+        textToRender = textToRender.slice(0, textMeta.characterLimit);
      }
    }

    if (field.inserted) {
      textToRender = field.customText;
+      textAlign = textMeta?.textAlign || 'center'; // Todo: Envelopes - What is the default
+
+      // Todo: Envelopes - Handle this on signatures
+      if (textMeta?.characterLimit) {
+        textToRender = textToRender.slice(0, textMeta.characterLimit);
+      }
    }
  }

@ -90,7 +106,7 @@ const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOption
  return fieldText;
 };

-export const renderGenericTextFieldElement = (
+export const renderTextFieldElement = (
  field: FieldToRender,
  options: RenderFieldElementOptions,
 ) => {
--- a/packages/lib/universal/upload/get-file.ts
+++ b/packages/lib/universal/upload/get-file.ts
@ -7,13 +7,7 @@ export type GetFileOptions = {
  data: string;
 };

-/**
- * KEPT FOR POSTERITY, SHOULD BE REMOVED IN THE FUTURE
- * DO NOT USE OR I WILL FIRE YOU
- *
- * - Lucas, 2025-11-04
- */
-const getFile = async ({ type, data }: GetFileOptions) => {
+export const getFile = async ({ type, data }: GetFileOptions) => {
  return await match(type)
    .with(DocumentDataType.BYTES, () => getFileFromBytes(data))
    .with(DocumentDataType.BYTES_64, () => getFileFromBytes64(data))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lucas Smith	bf6f09194d	Merge branch 'main' into feat/unlink-documents-deleted-org	2025-10-28 21:04:54 +11:00
Catalin Pit	0bbd9aa9a1	chore: merge main	2025-09-11 17:20:24 +03:00
Catalin Pit	5e8c3d5d92	chore: return minimal data	2025-09-01 14:20:15 +03:00
Catalin Pit	c97c2551db	Merge branch 'main' into feat/unlink-documents-deleted-org	2025-09-01 14:01:42 +03:00
Catalin Pit	1863d990c8	chore: don't return more than necessary	2025-09-01 13:56:21 +03:00
Catalin Pit	38483bb88c	chore: update file name in import	2025-09-01 12:38:15 +03:00
Catalin Pit	9cbbdfb127	chore: make code re-usable	2025-09-01 12:18:12 +03:00
Catalin Pit	fb6e2753df	chore: add deletedAt property	2025-08-28 13:23:43 +03:00
Catalin Pit	a89c781b31	chore: add deletedAt property	2025-08-28 11:44:20 +03:00
Catalin Pit	8b131e42c7	feat: unlink documents from deleted organization	2025-08-28 09:35:31 +03:00