chore: update deps

.github/workflows/codeql-analysis.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read

.github/workflows/e2e-tests.yml

@@ -8,7 +8,7 @@ jobs:
   e2e_tests:
     name: 'E2E Tests'
     timeout-minutes: 60
-    runs-on: warp-ubuntu-2204-x64-16x
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 

apps/documentation/package.json

@@ -16,7 +16,7 @@
     "@documenso/tailwind-config": "*",
     "@documenso/trpc": "*",
     "@documenso/ui": "*",
-    "next": "14.2.6",
+    "next": "14.2.23",
     "next-plausible": "^3.12.0",
     "nextra": "^2.13.4",
     "nextra-theme-docs": "^2.13.4",
@@ -27,6 +27,6 @@
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "typescript": "5.6.2"
+    "typescript": "5.2.2"
   }
 }

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

@@ -5,6 +5,5 @@
   "svelte": "Svelte Integration",
   "solid": "Solid Integration",
   "preact": "Preact Integration",
-  "angular": "Angular Integration",
   "css-variables": "CSS Variables"
 }

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

@@ -1,90 +0,0 @@
----
-title: Angular Integration
-description: Learn how to use our embedding SDK within your Angular application.
----
-
-# Angular Integration
-
-Our Angular SDK provides a simple way to embed a signing experience within your Angular application. It supports both direct link templates and signing tokens.
-
-## Installation
-
-To install the SDK, run the following command:
-
-```bash
-npm install @documenso/embed-angular
-```
-
-## 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 `EmbedDirectTemplate` component.
-
-```typescript
-import { Component } from '@angular/core';
-import { EmbedDirectTemplate } from '@documenso/embed-angular';
-
-@Component({
-  selector: 'app-embedding',
-  template: `
-    <embed-direct-template [token]="token" />
-  `,
-  standalone: true,
-  imports: [EmbedDirectTemplate],
-})
-export class EmbeddingComponent {
-  token = 'YOUR_TOKEN_HERE'; // Replace with the actual token
-}
-```
-
-#### Props
-
-| Prop                | 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 `EmbedSignDocument` component.
-
-```typescript
-import { Component } from '@angular/core';
-import { EmbedSignDocument } from '@documenso/embed-angular';
-
-@Component({
-  selector: 'app-embedding',
-  template: `
-    <embed-sign-document [token]="token" />
-  `,
-  standalone: true,
-  imports: [EmbedSignDocument],
-})
-export class EmbeddingComponent {
-  token = 'YOUR_TOKEN_HERE'; // Replace with the actual token
-}
-```
-
-#### Props
-
-| Prop                | 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             |

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

@@ -5,7 +5,7 @@ description: Learn how to use embedding to bring signing to your own website or
 
 # Embedding
 
-Our embedding feature lets you integrate our document signing experience into your own application or website. Whether you're building with React, Preact, Vue, Svelte, Solid, Angular, or using generalized web components, this guide will help you get started with embedding Documenso.
+Our embedding feature lets you integrate our document signing experience into your own application or website. Whether you're building with React, Preact, Vue, Svelte, Solid, or using generalized web components, this guide will help you get started with embedding Documenso.
 
 ## Availability
 
@@ -74,13 +74,12 @@ 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) |
 
 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.
 
@@ -128,7 +127,7 @@ This will show a dialog which will ask you to configure which recipient should b
 
 ## Embedding with Signing Tokens
 
-To embed the signing process for an ordinary document, you'll need a **document signing token** for the recipient. This token provides the necessary access to load the document and facilitate the signing process securely.
+To embed the signing process for an ordinary document, you’ll need a **document signing token** for the recipient. This token provides the necessary access to load the document and facilitate the signing process securely.
 
 #### Instructions
 
@@ -165,7 +164,6 @@ Once you've obtained the appropriate tokens, you can integrate the signing exper
 - [Vue](/developers/embedding/vue)
 - [Svelte](/developers/embedding/svelte)
 - [Solid](/developers/embedding/solid)
-- [Angular](/developers/embedding/angular)
 
 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.
 
@@ -176,5 +174,4 @@ If you're using **web components**, the integration process is slightly differen
 - [Svelte Integration](/developers/embedding/svelte)
 - [Solid Integration](/developers/embedding/solid)
 - [Preact Integration](/developers/embedding/preact)
-- [Angular Integration](/developers/embedding/angular)
 - [CSS Variables](/developers/embedding/css-variables)

apps/documentation/pages/developers/webhooks.mdx

@@ -21,7 +21,6 @@ Documenso supports Webhooks and allows you to subscribe to the following events:
 - `document.signed`
 - `document.completed`
 - `document.rejected`
-- `document.cancelled`
 
 ## Create a webhook subscription
 
@@ -38,7 +37,7 @@ Clicking on the "**Create Webhook**" button opens a modal to create a new webhoo
 To create a new webhook subscription, you need to provide the following information:
 
 - Enter the webhook URL that will receive the event payload.
-- Select the event(s) you want to subscribe to: `document.created`, `document.sent`, `document.opened`, `document.signed`, `document.completed`, `document.rejected`, `document.cancelled`.
+- Select the event(s) you want to subscribe to: `document.created`, `document.sent`, `document.opened`, `document.signed`, `document.completed`, `document.rejected`.
 - Optionally, you can provide a secret key that will be used to sign the payload. This key will be included in the `X-Documenso-Secret` header of the request.
 
 ![A screenshot of the Create Webhook modal that shows the URL input field and the event checkboxes](/webhook-images/webhooks-page-create-webhook-modal.webp)
