chore: remove unused type

chore: avoid using lastSignedIn
Merge branch 'main' into feat/mau
2026-07-05 02:24:56 +10:00 · 2025-01-30 05:20:38 +00:00 · 2025-01-29 07:25:07 +00:00 · 2025-01-29 00:30:43 +00:00 · 2025-01-29 00:25:07 +00:00 · 2025-01-28 16:19:14 +00:00
102 changed files with 10903 additions and 14382 deletions
@@ -1,4 +1,4 @@
-> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="https://documen.so/sign-everywhere">The Platform Plan</a>!
+> 🚨 We are live on Product Hunt 🎉  Check out our latest launch: <a href="documen.so/sign-everywhere">The Platform Plan</a>!

 <a href="https://www.producthunt.com/posts/documenso-platform-plan?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso&#0045;platform&#0045;plan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=670576&theme=light" alt="Documenso&#0032;Platform&#0032;Plan - Whitelabeled&#0032;signing&#0032;flows&#0032;in&#0032;your&#0032;product | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>

@@ -14,4 +14,4 @@
  "public-api": "Public API",
  "embedding": "Embedding",
  "webhooks": "Webhooks"
-}
+}
@@ -6,6 +6,5 @@
  "solid": "Solid Integration",
  "preact": "Preact Integration",
  "angular": "Angular Integration",
-  "css-variables": "CSS Variables",
-  "web-components": "Web Components"
+  "css-variables": "CSS Variables"
 }
@@ -111,83 +111,6 @@ The colors will be automatically converted to the appropriate format internally.

 4. **Consistent Radius**: Use a consistent border radius value that matches your application's design system.

-## CSS Class Targets
-
-In addition to CSS variables, specific components in the embedded experience can be targeted using CSS classes for more granular styling:
-
-### Component Classes
-
-| Class Name                        | Description                                                             |
-| --------------------------------- | ----------------------------------------------------------------------- |
-| `.embed--Root`                    | Main container for the embedded signing experience                      |
-| `.embed--DocumentContainer`       | Container for the document and signing widget                           |
-| `.embed--DocumentViewer`          | Container for the document viewer                                       |
-| `.embed--DocumentWidget`          | The signing widget container                                            |
-| `.embed--DocumentWidgetContainer` | Outer container for the signing widget, handles positioning             |
-| `.embed--DocumentWidgetHeader`    | Header section of the signing widget                                    |
-| `.embed--DocumentWidgetContent`   | Main content area of the signing widget                                 |
-| `.embed--DocumentWidgetForm`      | Form section within the signing widget                                  |
-| `.embed--DocumentWidgetFooter`    | Footer section of the signing widget                                    |
-| `.embed--WaitingForTurn`          | Container for the waiting screen when it's not the user's turn to sign  |
-| `.embed--DocumentCompleted`       | Container for the completion screen after signing                       |
-| `.field--FieldRootContainer`      | Base container for document fields (signatures, text, checkboxes, etc.) |
-
-Field components also expose several data attributes that can be used for styling different states:
-
-| Data Attribute      | Values                                         | Description                          |
-| ------------------- | ---------------------------------------------- | ------------------------------------ |
-| `[data-field-type]` | `SIGNATURE`, `TEXT`, `CHECKBOX`, `RADIO`, etc. | The type of field                    |
-| `[data-inserted]`   | `true`, `false`                                | Whether the field has been filled    |
-| `[data-validate]`   | `true`, `false`                                | Whether the field is being validated |
-
-### Field Styling Example
-
-```css
-/* Style all field containers */
-.field--FieldRootContainer {
-  transition: all 200ms ease;
-}
-
-/* Style specific field types */
-.field--FieldRootContainer[data-field-type='SIGNATURE'] {
-  background-color: rgba(0, 0, 0, 0.02);
-}
-
-/* Style inserted fields */
-.field--FieldRootContainer[data-inserted='true'] {
-  background-color: var(--primary);
-  opacity: 0.2;
-}
-
-/* Style fields being validated */
-.field--FieldRootContainer[data-validate='true'] {
-  border-color: orange;
-}
-```
-
-### Example Usage
-
-```css
-/* Custom styles for the document widget */
-.embed--DocumentWidget {
-  background-color: #ffffff;
-  box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1);
-}
-
-/* Custom styles for the waiting screen */
-.embed--WaitingForTurn {
-  background-color: #f9fafb;
-  padding: 2rem;
-}
-
-/* Responsive adjustments for the document container */
-@media (min-width: 768px) {
-  .embed--DocumentContainer {
-    gap: 2rem;
-  }
-}
-```
-
 ## Related

 - [React Integration](/developers/embedding/react)
@@ -73,15 +73,14 @@ These customization options are available for both Direct Templates and Signing

 We support embedding across a range of popular JavaScript frameworks, including:

-| Framework        | Package                                                                                      |
-| ---------        | ----------------------------------------------------------------------------------           |
-| React            | [@documenso/embed-react](https://www.npmjs.com/package/@documenso/embed-react)               |
-| Preact           | [@documenso/embed-preact](https://www.npmjs.com/package/@documenso/embed-preact)             |
-| Vue              | [@documenso/embed-vue](https://www.npmjs.com/package/@documenso/embed-vue)                   |
-| Svelte           | [@documenso/embed-svelte](https://www.npmjs.com/package/@documenso/embed-svelte)             |
-| Solid            | [@documenso/embed-solid](https://www.npmjs.com/package/@documenso/embed-solid)               |
-| Angular          | [@documenso/embed-angular](https://www.npmjs.com/package/@documenso/embed-angular)           |
-| Web Components   | [@documenso/embed-webcomponent](https://www.npmjs.com/package/@documenso/embed-webcomponent) |
+| Framework | Package                                                                            |
+| --------- | ---------------------------------------------------------------------------------- |
+| React     | [@documenso/embed-react](https://www.npmjs.com/package/@documenso/embed-react)     |
+| Preact    | [@documenso/embed-preact](https://www.npmjs.com/package/@documenso/embed-preact)   |
+| Vue       | [@documenso/embed-vue](https://www.npmjs.com/package/@documenso/embed-vue)         |
+| Svelte    | [@documenso/embed-svelte](https://www.npmjs.com/package/@documenso/embed-svelte)   |
+| Solid     | [@documenso/embed-solid](https://www.npmjs.com/package/@documenso/embed-solid)     |
+| Angular   | [@documenso/embed-angular](https://www.npmjs.com/package/@documenso/embed-angular) |

 Additionally, we provide **web components** for more generalized use. However, please note that web components are still in their early stages and haven't been extensively tested.

@@ -167,7 +166,6 @@ Once you've obtained the appropriate tokens, you can integrate the signing exper
 - [Svelte](/developers/embedding/svelte)
 - [Solid](/developers/embedding/solid)
 - [Angular](/developers/embedding/angular)
- [Web Components](/developers/embedding/web-components)

 If you're using **web components**, the integration process is slightly different. Keep in mind that web components are currently less tested but can still provide flexibility for general use cases.

@@ -179,5 +177,4 @@ If you're using **web components**, the integration process is slightly differen
 - [Solid Integration](/developers/embedding/solid)
 - [Preact Integration](/developers/embedding/preact)
 - [Angular Integration](/developers/embedding/angular)
- [Web Components](/developers/embedding/web-components)
 - [CSS Variables](/developers/embedding/css-variables)
@@ -1,89 +0,0 @@
---
-title: Web Components Integration
-description: Learn how to use our embedding SDK via Web Components on a framework-less web application.
---
-
-# Web Components Integration
-
-Our Web Components SDK provides a simple way to embed a signing experience within your framework-less web application. It supports both direct link templates and signing tokens.
-
-## Installation
-
-To install the SDK, run the following command:
-
-```bash
-npm install @documenso/embed-webcomponent
-```
-
-Then in your html file, add the following to add the script, replacing the path with the proper path to the web component script.
-
-```html
-<script src="YOUR_PATH_HERE"></script>
-```
-
-## Usage
-
-To embed a signing experience, you'll need to provide the token for the document you want to embed. This can be done in a few different ways, depending on your use case.
-
-### Direct Link Template
-
-If you have a direct link template, you can simply provide the token for the template to the `documenso-embed-direct-template` tag.
-
-```html
-<documenso-embed-direct-template
-  token="YOUR_TOKEN_HERE"
-</documenso-embed-direct-template>
-```
-
-#### Attributes
-
-| Attribute                | Type                | Description                                                                                |
-| ------------------- | ------------------- | ------------------------------------------------------------------------------------------ |
-| token               | string              | The token for the document you want to embed                                               |
-| host                | string (optional)   | The host to be used for the signing experience, relevant for self-hosters                  |
-| name                | string (optional)   | The name the signer that will be used by default for signing                               |
-| lockName            | boolean (optional)  | Whether or not the name field should be locked disallowing modifications                   |
-| email               | string (optional)   | The email the signer that will be used by default for signing                              |
-| lockEmail           | boolean (optional)  | Whether or not the email field should be locked disallowing modifications                  |
-| onDocumentReady     | function (optional) | A callback function that will be called when the document is loaded and ready to be signed |
-| onDocumentCompleted | function (optional) | A callback function that will be called when the document has been completed               |
-| onDocumentError     | function (optional) | A callback function that will be called when an error occurs with the document             |
-| onFieldSigned       | function (optional) | A callback function that will be called when a field is signed                             |
-| onFieldUnsigned     | function (optional) | A callback function that will be called when a field is unsigned                           |
-
-### Signing Token
-
-If you have a signing token, you can provide it to the `documenso-embed-sign-document` tag.
-
-```html
-<documenso-embed-sign-document
-  token="YOUR_TOKEN_HERE"
-</documenso-embed-sign-document>
-```
-
-#### Attributes
-
-| Attribute                | Type                | Description                                                                                |
-| ------------------- | ------------------- | ------------------------------------------------------------------------------------------ |
-| token               | string              | The token for the document you want to embed                                               |
-| host                | string (optional)   | The host to be used for the signing experience, relevant for self-hosters                  |
-| name                | string (optional)   | The name the signer that will be used by default for signing                               |
-| lockName            | boolean (optional)  | Whether or not the name field should be locked disallowing modifications                   |
-| onDocumentReady     | function (optional) | A callback function that will be called when the document is loaded and ready to be signed |
-| onDocumentCompleted | function (optional) | A callback function that will be called when the document has been completed               |
-| onDocumentError     | function (optional) | A callback function that will be called when an error occurs with the document             |
-
-### Creating via JavaScript
-
-You can also create the tag element using javascript, for dynamic generation of either modes. For example, this would add the sign document embed to the DOM.
-
-```javascript
-document.getElementById('my-wrapper-here').innerHTML = '';
-
-const tag = document.createElement('documenso-embed-sign-document');
-tag.setAttribute('token', data.token);
-tag.style.width = '100%';
-tag.style.height = '100%';
-
-document.getElementById('my-wrapper-here').appendChild(tag);
-```
@@ -3,8 +3,6 @@ title: Public API
 description: Learn how to interact with your documents programmatically using the Documenso public API.
 ---

-import { Callout, Steps } from 'nextra/components';
-
 # Public API

 Documenso provides a public REST API enabling you to interact with your documents programmatically. The API exposes various HTTP endpoints that allow you to perform operations such as:
@@ -15,35 +13,10 @@ Documenso provides a public REST API enabling you to interact with your document

 The documentation walks you through creating API keys and using them to authenticate your API requests. You'll also learn about the available endpoints, request and response formats, and how to use the API.

-## API V1 - Stable
+## Swagger Documentation

-Check out the [API V1 documentation](https://app.documenso.com/api/v1/openapi) for details about the API endpoints, request parameters, response formats, and authentication methods.
-
-## API V2 - Beta
-
-<Callout type="warning">API V2 is currently beta, and will be subject to breaking changes</Callout>
-
-Check out the [API V2 documentation](https://documen.so/api-v2-docs) for details about the API endpoints, request parameters, response formats, and authentication methods.
-
-Our new API V2 supports the following typed SDKs:
-
- [TypeScript](https://github.com/documenso/sdk-typescript)
- [Python](https://github.com/documenso/sdk-python)
- [Go](https://github.com/documenso/sdk-go)
-
-<Callout type="info">
-  For the staging API, please use the following base URL:
-  `https://stg-app.documenso.dev/api/v2-beta/`
-</Callout>
-
-🚀 [V2 Announcement](https://documen.so/sdk-blog)
-
-📖 [Documentation](https://documen.so/api-v2-docs)
-
-💬 [Leave Feedback](https://documen.so/sdk-feedback)
-
-🔔 [Breaking Changes](https://documen.so/sdk-breaking)
+The [Swagger documentation](https://app.documenso.com/api/v1/openapi) also provides information about the API endpoints, request parameters, response formats, and authentication methods.

 ## Availability

-The API is available to individual users, teams and higher plans. [Fair Use](https://documen.so/fair) applies.
+The API is available to individual users and teams.
@@ -85,13 +85,12 @@ You can also set the recipient's role, which determines their actions and permis

 Documenso has 4 roles for recipients with different permissions and actions.

-|   Role    |                                    Function                                     | Action required | Signature |
-| :-------: | :-----------------------------------------------------------------------------: | :-------------: | :-------: |
-|  Signer   |                Needs to sign signatures fields assigned to them.                |       Yes       |    Yes    |
-| Approver  |          Needs to approve the document as a whole. Signature optional.          |       Yes       | Optional  |
-|  Viewer   |                   Needs to confirm they viewed the document.                    |       Yes       |    No     |
-| Assistant | Can help prepare the document by filling in fields on behalf of other signers.  |       Yes       |    No     |
-|    CC     | Receives a copy of the signed document after completion. No action is required. |       No        |    No     |
+|   Role   |                                    Function                                     | Action required | Signature |
+| :------: | :-----------------------------------------------------------------------------: | :-------------: | :-------: |
+|  Signer  |                Needs to sign signatures fields assigned to them.                |       Yes       |    Yes    |
+| Approver |          Needs to approve the document as a whole. Signature optional.          |       Yes       | Optional  |
+|  Viewer  |                   Needs to confirm they viewed the document.                    |       Yes       |    No     |
+|   BCC    | Receives a copy of the signed document after completion. No action is required. |       No        |    No     |

 ### Fields

@@ -1,6 +1,6 @@
 {
  "name": "@documenso/web",
-  "version": "1.9.1-rc.7",
+  "version": "1.9.0-rc.11",
  "private": true,
  "license": "AGPL-3.0",
  "scripts": {
@@ -0,0 +1,73 @@
+'use client';
+
+import { DateTime } from 'luxon';
+import type { TooltipProps } from 'recharts';
+import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
+import type { NameType, ValueType } from 'recharts/types/component/DefaultTooltipContent';
+
+import type { GetMonthlyActiveUsersResult } from '@documenso/lib/server-only/admin/get-users-stats';
+
+export type MonthlyActiveUsersChartProps = {
+  className?: string;
+  title: string;
+  cummulative?: boolean;
+  data: GetMonthlyActiveUsersResult;
+};
+
+const CustomTooltip = ({ active, payload, label }: TooltipProps<ValueType, NameType>) => {
+  if (active && payload && payload.length) {
+    return (
+      <div className="z-100 w-60 space-y-1 rounded-md border border-solid bg-white p-2 px-3">
+        <p>{label}</p>
+        <p className="text-documenso">
+          {payload[0].name === 'cume_count' ? 'Cumulative MAU' : 'Monthly Active Users'}:{' '}
+          <span className="text-black">{Number(payload[0].value).toLocaleString('en-US')}</span>
+        </p>
+      </div>
+    );
+  }
+
+  return null;
+};
+
+export const MonthlyActiveUsersChart = ({
+  className,
+  data,
+  title,
+  cummulative = false,
+}: MonthlyActiveUsersChartProps) => {
+  const formattedData = [...data].reverse().map(({ month, count, cume_count }) => {
+    return {
+      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('MMM yyyy'),
+      count: Number(count),
+      cume_count: Number(cume_count),
+    };
+  });
+
+  return (
+    <div className={className}>
+      <div className="border-border flex flex-1 flex-col justify-center rounded-2xl border p-6 pl-2">
+        <div className="mb-6 flex px-4">
+          <h3 className="text-lg font-semibold">{title}</h3>
+        </div>
+
+        <ResponsiveContainer width="100%" height={400}>
+          <BarChart data={formattedData}>
+            <XAxis dataKey="month" />
+            <YAxis />
+
+            <Tooltip content={<CustomTooltip />} cursor={{ fill: 'hsl(var(--primary) / 10%)' }} />
+
+            <Bar
+              dataKey={cummulative ? 'cume_count' : 'count'}
+              fill="hsl(var(--primary))"
+              radius={[4, 4, 0, 0]}
+              maxBarSize={60}
+              label={cummulative ? 'Cumulative MAU' : 'Monthly Active Users'}
+            />
+          </BarChart>
+        </ResponsiveContainer>
+      </div>
+    </div>
+  );
+};
@@ -18,6 +18,7 @@ import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getDocumentStats } from '@documenso/lib/server-only/admin/get-documents-stats';
 import { getRecipientsStats } from '@documenso/lib/server-only/admin/get-recipients-stats';
 import {
+  getMonthlyActiveUsers,
  getUserWithSignedDocumentMonthlyGrowth,
  getUsersCount,
  getUsersWithSubscriptionsCount,
@@ -26,6 +27,7 @@ import { getSignerConversionMonthly } from '@documenso/lib/server-only/user/get-

 import { CardMetric } from '~/components/(dashboard)/metric-card/metric-card';

+import { MonthlyActiveUsersChart } from './monthly-active-users-chart';
 import { SignerConversionChart } from './signer-conversion-chart';
 import { UserWithDocumentChart } from './user-with-document';

@@ -43,6 +45,7 @@ export default async function AdminStatsPage() {
    // userWithAtLeastOneDocumentPerMonth,
    // userWithAtLeastOneDocumentSignedPerMonth,
    MONTHLY_USERS_SIGNED,
+    MONTHLY_ACTIVE_USERS,
  ] = await Promise.all([
    getUsersCount(),
    getUsersWithSubscriptionsCount(),
@@ -52,6 +55,7 @@ export default async function AdminStatsPage() {
    // getUserWithAtLeastOneDocumentPerMonth(),
    // getUserWithAtLeastOneDocumentSignedPerMonth(),
    getUserWithSignedDocumentMonthlyGrowth(),
+    getMonthlyActiveUsers(),
  ]);

  return (
@@ -68,7 +72,6 @@ export default async function AdminStatsPage() {
          title={_(msg`Active Subscriptions`)}
          value={usersWithSubscriptionsCount}
        />
-
        <CardMetric
          icon={FileCog}
          title={_(msg`App Version`)}
@@ -132,6 +135,14 @@ export default async function AdminStatsPage() {
          <Trans>Charts</Trans>
        </h3>
        <div className="mt-5 grid grid-cols-2 gap-8">
+          <MonthlyActiveUsersChart title={_(msg`MAU (signed in)`)} data={MONTHLY_ACTIVE_USERS} />
+
+          <MonthlyActiveUsersChart
+            title={_(msg`Cumulative MAU (signed in)`)}
+            data={MONTHLY_ACTIVE_USERS}
+            cummulative
+          />
+
          <UserWithDocumentChart
            data={MONTHLY_USERS_SIGNED}
            title={_(msg`MAU (created document)`)}
@@ -1,8 +1,8 @@
 'use client';

 import { DateTime } from 'luxon';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 import type { TooltipProps } from 'recharts';
+import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 import type { NameType, ValueType } from 'recharts/types/component/DefaultTooltipContent';

 import type { GetUserWithDocumentMonthlyGrowth } from '@documenso/lib/server-only/admin/get-users-stats';
@@ -23,7 +23,7 @@ const CustomTooltip = ({
 }: TooltipProps<ValueType, NameType> & { tooltip?: string }) => {
  if (active && payload && payload.length) {
    return (
-      <div className="z-100 w-60 space-y-1 rounded-md border border-solid  bg-white p-2 px-3">
+      <div className="z-100 w-60 space-y-1 rounded-md border border-solid bg-white p-2 px-3">
        <p className="">{label}</p>
        <p className="text-documenso">
          {`${tooltip} : `}
@@ -12,14 +12,13 @@ import {
  MailOpenIcon,
  PenIcon,
  PlusIcon,
-  UserIcon,
 } from 'lucide-react';
 import { match } from 'ts-pattern';

 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import { formatSigningLink } from '@documenso/lib/utils/recipients';
-import type { Document, Recipient } from '@documenso/prisma/client';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import type { Document, Recipient } from '@documenso/prisma/client';
 import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
 import { SignatureIcon } from '@documenso/ui/icons/signature';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
@@ -121,12 +120,6 @@ export const DocumentPageViewRecipients = ({
                          <Trans>Viewed</Trans>
                        </>
                      ))
-                      .with(RecipientRole.ASSISTANT, () => (
-                        <>
-                          <UserIcon className="mr-1 h-3 w-3" />
-                          <Trans>Assisted</Trans>
-                        </>
-                      ))
                      .exhaustive()}
                  </Badge>
                )}
@@ -162,7 +162,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
        </DropdownMenuItem>

        {/* We don't want to allow teams moving documents across at the moment. */}
-        {!team && !row.teamId && (
+        {!team && (
          <DropdownMenuItem onClick={() => setMoveDialogOpen(true)}>
            <MoveRight className="mr-2 h-4 w-4" />
            <Trans>Move to Team</Trans>
@@ -40,7 +40,7 @@ export const MoveDocumentDialog = ({ documentId, open, onOpenChange }: MoveDocum

  const [selectedTeamId, setSelectedTeamId] = useState<number | null>(null);

-  const { data: teams, isPending: isLoadingTeams } = trpc.team.getTeams.useQuery();
+  const { data: teams, isLoading: isLoadingTeams } = trpc.team.getTeams.useQuery();

  const { mutateAsync: moveDocument, isPending } = trpc.document.moveDocumentToTeam.useMutation({
    onSuccess: () => {
@@ -81,7 +81,7 @@ export const DataTableActionDropdown = ({
          <Trans>Direct link</Trans>
        </DropdownMenuItem>

-        {!teamId && !row.teamId && (
+        {!teamId && (
          <DropdownMenuItem onClick={() => setMoveDialogOpen(true)}>
            <MoveRight className="mr-2 h-4 w-4" />
            <Trans>Move to Team</Trans>
@@ -42,7 +42,7 @@ export const MoveTemplateDialog = ({ templateId, open, onOpenChange }: MoveTempl

  const [selectedTeamId, setSelectedTeamId] = useState<number | null>(null);

-  const { data: teams, isPending: isLoadingTeams } = trpc.team.getTeams.useQuery();
+  const { data: teams, isLoading: isLoadingTeams } = trpc.team.getTeams.useQuery();
  const { mutateAsync: moveTemplate, isPending } = trpc.template.moveTemplateToTeam.useMutation({
    onSuccess: () => {
      router.refresh();
@@ -77,11 +77,7 @@ export const TemplateDirectLinkDialog = ({
  );

  const validDirectTemplateRecipients = useMemo(
-    () =>
-      template.recipients.filter(
-        (recipient) =>
-          recipient.role !== RecipientRole.CC && recipient.role !== RecipientRole.ASSISTANT,
-      ),
+    () => template.recipients.filter((recipient) => recipient.role !== RecipientRole.CC),
    [template.recipients],
  );

@@ -47,7 +47,6 @@ import { NameField } from '~/app/(signing)/sign/[token]/name-field';
 import { NumberField } from '~/app/(signing)/sign/[token]/number-field';
 import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
 import { RadioField } from '~/app/(signing)/sign/[token]/radio-field';
-import { RecipientProvider } from '~/app/(signing)/sign/[token]/recipient-context';
 import { SignDialog } from '~/app/(signing)/sign/[token]/sign-dialog';
 import { SignatureField } from '~/app/(signing)/sign/[token]/signature-field';
 import { TextField } from '~/app/(signing)/sign/[token]/text-field';
@@ -170,7 +169,7 @@ export const SignDirectTemplateForm = ({
  };

  return (
-    <RecipientProvider recipient={directRecipient}>
+    <>
      <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />

      <DocumentFlowFormContainerContent>
@@ -187,15 +186,16 @@ export const SignDirectTemplateForm = ({
                <SignatureField
                  key={field.id}
                  field={field}
+                  recipient={directRecipient}
                  onSignField={onSignField}
                  onUnsignField={onUnsignField}
-                  typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
                />
              ))
              .with(FieldType.INITIALS, () => (
                <InitialsField
                  key={field.id}
                  field={field}
+                  recipient={directRecipient}
                  onSignField={onSignField}
                  onUnsignField={onUnsignField}
                />
@@ -204,6 +204,7 @@ export const SignDirectTemplateForm = ({
                <NameField
                  key={field.id}
                  field={field}
+                  recipient={directRecipient}
                  onSignField={onSignField}
                  onUnsignField={onUnsignField}
                />
@@ -212,6 +213,7 @@ export const SignDirectTemplateForm = ({
                <DateField
                  key={field.id}
                  field={field}
+                  recipient={directRecipient}
                  dateFormat={template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
                  timezone={template.templateMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}
                  onSignField={onSignField}
@@ -222,6 +224,7 @@ export const SignDirectTemplateForm = ({
                <EmailField
                  key={field.id}
                  field={field}
+                  recipient={directRecipient}
                  onSignField={onSignField}
                  onUnsignField={onUnsignField}
                />
@@ -238,6 +241,7 @@ export const SignDirectTemplateForm = ({
                      ...field,
                      fieldMeta: parsedFieldMeta,
                    }}
+                    recipient={directRecipient}
                    onSignField={onSignField}
                    onUnsignField={onUnsignField}
                  />
@@ -255,6 +259,7 @@ export const SignDirectTemplateForm = ({
                      ...field,
                      fieldMeta: parsedFieldMeta,
                    }}
+                    recipient={directRecipient}
                    onSignField={onSignField}
                    onUnsignField={onUnsignField}
                  />
@@ -272,6 +277,7 @@ export const SignDirectTemplateForm = ({
                      ...field,
                      fieldMeta: parsedFieldMeta,
                    }}
+                    recipient={directRecipient}
                    onSignField={onSignField}
                    onUnsignField={onUnsignField}
                  />
@@ -289,6 +295,7 @@ export const SignDirectTemplateForm = ({
                      ...field,
                      fieldMeta: parsedFieldMeta,
                    }}
+                    recipient={directRecipient}
                    onSignField={onSignField}
                    onUnsignField={onUnsignField}
                  />
@@ -306,6 +313,7 @@ export const SignDirectTemplateForm = ({
                      ...field,
                      fieldMeta: parsedFieldMeta,
                    }}
+                    recipient={directRecipient}
                    onSignField={onSignField}
                    onUnsignField={onUnsignField}
                  />
@@ -343,7 +351,6 @@ export const SignDirectTemplateForm = ({
                    onChange={(value) => {
                      setSignature(value);
                    }}
-                    allowTypedSignature={template.templateMeta?.typedSignatureEnabled}
                  />
                </CardContent>
              </Card>
@@ -376,6 +383,6 @@ export const SignDirectTemplateForm = ({
          />
        </div>
      </DocumentFlowFormContainerFooter>
-    </RecipientProvider>
+    </>
  );
 };
@@ -1,73 +0,0 @@
-import { Trans } from '@lingui/macro';
-
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-
-import { SigningDisclosure } from '~/components/general/signing-disclosure';
-
-type ConfirmationDialogProps = {
-  isOpen: boolean;
-  onClose: () => void;
-  onConfirm: () => void;
-  hasUninsertedFields: boolean;
-  isSubmitting: boolean;
-};
-
-export function AssistantConfirmationDialog({
-  isOpen,
-  onClose,
-  onConfirm,
-  hasUninsertedFields,
-  isSubmitting,
-}: ConfirmationDialogProps) {
-  const onOpenChange = () => {
-    if (isSubmitting) {
-      return;
-    }
-
-    onClose();
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Complete Document</Trans>
-          </DialogTitle>
-          <DialogDescription>
-            <Trans>
-              Are you sure you want to complete the document? This action cannot be undone. Please
-              ensure that you have completed prefilling all relevant fields before proceeding.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className="flex flex-col gap-4">
-          <SigningDisclosure />
-        </div>
-
-        <DialogFooter className="mt-4">
-          <Button variant="secondary" onClick={onClose} disabled={isSubmitting}>
-            Cancel
-          </Button>
-          <Button
-            variant={hasUninsertedFields ? 'destructive' : 'default'}
-            onClick={onConfirm}
-            disabled={isSubmitting}
-            loading={isSubmitting}
-          >
-            {isSubmitting ? 'Submitting...' : hasUninsertedFields ? 'Proceed' : 'Continue'}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}
@@ -13,6 +13,7 @@ import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZCheckboxFieldMeta } from '@documenso/lib/types/field-meta';
 import { fromCheckboxValue, toCheckboxValue } from '@documenso/lib/universal/field-checkbox';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -26,30 +27,29 @@ import { Label } from '@documenso/ui/primitives/label';
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type CheckboxFieldProps = {
  field: FieldWithSignatureAndFieldMeta;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFieldProps) => {
+export const CheckboxField = ({
+  field,
+  recipient,
+  onSignField,
+  onUnsignField,
+}: CheckboxFieldProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const router = useRouter();
  const [isPending, startTransition] = useTransition();
  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();

-  const parsedFieldMeta = ZCheckboxFieldMeta.parse(
-    field.fieldMeta ?? {
-      type: 'checkbox',
-      values: [{ id: 1, checked: false, value: '' }],
-    },
-  );
+  const parsedFieldMeta = ZCheckboxFieldMeta.parse(field.fieldMeta);

  const values = parsedFieldMeta.values?.map((item) => ({
    ...item,
@@ -122,9 +122,7 @@ export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFie

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -153,7 +151,7 @@ export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFie

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
@@ -185,25 +183,28 @@ export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFie
          ...checkedValues,
          item.value.length > 0 ? item.value : `empty-value-${item.id}`,
        ];
+
+        await removeSignedFieldWithToken({
+          token: recipient.token,
+          fieldId: field.id,
+        });
+
+        if (isLengthConditionMet) {
+          await signFieldWithToken({
+            token: recipient.token,
+            fieldId: field.id,
+            value: toCheckboxValue(checkedValues),
+            isBase64: true,
+          });
+        }
      } else {
        updatedValues = checkedValues.filter(
          (v) => v !== item.value && v !== `empty-value-${item.id}`,
        );
-      }

-      setCheckedValues(updatedValues);
-
-      await removeSignedFieldWithToken({
-        token: recipient.token,
-        fieldId: field.id,
-      });
-
-      if (updatedValues.length > 0) {
-        await signFieldWithToken({
+        await removeSignedFieldWithToken({
          token: recipient.token,
          fieldId: field.id,
-          value: toCheckboxValue(updatedValues),
-          isBase64: true,
        });
      }
    } catch (err) {
@@ -215,6 +216,7 @@ export const CheckboxField = ({ field, onSignField, onUnsignField }: CheckboxFie
        variant: 'destructive',
      });
    } finally {
+      setCheckedValues(updatedValues);
      startTransition(() => router.refresh());
    }
  };
@@ -4,6 +4,7 @@ import { notFound } from 'next/navigation';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { CheckCircle2, Clock8 } from 'lucide-react';
+import { getServerSession } from 'next-auth';
 import { env } from 'next-runtime-env';
 import { match } from 'ts-pattern';

@@ -15,12 +16,10 @@ import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-re
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
-import { getNextInboxDocument } from '@documenso/lib/server-only/user/get-next-inbox-document';
 import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
 import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/client';
 import { DocumentDownloadButton } from '@documenso/ui/components/document/document-download-button';
 import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
-import { NextInboxItemButton } from '@documenso/ui/components/document/next-inbox-item-button';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';
 import { cn } from '@documenso/ui/lib/utils';
 import { Badge } from '@documenso/ui/primitives/badge';
@@ -62,10 +61,9 @@ export default async function CompletedSigningPage({

  const { documentData } = document;

-  const [fields, recipient, nextInboxDocument] = await Promise.all([
+  const [fields, recipient] = await Promise.all([
    getFieldsForToken({ token }),
    getRecipientByToken({ token }).catch(() => null),
-    getNextInboxDocument({ email: user?.email }).catch(() => null),
  ]);

  if (!recipient) {
@@ -93,7 +91,8 @@ export default async function CompletedSigningPage({
    fields.find((field) => field.type === FieldType.NAME)?.customText ||
    recipient.email;

-  const isLoggedIn = !!user;
+  const sessionData = await getServerSession();
+  const isLoggedIn = !!sessionData?.user;
  const canSignUp = !isExistingUser && NEXT_PUBLIC_DISABLE_SIGNUP !== 'true';

  return (
@@ -183,16 +182,12 @@ export default async function CompletedSigningPage({
              </p>
            ))}

-          <div
-            className={cn('mt-8 flex w-full items-center justify-center gap-4', {
-              'max-w-sm': !nextInboxDocument,
-            })}
-          >
+          <div className="mt-8 flex w-full max-w-sm items-center justify-center gap-4">
            <DocumentShareButton documentId={document.id} token={recipient.token} />

            {document.status === DocumentStatus.COMPLETED ? (
              <DocumentDownloadButton
-                className="flex-1 text-xs"
+                className="flex-1"
                fileName={document.title}
                documentData={documentData}
                disabled={document.status !== DocumentStatus.COMPLETED}
@@ -204,15 +199,6 @@ export default async function CompletedSigningPage({
                documentData={documentData}
              />
            )}
-
-            {isLoggedIn && nextInboxDocument && (
-              <NextInboxItemButton
-                className="text-xs"
-                userEmail={user?.email}
-                documentData={documentData}
-                nextInboxDocument={nextInboxDocument}
-              />
-            )}
          </div>
        </div>

@@ -234,7 +220,7 @@ export default async function CompletedSigningPage({
          )}

          {isLoggedIn && (
-            <Link href="/documents" className="text-documenso-700 hover:text-documenso-600 mt-4">
+            <Link href="/documents" className="text-documenso-700 hover:text-documenso-600 mt-2">
              <Trans>Go Back Home</Trans>
            </Link>
          )}
@@ -17,6 +17,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZDateFieldMeta } from '@documenso/lib/types/field-meta';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -26,11 +27,11 @@ import type {
 import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type DateFieldProps = {
  field: FieldWithSignature;
+  recipient: Recipient;
  dateFormat?: string | null;
  timezone?: string | null;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
@@ -39,17 +40,17 @@ export type DateFieldProps = {

 export const DateField = ({
  field,
+  recipient,
  dateFormat = DEFAULT_DOCUMENT_DATE_FORMAT,
  timezone = DEFAULT_DOCUMENT_TIME_ZONE,
  onSignField,
  onUnsignField,
 }: DateFieldProps) => {
  const router = useRouter();
+
  const { _ } = useLingui();
  const { toast } = useToast();

-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();
-
  const [isPending, startTransition] = useTransition();

  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
@@ -66,7 +67,9 @@ export const DateField = ({
  const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;

  const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);
+
  const isDifferentTime = field.inserted && localDateString !== field.customText;
+
  const tooltipText = _(
    msg`"${field.customText}" will appear on the document as it has a timezone of "${timezone}".`,
  );
@@ -99,9 +102,7 @@ export const DateField = ({

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -127,7 +128,7 @@ export const DateField = ({

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
@@ -12,6 +12,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZDropdownFieldMeta } from '@documenso/lib/types/field-meta';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -29,19 +30,23 @@ import {
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type DropdownFieldProps = {
  field: FieldWithSignatureAndFieldMeta;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const DropdownField = ({ field, onSignField, onUnsignField }: DropdownFieldProps) => {
+export const DropdownField = ({
+  field,
+  recipient,
+  onSignField,
+  onUnsignField,
+}: DropdownFieldProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const router = useRouter();
  const [isPending, startTransition] = useTransition();
@@ -98,9 +103,7 @@ export const DropdownField = ({ field, onSignField, onUnsignField }: DropdownFie

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -131,7 +134,7 @@ export const DropdownField = ({ field, onSignField, onUnsignField }: DropdownFie

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
@@ -12,6 +12,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZEmailFieldMeta } from '@documenso/lib/types/field-meta';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -22,23 +23,22 @@ import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredSigningContext } from './provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type EmailFieldProps = {
  field: FieldWithSignature;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const EmailField = ({ field, onSignField, onUnsignField }: EmailFieldProps) => {
+export const EmailField = ({ field, recipient, onSignField, onUnsignField }: EmailFieldProps) => {
  const router = useRouter();

  const { _ } = useLingui();
  const { toast } = useToast();

  const { email: providedEmail } = useRequiredSigningContext();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const [isPending, startTransition] = useTransition();

@@ -86,9 +86,7 @@ export const EmailField = ({ field, onSignField, onUnsignField }: EmailFieldProp

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -114,7 +112,7 @@ export const EmailField = ({ field, onSignField, onUnsignField }: EmailFieldProp

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
@@ -1,22 +1,19 @@
 'use client';

-import { useId, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';

 import { useRouter } from 'next/navigation';

-import { Trans, msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/macro';
 import { useSession } from 'next-auth/react';
-import { Controller, useForm } from 'react-hook-form';
+import { useForm } from 'react-hook-form';

 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
 import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
-import type { Recipient } from '@documenso/prisma/client';
-import { type Field, FieldType, RecipientRole } from '@documenso/prisma/client';
-import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
+import { type Field, FieldType, type Recipient, RecipientRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { cn } from '@documenso/ui/lib/utils';
@@ -24,11 +21,8 @@ import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
-import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
-import { useToast } from '@documenso/ui/primitives/use-toast';

-import { AssistantConfirmationDialog } from './assistant/assistant-confirmation-dialog';
 import { useRequiredSigningContext } from './provider';
 import { SignDialog } from './sign-dialog';

@@ -38,8 +32,6 @@ export type SigningFormProps = {
  fields: Field[];
  redirectUrl?: string | null;
  isRecipientsTurn: boolean;
-  allRecipients?: RecipientWithFields[];
-  setSelectedSignerId?: (id: number | null) => void;
 };

 export const SigningForm = ({
@@ -48,35 +40,19 @@ export const SigningForm = ({
  fields,
  redirectUrl,
  isRecipientsTurn,
-  allRecipients = [],
-  setSelectedSignerId,
 }: SigningFormProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
  const router = useRouter();
  const analytics = useAnalytics();
-
  const { data: session } = useSession();

-  const assistantSignersId = useId();
-
  const { fullName, signature, setFullName, setSignature, signatureValid, setSignatureValid } =
    useRequiredSigningContext();

  const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
-  const [isConfirmationDialogOpen, setIsConfirmationDialogOpen] = useState(false);
-  const [isAssistantSubmitting, setIsAssistantSubmitting] = useState(false);

  const { mutateAsync: completeDocumentWithToken } =
    trpc.recipient.completeDocumentWithToken.useMutation();

-  const assistantForm = useForm<{ selectedSignerId: number | undefined }>({
-    defaultValues: {
-      selectedSignerId: undefined,
-    },
-  });
-
  const { handleSubmit, formState } = useForm();

  // Keep the loading state going if successful since the redirect may take some time.
@@ -91,11 +67,7 @@ export const SigningForm = ({

  const uninsertedFields = useMemo(() => {
    return sortFieldsByPosition(fieldsRequiringValidation.filter((field) => !field.inserted));
-  }, [fieldsRequiringValidation]);
-
-  const uninsertedRecipientFields = useMemo(() => {
-    return fieldsRequiringValidation.filter((field) => field.recipientId === recipient.id);
-  }, [fieldsRequiringValidation, recipient]);
+  }, [fields]);

  const fieldsValidated = () => {
    setValidateUninsertedFields(true);
@@ -116,31 +88,12 @@ export const SigningForm = ({
    }

    await completeDocument();
-  };

-  const onAssistantFormSubmit = () => {
-    if (uninsertedRecipientFields.length > 0) {
-      return;
-    }
-
-    setIsConfirmationDialogOpen(true);
-  };
-
-  const handleAssistantConfirmDialogSubmit = async () => {
-    setIsAssistantSubmitting(true);
-
-    try {
-      await completeDocument();
-    } catch (err) {
-      toast({
-        title: 'Error',
-        description: 'An error occurred while completing the document. Please try again.',
-        variant: 'destructive',
-      });
-
-      setIsAssistantSubmitting(false);
-      setIsConfirmationDialogOpen(false);
-    }
+    // Reauth is currently not required for completing the document.
+    // await executeActionAuthProcedure({
+    //   onReauthFormSubmit: completeDocument,
+    //   actionTarget: 'DOCUMENT',
+    // });
  };

  const completeDocument = async (authOptions?: TRecipientActionAuth) => {
@@ -160,7 +113,7 @@ export const SigningForm = ({
  };

  return (
-    <div
+    <form
      className={cn(
        'dark:bg-background border-border bg-widget sticky flex h-full flex-col rounded-xl border px-4 py-6',
        {
@@ -168,6 +121,7 @@ export const SigningForm = ({
          'top-4 max-h-[min(68rem,calc(100vh-2rem))]': !session,
        },
      )}
+      onSubmit={handleSubmit(onFormSubmit)}
    >
      {validateUninsertedFields && uninsertedFields[0] && (
        <FieldToolTip key={uninsertedFields[0].id} field={uninsertedFields[0]} color="warning">
@@ -175,13 +129,17 @@ export const SigningForm = ({
        </FieldToolTip>
      )}

-      <div className="custom-scrollbar -mx-2 flex flex-1 flex-col overflow-y-auto overflow-x-hidden px-2">
-        <div className="flex flex-1 flex-col">
+      <fieldset
+        disabled={isSubmitting}
+        className={cn(
+          'custom-scrollbar -mx-2 flex flex-1 flex-col overflow-y-auto overflow-x-hidden px-2',
+        )}
+      >
+        <div className={cn('flex flex-1 flex-col')}>
          <h3 className="text-foreground text-2xl font-semibold">
            {recipient.role === RecipientRole.VIEWER && <Trans>View Document</Trans>}
            {recipient.role === RecipientRole.SIGNER && <Trans>Sign Document</Trans>}
            {recipient.role === RecipientRole.APPROVER && <Trans>Approve Document</Trans>}
-            {recipient.role === RecipientRole.ASSISTANT && <Trans>Assist Document</Trans>}
          </h3>

          {recipient.role === RecipientRole.VIEWER ? (
@@ -218,185 +176,91 @@ export const SigningForm = ({
                </div>
              </div>
            </>
-          ) : recipient.role === RecipientRole.ASSISTANT ? (
-            <>
-              <form onSubmit={assistantForm.handleSubmit(onAssistantFormSubmit)}>
-                <p className="text-muted-foreground mt-2 text-sm">
-                  <Trans>
-                    Complete the fields for the following signers. Once reviewed, they will inform
-                    you if any modifications are needed.
-                  </Trans>
-                </p>
-
-                <hr className="border-border my-4" />
-
-                <fieldset className="dark:bg-background border-border rounded-2xl border bg-white p-3">
-                  <Controller
-                    name="selectedSignerId"
-                    control={assistantForm.control}
-                    rules={{ required: 'Please select a signer' }}
-                    render={({ field }) => (
-                      <RadioGroup
-                        className="gap-0 space-y-3 shadow-none"
-                        value={field.value?.toString()}
-                        onValueChange={(value) => {
-                          field.onChange(value);
-                          setSelectedSignerId?.(Number(value));
-                        }}
-                      >
-                        {allRecipients
-                          .filter((r) => r.fields.length > 0)
-                          .map((r) => (
-                            <div
-                              key={`${assistantSignersId}-${r.id}`}
-                              className="bg-widget border-border relative flex flex-col gap-4 rounded-lg border p-4"
-                            >
-                              <div className="flex items-center justify-between">
-                                <div className="flex items-center gap-3">
-                                  <RadioGroupItem
-                                    id={`${assistantSignersId}-${r.id}`}
-                                    value={r.id.toString()}
-                                    className="after:absolute after:inset-0"
-                                  />
-
-                                  <div className="grid grow gap-1">
-                                    <Label
-                                      className="inline-flex items-start"
-                                      htmlFor={`${assistantSignersId}-${r.id}`}
-                                    >
-                                      {r.name}
-
-                                      {r.id === recipient.id && (
-                                        <span className="text-muted-foreground ml-2">
-                                          {_(msg`(You)`)}
-                                        </span>
-                                      )}
-                                    </Label>
-                                    <p className="text-muted-foreground text-xs">{r.email}</p>
-                                  </div>
-                                </div>
-                                <div className="text-muted-foreground text-xs leading-[inherit]">
-                                  {r.fields.length} {r.fields.length === 1 ? 'field' : 'fields'}
-                                </div>
-                              </div>
-                            </div>
-                          ))}
-                      </RadioGroup>
-                    )}
-                  />
-                </fieldset>
-
-                <div className="mt-6 flex flex-col gap-4 md:flex-row">
-                  <Button
-                    type="submit"
-                    className="w-full"
-                    size="lg"
-                    loading={isAssistantSubmitting}
-                    disabled={isAssistantSubmitting || uninsertedRecipientFields.length > 0}
-                  >
-                    {isAssistantSubmitting ? <Trans>Submitting...</Trans> : <Trans>Continue</Trans>}
-                  </Button>
-                </div>
-
-                <AssistantConfirmationDialog
-                  hasUninsertedFields={uninsertedFields.length > 0}
-                  isOpen={isConfirmationDialogOpen}
-                  onClose={() => !isAssistantSubmitting && setIsConfirmationDialogOpen(false)}
-                  onConfirm={handleAssistantConfirmDialogSubmit}
-                  isSubmitting={isAssistantSubmitting}
-                />
-              </form>
-            </>
          ) : (
            <>
-              <form onSubmit={handleSubmit(onFormSubmit)}>
-                <p className="text-muted-foreground mt-2 text-sm">
-                  <Trans>Please review the document before signing.</Trans>
-                </p>
+              <p className="text-muted-foreground mt-2 text-sm">
+                <Trans>Please review the document before signing.</Trans>
+              </p>

-                <hr className="border-border mb-8 mt-4" />
+              <hr className="border-border mb-8 mt-4" />

-                <fieldset
-                  disabled={isSubmitting}
-                  className="-mx-2 flex flex-1 flex-col gap-4 overflow-y-auto px-2"
-                >
-                  <div className="flex flex-1 flex-col gap-y-4">
-                    <div>
-                      <Label htmlFor="full-name">
-                        <Trans>Full Name</Trans>
-                      </Label>
+              <div className="-mx-2 flex flex-1 flex-col gap-4 overflow-y-auto px-2">
+                <div className="flex flex-1 flex-col gap-y-4">
+                  <div>
+                    <Label htmlFor="full-name">
+                      <Trans>Full Name</Trans>
+                    </Label>

-                      <Input
-                        type="text"
-                        id="full-name"
-                        className="bg-background mt-2"
-                        value={fullName}
-                        onChange={(e) => setFullName(e.target.value.trimStart())}
-                      />
-                    </div>
-
-                    <div>
-                      <Label htmlFor="Signature">
-                        <Trans>Signature</Trans>
-                      </Label>
-
-                      <Card className="mt-2" gradient degrees={-120}>
-                        <CardContent className="p-0">
-                          <SignaturePad
-                            className="h-44 w-full"
-                            disabled={isSubmitting}
-                            defaultValue={signature ?? undefined}
-                            onValidityChange={(isValid) => {
-                              setSignatureValid(isValid);
-                            }}
-                            onChange={(value) => {
-                              if (signatureValid) {
-                                setSignature(value);
-                              }
-                            }}
-                            allowTypedSignature={document.documentMeta?.typedSignatureEnabled}
-                          />
-                        </CardContent>
-                      </Card>
-
-                      {hasSignatureField && !signatureValid && (
-                        <div className="text-destructive mt-2 text-sm">
-                          <Trans>
-                            Signature is too small. Please provide a more complete signature.
-                          </Trans>
-                        </div>
-                      )}
-                    </div>
-                  </div>
-
-                  <div className="flex flex-col gap-4 md:flex-row">
-                    <Button
-                      type="button"
-                      className="dark:bg-muted dark:hover:bg-muted/80 w-full bg-black/5 hover:bg-black/10"
-                      variant="secondary"
-                      size="lg"
-                      disabled={typeof window !== 'undefined' && window.history.length <= 1}
-                      onClick={() => router.back()}
-                    >
-                      <Trans>Cancel</Trans>
-                    </Button>
-
-                    <SignDialog
-                      isSubmitting={isSubmitting}
-                      onSignatureComplete={handleSubmit(onFormSubmit)}
-                      documentTitle={document.title}
-                      fields={fields}
-                      fieldsValidated={fieldsValidated}
-                      role={recipient.role}
-                      disabled={!isRecipientsTurn}
+                    <Input
+                      type="text"
+                      id="full-name"
+                      className="bg-background mt-2"
+                      value={fullName}
+                      onChange={(e) => setFullName(e.target.value.trimStart())}
                    />
                  </div>
-                </fieldset>
-              </form>
+
+                  <div>
+                    <Label htmlFor="Signature">
+                      <Trans>Signature</Trans>
+                    </Label>
+
+                    <Card className="mt-2" gradient degrees={-120}>
+                      <CardContent className="p-0">
+                        <SignaturePad
+                          className="h-44 w-full"
+                          disabled={isSubmitting}
+                          defaultValue={signature ?? undefined}
+                          onValidityChange={(isValid) => {
+                            setSignatureValid(isValid);
+                          }}
+                          onChange={(value) => {
+                            if (signatureValid) {
+                              setSignature(value);
+                            }
+                          }}
+                          allowTypedSignature={document.documentMeta?.typedSignatureEnabled}
+                        />
+                      </CardContent>
+                    </Card>
+
+                    {hasSignatureField && !signatureValid && (
+                      <div className="text-destructive mt-2 text-sm">
+                        <Trans>
+                          Signature is too small. Please provide a more complete signature.
+                        </Trans>
+                      </div>
+                    )}
+                  </div>
+                </div>
+
+                <div className="flex flex-col gap-4 md:flex-row">
+                  <Button
+                    type="button"
+                    className="dark:bg-muted dark:hover:bg-muted/80 w-full bg-black/5 hover:bg-black/10"
+                    variant="secondary"
+                    size="lg"
+                    disabled={typeof window !== 'undefined' && window.history.length <= 1}
+                    onClick={() => router.back()}
+                  >
+                    <Trans>Cancel</Trans>
+                  </Button>
+
+                  <SignDialog
+                    isSubmitting={isSubmitting}
+                    onSignatureComplete={handleSubmit(onFormSubmit)}
+                    documentTitle={document.title}
+                    fields={fields}
+                    fieldsValidated={fieldsValidated}
+                    role={recipient.role}
+                    disabled={!isRecipientsTurn}
+                  />
+                </div>
+              </div>
            </>
          )}
        </div>
-      </div>
-    </div>
+      </fieldset>
+    </form>
  );
 };
@@ -12,6 +12,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -21,22 +22,26 @@ import type {
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredSigningContext } from './provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type InitialsFieldProps = {
  field: FieldWithSignature;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const InitialsField = ({ field, onSignField, onUnsignField }: InitialsFieldProps) => {
+export const InitialsField = ({
+  field,
+  recipient,
+  onSignField,
+  onUnsignField,
+}: InitialsFieldProps) => {
  const router = useRouter();
  const { toast } = useToast();
  const { _ } = useLingui();

  const { fullName } = useRequiredSigningContext();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();
  const initials = extractInitials(fullName);

  const [isPending, startTransition] = useTransition();
@@ -82,9 +87,7 @@ export const InitialsField = ({ field, onSignField, onUnsignField }: InitialsFie

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -12,6 +12,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZNameFieldMeta } from '@documenso/lib/types/field-meta';
+import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -27,16 +28,16 @@ import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
 import { useRequiredSigningContext } from './provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type NameFieldProps = {
  field: FieldWithSignature;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const NameField = ({ field, onSignField, onUnsignField }: NameFieldProps) => {
+export const NameField = ({ field, recipient, onSignField, onUnsignField }: NameFieldProps) => {
  const router = useRouter();

  const { _ } = useLingui();
@@ -44,7 +45,6 @@ export const NameField = ({ field, onSignField, onUnsignField }: NameFieldProps)

  const { fullName: providedFullName, setFullName: setProvidedFullName } =
    useRequiredSigningContext();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();

@@ -67,7 +67,7 @@ export const NameField = ({ field, onSignField, onUnsignField }: NameFieldProps)
  const [localFullName, setLocalFullName] = useState('');

  const onPreSign = () => {
-    if (!providedFullName && !isAssistantMode) {
+    if (!providedFullName) {
      setShowFullNameModal(true);
      return false;
    }
@@ -90,9 +90,9 @@ export const NameField = ({ field, onSignField, onUnsignField }: NameFieldProps)

  const onSign = async (authOptions?: TRecipientActionAuth, name?: string) => {
    try {
-      const value = name || providedFullName || '';
+      const value = name || providedFullName;

-      if (!value && !isAssistantMode) {
+      if (!value) {
        setShowFullNameModal(true);
        return;
      }
@@ -124,9 +124,7 @@ export const NameField = ({ field, onSignField, onUnsignField }: NameFieldProps)

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -152,7 +150,7 @@ export const NameField = ({ field, onSignField, onUnsignField }: NameFieldProps)

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
@@ -13,6 +13,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZNumberFieldMeta } from '@documenso/lib/types/field-meta';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -26,7 +27,6 @@ import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 type ValidationErrors = {
@@ -39,18 +39,18 @@ type ValidationErrors = {

 export type NumberFieldProps = {
  field: FieldWithSignature;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldProps) => {
+export const NumberField = ({ field, recipient, onSignField, onUnsignField }: NumberFieldProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const router = useRouter();
  const [isPending, startTransition] = useTransition();
-  const [showNumberModal, setShowNumberModal] = useState(false);
+  const [showRadioModal, setShowRadioModal] = useState(false);

  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
@@ -105,7 +105,7 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr
  };

  const onDialogSignClick = () => {
-    setShowNumberModal(false);
+    setShowRadioModal(false);

    void executeActionAuthProcedure({
      onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
@@ -148,20 +148,14 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
  };

  const onPreSign = () => {
-    if (isAssistantMode) {
-      return true;
-    }
-
-    setShowNumberModal(true);
+    setShowRadioModal(true);

    if (localNumber && parsedFieldMeta) {
      const validationErrors = validateNumberField(localNumber, parsedFieldMeta, true);
@@ -199,18 +193,18 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
  };

  useEffect(() => {
-    if (!showNumberModal) {
+    if (!showRadioModal) {
      setLocalNumber(parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '0');
      setErrors(initialErrors);
    }
-  }, [showNumberModal]);
+  }, [showRadioModal]);

  useEffect(() => {
    if (
@@ -228,8 +222,8 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr

  if (parsedFieldMeta?.label) {
    fieldDisplayName =
-      parsedFieldMeta.label.length > 20
-        ? parsedFieldMeta.label.substring(0, 20) + '...'
+      parsedFieldMeta.label.length > 10
+        ? parsedFieldMeta.label.substring(0, 10) + '...'
        : parsedFieldMeta.label;
  }

@@ -241,7 +235,7 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr
      onPreSign={onPreSign}
      onSign={onSign}
      onRemove={onRemove}
-      type="Number"
+      type="Signature"
    >
      {isLoading && (
        <div className="bg-background absolute inset-0 flex items-center justify-center rounded-md">
@@ -284,7 +278,7 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr
        </div>
      )}

-      <Dialog open={showNumberModal} onOpenChange={setShowNumberModal}>
+      <Dialog open={showRadioModal} onOpenChange={setShowRadioModal}>
        <DialogContent>
          <DialogTitle>
            {parsedFieldMeta?.label ? parsedFieldMeta?.label : <Trans>Number</Trans>}
@@ -340,7 +334,7 @@ export const NumberField = ({ field, onSignField, onUnsignField }: NumberFieldPr
                className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
                variant="secondary"
                onClick={() => {
-                  setShowNumberModal(false);
+                  setShowRadioModal(false);
                  setLocalNumber('');
                }}
              >
@@ -12,12 +12,11 @@ import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-f
 import { getIsRecipientsTurnToSign } from '@documenso/lib/server-only/recipient/get-is-recipient-turn';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
-import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';
 import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { extractNextHeaderRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';

 import { DocumentAuthProvider } from './document-auth-provider';
 import { NoLongerAvailable } from './no-longer-available';
@@ -44,14 +43,14 @@ export default async function SigningPage({ params: { token } }: SigningPageProp

  const requestMetadata = extractNextHeaderRequestMetadata(requestHeaders);

-  const [document, recipient, fields, completedFields] = await Promise.all([
+  const [document, fields, recipient, completedFields] = await Promise.all([
    getDocumentAndSenderByToken({
      token,
      userId: user?.id,
      requireAccessAuth: false,
    }).catch(() => null),
-    getRecipientByToken({ token }).catch(() => null),
    getFieldsForToken({ token }),
+    getRecipientByToken({ token }).catch(() => null),
    getCompletedFieldsForToken({ token }),
  ]);

@@ -64,21 +63,12 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
    return notFound();
  }

-  const recipientWithFields = { ...recipient, fields };
-
  const isRecipientsTurn = await getIsRecipientsTurnToSign({ token });

  if (!isRecipientsTurn) {
    return redirect(`/sign/${token}/waiting`);
  }

-  const allRecipients =
-    recipient.role === RecipientRole.ASSISTANT
-      ? await getRecipientsForAssistant({
-          token,
-        })
-      : [];
-
  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
    documentAuth: document.authOptions,
    recipientAuth: recipient.authOptions,
@@ -163,12 +153,11 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
        user={user}
      >
        <SigningPageView
-          recipient={recipientWithFields}
+          recipient={recipient}
          document={document}
          fields={fields}
          completedFields={completedFields}
          isRecipientsTurn={isRecipientsTurn}
-          allRecipients={allRecipients}
        />
      </DocumentAuthProvider>
    </SigningProvider>
@@ -12,6 +12,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZRadioFieldMeta } from '@documenso/lib/types/field-meta';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -23,19 +24,18 @@ import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 export type RadioFieldProps = {
  field: FieldWithSignatureAndFieldMeta;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const RadioField = ({ field, onSignField, onUnsignField }: RadioFieldProps) => {
+export const RadioField = ({ field, recipient, onSignField, onUnsignField }: RadioFieldProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const router = useRouter();
  const [isPending, startTransition] = useTransition();
@@ -99,9 +99,7 @@ export const RadioField = ({ field, onSignField, onUnsignField }: RadioFieldProp

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -128,7 +126,7 @@ export const RadioField = ({ field, onSignField, onUnsignField }: RadioFieldProp

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the selection.`),
+        description: _(msg`An error occurred while removing the signature.`),
        variant: 'destructive',
      });
    }
@@ -1,66 +0,0 @@
-'use client';
-
-import { type PropsWithChildren, createContext, useContext } from 'react';
-
-import type { Recipient } from '@documenso/prisma/client';
-import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
-
-export interface RecipientContextValue {
-  /**
-   * The recipient who is currently signing the document.
-   * In regular mode, this is the actual signer.
-   * In assistant mode, this is the recipient who is helping fill out the document.
-   */
-  recipient: Recipient | RecipientWithFields;
-
-  /**
-   * Only present in assistant mode.
-   * The recipient on whose behalf we're filling out the document.
-   */
-  targetSigner: RecipientWithFields | null;
-
-  /**
-   * Whether we're in assistant mode (one recipient filling out for another)
-   */
-  isAssistantMode: boolean;
-}
-
-const RecipientContext = createContext<RecipientContextValue | null>(null);
-
-export interface RecipientProviderProps extends PropsWithChildren {
-  recipient: Recipient | RecipientWithFields;
-  targetSigner?: RecipientWithFields | null;
-}
-
-export const RecipientProvider = ({
-  children,
-  recipient,
-  targetSigner = null,
-}: RecipientProviderProps) => {
-  // console.log({
-  //   recipient,
-  //   targetSigner,
-  //   isAssistantMode: !!targetSigner,
-  // });
-  return (
-    <RecipientContext.Provider
-      value={{
-        recipient,
-        targetSigner,
-        isAssistantMode: !!targetSigner,
-      }}
-    >
-      {children}
-    </RecipientContext.Provider>
-  );
-};
-
-export function useRecipientContext() {
-  const context = useContext(RecipientContext);
-
-  if (!context) {
-    throw new Error('useRecipientContext must be used within a RecipientProvider');
-  }
-
-  return context;
-}
@@ -43,10 +43,9 @@ type TRejectDocumentFormSchema = z.infer<typeof ZRejectDocumentFormSchema>;
 export interface RejectDocumentDialogProps {
  document: Pick<Document, 'id'>;
  token: string;
-  onRejected?: (reason: string) => void | Promise<void>;
 }

-export function RejectDocumentDialog({ document, token, onRejected }: RejectDocumentDialogProps) {
+export function RejectDocumentDialog({ document, token }: RejectDocumentDialogProps) {
  const { toast } = useToast();
  const router = useRouter();
  const searchParams = useSearchParams();
@@ -80,11 +79,7 @@ export function RejectDocumentDialog({ document, token, onRejected }: RejectDocu

      setIsOpen(false);

-      if (onRejected) {
-        await onRejected(reason);
-      } else {
-        router.push(`/sign/${token}/rejected`);
-      }
+      router.push(`/sign/${token}/rejected`);
    } catch (err) {
      toast({
        title: 'Error',
@@ -11,6 +11,7 @@ import { Loader } from 'lucide-react';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
+import { type Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -27,12 +28,12 @@ import { SigningDisclosure } from '~/components/general/signing-disclosure';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
 import { useRequiredSigningContext } from './provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

 type SignatureFieldState = 'empty' | 'signed-image' | 'signed-text';
 export type SignatureFieldProps = {
  field: FieldWithSignature;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
  typedSignatureEnabled?: boolean;
@@ -40,14 +41,15 @@ export type SignatureFieldProps = {

 export const SignatureField = ({
  field,
+  recipient,
  onSignField,
  onUnsignField,
  typedSignatureEnabled,
 }: SignatureFieldProps) => {
  const router = useRouter();
+
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { recipient } = useRecipientContext();

  const signatureRef = useRef<HTMLParagraphElement>(null);
  const containerRef = useRef<HTMLDivElement>(null);
@@ -46,7 +46,6 @@ export type SignatureFieldProps = {
    | 'Email'
    | 'Name'
    | 'Signature'
-    | 'Text'
    | 'Radio'
    | 'Dropdown'
    | 'Number'
@@ -182,23 +181,6 @@ export const SigningFieldContainer = ({
          </button>
        )}

-        {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&
-          field.fieldMeta?.label && (
-            <div
-              className={cn(
-                'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',
-                {
-                  'bg-foreground/5 border-border border': !field.inserted,
-                },
-                {
-                  'bg-documenso-200 border-primary border': field.inserted,
-                },
-              )}
-            >
-              {field.fieldMeta.label}
-            </div>
-          )}
-
        {children}
      </FieldRootContainer>
    </div>
@@ -1,7 +1,3 @@
-'use client';
-
-import { useState } from 'react';
-
 import { Trans } from '@lingui/macro';
 import { match } from 'ts-pattern';

@@ -17,10 +13,9 @@ import {
  ZTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
 import type { CompletedField } from '@documenso/lib/types/fields';
-import type { Field } from '@documenso/prisma/client';
+import type { Field, Recipient } from '@documenso/prisma/client';
 import { FieldType, RecipientRole } from '@documenso/prisma/client';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
-import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
@@ -37,18 +32,16 @@ import { InitialsField } from './initials-field';
 import { NameField } from './name-field';
 import { NumberField } from './number-field';
 import { RadioField } from './radio-field';
-import { RecipientProvider } from './recipient-context';
 import { RejectDocumentDialog } from './reject-document-dialog';
 import { SignatureField } from './signature-field';
 import { TextField } from './text-field';

 export type SigningPageViewProps = {
  document: DocumentAndSender;
-  recipient: RecipientWithFields;
+  recipient: Recipient;
  fields: Field[];
  completedFields: CompletedField[];
  isRecipientsTurn: boolean;
-  allRecipients?: RecipientWithFields[];
 };

 export const SigningPageView = ({
@@ -57,12 +50,9 @@ export const SigningPageView = ({
  fields,
  completedFields,
  isRecipientsTurn,
-  allRecipients = [],
 }: SigningPageViewProps) => {
  const { documentData, documentMeta } = document;

-  const [selectedSignerId, setSelectedSignerId] = useState<number | null>(allRecipients?.[0]?.id);
-
  const shouldUseTeamDetails =
    document.teamId && document.team?.teamGlobalSettings?.includeSenderDetails === false;

@@ -74,168 +64,153 @@ export const SigningPageView = ({
    senderEmail = document.team?.teamEmail?.email ? `(${document.team.teamEmail.email})` : '';
  }

-  const selectedSigner = allRecipients?.find((r) => r.id === selectedSignerId);
-
  return (
-    <RecipientProvider recipient={recipient} targetSigner={selectedSigner ?? null}>
-      <div className="mx-auto w-full max-w-screen-xl">
-        <h1
-          className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-          title={document.title}
-        >
-          {document.title}
-        </h1>
+    <div className="mx-auto w-full max-w-screen-xl">
+      <h1
+        className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
+        title={document.title}
+      >
+        {document.title}
+      </h1>

-        <div className="mt-2.5 flex flex-wrap items-center justify-between gap-x-6">
-          <div className="max-w-[50ch]">
-            <span className="text-muted-foreground truncate" title={senderName}>
-              {senderName} {senderEmail}
-            </span>{' '}
-            <span className="text-muted-foreground">
-              {match(recipient.role)
-                .with(RecipientRole.VIEWER, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
-                    <Trans>
-                      on behalf of "{document.team?.name}" has invited you to view this document
-                    </Trans>
-                  ) : (
-                    <Trans>has invited you to view this document</Trans>
-                  ),
-                )
-                .with(RecipientRole.SIGNER, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
-                    <Trans>
-                      on behalf of "{document.team?.name}" has invited you to sign this document
-                    </Trans>
-                  ) : (
-                    <Trans>has invited you to sign this document</Trans>
-                  ),
-                )
-                .with(RecipientRole.APPROVER, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
-                    <Trans>
-                      on behalf of "{document.team?.name}" has invited you to approve this document
-                    </Trans>
-                  ) : (
-                    <Trans>has invited you to approve this document</Trans>
-                  ),
-                )
-                .with(RecipientRole.ASSISTANT, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
-                    <Trans>
-                      on behalf of "{document.team?.name}" has invited you to assist this document
-                    </Trans>
-                  ) : (
-                    <Trans>has invited you to assist this document</Trans>
-                  ),
-                )
-                .otherwise(() => null)}
-            </span>
-          </div>
-
-          <RejectDocumentDialog document={document} token={recipient.token} />
+      <div className="mt-2.5 flex flex-wrap items-center justify-between gap-x-6">
+        <div className="max-w-[50ch]">
+          <span className="text-muted-foreground truncate" title={senderName}>
+            {senderName} {senderEmail}
+          </span>{' '}
+          <span className="text-muted-foreground">
+            {match(recipient.role)
+              .with(RecipientRole.VIEWER, () =>
+                document.teamId && !shouldUseTeamDetails ? (
+                  <Trans>
+                    on behalf of "{document.team?.name}" has invited you to view this document
+                  </Trans>
+                ) : (
+                  <Trans>has invited you to view this document</Trans>
+                ),
+              )
+              .with(RecipientRole.SIGNER, () =>
+                document.teamId && !shouldUseTeamDetails ? (
+                  <Trans>
+                    on behalf of "{document.team?.name}" has invited you to sign this document
+                  </Trans>
+                ) : (
+                  <Trans>has invited you to sign this document</Trans>
+                ),
+              )
+              .with(RecipientRole.APPROVER, () =>
+                document.teamId && !shouldUseTeamDetails ? (
+                  <Trans>
+                    on behalf of "{document.team?.name}" has invited you to approve this document
+                  </Trans>
+                ) : (
+                  <Trans>has invited you to approve this document</Trans>
+                ),
+              )
+              .otherwise(() => null)}
+          </span>
        </div>

-        <div className="mt-8 grid grid-cols-12 gap-y-8 lg:gap-x-8 lg:gap-y-0">
-          <Card
-            className="col-span-12 rounded-xl before:rounded-xl lg:col-span-7 xl:col-span-8"
-            gradient
-          >
-            <CardContent className="p-2">
-              <LazyPDFViewer
-                key={documentData.id}
-                documentData={documentData}
-                document={document}
-                password={documentMeta?.password}
-              />
-            </CardContent>
-          </Card>
-
-          <div className="col-span-12 lg:col-span-5 xl:col-span-4">
-            <SigningForm
-              document={document}
-              recipient={recipient}
-              fields={fields}
-              redirectUrl={documentMeta?.redirectUrl}
-              isRecipientsTurn={isRecipientsTurn}
-              allRecipients={allRecipients}
-              setSelectedSignerId={setSelectedSignerId}
-            />
-          </div>
-        </div>
-
-        <DocumentReadOnlyFields fields={completedFields} />
-
-        {recipient.role !== RecipientRole.ASSISTANT && (
-          <AutoSign recipient={recipient} fields={fields} />
-        )}
-
-        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
-          {fields
-            .filter(
-              (field) =>
-                recipient.role !== RecipientRole.ASSISTANT ||
-                field.recipientId === selectedSigner?.id,
-            )
-            .map((field) =>
-              match(field.type)
-                .with(FieldType.SIGNATURE, () => (
-                  <SignatureField
-                    key={field.id}
-                    field={field}
-                    typedSignatureEnabled={documentMeta?.typedSignatureEnabled}
-                  />
-                ))
-                .with(FieldType.INITIALS, () => <InitialsField key={field.id} field={field} />)
-                .with(FieldType.NAME, () => <NameField key={field.id} field={field} />)
-                .with(FieldType.DATE, () => (
-                  <DateField
-                    key={field.id}
-                    field={field}
-                    dateFormat={documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
-                    timezone={documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}
-                  />
-                ))
-                .with(FieldType.EMAIL, () => <EmailField key={field.id} field={field} />)
-                .with(FieldType.TEXT, () => {
-                  const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
-                    ...field,
-                    fieldMeta: field.fieldMeta ? ZTextFieldMeta.parse(field.fieldMeta) : null,
-                  };
-                  return <TextField key={field.id} field={fieldWithMeta} />;
-                })
-                .with(FieldType.NUMBER, () => {
-                  const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
-                    ...field,
-                    fieldMeta: field.fieldMeta ? ZNumberFieldMeta.parse(field.fieldMeta) : null,
-                  };
-                  return <NumberField key={field.id} field={fieldWithMeta} />;
-                })
-                .with(FieldType.RADIO, () => {
-                  const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
-                    ...field,
-                    fieldMeta: field.fieldMeta ? ZRadioFieldMeta.parse(field.fieldMeta) : null,
-                  };
-                  return <RadioField key={field.id} field={fieldWithMeta} />;
-                })
-                .with(FieldType.CHECKBOX, () => {
-                  const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
-                    ...field,
-                    fieldMeta: field.fieldMeta ? ZCheckboxFieldMeta.parse(field.fieldMeta) : null,
-                  };
-                  return <CheckboxField key={field.id} field={fieldWithMeta} />;
-                })
-                .with(FieldType.DROPDOWN, () => {
-                  const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
-                    ...field,
-                    fieldMeta: field.fieldMeta ? ZDropdownFieldMeta.parse(field.fieldMeta) : null,
-                  };
-                  return <DropdownField key={field.id} field={fieldWithMeta} />;
-                })
-                .otherwise(() => null),
-            )}
-        </ElementVisible>
+        <RejectDocumentDialog document={document} token={recipient.token} />
      </div>
-    </RecipientProvider>
+
+      <div className="mt-8 grid grid-cols-12 gap-y-8 lg:gap-x-8 lg:gap-y-0">
+        <Card
+          className="col-span-12 rounded-xl before:rounded-xl lg:col-span-7 xl:col-span-8"
+          gradient
+        >
+          <CardContent className="p-2">
+            <LazyPDFViewer
+              key={documentData.id}
+              documentData={documentData}
+              document={document}
+              password={documentMeta?.password}
+            />
+          </CardContent>
+        </Card>
+
+        <div className="col-span-12 lg:col-span-5 xl:col-span-4">
+          <SigningForm
+            document={document}
+            recipient={recipient}
+            fields={fields}
+            redirectUrl={documentMeta?.redirectUrl}
+            isRecipientsTurn={isRecipientsTurn}
+          />
+        </div>
+      </div>
+
+      <DocumentReadOnlyFields fields={completedFields} />
+
+      <AutoSign recipient={recipient} fields={fields} />
+
+      <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
+        {fields.map((field) =>
+          match(field.type)
+            .with(FieldType.SIGNATURE, () => (
+              <SignatureField
+                key={field.id}
+                field={field}
+                recipient={recipient}
+                typedSignatureEnabled={documentMeta?.typedSignatureEnabled}
+              />
+            ))
+            .with(FieldType.INITIALS, () => (
+              <InitialsField key={field.id} field={field} recipient={recipient} />
+            ))
+            .with(FieldType.NAME, () => (
+              <NameField key={field.id} field={field} recipient={recipient} />
+            ))
+            .with(FieldType.DATE, () => (
+              <DateField
+                key={field.id}
+                field={field}
+                recipient={recipient}
+                dateFormat={documentMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
+                timezone={documentMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}
+              />
+            ))
+            .with(FieldType.EMAIL, () => (
+              <EmailField key={field.id} field={field} recipient={recipient} />
+            ))
+            .with(FieldType.TEXT, () => {
+              const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
+                ...field,
+                fieldMeta: field.fieldMeta ? ZTextFieldMeta.parse(field.fieldMeta) : null,
+              };
+              return <TextField key={field.id} field={fieldWithMeta} recipient={recipient} />;
+            })
+            .with(FieldType.NUMBER, () => {
+              const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
+                ...field,
+                fieldMeta: field.fieldMeta ? ZNumberFieldMeta.parse(field.fieldMeta) : null,
+              };
+              return <NumberField key={field.id} field={fieldWithMeta} recipient={recipient} />;
+            })
+            .with(FieldType.RADIO, () => {
+              const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
+                ...field,
+                fieldMeta: field.fieldMeta ? ZRadioFieldMeta.parse(field.fieldMeta) : null,
+              };
+              return <RadioField key={field.id} field={fieldWithMeta} recipient={recipient} />;
+            })
+            .with(FieldType.CHECKBOX, () => {
+              const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
+                ...field,
+                fieldMeta: field.fieldMeta ? ZCheckboxFieldMeta.parse(field.fieldMeta) : null,
+              };
+              return <CheckboxField key={field.id} field={fieldWithMeta} recipient={recipient} />;
+            })
+            .with(FieldType.DROPDOWN, () => {
+              const fieldWithMeta: FieldWithSignatureAndFieldMeta = {
+                ...field,
+                fieldMeta: field.fieldMeta ? ZDropdownFieldMeta.parse(field.fieldMeta) : null,
+              };
+              return <DropdownField key={field.id} field={fieldWithMeta} recipient={recipient} />;
+            })
+            .otherwise(() => null),
+        )}
+      </ElementVisible>
+    </div>
  );
 };
@@ -13,6 +13,7 @@ import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/tr
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { ZTextFieldMeta } from '@documenso/lib/types/field-meta';
+import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
 import { trpc } from '@documenso/trpc/react';
 import type {
@@ -26,31 +27,26 @@ import { Textarea } from '@documenso/ui/primitives/textarea';
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredDocumentAuthContext } from './document-auth-provider';
-import { useRecipientContext } from './recipient-context';
 import { SigningFieldContainer } from './signing-field-container';

-type ValidationErrors = {
-  required: string[];
-  characterLimit: string[];
-};
-
 export type TextFieldProps = {
  field: FieldWithSignatureAndFieldMeta;
+  recipient: Recipient;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };

-export const TextField = ({ field, onSignField, onUnsignField }: TextFieldProps) => {
+export const TextField = ({ field, recipient, onSignField, onUnsignField }: TextFieldProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { recipient, targetSigner, isAssistantMode } = useRecipientContext();

  const router = useRouter();

-  const initialErrors: ValidationErrors = {
+  const initialErrors: Record<string, string[]> = {
    required: [],
    characterLimit: [],
  };
+
  const [errors, setErrors] = useState(initialErrors);
  const userInputHasErrors = Object.values(errors).some((error) => error.length > 0);

@@ -170,9 +166,7 @@ export const TextField = ({ field, onSignField, onUnsignField }: TextFieldProps)

      toast({
        title: _(msg`Error`),
-        description: isAssistantMode
-          ? _(msg`An error occurred while signing as assistant.`)
-          : _(msg`An error occurred while signing the document.`),
+        description: _(msg`An error occurred while signing the document.`),
        variant: 'destructive',
      });
    }
@@ -200,7 +194,7 @@ export const TextField = ({ field, onSignField, onUnsignField }: TextFieldProps)

      toast({
        title: _(msg`Error`),
-        description: _(msg`An error occurred while removing the field.`),
+        description: _(msg`An error occurred while removing the text.`),
        variant: 'destructive',
      });
    }
@@ -240,7 +234,7 @@ export const TextField = ({ field, onSignField, onUnsignField }: TextFieldProps)
      onPreSign={onPreSign}
      onSign={onSign}
      onRemove={onRemove}
-      type="Text"
+      type="Signature"
    >
      {isLoading && (
        <div className="bg-background absolute inset-0 flex items-center justify-center rounded-md">
@@ -282,7 +276,7 @@ export const TextField = ({ field, onSignField, onUnsignField }: TextFieldProps)
          >
            {field.customText.length < 20
              ? field.customText
-              : field.customText.substring(0, 20) + '...'}
+              : field.customText.substring(0, 15) + '...'}
          </p>
        </div>
      )}
@@ -12,7 +12,7 @@ export type EmbedDocumentCompletedPageProps = {
 export const EmbedDocumentCompleted = ({ name, signature }: EmbedDocumentCompletedPageProps) => {
  console.log({ signature });
  return (
-    <div className="embed--DocumentCompleted relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
+    <div className="relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
      <h3 className="text-foreground text-2xl font-semibold">
        <Trans>Document Completed!</Trans>
      </h3>
@@ -49,7 +49,7 @@ export type EmbedDirectTemplateClientPageProps = {
  fields: Field[];
  metadata?: DocumentMeta | TemplateMeta | null;
  hidePoweredBy?: boolean;
-  allowWhiteLabelling?: boolean;
+  isPlatformOrEnterprise?: boolean;
 };

 export const EmbedDirectTemplateClientPage = ({
@@ -60,7 +60,7 @@ export const EmbedDirectTemplateClientPage = ({
  fields,
  metadata,
  hidePoweredBy = false,
-  allowWhiteLabelling = false,
+  isPlatformOrEnterprise = false,
 }: EmbedDirectTemplateClientPageProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
@@ -288,7 +288,7 @@ export const EmbedDirectTemplateClientPage = ({
        document.documentElement.classList.add('dark-mode-disabled');
      }

-      if (allowWhiteLabelling) {
+      if (isPlatformOrEnterprise) {
        injectCss({
          css: data.css,
          cssVars: data.cssVars,
@@ -349,7 +349,7 @@ export const EmbedDirectTemplateClientPage = ({
        {/* Widget */}
        <div
          key={isExpanded ? 'expanded' : 'collapsed'}
-          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit max-h-[calc(100dvh-2rem)] w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
+          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
          data-expanded={isExpanded || undefined}
        >
          <div className="border-border bg-widget flex h-fit w-full flex-col rounded-xl border px-4 py-4 md:min-h-[min(calc(100dvh-2rem),48rem)] md:py-6">
@@ -360,34 +360,19 @@ export const EmbedDirectTemplateClientPage = ({
                  <Trans>Sign document</Trans>
                </h3>

-                {isExpanded ? (
-                  <Button
-                    variant="outline"
-                    className="h-8 w-8 p-0 md:hidden"
-                    onClick={() => setIsExpanded(false)}
-                  >
-                    <LucideChevronDown className="text-muted-foreground h-5 w-5" />
-                  </Button>
-                ) : pendingFields.length > 0 ? (
-                  <Button
-                    variant="outline"
-                    className="h-8 w-8 p-0 md:hidden"
-                    onClick={() => setIsExpanded(true)}
-                  >
-                    <LucideChevronUp className="text-muted-foreground h-5 w-5" />
-                  </Button>
-                ) : (
-                  <Button
-                    variant="default"
-                    size="sm"
-                    className="md:hidden"
-                    disabled={isThrottled || (hasSignatureField && !signatureValid)}
-                    loading={isSubmitting}
-                    onClick={() => throttledOnCompleteClick()}
-                  >
-                    <Trans>Complete</Trans>
-                  </Button>
-                )}
+                <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
+                  {isExpanded ? (
+                    <LucideChevronDown
+                      className="text-muted-foreground h-5 w-5"
+                      onClick={() => setIsExpanded(false)}
+                    />
+                  ) : (
+                    <LucideChevronUp
+                      className="text-muted-foreground h-5 w-5"
+                      onClick={() => setIsExpanded(true)}
+                    />
+                  )}
+                </Button>
              </div>
            </div>

@@ -500,6 +485,7 @@ export const EmbedDirectTemplateClientPage = ({

        {/* Fields */}
        <EmbedDocumentFields
+          recipient={recipient}
          fields={localFields}
          metadata={metadata}
          onSignField={onSignField}
@@ -2,7 +2,6 @@ import { notFound } from 'next/navigation';

 import { match } from 'ts-pattern';

-import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
@@ -14,7 +13,6 @@ import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';

 import { DocumentAuthProvider } from '~/app/(signing)/sign/[token]/document-auth-provider';
 import { SigningProvider } from '~/app/(signing)/sign/[token]/provider';
-import { RecipientProvider } from '~/app/(signing)/sign/[token]/recipient-context';

 import { EmbedAuthenticateView } from '../../authenticate';
 import { EmbedPaywall } from '../../paywall';
@@ -56,16 +54,12 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
    documentAuth: template.authOptions,
  });

-  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
+  const [isPlatformDocument, isEnterpriseDocument] = await Promise.all([
    isDocumentPlatform(template),
    isUserEnterprise({
      userId: template.userId,
      teamId: template.teamId ?? undefined,
    }),
-    isUserCommunityPlan({
-      userId: template.userId,
-      teamId: template.teamId ?? undefined,
-    }),
  ]);

  const isAccessAuthValid = match(derivedRecipientAccessAuth)
@@ -102,20 +96,16 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
        recipient={recipient}
        user={user}
      >
-        <RecipientProvider recipient={recipient}>
-          <EmbedDirectTemplateClientPage
-            token={token}
-            updatedAt={template.updatedAt}
-            documentData={template.templateDocumentData}
-            recipient={recipient}
-            fields={fields}
-            metadata={template.templateMeta}
-            hidePoweredBy={
-              isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
-            }
-            allowWhiteLabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
-          />
-        </RecipientProvider>
+        <EmbedDirectTemplateClientPage
+          token={token}
+          updatedAt={template.updatedAt}
+          documentData={template.templateDocumentData}
+          recipient={recipient}
+          fields={fields}
+          metadata={template.templateMeta}
+          hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
+          isPlatformOrEnterprise={isPlatformDocument || isEnterpriseDocument}
+        />
      </DocumentAuthProvider>
    </SigningProvider>
  );
@@ -12,7 +12,7 @@ import {
  ZRadioFieldMeta,
  ZTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
-import type { DocumentMeta, TemplateMeta } from '@documenso/prisma/client';
+import type { DocumentMeta, Recipient, TemplateMeta } from '@documenso/prisma/client';
 import { type Field, FieldType } from '@documenso/prisma/client';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
 import type {
@@ -33,6 +33,7 @@ import { SignatureField } from '~/app/(signing)/sign/[token]/signature-field';
 import { TextField } from '~/app/(signing)/sign/[token]/text-field';

 export type EmbedDocumentFieldsProps = {
+  recipient: Recipient;
  fields: Field[];
  metadata?: DocumentMeta | TemplateMeta | null;
  onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
@@ -40,6 +41,7 @@ export type EmbedDocumentFieldsProps = {
 };

 export const EmbedDocumentFields = ({
+  recipient,
  fields,
  metadata,
  onSignField,
@@ -53,6 +55,7 @@ export const EmbedDocumentFields = ({
            <SignatureField
              key={field.id}
              field={field}
+              recipient={recipient}
              onSignField={onSignField}
              onUnsignField={onUnsignField}
              typedSignatureEnabled={metadata?.typedSignatureEnabled}
@@ -62,6 +65,7 @@ export const EmbedDocumentFields = ({
            <InitialsField
              key={field.id}
              field={field}
+              recipient={recipient}
              onSignField={onSignField}
              onUnsignField={onUnsignField}
            />
@@ -70,6 +74,7 @@ export const EmbedDocumentFields = ({
            <NameField
              key={field.id}
              field={field}
+              recipient={recipient}
              onSignField={onSignField}
              onUnsignField={onUnsignField}
            />
@@ -78,6 +83,7 @@ export const EmbedDocumentFields = ({
            <DateField
              key={field.id}
              field={field}
+              recipient={recipient}
              onSignField={onSignField}
              onUnsignField={onUnsignField}
              dateFormat={metadata?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
@@ -88,6 +94,7 @@ export const EmbedDocumentFields = ({
            <EmailField
              key={field.id}
              field={field}
+              recipient={recipient}
              onSignField={onSignField}
              onUnsignField={onUnsignField}
            />
@@ -102,6 +109,7 @@ export const EmbedDocumentFields = ({
              <TextField
                key={field.id}
                field={fieldWithMeta}
+                recipient={recipient}
                onSignField={onSignField}
                onUnsignField={onUnsignField}
              />
@@ -117,6 +125,7 @@ export const EmbedDocumentFields = ({
              <NumberField
                key={field.id}
                field={fieldWithMeta}
+                recipient={recipient}
                onSignField={onSignField}
                onUnsignField={onUnsignField}
              />
@@ -132,6 +141,7 @@ export const EmbedDocumentFields = ({
              <RadioField
                key={field.id}
                field={fieldWithMeta}
+                recipient={recipient}
                onSignField={onSignField}
                onUnsignField={onUnsignField}
              />
@@ -147,6 +157,7 @@ export const EmbedDocumentFields = ({
              <CheckboxField
                key={field.id}
                field={fieldWithMeta}
+                recipient={recipient}
                onSignField={onSignField}
                onUnsignField={onUnsignField}
              />
@@ -162,6 +173,7 @@ export const EmbedDocumentFields = ({
              <DropdownField
                key={field.id}
                field={fieldWithMeta}
+                recipient={recipient}
                onSignField={onSignField}
                onUnsignField={onUnsignField}
              />
@@ -1,40 +0,0 @@
-import { Trans } from '@lingui/macro';
-import { XCircle } from 'lucide-react';
-
-import type { Signature } from '@documenso/prisma/client';
-
-export type EmbedDocumentRejectedPageProps = {
-  name?: string;
-  signature?: Signature;
-};
-
-export const EmbedDocumentRejected = ({ name }: EmbedDocumentRejectedPageProps) => {
-  return (
-    <div className="embed--DocumentRejected relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
-      <div className="flex flex-col items-center">
-        <div className="flex items-center gap-x-4">
-          <XCircle className="text-destructive h-10 w-10" />
-
-          <h2 className="max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
-            <Trans>Document Rejected</Trans>
-          </h2>
-        </div>
-
-        <div className="text-destructive mt-4 flex items-center text-center text-sm">
-          <Trans>You have rejected this document</Trans>
-        </div>
-
-        <p className="text-muted-foreground mt-6 max-w-[60ch] text-center text-sm">
-          <Trans>
-            The document owner has been notified of your decision. They may contact you with further
-            instructions if necessary.
-          </Trans>
-        </p>
-
-        <p className="text-muted-foreground mt-2 max-w-[60ch] text-center text-sm">
-          <Trans>No further action is required from you at this time.</Trans>
-        </p>
-      </div>
-    </div>
-  );
-};
@@ -1,6 +1,6 @@
 'use client';

-import { useEffect, useId, useLayoutEffect, useState } from 'react';
+import { useEffect, useLayoutEffect, useState } from 'react';

 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
@@ -9,15 +9,8 @@ import { LucideChevronDown, LucideChevronUp } from 'lucide-react';
 import { useThrottleFn } from '@documenso/lib/client-only/hooks/use-throttle-fn';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { validateFieldsInserted } from '@documenso/lib/utils/fields';
-import type { DocumentMeta, TemplateMeta } from '@documenso/prisma/client';
-import {
-  type DocumentData,
-  type Field,
-  FieldType,
-  RecipientRole,
-  SigningStatus,
-} from '@documenso/prisma/client';
-import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
+import type { DocumentMeta, Recipient, TemplateMeta } from '@documenso/prisma/client';
+import { type DocumentData, type Field, FieldType } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
@@ -26,19 +19,15 @@ import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
-import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
-import { RecipientProvider } from '~/app/(signing)/sign/[token]/recipient-context';
-import { RejectDocumentDialog } from '~/app/(signing)/sign/[token]/reject-document-dialog';
 import { Logo } from '~/components/branding/logo';

 import { EmbedClientLoading } from '../../client-loading';
 import { EmbedDocumentCompleted } from '../../completed';
 import { EmbedDocumentFields } from '../../document-fields';
-import { EmbedDocumentRejected } from '../../rejected';
 import { injectCss } from '../../util';
 import { ZSignDocumentEmbedDataSchema } from './schema';

@@ -46,13 +35,12 @@ export type EmbedSignDocumentClientPageProps = {
  token: string;
  documentId: number;
  documentData: DocumentData;
-  recipient: RecipientWithFields;
+  recipient: Recipient;
  fields: Field[];
  metadata?: DocumentMeta | TemplateMeta | null;
  isCompleted?: boolean;
  hidePoweredBy?: boolean;
-  allowWhitelabelling?: boolean;
-  allRecipients?: RecipientWithFields[];
+  isPlatformOrEnterprise?: boolean;
 };

 export const EmbedSignDocumentClientPage = ({
@@ -64,8 +52,7 @@ export const EmbedSignDocumentClientPage = ({
  metadata,
  isCompleted,
  hidePoweredBy = false,
-  allowWhitelabelling = false,
-  allRecipients = [],
+  isPlatformOrEnterprise = false,
 }: EmbedSignDocumentClientPageProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
@@ -83,26 +70,17 @@ export const EmbedSignDocumentClientPage = ({
  const [hasFinishedInit, setHasFinishedInit] = useState(false);
  const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
  const [hasCompletedDocument, setHasCompletedDocument] = useState(isCompleted);
-  const [hasRejectedDocument, setHasRejectedDocument] = useState(
-    recipient.signingStatus === SigningStatus.REJECTED,
-  );
-  const [selectedSignerId, setSelectedSignerId] = useState<number | null>(
-    allRecipients.length > 0 ? allRecipients[0].id : null,
-  );

  const [isExpanded, setIsExpanded] = useState(false);
+
  const [isNameLocked, setIsNameLocked] = useState(false);
+
  const [showPendingFieldTooltip, setShowPendingFieldTooltip] = useState(false);

-  const [allowDocumentRejection, setAllowDocumentRejection] = useState(false);
-
-  const selectedSigner = allRecipients.find((r) => r.id === selectedSignerId);
-  const isAssistantMode = recipient.role === RecipientRole.ASSISTANT;
-
  const [throttledOnCompleteClick, isThrottled] = useThrottleFn(() => void onCompleteClick(), 500);

  const [pendingFields, _completedFields] = [
-    fields.filter((field) => field.recipientId === recipient.id && !field.inserted),
+    fields.filter((field) => !field.inserted),
    fields.filter((field) => field.inserted),
  ];

@@ -111,8 +89,6 @@ export const EmbedSignDocumentClientPage = ({

  const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);

-  const assistantSignersId = useId();
-
  const onNextFieldClick = () => {
    validateFieldsInserted(fields);

@@ -174,25 +150,6 @@ export const EmbedSignDocumentClientPage = ({
    }
  };

-  const onDocumentRejected = (reason: string) => {
-    if (window.parent) {
-      window.parent.postMessage(
-        {
-          action: 'document-rejected',
-          data: {
-            token,
-            documentId,
-            recipientId: recipient.id,
-            reason,
-          },
-        },
-        '*',
-      );
-    }
-
-    setHasRejectedDocument(true);
-  };
-
  useLayoutEffect(() => {
    const hash = window.location.hash.slice(1);

@@ -206,13 +163,12 @@ export const EmbedSignDocumentClientPage = ({
      // Since a recipient can be provided a name we can lock it without requiring
      // a to be provided by the parent application, unlike direct templates.
      setIsNameLocked(!!data.lockName);
-      setAllowDocumentRejection(!!data.allowDocumentRejection);

      if (data.darkModeDisabled) {
        document.documentElement.classList.add('dark-mode-disabled');
      }

-      if (allowWhitelabelling) {
+      if (isPlatformOrEnterprise) {
        injectCss({
          css: data.css,
          cssVars: data.cssVars,
@@ -241,10 +197,6 @@ export const EmbedSignDocumentClientPage = ({
    }
  }, [hasFinishedInit, hasDocumentLoaded]);

-  if (hasRejectedDocument) {
-    return <EmbedDocumentRejected name={fullName} />;
-  }
-
  if (hasCompletedDocument) {
    return (
      <EmbedDocumentCompleted
@@ -262,261 +214,164 @@ export const EmbedSignDocumentClientPage = ({
  }

  return (
-    <RecipientProvider recipient={recipient} targetSigner={selectedSigner ?? null}>
-      <div className="embed--Root relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
-        {(!hasFinishedInit || !hasDocumentLoaded) && <EmbedClientLoading />}
+    <div className="relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
+      {(!hasFinishedInit || !hasDocumentLoaded) && <EmbedClientLoading />}

-        {allowDocumentRejection && (
-          <div className="embed--Actions mb-4 flex w-full flex-row-reverse items-baseline justify-between">
-            <RejectDocumentDialog
-              document={{ id: documentId }}
-              token={token}
-              onRejected={onDocumentRejected}
-            />
-          </div>
-        )}
-
-        <div className="embed--DocumentContainer relative flex w-full flex-col gap-x-6 gap-y-12 md:flex-row">
-          {/* Viewer */}
-          <div className="embed--DocumentViewer flex-1">
-            <LazyPDFViewer
-              documentData={documentData}
-              onDocumentLoad={() => setHasDocumentLoaded(true)}
-            />
-          </div>
-
-          {/* Widget */}
-          <div
-            key={isExpanded ? 'expanded' : 'collapsed'}
-            className="embed--DocumentWidgetContainer group/document-widget fixed bottom-8 left-0 z-50 h-fit max-h-[calc(100dvh-2rem)] w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
-            data-expanded={isExpanded || undefined}
-          >
-            <div className="embed--DocumentWidget border-border bg-widget flex w-full flex-col rounded-xl border px-4 py-4 md:py-6">
-              {/* Header */}
-              <div className="embed--DocumentWidgetHeader">
-                <div className="flex items-center justify-between gap-x-2">
-                  <h3 className="text-foreground text-xl font-semibold md:text-2xl">
-                    {isAssistantMode ? (
-                      <Trans>Assist with signing</Trans>
-                    ) : (
-                      <Trans>Sign document</Trans>
-                    )}
-                  </h3>
-
-                  {isExpanded ? (
-                    <Button
-                      variant="outline"
-                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
-                      onClick={() => setIsExpanded(false)}
-                    >
-                      <LucideChevronDown className="text-muted-foreground dark:text-background h-5 w-5" />
-                    </Button>
-                  ) : pendingFields.length > 0 ? (
-                    <Button
-                      variant="outline"
-                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
-                      onClick={() => setIsExpanded(true)}
-                    >
-                      <LucideChevronUp className="text-muted-foreground dark:text-background h-5 w-5" />
-                    </Button>
-                  ) : (
-                    <Button
-                      variant="default"
-                      size="sm"
-                      className="md:hidden"
-                      disabled={
-                        isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
-                      }
-                      loading={isSubmitting}
-                      onClick={() => throttledOnCompleteClick()}
-                    >
-                      <Trans>Complete</Trans>
-                    </Button>
-                  )}
-                </div>
-              </div>
-
-              <div className="embed--DocumentWidgetContent hidden group-data-[expanded]/document-widget:block md:block">
-                <p className="text-muted-foreground mt-2 text-sm">
-                  {isAssistantMode ? (
-                    <Trans>Help complete the document for other signers.</Trans>
-                  ) : (
-                    <Trans>Sign the document to complete the process.</Trans>
-                  )}
-                </p>
-
-                <hr className="border-border mb-8 mt-4" />
-              </div>
-
-              {/* Form */}
-              <div className="embed--DocumentWidgetForm -mx-2 hidden px-2 group-data-[expanded]/document-widget:block md:block">
-                <div className="flex flex-1 flex-col gap-y-4">
-                  {isAssistantMode && (
-                    <div>
-                      <Label>
-                        <Trans>Signing for</Trans>
-                      </Label>
-
-                      <fieldset className="dark:bg-background border-border mt-2 rounded-2xl border bg-white p-3">
-                        <RadioGroup
-                          className="gap-0 space-y-3 shadow-none"
-                          value={selectedSignerId?.toString()}
-                          onValueChange={(value) => setSelectedSignerId(Number(value))}
-                        >
-                          {allRecipients
-                            .filter((r) => r.fields.length > 0)
-                            .map((r) => (
-                              <div
-                                key={`${assistantSignersId}-${r.id}`}
-                                className="bg-widget border-border relative flex flex-col gap-4 rounded-lg border p-4"
-                              >
-                                <div className="flex items-center justify-between">
-                                  <div className="flex items-center gap-3">
-                                    <RadioGroupItem
-                                      id={`${assistantSignersId}-${r.id}`}
-                                      value={r.id.toString()}
-                                      className="after:absolute after:inset-0"
-                                    />
-
-                                    <div className="grid grow gap-1">
-                                      <Label
-                                        className="inline-flex items-start"
-                                        htmlFor={`${assistantSignersId}-${r.id}`}
-                                      >
-                                        {r.name}
-
-                                        {r.id === recipient.id && (
-                                          <span className="text-muted-foreground ml-2">
-                                            {_(msg`(You)`)}
-                                          </span>
-                                        )}
-                                      </Label>
-                                      <p className="text-muted-foreground text-xs">{r.email}</p>
-                                    </div>
-                                  </div>
-                                  <div className="text-muted-foreground text-xs leading-[inherit]">
-                                    {r.fields.length} {r.fields.length === 1 ? 'field' : 'fields'}
-                                  </div>
-                                </div>
-                              </div>
-                            ))}
-                        </RadioGroup>
-                      </fieldset>
-                    </div>
-                  )}
-
-                  {!isAssistantMode && (
-                    <>
-                      <div>
-                        <Label htmlFor="full-name">
-                          <Trans>Full Name</Trans>
-                        </Label>
-
-                        <Input
-                          type="text"
-                          id="full-name"
-                          className="bg-background mt-2"
-                          disabled={isNameLocked}
-                          value={fullName}
-                          onChange={(e) => !isNameLocked && setFullName(e.target.value)}
-                        />
-                      </div>
-
-                      <div>
-                        <Label htmlFor="email">
-                          <Trans>Email</Trans>
-                        </Label>
-
-                        <Input
-                          type="email"
-                          id="email"
-                          className="bg-background mt-2"
-                          value={email}
-                          disabled
-                        />
-                      </div>
-
-                      <div>
-                        <Label htmlFor="Signature">
-                          <Trans>Signature</Trans>
-                        </Label>
-
-                        <Card className="mt-2" gradient degrees={-120}>
-                          <CardContent className="p-0">
-                            <SignaturePad
-                              className="h-44 w-full"
-                              disabled={isThrottled || isSubmitting}
-                              defaultValue={signature ?? undefined}
-                              onChange={(value) => {
-                                setSignature(value);
-                              }}
-                              onValidityChange={(isValid) => {
-                                setSignatureValid(isValid);
-                              }}
-                              allowTypedSignature={Boolean(
-                                metadata &&
-                                  'typedSignatureEnabled' in metadata &&
-                                  metadata.typedSignatureEnabled,
-                              )}
-                            />
-                          </CardContent>
-                        </Card>
-
-                        {hasSignatureField && !signatureValid && (
-                          <div className="text-destructive mt-2 text-sm">
-                            <Trans>
-                              Signature is too small. Please provide a more complete signature.
-                            </Trans>
-                          </div>
-                        )}
-                      </div>
-                    </>
-                  )}
-                </div>
-              </div>
-
-              <div className="hidden flex-1 group-data-[expanded]/document-widget:block md:block" />
-
-              <div className="embed--DocumentWidgetFooter mt-4 hidden w-full grid-cols-2 items-center group-data-[expanded]/document-widget:grid md:grid">
-                {pendingFields.length > 0 ? (
-                  <Button className="col-start-2" onClick={() => onNextFieldClick()}>
-                    <Trans>Next</Trans>
-                  </Button>
-                ) : (
-                  <Button
-                    className={allowDocumentRejection ? 'col-start-2' : 'col-span-2'}
-                    disabled={
-                      isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
-                    }
-                    loading={isSubmitting}
-                    onClick={() => throttledOnCompleteClick()}
-                  >
-                    <Trans>Complete</Trans>
-                  </Button>
-                )}
-              </div>
-            </div>
-          </div>
-
-          <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
-            {showPendingFieldTooltip && pendingFields.length > 0 && (
-              <FieldToolTip key={pendingFields[0].id} field={pendingFields[0]} color="warning">
-                <Trans>Click to insert field</Trans>
-              </FieldToolTip>
-            )}
-          </ElementVisible>
-
-          {/* Fields */}
-          <EmbedDocumentFields fields={fields} metadata={metadata} />
+      <div className="relative flex w-full flex-col gap-x-6 gap-y-12 md:flex-row">
+        {/* Viewer */}
+        <div className="flex-1">
+          <LazyPDFViewer
+            documentData={documentData}
+            onDocumentLoad={() => setHasDocumentLoaded(true)}
+          />
        </div>

-        {!hidePoweredBy && (
-          <div className="bg-primary text-primary-foreground fixed bottom-0 left-0 z-40 rounded-tr px-2 py-1 text-xs font-medium opacity-60 hover:opacity-100">
-            <span>Powered by</span>
-            <Logo className="ml-2 inline-block h-[14px]" />
+        {/* Widget */}
+        <div
+          key={isExpanded ? 'expanded' : 'collapsed'}
+          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
+          data-expanded={isExpanded || undefined}
+        >
+          <div className="border-border bg-widget flex w-full flex-col rounded-xl border px-4 py-4 md:py-6">
+            {/* Header */}
+            <div>
+              <div className="flex items-center justify-between gap-x-2">
+                <h3 className="text-foreground text-xl font-semibold md:text-2xl">
+                  <Trans>Sign document</Trans>
+                </h3>
+
+                <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
+                  {isExpanded ? (
+                    <LucideChevronDown
+                      className="text-muted-foreground h-5 w-5"
+                      onClick={() => setIsExpanded(false)}
+                    />
+                  ) : (
+                    <LucideChevronUp
+                      className="text-muted-foreground h-5 w-5"
+                      onClick={() => setIsExpanded(true)}
+                    />
+                  )}
+                </Button>
+              </div>
+            </div>
+
+            <div className="hidden group-data-[expanded]/document-widget:block md:block">
+              <p className="text-muted-foreground mt-2 text-sm">
+                <Trans>Sign the document to complete the process.</Trans>
+              </p>
+
+              <hr className="border-border mb-8 mt-4" />
+            </div>
+
+            {/* Form */}
+            <div className="-mx-2 hidden px-2 group-data-[expanded]/document-widget:block md:block">
+              <div className="flex flex-1 flex-col gap-y-4">
+                <div>
+                  <Label htmlFor="full-name">
+                    <Trans>Full Name</Trans>
+                  </Label>
+
+                  <Input
+                    type="text"
+                    id="full-name"
+                    className="bg-background mt-2"
+                    disabled={isNameLocked}
+                    value={fullName}
+                    onChange={(e) => !isNameLocked && setFullName(e.target.value)}
+                  />
+                </div>
+
+                <div>
+                  <Label htmlFor="email">
+                    <Trans>Email</Trans>
+                  </Label>
+
+                  <Input
+                    type="email"
+                    id="email"
+                    className="bg-background mt-2"
+                    value={email}
+                    disabled
+                  />
+                </div>
+
+                <div>
+                  <Label htmlFor="Signature">
+                    <Trans>Signature</Trans>
+                  </Label>
+
+                  <Card className="mt-2" gradient degrees={-120}>
+                    <CardContent className="p-0">
+                      <SignaturePad
+                        className="h-44 w-full"
+                        disabled={isThrottled || isSubmitting}
+                        defaultValue={signature ?? undefined}
+                        onChange={(value) => {
+                          setSignature(value);
+                        }}
+                        onValidityChange={(isValid) => {
+                          setSignatureValid(isValid);
+                        }}
+                        allowTypedSignature={Boolean(
+                          metadata &&
+                            'typedSignatureEnabled' in metadata &&
+                            metadata.typedSignatureEnabled,
+                        )}
+                      />
+                    </CardContent>
+                  </Card>
+
+                  {hasSignatureField && !signatureValid && (
+                    <div className="text-destructive mt-2 text-sm">
+                      <Trans>
+                        Signature is too small. Please provide a more complete signature.
+                      </Trans>
+                    </div>
+                  )}
+                </div>
+              </div>
+            </div>
+
+            <div className="hidden flex-1 group-data-[expanded]/document-widget:block md:block" />
+
+            <div className="mt-4 hidden w-full grid-cols-2 items-center group-data-[expanded]/document-widget:grid md:grid">
+              {pendingFields.length > 0 ? (
+                <Button className="col-start-2" onClick={() => onNextFieldClick()}>
+                  <Trans>Next</Trans>
+                </Button>
+              ) : (
+                <Button
+                  className="col-start-2"
+                  disabled={isThrottled || (hasSignatureField && !signatureValid)}
+                  loading={isSubmitting}
+                  onClick={() => throttledOnCompleteClick()}
+                >
+                  <Trans>Complete</Trans>
+                </Button>
+              )}
+            </div>
          </div>
-        )}
+        </div>
+
+        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
+          {showPendingFieldTooltip && pendingFields.length > 0 && (
+            <FieldToolTip key={pendingFields[0].id} field={pendingFields[0]} color="warning">
+              <Trans>Click to insert field</Trans>
+            </FieldToolTip>
+          )}
+        </ElementVisible>
+
+        {/* Fields */}
+        <EmbedDocumentFields recipient={recipient} fields={fields} metadata={metadata} />
      </div>
-    </RecipientProvider>
+
+      {!hidePoweredBy && (
+        <div className="bg-primary text-primary-foreground fixed bottom-0 left-0 z-40 rounded-tr px-2 py-1 text-xs font-medium opacity-60 hover:opacity-100">
+          <span>Powered by</span>
+          <Logo className="ml-2 inline-block h-[14px]" />
+        </div>
+      )}
+    </div>
  );
 };
@@ -2,27 +2,23 @@ import { notFound } from 'next/navigation';

 import { match } from 'ts-pattern';

-import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
 import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
-import { getIsRecipientsTurnToSign } from '@documenso/lib/server-only/recipient/get-is-recipient-turn';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
-import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';
 import { getTeamById } from '@documenso/lib/server-only/team/get-team';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { DocumentStatus, RecipientRole } from '@documenso/prisma/client';
+import { DocumentStatus } from '@documenso/prisma/client';

 import { DocumentAuthProvider } from '~/app/(signing)/sign/[token]/document-auth-provider';
 import { SigningProvider } from '~/app/(signing)/sign/[token]/provider';

 import { EmbedAuthenticateView } from '../../authenticate';
 import { EmbedPaywall } from '../../paywall';
-import { EmbedWaitingForTurn } from '../../waiting-for-turn';
 import { EmbedSignDocumentClientPage } from './client';

 export type EmbedSignDocumentPageProps = {
@@ -63,16 +59,12 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
    return <EmbedPaywall />;
  }

-  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
+  const [isPlatformDocument, isEnterpriseDocument] = await Promise.all([
    isDocumentPlatform(document),
    isUserEnterprise({
      userId: document.userId,
      teamId: document.teamId ?? undefined,
    }),
-    isUserCommunityPlan({
-      userId: document.userId,
-      teamId: document.teamId ?? undefined,
-    }),
  ]);

  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
@@ -93,19 +85,6 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
    );
  }

-  const isRecipientsTurnToSign = await getIsRecipientsTurnToSign({ token });
-
-  if (!isRecipientsTurnToSign) {
-    return <EmbedWaitingForTurn />;
-  }
-
-  const allRecipients =
-    recipient.role === RecipientRole.ASSISTANT
-      ? await getRecipientsForAssistant({
-          token,
-        })
-      : [];
-
  const team = document.teamId
    ? await getTeamById({ teamId: document.teamId, userId: document.userId }).catch(() => null)
    : null;
@@ -131,11 +110,8 @@ export default async function EmbedSignDocumentPage({ params }: EmbedSignDocumen
          fields={fields}
          metadata={document.documentMeta}
          isCompleted={document.status === DocumentStatus.COMPLETED}
-          hidePoweredBy={
-            isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
-          }
-          allowWhitelabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
-          allRecipients={allRecipients}
+          hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
+          isPlatformOrEnterprise={isPlatformDocument || isEnterpriseDocument}
        />
      </DocumentAuthProvider>
    </SigningProvider>
@@ -13,5 +13,4 @@ export const ZSignDocumentEmbedDataSchema = ZBaseEmbedDataSchema.extend({
    .optional()
    .transform((value) => value || undefined),
  lockName: z.boolean().optional().default(false),
-  allowDocumentRejection: z.boolean().optional(),
 });
@@ -1,48 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-import { Trans } from '@lingui/macro';
-
-export const EmbedWaitingForTurn = () => {
-  const [hasPostedMessage, setHasPostedMessage] = useState(false);
-
-  useEffect(() => {
-    if (window.parent && !hasPostedMessage) {
-      window.parent.postMessage(
-        {
-          action: 'document-waiting-for-turn',
-          data: null,
-        },
-        '*',
-      );
-    }
-
-    setHasPostedMessage(true);
-  }, [hasPostedMessage]);
-
-  if (!hasPostedMessage) {
-    return null;
-  }
-
-  return (
-    <div className="embed--WaitingForTurn relative mx-auto flex min-h-[100dvh] max-w-screen-lg flex-col items-center justify-center p-6">
-      <h3 className="text-foreground text-center text-2xl font-bold">
-        <Trans>Waiting for Your Turn</Trans>
-      </h3>
-
-      <div className="mt-8 max-w-[50ch] text-center">
-        <p className="text-muted-foreground text-sm">
-          <Trans>
-            It's currently not your turn to sign. Please check back soon as this document should be
-            available for you to sign shortly.
-          </Trans>
-        </p>
-
-        <p className="text-muted-foreground mt-4 text-sm">
-          <Trans>Please check with the parent application for more information.</Trans>
-        </p>
-      </div>
-    </div>
-  );
-};
@@ -85,7 +85,7 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
  const [search, setSearch] = useState('');
  const [pages, setPages] = useState<string[]>([]);

-  const { data: searchDocumentsData, isPending: isSearchingDocuments } =
+  const { data: searchDocumentsData, isLoading: isSearchingDocuments } =
    trpcReact.document.searchDocuments.useQuery(
      {
        query: search,
@@ -67,7 +67,7 @@ export const TransferTeamDialog = ({
  const {
    data,
    refetch: refetchTeamMembers,
-    isPending: loadingTeamMembers,
+    isLoading: loadingTeamMembers,
    isLoadingError: loadingTeamMembersError,
  } = trpc.team.getTeamMembers.useQuery({
    teamId,
@@ -353,16 +353,6 @@ export const DocumentHistorySheet = ({
                      />
                    ),
                  )
-                  .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_PREFILLED }, ({ data }) => (
-                    <DocumentHistorySheetChanges
-                      values={[
-                        {
-                          key: 'Field prefilled',
-                          value: formatGenericText(data.field.type),
-                        },
-                      ]}
-                    />
-                  ))
                  .exhaustive()}

                {isUserDetailsVisible && (
@@ -1,6 +1,6 @@
 {
  "private": true,
-  "version": "1.9.1-rc.7",
+  "version": "1.9.0-rc.11",
  "scripts": {
    "build": "turbo run build",
    "build:web": "turbo run build --filter=@documenso/web",
@@ -540,19 +540,12 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
    if (i > 1) {
      await page.getByRole('button', { name: 'Add Signer' }).click();
    }
-
    await page
-      .getByLabel('Email')
-      .nth(i - 1)
-      .focus();
-
-    await page
-      .getByLabel('Email')
+      .getByPlaceholder('Email')
      .nth(i - 1)
      .fill(`user${i}@example.com`);
-
    await page
-      .getByLabel('Name')
+      .getByPlaceholder('Name')
      .nth(i - 1)
      .fill(`User ${i}`);
  }
@@ -4,14 +4,15 @@ import { stripe } from '@documenso/lib/server-only/stripe';
 type PlanType = (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE];

 export const getPricesByPlan = async (plan: PlanType | PlanType[]) => {
-  const planTypes: string[] = typeof plan === 'string' ? [plan] : plan;
+  const planTypes = typeof plan === 'string' ? [plan] : plan;

-  const prices = await stripe.prices.list({
+  const query = planTypes.map((planType) => `metadata['plan']:'${planType}'`).join(' OR ');
+
+  const { data: prices } = await stripe.prices.search({
+    query,
    expand: ['data.product'],
    limit: 100,
  });

-  return prices.data.filter(
-    (price) => price.type === 'recurring' && planTypes.includes(price.metadata.plan),
-  );
+  return prices.filter((price) => price.type === 'recurring');
 };
@@ -1,56 +0,0 @@
-import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
-import { prisma } from '@documenso/prisma';
-import type { Subscription } from '@documenso/prisma/client';
-
-import { getCommunityPlanPriceIds } from '../stripe/get-community-plan-prices';
-
-export type IsCommunityPlanOptions = {
-  userId: number;
-  teamId?: number;
-};
-
-/**
- * Whether the user or team is on the community plan.
- */
-export const isCommunityPlan = async ({
-  userId,
-  teamId,
-}: IsCommunityPlanOptions): Promise<boolean> => {
-  let subscriptions: Subscription[] = [];
-
-  if (teamId) {
-    subscriptions = await prisma.team
-      .findFirstOrThrow({
-        where: {
-          id: teamId,
-        },
-        select: {
-          owner: {
-            include: {
-              subscriptions: true,
-            },
-          },
-        },
-      })
-      .then((team) => team.owner.subscriptions);
-  } else {
-    subscriptions = await prisma.user
-      .findFirstOrThrow({
-        where: {
-          id: userId,
-        },
-        select: {
-          subscriptions: true,
-        },
-      })
-      .then((user) => user.subscriptions);
-  }
-
-  if (subscriptions.length === 0) {
-    return false;
-  }
-
-  const communityPlanPriceIds = await getCommunityPlanPriceIds();
-
-  return subscriptionsContainsActivePlan(subscriptions, communityPlanPriceIds);
-};
@@ -84,9 +84,6 @@ export const TemplateDocumentInvite = ({
            .with(RecipientRole.VIEWER, () => <Trans>Continue by viewing the document.</Trans>)
            .with(RecipientRole.APPROVER, () => <Trans>Continue by approving the document.</Trans>)
            .with(RecipientRole.CC, () => '')
-            .with(RecipientRole.ASSISTANT, () => (
-              <Trans>Continue by assisting with the document.</Trans>
-            ))
            .exhaustive()}
        </Text>

@@ -107,7 +104,6 @@ export const TemplateDocumentInvite = ({
              .with(RecipientRole.VIEWER, () => <Trans>View Document</Trans>)
              .with(RecipientRole.APPROVER, () => <Trans>Approve Document</Trans>)
              .with(RecipientRole.CC, () => '')
-              .with(RecipientRole.ASSISTANT, () => <Trans>Assist Document</Trans>)
              .exhaustive()}
          </Button>
        </Section>
@@ -10,9 +10,6 @@ export const DOCUMENT_AUDIT_LOG_EMAIL_FORMAT = {
  [DOCUMENT_EMAIL_TYPE.APPROVE_REQUEST]: {
    description: 'Approval request',
  },
-  [DOCUMENT_EMAIL_TYPE.ASSISTING_REQUEST]: {
-    description: 'Assisting request',
-  },
  [DOCUMENT_EMAIL_TYPE.CC]: {
    description: 'CC',
  },
@@ -1,6 +1,6 @@
 import { z } from 'zod';

-export const SUPPORTED_LANGUAGE_CODES = ['de', 'en', 'fr', 'es', 'it', 'pl'] as const;
+export const SUPPORTED_LANGUAGE_CODES = ['de', 'en', 'fr', 'es'] as const;

 export const ZSupportedLanguageCodeSchema = z.enum(SUPPORTED_LANGUAGE_CODES).catch('en');

@@ -46,14 +46,6 @@ export const SUPPORTED_LANGUAGES: Record<string, SupportedLanguage> = {
    full: 'Spanish',
    short: 'es',
  },
-  it: {
-    full: 'Italian',
-    short: 'it',
-  },
-  pl: {
-    short: 'pl',
-    full: 'Polish',
-  },
 } satisfies Record<SupportedLanguageCodes, SupportedLanguage>;

 export const isValidLanguageCode = (code: unknown): code is SupportedLanguageCodes =>
@@ -32,26 +32,12 @@ export const RECIPIENT_ROLES_DESCRIPTION = {
    roleName: msg`Viewer`,
    roleNamePlural: msg`Viewers`,
  },
-  [RecipientRole.ASSISTANT]: {
-    actionVerb: msg`Assist`,
-    actioned: msg`Assisted`,
-    progressiveVerb: msg`Assisting`,
-    roleName: msg`Assistant`,
-    roleNamePlural: msg`Assistants`,
-  },
 } satisfies Record<keyof typeof RecipientRole, unknown>;

-export const RECIPIENT_ROLE_TO_DISPLAY_TYPE = {
-  [RecipientRole.SIGNER]: `SIGNING_REQUEST`,
-  [RecipientRole.VIEWER]: `VIEW_REQUEST`,
-  [RecipientRole.APPROVER]: `APPROVE_REQUEST`,
-} as const;
-
 export const RECIPIENT_ROLE_TO_EMAIL_TYPE = {
  [RecipientRole.SIGNER]: `SIGNING_REQUEST`,
  [RecipientRole.VIEWER]: `VIEW_REQUEST`,
  [RecipientRole.APPROVER]: `APPROVE_REQUEST`,
-  [RecipientRole.ASSISTANT]: `ASSISTING_REQUEST`,
 } as const;

 export const RECIPIENT_ROLE_SIGNING_REASONS = {
@@ -59,5 +45,4 @@ export const RECIPIENT_ROLE_SIGNING_REASONS = {
  [RecipientRole.APPROVER]: msg`I am an approver of this document`,
  [RecipientRole.CC]: msg`I am required to receive a copy of this document`,
  [RecipientRole.VIEWER]: msg`I am a viewer of this document`,
-  [RecipientRole.ASSISTANT]: msg`I am an assistant of this document`,
 } satisfies Record<keyof typeof RecipientRole, MessageDescriptor>;
@@ -1,7 +1,11 @@
 import { DateTime } from 'luxon';

-import { prisma } from '@documenso/prisma';
-import { DocumentStatus, SubscriptionStatus } from '@documenso/prisma/client';
+import { kyselyPrisma, prisma, sql } from '@documenso/prisma';
+import {
+  DocumentStatus,
+  SubscriptionStatus,
+  UserSecurityAuditLogType,
+} from '@documenso/prisma/client';

 export const getUsersCount = async () => {
  return await prisma.user.count();
@@ -80,3 +84,38 @@ export const getUserWithSignedDocumentMonthlyGrowth = async () => {
    signed_count: Number(row.signed_count),
  }));
 };
+
+export type GetMonthlyActiveUsersResult = Array<{
+  month: string;
+  count: number;
+  cume_count: number;
+}>;
+
+export const getMonthlyActiveUsers = async () => {
+  const qb = kyselyPrisma.$kysely
+    .selectFrom('UserSecurityAuditLog')
+    .select(({ fn }) => [
+      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'UserSecurityAuditLog.createdAt']).as('month'),
+      fn.count('userId').distinct().as('count'),
+      fn
+        .sum(fn.count('userId').distinct())
+        .over((ob) =>
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'UserSecurityAuditLog.createdAt']) as any),
+        )
+        .as('cume_count'),
+    ])
+    // @ts-expect-error - Raw SQL enum casting not properly typed by Kysely
+    .where(sql`type = ${UserSecurityAuditLogType.SIGN_IN}::"UserSecurityAuditLogType"`)
+    .groupBy(({ fn }) => fn('DATE_TRUNC', [sql.lit('MONTH'), 'UserSecurityAuditLog.createdAt']))
+    .orderBy('month', 'desc')
+    .limit(12);
+
+  const result = await qb.execute();
+
+  return result.map((row) => ({
+    month: DateTime.fromJSDate(row.month).toFormat('yyyy-MM'),
+    count: Number(row.count),
+    cume_count: Number(row.cume_count),
+  }));
+};
@@ -12,7 +12,6 @@ import {
  WebhookTriggerEvents,
 } from '@documenso/prisma/client';

-import { AppError, AppErrorCode } from '../../errors/app-error';
 import { jobs } from '../../jobs/client';
 import type { TRecipientActionAuth } from '../../types/document-auth';
 import {
@@ -73,13 +72,6 @@ export const completeDocumentWithToken = async ({
    throw new Error(`Recipient ${recipient.id} has already signed`);
  }

-  if (recipient.signingStatus === SigningStatus.REJECTED) {
-    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
-      message: 'Recipient has already rejected the document',
-      statusCode: 400,
-    });
-  }
-
  if (document.documentMeta?.signingOrder === DocumentSigningOrder.SEQUENTIAL) {
    const isRecipientsTurn = await getIsRecipientsTurnToSign({ token: recipient.token });

@@ -88,7 +88,6 @@ export const findDocuments = async ({
  const searchFilter: Prisma.DocumentWhereInput = {
    OR: [
      { title: { contains: query, mode: 'insensitive' } },
-      { externalId: { contains: query, mode: 'insensitive' } },
      { recipients: { some: { name: { contains: query, mode: 'insensitive' } } } },
      { recipients: { some: { email: { contains: query, mode: 'insensitive' } } } },
    ],
@@ -14,8 +14,8 @@ import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-reques
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template';
 import { prisma } from '@documenso/prisma';
-import type { Prisma } from '@documenso/prisma/client';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import type { Prisma } from '@documenso/prisma/client';

 import { getI18nInstance } from '../../client-only/providers/i18n.server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
@@ -34,14 +34,6 @@ export const searchDocumentsWithKeyword = async ({
          userId: userId,
          deletedAt: null,
        },
-        {
-          externalId: {
-            contains: query,
-            mode: 'insensitive',
-          },
-          userId: userId,
-          deletedAt: null,
-        },
        {
          recipients: {
            some: {
@@ -96,23 +88,6 @@ export const searchDocumentsWithKeyword = async ({
          },
          deletedAt: null,
        },
-        {
-          externalId: {
-            contains: query,
-            mode: 'insensitive',
-          },
-          teamId: {
-            not: null,
-          },
-          team: {
-            members: {
-              some: {
-                userId: userId,
-              },
-            },
-          },
-          deletedAt: null,
-        },
      ],
    },
    include: {
@@ -1,55 +1,15 @@
 import { prisma } from '@documenso/prisma';
-import { FieldType, RecipientRole, SigningStatus } from '@documenso/prisma/client';

 export type GetFieldsForTokenOptions = {
  token: string;
 };

 export const getFieldsForToken = async ({ token }: GetFieldsForTokenOptions) => {
-  if (!token) {
-    throw new Error('Missing token');
-  }
-
-  const recipient = await prisma.recipient.findFirst({
-    where: { token },
-  });
-
-  if (!recipient) {
-    return [];
-  }
-
-  if (recipient.role === RecipientRole.ASSISTANT) {
-    return await prisma.field.findMany({
-      where: {
-        OR: [
-          {
-            type: {
-              not: FieldType.SIGNATURE,
-            },
-            recipient: {
-              signingStatus: {
-                not: SigningStatus.SIGNED,
-              },
-              signingOrder: {
-                gte: recipient.signingOrder ?? 0,
-              },
-            },
-            documentId: recipient.documentId,
-          },
-          {
-            recipientId: recipient.id,
-          },
-        ],
-      },
-      include: {
-        signature: true,
-      },
-    });
-  }
-
  return await prisma.field.findMany({
    where: {
-      recipientId: recipient.id,
+      recipient: {
+        token,
+      },
    },
    include: {
      signature: true,
@@ -4,7 +4,7 @@ import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-log
 import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
-import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';

 export type RemovedSignedFieldWithTokenOptions = {
  token: string;
@@ -17,28 +17,11 @@ export const removeSignedFieldWithToken = async ({
  fieldId,
  requestMetadata,
 }: RemovedSignedFieldWithTokenOptions) => {
-  const recipient = await prisma.recipient.findFirstOrThrow({
-    where: {
-      token,
-    },
-  });
-
  const field = await prisma.field.findFirstOrThrow({
    where: {
      id: fieldId,
      recipient: {
-        ...(recipient.role !== RecipientRole.ASSISTANT
-          ? {
-              id: recipient.id,
-            }
-          : {
-              signingOrder: {
-                gte: recipient.signingOrder ?? 0,
-              },
-              signingStatus: {
-                not: SigningStatus.SIGNED,
-              },
-            }),
+        token,
      },
    },
    include: {
@@ -47,7 +30,7 @@ export const removeSignedFieldWithToken = async ({
    },
  });

-  const { document } = field;
+  const { document, recipient } = field;

  if (!document) {
    throw new Error(`Document not found for field ${field.id}`);
@@ -57,10 +40,7 @@ export const removeSignedFieldWithToken = async ({
    throw new Error(`Document ${document.id} must be pending`);
  }

-  if (
-    recipient?.signingStatus === SigningStatus.SIGNED ||
-    field.recipient.signingStatus === SigningStatus.SIGNED
-  ) {
+  if (recipient?.signingStatus === SigningStatus.SIGNED) {
    throw new Error(`Recipient ${recipient.id} has already signed`);
  }

@@ -86,22 +66,20 @@ export const removeSignedFieldWithToken = async ({
      },
    });

-    if (recipient.role !== RecipientRole.ASSISTANT) {
-      await tx.documentAuditLog.create({
-        data: createDocumentAuditLogData({
-          type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED,
-          documentId: document.id,
-          user: {
-            name: recipient.name,
-            email: recipient.email,
-          },
-          requestMetadata,
-          data: {
-            field: field.type,
-            fieldId: field.secondaryId,
-          },
-        }),
-      });
-    }
+    await tx.documentAuditLog.create({
+      data: createDocumentAuditLogData({
+        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_UNINSERTED,
+        documentId: document.id,
+        user: {
+          name: recipient?.name,
+          email: recipient?.email,
+        },
+        requestMetadata,
+        data: {
+          field: field.type,
+          fieldId: field.secondaryId,
+        },
+      }),
+    });
  });
 };
@@ -10,7 +10,7 @@ import { validateRadioField } from '@documenso/lib/advanced-fields-validation/va
 import { validateTextField } from '@documenso/lib/advanced-fields-validation/validate-text';
 import { fromCheckboxValue } from '@documenso/lib/universal/field-checkbox';
 import { prisma } from '@documenso/prisma';
-import { DocumentStatus, FieldType, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import { DocumentStatus, FieldType, SigningStatus } from '@documenso/prisma/client';

 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '../../constants/date-formats';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '../../constants/time-zones';
@@ -56,41 +56,20 @@ export const signFieldWithToken = async ({
  authOptions,
  requestMetadata,
 }: SignFieldWithTokenOptions) => {
-  const recipient = await prisma.recipient.findFirstOrThrow({
-    where: {
-      token,
-    },
-  });
-
  const field = await prisma.field.findFirstOrThrow({
    where: {
      id: fieldId,
      recipient: {
-        ...(recipient.role !== RecipientRole.ASSISTANT
-          ? {
-              id: recipient.id,
-            }
-          : {
-              signingStatus: {
-                not: SigningStatus.SIGNED,
-              },
-              signingOrder: {
-                gte: recipient.signingOrder ?? 0,
-              },
-            }),
+        token,
      },
    },
    include: {
-      document: {
-        include: {
-          recipients: true,
-        },
-      },
+      document: true,
      recipient: true,
    },
  });

-  const { document } = field;
+  const { document, recipient } = field;

  if (!document) {
    throw new Error(`Document not found for field ${field.id}`);
@@ -108,10 +87,7 @@ export const signFieldWithToken = async ({
    throw new Error(`Document ${document.id} must be pending for signing`);
  }

-  if (
-    recipient.signingStatus === SigningStatus.SIGNED ||
-    field.recipient.signingStatus === SigningStatus.SIGNED
-  ) {
+  if (recipient?.signingStatus === SigningStatus.SIGNED) {
    throw new Error(`Recipient ${recipient.id} has already signed`);
  }

@@ -207,8 +183,6 @@ export const signFieldWithToken = async ({
    throw new Error('Typed signatures are not allowed. Please draw your signature');
  }

-  const assistant = recipient.role === RecipientRole.ASSISTANT ? recipient : undefined;
-
  return await prisma.$transaction(async (tx) => {
    const updatedField = await tx.field.update({
      where: {
@@ -245,14 +219,11 @@ export const signFieldWithToken = async ({

    await tx.documentAuditLog.create({
      data: createDocumentAuditLogData({
-        type:
-          assistant && field.recipientId !== assistant.id
-            ? DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_PREFILLED
-            : DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED,
+        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_INSERTED,
        documentId: document.id,
        user: {
-          email: assistant?.email ?? recipient.email,
-          name: assistant?.name ?? recipient.name,
+          email: recipient.email,
+          name: recipient.name,
        },
        requestMetadata,
        data: {
@@ -9,8 +9,5 @@ export const getRecipientByToken = async ({ token }: GetRecipientByTokenOptions)
    where: {
      token,
    },
-    include: {
-      fields: true,
-    },
  });
 };
@@ -1,57 +0,0 @@
-import { prisma } from '@documenso/prisma';
-import { FieldType } from '@documenso/prisma/client';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-
-export interface GetRecipientsForAssistantOptions {
-  token: string;
-}
-
-export const getRecipientsForAssistant = async ({ token }: GetRecipientsForAssistantOptions) => {
-  const assistant = await prisma.recipient.findFirst({
-    where: {
-      token,
-    },
-  });
-
-  if (!assistant) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Assistant not found',
-    });
-  }
-
-  let recipients = await prisma.recipient.findMany({
-    where: {
-      documentId: assistant.documentId,
-      signingOrder: {
-        gte: assistant.signingOrder ?? 0,
-      },
-    },
-    include: {
-      fields: {
-        where: {
-          OR: [
-            {
-              recipientId: assistant.id,
-            },
-            {
-              type: {
-                not: FieldType.SIGNATURE,
-              },
-              documentId: assistant.documentId,
-            },
-          ],
-        },
-      },
-    },
-  });
-
-  // Omit the token for recipients other than the assistant so
-  // it doesn't get sent to the client.
-  recipients = recipients.map((recipient) => ({
-    ...recipient,
-    token: recipient.id === assistant.id ? token : '',
-  }));
-
-  return recipients;
-};
@@ -1,46 +0,0 @@
-import { DocumentStatus, RecipientRole, SigningStatus } from '@prisma/client';
-
-import { prisma } from '@documenso/prisma';
-
-type GetNextInboxDocumentOptions = {
-  email: string | undefined;
-};
-
-export const getNextInboxDocument = async ({ email }: GetNextInboxDocumentOptions) => {
-  if (!email) {
-    throw new Error('User is required');
-  }
-
-  return await prisma.document.findMany({
-    where: {
-      recipients: {
-        some: {
-          email,
-          signingStatus: SigningStatus.NOT_SIGNED,
-          role: {
-            not: RecipientRole.CC,
-          },
-        },
-      },
-      status: { not: DocumentStatus.DRAFT },
-      deletedAt: null,
-    },
-    select: {
-      id: true,
-      createdAt: true,
-      title: true,
-      status: true,
-      recipients: {
-        where: {
-          email,
-        },
-        select: {
-          token: true,
-          role: true,
-        },
-      },
-      documentMeta: true,
-    },
-    orderBy: [{ createdAt: 'asc' }],
-  });
-};
@@ -28,7 +28,6 @@ export const ZDocumentAuditLogTypeSchema = z.enum([
  'DOCUMENT_DELETED', // When the document is soft deleted.
  'DOCUMENT_FIELD_INSERTED', // When a field is inserted (signed/approved/etc) by a recipient.
  'DOCUMENT_FIELD_UNINSERTED', // When a field is uninserted by a recipient.
-  'DOCUMENT_FIELD_PREFILLED', // When a field is prefilled by an assistant.
  'DOCUMENT_VISIBILITY_UPDATED', // When the document visibility scope is updated
  'DOCUMENT_GLOBAL_AUTH_ACCESS_UPDATED', // When the global access authentication is updated.
  'DOCUMENT_GLOBAL_AUTH_ACTION_UPDATED', // When the global action authentication is updated.
@@ -46,7 +45,6 @@ export const ZDocumentAuditLogEmailTypeSchema = z.enum([
  'SIGNING_REQUEST',
  'VIEW_REQUEST',
  'APPROVE_REQUEST',
-  'ASSISTING_REQUEST',
  'CC',
  'DOCUMENT_COMPLETED',
 ]);
@@ -315,83 +313,6 @@ export const ZDocumentAuditLogEventDocumentFieldUninsertedSchema = z.object({
  }),
 });

-/**
- * Event: Document field prefilled by assistant.
- */
-export const ZDocumentAuditLogEventDocumentFieldPrefilledSchema = z.object({
-  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_PREFILLED),
-  data: ZBaseRecipientDataSchema.extend({
-    fieldId: z.string(),
-
-    // Organised into union to allow us to extend each field if required.
-    field: z.union([
-      z.object({
-        type: z.literal(FieldType.INITIALS),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.EMAIL),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.DATE),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.NAME),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.TEXT),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.union([z.literal(FieldType.SIGNATURE), z.literal(FieldType.FREE_SIGNATURE)]),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.RADIO),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.CHECKBOX),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.DROPDOWN),
-        data: z.string(),
-      }),
-      z.object({
-        type: z.literal(FieldType.NUMBER),
-        data: z.string(),
-      }),
-    ]),
-    fieldSecurity: z.preprocess(
-      (input) => {
-        const legacyNoneSecurityType = JSON.stringify({
-          type: 'NONE',
-        });
-
-        // Replace legacy 'NONE' field security type with undefined.
-        if (
-          typeof input === 'object' &&
-          input !== null &&
-          JSON.stringify(input) === legacyNoneSecurityType
-        ) {
-          return undefined;
-        }
-
-        return input;
-      },
-      z
-        .object({
-          type: ZRecipientActionAuthTypesSchema,
-        })
-        .optional(),
-    ),
-  }),
-});
-
 export const ZDocumentAuditLogEventDocumentVisibilitySchema = z.object({
  type: z.literal(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VISIBILITY_UPDATED),
  data: ZGenericFromToSchema,
@@ -572,7 +493,6 @@ export const ZDocumentAuditLogSchema = ZDocumentAuditLogBaseSchema.and(
    ZDocumentAuditLogEventDocumentMovedToTeamSchema,
    ZDocumentAuditLogEventDocumentFieldInsertedSchema,
    ZDocumentAuditLogEventDocumentFieldUninsertedSchema,
-    ZDocumentAuditLogEventDocumentFieldPrefilledSchema,
    ZDocumentAuditLogEventDocumentVisibilitySchema,
    ZDocumentAuditLogEventDocumentGlobalAuthAccessUpdatedSchema,
    ZDocumentAuditLogEventDocumentGlobalAuthActionUpdatedSchema,
@@ -314,10 +314,6 @@ export const formatDocumentAuditLogAction = (
      anonymous: msg`Field unsigned`,
      identified: msg`${prefix} unsigned a field`,
    }))
-    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_FIELD_PREFILLED }, () => ({
-      anonymous: msg`Field prefilled by assistant`,
-      identified: msg`${prefix} prefilled a field`,
-    }))
    .with({ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_VISIBILITY_UPDATED }, () => ({
      anonymous: msg`Document visibility updated`,
      identified: msg`${prefix} updated the document visibility`,
@@ -1,2 +0,0 @@
-- AlterEnum
-ALTER TYPE "RecipientRole" ADD VALUE 'ASSISTANT';
@@ -1,18 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `expires` on the `Session` table. All the data in the column will be lost.
-  - Added the required column `expiresAt` to the `Session` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `updatedAt` to the `Session` table without a default value. This is not possible if the table is not empty.
-
-*/
-- AlterTable
-ALTER TABLE "Account" ADD COLUMN     "password" TEXT;
-
-- AlterTable
-ALTER TABLE "Session" DROP COLUMN "expires",
-ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-ADD COLUMN     "expiresAt" TIMESTAMP(3) NOT NULL,
-ADD COLUMN     "ipAddress" TEXT,
-ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL,
-ADD COLUMN     "userAgent" TEXT;
@@ -36,4 +36,4 @@
    "typescript": "5.6.2",
    "zod-prisma-types": "3.1.9"
  }
-}
+}
@@ -270,25 +270,18 @@ model Account {
  scope             String?
  id_token          String? @db.Text
  session_state     String?
-  password          String?

-  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)

  @@unique([provider, providerAccountId])
 }

 model Session {
-  id           String @id @default(cuid())
-  sessionToken String @unique
+  id           String   @id @default(cuid())
+  sessionToken String   @unique
  userId       Int
-
-  ipAddress String?
-  userAgent String?
-  expiresAt DateTime
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
+  expires      DateTime
+  user         User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
 }

 enum DocumentStatus {
@@ -424,7 +417,6 @@ enum RecipientRole {
  SIGNER
  VIEWER
  APPROVER
-  ASSISTANT
 }

 /// @zod.import(["import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';"])
@@ -5,18 +5,6 @@ import { hashSync } from '@documenso/lib/server-only/auth/hash';

 import { prisma } from '..';
 import { DocumentDataType, DocumentSource, Role, TeamMemberRole } from '../client';
-import { seedPendingDocument } from './documents';
-import { seedDirectTemplate, seedTemplate } from './templates';
-
-const createDocumentData = async ({ documentData }: { documentData: string }) => {
-  return prisma.documentData.create({
-    data: {
-      type: DocumentDataType.BYTES_64,
-      data: documentData,
-      initialData: documentData,
-    },
-  });
-};

 export const seedDatabase = async () => {
  const examplePdf = fs
@@ -51,80 +39,35 @@ export const seedDatabase = async () => {
    update: {},
  });

-  for (let i = 1; i <= 4; i++) {
-    const documentData = await createDocumentData({ documentData: examplePdf });
-
-    await prisma.document.create({
-      data: {
-        source: DocumentSource.DOCUMENT,
-        title: `Example Document ${i}`,
-        documentDataId: documentData.id,
-        userId: exampleUser.id,
-        recipients: {
-          create: {
-            name: String(adminUser.name),
-            email: adminUser.email,
-            token: Math.random().toString(36).slice(2, 9),
-          },
-        },
-      },
-    });
-  }
-
-  for (let i = 1; i <= 4; i++) {
-    const documentData = await createDocumentData({ documentData: examplePdf });
-
-    await prisma.document.create({
-      data: {
-        source: DocumentSource.DOCUMENT,
-        title: `Document ${i}`,
-        documentDataId: documentData.id,
-        userId: adminUser.id,
-        recipients: {
-          create: {
-            name: String(exampleUser.name),
-            email: exampleUser.email,
-            token: Math.random().toString(36).slice(2, 9),
-          },
-        },
-      },
-    });
-  }
-
-  await seedPendingDocument(exampleUser, [adminUser], {
-    key: 'example-pending',
-    createDocumentOptions: {
-      title: 'Pending Document',
+  const examplePdfData = await prisma.documentData.upsert({
+    where: {
+      id: 'clmn0kv5k0000pe04vcqg5zla',
    },
+    create: {
+      id: 'clmn0kv5k0000pe04vcqg5zla',
+      type: DocumentDataType.BYTES_64,
+      data: examplePdf,
+      initialData: examplePdf,
+    },
+    update: {},
  });

-  await seedPendingDocument(adminUser, [exampleUser], {
-    key: 'admin-pending',
-    createDocumentOptions: {
-      title: 'Pending Document',
+  await prisma.document.create({
+    data: {
+      source: DocumentSource.DOCUMENT,
+      title: 'Example Document',
+      documentDataId: examplePdfData.id,
+      userId: exampleUser.id,
+      recipients: {
+        create: {
+          name: String(adminUser.name),
+          email: adminUser.email,
+          token: Math.random().toString(36).slice(2, 9),
+        },
+      },
    },
  });

-  await Promise.all([
-    seedTemplate({
-      title: 'Template 1',
-      userId: exampleUser.id,
-    }),
-    seedDirectTemplate({
-      title: 'Direct Template 1',
-      userId: exampleUser.id,
-    }),
-
-    seedTemplate({
-      title: 'Template 1',
-      userId: adminUser.id,
-    }),
-    seedDirectTemplate({
-      title: 'Direct Template 1',
-      userId: adminUser.id,
-    }),
-  ]);
-
  const testUsers = [
    'test@documenso.com',
    'test2@documenso.com',
@@ -1,5 +0,0 @@
-import type { Field, Recipient } from '@documenso/prisma/client';
-
-export type RecipientWithFields = Recipient & {
-  fields: Field[];
-};
@@ -1,79 +0,0 @@
-import type { HTMLAttributes } from 'react';
-
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
-import { CheckCircle2, Clock, File } from 'lucide-react';
-import type { LucideIcon } from 'lucide-react/dist/lucide-react';
-
-import type { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
-import { SignatureIcon } from '@documenso/ui/icons/signature';
-import { cn } from '@documenso/ui/lib/utils';
-
-type FriendlyStatus = {
-  label: MessageDescriptor;
-  labelExtended: MessageDescriptor;
-  icon?: LucideIcon;
-  color: string;
-};
-
-export const FRIENDLY_STATUS_MAP: Record<ExtendedDocumentStatus, FriendlyStatus> = {
-  PENDING: {
-    label: msg`Pending`,
-    labelExtended: msg`Document pending`,
-    icon: Clock,
-    color: 'text-blue-600 dark:text-blue-300',
-  },
-  COMPLETED: {
-    label: msg`Completed`,
-    labelExtended: msg`Document completed`,
-    icon: CheckCircle2,
-    color: 'text-green-500 dark:text-green-300',
-  },
-  DRAFT: {
-    label: msg`Draft`,
-    labelExtended: msg`Document draft`,
-    icon: File,
-    color: 'text-yellow-500 dark:text-yellow-200',
-  },
-  INBOX: {
-    label: msg`Inbox`,
-    labelExtended: msg`Document inbox`,
-    icon: SignatureIcon,
-    color: 'text-muted-foreground',
-  },
-  ALL: {
-    label: msg`All`,
-    labelExtended: msg`Document All`,
-    color: 'text-muted-foreground',
-  },
-};
-
-export type DocumentStatusProps = HTMLAttributes<HTMLSpanElement> & {
-  status: ExtendedDocumentStatus;
-  inheritColor?: boolean;
-};
-
-export const DocumentStatus = ({
-  className,
-  status,
-  inheritColor,
-  ...props
-}: DocumentStatusProps) => {
-  const { _ } = useLingui();
-
-  const { label, icon: Icon, color } = FRIENDLY_STATUS_MAP[status];
-
-  return (
-    <span className={cn('flex items-center', className)} {...props}>
-      {Icon && (
-        <Icon
-          className={cn('mr-2 inline-block h-4 w-4', {
-            [color]: !inheritColor,
-          })}
-        />
-      )}
-      {_(label)}
-    </span>
-  );
-};
@@ -1,131 +0,0 @@
-'use client';
-
-import type { HTMLAttributes } from 'react';
-
-import Link from 'next/link';
-
-import { Trans } from '@lingui/macro';
-import { CheckCircle, EyeIcon, Pencil } from 'lucide-react';
-import { DateTime } from 'luxon';
-import { match } from 'ts-pattern';
-
-import { type DocumentData, type Prisma, RecipientRole } from '@documenso/prisma/client';
-import { SignatureIcon } from '@documenso/ui/icons/signature';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Sheet,
-  SheetContent,
-  SheetDescription,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from '@documenso/ui/primitives/sheet';
-
-import { DocumentStatus } from './document-status';
-
-type GetNextInboxDocumentResult =
-  | Prisma.DocumentGetPayload<{
-      select: {
-        id: true;
-        createdAt: true;
-        title: true;
-        status: true;
-        recipients: {
-          select: {
-            token: true;
-            role: true;
-          };
-        };
-        documentMeta: true;
-      };
-    }>[]
-  | null;
-
-export type NextInboxItemButtonProps = HTMLAttributes<HTMLButtonElement> & {
-  disabled?: boolean;
-  documentData?: DocumentData;
-  userEmail: string | undefined;
-  nextInboxDocument: GetNextInboxDocumentResult;
-};
-
-export const NextInboxItemButton = ({
-  className,
-  documentData,
-  nextInboxDocument,
-  userEmail,
-  disabled,
-  ...props
-}: NextInboxItemButtonProps) => {
-  return (
-    <Sheet>
-      <SheetTrigger asChild>
-        <Button
-          type="button"
-          variant="outline"
-          className={className}
-          disabled={disabled || !documentData || !userEmail}
-          {...props}
-        >
-          <SignatureIcon className="mr-2 h-5 w-5" />
-          <Trans>Sign Next Document</Trans>
-        </Button>
-      </SheetTrigger>
-      <SheetContent>
-        <SheetHeader>
-          <SheetTitle className="text-2xl">Inbox</SheetTitle>
-          <SheetDescription>Documents awaiting your signature or review</SheetDescription>
-        </SheetHeader>
-
-        <div className="mt-8 space-y-6">
-          {nextInboxDocument?.map((document) => {
-            const recipient = document.recipients[0];
-
-            return (
-              <div key={document.id} className="flex items-center justify-between space-y-1">
-                <div>
-                  <p className="text-foreground text-lg font-semibold">{document.title}</p>
-
-                  <div className="flex items-center gap-x-2">
-                    <DocumentStatus status={document.status} />
-
-                    {document.createdAt && (
-                      <p className="text-muted-foreground">
-                        <Trans>
-                          Created {DateTime.fromJSDate(document.createdAt).toFormat('LLL ‘yy')}
-                        </Trans>
-                      </p>
-                    )}
-                  </div>
-                </div>
-
-                <Button asChild className="w-28">
-                  <Link href={`/sign/${recipient?.token}`}>
-                    {match(recipient?.role)
-                      .with(RecipientRole.SIGNER, () => (
-                        <>
-                          <Pencil className="-ml-1 mr-2 h-4 w-4" />
-                          <Trans>Sign</Trans>
-                        </>
-                      ))
-                      .with(RecipientRole.APPROVER, () => (
-                        <>
-                          <CheckCircle className="-ml-1 mr-2 h-4 w-4" />
-                          <Trans>Approve</Trans>
-                        </>
-                      ))
-                      .otherwise(() => (
-                        <>
-                          <EyeIcon className="-ml-1 mr-2 h-4 w-4" />
-                          <Trans>View</Trans>
-                        </>
-                      ))}
-                  </Link>
-                </Button>
-              </div>
-            );
-          })}
-        </div>
-      </SheetContent>
-    </Sheet>
-  );
-};
@@ -31,8 +31,7 @@ const getCardClassNames = (
  checkBoxOrRadio: boolean,
  cardClassName?: string,
 ) => {
-  const baseClasses =
-    'field--FieldRootContainer field-card-container relative z-20 h-full w-full transition-all';
+  const baseClasses = 'field-card-container relative z-20 h-full w-full transition-all';

  const insertedClasses =
    'bg-primary/20 border-primary ring-primary/20 ring-offset-primary/20 ring-2 ring-offset-2 dark:shadow-none';
@@ -142,7 +141,6 @@ export function FieldRootContainer({ field, children, cardClassName }: FieldCont
      <Card
        id={`field-${field.id}`}
        ref={ref}
-        data-field-type={field.type}
        data-inserted={field.inserted ? 'true' : 'false'}
        className={cardClassNames}
      >
@@ -1,6 +1,6 @@
 'use client';

-import { forwardRef } from 'react';
+import React, { forwardRef } from 'react';

 import { Trans } from '@lingui/macro';
 import type { SelectProps } from '@radix-ui/react-select';
@@ -11,15 +11,12 @@ import { ROLE_ICONS } from '@documenso/ui/primitives/recipient-role-icons';
 import { Select, SelectContent, SelectItem, SelectTrigger } from '@documenso/ui/primitives/select';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';

-import { cn } from '../../lib/utils';
-
 export type RecipientRoleSelectProps = SelectProps & {
  hideCCRecipients?: boolean;
-  isAssistantEnabled?: boolean;
 };

 export const RecipientRoleSelect = forwardRef<HTMLButtonElement, RecipientRoleSelectProps>(
-  ({ hideCCRecipients, isAssistantEnabled = true, ...props }, ref) => (
+  ({ hideCCRecipients, ...props }, ref) => (
    <Select {...props}>
      <SelectTrigger ref={ref} className="bg-background w-[50px] p-2">
        {/* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */}
@@ -113,42 +110,6 @@ export const RecipientRoleSelect = forwardRef<HTMLButtonElement, RecipientRoleSe
            </div>
          </SelectItem>
        )}
-
-        <SelectItem
-          value={RecipientRole.ASSISTANT}
-          disabled={!isAssistantEnabled}
-          className={cn(
-            !isAssistantEnabled &&
-              'cursor-not-allowed opacity-50 data-[disabled]:pointer-events-auto',
-          )}
-        >
-          <div className="flex items-center">
-            <div className="flex w-[150px] items-center">
-              <span className="mr-2">{ROLE_ICONS[RecipientRole.ASSISTANT]}</span>
-              <Trans>Can prepare</Trans>
-            </div>
-            <Tooltip>
-              <TooltipTrigger>
-                <InfoIcon className="h-4 w-4" />
-              </TooltipTrigger>
-              <TooltipContent className="text-foreground z-9999 max-w-md p-4">
-                <p>
-                  {isAssistantEnabled ? (
-                    <Trans>
-                      The recipient can prepare the document for later signers by pre-filling
-                      suggest values.
-                    </Trans>
-                  ) : (
-                    <Trans>
-                      Assistant role is only available when the document is in sequential signing
-                      mode.
-                    </Trans>
-                  )}
-                </p>
-              </TooltipContent>
-            </Tooltip>
-          </div>
-        </SelectItem>
      </SelectContent>
    </Select>
  ),
@@ -78,7 +78,6 @@
    "tailwind-merge": "^1.12.0",
    "tailwindcss-animate": "^1.0.5",
    "ts-pattern": "^5.0.5",
-    "vaul": "^1.0.0",
    "zod": "3.24.1"
  }
-}
+}
@@ -508,15 +508,7 @@ export const AddFieldsFormPartial = ({
  }, []);

  useEffect(() => {
-    const recipientsByRoleToDisplay = recipients.filter(
-      (recipient) =>
-        recipient.role !== RecipientRole.CC && recipient.role !== RecipientRole.ASSISTANT,
-    );
-
-    setSelectedSigner(
-      recipientsByRoleToDisplay.find((r) => r.sendStatus !== SendStatus.SENT) ??
-        recipientsByRoleToDisplay[0],
-    );
+    setSelectedSigner(recipients.find((r) => r.sendStatus !== SendStatus.SENT) ?? recipients[0]);
  }, [recipients]);

  const recipientsByRole = useMemo(() => {
@@ -525,7 +517,6 @@ export const AddFieldsFormPartial = ({
      VIEWER: [],
      SIGNER: [],
      APPROVER: [],
-      ASSISTANT: [],
    };

    recipients.forEach((recipient) => {
@@ -538,12 +529,7 @@ export const AddFieldsFormPartial = ({
  const recipientsByRoleToDisplay = useMemo(() => {
    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
    return (Object.entries(recipientsByRole) as [RecipientRole, Recipient[]][])
-      .filter(
-        ([role]) =>
-          role !== RecipientRole.CC &&
-          role !== RecipientRole.VIEWER &&
-          role !== RecipientRole.ASSISTANT,
-      )
+      .filter(([role]) => role !== RecipientRole.CC && role !== RecipientRole.VIEWER)
      .map(
        ([role, roleRecipients]) =>
          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -558,6 +544,12 @@ export const AddFieldsFormPartial = ({
      );
  }, [recipientsByRole]);

+  const isTypedSignatureEnabled = form.watch('typedSignatureEnabled');
+
+  const handleTypedSignatureChange = (value: boolean) => {
+    form.setValue('typedSignatureEnabled', value, { shouldDirty: true });
+  };
+
  const handleAdvancedSettings = () => {
    setShowAdvancedSettings((prev) => !prev);
  };
@@ -695,7 +687,9 @@ export const AddFieldsFormPartial = ({
                      )}

                      {!selectedSigner?.email && (
-                        <span className="flex-1 truncate text-left">{selectedSigner?.email}</span>
+                        <span className="gradie flex-1 truncate text-left">
+                          {selectedSigner?.email}
+                        </span>
                      )}

                      <ChevronsUpDown className="ml-2 h-4 w-4" />
@@ -13,8 +13,14 @@ import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import type { TDocument } from '@documenso/lib/types/document';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client';
-import { DocumentStatus, type Field, type Recipient, SendStatus } from '@documenso/prisma/client';
+import {
+  DocumentStatus,
+  DocumentVisibility,
+  type Field,
+  type Recipient,
+  SendStatus,
+  TeamMemberRole,
+} from '@documenso/prisma/client';
 import {
  DocumentGlobalAuthAccessSelect,
  DocumentGlobalAuthAccessTooltip,
@@ -41,7 +41,6 @@ import {
  DocumentFlowFormContainerStep,
 } from './document-flow-root';
 import { ShowFieldItem } from './show-field-item';
-import { SigningOrderConfirmation } from './signing-order-confirmation';
 import type { DocumentFlowStep } from './types';

 export type AddSignersFormProps = {
@@ -124,7 +123,6 @@ export const AddSignersFormPartial = ({
  }, [recipients, form]);

  const [showAdvancedSettings, setShowAdvancedSettings] = useState(alwaysShowAdvancedSettings);
-  const [showSigningOrderConfirmation, setShowSigningOrderConfirmation] = useState(false);

  const {
    setValue,
@@ -136,10 +134,6 @@ export const AddSignersFormPartial = ({
  const watchedSigners = watch('signers');
  const isSigningOrderSequential = watch('signingOrder') === DocumentSigningOrder.SEQUENTIAL;

-  const hasAssistantRole = useMemo(() => {
-    return watchedSigners.some((signer) => signer.role === RecipientRole.ASSISTANT);
-  }, [watchedSigners]);
-
  const normalizeSigningOrders = (signers: typeof watchedSigners) => {
    return signers
      .sort((a, b) => (a.signingOrder ?? 0) - (b.signingOrder ?? 0))
@@ -239,7 +233,6 @@ export const AddSignersFormPartial = ({
      const items = Array.from(watchedSigners);
      const [reorderedSigner] = items.splice(result.source.index, 1);

-      // Find next valid position
      let insertIndex = result.destination.index;
      while (insertIndex < items.length && !canRecipientBeModified(items[insertIndex].nativeId)) {
        insertIndex++;
@@ -247,116 +240,126 @@ export const AddSignersFormPartial = ({

      items.splice(insertIndex, 0, reorderedSigner);

-      const updatedSigners = items.map((signer, index) => ({
-        ...signer,
-        signingOrder: !canRecipientBeModified(signer.nativeId) ? signer.signingOrder : index + 1,
+      const updatedSigners = items.map((item, index) => ({
+        ...item,
+        signingOrder: !canRecipientBeModified(item.nativeId) ? item.signingOrder : index + 1,
      }));

-      form.setValue('signers', updatedSigners);
-
-      const lastSigner = updatedSigners[updatedSigners.length - 1];
-      if (lastSigner.role === RecipientRole.ASSISTANT) {
-        toast({
-          title: _(msg`Warning: Assistant as last signer`),
-          description: _(
-            msg`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
-          ),
+      updatedSigners.forEach((item, index) => {
+        const keys: (keyof typeof item)[] = [
+          'formId',
+          'nativeId',
+          'email',
+          'name',
+          'role',
+          'signingOrder',
+          'actionAuth',
+        ];
+        keys.forEach((key) => {
+          form.setValue(`signers.${index}.${key}` as const, item[key]);
        });
+      });
+
+      const currentLength = form.getValues('signers').length;
+      if (currentLength > updatedSigners.length) {
+        for (let i = updatedSigners.length; i < currentLength; i++) {
+          form.unregister(`signers.${i}`);
+        }
      }

      await form.trigger('signers');
    },
-    [form, canRecipientBeModified, watchedSigners, toast],
+    [form, canRecipientBeModified, watchedSigners],
  );

-  const handleRoleChange = useCallback(
-    (index: number, role: RecipientRole) => {
-      const currentSigners = form.getValues('signers');
-      const signingOrder = form.getValues('signingOrder');
-
-      // Handle parallel to sequential conversion for assistants
-      if (role === RecipientRole.ASSISTANT && signingOrder === DocumentSigningOrder.PARALLEL) {
-        form.setValue('signingOrder', DocumentSigningOrder.SEQUENTIAL);
-        toast({
-          title: _(msg`Signing order is enabled.`),
-          description: _(msg`You cannot add assistants when signing order is disabled.`),
-          variant: 'destructive',
-        });
+  const triggerDragAndDrop = useCallback(
+    (fromIndex: number, toIndex: number) => {
+      if (!$sensorApi.current) {
        return;
      }

-      const updatedSigners = currentSigners.map((signer, idx) => ({
-        ...signer,
-        role: idx === index ? role : signer.role,
-        signingOrder: !canRecipientBeModified(signer.nativeId) ? signer.signingOrder : idx + 1,
-      }));
+      const draggableId = signers[fromIndex].id;

-      form.setValue('signers', updatedSigners);
+      const preDrag = $sensorApi.current.tryGetLock(draggableId);

-      if (role === RecipientRole.ASSISTANT && index === updatedSigners.length - 1) {
-        toast({
-          title: _(msg`Warning: Assistant as last signer`),
-          description: _(
-            msg`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
-          ),
-        });
+      if (!preDrag) {
+        return;
      }
+
+      const drag = preDrag.snapLift();
+
+      setTimeout(() => {
+        // Move directly to the target index
+        if (fromIndex < toIndex) {
+          for (let i = fromIndex; i < toIndex; i++) {
+            drag.moveDown();
+          }
+        } else {
+          for (let i = fromIndex; i > toIndex; i--) {
+            drag.moveUp();
+          }
+        }
+
+        setTimeout(() => {
+          drag.drop();
+        }, 500);
+      }, 0);
    },
-    [form, toast, canRecipientBeModified],
+    [signers],
+  );
+
+  const updateSigningOrders = useCallback(
+    (newIndex: number, oldIndex: number) => {
+      const updatedSigners = form.getValues('signers').map((signer, index) => {
+        if (index === oldIndex) {
+          return { ...signer, signingOrder: newIndex + 1 };
+        } else if (index >= newIndex && index < oldIndex) {
+          return {
+            ...signer,
+            signingOrder: !canRecipientBeModified(signer.nativeId)
+              ? signer.signingOrder
+              : (signer.signingOrder ?? index + 1) + 1,
+          };
+        } else if (index <= newIndex && index > oldIndex) {
+          return {
+            ...signer,
+            signingOrder: !canRecipientBeModified(signer.nativeId)
+              ? signer.signingOrder
+              : Math.max(1, (signer.signingOrder ?? index + 1) - 1),
+          };
+        }
+        return signer;
+      });
+
+      updatedSigners.forEach((signer, index) => {
+        form.setValue(`signers.${index}.signingOrder`, signer.signingOrder);
+      });
+    },
+    [form, canRecipientBeModified],
  );

  const handleSigningOrderChange = useCallback(
    (index: number, newOrderString: string) => {
-      const trimmedOrderString = newOrderString.trim();
-      if (!trimmedOrderString) {
+      const newOrder = parseInt(newOrderString, 10);
+
+      if (!newOrderString.trim()) {
        return;
      }

-      const newOrder = Number(trimmedOrderString);
-      if (!Number.isInteger(newOrder) || newOrder < 1) {
+      if (Number.isNaN(newOrder)) {
+        form.setValue(`signers.${index}.signingOrder`, index + 1);
        return;
      }

-      const currentSigners = form.getValues('signers');
-      const signer = currentSigners[index];
-
-      // Remove signer from current position and insert at new position
-      const remainingSigners = currentSigners.filter((_, idx) => idx !== index);
-      const newPosition = Math.min(Math.max(0, newOrder - 1), currentSigners.length - 1);
-      remainingSigners.splice(newPosition, 0, signer);
-
-      const updatedSigners = remainingSigners.map((s, idx) => ({
-        ...s,
-        signingOrder: !canRecipientBeModified(s.nativeId) ? s.signingOrder : idx + 1,
-      }));
-
-      form.setValue('signers', updatedSigners);
-
-      if (signer.role === RecipientRole.ASSISTANT && newPosition === remainingSigners.length - 1) {
-        toast({
-          title: _(msg`Warning: Assistant as last signer`),
-          description: _(
-            msg`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
-          ),
-        });
+      const newIndex = newOrder - 1;
+      if (index !== newIndex) {
+        updateSigningOrders(newIndex, index);
+        triggerDragAndDrop(index, newIndex);
      }
    },
-    [form, canRecipientBeModified, toast],
+    [form, triggerDragAndDrop, updateSigningOrders],
  );

-  const handleSigningOrderDisable = useCallback(() => {
-    setShowSigningOrderConfirmation(false);
-
-    const currentSigners = form.getValues('signers');
-    const updatedSigners = currentSigners.map((signer) => ({
-      ...signer,
-      role: signer.role === RecipientRole.ASSISTANT ? RecipientRole.SIGNER : signer.role,
-    }));
-
-    form.setValue('signers', updatedSigners);
-    form.setValue('signingOrder', DocumentSigningOrder.PARALLEL);
-  }, [form]);
-
  return (
    <>
      <DocumentFlowFormContainerHeader
@@ -381,16 +384,11 @@ export const AddSignersFormPartial = ({
                      {...field}
                      id="signingOrder"
                      checked={field.value === DocumentSigningOrder.SEQUENTIAL}
-                      onCheckedChange={(checked) => {
-                        if (!checked && hasAssistantRole) {
-                          setShowSigningOrderConfirmation(true);
-                          return;
-                        }
-
+                      onCheckedChange={(checked) =>
                        field.onChange(
                          checked ? DocumentSigningOrder.SEQUENTIAL : DocumentSigningOrder.PARALLEL,
-                        );
-                      }}
+                        )
+                      }
                      disabled={isSubmitting || hasDocumentBeenSent}
                    />
                  </FormControl>
@@ -615,11 +613,7 @@ export const AddSignersFormPartial = ({
                                      <FormControl>
                                        <RecipientRoleSelect
                                          {...field}
-                                          isAssistantEnabled={isSigningOrderSequential}
-                                          onValueChange={(value) =>
-                                            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                                            handleRoleChange(index, value as RecipientRole)
-                                          }
+                                          onValueChange={field.onChange}
                                          disabled={
                                            snapshot.isDragging ||
                                            isSubmitting ||
@@ -716,12 +710,6 @@ export const AddSignersFormPartial = ({
            )}
          </Form>
        </AnimateGenericFadeInOut>
-
-        <SigningOrderConfirmation
-          open={showSigningOrderConfirmation}
-          onOpenChange={setShowSigningOrderConfirmation}
-          onConfirm={handleSigningOrderDisable}
-        />
      </DocumentFlowFormContainerContent>

      <DocumentFlowFormContainerFooter>
@@ -59,10 +59,10 @@ export const FieldIcon = ({
    if (fieldMeta && (type === 'TEXT' || type === 'NUMBER')) {
      if (type === 'TEXT' && 'text' in fieldMeta && fieldMeta.text && !fieldMeta.label) {
        label =
-          fieldMeta.text.length > 20 ? fieldMeta.text.substring(0, 20) + '...' : fieldMeta.text;
+          fieldMeta.text.length > 10 ? fieldMeta.text.substring(0, 10) + '...' : fieldMeta.text;
      } else if (fieldMeta.label) {
        label =
-          fieldMeta.label.length > 20 ? fieldMeta.label.substring(0, 20) + '...' : fieldMeta.label;
+          fieldMeta.label.length > 10 ? fieldMeta.label.substring(0, 10) + '...' : fieldMeta.label;
      } else {
        label = fieldIcons[type]?.label;
      }
@@ -12,7 +12,6 @@ import { match } from 'ts-pattern';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import type { TFieldMetaSchema } from '@documenso/lib/types/field-meta';
 import { ZCheckboxFieldMeta, ZRadioFieldMeta } from '@documenso/lib/types/field-meta';
-import { FieldType } from '@documenso/prisma/client';

 import { useSignerColors } from '../../lib/signer-colors';
 import { cn } from '../../lib/utils';
@@ -186,35 +185,11 @@ export const FieldItem = ({
    () => hasFieldMetaValues('CHECKBOX', field.fieldMeta, ZCheckboxFieldMeta),
    [field.fieldMeta],
  );
-
  const radioHasValues = useMemo(
    () => hasFieldMetaValues('RADIO', field.fieldMeta, ZRadioFieldMeta),
    [field.fieldMeta],
  );

-  const hasCheckedValues = (fieldMeta: TFieldMetaSchema, type: FieldType) => {
-    if (!fieldMeta || (type !== FieldType.RADIO && type !== FieldType.CHECKBOX)) {
-      return false;
-    }
-
-    if (type === FieldType.RADIO) {
-      const parsed = ZRadioFieldMeta.parse(fieldMeta);
-      return parsed.values?.some((value) => value.checked) ?? false;
-    }
-
-    if (type === FieldType.CHECKBOX) {
-      const parsed = ZCheckboxFieldMeta.parse(fieldMeta);
-      return parsed.values?.some((value) => value.checked) ?? false;
-    }
-
-    return false;
-  };
-
-  const fieldHasCheckedValues = useMemo(
-    () => hasCheckedValues(field.fieldMeta, field.type),
-    [field.fieldMeta, field.type],
-  );
-
  const fixedSize = checkBoxHasValues || radioHasValues;

  return createPortal(
@@ -254,21 +229,6 @@ export const FieldItem = ({
        onMove?.(d.node);
      }}
    >
-      {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&
-        field.fieldMeta?.label && (
-          <div
-            className={cn(
-              'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',
-              {
-                'bg-foreground/5 border-primary border': !fieldHasCheckedValues,
-                'bg-documenso-200 border-primary border': fieldHasCheckedValues,
-              },
-            )}
-          >
-            {field.fieldMeta.label}
-          </div>
-        )}
-
      <div
        className={cn(
          'relative flex h-full w-full items-center justify-center bg-white',
@@ -126,18 +126,6 @@ export const CheckboxFieldAdvancedSettings = ({

  return (
    <div className="flex flex-col gap-4">
-      <div className="mb-2">
-        <Label>
-          <Trans>Label</Trans>
-        </Label>
-        <Input
-          id="label"
-          className="bg-background mt-2"
-          placeholder={_(msg`Field label`)}
-          value={fieldState.label}
-          onChange={(e) => handleFieldChange('label', e.target.value)}
-        />
-      </div>
      <div className="flex flex-row items-center gap-x-4">
        <div className="flex w-2/3 flex-col">
          <Label>
@@ -2,8 +2,7 @@

 import { useEffect, useState } from 'react';

-import { Trans, msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/macro';
 import { ChevronDown, ChevronUp, Trash } from 'lucide-react';

 import { validateRadioField } from '@documenso/lib/advanced-fields-validation/validate-radio';
@@ -28,8 +27,6 @@ export const RadioFieldAdvancedSettings = ({
  handleFieldChange,
  handleErrors,
 }: RadioFieldAdvancedSettingsProps) => {
-  const { _ } = useLingui();
-
  const [showValidation, setShowValidation] = useState(false);
  const [values, setValues] = useState(
    fieldState.values ?? [{ id: 1, checked: false, value: 'Default value' }],
@@ -105,18 +102,6 @@ export const RadioFieldAdvancedSettings = ({
  return (
    <div className="flex flex-col gap-4">
      <div className="flex flex-col gap-4">
-        <div>
-          <Label>
-            <Trans>Label</Trans>
-          </Label>
-          <Input
-            id="label"
-            className="bg-background mt-2"
-            placeholder={_(msg`Field label`)}
-            value={fieldState.label}
-            onChange={(e) => handleFieldChange('label', e.target.value)}
-          />
-        </div>
        <div className="flex flex-row items-center gap-2">
          <Switch
            className="bg-background"
@@ -1,40 +0,0 @@
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@documenso/ui/primitives/alert-dialog';
-
-export type SigningOrderConfirmationProps = {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  onConfirm: () => void;
-};
-
-export function SigningOrderConfirmation({
-  open,
-  onOpenChange,
-  onConfirm,
-}: SigningOrderConfirmationProps) {
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle>Warning</AlertDialogTitle>
-          <AlertDialogDescription>
-            You have an assistant role on the signers list, removing the signing order will change
-            the assistant role to signer.
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel>Cancel</AlertDialogCancel>
-          <AlertDialogAction onClick={onConfirm}>Proceed</AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}
@@ -19,18 +19,18 @@ RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;
 const RadioGroupItem = React.forwardRef<
  React.ElementRef<typeof RadioGroupPrimitive.Item>,
  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
->(({ className, ...props }, ref) => {
+>(({ className, children: _children, ...props }, ref) => {
  return (
    <RadioGroupPrimitive.Item
      ref={ref}
      className={cn(
-        'border-primary text-primary focus-visible:ring-ring aspect-square h-4 w-4 rounded-full border shadow focus:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50',
+        'border-input ring-offset-background focus:ring-ring h-4 w-4 rounded-full border focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
        className,
      )}
      {...props}
    >
      <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
-        <Circle className="fill-primary h-2.5 w-2.5" />
+        <Circle className="fill-primary text-primary h-2.5 w-2.5" />
      </RadioGroupPrimitive.Indicator>
    </RadioGroupPrimitive.Item>
  );
@@ -1,4 +1,4 @@
-import { BadgeCheck, Copy, Eye, PencilLine, User } from 'lucide-react';
+import { BadgeCheck, Copy, Eye, PencilLine } from 'lucide-react';

 import type { RecipientRole } from '.prisma/client';

@@ -7,5 +7,4 @@ export const ROLE_ICONS: Record<RecipientRole, JSX.Element> = {
  APPROVER: <BadgeCheck className="h-4 w-4" />,
  CC: <Copy className="h-4 w-4" />,
  VIEWER: <Eye className="h-4 w-4" />,
-  ASSISTANT: <User className="h-4 w-4" />,
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ephraim Atta-Duncan	8d85d01c93	chore: remove unused type	2025-01-30 05:20:38 +00:00
Ephraim Atta-Duncan	cdb980bd4c	chore: avoid using lastSignedIn	2025-01-29 07:25:07 +00:00
Ephraim Duncan	413c3cbc6e	Merge branch 'main' into feat/mau	2025-01-29 00:30:43 +00:00
Ephraim Atta-Duncan	ff4ba71ef3	chore: add tooltip	2025-01-29 00:25:07 +00:00
Ephraim Atta-Duncan	9bc825b308	chore: cleanup	2025-01-28 16:19:14 +00:00
Ephraim Atta-Duncan	d7f7cbf27f	fix: exclude disabled users	2025-01-28 15:57:15 +00:00
Ephraim Atta-Duncan	97f7d77a34	chore: cleanup	2025-01-28 15:40:40 +00:00
Ephraim Atta-Duncan	6993c52b2a	feat: mau	2025-01-28 15:29:36 +00:00
Ephraim Atta-Duncan	68c8eba2c3	chore: wip	2025-01-28 05:08:28 +00:00
Ephraim Atta-Duncan	c40e802396	feat: add mau card	2025-01-25 12:23:26 +00:00