@@ -529,96 +528,6 @@ Example payload for the `document.rejected` event:
 }
 ```
 
-Example payload for the `document.rejected` event:
-
-```json
-{
-  "event": "DOCUMENT_CANCELLED",
-  "payload": {
-    "id": 7,
-    "externalId": null,
-    "userId": 3,
-    "authOptions": null,
-    "formValues": null,
-    "visibility": "EVERYONE",
-    "title": "documenso.pdf",
-    "status": "PENDING",
-    "documentDataId": "cm6exvn93006hi02ru90a265a",
-    "createdAt": "2025-01-27T11:02:14.393Z",
-    "updatedAt": "2025-01-27T11:03:16.387Z",
-    "completedAt": null,
-    "deletedAt": null,
-    "teamId": null,
-    "templateId": null,
-    "source": "DOCUMENT",
-    "documentMeta": {
-      "id": "cm6exvn96006ji02rqvzjvwoy",
-      "subject": "",
-      "message": "",
-      "timezone": "Etc/UTC",
-      "password": null,
-      "dateFormat": "yyyy-MM-dd hh:mm a",
-      "redirectUrl": "",
-      "signingOrder": "PARALLEL",
-      "typedSignatureEnabled": true,
-      "language": "en",
-      "distributionMethod": "EMAIL",
-      "emailSettings": {
-        "documentDeleted": true,
-        "documentPending": true,
-        "recipientSigned": true,
-        "recipientRemoved": true,
-        "documentCompleted": true,
-        "ownerDocumentCompleted": true,
-        "recipientSigningRequest": true
-      }
-    },
-    "recipients": [
-      {
-        "id": 7,
-        "documentId": 7,
-        "templateId": null,
-        "email": "mybirihix@mailinator.com",
-        "name": "Zorita Baird",
-        "token": "XkKx1HCs6Znm2UBJA2j6o",
-        "documentDeletedAt": null,
-        "expired": null,
-        "signedAt": null,
-        "authOptions": { "accessAuth": null, "actionAuth": null },
-        "signingOrder": 1,
-        "rejectionReason": null,
-        "role": "SIGNER",
-        "readStatus": "NOT_OPENED",
-        "signingStatus": "NOT_SIGNED",
-        "sendStatus": "SENT"
-      }
-    ],
-    "Recipient": [
-      {
-        "id": 7,
-        "documentId": 7,
-        "templateId": null,
-        "email": "signer@documenso.com",
-        "name": "Signer",
-        "token": "XkKx1HCs6Znm2UBJA2j6o",
-        "documentDeletedAt": null,
-        "expired": null,
-        "signedAt": null,
-        "authOptions": { "accessAuth": null, "actionAuth": null },
-        "signingOrder": 1,
-        "rejectionReason": null,
-        "role": "SIGNER",
-        "readStatus": "NOT_OPENED",
-        "signingStatus": "NOT_SIGNED",
-        "sendStatus": "SENT"
-      }
-    ]
-  },
-  "createdAt": "2025-01-27T11:03:27.730Z",
-  "webhookEndpoint": "https://mywebhooksite.com/mywebhook"
-}
-```
-
 ## Availability
 
 Webhooks are available to individual users and teams.

apps/openpage-api/package.json

@@ -13,11 +13,11 @@
   "dependencies": {
     "@documenso/prisma": "*",
     "luxon": "^3.5.0",
-    "next": "14.2.6"
+    "next": "14.2.23"
   },
   "devDependencies": {
     "@types/node": "^20",
-    "@types/react": "18.3.5",
+    "@types/react": "^18",
-    "typescript": "5.6.2"
+    "typescript": "5.2.2"
   }
 }

apps/web/next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.9.0-rc.11",
+  "version": "1.9.0-rc.7",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
@@ -26,18 +26,19 @@
     "@lingui/react": "^4.11.3",
     "@simplewebauthn/browser": "^9.0.1",
     "@simplewebauthn/server": "^9.0.3",
+    "@tanstack/react-query": "^4.29.5",
     "colord": "^2.9.3",
     "cookie-es": "^1.0.0",
     "formidable": "^2.1.1",
     "framer-motion": "^10.12.8",
     "input-otp": "^1.2.4",
     "lucide-react": "^0.279.0",
-    "luxon": "^3.4.0",
+    "luxon": "^3.5.0",
     "micro": "^10.0.1",
-    "next": "14.2.6",
+    "next": "14.2.23",
     "next-auth": "4.24.5",
     "next-axiom": "^1.5.1",
-    "next-plausible": "^3.10.1",
+    "next-plausible": "^3.12.0",
     "next-themes": "^0.2.1",
     "papaparse": "^5.4.1",
     "perfect-freehand": "^1.2.0",
@@ -54,7 +55,7 @@
     "recharts": "^2.7.2",
     "remeda": "^2.17.3",
     "sharp": "0.32.6",
-    "trpc-to-openapi": "2.0.4",
+    "trpc-openapi": "^1.2.0",
     "ts-pattern": "^5.0.5",
     "ua-parser-js": "^1.0.37",
     "uqr": "^0.1.2",
@@ -72,6 +73,6 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@types/ua-parser-js": "^0.7.39",
-    "typescript": "5.6.2"
+    "typescript": "5.2.2"
   }
 }

apps/web/src/app/(dashboard)/admin/documents/[id]/admin-actions.tsx

@@ -28,7 +28,7 @@ export const AdminActions = ({ className, document, recipients }: AdminActionsPr
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutate: resealDocument, isPending: isResealDocumentLoading } =
+  const { mutate: resealDocument, isLoading: isResealDocumentLoading } =
     trpc.admin.resealDocument.useMutation({
       onSuccess: () => {
         toast({

apps/web/src/app/(dashboard)/admin/documents/[id]/page.tsx

@@ -59,7 +59,7 @@ export default async function AdminDocumentDetailsPage({ params }: AdminDocument
         <Trans>Admin Actions</Trans>
       </h2>
 
-      <AdminActions className="mt-2" document={document} recipients={document.recipients} />
+      <AdminActions className="mt-2" document={document} recipients={document.Recipient} />
 
       <hr className="my-4" />
       <h2 className="text-lg font-semibold">
@@ -68,7 +68,7 @@ export default async function AdminDocumentDetailsPage({ params }: AdminDocument
 
       <div className="mt-4">
         <Accordion type="multiple" className="space-y-4">
-          {document.recipients.map((recipient) => (
+          {document.Recipient.map((recipient) => (
             <AccordionItem
               key={recipient.id}
               value={recipient.id.toString()}

apps/web/src/app/(dashboard)/admin/documents/[id]/recipient-item.tsx

@@ -39,9 +39,9 @@ type TAdminUpdateRecipientFormSchema = z.infer<typeof ZAdminUpdateRecipientFormS
 
 export type RecipientItemProps = {
   recipient: Recipient & {
-    fields: Array<
+    Field: Array<
       Field & {
-        signature: Signature | null;
+        Signature: Signature | null;
       }
     >;
   };
@@ -89,13 +89,13 @@ export const RecipientItem = ({ recipient }: RecipientItemProps) => {
         accessorKey: 'signature',
         cell: ({ row }) => (
           <div>
-            {row.original.signature?.typedSignature && (
+            {row.original.Signature?.typedSignature && (
-              <span>{row.original.signature.typedSignature}</span>
+              <span>{row.original.Signature.typedSignature}</span>
             )}
 
-            {row.original.signature?.signatureImageAsBase64 && (
+            {row.original.Signature?.signatureImageAsBase64 && (
               <img
-                src={row.original.signature.signatureImageAsBase64}
+                src={row.original.Signature.signatureImageAsBase64}
                 alt="Signature"
                 className="h-12 w-full dark:invert"
               />
@@ -103,7 +103,7 @@ export const RecipientItem = ({ recipient }: RecipientItemProps) => {
           </div>
         ),
       },
-    ] satisfies DataTableColumnDef<(typeof recipient)['fields'][number]>[];
+    ] satisfies DataTableColumnDef<(typeof recipient)['Field'][number]>[];
   }, []);
 
   const onUpdateRecipientFormSubmit = async ({ name, email }: TAdminUpdateRecipientFormSchema) => {
@@ -190,7 +190,7 @@ export const RecipientItem = ({ recipient }: RecipientItemProps) => {
         <Trans>Fields</Trans>
       </h2>
 
-      <DataTable columns={columns} data={recipient.fields} />
+      <DataTable columns={columns} data={recipient.Field} />
     </div>
   );
 };

apps/web/src/app/(dashboard)/admin/documents/[id]/super-delete-document-dialog.tsx

@@ -8,6 +8,7 @@ import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 
 import type { Document } from '@documenso/prisma/client';
+import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@@ -35,7 +36,7 @@ export const SuperDeleteDocumentDialog = ({ document }: SuperDeleteDocumentDialo
 
   const [reason, setReason] = useState('');
 
-  const { mutateAsync: deleteDocument, isPending: isDeletingDocument } =
+  const { mutateAsync: deleteDocument, isLoading: isDeletingDocument } =
     trpc.admin.deleteDocument.useMutation();
 
   const handleDeleteDocument = async () => {
@@ -54,13 +55,22 @@ export const SuperDeleteDocumentDialog = ({ document }: SuperDeleteDocumentDialo
 
       router.push('/admin/documents');
     } catch (err) {
+      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+        toast({
+          title: _(msg`An error occurred`),
+          description: err.message,
+          variant: 'destructive',
+        });
+      } else {
         toast({
           title: _(msg`An unknown error occurred`),
           variant: 'destructive',
           description:
+            err.message ??
             'We encountered an unknown error while attempting to delete your document. Please try again later.',
         });
       }
+    }
   };
 
   return (

apps/web/src/app/(dashboard)/admin/documents/document-results.tsx

@@ -37,7 +37,7 @@ export const AdminDocumentResults = () => {
   const page = searchParams?.get?.('page') ? Number(searchParams.get('page')) : undefined;
   const perPage = searchParams?.get?.('perPage') ? Number(searchParams.get('perPage')) : undefined;
 
-  const { data: findDocumentsData, isPending: isFindDocumentsLoading } =
+  const { data: findDocumentsData, isLoading: isFindDocumentsLoading } =
     trpc.admin.findDocuments.useQuery(
       {
         query: debouncedTerm,
@@ -45,7 +45,7 @@ export const AdminDocumentResults = () => {
         perPage: perPage || 20,
       },
       {
-        placeholderData: (previousData) => previousData,
+        keepPreviousData: true,
       },
     );
 
@@ -86,14 +86,14 @@ export const AdminDocumentResults = () => {
         header: _(msg`Owner`),
         accessorKey: 'owner',
         cell: ({ row }) => {
-          const avatarFallbackText = row.original.user.name
+          const avatarFallbackText = row.original.User.name
-            ? extractInitials(row.original.user.name)
+            ? extractInitials(row.original.User.name)
-            : row.original.user.email.slice(0, 1).toUpperCase();
+            : row.original.User.email.slice(0, 1).toUpperCase();
 
           return (
             <Tooltip delayDuration={200}>
               <TooltipTrigger>
-                <Link href={`/admin/users/${row.original.user.id}`}>
+                <Link href={`/admin/users/${row.original.User.id}`}>
                   <Avatar className="dark:border-border h-12 w-12 border-2 border-solid border-white">
                     <AvatarFallback className="text-xs text-gray-400">
                       {avatarFallbackText}
@@ -110,8 +110,8 @@ export const AdminDocumentResults = () => {
                 </Avatar>
 
                 <div className="text-muted-foreground flex flex-col text-sm">
-                  <span>{row.original.user.name}</span>
+                  <span>{row.original.User.name}</span>
-                  <span>{row.original.user.email}</span>
+                  <span>{row.original.User.email}</span>
                 </div>
               </TooltipContent>
             </Tooltip>

apps/web/src/app/(dashboard)/admin/leaderboard/data-table-leaderboard.tsx

@@ -4,7 +4,7 @@ import { useEffect, useMemo, useState, useTransition } from 'react';
 
 import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import { ChevronDownIcon, ChevronUpIcon, ChevronsUpDown, Loader } from 'lucide-react';
+import { ChevronDownIcon as CaretSortIcon, Loader } from 'lucide-react';
 
 import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
@@ -54,15 +54,7 @@ export const LeaderboardTable = ({
             onClick={() => handleColumnSort('name')}
           >
             {_(msg`Name`)}
-            {sortBy === 'name' ? (
+            <CaretSortIcon className="ml-2 h-4 w-4" />
-              sortOrder === 'asc' ? (
-                <ChevronUpIcon className="ml-2 h-4 w-4" />
-              ) : (
-                <ChevronDownIcon className="ml-2 h-4 w-4" />
-              )
-            ) : (
-              <ChevronsUpDown className="ml-2 h-4 w-4" />
-            )}
           </div>
         ),
         accessorKey: 'name',
@@ -88,15 +80,7 @@ export const LeaderboardTable = ({
             onClick={() => handleColumnSort('signingVolume')}
           >
             {_(msg`Signing Volume`)}
-            {sortBy === 'signingVolume' ? (
+            <CaretSortIcon className="ml-2 h-4 w-4" />
-              sortOrder === 'asc' ? (
-                <ChevronUpIcon className="ml-2 h-4 w-4" />
-              ) : (
-                <ChevronDownIcon className="ml-2 h-4 w-4" />
-              )
-            ) : (
-              <ChevronsUpDown className="ml-2 h-4 w-4" />
-            )}
           </div>
         ),
         accessorKey: 'signingVolume',
@@ -110,15 +94,7 @@ export const LeaderboardTable = ({
               onClick={() => handleColumnSort('createdAt')}
             >
               {_(msg`Created`)}
-              {sortBy === 'createdAt' ? (
+              <CaretSortIcon className="ml-2 h-4 w-4" />
-                sortOrder === 'asc' ? (
-                  <ChevronUpIcon className="ml-2 h-4 w-4" />
-                ) : (
-                  <ChevronDownIcon className="ml-2 h-4 w-4" />
-                )
-              ) : (
-                <ChevronsUpDown className="ml-2 h-4 w-4" />
-              )}
             </div>
           );
         },
@@ -126,7 +102,7 @@ export const LeaderboardTable = ({
         cell: ({ row }) => i18n.date(row.original.createdAt),
       },
     ] satisfies DataTableColumnDef<SigningVolume>[];
-  }, [sortOrder, sortBy]);
+  }, [sortOrder]);
 
   useEffect(() => {
     startTransition(() => {
@@ -157,9 +133,6 @@ export const LeaderboardTable = ({
   const handleColumnSort = (column: 'name' | 'createdAt' | 'signingVolume') => {
     startTransition(() => {
       updateSearchParams({
-        search: debouncedSearchString,
-        page,
-        perPage,
         sortBy: column,
         sortOrder: sortBy === column && sortOrder === 'asc' ? 'desc' : 'asc',
       });

apps/web/src/app/(dashboard)/admin/site-settings/banner-form.tsx

@@ -13,6 +13,7 @@ import {
   SITE_SETTINGS_BANNER_ID,
   ZSiteSettingsBannerSchema,
 } from '@documenso/lib/server-only/site-settings/schemas/banner';
+import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc as trpcReact } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import { ColorPicker } from '@documenso/ui/primitives/color-picker';
@@ -58,7 +59,7 @@ export function BannerForm({ banner }: BannerFormProps) {
 
   const enabled = form.watch('enabled');
 
-  const { mutateAsync: updateSiteSetting, isPending: isUpdateSiteSettingLoading } =
+  const { mutateAsync: updateSiteSetting, isLoading: isUpdateSiteSettingLoading } =
     trpcReact.admin.updateSiteSetting.useMutation();
 
   const onBannerUpdate = async ({ id, enabled, data }: TBannerFormSchema) => {
@@ -77,6 +78,13 @@ export function BannerForm({ banner }: BannerFormProps) {
 
       router.refresh();
     } catch (err) {
+      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+        toast({
+          title: _(msg`An error occurred`),
+          description: err.message,
+          variant: 'destructive',
+        });
+      } else {
         toast({
           title: _(msg`An unknown error occurred`),
           variant: 'destructive',
@@ -85,6 +93,7 @@ export function BannerForm({ banner }: BannerFormProps) {
           ),
         });
       }
+    }
   };
 
   return (

apps/web/src/app/(dashboard)/admin/stats/monthly-active-users-chart.tsx

@@ -1,73 +0,0 @@
-'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>
-  );
-};

apps/web/src/app/(dashboard)/admin/stats/page.tsx

@@ -18,7 +18,6 @@ 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,
@@ -27,7 +26,6 @@ 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';
 
@@ -45,7 +43,6 @@ export default async function AdminStatsPage() {
     // userWithAtLeastOneDocumentPerMonth,
     // userWithAtLeastOneDocumentSignedPerMonth,
     MONTHLY_USERS_SIGNED,
-    MONTHLY_ACTIVE_USERS,
   ] = await Promise.all([
     getUsersCount(),
     getUsersWithSubscriptionsCount(),
@@ -55,7 +52,6 @@ export default async function AdminStatsPage() {
     // getUserWithAtLeastOneDocumentPerMonth(),
     // getUserWithAtLeastOneDocumentSignedPerMonth(),
     getUserWithSignedDocumentMonthlyGrowth(),
-    getMonthlyActiveUsers(),
   ]);
 
   return (
@@ -72,6 +68,7 @@ export default async function AdminStatsPage() {
           title={_(msg`Active Subscriptions`)}
           value={usersWithSubscriptionsCount}
         />
+
         <CardMetric
           icon={FileCog}
           title={_(msg`App Version`)}
@@ -135,14 +132,6 @@ 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)`)}

apps/web/src/app/(dashboard)/admin/stats/user-with-document.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { DateTime } from 'luxon';
-import type { TooltipProps } from 'recharts';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
+import type { TooltipProps } from 'recharts';
 import type { NameType, ValueType } from 'recharts/types/component/DefaultTooltipContent';
 
 import type { GetUserWithDocumentMonthlyGrowth } from '@documenso/lib/server-only/admin/get-users-stats';

apps/web/src/app/(dashboard)/admin/users/[id]/delete-user-dialog.tsx

@@ -6,10 +6,9 @@ import { useRouter } from 'next/navigation';
 
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import { match } from 'ts-pattern';
 
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { User } from '@documenso/prisma/client';
+import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
@@ -38,7 +37,7 @@ export const DeleteUserDialog = ({ className, user }: DeleteUserDialogProps) =>
 
   const [email, setEmail] = useState('');
 
-  const { mutateAsync: deleteUser, isPending: isDeletingUser } =
+  const { mutateAsync: deleteUser, isLoading: isDeletingUser } =
     trpc.admin.deleteUser.useMutation();
 
   const onDeleteAccount = async () => {
@@ -55,19 +54,23 @@ export const DeleteUserDialog = ({ className, user }: DeleteUserDialogProps) =>
 
       router.push('/admin/users');
     } catch (err) {
-      const error = AppError.parseError(err);
+      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
-
-      const errorMessage = match(error.code)
-        .with(AppErrorCode.NOT_FOUND, () => msg`User not found.`)
-        .with(AppErrorCode.UNAUTHORIZED, () => msg`You are not authorized to delete this user.`)
-        .otherwise(() => msg`An error occurred while deleting the user.`);
-
         toast({
-        title: _(msg`Error`),
+          title: _(msg`An error occurred`),
-        description: _(errorMessage),
+          description: err.message,
           variant: 'destructive',
-        duration: 7500,
         });
+      } else {
+        toast({
+          title: _(msg`An unknown error occurred`),
+          variant: 'destructive',
+          description:
+            err.message ??
+            _(
+              msg`We encountered an unknown error while attempting to delete your account. Please try again later.`,
+            ),
+        });
+      }
     }
   };
 

apps/web/src/app/(dashboard)/admin/users/[id]/disable-user-dialog.tsx

@@ -34,7 +34,7 @@ export const DisableUserDialog = ({ className, userToDisable }: DisableUserDialo
 
   const [email, setEmail] = useState('');
 
-  const { mutateAsync: disableUser, isPending: isDisablingUser } =
+  const { mutateAsync: disableUser, isLoading: isDisablingUser } =
     trpc.admin.disableUser.useMutation();
 
   const onDisableAccount = async () => {

apps/web/src/app/(dashboard)/admin/users/[id]/enable-user-dialog.tsx

@@ -34,7 +34,7 @@ export const EnableUserDialog = ({ className, userToEnable }: EnableUserDialogPr
 
   const [email, setEmail] = useState('');
 
-  const { mutateAsync: enableUser, isPending: isEnablingUser } =
+  const { mutateAsync: enableUser, isLoading: isEnablingUser } =
     trpc.admin.enableUser.useMutation();
 
   const onEnableAccount = async () => {

apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx

@@ -22,8 +22,8 @@ type UserData = {
   name: string | null;
   email: string;
   roles: Role[];
-  subscriptions?: SubscriptionLite[] | null;
+  Subscription?: SubscriptionLite[] | null;
-  documents: DocumentLite[];
+  Document: DocumentLite[];
 };
 
 type SubscriptionLite = Pick<
@@ -81,7 +81,7 @@ export const UsersDataTable = ({
         header: _(msg`Subscription`),
         accessorKey: 'subscription',
         cell: ({ row }) => {
-          const foundIndividualSubscription = (row.original.subscriptions ?? []).find((sub) =>
+          const foundIndividualSubscription = (row.original.Subscription ?? []).find((sub) =>
             individualPriceIds.includes(sub.priceId),
           );
 
@@ -92,7 +92,7 @@ export const UsersDataTable = ({
         header: _(msg`Documents`),
         accessorKey: 'documents',
         cell: ({ row }) => {
-          return <div>{row.original.documents?.length}</div>;
+          return <div>{row.original.Document.length}</div>;
         },
       },
       {

apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx

@@ -18,8 +18,8 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DocumentPageViewButtonProps = {
   document: Document & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
-    recipients: Recipient[];
+    Recipient: Recipient[];
     team: Pick<Team, 'id' | 'url'> | null;
   };
   team?: Pick<Team, 'id' | 'url'>;
@@ -34,7 +34,7 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
     return null;
   }
 
-  const recipient = document.recipients.find((recipient) => recipient.email === session.user.email);
+  const recipient = document.Recipient.find((recipient) => recipient.email === session.user.email);
 
   const isRecipient = !!recipient;
   const isPending = document.status === DocumentStatus.PENDING;
@@ -46,16 +46,9 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
 
   const onDownloadClick = async () => {
     try {
-      const documentWithData = await trpcClient.document.getDocumentById.query(
+      const documentWithData = await trpcClient.document.getDocumentById.query({
-        {
         documentId: document.id,
-        },
+      });
-        {
-          context: {
-            teamId: document.team?.id?.toString(),
-          },
-        },
-      );
 
       const documentData = documentWithData?.documentData;
 

apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx

@@ -41,8 +41,8 @@ import { DuplicateDocumentDialog } from '../duplicate-document-dialog';
 
 export type DocumentPageViewDropdownProps = {
   document: Document & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
-    recipients: Recipient[];
+    Recipient: Recipient[];
     team: Pick<Team, 'id' | 'url'> | null;
   };
   team?: Pick<Team, 'id' | 'url'> & { teamEmail: TeamEmail | null };
@@ -60,9 +60,9 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
     return null;
   }
 
-  const recipient = document.recipients.find((recipient) => recipient.email === session.user.email);
+  const recipient = document.Recipient.find((recipient) => recipient.email === session.user.email);
 
-  const isOwner = document.user.id === session.user.id;
+  const isOwner = document.User.id === session.user.id;
   const isDraft = document.status === DocumentStatus.DRAFT;
   const isPending = document.status === DocumentStatus.PENDING;
   const isDeleted = document.deletedAt !== null;
@@ -74,16 +74,9 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
 
   const onDownloadClick = async () => {
     try {
-      const documentWithData = await trpcClient.document.getDocumentById.query(
+      const documentWithData = await trpcClient.document.getDocumentById.query({
-        {
         documentId: document.id,
-        },
+      });
-        {
-          context: {
-            teamId: team?.id?.toString(),
-          },
-        },
-      );
 
       const documentData = documentWithData?.documentData;
 
@@ -101,7 +94,7 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
     }
   };
 
-  const nonSignedRecipients = document.recipients.filter((item) => item.signingStatus !== 'SIGNED');
+  const nonSignedRecipients = document.Recipient.filter((item) => item.signingStatus !== 'SIGNED');
 
   return (
     <DropdownMenu>
@@ -156,7 +149,7 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
 
         {canManageDocument && (
           <DocumentRecipientLinkCopyDialog
-            recipients={document.recipients}
+            recipients={document.Recipient}
             trigger={
               <DropdownMenuItem
                 disabled={!isPending || isDeleted}

apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx

@@ -12,8 +12,8 @@ import type { Document, Recipient, User } from '@documenso/prisma/client';
 export type DocumentPageViewInformationProps = {
   userId: number;
   document: Document & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
-    recipients: Recipient[];
+    Recipient: Recipient[];
   };
 };
 
@@ -29,8 +29,7 @@ export const DocumentPageViewInformation = ({
     return [
       {
         description: msg`Uploaded by`,
-        value:
+        value: userId === document.userId ? _(msg`You`) : document.User.name ?? document.User.email,
-          userId === document.userId ? _(msg`You`) : (document.user.name ?? document.user.email),
       },
       {
         description: msg`Created`,

apps/web/src/app/(dashboard)/documents/[id]/document-page-view-recipients.tsx

@@ -28,7 +28,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DocumentPageViewRecipientsProps = {
   document: Document & {
-    recipients: Recipient[];
+    Recipient: Recipient[];
   };
   documentRootPath: string;
 };
@@ -40,7 +40,7 @@ export const DocumentPageViewRecipients = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const recipients = document.recipients;
+  const recipients = document.Recipient;
 
   return (
     <section className="dark:bg-background border-border bg-widget flex flex-col rounded-xl border">

apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx

@@ -71,7 +71,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
 
   const documentVisibility = document?.visibility;
   const currentTeamMemberRole = team?.currentTeamMember?.role;
-  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
+  const isRecipient = document?.Recipient.find((recipient) => recipient.email === user.email);
   let canAccessDocument = true;
 
   if (team && !isRecipient && document?.userId !== user.id) {
@@ -131,7 +131,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
 
   const documentWithRecipients = {
     ...document,
-    recipients,
+    Recipient: recipients,
   };
 
   return (

apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx

@@ -12,7 +12,7 @@ import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
-import type { TDocument } from '@documenso/lib/types/document';
+import type { TGetDocumentWithDetailsByIdResponse } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
 import { DocumentDistributionMethod, DocumentStatus } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -35,7 +35,7 @@ import { useOptionalCurrentTeam } from '~/providers/team';
 
 export type EditDocumentFormProps = {
   className?: string;
-  initialDocument: TDocument;
+  initialDocument: TGetDocumentWithDetailsByIdResponse;
   documentRootPath: string;
   isDocumentEnterprise: boolean;
 };
@@ -71,7 +71,7 @@ export const EditDocumentForm = ({
       },
     );
 
-  const { recipients, fields } = document;
+  const { Recipient: recipients, Field: fields } = document;
 
   const { mutateAsync: updateDocument } = trpc.document.setSettingsForDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
@@ -105,7 +105,7 @@ export const EditDocumentForm = ({
         {
           documentId: initialDocument.id,
         },
-        (oldData) => ({ ...(oldData || initialDocument), fields: newFields }),
+        (oldData) => ({ ...(oldData || initialDocument), Field: newFields }),
       );
     },
   });
@@ -117,7 +117,7 @@ export const EditDocumentForm = ({
         {
           documentId: initialDocument.id,
         },
-        (oldData) => ({ ...(oldData || initialDocument), recipients: newRecipients }),
+        (oldData) => ({ ...(oldData || initialDocument), Recipient: newRecipients }),
       );
     },
   });

apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx

@@ -52,7 +52,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
 
   const documentVisibility = document?.visibility;
   const currentTeamMemberRole = team?.currentTeamMember?.role;
-  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
+  const isRecipient = document?.Recipient.find((recipient) => recipient.email === user.email);
   let canAccessDocument = true;
 
   if (!isRecipient && document?.userId !== user.id) {
@@ -78,7 +78,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
     redirect(`${documentRootPath}/${documentId}`);
   }
 
-  const { documentMeta, recipients } = document;
+  const { documentMeta, Recipient: recipients } = document;
 
   if (documentMeta?.password) {
     const key = DOCUMENSO_ENCRYPTION_KEY;

apps/web/src/app/(dashboard)/documents/[id]/logs/document-logs-data-table.tsx

@@ -37,14 +37,15 @@ export const DocumentLogsDataTable = ({ documentId }: DocumentLogsDataTableProps
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.document.findDocumentAuditLogs.useQuery(
+  const { data, isLoading, isInitialLoading, isLoadingError } =
+    trpc.document.findDocumentAuditLogs.useQuery(
       {
         documentId,
         page: parsedSearchParams.page,
         perPage: parsedSearchParams.perPage,
       },
       {
-      placeholderData: (previousData) => previousData,
+        keepPreviousData: true,
       },
     );
 
@@ -131,7 +132,7 @@ export const DocumentLogsDataTable = ({ documentId }: DocumentLogsDataTableProps
         enable: isLoadingError,
       }}
       skeleton={{
-        enable: isLoading,
+        enable: isLoading && isInitialLoading,
         rows: 3,
         component: (
           <>

apps/web/src/app/(dashboard)/documents/[id]/logs/document-logs-page-view.tsx

@@ -77,9 +77,9 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
     },
     {
       description: msg`Created by`,
-      value: document.user.name
+      value: document.User.name
-        ? `${document.user.name} (${document.user.email})`
+        ? `${document.User.name} (${document.User.email})`
-        : document.user.email,
+        : document.User.email,
     },
     {
       description: msg`Date created`,

apps/web/src/app/(dashboard)/documents/[id]/logs/download-audit-log-button.tsx

@@ -19,7 +19,7 @@ export const DownloadAuditLogButton = ({ className, documentId }: DownloadAuditL
   const { toast } = useToast();
   const { _ } = useLingui();
 
-  const { mutateAsync: downloadAuditLogs, isPending } =
+  const { mutateAsync: downloadAuditLogs, isLoading } =
     trpc.document.downloadAuditLogs.useMutation();
 
   const onDownloadAuditLogsClick = async () => {
@@ -70,10 +70,10 @@ export const DownloadAuditLogButton = ({ className, documentId }: DownloadAuditL
   return (
     <Button
       className={cn('w-full sm:w-auto', className)}
-      loading={isPending}
+      loading={isLoading}
       onClick={() => void onDownloadAuditLogsClick()}
     >
-      {!isPending && <DownloadIcon className="mr-1.5 h-4 w-4" />}
+      {!isLoading && <DownloadIcon className="mr-1.5 h-4 w-4" />}
       <Trans>Download Audit Logs</Trans>
     </Button>
   );

apps/web/src/app/(dashboard)/documents/[id]/logs/download-certificate-button.tsx

@@ -26,7 +26,7 @@ export const DownloadCertificateButton = ({
   const { toast } = useToast();
   const { _ } = useLingui();
 
-  const { mutateAsync: downloadCertificate, isPending } =
+  const { mutateAsync: downloadCertificate, isLoading } =
     trpc.document.downloadCertificate.useMutation();
 
   const onDownloadCertificatesClick = async () => {
@@ -77,12 +77,12 @@ export const DownloadCertificateButton = ({
   return (
     <Button
       className={cn('w-full sm:w-auto', className)}
-      loading={isPending}
+      loading={isLoading}
       variant="outline"
       disabled={documentStatus !== DocumentStatus.COMPLETED}
       onClick={() => void onDownloadCertificatesClick()}
     >
-      {!isPending && <DownloadIcon className="mr-1.5 h-4 w-4" />}
+      {!isLoading && <DownloadIcon className="mr-1.5 h-4 w-4" />}
       <Trans>Download Certificate</Trans>
     </Button>
   );

apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx

@@ -12,14 +12,15 @@ import { downloadPDF } from '@documenso/lib/client-only/download-pdf';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
 import { trpc as trpcClient } from '@documenso/trpc/client';
 import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DataTableActionButtonProps = {
   row: Document & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
-    recipients: Recipient[];
+    Recipient: Recipient[];
     team: Pick<Team, 'id' | 'url'> | null;
   };
   team?: Pick<Team, 'id' | 'url'>;
@@ -34,9 +35,9 @@ export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps)
     return null;
   }
 
-  const recipient = row.recipients.find((recipient) => recipient.email === session.user.email);
+  const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
 
-  const isOwner = row.user.id === session.user.id;
+  const isOwner = row.User.id === session.user.id;
   const isRecipient = !!recipient;
   const isDraft = row.status === DocumentStatus.DRAFT;
   const isPending = row.status === DocumentStatus.PENDING;
@@ -49,20 +50,17 @@ export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps)
 
   const onDownloadClick = async () => {
     try {
-      const document = !recipient
+      let document: DocumentWithData | null = null;
-        ? await trpcClient.document.getDocumentById.query(
+
-            {
+      if (!recipient) {
+        document = await trpcClient.document.getDocumentById.query({
           documentId: row.id,
-            },
+        });
-            {
+      } else {
-              context: {
+        document = await trpcClient.document.getDocumentByToken.query({
-                teamId: team?.id?.toString(),
-              },
-            },
-          )
-        : await trpcClient.document.getDocumentByToken.query({
           token: recipient.token,
         });
+      }
 
       const documentData = document?.documentData;
 

apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx

@@ -23,8 +23,9 @@ import { useSession } from 'next-auth/react';
 
 import { downloadPDF } from '@documenso/lib/client-only/download-pdf';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 import { DocumentStatus, RecipientRole } from '@documenso/prisma/client';
+import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
+import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
 import { trpc as trpcClient } from '@documenso/trpc/client';
 import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import {
@@ -45,8 +46,8 @@ import { MoveDocumentDialog } from './move-document-dialog';
 
 export type DataTableActionDropdownProps = {
   row: Document & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
-    recipients: Recipient[];
+    Recipient: Recipient[];
     team: Pick<Team, 'id' | 'url'> | null;
   };
   team?: Pick<Team, 'id' | 'url'> & { teamEmail?: string };
@@ -65,9 +66,9 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
     return null;
   }
 
-  const recipient = row.recipients.find((recipient) => recipient.email === session.user.email);
+  const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
 
-  const isOwner = row.user.id === session.user.id;
+  const isOwner = row.User.id === session.user.id;
   // const isRecipient = !!recipient;
   const isDraft = row.status === DocumentStatus.DRAFT;
   const isPending = row.status === DocumentStatus.PENDING;
@@ -80,13 +81,17 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
 
   const onDownloadClick = async () => {
     try {
-      const document = !recipient
+      let document: DocumentWithData | null = null;
-        ? await trpcClient.document.getDocumentById.query({
+
+      if (!recipient) {
+        document = await trpcClient.document.getDocumentById.query({
           documentId: row.id,
-          })
+        });
-        : await trpcClient.document.getDocumentByToken.query({
+      } else {
+        document = await trpcClient.document.getDocumentByToken.query({
           token: recipient.token,
         });
+      }
 
       const documentData = document?.documentData;
 
@@ -104,7 +109,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
     }
   };
 
-  const nonSignedRecipients = row.recipients.filter((item) => item.signingStatus !== 'SIGNED');
+  const nonSignedRecipients = row.Recipient.filter((item) => item.signingStatus !== 'SIGNED');
 
   return (
     <DropdownMenu>
@@ -189,7 +194,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
 
         {canManageDocument && (
           <DocumentRecipientLinkCopyDialog
-            recipients={row.recipients}
+            recipients={row.Recipient}
             trigger={
               <DropdownMenuItem disabled={!isPending} asChild onSelect={(e) => e.preventDefault()}>
                 <div>
@@ -233,12 +238,14 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
         onOpenChange={setMoveDialogOpen}
       />
 
+      {isDuplicateDialogOpen && (
         <DuplicateDocumentDialog
           id={row.id}
           open={isDuplicateDialogOpen}
           onOpenChange={setDuplicateDialogOpen}
           team={team}
         />
+      )}
     </DropdownMenu>
   );
 };

apps/web/src/app/(dashboard)/documents/data-table-sender-filter.tsx

@@ -25,7 +25,7 @@ export const DataTableSenderFilter = ({ teamId }: DataTableSenderFilterProps) =>
 
   const senderIds = parseToIntegerArray(searchParams?.get('senderIds') ?? '');
 
-  const { data, isLoading } = trpc.team.getTeamMembers.useQuery({
+  const { data, isInitialLoading } = trpc.team.getTeamMembers.useQuery({
     teamId,
   });
 
@@ -61,7 +61,7 @@ export const DataTableSenderFilter = ({ teamId }: DataTableSenderFilterProps) =>
       }
       enableClearAllButton={true}
       inputPlaceholder={msg`Search`}
-      loading={!isMounted || isLoading}
+      loading={!isMounted || isInitialLoading}
       options={comboBoxOptions}
       selectedValues={senderIds}
       onChange={onChange}

apps/web/src/app/(dashboard)/documents/data-table-title.tsx

@@ -10,9 +10,9 @@ import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 
 export type DataTableTitleProps = {
   row: Document & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
     team: Pick<Team, 'url'> | null;
-    recipients: Recipient[];
+    Recipient: Recipient[];
   };
   teamUrl?: string;
 };
@@ -24,9 +24,9 @@ export const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
     return null;
   }
 
-  const recipient = row.recipients.find((recipient) => recipient.email === session.user.email);
+  const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
 
-  const isOwner = row.user.id === session.user.id;
+  const isOwner = row.User.id === session.user.id;
   const isRecipient = !!recipient;
   const isCurrentTeamDocument = teamUrl && row.team?.url === teamUrl;
 

apps/web/src/app/(dashboard)/documents/data-table.tsx

@@ -9,9 +9,9 @@ import { DateTime } from 'luxon';
 import { useSession } from 'next-auth/react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import type { TFindDocumentsResponse } from '@documenso/lib/server-only/document/find-documents';
 import type { Team } from '@documenso/prisma/client';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
-import type { TFindDocumentsResponse } from '@documenso/trpc/server/document-router/schema';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
@@ -57,14 +57,14 @@ export const DocumentsDataTable = ({
       {
         id: 'sender',
         header: _(msg`Sender`),
-        cell: ({ row }) => row.original.user.name ?? row.original.user.email,
+        cell: ({ row }) => row.original.User.name ?? row.original.User.email,
       },
       {
         header: _(msg`Recipient`),
         accessorKey: 'recipient',
         cell: ({ row }) => (
           <StackAvatarsWithTooltip
-            recipients={row.original.recipients}
+            recipients={row.original.Recipient}
             documentStatus={row.original.status}
           />
         ),

apps/web/src/app/(dashboard)/documents/delete-document-dialog.tsx

@@ -51,7 +51,7 @@ export const DeleteDocumentDialog = ({
   const [inputValue, setInputValue] = useState('');
   const [isDeleteEnabled, setIsDeleteEnabled] = useState(status === DocumentStatus.DRAFT);
 
-  const { mutateAsync: deleteDocument, isPending } = trpcReact.document.deleteDocument.useMutation({
+  const { mutateAsync: deleteDocument, isLoading } = trpcReact.document.deleteDocument.useMutation({
     onSuccess: () => {
       router.refresh();
       void refreshLimits();
@@ -92,7 +92,7 @@ export const DeleteDocumentDialog = ({
   };
 
   return (
-    <Dialog open={open} onOpenChange={(value) => !isPending && onOpenChange(value)}>
+    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>
@@ -193,7 +193,7 @@ export const DeleteDocumentDialog = ({
 
           <Button
             type="button"
-            loading={isPending}
+            loading={isLoading}
             onClick={onDelete}
             disabled={!isDeleteEnabled && canManageDocument}
             variant="destructive"

apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx

@@ -48,10 +48,10 @@ export const DuplicateDocumentDialog = ({
 
   const documentsPath = formatDocumentsPath(team?.url);
 
-  const { mutateAsync: duplicateDocument, isPending: isDuplicateLoading } =
+  const { mutateAsync: duplicateDocument, isLoading: isDuplicateLoading } =
     trpcReact.document.duplicateDocument.useMutation({
-      onSuccess: ({ documentId }) => {
+      onSuccess: (newId) => {
-        router.push(`${documentsPath}/${documentId}/edit`);
+        router.push(`${documentsPath}/${newId}/edit`);
 
         toast({
           title: _(msg`Document Duplicated`),

apps/web/src/app/(dashboard)/documents/move-document-dialog.tsx

@@ -42,7 +42,7 @@ export const MoveDocumentDialog = ({ documentId, open, onOpenChange }: MoveDocum
 
   const { data: teams, isLoading: isLoadingTeams } = trpc.team.getTeams.useQuery();
 
-  const { mutateAsync: moveDocument, isPending } = trpc.document.moveDocumentToTeam.useMutation({
+  const { mutateAsync: moveDocument, isLoading } = trpc.document.moveDocumentToTeam.useMutation({
     onSuccess: () => {
       router.refresh();
       toast({
@@ -119,8 +119,8 @@ export const MoveDocumentDialog = ({ documentId, open, onOpenChange }: MoveDocum
           <Button variant="secondary" onClick={() => onOpenChange(false)}>
             <Trans>Cancel</Trans>
           </Button>
-          <Button onClick={onMove} loading={isPending} disabled={!selectedTeamId || isPending}>
+          <Button onClick={onMove} loading={isLoading} disabled={!selectedTeamId || isLoading}>
-            {isPending ? <Trans>Moving...</Trans> : <Trans>Move</Trans>}
+            {isLoading ? <Trans>Moving...</Trans> : <Trans>Move</Trans>}
           </Button>
         </DialogFooter>
       </DialogContent>

apps/web/src/app/(dashboard)/documents/upload-document.tsx

@@ -8,16 +8,16 @@ import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { Loader } from 'lucide-react';
 import { useSession } from 'next-auth/react';
-import { match } from 'ts-pattern';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { AppError } from '@documenso/lib/errors/app-error';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';
@@ -99,20 +99,25 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
 
       console.error(err);
 
-      const errorMessage = match(error.code)
+      if (error.code === 'INVALID_DOCUMENT_FILE') {
-        .with('INVALID_DOCUMENT_FILE', () => msg`You cannot upload encrypted PDFs`)
+        toast({
-        .with(
+          title: _(msg`Invalid file`),
-          AppErrorCode.LIMIT_EXCEEDED,
+          description: _(msg`You cannot upload encrypted PDFs`),
-          () => msg`You have reached your document limit for this month. Please upgrade your plan.`,
+          variant: 'destructive',
-        )
+        });
-        .otherwise(() => msg`An error occurred while uploading your document.`);
+      } else if (err instanceof TRPCClientError) {
-
         toast({
           title: _(msg`Error`),
-        description: _(errorMessage),
+          description: err.message,
           variant: 'destructive',
-        duration: 7500,
         });
+      } else {
+        toast({
+          title: _(msg`Error`),
+          description: _(msg`An error occurred while uploading your document.`),
+          variant: 'destructive',
+        });
+      }
     } finally {
       setIsLoading(false);
     }

apps/web/src/app/(dashboard)/settings/profile/delete-account-dialog.tsx

@@ -36,7 +36,7 @@ export const DeleteAccountDialog = ({ className, user }: DeleteAccountDialogProp
 
   const [enteredEmail, setEnteredEmail] = useState<string>('');
 
-  const { mutateAsync: deleteAccount, isPending: isDeletingAccount } =
+  const { mutateAsync: deleteAccount, isLoading: isDeletingAccount } =
     trpc.profile.deleteAccount.useMutation();
 
   const onDeleteAccount = async () => {

apps/web/src/app/(dashboard)/settings/public-profile/public-profile-page-view.tsx

@@ -5,6 +5,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 
+import type { FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
 import type {
   Team,
   TeamProfile,
@@ -14,7 +15,6 @@ import type {
 } from '@documenso/prisma/client';
 import { TemplateType } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
-import type { FindTemplateRow } from '@documenso/trpc/server/template-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import { Switch } from '@documenso/ui/primitives/switch';
@@ -63,10 +63,10 @@ export const PublicProfilePageView = ({ user, team, profile }: PublicProfilePage
     perPage: 100,
   });
 
-  const { mutateAsync: updateUserProfile, isPending: isUpdatingUserProfile } =
+  const { mutateAsync: updateUserProfile, isLoading: isUpdatingUserProfile } =
     trpc.profile.updatePublicProfile.useMutation();
 
-  const { mutateAsync: updateTeamProfile, isPending: isUpdatingTeamProfile } =
+  const { mutateAsync: updateTeamProfile, isLoading: isUpdatingTeamProfile } =
     trpc.team.updateTeamPublicProfile.useMutation();
 
   const isUpdating = isUpdatingUserProfile || isUpdatingTeamProfile;

apps/web/src/app/(dashboard)/settings/public-profile/public-templates-data-table.tsx

@@ -7,11 +7,11 @@ import { useLingui } from '@lingui/react';
 import { EditIcon, FileIcon, LinkIcon, MoreHorizontalIcon, Trash2Icon } from 'lucide-react';
 
 import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
+import type { FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
 import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
 import type { TemplateDirectLink } from '@documenso/prisma/client';
 import { TemplateType } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
-import type { FindTemplateRow } from '@documenso/trpc/server/template-router/schema';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -39,10 +39,10 @@ export const PublicTemplatesDataTable = () => {
     templateId: number;
   } | null>(null);
 
-  const { data, isLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery(
+  const { data, isInitialLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery(
     {},
     {
-      placeholderData: (previousData) => previousData,
+      keepPreviousData: true,
     },
   );
 
@@ -80,7 +80,7 @@ export const PublicTemplatesDataTable = () => {
         {/* Loading and error handling states. */}
         {publicDirectTemplates.length === 0 && (
           <>
-            {isLoading &&
+            {isInitialLoading &&
               Array(3)
                 .fill(0)
                 .map((_, index) => (
@@ -115,7 +115,7 @@ export const PublicTemplatesDataTable = () => {
               </div>
             )}
 
-            {!isLoading && (
+            {!isInitialLoading && (
               <div className="text-muted-foreground flex h-32 flex-col items-center justify-center text-sm">
                 <Trans>No public profile templates found</Trans>
                 <ManagePublicTemplateDialog

apps/web/src/app/(dashboard)/settings/security/activity/user-security-activity-data-table.tsx

@@ -35,13 +35,14 @@ export const UserSecurityActivityDataTable = () => {
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.profile.findUserSecurityAuditLogs.useQuery(
+  const { data, isLoading, isInitialLoading, isLoadingError } =
+    trpc.profile.findUserSecurityAuditLogs.useQuery(
       {
         page: parsedSearchParams.page,
         perPage: parsedSearchParams.perPage,
       },
       {
-      placeholderData: (previousData) => previousData,
+        keepPreviousData: true,
       },
     );
 
@@ -133,7 +134,7 @@ export const UserSecurityActivityDataTable = () => {
         enable: isLoadingError,
       }}
       skeleton={{
-        enable: isLoading,
+        enable: isLoading && isInitialLoading,
         rows: 3,
         component: (
           <>

apps/web/src/app/(dashboard)/settings/security/passkeys/create-passkey-dialog.tsx

@@ -65,7 +65,7 @@ export const CreatePasskeyDialog = ({ trigger, onSuccess, ...props }: CreatePass
     },
   });
 
-  const { mutateAsync: createPasskeyRegistrationOptions, isPending } =
+  const { mutateAsync: createPasskeyRegistrationOptions, isLoading } =
     trpc.auth.createPasskeyRegistrationOptions.useMutation();
 
   const { mutateAsync: createPasskey } = trpc.auth.createPasskey.useMutation();
@@ -141,7 +141,7 @@ export const CreatePasskeyDialog = ({ trigger, onSuccess, ...props }: CreatePass
     >
       <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
         {trigger ?? (
-          <Button variant="secondary" loading={isPending}>
+          <Button variant="secondary" loading={isLoading}>
             <KeyRoundIcon className="-ml-1 mr-1 h-5 w-5" />
             <Trans>Add passkey</Trans>
           </Button>

apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table-actions.tsx

@@ -60,7 +60,7 @@ export const UserPasskeysDataTableActions = ({
     },
   });
 
-  const { mutateAsync: updatePasskey, isPending: isUpdatingPasskey } =
+  const { mutateAsync: updatePasskey, isLoading: isUpdatingPasskey } =
     trpc.auth.updatePasskey.useMutation({
       onSuccess: () => {
         toast({
@@ -80,7 +80,7 @@ export const UserPasskeysDataTableActions = ({
       },
     });
 
-  const { mutateAsync: deletePasskey, isPending: isDeletingPasskey } =
+  const { mutateAsync: deletePasskey, isLoading: isDeletingPasskey } =
     trpc.auth.deletePasskey.useMutation({
       onSuccess: () => {
         toast({

apps/web/src/app/(dashboard)/settings/security/passkeys/user-passkeys-data-table.tsx

@@ -29,13 +29,13 @@ export const UserPasskeysDataTable = () => {
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.auth.findPasskeys.useQuery(
+  const { data, isLoading, isInitialLoading, isLoadingError } = trpc.auth.findPasskeys.useQuery(
     {
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,
     },
     {
-      placeholderData: (previousData) => previousData,
+      keepPreviousData: true,
     },
   );
 
@@ -100,7 +100,7 @@ export const UserPasskeysDataTable = () => {
         enable: isLoadingError,
       }}
       skeleton={{
-        enable: isLoading,
+        enable: isLoading && isInitialLoading,
         rows: 3,
         component: (
           <>

apps/web/src/app/(dashboard)/settings/teams/accept-team-invitation-button.tsx

@@ -17,7 +17,7 @@ export const AcceptTeamInvitationButton = ({ teamId }: AcceptTeamInvitationButto
 
   const {
     mutateAsync: acceptTeamInvitation,
-    isPending,
+    isLoading,
     isSuccess,
   } = trpc.team.acceptTeamInvitation.useMutation({
     onSuccess: () => {
@@ -40,8 +40,8 @@ export const AcceptTeamInvitationButton = ({ teamId }: AcceptTeamInvitationButto
   return (
     <Button
       onClick={async () => acceptTeamInvitation({ teamId })}
-      loading={isPending}
+      loading={isLoading}
-      disabled={isPending || isSuccess}
+      disabled={isLoading || isSuccess}
     >
       <Trans>Accept</Trans>
     </Button>

apps/web/src/app/(dashboard)/settings/teams/decline-team-invitation-button.tsx

@@ -17,7 +17,7 @@ export const DeclineTeamInvitationButton = ({ teamId }: DeclineTeamInvitationBut
 
   const {
     mutateAsync: declineTeamInvitation,
-    isPending,
+    isLoading,
     isSuccess,
   } = trpc.team.declineTeamInvitation.useMutation({
     onSuccess: () => {
@@ -40,8 +40,8 @@ export const DeclineTeamInvitationButton = ({ teamId }: DeclineTeamInvitationBut
   return (
     <Button
       onClick={async () => declineTeamInvitation({ teamId })}
-      loading={isPending}
+      loading={isLoading}
-      disabled={isPending || isSuccess}
+      disabled={isLoading || isSuccess}
       variant="ghost"
     >
       <Trans>Decline</Trans>

apps/web/src/app/(dashboard)/settings/teams/team-email-usage.tsx

@@ -30,7 +30,7 @@ export const TeamEmailUsage = ({ teamEmail }: TeamEmailUsageProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: deleteTeamEmail, isPending: isDeletingTeamEmail } =
+  const { mutateAsync: deleteTeamEmail, isLoading: isDeletingTeamEmail } =
     trpc.team.deleteTeamEmail.useMutation({
       onSuccess: () => {
         toast({

apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx

@@ -23,11 +23,11 @@ import { AcceptTeamInvitationButton } from './accept-team-invitation-button';
 import { DeclineTeamInvitationButton } from './decline-team-invitation-button';
 
 export const TeamInvitations = () => {
-  const { data, isLoading } = trpc.team.getTeamInvitations.useQuery();
+  const { data, isInitialLoading } = trpc.team.getTeamInvitations.useQuery();
 
   return (
     <AnimatePresence>
-      {data && data.length > 0 && !isLoading && (
+      {data && data.length > 0 && !isInitialLoading && (
         <AnimateGenericFadeInOut>
           <Alert variant="secondary">
             <div className="flex h-full flex-row items-center p-2">

apps/web/src/app/(dashboard)/templates/[id]/edit/edit-template.tsx

@@ -12,7 +12,7 @@ import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
-import type { TTemplate } from '@documenso/lib/types/template';
+import type { TemplateWithDetails } from '@documenso/prisma/types/template';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -32,7 +32,7 @@ import { useOptionalCurrentTeam } from '~/providers/team';
 
 export type EditTemplateFormProps = {
   className?: string;
-  initialTemplate: TTemplate;
+  initialTemplate: TemplateWithDetails;
   isEnterprise: boolean;
   templateRootPath: string;
 };
@@ -69,7 +69,7 @@ export const EditTemplateForm = ({
     },
   );
 
-  const { recipients, fields, templateDocumentData } = template;
+  const { Recipient: recipients, Field: fields, templateDocumentData } = template;
 
   const documentFlow: Record<EditTemplateStep, DocumentFlowStep> = {
     settings: {

apps/web/src/app/(dashboard)/templates/[id]/template-direct-link-dialog-wrapper.tsx

@@ -11,7 +11,7 @@ import { Button } from '@documenso/ui/primitives/button';
 import { TemplateDirectLinkDialog } from '../template-direct-link-dialog';
 
 export type TemplateDirectLinkDialogWrapperProps = {
-  template: Template & { directLink?: TemplateDirectLink | null; recipients: Recipient[] };
+  template: Template & { directLink?: TemplateDirectLink | null; Recipient: Recipient[] };
 };
 
 export const TemplateDirectLinkDialogWrapper = ({

apps/web/src/app/(dashboard)/templates/[id]/template-page-view-documents-table.tsx

@@ -69,7 +69,8 @@ export const TemplatePageViewDocumentsTable = ({
     Object.fromEntries(searchParams ?? []),
   );
 
-  const { data, isLoading, isLoadingError } = trpc.document.findDocuments.useQuery(
+  const { data, isLoading, isInitialLoading, isLoadingError } =
+    trpc.document.findDocuments.useQuery(
       {
         templateId,
         page: parsedSearchParams.page,
@@ -79,7 +80,7 @@ export const TemplatePageViewDocumentsTable = ({
         status: parsedSearchParams.status,
       },
       {
-      placeholderData: (previousData) => previousData,
+        keepPreviousData: true,
       },
     );
 
@@ -115,7 +116,7 @@ export const TemplatePageViewDocumentsTable = ({
         accessorKey: 'recipient',
         cell: ({ row }) => (
           <StackAvatarsWithTooltip
-            recipients={row.original.recipients}
+            recipients={row.original.Recipient}
             documentStatus={row.original.status}
           />
         ),
@@ -240,7 +241,7 @@ export const TemplatePageViewDocumentsTable = ({
           enable: isLoadingError,
         }}
         skeleton={{
-          enable: isLoading,
+          enable: isLoading && isInitialLoading,
           rows: 3,
           component: (
             <>

apps/web/src/app/(dashboard)/templates/[id]/template-page-view-information.tsx

@@ -12,7 +12,7 @@ import type { Template, User } from '@documenso/prisma/client';
 export type TemplatePageViewInformationProps = {
   userId: number;
   template: Template & {
-    user: Pick<User, 'id' | 'name' | 'email'>;
+    User: Pick<User, 'id' | 'name' | 'email'>;
   };
 };
 
@@ -28,8 +28,7 @@ export const TemplatePageViewInformation = ({
     return [
       {
         description: msg`Uploaded by`,
-        value:
+        value: userId === template.userId ? _(msg`You`) : template.User.name ?? template.User.email,
-          userId === template.userId ? _(msg`You`) : (template.user.name ?? template.user.email),
       },
       {
         description: msg`Created`,

apps/web/src/app/(dashboard)/templates/[id]/template-page-view-recent-activity.tsx

@@ -123,7 +123,7 @@ export const TemplatePageViewRecentActivity = ({
                   {match(document.source)
                     .with(DocumentSource.DOCUMENT, DocumentSource.TEMPLATE, () => (
                       <Trans>
-                        Document created by <span className="font-bold">{document.user.name}</span>
+                        Document created by <span className="font-bold">{document.User.name}</span>
                       </Trans>
                     ))
                     .with(DocumentSource.TEMPLATE_DIRECT_LINK, () => (

apps/web/src/app/(dashboard)/templates/[id]/template-page-view-recipients.tsx

@@ -10,7 +10,7 @@ import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 
 export type TemplatePageViewRecipientsProps = {
   template: Template & {
-    recipients: Recipient[];
+    Recipient: Recipient[];
   };
   templateRootPath: string;
 };
@@ -21,7 +21,7 @@ export const TemplatePageViewRecipients = ({
 }: TemplatePageViewRecipientsProps) => {
   const { _ } = useLingui();
 
-  const recipients = template.recipients;
+  const recipients = template.Recipient;
 
   return (
     <section className="dark:bg-background border-border bg-widget flex flex-col rounded-xl border">

apps/web/src/app/(dashboard)/templates/[id]/template-page-view.tsx

@@ -14,7 +14,6 @@ import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 
 import { DocumentReadOnlyFields } from '~/components/document/document-read-only-fields';
 import { TemplateType } from '~/components/formatter/template-type';
-import { TemplateBulkSendDialog } from '~/components/templates/template-bulk-send-dialog';
 
 import { DataTableActionDropdown } from '../data-table-action-dropdown';
 import { TemplateDirectLinkBadge } from '../template-direct-link-badge';
@@ -55,10 +54,10 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
     redirect(templateRootPath);
   }
 
-  const { templateDocumentData, fields, recipients, templateMeta } = template;
+  const { templateDocumentData, Field, Recipient: recipients, templateMeta } = template;
 
   // Remap to fit the DocumentReadOnlyFields component.
-  const readOnlyFields = fields.map((field) => {
+  const readOnlyFields = Field.map((field) => {
     const recipient = recipients.find((recipient) => recipient.id === field.recipientId) || {
       name: '',
       email: '',
@@ -67,8 +66,8 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
 
     return {
       ...field,
-      recipient,
+      Recipient: recipient,
-      signature: null,
+      Signature: null,
     };
   });
 
@@ -112,8 +111,6 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
         <div className="mt-2 flex flex-row space-x-4 sm:mt-0 sm:self-end">
           <TemplateDirectLinkDialogWrapper template={template} />
 
-          <TemplateBulkSendDialog templateId={template.id} recipients={template.recipients} />
-
           <Button className="w-full" asChild>
             <Link href={`${templateRootPath}/${template.id}/edit`}>
               <LucideEdit className="mr-1.5 h-3.5 w-3.5" />
@@ -168,7 +165,7 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
                 <UseTemplateDialog
                   templateId={template.id}
                   templateSigningOrder={template.templateMeta?.signingOrder}
-                  recipients={template.recipients}
+                  recipients={template.Recipient}
                   documentRootPath={documentRootPath}
                   trigger={
                     <Button className="w-full">

apps/web/src/app/(dashboard)/templates/data-table-action-dropdown.tsx

@@ -5,7 +5,7 @@ import { useState } from 'react';
 import Link from 'next/link';
 
 import { Trans } from '@lingui/macro';
-import { Copy, Edit, MoreHorizontal, MoveRight, Share2Icon, Trash2, Upload } from 'lucide-react';
+import { Copy, Edit, MoreHorizontal, MoveRight, Share2Icon, Trash2 } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
 import type { Recipient, Template, TemplateDirectLink } from '@documenso/prisma/client';
@@ -17,8 +17,6 @@ import {
   DropdownMenuTrigger,
 } from '@documenso/ui/primitives/dropdown-menu';
 
-import { TemplateBulkSendDialog } from '~/components/templates/template-bulk-send-dialog';
-
 import { DeleteTemplateDialog } from './delete-template-dialog';
 import { DuplicateTemplateDialog } from './duplicate-template-dialog';
 import { MoveTemplateDialog } from './move-template-dialog';
@@ -27,7 +25,7 @@ import { TemplateDirectLinkDialog } from './template-direct-link-dialog';
 export type DataTableActionDropdownProps = {
   row: Template & {
     directLink?: Pick<TemplateDirectLink, 'token' | 'enabled'> | null;
-    recipients: Recipient[];
+    Recipient: Recipient[];
   };
   templateRootPath: string;
   teamId?: number;
@@ -88,17 +86,6 @@ export const DataTableActionDropdown = ({
           </DropdownMenuItem>
         )}
 
-        <TemplateBulkSendDialog
-          templateId={row.id}
-          recipients={row.recipients}
-          trigger={
-            <div className="hover:bg-accent hover:text-accent-foreground relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors">
-              <Upload className="mr-2 h-4 w-4" />
-              <Trans>Bulk Send via CSV</Trans>
-            </div>
-          }
-        />
-
         <DropdownMenuItem
           disabled={!isOwner && !isTeamTemplate}
           onClick={() => setDeleteDialogOpen(true)}

apps/web/src/app/(dashboard)/templates/data-table-templates.tsx

@@ -10,7 +10,7 @@ import { AlertTriangle, Globe2Icon, InfoIcon, Link2Icon, Loader, LockIcon } from
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import type { FindTemplateRow } from '@documenso/trpc/server/template-router/schema';
+import type { FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
@@ -146,7 +146,7 @@ export const TemplatesDataTable = ({
                 templateId={row.original.id}
                 templateSigningOrder={row.original.templateMeta?.signingOrder}
                 documentDistributionMethod={row.original.templateMeta?.distributionMethod}
-                recipients={row.original.recipients}
+                recipients={row.original.Recipient}
                 documentRootPath={documentRootPath}
               />
 

apps/web/src/app/(dashboard)/templates/delete-template-dialog.tsx

@@ -28,7 +28,7 @@ export const DeleteTemplateDialog = ({ id, open, onOpenChange }: DeleteTemplateD
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: deleteTemplate, isPending } = trpcReact.template.deleteTemplate.useMutation({
+  const { mutateAsync: deleteTemplate, isLoading } = trpcReact.template.deleteTemplate.useMutation({
     onSuccess: () => {
       router.refresh();
 
@@ -51,7 +51,7 @@ export const DeleteTemplateDialog = ({ id, open, onOpenChange }: DeleteTemplateD
   });
 
   return (
-    <Dialog open={open} onOpenChange={(value) => !isPending && onOpenChange(value)}>
+    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>
@@ -70,7 +70,7 @@ export const DeleteTemplateDialog = ({ id, open, onOpenChange }: DeleteTemplateD
           <Button
             type="button"
             variant="secondary"
-            disabled={isPending}
+            disabled={isLoading}
             onClick={() => onOpenChange(false)}
           >
             <Trans>Cancel</Trans>
@@ -79,7 +79,7 @@ export const DeleteTemplateDialog = ({ id, open, onOpenChange }: DeleteTemplateD
           <Button
             type="button"
             variant="destructive"
-            loading={isPending}
+            loading={isLoading}
             onClick={async () => deleteTemplate({ templateId: id })}
           >
             <Trans>Delete</Trans>

apps/web/src/app/(dashboard)/templates/duplicate-template-dialog.tsx

@@ -32,7 +32,7 @@ export const DuplicateTemplateDialog = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: duplicateTemplate, isPending } =
+  const { mutateAsync: duplicateTemplate, isLoading } =
     trpcReact.template.duplicateTemplate.useMutation({
       onSuccess: () => {
         router.refresh();
@@ -55,7 +55,7 @@ export const DuplicateTemplateDialog = ({
     });
 
   return (
-    <Dialog open={open} onOpenChange={(value) => !isPending && onOpenChange(value)}>
+    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>
@@ -70,7 +70,7 @@ export const DuplicateTemplateDialog = ({
         <DialogFooter>
           <Button
             type="button"
-            disabled={isPending}
+            disabled={isLoading}
             variant="secondary"
             onClick={() => onOpenChange(false)}
           >
@@ -79,7 +79,7 @@ export const DuplicateTemplateDialog = ({
 
           <Button
             type="button"
-            loading={isPending}
+            loading={isLoading}
             onClick={async () =>
               duplicateTemplate({
                 templateId: id,

apps/web/src/app/(dashboard)/templates/move-template-dialog.tsx

@@ -43,7 +43,7 @@ export const MoveTemplateDialog = ({ templateId, open, onOpenChange }: MoveTempl
   const [selectedTeamId, setSelectedTeamId] = useState<number | null>(null);
 
   const { data: teams, isLoading: isLoadingTeams } = trpc.team.getTeams.useQuery();
-  const { mutateAsync: moveTemplate, isPending } = trpc.template.moveTemplateToTeam.useMutation({
+  const { mutateAsync: moveTemplate, isLoading } = trpc.template.moveTemplateToTeam.useMutation({
     onSuccess: () => {
       router.refresh();
       toast({
@@ -130,8 +130,8 @@ export const MoveTemplateDialog = ({ templateId, open, onOpenChange }: MoveTempl
           <Button variant="secondary" onClick={() => onOpenChange(false)}>
             <Trans>Cancel</Trans>
           </Button>
-          <Button onClick={onMove} loading={isPending} disabled={!selectedTeamId || isPending}>
+          <Button onClick={onMove} loading={isLoading} disabled={!selectedTeamId || isLoading}>
-            {isPending ? <Trans>Moving...</Trans> : <Trans>Move</Trans>}
+            {isLoading ? <Trans>Moving...</Trans> : <Trans>Move</Trans>}
           </Button>
         </DialogFooter>
       </DialogContent>

apps/web/src/app/(dashboard)/templates/template-direct-link-dialog.tsx

@@ -46,10 +46,12 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { useOptionalCurrentTeam } from '~/providers/team';
+
 type TemplateDirectLinkDialogProps = {
   template: Template & {
     directLink?: Pick<TemplateDirectLink, 'token' | 'enabled'> | null;
-    recipients: Recipient[];
+    Recipient: Recipient[];
   };
   open: boolean;
   onOpenChange: (_open: boolean) => void;
@@ -66,6 +68,8 @@ export const TemplateDirectLinkDialog = ({
   const { quota, remaining } = useLimits();
   const { _ } = useLingui();
 
+  const team = useOptionalCurrentTeam();
+
   const [, copy] = useCopyToClipboard();
   const router = useRouter();
 
@@ -77,13 +81,13 @@ export const TemplateDirectLinkDialog = ({
   );
 
   const validDirectTemplateRecipients = useMemo(
-    () => template.recipients.filter((recipient) => recipient.role !== RecipientRole.CC),
+    () => template.Recipient.filter((recipient) => recipient.role !== RecipientRole.CC),
-    [template.recipients],
+    [template.Recipient],
   );
 
   const {
     mutateAsync: createTemplateDirectLink,
-    isPending: isCreatingTemplateDirectLink,
+    isLoading: isCreatingTemplateDirectLink,
     reset: resetCreateTemplateDirectLink,
   } = trpcReact.template.createTemplateDirectLink.useMutation({
     onSuccess: (data) => {
@@ -104,7 +108,7 @@ export const TemplateDirectLinkDialog = ({
     },
   });
 
-  const { mutateAsync: toggleTemplateDirectLink, isPending: isTogglingTemplateAccess } =
+  const { mutateAsync: toggleTemplateDirectLink, isLoading: isTogglingTemplateAccess } =
     trpcReact.template.toggleTemplateDirectLink.useMutation({
       onSuccess: (data) => {
         const enabledDescription = msg`Direct link signing has been enabled`;
@@ -127,7 +131,7 @@ export const TemplateDirectLinkDialog = ({
       },
     });
 
-  const { mutateAsync: deleteTemplateDirectLink, isPending: isDeletingTemplateDirectLink } =
+  const { mutateAsync: deleteTemplateDirectLink, isLoading: isDeletingTemplateDirectLink } =
     trpcReact.template.deleteTemplateDirectLink.useMutation({
       onSuccess: () => {
         onOpenChange(false);
@@ -322,7 +326,7 @@ export const TemplateDirectLinkDialog = ({
                 </div>
 
                 {/* Prevent creating placeholder direct template recipient if the email already exists. */}
-                {!template.recipients.some(
+                {!template.Recipient.some(
                   (recipient) => recipient.email === DIRECT_TEMPLATE_RECIPIENT_EMAIL,
                 ) && (
                   <DialogFooter className="mx-auto">

apps/web/src/app/(internal)/%5F%5Fhtmltopdf/audit-log/page.tsx

@@ -104,7 +104,7 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
             <span className="font-medium">{_(msg`Owner`)}</span>
 
             <span className="mt-1 block break-words">
-              {document.user.name} ({document.user.email})
+              {document.User.name} ({document.User.email})
             </span>
           </p>
 
@@ -140,7 +140,7 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
             <p className="font-medium">{_(msg`Recipients`)}</p>
 
             <ul className="mt-1 list-inside list-disc">
-              {document.recipients.map((recipient) => (
+              {document.Recipient.map((recipient) => (
                 <li key={recipient.id}>
                   <span className="text-muted-foreground">
                     [{_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}]

apps/web/src/app/(internal)/%5F%5Fhtmltopdf/certificate/page.tsx

@@ -86,7 +86,7 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
   });
 
   const isOwner = (email: string) => {
-    return email.toLowerCase() === document.user.email.toLowerCase();
+    return email.toLowerCase() === document.User.email.toLowerCase();
   };
 
   const getDevice = (userAgent?: string | null) => {
@@ -104,7 +104,7 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
   };
 
   const getAuthenticationLevel = (recipientId: number) => {
-    const recipient = document.recipients.find((recipient) => recipient.id === recipientId);
+    const recipient = document.Recipient.find((recipient) => recipient.id === recipientId);
 
     if (!recipient) {
       return 'Unknown';
@@ -157,9 +157,7 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
   };
 
   const getRecipientSignatureField = (recipientId: number) => {
-    return document.recipients
+    return document.Recipient.find((recipient) => recipient.id === recipientId)?.Field.find(
-      .find((recipient) => recipient.id === recipientId)
-      ?.fields.find(
       (field) => field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE,
     );
   };
@@ -183,7 +181,7 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
             </TableHeader>
 
             <TableBody className="print:text-xs">
-              {document.recipients.map((recipient, i) => {
+              {document.Recipient.map((recipient, i) => {
                 const logs = getRecipientAuditLogs(recipient.id);
                 const signature = getRecipientSignatureField(recipient.id);
 
@@ -211,17 +209,17 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
                               boxShadow: `0px 0px 0px 4.88px rgba(122, 196, 85, 0.1), 0px 0px 0px 1.22px rgba(122, 196, 85, 0.6), 0px 0px 0px 0.61px rgba(122, 196, 85, 1)`,
                             }}
                           >
-                            {signature.signature?.signatureImageAsBase64 && (
+                            {signature.Signature?.signatureImageAsBase64 && (
                               <img
-                                src={`${signature.signature?.signatureImageAsBase64}`}
+                                src={`${signature.Signature?.signatureImageAsBase64}`}
                                 alt="Signature"
                                 className="max-h-12 max-w-full"
                               />
                             )}
 
-                            {signature.signature?.typedSignature && (
+                            {signature.Signature?.typedSignature && (
                               <p className="font-signature text-center text-sm">
-                                {signature.signature?.typedSignature}
+                                {signature.Signature?.typedSignature}
                               </p>
                             )}
                           </div>

apps/web/src/app/(recipient)/d/[token]/configure-direct-template.tsx

@@ -7,9 +7,8 @@ import { useSession } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
-import type { TTemplate } from '@documenso/lib/types/template';
+import type { Field, Recipient } from '@documenso/prisma/client';
-import type { Recipient } from '@documenso/prisma/client';
+import type { TemplateWithDetails } from '@documenso/prisma/types/template';
-import type { Field } from '@documenso/prisma/client';
 import {
   DocumentFlowFormContainerActions,
   DocumentFlowFormContainerContent,
@@ -41,8 +40,8 @@ export type TConfigureDirectTemplateFormSchema = z.infer<typeof ZConfigureDirect
 export type ConfigureDirectTemplateFormProps = {
   flowStep: DocumentFlowStep;
   isDocumentPdfLoaded: boolean;
-  template: Omit<TTemplate, 'user'>;
+  template: Omit<TemplateWithDetails, 'User'>;
-  directTemplateRecipient: Recipient & { fields: Field[] };
+  directTemplateRecipient: Recipient & { Field: Field[] };
   initialEmail?: string;
   onSubmit: (_data: TConfigureDirectTemplateFormSchema) => void;
 };
@@ -58,10 +57,10 @@ export const ConfigureDirectTemplateFormPartial = ({
   const { _ } = useLingui();
   const { data: session } = useSession();
 
-  const { recipients } = template;
+  const { Recipient } = template;
   const { derivedRecipientAccessAuth } = useRequiredDocumentAuthContext();
 
-  const recipientsWithBlankDirectRecipientEmail = recipients.map((recipient) => {
+  const recipientsWithBlankDirectRecipientEmail = Recipient.map((recipient) => {
     if (recipient.id === directTemplateRecipient.id) {
       return {
         ...recipient,
@@ -75,7 +74,7 @@ export const ConfigureDirectTemplateFormPartial = ({
   const form = useForm<TConfigureDirectTemplateFormSchema>({
     resolver: zodResolver(
       ZConfigureDirectTemplateFormSchema.superRefine((items, ctx) => {
-        if (template.recipients.map((recipient) => recipient.email).includes(items.email)) {
+        if (template.Recipient.map((recipient) => recipient.email).includes(items.email)) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
             message: _(msg`Email cannot already exist in the template`),
@@ -97,7 +96,7 @@ export const ConfigureDirectTemplateFormPartial = ({
 
       <DocumentFlowFormContainerContent>
         {isDocumentPdfLoaded &&
-          directTemplateRecipient.fields.map((field, index) => (
+          directTemplateRecipient.Field.map((field, index) => (
             <ShowFieldItem
               key={index}
               field={field}

apps/web/src/app/(recipient)/d/[token]/direct-template.tsx

@@ -8,9 +8,9 @@ import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import type { TTemplate } from '@documenso/lib/types/template';
 import type { Field } from '@documenso/prisma/client';
 import { type Recipient } from '@documenso/prisma/client';
+import type { TemplateWithDetails } from '@documenso/prisma/types/template';
 import { trpc } from '@documenso/trpc/react';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { DocumentFlowFormContainer } from '@documenso/ui/primitives/document-flow/document-flow-root';
@@ -28,9 +28,9 @@ import type { DirectTemplateLocalField } from './sign-direct-template';
 import { SignDirectTemplateForm } from './sign-direct-template';
 
 export type TemplatesDirectPageViewProps = {
-  template: Omit<TTemplate, 'user'>;
+  template: Omit<TemplateWithDetails, 'User'>;
   directTemplateToken: string;
-  directTemplateRecipient: Recipient & { fields: Field[] };
+  directTemplateRecipient: Recipient & { Field: Field[] };
 };
 
 type DirectTemplateStep = 'configure' | 'sign';
@@ -164,7 +164,7 @@ export const DirectTemplatePageView = ({
             <SignDirectTemplateForm
               flowStep={directTemplateFlow.sign}
               directRecipient={recipient}
-              directRecipientFields={directTemplateRecipient.fields}
+              directRecipientFields={directTemplateRecipient.Field}
               template={template}
               onSubmit={onSignDirectTemplateSubmit}
             />

apps/web/src/app/(recipient)/d/[token]/page.tsx

@@ -41,7 +41,7 @@ export default async function TemplatesDirectPage({ params }: TemplatesDirectPag
     notFound();
   }
 
-  const directTemplateRecipient = template.recipients.find(
+  const directTemplateRecipient = template.Recipient.find(
     (recipient) => recipient.id === template.directLink?.directTemplateRecipientId,
   );
 
@@ -81,7 +81,7 @@ export default async function TemplatesDirectPage({ params }: TemplatesDirectPag
           <div className="text-muted-foreground mb-8 mt-2.5 flex items-center gap-x-2">
             <UsersIcon className="h-4 w-4" />
             <p className="text-muted-foreground/80">
-              <Plural value={template.recipients.length} one="# recipient" other="# recipients" />
+              <Plural value={template.Recipient.length} one="# recipient" other="# recipients" />
             </p>
           </div>
 

apps/web/src/app/(recipient)/d/[token]/sign-direct-template.tsx

@@ -14,10 +14,10 @@ import {
   ZRadioFieldMeta,
   ZTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
-import type { TTemplate } from '@documenso/lib/types/template';
 import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { Field, Recipient, Signature } from '@documenso/prisma/client';
 import { FieldType } from '@documenso/prisma/client';
+import type { TemplateWithDetails } from '@documenso/prisma/types/template';
 import type {
   TRemovedSignedFieldWithTokenMutationSchema,
   TSignFieldWithTokenMutationSchema,
@@ -55,13 +55,13 @@ export type SignDirectTemplateFormProps = {
   flowStep: DocumentFlowStep;
   directRecipient: Recipient;
   directRecipientFields: Field[];
-  template: Omit<TTemplate, 'user'>;
+  template: Omit<TemplateWithDetails, 'User'>;
   onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
 };
 
 export type DirectTemplateLocalField = Field & {
   signedValue?: TSignFieldWithTokenMutationSchema;
-  signature?: Signature;
+  Signature?: Signature;
 };
 
 export const SignDirectTemplateForm = ({
@@ -95,7 +95,7 @@ export const SignDirectTemplateForm = ({
         };
 
         if (field.type === FieldType.SIGNATURE) {
-          tempField.signature = {
+          tempField.Signature = {
             id: 1,
             created: new Date(),
             recipientId: 1,
@@ -127,7 +127,7 @@ export const SignDirectTemplateForm = ({
           customText: '',
           inserted: false,
           signedValue: undefined,
-          signature: undefined,
+          Signature: undefined,
         };
       }),
     );

apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx

@@ -52,15 +52,15 @@ export async function GET(_request: Request, { params: { slug } }: SharePageOpen
   const isRecipient = 'Signature' in recipientOrSender;
 
   const signatureImage = match(recipientOrSender)
-    .with({ signatures: P.array(P._) }, (recipient) => {
+    .with({ Signature: P.array(P._) }, (recipient) => {
-      return recipient.signatures?.[0]?.signatureImageAsBase64 || null;
+      return recipient.Signature?.[0]?.signatureImageAsBase64 || null;
     })
     .otherwise((sender) => {
       return sender.signature || null;
     });
 
   const signatureName = match(recipientOrSender)
-    .with({ signatures: P.array(P._) }, (recipient) => {
+    .with({ Signature: P.array(P._) }, (recipient) => {
       return recipient.name || recipient.email;
     })
     .otherwise((sender) => {

apps/web/src/app/(signing)/sign/[token]/checkbox-field.tsx

@@ -81,12 +81,12 @@ export const CheckboxField = ({
     );
   }, [checkedValues, validationSign, checkboxValidationLength]);
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;

apps/web/src/app/(signing)/sign/[token]/date-field.tsx

@@ -16,7 +16,6 @@ import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones'
 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 { 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';
@@ -24,7 +23,6 @@ import type {
   TRemovedSignedFieldWithTokenMutationSchema,
   TSignFieldWithTokenMutationSchema,
 } from '@documenso/trpc/server/field-router/schema';
-import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { SigningFieldContainer } from './signing-field-container';
@@ -53,17 +51,14 @@ export const DateField = ({
 
   const [isPending, startTransition] = useTransition();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const safeFieldMeta = ZDateFieldMeta.safeParse(field.fieldMeta);
-  const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
-
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 
   const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);
@@ -155,21 +150,9 @@ export const DateField = ({
       )}
 
       {field.inserted && (
-        <div className="flex h-full w-full items-center">
+        <p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
-          <p
-            className={cn(
-              'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
-              {
-                'text-left': parsedFieldMeta?.textAlign === 'left',
-                'text-center':
-                  !parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
-                'text-right': parsedFieldMeta?.textAlign === 'right',
-              },
-            )}
-          >
           {localDateString}
         </p>
-        </div>
       )}
     </SigningFieldContainer>
   );

apps/web/src/app/(signing)/sign/[token]/document-auth-provider.tsx

@@ -106,7 +106,7 @@ export const DocumentAuthProvider = ({
       perPage: MAXIMUM_PASSKEYS,
     },
     {
-      placeholderData: (previousData) => previousData,
+      keepPreviousData: true,
       enabled: derivedRecipientActionAuth === DocumentAuth.PASSKEY,
     },
   );

apps/web/src/app/(signing)/sign/[token]/dropdown-field.tsx

@@ -58,12 +58,12 @@ export const DropdownField = ({
   const defaultValue = parsedFieldMeta?.defaultValue;
   const [localChoice, setLocalChoice] = useState(parsedFieldMeta.defaultValue ?? '');
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;

apps/web/src/app/(signing)/sign/[token]/email-field.tsx

@@ -11,7 +11,6 @@ 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 { 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';
@@ -19,7 +18,6 @@ import type {
   TRemovedSignedFieldWithTokenMutationSchema,
   TSignFieldWithTokenMutationSchema,
 } from '@documenso/trpc/server/field-router/schema';
-import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useRequiredSigningContext } from './provider';
@@ -42,17 +40,14 @@ export const EmailField = ({ field, recipient, onSignField, onUnsignField }: Ema
 
   const [isPending, startTransition] = useTransition();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const safeFieldMeta = ZEmailFieldMeta.safeParse(field.fieldMeta);
-  const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
-
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 
   const onSign = async (authOptions?: TRecipientActionAuth) => {
@@ -133,21 +128,9 @@ export const EmailField = ({ field, recipient, onSignField, onUnsignField }: Ema
       )}
 
       {field.inserted && (
-        <div className="flex h-full w-full items-center">
+        <p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
-          <p
-            className={cn(
-              'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
-              {
-                'text-left': parsedFieldMeta?.textAlign === 'left',
-                'text-center':
-                  !parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
-                'text-right': parsedFieldMeta?.textAlign === 'right',
-              },
-            )}
-          >
           {field.customText}
         </p>
-        </div>
       )}
     </SigningFieldContainer>
   );

apps/web/src/app/(signing)/sign/[token]/initials-field.tsx

@@ -46,12 +46,12 @@ export const InitialsField = ({
 
   const [isPending, startTransition] = useTransition();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;

apps/web/src/app/(signing)/sign/[token]/name-field.tsx

@@ -11,7 +11,6 @@ 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 { 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';
@@ -19,7 +18,6 @@ import type {
   TRemovedSignedFieldWithTokenMutationSchema,
   TSignFieldWithTokenMutationSchema,
 } from '@documenso/trpc/server/field-router/schema';
-import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
 import { Input } from '@documenso/ui/primitives/input';
@@ -50,17 +48,14 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
 
   const [isPending, startTransition] = useTransition();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const safeFieldMeta = ZNameFieldMeta.safeParse(field.fieldMeta);
-  const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
-
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 
   const [showFullNameModal, setShowFullNameModal] = useState(false);
@@ -177,21 +172,9 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
       )}
 
       {field.inserted && (
-        <div className="flex h-full w-full items-center">
+        <p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
-          <p
-            className={cn(
-              'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
-              {
-                'text-left': parsedFieldMeta?.textAlign === 'left',
-                'text-center':
-                  !parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
-                'text-right': parsedFieldMeta?.textAlign === 'right',
-              },
-            )}
-          >
           {field.customText}
         </p>
-        </div>
       )}
 
       <Dialog open={showFullNameModal} onOpenChange={setShowFullNameModal}>

apps/web/src/app/(signing)/sign/[token]/number-field.tsx

@@ -52,19 +52,8 @@ export const NumberField = ({ field, recipient, onSignField, onUnsignField }: Nu
   const [isPending, startTransition] = useTransition();
   const [showRadioModal, setShowRadioModal] = useState(false);
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const parsedFieldMeta = field.fieldMeta ? ZNumberFieldMeta.parse(field.fieldMeta) : null;
-    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  const isReadOnly = parsedFieldMeta?.readOnly;
-
-  const {
-    mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
-  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
-
-  const safeFieldMeta = ZNumberFieldMeta.safeParse(field.fieldMeta);
-  const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
-
-  const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
-
   const defaultValue = parsedFieldMeta?.value;
   const [localNumber, setLocalNumber] = useState(
     parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '0',
@@ -82,6 +71,16 @@ export const NumberField = ({ field, recipient, onSignField, onUnsignField }: Nu
 
   const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
+    trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+
+  const {
+    mutateAsync: removeSignedFieldWithToken,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
+  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+
+  const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
+
   const handleNumberChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const text = e.target.value;
     setLocalNumber(text);
@@ -209,7 +208,7 @@ export const NumberField = ({ field, recipient, onSignField, onUnsignField }: Nu
   useEffect(() => {
     if (
       (!field.inserted && defaultValue && localNumber) ||
-      (!field.inserted && parsedFieldMeta?.readOnly && defaultValue)
+      (!field.inserted && isReadOnly && defaultValue)
     ) {
       void executeActionAuthProcedure({
         onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
@@ -261,21 +260,9 @@ export const NumberField = ({ field, recipient, onSignField, onUnsignField }: Nu
       )}
 
       {field.inserted && (
-        <div className="flex h-full w-full items-center">
+        <p className="text-muted-foreground dark:text-background/80 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
-          <p
-            className={cn(
-              'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
-              {
-                'text-left': parsedFieldMeta?.textAlign === 'left',
-                'text-center':
-                  !parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
-                'text-right': parsedFieldMeta?.textAlign === 'right',
-              },
-            )}
-          >
           {field.customText}
         </p>
-        </div>
       )}
 
       <Dialog open={showRadioModal} onOpenChange={setShowRadioModal}>

apps/web/src/app/(signing)/sign/[token]/radio-field.tsx

@@ -52,12 +52,12 @@ export const RadioField = ({ field, recipient, onSignField, onUnsignField }: Rad
 
   const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;

apps/web/src/app/(signing)/sign/[token]/signature-field.tsx

@@ -66,15 +66,15 @@ export const SignatureField = ({
 
   const [isPending, startTransition] = useTransition();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const { signature } = field;
+  const { Signature: signature } = field;
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 

apps/web/src/app/(signing)/sign/[token]/signing-page-view.tsx

@@ -56,8 +56,8 @@ export const SigningPageView = ({
   const shouldUseTeamDetails =
     document.teamId && document.team?.teamGlobalSettings?.includeSenderDetails === false;
 
-  let senderName = document.user.name ?? '';
+  let senderName = document.User.name ?? '';
-  let senderEmail = `(${document.user.email})`;
+  let senderEmail = `(${document.User.email})`;
 
   if (shouldUseTeamDetails) {
     senderName = document.team?.name ?? '';

apps/web/src/app/(signing)/sign/[token]/text-field.tsx

@@ -54,16 +54,15 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
 
   const [isPending, startTransition] = useTransition();
 
-  const { mutateAsync: signFieldWithToken, isPending: isSignFieldWithTokenLoading } =
+  const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const {
     mutateAsync: removeSignedFieldWithToken,
-    isPending: isRemoveSignedFieldWithTokenLoading,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
   } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const safeFieldMeta = ZTextFieldMeta.safeParse(field.fieldMeta);
+  const parsedFieldMeta = field.fieldMeta ? ZTextFieldMeta.parse(field.fieldMeta) : null;
-  const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
   const shouldAutoSignField =
@@ -262,23 +261,11 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
       )}
 
       {field.inserted && (
-        <div className="flex h-full w-full items-center">
+        <p className="text-muted-foreground dark:text-background/80 flex items-center justify-center gap-x-1 text-[clamp(0.425rem,25cqw,0.825rem)] duration-200">
-          <p
-            className={cn(
-              'text-muted-foreground dark:text-background/80 w-full text-[clamp(0.425rem,25cqw,0.825rem)] duration-200',
-              {
-                'text-left': parsedFieldMeta?.textAlign === 'left',
-                'text-center':
-                  !parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
-                'text-right': parsedFieldMeta?.textAlign === 'right',
-              },
-            )}
-          >
           {field.customText.length < 20
             ? field.customText
             : field.customText.substring(0, 15) + '...'}
         </p>
-        </div>
       )}
 
       <Dialog open={showCustomTextModal} onOpenChange={setShowCustomTextModal}>
@@ -294,10 +281,6 @@ export const TextField = ({ field, recipient, onSignField, onUnsignField }: Text
               className={cn('mt-2 w-full rounded-md', {
                 'border-2 border-red-300 ring-2 ring-red-200 ring-offset-2 ring-offset-red-200 focus-visible:border-red-400 focus-visible:ring-4 focus-visible:ring-red-200 focus-visible:ring-offset-2 focus-visible:ring-offset-red-200':
                   userInputHasErrors,
-                'text-left': parsedFieldMeta?.textAlign === 'left',
-                'text-center':
-                  !parsedFieldMeta?.textAlign || parsedFieldMeta?.textAlign === 'center',
-                'text-right': parsedFieldMeta?.textAlign === 'right',
               })}
               value={localText}
               onChange={handleTextChange}

apps/web/src/app/(teams)/t/[teamUrl]/layout-billing-banner.tsx

@@ -38,7 +38,7 @@ export const LayoutBillingBanner = ({
 
   const [isOpen, setIsOpen] = useState(false);
 
-  const { mutateAsync: createBillingPortal, isPending } =
+  const { mutateAsync: createBillingPortal, isLoading } =
     trpc.team.createBillingPortal.useMutation();
 
   const handleCreatePortal = async () => {
@@ -92,7 +92,7 @@ export const LayoutBillingBanner = ({
               'text-destructive-foreground hover:bg-destructive-foreground hover:text-white':
                 subscription.status === SubscriptionStatus.INACTIVE,
             })}
-            disabled={isPending}
+            disabled={isLoading}
             onClick={() => setIsOpen(true)}
             size="sm"
           >
@@ -101,7 +101,7 @@ export const LayoutBillingBanner = ({
         </div>
       </div>
 
-      <Dialog open={isOpen} onOpenChange={(value) => !isPending && setIsOpen(value)}>
+      <Dialog open={isOpen} onOpenChange={(value) => !isLoading && setIsOpen(value)}>
         <DialogContent>
           <DialogTitle>
             <Trans>Payment overdue</Trans>
@@ -128,7 +128,7 @@ export const LayoutBillingBanner = ({
 
           {canExecuteTeamAction('MANAGE_BILLING', userRole) && (
             <DialogFooter>
-              <Button loading={isPending} onClick={handleCreatePortal}>
+              <Button loading={isLoading} onClick={handleCreatePortal}>
                 <Trans>Resolve payment</Trans>
               </Button>
             </DialogFooter>

apps/web/src/app/(teams)/t/[teamUrl]/settings/team-email-dropdown.tsx

@@ -25,7 +25,7 @@ export const TeamEmailDropdown = ({ team }: TeamsSettingsPageProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: resendEmailVerification, isPending: isResendingEmailVerification } =
+  const { mutateAsync: resendEmailVerification, isLoading: isResendingEmailVerification } =
     trpc.team.resendTeamEmailVerification.useMutation({
       onSuccess: () => {
         toast({

apps/web/src/app/(teams)/t/[teamUrl]/settings/team-transfer-status.tsx

@@ -36,7 +36,7 @@ export const TeamTransferStatus = ({
 
   const isExpired = transferVerification && isTokenExpired(transferVerification.expiresAt);
 
-  const { mutateAsync: deleteTeamTransferRequest, isPending } =
+  const { mutateAsync: deleteTeamTransferRequest, isLoading } =
     trpc.team.deleteTeamTransferRequest.useMutation({
       onSuccess: () => {
         if (!isExpired) {
@@ -112,7 +112,7 @@ export const TeamTransferStatus = ({
             {canExecuteTeamAction('DELETE_TEAM_TRANSFER_REQUEST', currentUserTeamRole) && (
               <Button
                 onClick={async () => deleteTeamTransferRequest({ teamId })}
-                loading={isPending}
+                loading={isLoading}
                 variant={isExpired ? 'destructive' : 'ghost'}
                 className={cn('ml-auto', {
                   'hover:bg-transparent hover:text-blue-800': !isExpired,

apps/web/src/app/embed/direct/[[...url]]/client.tsx

@@ -100,7 +100,7 @@ export const EmbedDirectTemplateClientPage = ({
 
   const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
 
-  const { mutateAsync: createDocumentFromDirectTemplate, isPending: isSubmitting } =
+  const { mutateAsync: createDocumentFromDirectTemplate, isLoading: isSubmitting } =
     trpc.template.createDocumentFromDirectTemplate.useMutation();
 
   const onSignField = (payload: TSignFieldWithTokenMutationSchema) => {
@@ -118,7 +118,7 @@ export const EmbedDirectTemplateClientPage = ({
         });
 
         if (field.type === FieldType.SIGNATURE) {
-          newField.signature = {
+          newField.Signature = {
             id: 1,
             created: new Date(),
             recipientId: 1,
@@ -163,7 +163,7 @@ export const EmbedDirectTemplateClientPage = ({
           customText: '',
           inserted: false,
           signedValue: undefined,
-          signature: undefined,
+          Signature: undefined,
         });
       }),
     );

apps/web/src/app/embed/direct/[[...url]]/page.tsx

@@ -73,7 +73,7 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
 
   const { directTemplateRecipientId } = template.directLink;
 
-  const recipient = template.recipients.find(
+  const recipient = template.Recipient.find(
     (recipient) => recipient.id === directTemplateRecipientId,
   );
 
@@ -81,7 +81,7 @@ export default async function EmbedDirectTemplatePage({ params }: EmbedDirectTem
     return notFound();
   }
 
-  const fields = template.fields.filter((field) => field.recipientId === directTemplateRecipientId);
+  const fields = template.Field.filter((field) => field.recipientId === directTemplateRecipientId);
 
   const team = template.teamId
     ? await getTeamById({ teamId: template.teamId, userId: template.userId }).catch(() => null)

apps/web/src/app/embed/sign/[[...url]]/client.tsx

@@ -84,7 +84,7 @@ export const EmbedSignDocumentClientPage = ({
     fields.filter((field) => field.inserted),
   ];
 
-  const { mutateAsync: completeDocumentWithToken, isPending: isSubmitting } =
+  const { mutateAsync: completeDocumentWithToken, isLoading: isSubmitting } =
     trpc.recipient.completeDocumentWithToken.useMutation();
 
   const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);

apps/web/src/components/(dashboard)/common/command-menu.tsx

@@ -91,7 +91,7 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
         query: search,
       },
       {
-        placeholderData: (previousData) => previousData,
+        keepPreviousData: true,
         // Do not batch this due to relatively long request time compared to
         // other queries which are generally batched with this.
         ...SKIP_QUERY_BATCH_META,

apps/web/src/components/(dashboard)/layout/verify-email-banner.tsx

@@ -31,7 +31,7 @@ export const VerifyEmailBanner = ({ email }: VerifyEmailBannerProps) => {
 
   const [isButtonDisabled, setIsButtonDisabled] = useState(false);
 
-  const { mutateAsync: sendConfirmationEmail, isPending } =
+  const { mutateAsync: sendConfirmationEmail, isLoading } =
     trpc.profile.sendConfirmationEmail.useMutation();
 
   const onResendConfirmationEmail = async () => {
@@ -122,10 +122,10 @@ export const VerifyEmailBanner = ({ email }: VerifyEmailBannerProps) => {
           <div>
             <Button
               disabled={isButtonDisabled}
-              loading={isPending}
+              loading={isLoading}
               onClick={onResendConfirmationEmail}
             >
-              {isPending ? <Trans>Sending...</Trans> : <Trans>Resend Confirmation Email</Trans>}
+              {isLoading ? <Trans>Sending...</Trans> : <Trans>Resend Confirmation Email</Trans>}
             </Button>
           </div>
         </DialogContent>

apps/web/src/components/(teams)/dialogs/add-team-email-dialog.tsx

@@ -64,7 +64,7 @@ export const AddTeamEmailDialog = ({ teamId, trigger, ...props }: AddTeamEmailDi
     },
   });
 
-  const { mutateAsync: createTeamEmailVerification, isPending } =
+  const { mutateAsync: createTeamEmailVerification, isLoading } =
     trpc.team.createTeamEmailVerification.useMutation();
 
   const onFormSubmit = async ({ name, email }: TCreateTeamEmailFormSchema) => {
@@ -120,7 +120,7 @@ export const AddTeamEmailDialog = ({ teamId, trigger, ...props }: AddTeamEmailDi
     >
       <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
         {trigger ?? (
-          <Button variant="outline" loading={isPending} className="bg-background">
+          <Button variant="outline" loading={isLoading} className="bg-background">
             <Plus className="-ml-1 mr-1 h-5 w-5" />
             <Trans>Add email</Trans>
           </Button>

apps/web/src/components/(teams)/dialogs/create-team-checkout-dialog.tsx

@@ -39,7 +39,7 @@ export const CreateTeamCheckoutDialog = ({
 
   const { data, isLoading } = trpc.team.getTeamPrices.useQuery();
 
-  const { mutateAsync: createCheckout, isPending: isCreatingCheckout } =
+  const { mutateAsync: createCheckout, isLoading: isCreatingCheckout } =
     trpc.team.createTeamPendingCheckout.useMutation({
       onSuccess: (checkoutUrl) => {
         window.open(checkoutUrl, '_blank');

apps/web/src/components/(teams)/dialogs/delete-team-member-dialog.tsx

@@ -42,7 +42,7 @@ export const DeleteTeamMemberDialog = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: deleteTeamMembers, isPending: isDeletingTeamMember } =
+  const { mutateAsync: deleteTeamMembers, isLoading: isDeletingTeamMember } =
     trpc.team.deleteTeamMembers.useMutation({
       onSuccess: () => {
         toast({

apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx

@@ -43,7 +43,7 @@ export const LeaveTeamDialog = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: leaveTeam, isPending: isLeavingTeam } = trpc.team.leaveTeam.useMutation({
+  const { mutateAsync: leaveTeam, isLoading: isLeavingTeam } = trpc.team.leaveTeam.useMutation({
     onSuccess: () => {
       toast({
         title: _(msg`Success`),

apps/web/src/components/(teams)/dialogs/remove-team-email-dialog.tsx

@@ -50,7 +50,7 @@ export const RemoveTeamEmailDialog = ({ trigger, teamName, team }: RemoveTeamEma
 
   const router = useRouter();
 
-  const { mutateAsync: deleteTeamEmail, isPending: isDeletingTeamEmail } =
+  const { mutateAsync: deleteTeamEmail, isLoading: isDeletingTeamEmail } =
     trpc.team.deleteTeamEmail.useMutation({
       onSuccess: () => {
         toast({
@@ -69,7 +69,7 @@ export const RemoveTeamEmailDialog = ({ trigger, teamName, team }: RemoveTeamEma
       },
     });
 
-  const { mutateAsync: deleteTeamEmailVerification, isPending: isDeletingTeamEmailVerification } =
+  const { mutateAsync: deleteTeamEmailVerification, isLoading: isDeletingTeamEmailVerification } =
     trpc.team.deleteTeamEmailVerification.useMutation({
       onSuccess: () => {
         toast({