chore: text fix

.env.example

@@ -13,10 +13,6 @@ NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY="DEADBEEF"
 NEXT_PRIVATE_GOOGLE_CLIENT_ID=""
 NEXT_PRIVATE_GOOGLE_CLIENT_SECRET=""
 
-NEXT_PRIVATE_OIDC_WELL_KNOWN=""
-NEXT_PRIVATE_OIDC_CLIENT_ID=""
-NEXT_PRIVATE_OIDC_CLIENT_SECRET=""
-
 # [[URLS]]
 NEXT_PUBLIC_WEBAPP_URL="http://localhost:3000"
 NEXT_PUBLIC_MARKETING_URL="http://localhost:3001"
@@ -44,14 +40,21 @@ NEXT_PRIVATE_SIGNING_GCLOUD_HSM_PUBLIC_CRT_FILE_CONTENTS=
 # OPTIONAL: The path to the Google Cloud Credentials file to use for the gcloud-hsm signing transport.
 NEXT_PRIVATE_SIGNING_GCLOUD_APPLICATION_CREDENTIALS_CONTENTS=
 
+# [[SIGNING]]
+# OPTIONAL: Defines the signing transport to use. Available options: local (default)
+NEXT_PRIVATE_SIGNING_TRANSPORT="local"
+# OPTIONAL: Defines the passphrase for the signing certificate.
+NEXT_PRIVATE_SIGNING_PASSPHRASE=
+# OPTIONAL: Defines the file contents for the signing certificate as a base64 encoded string.
+NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS=
+# OPTIONAL: Defines the file path for the signing certificate. defaults to ./example/cert.p12
+NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=
+
 # [[STORAGE]]
 # OPTIONAL: Defines the storage transport to use. Available options: database (default) | s3
 NEXT_PUBLIC_UPLOAD_TRANSPORT="database"
 # OPTIONAL: Defines the endpoint to use for the S3 storage transport. Relevant when using third-party S3-compatible providers.
 NEXT_PRIVATE_UPLOAD_ENDPOINT="http://127.0.0.1:9002"
-# OPTIONAL: Defines the force path style to use for the S3 storage transport. Relevant when using third-party S3-compatible providers.
-# This will change it from using virtual hosts <bucket>.domain.com/<path> to fully qualified paths domain.com/<bucket>/<path>
-NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE="false"
 # OPTIONAL: Defines the region to use for the S3 storage transport. Defaults to us-east-1.
 NEXT_PRIVATE_UPLOAD_REGION="unknown"
 # REQUIRED: Defines the bucket to use for the S3 storage transport.
@@ -79,7 +82,7 @@ NEXT_PRIVATE_SMTP_APIKEY=
 # OPTIONAL: Defines whether to force the use of TLS.
 NEXT_PRIVATE_SMTP_SECURE=
 # REQUIRED: Defines the sender name to use for the from address.
-NEXT_PRIVATE_SMTP_FROM_NAME="Documenso"
+NEXT_PRIVATE_SMTP_FROM_NAME="No Reply @ Documenso"
 # REQUIRED: Defines the email address to use as the from address.
 NEXT_PRIVATE_SMTP_FROM_ADDRESS="noreply@documenso.com"
 # OPTIONAL: The API key to use for Resend.com
@@ -101,7 +104,6 @@ NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT=5
 NEXT_PRIVATE_STRIPE_API_KEY=
 NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET=
 NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID=
-NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID=
 
 # [[FEATURES]]
 # OPTIONAL: Leave blank to disable PostHog and feature flags.

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/codeql-analysis.yml

@@ -33,9 +33,9 @@ jobs:
       - uses: ./.github/actions/cache-build
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2

.github/workflows/e2e-tests.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Run Playwright tests
         run: npm run ci
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: test-results

.github/workflows/issue-assignee-check.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Check Assigned User's Issue Count
         id: parse-comment
-        uses: actions/github-script@v6
+        uses: actions/github-script@v5
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/issue-labeler.yml

@@ -1,25 +0,0 @@
-name: Auto Label Assigned Issues
-
-on:
-  issues:
-    types: [assigned]
-
-jobs:
-  label-when-assigned:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label issue
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const issue = context.issue;
-            // To run only on issues and not on PR
-            if (github.context.payload.issue.pull_request === undefined) {
-              const labelResponse = await github.rest.issues.addLabels({
-                owner: issue.owner,
-                repo: issue.repo,
-                issue_number: issue.number,
-                labels: ['status: assigned']
-              });
-            }

.github/workflows/issue-opened.yml

@@ -17,5 +17,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ["status: triage"]
+              labels: ["needs triage"]
             })

.github/workflows/pr-review-reminder.yml

@@ -2,14 +2,14 @@ name: 'PR Review Reminder'
 
 on:
   pull_request:
-    types: ['opened', 'ready_for_review']
+    types: ['opened', 'reopened', 'ready_for_review', 'review_requested']
 
 permissions:
   pull-requests: write
 
 jobs:
   checkPRs:
-    if: ${{ github.event.pull_request.user.login }} && github.event.action == ('opened' || 'ready_for_review')
+    if: ${{ github.event.pull_request.user.login }} && github.event.action == ('opened' || 'reopened' || 'ready_for_review' || 'review_requested')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-pr-stale: 90

.gitpod.yml

@@ -6,7 +6,7 @@ tasks:
       set -a; source .env &&
       export NEXTAUTH_URL="$(gp url 3000)" &&
       export NEXT_PUBLIC_WEBAPP_URL="$(gp url 3000)" &&
-      export NEXT_PUBLIC_MARKETING_URL="$(gp url 3001)"
+      export NEXT_PUBLIC_MARKETING_URL="$(gp url 3001)" 
     command: npm run d
 
 ports:
@@ -25,10 +25,20 @@ ports:
   - port: 2500
     visibility: private
     onOpen: ignore
-  - port: 54320
+  - port: 54320 
-    visibility: private
+    visibility: private 
     onOpen: ignore
 
+
+github:
+  prebuilds:
+    master: true
+    pullRequests: true
+    pullRequestsFromForks: true
+    addCheck: true
+    addComment: true
+    addBadge: true
+
 vscode:
   extensions:
     - aaron-bond.better-comments
@@ -37,5 +47,9 @@ vscode:
     - esbenp.prettier-vscode
     - mikestead.dotenv
     - unifiedjs.vscode-mdx
+    - GitHub.copilot-chat
+    - GitHub.copilot-labs
+    - GitHub.copilot
     - GitHub.vscode-pull-request-github
     - Prisma.prisma
+    - VisualStudioExptTeam.vscodeintellicode

README.md

@@ -82,7 +82,7 @@ Contact us if you are interested in our Enterprise plan for large organizations
 - [NextAuth.js](https://next-auth.js.org/) - Authentication
 - [react-email](https://react.email/) - Email Templates
 - [tRPC](https://trpc.io/) - API
-- [@documenso/pdf-sign](https://www.npmjs.com/package/@documenso/pdf-sign) - PDF Signatures
+- [Node SignPDF](https://github.com/vbuch/node-signpdf) - Digital Signature
 - [React-PDF](https://github.com/wojtekmaj/react-pdf) - Viewing PDFs
 - [PDF-Lib](https://github.com/Hopding/pdf-lib) - PDF manipulation
 - [Stripe](https://stripe.com/) - Payments

SIGNING.md

@@ -17,8 +17,7 @@ For the digital signature of your documents you need a signing certificate in .p
    `openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt`
 
 4. You will be prompted to enter a password for the p12 file. Choose a strong password and remember it, as you will need it to use the certificate (**can be empty for dev certificates**)
-
+5. Place the certificate `/apps/web/resources/certificate.p12`
-5. Place the certificate `/apps/web/resources/certificate.p12` (If the path does not exist, it needs to be created)
 
 ## Docker
 

apps/marketing/content/blog/building-documenso-pt1.mdx

@@ -1,6 +1,6 @@
 ---
 title: 'Building Documenso — Part 1: Certificates'
-description: Let's take a look why you need a signing certificate and how Documenso does it.
+description: In today's fast-paced world, productivity and efficiency are crucial for success, both in personal and professional endeavors. We all strive to make the most of our time and energy to achieve our goals effectively. However, it's not always easy to stay on track and maintain peak performance. In this blog post, we'll explore 10 valuable tips to help you boost productivity and efficiency in your daily life.
 authorName: 'Timur Ercan'
 authorImage: '/blog/blog-author-timur.jpeg'
 authorRole: 'Co-Founder'

apps/marketing/content/blog/building-documenso-pt2.mdx

@@ -1,117 +0,0 @@
----
-title: 'Building Documenso — Part 2: Signature Validity'
-description: Is a signature valid? And what does that mean? It's a surprisingly complex question; let's take a look.
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2024-04-05
-tags:
-  - Document Signature
-  - Certificates
-  - Signing
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/eu-validate-1.png"
-    width= "650"
-    height= "650"
-    alt= "A report card for signature validity."
-  />
-
-  <figcaption className="text-center">
-    If a tree does not comply with the EU trust list, does it make a sound when validating?r
-  </figcaption>
-</figure>
-
-> TLDR; Signatures can be valid and compliant for different signature levels, even if some validators show higher-level errors. Not all helpful security measures are mandated by law.
-
-# A valid question
-
-A few days ago, an early adopter brought up this question in our [Discord](https://documen.so/discord):
-
-<figure>
-  <MdxNextImage
-    src="/blog/eu-validate-2.png"
-    width= "650"
-    height= "650"
-    alt= "A report card for signature validity."
-  />
-
-  <figcaption className="text-center">
-    You can check out the validator here: [https://documen.so/eu-validator](https://documen.so/eu-validator)
-  </figcaption>
-</figure>
-
-For those unfamiliar with the tool, he used the validator tool of the EU's Digital Signature Service (DSS) Framework to check the signature of a document signed with Documenso. The EU provides this tool to help users and providers check the validity level of their signatures.
-
-A short refresher from [Building Documenso — Part 1: Certificates](https://documen.so/certs):
-
-> Documenso inserts all visual signatures into the document and then seals it using the "Documenso Inc." corporate certificate. This makes the resulting PDF document tamper-proof and guarantees it hasn't changed since signing.
-
-Before we answer if the document was signed correctly, we need to understand what the goal was.
-
-There are three signature levels in the European eIDAS regulation:
-
-1. **Simple Electronic Signatures (Level 1/ SES):** This is just a visual signature or even a checkbox on a document.
-
-2. **Advanded Electronic Signatures (Level 2/ AES)**: An actual crypographic signature (not just a seal on the whole document, but a specific signature), using a certificate linked to the identification data of the signer.
-
-3. **Qualified Electronic Signatures (Level 3/ QES):** Same as 2. but done by a government-certified entity on certified hardware and after identifying the signer with an official ID document (e.g., passport)
-
-> 💡 Side Note: Number 2 (AES) is how most people imagine digital signatures. But most of the market uses 1. plus a seal on the whole document under the name of the signing provider (e.g., Documenso). The signer's data is only inserted visually, not in the actual signature. Why? One of the reasons is that it's much easier, and without a readily available open source framework to draw from, it is quite tricky to build. This is something we aim to build (which many have done) and open source (which no one has done).
-
-From the perspective of eIDAS, Documenso offers Level 1/ SES signatures since it does not adhere to all of the requirements of Level 2/ AES. This means that, technically, there is no legal need to seal the document to achieve this level of validity (at least within eIDAS). We do it anyway since it improves the level of confidence users can have in the signed document. Sealing the document, even though not legally required, is a great example of Documenso's approach to signatures. First, we aim to provide all legal requirements for a given use case. Then, we add any protection that can be added without unwarranted friction to the creation of the signature.
-
-## Not if valid, but how valid
-
-**Q: So, is the signature in the image valid?**
-
-A: Yes, as an eidas Level 1 SES.
-
-**Q: Then why does it say "Unable to build a certificate chain up to a trusted list"**
-
-A: The certificate we use to seal the document after inserting the signatures is not on the EU Trust list.
-
-**Q: Does that mean it is less secure?**
-
-A: No, it means the provider (Wisekey) is not on a list maintained by the EU. The cryptographic signature is just as strong as any other
-
-For someone who does not deal with this stuff daily, this can be hard to comprehend. Whether you use a certificate you generated yourself, one generated by a certificate authority (CA) like Wisekey, or one by another on the EU trust list (e.g., Bundesdruckerei), the cryptographic security guaranteeing that the document has not been tampered with is always the same. Many providers like Documenso, DocuSign, PandaDoc, and Digisigner all use this method for their regular plans. That means if you were to run a document signed by them through the validator above, the result would be the same[1]. The interesting question is why? Why do it like this?
-
-## Certificate Infrastructure is broken
-
-While there are some actual expenses involved in providing AES and QES, the blunt reality is that it's just good business to charge for them per signature, making it unsuitable for the "standard offerings"; almost no one has the resources to set this up themselves. While this initial process of becoming a QES-certified entity is really expensive, selling the certificates afterward is very lucrative. This leads to less innovation in the space and only big players providing these high-compliance services. Even certificates only used to seal documents without being QES certified are sold for a large range of prices, and they cost almost nothing to produce.
-
-## Why Though?
-
-**Q: Why do people buy a certificate for money and not just generate one themselves? Isn't the cryptographic security the same?**
-
-A: Self-generated certificates are not recognized for higher-level compliance signatures like QES
-
-**Q: So if you don't need higher-level signatures, you could just generate one yourself?**
-
-A: Yes, you could. Since eIDAS Level 1 does not require a cert, you could use your own.
-
-**Q: Why don't more people?**
-
-A: One reason is that apart from the EU trust list, there are others, like the Adobe trust list. While not legally required, being on that one (like Wisekey) gives you a green checkmark in Adobe PDF, which is how most people check signature validity.
-
-**Q: Not a question, but all of this sounds weird**
-
-A: It is. This is one of the reasons why Documenso exists. We plan to make this easier.
-
-**Q: How?**
-
-A: By explaining and providing easy-to-use tools and eventually free, highly compliant signature certificates for everyone.
-
-Eventually, we plan to start a free certificate authority called Let's Sign, named after another instituion that broke the paid certificate paradigm to the benefit of the internet: [Let's Encrypt](https://letsencrypt.org/).
-
-As always, feel free to connect on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord) if you have any questions or comments.
-
-Best from Hamburg\
-Timur
-\
-\
-\
-[1] The signature format (e.g. PKCS7-B) will vary. It's the format what the signature inserted into the document looks like. eIDAS itself does not specifically require any given format, but the PAdES defined by the EU is mostly used by european providers.

apps/marketing/next.config.js

@@ -2,7 +2,6 @@
 const fs = require('fs');
 const path = require('path');
 const { withContentlayer } = require('next-contentlayer');
-const { withAxiom } = require('next-axiom');
 
 const ENV_FILES = ['.env', '.env.local', `.env.${process.env.NODE_ENV || 'development'}`];
 
@@ -18,15 +17,11 @@ const FONT_CAVEAT_BYTES = fs.readFileSync(
   path.join(__dirname, '../../packages/assets/fonts/caveat.ttf'),
 );
 
-const FONT_NOTO_SANS_BYTES = fs.readFileSync(
-  path.join(__dirname, '../../packages/assets/fonts/noto-sans.ttf'),
-);
-
 /** @type {import('next').NextConfig} */
 const config = {
   experimental: {
     outputFileTracingRoot: path.join(__dirname, '../../'),
-    serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign', 'playwright'],
+    serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign'],
     serverActions: {
       bodySizeLimit: '50mb',
     },
@@ -42,7 +37,6 @@ const config = {
   env: {
     NEXT_PUBLIC_PROJECT: 'marketing',
     FONT_CAVEAT_URI: `data:font/ttf;base64,${FONT_CAVEAT_BYTES.toString('base64')}`,
-    FONT_NOTO_SANS_URI: `data:font/ttf;base64,${FONT_NOTO_SANS_BYTES.toString('base64')}`,
   },
   modularizeImports: {
     'lucide-react': {
@@ -101,4 +95,4 @@ const config = {
   },
 };
 
-module.exports = withAxiom(withContentlayer(config));
+module.exports = withContentlayer(config);

apps/marketing/package.json

@@ -19,7 +19,6 @@
     "@documenso/trpc": "*",
     "@documenso/ui": "*",
     "@hookform/resolvers": "^3.1.0",
-    "@openstatus/react": "^0.0.3",
     "contentlayer": "^0.3.4",
     "framer-motion": "^10.12.8",
     "lucide-react": "^0.279.0",
@@ -27,7 +26,6 @@
     "micro": "^10.0.1",
     "next": "14.0.3",
     "next-auth": "4.24.5",
-    "next-axiom": "^1.1.1",
     "next-contentlayer": "^0.3.4",
     "next-plausible": "^3.10.1",
     "perfect-freehand": "^1.2.0",

apps/marketing/src/api/claim-plan/fetcher.ts

@@ -1,5 +1,4 @@
-import type { TClaimPlanRequestSchema } from './types';
+import { TClaimPlanRequestSchema, ZClaimPlanResponseSchema } from './types';
-import { ZClaimPlanResponseSchema } from './types';
 
 export const claimPlan = async ({
   name,

apps/marketing/src/app/(marketing)/layout.tsx

@@ -2,8 +2,10 @@
 
 import React, { useEffect, useState } from 'react';
 
+import Image from 'next/image';
 import { usePathname } from 'next/navigation';
 
+import launchWeekTwoImage from '@documenso/assets/images/background-lw-2.png';
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { cn } from '@documenso/ui/lib/utils';
@@ -36,8 +38,7 @@ export default function MarketingLayout({ children }: MarketingLayoutProps) {
   return (
     <div
       className={cn('relative flex min-h-[100vh] max-w-[100vw] flex-col pt-20 md:pt-28', {
-        'overflow-y-auto overflow-x-hidden':
+        'overflow-y-auto overflow-x-hidden': pathname !== '/singleplayer',
-          pathname && !['/singleplayer', '/pricing'].includes(pathname),
       })}
     >
       <div
@@ -46,8 +47,16 @@ export default function MarketingLayout({ children }: MarketingLayoutProps) {
         })}
       >
         {showProfilesAnnouncementBar && (
-          <div className="relative inline-flex w-full items-center justify-center overflow-hidden bg-[#e7f3df] px-4 py-2.5">
+          <div className="relative inline-flex w-full items-center justify-center overflow-hidden px-4 py-2.5">
-            <div className="text-black text-center text-sm font-medium">
+            <div className="absolute inset-0 -z-[1]">
+              <Image
+                src={launchWeekTwoImage}
+                className="h-full w-full object-cover"
+                alt="Launch Week 2"
+              />
+            </div>
+
+            <div className="text-background text-center text-sm text-white">
               Claim your documenso public profile username now!{' '}
               <span className="hidden font-semibold md:inline">documenso.com/u/yourname</span>
               <div className="mt-1.5 block md:ml-4 md:mt-0 md:inline-block">

apps/marketing/src/app/(marketing)/open/bar-metrics.tsx

@@ -1,10 +1,11 @@
 'use client';
 
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import { formatMonth } from '@documenso/lib/client-only/format-month';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type BarMetricProps<T extends Record<string, unknown>> = HTMLAttributes<HTMLDivElement> & {
   data: T;
@@ -33,13 +34,13 @@ export const BarMetric = <T extends Record<string, Record<keyof T[string], unkno
     .reverse();
 
   return (
-    <div className={className} {...props}>
+    <div className={cn('flex flex-col', className)} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <div className="flex items-center px-4">
-        <div className="mb-6 flex px-4">
+        <h3 className="text-lg font-semibold">{title}</h3>
-          <h3 className="text-lg font-semibold">{title}</h3>
+        <span>{extraInfo}</span>
-          <span>{extraInfo}</span>
+      </div>
-        </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={chartHeight}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />
@@ -55,7 +56,6 @@ export const BarMetric = <T extends Record<string, Record<keyof T[string], unkno
               cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
             />
             <Bar
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
               dataKey={metricKey as string}
               maxBarSize={60}
               fill="hsl(var(--primary))"

apps/marketing/src/app/(marketing)/open/cap-table.tsx

@@ -5,6 +5,8 @@ import { useEffect, useState } from 'react';
 
 import { Cell, Legend, Pie, PieChart, Tooltip } from 'recharts';
 
+import { cn } from '@documenso/ui/lib/utils';
+
 import { CAP_TABLE } from './data';
 
 const COLORS = ['#7fd843', '#a2e771', '#c6f2a4'];
@@ -47,12 +49,10 @@ export const CapTable = ({ className, ...props }: CapTableProps) => {
     setIsSSR(false);
   }, []);
   return (
-    <div className={className} {...props}>
+    <div className={cn('flex flex-col', className)} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <h3 className="px-4 text-lg font-semibold">Cap Table</h3>
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Cap Table</h3>
-        </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border shadow-sm hover:shadow">
         {!isSSR && (
           <PieChart width={400} height={400}>
             <Pie

apps/marketing/src/app/(marketing)/open/funding-raised.tsx

@@ -1,10 +1,11 @@
 'use client';
 
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import { formatMonth } from '@documenso/lib/client-only/format-month';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type FundingRaisedProps = HTMLAttributes<HTMLDivElement> & {
   data: Record<string, string | number>[];
@@ -13,17 +14,14 @@ export type FundingRaisedProps = HTMLAttributes<HTMLDivElement> & {
 export const FundingRaised = ({ className, data, ...props }: FundingRaisedProps) => {
   const formattedData = data.map((item) => ({
     amount: Number(item.amount),
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     date: formatMonth(item.date as string),
   }));
 
   return (
-    <div className={className} {...props}>
+    <div className={cn('flex flex-col', className)} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <h3 className="px-4 text-lg font-semibold">Total Funding Raised</h3>
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Total Funding Raised</h3>
-        </div>
 
+      <div className="border-border mt-2.5 flex flex-1 flex-col items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData} margin={{ top: 40, right: 40, bottom: 20, left: 40 }}>
             <XAxis dataKey="date" />

apps/marketing/src/app/(marketing)/open/metric-card.tsx

@@ -1,4 +1,4 @@
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { cn } from '@documenso/ui/lib/utils';
 

apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart copy.tsx

@@ -3,18 +3,19 @@
 import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
-import type { GetCompletedDocumentsMonthlyResult } from '@documenso/lib/server-only/user/get-monthly-completed-document';
+import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type MonthlyCompletedDocumentsChartProps = {
   className?: string;
-  data: GetCompletedDocumentsMonthlyResult;
+  data: GetUserMonthlyGrowthResult;
 };
 
 export const MonthlyCompletedDocumentsChart = ({
   className,
   data,
 }: MonthlyCompletedDocumentsChartProps) => {
-  const formattedData = [...data].reverse().map(({ month, count }) => {
+  const formattedData = [...data].reverse().map(({ month, cume_count: count }) => {
     return {
       month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLLL'),
       count: Number(count),
@@ -22,12 +23,12 @@ export const MonthlyCompletedDocumentsChart = ({
   });
 
   return (
-    <div className={className}>
+    <div className={cn('flex flex-col', className)}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <div className="flex items-center px-4">
-        <div className="mb-6 flex px-4">
+        <h3 className="text-lg font-semibold">Completed Documents per Month</h3>
-          <h3 className="text-lg font-semibold">Completed Documents per Month</h3>
+      </div>
-        </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />
@@ -37,7 +38,7 @@ export const MonthlyCompletedDocumentsChart = ({
               labelStyle={{
                 color: 'hsl(var(--primary-foreground))',
               }}
-              formatter={(value) => [Number(value).toLocaleString('en-US'), 'Completed Documents']}
+              formatter={(value) => [Number(value).toLocaleString('en-US'), 'Total Users']}
               cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
             />
 
@@ -46,7 +47,7 @@ export const MonthlyCompletedDocumentsChart = ({
               fill="hsl(var(--primary))"
               radius={[4, 4, 0, 0]}
               maxBarSize={60}
-              label="Completed Documents"
+              label="Completed Documents per Month"
             />
           </BarChart>
         </ResponsiveContainer>

apps/marketing/src/app/(marketing)/open/monthly-new-users-chart.tsx

@@ -4,6 +4,7 @@ import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type MonthlyNewUsersChartProps = {
   className?: string;
@@ -19,12 +20,12 @@ export const MonthlyNewUsersChart = ({ className, data }: MonthlyNewUsersChartPr
   });
 
   return (
-    <div className={className}>
+    <div className={cn('flex flex-col', className)}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <div className="flex items-center px-4">
-        <div className="mb-6 flex px-4">
+        <h3 className="text-lg font-semibold">New Users</h3>
-          <h3 className="text-lg font-semibold">New Users</h3>
+      </div>
-        </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />

apps/marketing/src/app/(marketing)/open/monthly-total-users-chart.tsx

@@ -4,6 +4,7 @@ import { DateTime } from 'luxon';
 import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
 
 import type { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
+import { cn } from '@documenso/ui/lib/utils';
 
 export type MonthlyTotalUsersChartProps = {
   className?: string;
@@ -19,12 +20,12 @@ export const MonthlyTotalUsersChart = ({ className, data }: MonthlyTotalUsersCha
   });
 
   return (
-    <div className={className}>
+    <div className={cn('flex flex-col', className)}>
-      <div className="border-border flex flex-1 flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <div className="flex items-center px-4">
-        <div className="mb-6 flex px-4">
+        <h3 className="text-lg font-semibold">Total Users</h3>
-          <h3 className="text-lg font-semibold">Total Users</h3>
+      </div>
-        </div>
 
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData}>
             <XAxis dataKey="month" />

apps/marketing/src/app/(marketing)/open/page.tsx

@@ -6,19 +6,18 @@ import { getCompletedDocumentsMonthly } from '@documenso/lib/server-only/user/ge
 import { getUserMonthlyGrowth } from '@documenso/lib/server-only/user/get-user-monthly-growth';
 
 import { FUNDING_RAISED } from '~/app/(marketing)/open/data';
+import { MetricCard } from '~/app/(marketing)/open/metric-card';
+import { SalaryBands } from '~/app/(marketing)/open/salary-bands';
 import { CallToAction } from '~/components/(marketing)/call-to-action';
 
 import { BarMetric } from './bar-metrics';
 import { CapTable } from './cap-table';
 import { FundingRaised } from './funding-raised';
-import { MetricCard } from './metric-card';
+import { MonthlyCompletedDocumentsChart } from './monthly-completed-documents-chart copy';
-import { MonthlyCompletedDocumentsChart } from './monthly-completed-documents-chart';
 import { MonthlyNewUsersChart } from './monthly-new-users-chart';
 import { MonthlyTotalUsersChart } from './monthly-total-users-chart';
-import { SalaryBands } from './salary-bands';
 import { TeamMembers } from './team-members';
 import { OpenPageTooltip } from './tooltip';
-import { TotalSignedDocumentsChart } from './total-signed-documents-chart';
 import { Typefully } from './typefully';
 
 export const metadata: Metadata = {
@@ -134,18 +133,17 @@ export default async function OpenPage() {
     { total_count: mergedPullRequests },
     STARGAZERS_DATA,
     EARLY_ADOPTERS_DATA,
-    MONTHLY_USERS,
-    MONTHLY_COMPLETED_DOCUMENTS,
   ] = await Promise.all([
     fetchGithubStats(),
     fetchOpenIssues(),
     fetchMergedPullRequests(),
     fetchStargazers(),
     fetchEarlyAdopters(),
-    getUserMonthlyGrowth(),
-    getCompletedDocumentsMonthly(),
   ]);
 
+  const MONTHLY_USERS = await getUserMonthlyGrowth();
+  const MONTHLY_COMPLETED_DOCUMENTS = await getCompletedDocumentsMonthly();
+
   return (
     <div>
       <div className="mx-auto mt-6 max-w-screen-lg sm:mt-12">
@@ -207,7 +205,7 @@ export default async function OpenPage() {
           <BarMetric<StargazersType>
             data={STARGAZERS_DATA}
             metricKey="stars"
-            title="GitHub: Total Stars"
+            title="Github: Total Stars"
             label="Stars"
             className="col-span-12 lg:col-span-6"
           />
@@ -215,27 +213,27 @@ export default async function OpenPage() {
           <BarMetric<StargazersType>
             data={STARGAZERS_DATA}
             metricKey="mergedPRs"
-            title="GitHub: Total Merged PRs"
+            title="Github: Total Merged PRs"
             label="Merged PRs"
-            chartHeight={400}
+            chartHeight={300}
             className="col-span-12 lg:col-span-6"
           />
 
           <BarMetric<StargazersType>
             data={STARGAZERS_DATA}
             metricKey="forks"
-            title="GitHub: Total Forks"
+            title="Github: Total Forks"
             label="Forks"
-            chartHeight={400}
+            chartHeight={300}
             className="col-span-12 lg:col-span-6"
           />
 
           <BarMetric<StargazersType>
             data={STARGAZERS_DATA}
             metricKey="openIssues"
-            title="GitHub: Total Open Issues"
+            title="Github: Total Open Issues"
             label="Open Issues"
-            chartHeight={400}
+            chartHeight={300}
             className="col-span-12 lg:col-span-6"
           />
 
@@ -260,10 +258,6 @@ export default async function OpenPage() {
             data={MONTHLY_COMPLETED_DOCUMENTS}
             className="col-span-12 lg:col-span-6"
           />
-          <TotalSignedDocumentsChart
-            data={MONTHLY_COMPLETED_DOCUMENTS}
-            className="col-span-12 lg:col-span-6"
-          />
         </div>
       </div>
 

apps/marketing/src/app/(marketing)/open/salary-bands.tsx

@@ -1,4 +1,4 @@
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import { cn } from '@documenso/ui/lib/utils';
 import {

apps/marketing/src/app/(marketing)/open/total-signed-documents-chart.tsx

@@ -1,56 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
-
-import type { GetCompletedDocumentsMonthlyResult } from '@documenso/lib/server-only/user/get-monthly-completed-document';
-
-export type TotalSignedDocumentsChartProps = {
-  className?: string;
-  data: GetCompletedDocumentsMonthlyResult;
-};
-
-export const TotalSignedDocumentsChart = ({ className, data }: TotalSignedDocumentsChartProps) => {
-  const formattedData = [...data].reverse().map(({ month, cume_count: count }) => {
-    return {
-      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLLL'),
-      count: Number(count),
-    };
-  });
-
-  return (
-    <div className={className}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Total Completed Documents</h3>
-        </div>
-
-        <ResponsiveContainer width="100%" height={400}>
-          <BarChart data={formattedData}>
-            <XAxis dataKey="month" />
-            <YAxis />
-
-            <Tooltip
-              labelStyle={{
-                color: 'hsl(var(--primary-foreground))',
-              }}
-              formatter={(value) => [
-                Number(value).toLocaleString('en-US'),
-                'Total Completed Documents',
-              ]}
-              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
-            />
-
-            <Bar
-              dataKey="count"
-              fill="hsl(var(--primary))"
-              radius={[4, 4, 0, 0]}
-              maxBarSize={60}
-              label="Total Completed Documents"
-            />
-          </BarChart>
-        </ResponsiveContainer>
-      </div>
-    </div>
-  );
-};

apps/marketing/src/app/(marketing)/open/typefully.tsx

@@ -6,19 +6,18 @@ import Link from 'next/link';
 
 import { FaXTwitter } from 'react-icons/fa6';
 
+import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
 export type TypefullyProps = HTMLAttributes<HTMLDivElement>;
 
 export const Typefully = ({ className, ...props }: TypefullyProps) => {
   return (
-    <div className={className} {...props}>
+    <div className={cn('flex flex-col', className)} {...props}>
-      <div className="border-border flex flex-col justify-center rounded-2xl border p-6 pl-2 shadow-sm hover:shadow">
+      <h3 className="px-4 text-lg font-semibold">Twitter Stats</h3>
-        <div className="mb-6 flex px-4">
-          <h3 className="text-lg font-semibold">Twitter Stats</h3>
-        </div>
 
-        <div className="my-12 flex flex-col items-center gap-y-4 text-center">
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border py-8 shadow-sm hover:shadow">
+        <div className="flex flex-col items-center gap-y-4 text-center">
           <FaXTwitter className="h-12 w-12" />
           <Link href="https://typefully.com/documenso/stats" target="_blank">
             <h1>Documenso on X</h1>

apps/marketing/src/app/(marketing)/oss-friends/container.tsx

@@ -2,14 +2,13 @@
 
 import Link from 'next/link';
 
-import type { Variants } from 'framer-motion';
+import { Variants, motion } from 'framer-motion';
-import { motion } from 'framer-motion';
 
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent, CardTitle } from '@documenso/ui/primitives/card';
 
-import type { TOSSFriendsSchema } from './schema';
+import { TOSSFriendsSchema } from './schema';
 
 const ContainerVariants: Variants = {
   initial: {

apps/marketing/src/app/(marketing)/singleplayer/client.tsx

@@ -8,7 +8,7 @@ import { useRouter } from 'next/navigation';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { base64 } from '@documenso/lib/universal/base64';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import type { Field, Recipient } from '@documenso/prisma/client';
 import { DocumentDataType, Prisma } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
@@ -115,7 +115,7 @@ export const SinglePlayerClient = () => {
     }
 
     try {
-      const putFileData = await putPdfFile(uploadedFile.file);
+      const putFileData = await putFile(uploadedFile.file);
 
       const documentToken = await createSinglePlayerDocument({
         documentData: {
@@ -158,11 +158,9 @@ export const SinglePlayerClient = () => {
     expired: null,
     signedAt: null,
     readStatus: 'OPENED',
-    documentDeletedAt: null,
     signingStatus: 'NOT_SIGNED',
     sendStatus: 'NOT_SENT',
     role: 'SIGNER',
-    authOptions: null,
   };
 
   const onFileDrop = async (file: File) => {
@@ -248,8 +246,6 @@ export const SinglePlayerClient = () => {
                   recipients={uploadedFile ? [placeholderRecipient] : []}
                   fields={fields}
                   onSubmit={onFieldsSubmit}
-                  canGoBack={true}
-                  isDocumentPdfLoaded={true}
                 />
               </fieldset>
 

apps/marketing/src/app/layout.tsx

@@ -2,7 +2,6 @@ import { Suspense } from 'react';
 
 import { Caveat, Inter } from 'next/font/google';
 
-import { AxiomWebVitals } from 'next-axiom';
 import { PublicEnvScript } from 'next-runtime-env';
 
 import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag';
@@ -68,8 +67,6 @@ export default async function RootLayout({ children }: { children: React.ReactNo
         <PublicEnvScript />
       </head>
 
-      <AxiomWebVitals />
-
       <Suspense>
         <PostHogPageview />
       </Suspense>

apps/marketing/src/app/robots.ts

@@ -1,4 +1,4 @@
-import type { MetadataRoute } from 'next';
+import { MetadataRoute } from 'next';
 
 import { getBaseUrl } from '@documenso/lib/universal/get-base-url';
 

apps/marketing/src/app/sitemap.ts

@@ -1,4 +1,4 @@
-import type { MetadataRoute } from 'next';
+import { MetadataRoute } from 'next';
 
 import { allBlogPosts, allGenericPages } from 'contentlayer/generated';
 

apps/marketing/src/components/(marketing)/callout.tsx

@@ -53,7 +53,7 @@ export const Callout = ({ starCount }: CalloutProps) => {
       >
         <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
           <LuGithub className="mr-2 h-5 w-5" />
-          Star on GitHub
+          Star on Github
           {starCount && starCount > 0 && (
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">
               {starCount.toLocaleString('en-US')}

apps/marketing/src/components/(marketing)/footer.tsx

@@ -13,8 +13,6 @@ import LogoImage from '@documenso/assets/logo.png';
 import { cn } from '@documenso/ui/lib/utils';
 import { ThemeSwitcher } from '@documenso/ui/primitives/theme-switcher';
 
-// import { StatusWidgetContainer } from './status-widget-container';
-
 export type FooterProps = HTMLAttributes<HTMLDivElement>;
 
 const SOCIAL_LINKS = [
@@ -64,10 +62,6 @@ export const Footer = ({ className, ...props }: FooterProps) => {
               </Link>
             ))}
           </div>
-
-          {/* <div className="mt-6">
-            <StatusWidgetContainer />
-          </div> */}
         </div>
 
         <div className="grid w-full max-w-sm grid-cols-2 gap-x-4 gap-y-2 md:w-auto md:gap-x-8">

apps/marketing/src/components/(marketing)/hero.tsx

@@ -96,7 +96,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
           variants={HeroTitleVariants}
           initial="initial"
           animate="animate"
-          className="text-center text-4xl font-bold leading-tight tracking-tight md:text-[48px] lg:text-[64px]"
+          className="text-center text-4xl font-bold leading-tight tracking-tight lg:text-[64px]"
         >
           Document signing,
           <span className="block" /> finally open source.
@@ -123,7 +123,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
           <Link href="https://github.com/documenso/documenso" onClick={() => event('view-github')}>
             <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
               <LuGithub className="mr-2 h-5 w-5" />
-              Star on GitHub
+              Star on Github
             </Button>
           </Link>
         </motion.div>

apps/marketing/src/components/(marketing)/open-build-template-bento.tsx

@@ -1,4 +1,4 @@
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import Image from 'next/image';
 

apps/marketing/src/components/(marketing)/pricing-table.tsx

@@ -23,7 +23,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
 
   return (
     <div className={cn('', className)} {...props}>
-      <div className="bg-background sticky top-32 flex items-center justify-end gap-x-6 shadow-[-1px_-5px_2px_6px_hsl(var(--background))] md:top-[7.5rem] lg:static lg:justify-center">
+      <div className="flex items-center justify-center gap-x-6">
         <AnimatePresence>
           <motion.button
             key="MONTHLY"
@@ -40,7 +40,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
             {period === 'MONTHLY' && (
               <motion.div
                 layoutId={SELECTED_PLAN_BAR_LAYOUT_ID}
-                className="bg-foreground lg:bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
+                className="bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
               />
             )}
           </motion.button>
@@ -63,7 +63,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
             {period === 'YEARLY' && (
               <motion.div
                 layoutId={SELECTED_PLAN_BAR_LAYOUT_ID}
-                className="bg-foreground lg:bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
+                className="bg-primary absolute bottom-0 left-0 h-[3px] w-full rounded-full"
               />
             )}
           </motion.button>

apps/marketing/src/components/(marketing)/share-connect-paid-widget-bento.tsx

@@ -1,4 +1,4 @@
-import type { HTMLAttributes } from 'react';
+import { HTMLAttributes } from 'react';
 
 import Image from 'next/image';
 
@@ -51,7 +51,7 @@ export const ShareConnectPaidWidgetBento = ({
         <Card className="col-span-2 lg:col-span-1" spotlight>
           <CardContent className="grid grid-cols-1 gap-8 p-6">
             <p className="text-foreground/80 leading-relaxed">
-              <strong className="block">Connections</strong>
+              <strong className="block">Connections (Soon).</strong>
               Create connections and automations with Zapier and more to integrate with your
               favorite tools.
             </p>
@@ -70,7 +70,7 @@ export const ShareConnectPaidWidgetBento = ({
           <CardContent className="grid grid-cols-1 gap-8 p-6">
             <p className="text-foreground/80 leading-relaxed">
               <strong className="block">Get paid (Soon).</strong>
-              Integrated payments with Stripe so you don’t have to worry about getting paid.
+              Integrated payments with stripe so you don’t have to worry about getting paid.
             </p>
 
             <div className="flex items-center justify-center p-8">

apps/marketing/src/components/(marketing)/status-widget-container.tsx

@@ -1,21 +0,0 @@
-// https://github.com/documenso/documenso/pull/1044/files#r1538258462
-import { Suspense } from 'react';
-
-import { StatusWidget } from './status-widget';
-
-export function StatusWidgetContainer() {
-  return (
-    <Suspense fallback={<StatusWidgetFallback />}>
-      <StatusWidget slug="documenso-status" />
-    </Suspense>
-  );
-}
-
-function StatusWidgetFallback() {
-  return (
-    <div className="border-border inline-flex max-w-fit  items-center justify-between space-x-2 rounded-md border border-gray-200 px-2 py-2 pr-3 text-sm">
-      <span className="bg-muted h-2 w-36 animate-pulse rounded-md" />
-      <span className="bg-muted relative inline-flex h-2 w-2 rounded-full" />
-    </div>
-  );
-}

apps/marketing/src/components/(marketing)/status-widget.tsx

@@ -1,73 +0,0 @@
-import { memo, use } from 'react';
-
-import { type Status, getStatus } from '@openstatus/react';
-
-import { cn } from '@documenso/ui/lib/utils';
-
-const getStatusLevel = (level: Status) => {
-  return {
-    operational: {
-      label: 'Operational',
-      color: 'bg-green-500',
-      color2: 'bg-green-400',
-    },
-    degraded_performance: {
-      label: 'Degraded Performance',
-      color: 'bg-yellow-500',
-      color2: 'bg-yellow-400',
-    },
-    partial_outage: {
-      label: 'Partial Outage',
-      color: 'bg-yellow-500',
-      color2: 'bg-yellow-400',
-    },
-    major_outage: {
-      label: 'Major Outage',
-      color: 'bg-red-500',
-      color2: 'bg-red-400',
-    },
-    unknown: {
-      label: 'Unknown',
-      color: 'bg-gray-500',
-      color2: 'bg-gray-400',
-    },
-    incident: {
-      label: 'Incident',
-      color: 'bg-yellow-500',
-      color2: 'bg-yellow-400',
-    },
-    under_maintenance: {
-      label: 'Under Maintenance',
-      color: 'bg-gray-500',
-      color2: 'bg-gray-400',
-    },
-  }[level];
-};
-
-export const StatusWidget = memo(function StatusWidget({ slug }: { slug: string }) {
-  const { status } = use(getStatus(slug));
-  const level = getStatusLevel(status);
-
-  return (
-    <a
-      className="border-border inline-flex max-w-fit  items-center justify-between gap-2 space-x-2 rounded-md border border-gray-200 px-3 py-1 text-sm"
-      href="https://status.documenso.com"
-      target="_blank"
-      rel="noreferrer"
-    >
-      <div>
-        <p className="text-sm">{level.label}</p>
-      </div>
-
-      <span className="relative ml-auto flex h-1.5 w-1.5">
-        <span
-          className={cn(
-            'absolute inline-flex h-full w-full animate-ping rounded-full opacity-75',
-            level.color2,
-          )}
-        />
-        <span className={cn('relative inline-flex h-1.5 w-1.5 rounded-full', level.color)} />
-      </span>
-    </a>
-  );
-});

apps/marketing/src/components/(marketing)/widget.tsx

@@ -346,7 +346,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
                   {signatureText && (
                     <p
                       className={cn(
-                        'text-foreground truncate text-4xl font-semibold [font-family:var(--font-caveat)]',
+                        'text-foreground text-4xl font-semibold [font-family:var(--font-caveat)]',
                       )}
                     >
                       {signatureText}
@@ -360,7 +360,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
                 >
                   <Input
                     id="signatureText"
-                    className="text-foreground placeholder:text-muted-foreground truncate border-none p-0 text-sm focus-visible:ring-0"
+                    className="text-foreground placeholder:text-muted-foreground border-none p-0 text-sm focus-visible:ring-0"
                     placeholder="Draw or type name here"
                     disabled={isSubmitting}
                     {...register('signatureText', {

apps/marketing/src/components/form/form-error-message.tsx

@@ -1,5 +1,5 @@
 import { AnimatePresence, motion } from 'framer-motion';
-import type { FieldError } from 'react-hook-form';
+import { FieldError } from 'react-hook-form';
 
 import { cn } from '@documenso/ui/lib/utils';
 

apps/marketing/src/components/ui/background.tsx

@@ -1,4 +1,4 @@
-import type { SVGAttributes } from 'react';
+import { SVGAttributes } from 'react';
 
 export type BackgroundProps = Omit<SVGAttributes<SVGElement>, 'viewBox'>;
 

apps/marketing/src/pages/api/stripe/webhook/index.ts

@@ -13,7 +13,6 @@ import { updateFile } from '@documenso/lib/universal/upload/update-file';
 import { prisma } from '@documenso/prisma';
 import {
   DocumentDataType,
-  DocumentSource,
   DocumentStatus,
   FieldType,
   ReadStatus,
@@ -105,7 +104,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
       const document = await prisma.document.create({
         data: {
-          source: DocumentSource.DOCUMENT,
           title: 'Documenso Supporter Pledge.pdf',
           status: DocumentStatus.COMPLETED,
           userId: user.id,

apps/marketing/src/providers/next-theme.tsx

@@ -3,7 +3,7 @@
 import * as React from 'react';
 
 import { ThemeProvider as NextThemesProvider } from 'next-themes';
-import type { ThemeProviderProps } from 'next-themes/dist/types';
+import { ThemeProviderProps } from 'next-themes/dist/types';
 
 export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
   return <NextThemesProvider {...props}>{children}</NextThemesProvider>;

apps/web/next.config.js

@@ -2,7 +2,6 @@
 const fs = require('fs');
 const path = require('path');
 const { version } = require('./package.json');
-const { withAxiom } = require('next-axiom');
 
 const ENV_FILES = ['.env', '.env.local', `.env.${process.env.NODE_ENV || 'development'}`];
 
@@ -18,16 +17,12 @@ const FONT_CAVEAT_BYTES = fs.readFileSync(
   path.join(__dirname, '../../packages/assets/fonts/caveat.ttf'),
 );
 
-const FONT_NOTO_SANS_BYTES = fs.readFileSync(
-  path.join(__dirname, '../../packages/assets/fonts/noto-sans.ttf'),
-);
-
 /** @type {import('next').NextConfig} */
 const config = {
   output: process.env.DOCKER_OUTPUT ? 'standalone' : undefined,
   experimental: {
     outputFileTracingRoot: path.join(__dirname, '../../'),
-    serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign', 'playwright'],
+    serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign'],
     serverActions: {
       bodySizeLimit: '50mb',
     },
@@ -46,7 +41,6 @@ const config = {
     APP_VERSION: version,
     NEXT_PUBLIC_PROJECT: 'web',
     FONT_CAVEAT_URI: `data:font/ttf;base64,${FONT_CAVEAT_BYTES.toString('base64')}`,
-    FONT_NOTO_SANS_URI: `data:font/ttf;base64,${FONT_NOTO_SANS_BYTES.toString('base64')}`,
   },
   modularizeImports: {
     'lucide-react': {
@@ -97,4 +91,4 @@ const config = {
   },
 };
 
-module.exports = withAxiom(config);
+module.exports = config;

apps/web/package.json

@@ -22,22 +22,16 @@
     "@documenso/trpc": "*",
     "@documenso/ui": "*",
     "@hookform/resolvers": "^3.1.0",
-    "@simplewebauthn/browser": "^9.0.1",
-    "@simplewebauthn/server": "^9.0.3",
     "@tanstack/react-query": "^4.29.5",
-    "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",
     "micro": "^10.0.1",
     "next": "14.0.3",
     "next-auth": "4.24.5",
-    "next-axiom": "^1.1.1",
     "next-plausible": "^3.10.1",
     "next-themes": "^0.2.1",
-    "papaparse": "^5.4.1",
     "perfect-freehand": "^1.2.0",
     "posthog-js": "^1.75.3",
     "posthog-node": "^3.1.1",
@@ -57,11 +51,9 @@
   },
   "devDependencies": {
     "@documenso/tailwind-config": "*",
-    "@simplewebauthn/types": "^9.0.1",
     "@types/formidable": "^2.0.6",
     "@types/luxon": "^3.3.1",
     "@types/node": "20.1.0",
-    "@types/papaparse": "^5.3.14",
     "@types/react": "18.2.18",
     "@types/react-dom": "18.2.7",
     "@types/ua-parser-js": "^0.7.39",

apps/web/process-env.d.ts

@@ -12,9 +12,5 @@ declare namespace NodeJS {
 
     NEXT_PRIVATE_GOOGLE_CLIENT_ID: string;
     NEXT_PRIVATE_GOOGLE_CLIENT_SECRET: string;
-
-    NEXT_PRIVATE_OIDC_WELL_KNOWN: string;
-    NEXT_PRIVATE_OIDC_CLIENT_ID: string;
-    NEXT_PRIVATE_OIDC_CLIENT_SECRET: string;
   }
 }

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

@@ -2,8 +2,7 @@
 
 import Link from 'next/link';
 
-import type { Recipient } from '@documenso/prisma/client';
+import { type Document, DocumentStatus } from '@documenso/prisma/client';
-import { type Document, SigningStatus } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -18,10 +17,9 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export type AdminActionsProps = {
   className?: string;
   document: Document;
-  recipients: Recipient[];
 };
 
-export const AdminActions = ({ className, document, recipients }: AdminActionsProps) => {
+export const AdminActions = ({ className, document }: AdminActionsProps) => {
   const { toast } = useToast();
 
   const { mutate: resealDocument, isLoading: isResealDocumentLoading } =
@@ -49,9 +47,7 @@ export const AdminActions = ({ className, document, recipients }: AdminActionsPr
             <Button
               variant="outline"
               loading={isResealDocumentLoading}
-              disabled={recipients.some(
+              disabled={document.status !== DocumentStatus.COMPLETED}
-                (recipient) => recipient.signingStatus !== SigningStatus.SIGNED,
-              )}
               onClick={() => resealDocument({ id: document.id })}
             >
               Reseal document

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

@@ -14,7 +14,6 @@ import { LocaleDate } from '~/components/formatter/locale-date';
 
 import { AdminActions } from './admin-actions';
 import { RecipientItem } from './recipient-item';
-import { SuperDeleteDocumentDialog } from './super-delete-document-dialog';
 
 type AdminDocumentDetailsPageProps = {
   params: {
@@ -53,7 +52,7 @@ export default async function AdminDocumentDetailsPage({ params }: AdminDocument
 
       <h2 className="text-lg font-semibold">Admin Actions</h2>
 
-      <AdminActions className="mt-2" document={document} recipients={document.Recipient} />
+      <AdminActions className="mt-2" document={document} />
 
       <hr className="my-4" />
       <h2 className="text-lg font-semibold">Recipients</h2>
@@ -82,10 +81,6 @@ export default async function AdminDocumentDetailsPage({ params }: AdminDocument
           ))}
         </Accordion>
       </div>
-
-      <hr className="my-4" />
-
-      {document && <SuperDeleteDocumentDialog document={document} />}
     </div>
   );
 }

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

@@ -1,130 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { useRouter } from 'next/navigation';
-
-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';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type SuperDeleteDocumentDialogProps = {
-  document: Document;
-};
-
-export const SuperDeleteDocumentDialog = ({ document }: SuperDeleteDocumentDialogProps) => {
-  const { toast } = useToast();
-  const router = useRouter();
-
-  const [reason, setReason] = useState('');
-
-  const { mutateAsync: deleteDocument, isLoading: isDeletingDocument } =
-    trpc.admin.deleteDocument.useMutation();
-
-  const handleDeleteDocument = async () => {
-    try {
-      if (!reason) {
-        return;
-      }
-
-      await deleteDocument({ id: document.id, reason });
-
-      toast({
-        title: 'Document deleted',
-        description: 'The Document has been deleted successfully.',
-        duration: 5000,
-      });
-
-      router.push('/admin/documents');
-    } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
-        toast({
-          title: 'An error occurred',
-          description: err.message,
-          variant: 'destructive',
-        });
-      } else {
-        toast({
-          title: '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 (
-    <div>
-      <div>
-        <Alert
-          className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row "
-          variant="neutral"
-        >
-          <div>
-            <AlertTitle>Delete Document</AlertTitle>
-            <AlertDescription className="mr-2">
-              Delete the document. This action is irreversible so proceed with caution.
-            </AlertDescription>
-          </div>
-
-          <div className="flex-shrink-0">
-            <Dialog>
-              <DialogTrigger asChild>
-                <Button variant="destructive">Delete Document</Button>
-              </DialogTrigger>
-
-              <DialogContent>
-                <DialogHeader className="space-y-4">
-                  <DialogTitle>Delete Document</DialogTitle>
-
-                  <Alert variant="destructive">
-                    <AlertDescription className="selection:bg-red-100">
-                      This action is not reversible. Please be certain.
-                    </AlertDescription>
-                  </Alert>
-                </DialogHeader>
-
-                <div>
-                  <DialogDescription>To confirm, please enter the reason</DialogDescription>
-
-                  <Input
-                    className="mt-2"
-                    type="text"
-                    value={reason}
-                    onChange={(e) => setReason(e.target.value)}
-                  />
-                </div>
-
-                <DialogFooter>
-                  <Button
-                    onClick={handleDeleteDocument}
-                    loading={isDeletingDocument}
-                    variant="destructive"
-                    disabled={!reason}
-                  >
-                    {isDeletingDocument ? 'Deleting document...' : 'Delete Document'}
-                  </Button>
-                </DialogFooter>
-              </DialogContent>
-            </Dialog>
-          </div>
-        </Alert>
-      </div>
-    </div>
-  );
-};

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

@@ -58,7 +58,6 @@ export const UsersDataTable = ({
         perPage,
       });
     });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [debouncedSearchString]);
 
   const onPaginationChange = (page: number, perPage: number) => {

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

@@ -4,22 +4,13 @@ import { useState } from 'react';
 
 import Link from 'next/link';
 
-import {
+import { Copy, Download, Edit, Loader, MoreHorizontal, Share, Trash2 } from 'lucide-react';
-  Copy,
-  Download,
-  Edit,
-  Loader,
-  MoreHorizontal,
-  ScrollTextIcon,
-  Share,
-  Trash2,
-} from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
 import { downloadPDF } from '@documenso/lib/client-only/download-pdf';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { DocumentStatus } from '@documenso/prisma/client';
-import type { Document, Recipient, Team, TeamEmail, User } from '@documenso/prisma/client';
+import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
 import { trpc as trpcClient } from '@documenso/trpc/client';
 import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import {
@@ -41,7 +32,7 @@ export type DocumentPageViewDropdownProps = {
     Recipient: Recipient[];
     team: Pick<Team, 'id' | 'url'> | null;
   };
-  team?: Pick<Team, 'id' | 'url'> & { teamEmail: TeamEmail | null };
+  team?: Pick<Team, 'id' | 'url'>;
 };
 
 export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDropdownProps) => {
@@ -59,10 +50,9 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
 
   const isOwner = document.User.id === session.user.id;
   const isDraft = document.status === DocumentStatus.DRAFT;
-  const isDeleted = document.deletedAt !== null;
   const isComplete = document.status === DocumentStatus.COMPLETED;
+  const isDocumentDeletable = isOwner;
   const isCurrentTeamDocument = team && document.team?.url === team.url;
-  const canManageDocument = Boolean(isOwner || isCurrentTeamDocument);
 
   const documentsPath = formatDocumentsPath(team?.url);
 
@@ -116,22 +106,12 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
           </DropdownMenuItem>
         )}
 
-        <DropdownMenuItem asChild>
-          <Link href={`${documentsPath}/${document.id}/logs`}>
-            <ScrollTextIcon className="mr-2 h-4 w-4" />
-            Audit Log
-          </Link>
-        </DropdownMenuItem>
-
         <DropdownMenuItem onClick={() => setDuplicateDialogOpen(true)}>
           <Copy className="mr-2 h-4 w-4" />
           Duplicate
         </DropdownMenuItem>
 
-        <DropdownMenuItem
+        <DropdownMenuItem onClick={() => setDeleteDialogOpen(true)} disabled={!isDocumentDeletable}>
-          onClick={() => setDeleteDialogOpen(true)}
-          disabled={Boolean(!canManageDocument && team?.teamEmail) || isDeleted}
-        >
           <Trash2 className="mr-2 h-4 w-4" />
           Delete
         </DropdownMenuItem>
@@ -158,15 +138,15 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
         />
       </DropdownMenuContent>
 
-      <DeleteDocumentDialog
+      {isDocumentDeletable && (
-        id={document.id}
+        <DeleteDocumentDialog
-        status={document.status}
+          id={document.id}
-        documentTitle={document.title}
+          status={document.status}
-        open={isDeleteDialogOpen}
+          documentTitle={document.title}
-        canManageDocument={canManageDocument}
+          open={isDeleteDialogOpen}
-        onOpenChange={setDeleteDialogOpen}
+          onOpenChange={setDeleteDialogOpen}
-      />
+        />
-
+      )}
       {isDuplicateDialogOpen && (
         <DuplicateDocumentDialog
           id={document.id}

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

@@ -8,20 +8,17 @@ import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
 import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
-import { getCompletedFieldsForDocument } from '@documenso/lib/server-only/field/get-completed-fields-for-document';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { DocumentStatus } from '@documenso/prisma/client';
-import type { Team, TeamEmail } from '@documenso/prisma/client';
+import type { Team } from '@documenso/prisma/client';
-import { Badge } from '@documenso/ui/primitives/badge';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 
 import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip';
 import { DocumentHistorySheet } from '~/components/document/document-history-sheet';
-import { DocumentReadOnlyFields } from '~/components/document/document-read-only-fields';
 import {
   DocumentStatus as DocumentStatusComponent,
   FRIENDLY_STATUS_MAP,
@@ -37,7 +34,7 @@ export type DocumentPageViewProps = {
   params: {
     id: string;
   };
-  team?: Team & { teamEmail: TeamEmail | null };
+  team?: Team;
 };
 
 export const DocumentPageView = async ({ params, team }: DocumentPageViewProps) => {
@@ -86,16 +83,11 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
     documentMeta.password = securePassword;
   }
 
-  const [recipients, completedFields] = await Promise.all([
+  const recipients = await getRecipientsForDocument({
-    getRecipientsForDocument({
+    documentId,
-      documentId,
+    teamId: team?.id,
-      teamId: team?.id,
+    userId: user.id,
-      userId: user.id,
+  });
-    }),
-    getCompletedFieldsForDocument({
-      documentId,
-    }),
-  ]);
 
   const documentWithRecipients = {
     ...document,
@@ -126,17 +118,11 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
               <div className="text-muted-foreground flex items-center">
                 <Users2 className="mr-2 h-5 w-5" />
 
-                <StackAvatarsWithTooltip
+                <StackAvatarsWithTooltip recipients={recipients} position="bottom">
-                  recipients={recipients}
-                  documentStatus={document.status}
-                  position="bottom"
-                >
                   <span>{recipients.length} Recipient(s)</span>
                 </StackAvatarsWithTooltip>
               </div>
             )}
-
-            {document.deletedAt && <Badge variant="destructive">Document deleted</Badge>}
           </div>
         </div>
 
@@ -162,13 +148,6 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
           </CardContent>
         </Card>
 
-        {document.status === DocumentStatus.PENDING && (
-          <DocumentReadOnlyFields
-            fields={completedFields}
-            documentMeta={document.documentMeta || undefined}
-          />
-        )}
-
         <div className="col-span-12 lg:col-span-6 xl:col-span-5">
           <div className="space-y-6">
             <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">

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

@@ -1,25 +1,29 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { useRouter, useSearchParams } from 'next/navigation';
 
 import {
-  DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
+  type DocumentData,
-  SKIP_QUERY_BATCH_META,
+  type DocumentMeta,
-} from '@documenso/lib/constants/trpc';
+  DocumentStatus,
-import type { DocumentWithDetails } from '@documenso/prisma/types/document';
+  type Field,
+  type Recipient,
+  type User,
+} from '@documenso/prisma/client';
+import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { AddFieldsFormPartial } from '@documenso/ui/primitives/document-flow/add-fields';
 import type { TAddFieldsFormSchema } from '@documenso/ui/primitives/document-flow/add-fields.types';
-import { AddSettingsFormPartial } from '@documenso/ui/primitives/document-flow/add-settings';
-import type { TAddSettingsFormSchema } from '@documenso/ui/primitives/document-flow/add-settings.types';
 import { AddSignersFormPartial } from '@documenso/ui/primitives/document-flow/add-signers';
 import type { TAddSignersFormSchema } from '@documenso/ui/primitives/document-flow/add-signers.types';
 import { AddSubjectFormPartial } from '@documenso/ui/primitives/document-flow/add-subject';
 import type { TAddSubjectFormSchema } from '@documenso/ui/primitives/document-flow/add-subject.types';
+import { AddTitleFormPartial } from '@documenso/ui/primitives/document-flow/add-title';
+import type { TAddTitleFormSchema } from '@documenso/ui/primitives/document-flow/add-title.types';
 import { DocumentFlowFormContainer } from '@documenso/ui/primitives/document-flow/document-flow-root';
 import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
@@ -30,19 +34,27 @@ import { useOptionalCurrentTeam } from '~/providers/team';
 
 export type EditDocumentFormProps = {
   className?: string;
-  initialDocument: DocumentWithDetails;
+  user: User;
+  document: DocumentWithData;
+  recipients: Recipient[];
+  documentMeta: DocumentMeta | null;
+  fields: Field[];
+  documentData: DocumentData;
   documentRootPath: string;
-  isDocumentEnterprise: boolean;
 };
 
-type EditDocumentStep = 'settings' | 'signers' | 'fields' | 'subject';
+type EditDocumentStep = 'title' | 'signers' | 'fields' | 'subject';
-const EditDocumentSteps: EditDocumentStep[] = ['settings', 'signers', 'fields', 'subject'];
+const EditDocumentSteps: EditDocumentStep[] = ['title', 'signers', 'fields', 'subject'];
 
 export const EditDocumentForm = ({
   className,
-  initialDocument,
+  document,
+  recipients,
+  fields,
+  documentMeta,
+  user: _user,
+  documentData,
   documentRootPath,
-  isDocumentEnterprise,
 }: EditDocumentFormProps) => {
   const { toast } = useToast();
 
@@ -50,83 +62,17 @@ export const EditDocumentForm = ({
   const searchParams = useSearchParams();
   const team = useOptionalCurrentTeam();
 
-  const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
+  const { mutateAsync: addTitle } = trpc.document.setTitleForDocument.useMutation();
-
+  const { mutateAsync: addFields } = trpc.field.addFields.useMutation();
-  const utils = trpc.useUtils();
+  const { mutateAsync: addSigners } = trpc.recipient.addSigners.useMutation();
-
+  const { mutateAsync: sendDocument } = trpc.document.sendDocument.useMutation();
-  const { data: document, refetch: refetchDocument } =
-    trpc.document.getDocumentWithDetailsById.useQuery(
-      {
-        id: initialDocument.id,
-        teamId: team?.id,
-      },
-      {
-        initialData: initialDocument,
-        ...SKIP_QUERY_BATCH_META,
-      },
-    );
-
-  const { Recipient: recipients, Field: fields } = document;
-
-  const { mutateAsync: setSettingsForDocument } = trpc.document.setSettingsForDocument.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
-      );
-    },
-  });
-
-  const { mutateAsync: addFields } = trpc.field.addFields.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newFields) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), Field: newFields }),
-      );
-    },
-  });
-
-  const { mutateAsync: addSigners } = trpc.recipient.addSigners.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newRecipients) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), Recipient: newRecipients }),
-      );
-    },
-  });
-
-  const { mutateAsync: sendDocument } = trpc.document.sendDocument.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.document.getDocumentWithDetailsById.setData(
-        {
-          id: initialDocument.id,
-          teamId: team?.id,
-        },
-        (oldData) => ({ ...(oldData || initialDocument), ...newData }),
-      );
-    },
-  });
-
   const { mutateAsync: setPasswordForDocument } =
     trpc.document.setPasswordForDocument.useMutation();
 
   const documentFlow: Record<EditDocumentStep, DocumentFlowStep> = {
-    settings: {
+    title: {
-      title: 'General',
+      title: 'Add Title',
-      description: 'Configure general settings for the document.',
+      description: 'Add the title to the document.',
       stepIndex: 1,
     },
     signers: {
@@ -150,7 +96,8 @@ export const EditDocumentForm = ({
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const searchParamStep = searchParams?.get('step') as EditDocumentStep | undefined;
 
-    let initialStep: EditDocumentStep = 'settings';
+    let initialStep: EditDocumentStep =
+      document.status === DocumentStatus.DRAFT ? 'title' : 'signers';
 
     if (
       searchParamStep &&
@@ -163,26 +110,15 @@ export const EditDocumentForm = ({
     return initialStep;
   });
 
-  const onAddSettingsFormSubmit = async (data: TAddSettingsFormSchema) => {
+  const onAddTitleFormSubmit = async (data: TAddTitleFormSchema) => {
     try {
-      const { timezone, dateFormat, redirectUrl } = data.meta;
+      // Custom invocation server action
-
+      await addTitle({
-      await setSettingsForDocument({
         documentId: document.id,
         teamId: team?.id,
-        data: {
+        title: data.title,
-          title: data.title,
-          globalAccessAuth: data.globalAccessAuth ?? null,
-          globalActionAuth: data.globalActionAuth ?? null,
-        },
-        meta: {
-          timezone,
-          dateFormat,
-          redirectUrl,
-        },
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
 
       setStep('signers');
@@ -191,7 +127,7 @@ export const EditDocumentForm = ({
 
       toast({
         title: 'Error',
-        description: 'An error occurred while updating the document settings.',
+        description: 'An error occurred while updating title.',
         variant: 'destructive',
       });
     }
@@ -199,19 +135,14 @@ export const EditDocumentForm = ({
 
   const onAddSignersFormSubmit = async (data: TAddSignersFormSchema) => {
     try {
+      // Custom invocation server action
       await addSigners({
         documentId: document.id,
         teamId: team?.id,
-        signers: data.signers.map((signer) => ({
+        signers: data.signers,
-          ...signer,
-          // Explicitly set to null to indicate we want to remove auth if required.
-          actionAuth: signer.actionAuth || null,
-        })),
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
-
       setStep('fields');
     } catch (err) {
       console.error(err);
@@ -226,14 +157,13 @@ export const EditDocumentForm = ({
 
   const onAddFieldsFormSubmit = async (data: TAddFieldsFormSchema) => {
     try {
+      // Custom invocation server action
       await addFields({
         documentId: document.id,
         fields: data.fields,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
-
       setStep('subject');
     } catch (err) {
       console.error(err);
@@ -247,7 +177,7 @@ export const EditDocumentForm = ({
   };
 
   const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {
-    const { subject, message } = data.meta;
+    const { subject, message, timezone, dateFormat, redirectUrl } = data.meta;
 
     try {
       await sendDocument({
@@ -256,6 +186,9 @@ export const EditDocumentForm = ({
         meta: {
           subject,
           message,
+          dateFormat,
+          timezone,
+          redirectUrl,
         },
       });
 
@@ -286,15 +219,6 @@ export const EditDocumentForm = ({
 
   const currentDocumentFlow = documentFlow[step];
 
-  /**
-   * Refresh the data in the background when steps change.
-   */
-  useEffect(() => {
-    void refetchDocument();
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [step]);
-
   return (
     <div className={cn('grid w-full grid-cols-12 gap-8', className)}>
       <Card
@@ -303,12 +227,11 @@ export const EditDocumentForm = ({
       >
         <CardContent className="p-2">
           <LazyPDFViewer
-            key={document.documentData.id}
+            key={documentData.id}
-            documentData={document.documentData}
+            documentData={documentData}
             document={document}
-            password={document.documentMeta?.password}
+            password={documentMeta?.password}
             onPasswordSubmit={onPasswordSubmit}
-            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
           />
         </CardContent>
       </Card>
@@ -322,36 +245,30 @@ export const EditDocumentForm = ({
             currentStep={currentDocumentFlow.stepIndex}
             setCurrentStep={(step) => setStep(EditDocumentSteps[step - 1])}
           >
-            <AddSettingsFormPartial
+            <AddTitleFormPartial
               key={recipients.length}
-              documentFlow={documentFlow.settings}
+              documentFlow={documentFlow.title}
               document={document}
               recipients={recipients}
               fields={fields}
-              isDocumentEnterprise={isDocumentEnterprise}
+              onSubmit={onAddTitleFormSubmit}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
-              onSubmit={onAddSettingsFormSubmit}
             />
 
             <AddSignersFormPartial
               key={recipients.length}
               documentFlow={documentFlow.signers}
+              document={document}
               recipients={recipients}
               fields={fields}
-              isDocumentEnterprise={isDocumentEnterprise}
               onSubmit={onAddSignersFormSubmit}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
-
             <AddFieldsFormPartial
               key={fields.length}
               documentFlow={documentFlow.fields}
               recipients={recipients}
               fields={fields}
               onSubmit={onAddFieldsFormSubmit}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
-
             <AddSubjectFormPartial
               key={recipients.length}
               documentFlow={documentFlow.subject}
@@ -359,7 +276,6 @@ export const EditDocumentForm = ({
               recipients={recipients}
               fields={fields}
               onSubmit={onAddSubjectFormSubmit}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
           </Stepper>
         </DocumentFlowFormContainer>

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

@@ -3,10 +3,11 @@ import { redirect } from 'next/navigation';
 
 import { ChevronLeft, Users2 } from 'lucide-react';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
+import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
+import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
+import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { Team } from '@documenso/prisma/client';
@@ -36,13 +37,13 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
 
   const { user } = await getRequiredServerComponentSession();
 
-  const document = await getDocumentWithDetailsById({
+  const document = await getDocumentById({
     id: documentId,
     userId: user.id,
     teamId: team?.id,
   }).catch(() => null);
 
-  if (!document) {
+  if (!document || !document.documentData) {
     redirect(documentRootPath);
   }
 
@@ -50,7 +51,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
     redirect(`${documentRootPath}/${documentId}`);
   }
 
-  const { documentMeta, Recipient: recipients } = document;
+  const { documentData, documentMeta } = document;
 
   if (documentMeta?.password) {
     const key = DOCUMENSO_ENCRYPTION_KEY;
@@ -69,10 +70,17 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
     documentMeta.password = securePassword;
   }
 
-  const isDocumentEnterprise = await isUserEnterprise({
+  const [recipients, fields] = await Promise.all([
-    userId: user.id,
+    getRecipientsForDocument({
-    teamId: team?.id,
+      documentId,
-  });
+      userId: user.id,
+      teamId: team?.id,
+    }),
+    getFieldsForDocument({
+      documentId,
+      userId: user.id,
+    }),
+  ]);
 
   return (
     <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
@@ -92,11 +100,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
           <div className="text-muted-foreground flex items-center">
             <Users2 className="mr-2 h-5 w-5" />
 
-            <StackAvatarsWithTooltip
+            <StackAvatarsWithTooltip recipients={recipients} position="bottom">
-              recipients={recipients}
-              documentStatus={document.status}
-              position="bottom"
-            >
               <span>{recipients.length} Recipient(s)</span>
             </StackAvatarsWithTooltip>
           </div>
@@ -104,10 +108,14 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
       </div>
 
       <EditDocumentForm
-        className="mt-6"
+        className="mt-8"
-        initialDocument={document}
+        document={document}
+        user={user}
+        documentMeta={documentMeta}
+        recipients={recipients}
+        fields={fields}
+        documentData={documentData}
         documentRootPath={documentRootPath}
-        isDocumentEnterprise={isDocumentEnterprise}
       />
     </div>
   );

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

@@ -2,8 +2,6 @@ import Link from 'next/link';
 
 import { ChevronLeft, Loader } from 'lucide-react';
 
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-
 export default function Loading() {
   return (
     <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">
@@ -15,12 +13,7 @@ export default function Loading() {
       <h1 className="mt-4 grow-0 truncate text-2xl font-semibold md:text-3xl">
         Loading Document...
       </h1>
-
+      <div className="mt-8 grid h-[80vh] max-h-[60rem] w-full grid-cols-12 gap-x-8">
-      <div className="flex h-10 items-center">
-        <Skeleton className="my-6 h-4 w-24 rounded-2xl" />
-      </div>
-
-      <div className="mt-4 grid h-[80vh] max-h-[60rem] w-full grid-cols-12 gap-x-8">
         <div className="dark:bg-background border-border col-span-12 rounded-xl border-2 bg-white/50 p-2 before:rounded-xl lg:col-span-6 xl:col-span-7">
           <div className="flex h-[80vh] max-h-[60rem] flex-col items-center justify-center">
             <Loader className="text-documenso h-12 w-12 animate-spin" />

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

@@ -1,25 +1,19 @@
 import Link from 'next/link';
 import { redirect } from 'next/navigation';
 
-import { ChevronLeft } from 'lucide-react';
+import { ChevronLeft, DownloadIcon } from 'lucide-react';
-import { DateTime } from 'luxon';
 
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getLocale } from '@documenso/lib/server-only/headers/get-locale';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { Recipient, Team } from '@documenso/prisma/client';
+import { Button } from '@documenso/ui/primitives/button';
 import { Card } from '@documenso/ui/primitives/card';
 
-import {
+import { FRIENDLY_STATUS_MAP } from '~/components/formatter/document-status';
-  DocumentStatus as DocumentStatusComponent,
-  FRIENDLY_STATUS_MAP,
-} from '~/components/formatter/document-status';
 
 import { DocumentLogsDataTable } from './document-logs-data-table';
-import { DownloadAuditLogButton } from './download-audit-log-button';
-import { DownloadCertificateButton } from './download-certificate-button';
 
 export type DocumentLogsPageViewProps = {
   params: {
@@ -29,8 +23,6 @@ export type DocumentLogsPageViewProps = {
 };
 
 export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageViewProps) => {
-  const locale = getLocale();
-
   const { id } = params;
 
   const documentId = Number(id);
@@ -75,21 +67,15 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
     },
     {
       description: 'Created by',
-      value: document.User.name
+      value: document.User.name ?? document.User.email,
-        ? `${document.User.name} (${document.User.email})`
-        : document.User.email,
     },
     {
       description: 'Date created',
-      value: DateTime.fromJSDate(document.createdAt)
+      value: document.createdAt.toISOString(),
-        .setLocale(locale)
-        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
     },
     {
       description: 'Last updated',
-      value: DateTime.fromJSDate(document.updatedAt)
+      value: document.updatedAt.toISOString(),
-        .setLocale(locale)
-        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
     },
     {
       description: 'Time zone',
@@ -104,7 +90,7 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
       text = `${recipient.name} (${recipient.email})`;
     }
 
-    return `[${recipient.role}] ${text}`;
+    return `${text} - ${recipient.role}`;
   };
 
   return (
@@ -118,28 +104,20 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
       </Link>
 
       <div className="flex flex-col justify-between sm:flex-row">
-        <div>
+        <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
-          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
+          {document.title}
-            {document.title}
+        </h1>
-          </h1>
-
-          <div className="mt-2.5 flex items-center gap-x-6">
-            <DocumentStatusComponent
-              inheritColor
-              status={document.status}
-              className="text-muted-foreground"
-            />
-          </div>
-        </div>
 
         <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
-          <DownloadCertificateButton
+          <Button variant="outline" className="mr-2 w-full sm:w-auto">
-            className="mr-2"
+            <DownloadIcon className="mr-1.5 h-4 w-4" />
-            documentId={document.id}
+            Download certificate
-            documentStatus={document.status}
+          </Button>
-          />
 
-          <DownloadAuditLogButton documentId={document.id} />
+          <Button className="w-full sm:w-auto">
+            <DownloadIcon className="mr-1.5 h-4 w-4" />
+            Download PDF
+          </Button>
         </div>
       </div>
 

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

@@ -1,74 +0,0 @@
-'use client';
-
-import { DownloadIcon } from 'lucide-react';
-
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type DownloadAuditLogButtonProps = {
-  className?: string;
-  documentId: number;
-};
-
-export const DownloadAuditLogButton = ({ className, documentId }: DownloadAuditLogButtonProps) => {
-  const { toast } = useToast();
-
-  const { mutateAsync: downloadAuditLogs, isLoading } =
-    trpc.document.downloadAuditLogs.useMutation();
-
-  const onDownloadAuditLogsClick = async () => {
-    try {
-      const { url } = await downloadAuditLogs({ documentId });
-
-      const iframe = Object.assign(document.createElement('iframe'), {
-        src: url,
-      });
-
-      Object.assign(iframe.style, {
-        position: 'fixed',
-        top: '0',
-        left: '0',
-        width: '0',
-        height: '0',
-      });
-
-      const onLoaded = () => {
-        if (iframe.contentDocument?.readyState === 'complete') {
-          iframe.contentWindow?.print();
-
-          iframe.contentWindow?.addEventListener('afterprint', () => {
-            document.body.removeChild(iframe);
-          });
-        }
-      };
-
-      // When the iframe has loaded, print the iframe and remove it from the dom
-      iframe.addEventListener('load', onLoaded);
-
-      document.body.appendChild(iframe);
-
-      onLoaded();
-    } catch (error) {
-      console.error(error);
-
-      toast({
-        title: 'Something went wrong',
-        description: 'Sorry, we were unable to download the audit logs. Please try again later.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <Button
-      className={cn('w-full sm:w-auto', className)}
-      loading={isLoading}
-      onClick={() => void onDownloadAuditLogsClick()}
-    >
-      {!isLoading && <DownloadIcon className="mr-1.5 h-4 w-4" />}
-      Download Audit Logs
-    </Button>
-  );
-};

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

@@ -1,82 +0,0 @@
-'use client';
-
-import { DownloadIcon } from 'lucide-react';
-
-import { DocumentStatus } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type DownloadCertificateButtonProps = {
-  className?: string;
-  documentId: number;
-  documentStatus: DocumentStatus;
-};
-
-export const DownloadCertificateButton = ({
-  className,
-  documentId,
-  documentStatus,
-}: DownloadCertificateButtonProps) => {
-  const { toast } = useToast();
-
-  const { mutateAsync: downloadCertificate, isLoading } =
-    trpc.document.downloadCertificate.useMutation();
-
-  const onDownloadCertificatesClick = async () => {
-    try {
-      const { url } = await downloadCertificate({ documentId });
-
-      const iframe = Object.assign(document.createElement('iframe'), {
-        src: url,
-      });
-
-      Object.assign(iframe.style, {
-        position: 'fixed',
-        top: '0',
-        left: '0',
-        width: '0',
-        height: '0',
-      });
-
-      const onLoaded = () => {
-        if (iframe.contentDocument?.readyState === 'complete') {
-          iframe.contentWindow?.print();
-
-          iframe.contentWindow?.addEventListener('afterprint', () => {
-            document.body.removeChild(iframe);
-          });
-        }
-      };
-
-      // When the iframe has loaded, print the iframe and remove it from the dom
-      iframe.addEventListener('load', onLoaded);
-
-      document.body.appendChild(iframe);
-
-      onLoaded();
-    } catch (error) {
-      console.error(error);
-
-      toast({
-        title: 'Something went wrong',
-        description: 'Sorry, we were unable to download the certificate. Please try again later.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <Button
-      className={cn('w-full sm:w-auto', className)}
-      loading={isLoading}
-      variant="outline"
-      disabled={documentStatus !== DocumentStatus.COMPLETED}
-      onClick={() => void onDownloadCertificatesClick()}
-    >
-      {!isLoading && <DownloadIcon className="mr-1.5 h-4 w-4" />}
-      Download Certificate
-    </Button>
-  );
-};

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

@@ -15,6 +15,7 @@ import {
   Pencil,
   Share,
   Trash2,
+  XCircle,
 } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
@@ -44,7 +45,7 @@ export type DataTableActionDropdownProps = {
     Recipient: Recipient[];
     team: Pick<Team, 'id' | 'url'> | null;
   };
-  team?: Pick<Team, 'id' | 'url'> & { teamEmail?: string };
+  team?: Pick<Team, 'id' | 'url'>;
 };
 
 export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownProps) => {
@@ -66,8 +67,8 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
   // const isPending = row.status === DocumentStatus.PENDING;
   const isComplete = row.status === DocumentStatus.COMPLETED;
   // const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
+  const isDocumentDeletable = isOwner;
   const isCurrentTeamDocument = team && row.team?.url === team.url;
-  const canManageDocument = Boolean(isOwner || isCurrentTeamDocument);
 
   const documentsPath = formatDocumentsPath(team?.url);
 
@@ -106,14 +107,14 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
 
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger data-testid="document-table-action-btn">
+      <DropdownMenuTrigger>
         <MoreHorizontal className="text-muted-foreground h-5 w-5" />
       </DropdownMenuTrigger>
 
       <DropdownMenuContent className="w-52" align="start" forceMount>
         <DropdownMenuLabel>Action</DropdownMenuLabel>
 
-        {!isDraft && recipient && recipient?.role !== RecipientRole.CC && (
+        {recipient && recipient?.role !== RecipientRole.CC && (
           <DropdownMenuItem disabled={!recipient || isComplete} asChild>
             <Link href={`/sign/${recipient?.token}`}>
               {recipient?.role === RecipientRole.VIEWER && (
@@ -140,7 +141,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
           </DropdownMenuItem>
         )}
 
-        <DropdownMenuItem disabled={!canManageDocument || isComplete} asChild>
+        <DropdownMenuItem disabled={(!isOwner && !isCurrentTeamDocument) || isComplete} asChild>
           <Link href={`${documentsPath}/${row.id}/edit`}>
             <Edit className="mr-2 h-4 w-4" />
             Edit
@@ -157,18 +158,14 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
           Duplicate
         </DropdownMenuItem>
 
-        {/* No point displaying this if there's no functionality. */}
+        <DropdownMenuItem disabled>
-        {/* <DropdownMenuItem disabled>
           <XCircle className="mr-2 h-4 w-4" />
           Void
-        </DropdownMenuItem> */}
+        </DropdownMenuItem>
 
-        <DropdownMenuItem
+        <DropdownMenuItem onClick={() => setDeleteDialogOpen(true)} disabled={!isDocumentDeletable}>
-          onClick={() => setDeleteDialogOpen(true)}
-          disabled={Boolean(!canManageDocument && team?.teamEmail)}
-        >
           <Trash2 className="mr-2 h-4 w-4" />
-          {canManageDocument ? 'Delete' : 'Hide'}
+          Delete
         </DropdownMenuItem>
 
         <DropdownMenuLabel>Share</DropdownMenuLabel>
@@ -189,16 +186,16 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
         />
       </DropdownMenuContent>
 
-      <DeleteDocumentDialog
+      {isDocumentDeletable && (
-        id={row.id}
+        <DeleteDocumentDialog
-        status={row.status}
+          id={row.id}
-        documentTitle={row.title}
+          status={row.status}
-        open={isDeleteDialogOpen}
+          documentTitle={row.title}
-        onOpenChange={setDeleteDialogOpen}
+          open={isDeleteDialogOpen}
-        teamId={team?.id}
+          onOpenChange={setDeleteDialogOpen}
-        canManageDocument={canManageDocument}
+          teamId={team?.id}
-      />
+        />
-
+      )}
       {isDuplicateDialogOpen && (
         <DuplicateDocumentDialog
           id={row.id}

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

@@ -3,7 +3,6 @@
 import { useTransition } from 'react';
 
 import { Loader } from 'lucide-react';
-import { DateTime } from 'luxon';
 import { useSession } from 'next-auth/react';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
@@ -30,7 +29,7 @@ export type DocumentsDataTableProps = {
     }
   >;
   showSenderColumn?: boolean;
-  team?: Pick<Team, 'id' | 'url'> & { teamEmail?: string };
+  team?: Pick<Team, 'id' | 'url'>;
 };
 
 export const DocumentsDataTable = ({
@@ -63,12 +62,7 @@ export const DocumentsDataTable = ({
           {
             header: 'Created',
             accessorKey: 'createdAt',
-            cell: ({ row }) => (
+            cell: ({ row }) => <LocaleDate date={row.original.createdAt} />,
-              <LocaleDate
-                date={row.original.createdAt}
-                format={{ ...DateTime.DATETIME_SHORT, hourCycle: 'h12' }}
-              />
-            ),
           },
           {
             header: 'Title',
@@ -82,12 +76,7 @@ export const DocumentsDataTable = ({
           {
             header: 'Recipient',
             accessorKey: 'recipient',
-            cell: ({ row }) => (
+            cell: ({ row }) => <StackAvatarsWithTooltip recipients={row.original.Recipient} />,
-              <StackAvatarsWithTooltip
-                recipients={row.original.Recipient}
-                documentStatus={row.original.status}
-              />
-            ),
           },
           {
             header: 'Status',

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

@@ -2,11 +2,8 @@ import { useEffect, useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { match } from 'ts-pattern';
-
 import { DocumentStatus } from '@documenso/prisma/client';
 import { trpc as trpcReact } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
@@ -26,7 +23,6 @@ type DeleteDocumentDialogProps = {
   status: DocumentStatus;
   documentTitle: string;
   teamId?: number;
-  canManageDocument: boolean;
 };
 
 export const DeleteDocumentDialog = ({
@@ -36,7 +32,6 @@ export const DeleteDocumentDialog = ({
   status,
   documentTitle,
   teamId,
-  canManageDocument,
 }: DeleteDocumentDialogProps) => {
   const router = useRouter();
 
@@ -88,82 +83,47 @@ export const DeleteDocumentDialog = ({
     <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>Are you sure?</DialogTitle>
+          <DialogTitle>Are you sure you want to delete "{documentTitle}"?</DialogTitle>
 
           <DialogDescription>
-            You are about to {canManageDocument ? 'delete' : 'hide'}{' '}
+            Please note that this action is irreversible. Once confirmed, your document will be
-            <strong>"{documentTitle}"</strong>
+            permanently deleted.
           </DialogDescription>
         </DialogHeader>
 
-        {canManageDocument ? (
+        {status !== DocumentStatus.DRAFT && (
-          <Alert variant="warning" className="-mt-1">
+          <div className="mt-4">
-            {match(status)
+            <Input
-              .with(DocumentStatus.DRAFT, () => (
+              type="text"
-                <AlertDescription>
+              value={inputValue}
-                  Please note that this action is <strong>irreversible</strong>. Once confirmed,
+              onChange={onInputChange}
-                  this document will be permanently deleted.
+              placeholder="Type 'delete' to confirm"
-                </AlertDescription>
+            />
-              ))
+          </div>
-              .with(DocumentStatus.PENDING, () => (
-                <AlertDescription>
-                  <p>
-                    Please note that this action is <strong>irreversible</strong>.
-                  </p>
-
-                  <p className="mt-1">Once confirmed, the following will occur:</p>
-
-                  <ul className="mt-0.5 list-inside list-disc">
-                    <li>Document will be permanently deleted</li>
-                    <li>Document signing process will be cancelled</li>
-                    <li>All inserted signatures will be voided</li>
-                    <li>All recipients will be notified</li>
-                  </ul>
-                </AlertDescription>
-              ))
-              .with(DocumentStatus.COMPLETED, () => (
-                <AlertDescription>
-                  <p>By deleting this document, the following will occur:</p>
-
-                  <ul className="mt-0.5 list-inside list-disc">
-                    <li>The document will be hidden from your account</li>
-                    <li>Recipients will still retain their copy of the document</li>
-                  </ul>
-                </AlertDescription>
-              ))
-              .exhaustive()}
-          </Alert>
-        ) : (
-          <Alert variant="warning" className="-mt-1">
-            <AlertDescription>
-              Please contact support if you would like to revert this action.
-            </AlertDescription>
-          </Alert>
-        )}
-
-        {status !== DocumentStatus.DRAFT && canManageDocument && (
-          <Input
-            type="text"
-            value={inputValue}
-            onChange={onInputChange}
-            placeholder="Type 'delete' to confirm"
-          />
         )}
 
         <DialogFooter>
-          <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
+          <div className="flex w-full flex-1 flex-nowrap gap-4">
-            Cancel
+            <Button
-          </Button>
+              type="button"
+              variant="secondary"
+              onClick={() => onOpenChange(false)}
+              className="flex-1"
+            >
+              Cancel
+            </Button>
 
-          <Button
+            <Button
-            type="button"
+              type="button"
-            loading={isLoading}
+              loading={isLoading}
-            onClick={onDelete}
+              onClick={onDelete}
-            disabled={!isDeleteEnabled && canManageDocument}
+              disabled={!isDeleteEnabled}
-            variant="destructive"
+              variant="destructive"
-          >
+              className="flex-1"
-            {canManageDocument ? 'Delete' : 'Hide'}
+            >
-          </Button>
+              Delete
+            </Button>
+          </div>
         </DialogFooter>
       </DialogContent>
     </Dialog>

apps/web/src/app/(dashboard)/documents/documents-page-view.tsx

@@ -41,9 +41,7 @@ export const DocumentsPageView = async ({ searchParams = {}, team }: DocumentsPa
   const page = Number(searchParams.page) || 1;
   const perPage = Number(searchParams.perPage) || 20;
   const senderIds = parseToIntegerArray(searchParams.senderIds ?? '');
-  const currentTeam = team
+  const currentTeam = team ? { id: team.id, url: team.url } : undefined;
-    ? { id: team.id, url: team.url, teamEmail: team.teamEmail?.email }
-    : undefined;
 
   const getStatOptions: GetStatsInput = {
     user,

apps/web/src/app/(dashboard)/documents/empty-state.tsx

@@ -37,10 +37,7 @@ export const EmptyDocumentState = ({ status }: EmptyDocumentProps) => {
     }));
 
   return (
-    <div
+    <div className="text-muted-foreground/60 flex h-60 flex-col items-center justify-center gap-y-4">
-      className="text-muted-foreground/60 flex h-60 flex-col items-center justify-center gap-y-4"
-      data-testid="empty-document-state"
-    >
       <Icon className="h-12 w-12" strokeWidth={1.5} />
 
       <div className="text-center">

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

@@ -10,9 +10,8 @@ import { useSession } from 'next-auth/react';
 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 { 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 { putFile } 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';
@@ -58,7 +57,7 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
     try {
       setIsLoading(true);
 
-      const { type, data } = await putPdfFile(file);
+      const { type, data } = await putFile(file);
 
       const { id: documentDataId } = await createDocumentData({
         type,
@@ -84,21 +83,13 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
       });
 
       router.push(`${formatDocumentsPath(team?.url)}/${id}/edit`);
-    } catch (err) {
+    } catch (error) {
-      const error = AppError.parseError(err);
+      console.error(error);
 
-      console.error(err);
+      if (error instanceof TRPCClientError) {
-
-      if (error.code === 'INVALID_DOCUMENT_FILE') {
-        toast({
-          title: 'Invalid file',
-          description: 'You cannot upload encrypted PDFs',
-          variant: 'destructive',
-        });
-      } else if (err instanceof TRPCClientError) {
         toast({
           title: 'Error',
-          description: err.message,
+          description: error.message,
           variant: 'destructive',
         });
       } else {

apps/web/src/app/(dashboard)/settings/security/activity/page.tsx

@@ -15,14 +15,15 @@ export default function SettingsSecurityActivityPage() {
       <SettingsHeader
         title="Security activity"
         subtitle="View all recent security activity related to your account."
-        hideDivider={true}
       >
-        <ActivityPageBackButton />
+        <div>
+          <ActivityPageBackButton />
+        </div>
       </SettingsHeader>
 
-      <div className="mt-4">
+      <hr className="my-4" />
-        <UserSecurityActivityDataTable />
+
-      </div>
+      <UserSecurityActivityDataTable />
     </div>
   );
 }

apps/web/src/app/(dashboard)/settings/security/page.tsx

@@ -1,15 +1,14 @@
 import type { Metadata } from 'next';
 import Link from 'next/link';
 
+import { IDENTITY_PROVIDER_NAME } from '@documenso/lib/constants/auth';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 
 import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header';
-import { DisableAuthenticatorAppDialog } from '~/components/forms/2fa/disable-authenticator-app-dialog';
+import { AuthenticatorApp } from '~/components/forms/2fa/authenticator-app';
-import { EnableAuthenticatorAppDialog } from '~/components/forms/2fa/enable-authenticator-app-dialog';
+import { RecoveryCodes } from '~/components/forms/2fa/recovery-codes';
-import { ViewRecoveryCodesDialog } from '~/components/forms/2fa/view-recovery-codes-dialog';
 import { PasswordForm } from '~/components/forms/password';
 
 export const metadata: Metadata = {
@@ -19,8 +18,6 @@ export const metadata: Metadata = {
 export default async function SecuritySettingsPage() {
   const { user } = await getRequiredServerComponentSession();
 
-  const isPasskeyEnabled = await getServerComponentFlag('app_passkey');
-
   return (
     <div>
       <SettingsHeader
@@ -28,70 +25,57 @@ export default async function SecuritySettingsPage() {
         subtitle="Here you can manage your password and security settings."
       />
 
-      {user.identityProvider === 'DOCUMENSO' && (
+      {user.identityProvider === 'DOCUMENSO' ? (
-        <>
+        <div>
           <PasswordForm user={user} />
 
           <hr className="border-border/50 mt-6" />
-        </>
-      )}
 
-      <Alert
+          <Alert
-        className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+            className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-        variant="neutral"
+            variant="neutral"
-      >
+          >
-        <div className="mb-4 sm:mb-0">
+            <div className="mb-4 sm:mb-0">
-          <AlertTitle>Two factor authentication</AlertTitle>
+              <AlertTitle>Two factor authentication</AlertTitle>
 
-          <AlertDescription className="mr-4">
+              <AlertDescription className="mr-4">
-            Add an authenticator to serve as a secondary authentication method{' '}
+                Create one-time passwords that serve as a secondary authentication method for
-            {user.identityProvider === 'DOCUMENSO'
+                confirming your identity when requested during the sign-in process.
-              ? 'when signing in, or when signing documents.'
+              </AlertDescription>
-              : 'for signing documents.'}
+            </div>
-          </AlertDescription>
+
+            <AuthenticatorApp isTwoFactorEnabled={user.twoFactorEnabled} />
+          </Alert>
+
+          {user.twoFactorEnabled && (
+            <Alert
+              className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+              variant="neutral"
+            >
+              <div className="mb-4 sm:mb-0">
+                <AlertTitle>Recovery codes</AlertTitle>
+
+                <AlertDescription className="mr-4">
+                  Two factor authentication recovery codes are used to access your account in the
+                  event that you lose access to your authenticator app.
+                </AlertDescription>
+              </div>
+
+              <RecoveryCodes isTwoFactorEnabled={user.twoFactorEnabled} />
+            </Alert>
+          )}
         </div>
+      ) : (
+        <Alert className="p-6" variant="neutral">
+          <AlertTitle>
+            Your account is managed by {IDENTITY_PROVIDER_NAME[user.identityProvider]}
+          </AlertTitle>
 
-        {user.twoFactorEnabled ? (
+          <AlertDescription>
-          <DisableAuthenticatorAppDialog />
+            To update your password, enable two-factor authentication, and manage other security
-        ) : (
+            settings, please go to your {IDENTITY_PROVIDER_NAME[user.identityProvider]} account
-          <EnableAuthenticatorAppDialog />
+            settings.
-        )}
+          </AlertDescription>
-      </Alert>
-
-      {user.twoFactorEnabled && (
-        <Alert
-          className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-          variant="neutral"
-        >
-          <div className="mb-4 sm:mb-0">
-            <AlertTitle>Recovery codes</AlertTitle>
-
-            <AlertDescription className="mr-4">
-              Two factor authentication recovery codes are used to access your account in the event
-              that you lose access to your authenticator app.
-            </AlertDescription>
-          </div>
-
-          <ViewRecoveryCodesDialog />
-        </Alert>
-      )}
-
-      {isPasskeyEnabled && (
-        <Alert
-          className="mt-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-          variant="neutral"
-        >
-          <div className="mb-4 sm:mb-0">
-            <AlertTitle>Passkeys</AlertTitle>
-
-            <AlertDescription className="mr-4">
-              Allows authenticating using biometrics, password managers, hardware keys, etc.
-            </AlertDescription>
-          </div>
-
-          <Button asChild variant="outline" className="bg-background">
-            <Link href="/settings/security/passkeys">Manage passkeys</Link>
-          </Button>
         </Alert>
       )}
 
@@ -107,7 +91,7 @@ export default async function SecuritySettingsPage() {
           </AlertDescription>
         </div>
 
-        <Button asChild variant="outline" className="bg-background">
+        <Button asChild>
           <Link href="/settings/security/activity">View activity</Link>
         </Button>
       </Alert>

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

@@ -1,237 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { startRegistration } from '@simplewebauthn/browser';
-import { KeyRoundIcon } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { match } from 'ts-pattern';
-import { UAParser } from 'ua-parser-js';
-import { z } from 'zod';
-
-import { MAXIMUM_PASSKEYS } from '@documenso/lib/constants/auth';
-import { AppError } from '@documenso/lib/errors/app-error';
-import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type CreatePasskeyDialogProps = {
-  trigger?: React.ReactNode;
-  onSuccess?: () => void;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const ZCreatePasskeyFormSchema = z.object({
-  passkeyName: z.string().min(3),
-});
-
-type TCreatePasskeyFormSchema = z.infer<typeof ZCreatePasskeyFormSchema>;
-
-const parser = new UAParser();
-
-export const CreatePasskeyDialog = ({ trigger, onSuccess, ...props }: CreatePasskeyDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const [formError, setFormError] = useState<string | null>(null);
-
-  const { toast } = useToast();
-
-  const form = useForm<TCreatePasskeyFormSchema>({
-    resolver: zodResolver(ZCreatePasskeyFormSchema),
-    defaultValues: {
-      passkeyName: '',
-    },
-  });
-
-  const { mutateAsync: createPasskeyRegistrationOptions, isLoading } =
-    trpc.auth.createPasskeyRegistrationOptions.useMutation();
-
-  const { mutateAsync: createPasskey } = trpc.auth.createPasskey.useMutation();
-
-  const onFormSubmit = async ({ passkeyName }: TCreatePasskeyFormSchema) => {
-    setFormError(null);
-
-    try {
-      const passkeyRegistrationOptions = await createPasskeyRegistrationOptions();
-
-      const registrationResult = await startRegistration(passkeyRegistrationOptions);
-
-      await createPasskey({
-        passkeyName,
-        verificationResponse: registrationResult,
-      });
-
-      toast({
-        description: 'Successfully created passkey',
-        duration: 5000,
-      });
-
-      onSuccess?.();
-      setOpen(false);
-    } catch (err) {
-      if (err.name === 'NotAllowedError') {
-        return;
-      }
-
-      const error = AppError.parseError(err);
-
-      setFormError(err.code || error.code);
-    }
-  };
-
-  const extractDefaultPasskeyName = () => {
-    if (!window || !window.navigator) {
-      return;
-    }
-
-    parser.setUA(window.navigator.userAgent);
-
-    const result = parser.getResult();
-    const operatingSystem = result.os.name;
-    const browser = result.browser.name;
-
-    let passkeyName = '';
-
-    if (operatingSystem && browser) {
-      passkeyName = `${browser} (${operatingSystem})`;
-    }
-
-    return passkeyName;
-  };
-
-  useEffect(() => {
-    if (!open) {
-      const defaultPasskeyName = extractDefaultPasskeyName();
-
-      form.reset({
-        passkeyName: defaultPasskeyName,
-      });
-
-      setFormError(null);
-    }
-  }, [open, form]);
-
-  return (
-    <Dialog
-      {...props}
-      open={open}
-      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
-    >
-      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
-        {trigger ?? (
-          <Button variant="secondary" loading={isLoading}>
-            <KeyRoundIcon className="-ml-1 mr-1 h-5 w-5" />
-            Add passkey
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent position="center">
-        <DialogHeader>
-          <DialogTitle>Add passkey</DialogTitle>
-
-          <DialogDescription className="mt-4">
-            Passkeys allow you to sign in and authenticate using biometrics, password managers, etc.
-          </DialogDescription>
-        </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onFormSubmit)}>
-            <fieldset
-              className="flex h-full flex-col space-y-4"
-              disabled={form.formState.isSubmitting}
-            >
-              <FormField
-                control={form.control}
-                name="passkeyName"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel required>Passkey name</FormLabel>
-                    <FormControl>
-                      <Input className="bg-background" placeholder="eg. Mac" {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <Alert variant="neutral">
-                <AlertDescription>
-                  When you click continue, you will be prompted to add the first available
-                  authenticator on your system.
-                </AlertDescription>
-
-                <AlertDescription className="mt-2">
-                  If you do not want to use the authenticator prompted, you can close it, which will
-                  then display the next available authenticator.
-                </AlertDescription>
-              </Alert>
-
-              {formError && (
-                <Alert variant="destructive">
-                  {match(formError)
-                    .with('ERROR_AUTHENTICATOR_PREVIOUSLY_REGISTERED', () => (
-                      <AlertDescription>This passkey has already been registered.</AlertDescription>
-                    ))
-                    .with('TOO_MANY_PASSKEYS', () => (
-                      <AlertDescription>
-                        You cannot have more than {MAXIMUM_PASSKEYS} passkeys.
-                      </AlertDescription>
-                    ))
-                    .with('InvalidStateError', () => (
-                      <>
-                        <AlertTitle className="text-sm">
-                          Passkey creation cancelled due to one of the following reasons:
-                        </AlertTitle>
-                        <AlertDescription>
-                          <ul className="mt-1 list-inside list-disc">
-                            <li>Cancelled by user</li>
-                            <li>Passkey already exists for the provided authenticator</li>
-                            <li>Exceeded timeout</li>
-                          </ul>
-                        </AlertDescription>
-                      </>
-                    ))
-                    .otherwise(() => (
-                      <AlertDescription>
-                        Something went wrong. Please try again or contact support.
-                      </AlertDescription>
-                    ))}
-                </Alert>
-              )}
-
-              <DialogFooter>
-                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                  Cancel
-                </Button>
-
-                <Button type="submit" loading={form.formState.isSubmitting}>
-                  Continue
-                </Button>
-              </DialogFooter>
-            </fieldset>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/web/src/app/(dashboard)/settings/security/passkeys/page.tsx

@@ -1,33 +0,0 @@
-import type { Metadata } from 'next';
-import { redirect } from 'next/navigation';
-
-import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
-
-import { SettingsHeader } from '~/components/(dashboard)/settings/layout/header';
-
-import { CreatePasskeyDialog } from './create-passkey-dialog';
-import { UserPasskeysDataTable } from './user-passkeys-data-table';
-
-export const metadata: Metadata = {
-  title: 'Manage passkeys',
-};
-
-export default async function SettingsManagePasskeysPage() {
-  const isPasskeyEnabled = await getServerComponentFlag('app_passkey');
-
-  if (!isPasskeyEnabled) {
-    redirect('/settings/security');
-  }
-
-  return (
-    <div>
-      <SettingsHeader title="Passkeys" subtitle="Manage your passkeys." hideDivider={true}>
-        <CreatePasskeyDialog />
-      </SettingsHeader>
-
-      <div className="mt-4">
-        <UserPasskeysDataTable />
-      </div>
-    </div>
-  );
-}

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

@@ -1,200 +0,0 @@
-import { useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type UserPasskeysDataTableActionsProps = {
-  className?: string;
-  passkeyId: string;
-  passkeyName: string;
-};
-
-const ZUpdatePasskeySchema = z.object({
-  name: z.string(),
-});
-
-type TUpdatePasskeySchema = z.infer<typeof ZUpdatePasskeySchema>;
-
-export const UserPasskeysDataTableActions = ({
-  className,
-  passkeyId,
-  passkeyName,
-}: UserPasskeysDataTableActionsProps) => {
-  const { toast } = useToast();
-
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
-  const [isUpdateDialogOpen, setIsUpdateDialogOpen] = useState(false);
-
-  const form = useForm<TUpdatePasskeySchema>({
-    resolver: zodResolver(ZUpdatePasskeySchema),
-    defaultValues: {
-      name: passkeyName,
-    },
-  });
-
-  const { mutateAsync: updatePasskey, isLoading: isUpdatingPasskey } =
-    trpc.auth.updatePasskey.useMutation({
-      onSuccess: () => {
-        toast({
-          title: 'Success',
-          description: 'Passkey has been updated',
-        });
-      },
-      onError: () => {
-        toast({
-          title: 'Something went wrong',
-          description:
-            'We are unable to update this passkey at the moment. Please try again later.',
-          duration: 10000,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  const { mutateAsync: deletePasskey, isLoading: isDeletingPasskey } =
-    trpc.auth.deletePasskey.useMutation({
-      onSuccess: () => {
-        toast({
-          title: 'Success',
-          description: 'Passkey has been removed',
-        });
-      },
-      onError: () => {
-        toast({
-          title: 'Something went wrong',
-          description:
-            'We are unable to remove this passkey at the moment. Please try again later.',
-          duration: 10000,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  return (
-    <div className={cn('flex justify-end space-x-2', className)}>
-      <Dialog
-        open={isUpdateDialogOpen}
-        onOpenChange={(value) => !isUpdatingPasskey && setIsUpdateDialogOpen(value)}
-      >
-        <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
-          <Button variant="outline">Edit</Button>
-        </DialogTrigger>
-
-        <DialogContent position="center">
-          <DialogHeader>
-            <DialogTitle>Update passkey</DialogTitle>
-
-            <DialogDescription className="mt-4">
-              You are currently updating the <strong>{passkeyName}</strong> passkey.
-            </DialogDescription>
-          </DialogHeader>
-
-          <Form {...form}>
-            <form
-              onSubmit={form.handleSubmit(async ({ name }) =>
-                updatePasskey({
-                  passkeyId,
-                  name,
-                }),
-              )}
-            >
-              <fieldset className="flex h-full flex-col" disabled={isUpdatingPasskey}>
-                <FormField
-                  control={form.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem className="w-full">
-                      <FormLabel required>Name</FormLabel>
-                      <FormControl>
-                        <Input {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <DialogFooter className="mt-4">
-                  <DialogClose asChild>
-                    <Button type="button" variant="secondary">
-                      Cancel
-                    </Button>
-                  </DialogClose>
-
-                  <Button type="submit" loading={isUpdatingPasskey}>
-                    Update
-                  </Button>
-                </DialogFooter>
-              </fieldset>
-            </form>
-          </Form>
-        </DialogContent>
-      </Dialog>
-
-      <Dialog
-        open={isDeleteDialogOpen}
-        onOpenChange={(value) => !isDeletingPasskey && setIsDeleteDialogOpen(value)}
-      >
-        <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
-          <Button variant="destructive">Delete</Button>
-        </DialogTrigger>
-
-        <DialogContent position="center">
-          <DialogHeader>
-            <DialogTitle>Delete passkey</DialogTitle>
-
-            <DialogDescription className="mt-4">
-              Are you sure you want to remove the <strong>{passkeyName}</strong> passkey.
-            </DialogDescription>
-          </DialogHeader>
-
-          <fieldset disabled={isDeletingPasskey}>
-            <DialogFooter>
-              <DialogClose asChild>
-                <Button type="button" variant="secondary">
-                  Cancel
-                </Button>
-              </DialogClose>
-
-              <Button
-                onClick={async () =>
-                  deletePasskey({
-                    passkeyId,
-                  })
-                }
-                variant="destructive"
-                loading={isDeletingPasskey}
-              >
-                Delete
-              </Button>
-            </DialogFooter>
-          </fieldset>
-        </DialogContent>
-      </Dialog>
-    </div>
-  );
-};

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

@@ -1,120 +0,0 @@
-'use client';
-
-import { usePathname, useRouter, useSearchParams } from 'next/navigation';
-
-import { DateTime } from 'luxon';
-
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
-import { trpc } from '@documenso/trpc/react';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-import { TableCell } from '@documenso/ui/primitives/table';
-
-import { UserPasskeysDataTableActions } from './user-passkeys-data-table-actions';
-
-export const UserPasskeysDataTable = () => {
-  const pathname = usePathname();
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const updateSearchParams = useUpdateSearchParams();
-
-  const parsedSearchParams = ZBaseTableSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
-
-  const { data, isLoading, isInitialLoading, isLoadingError } = trpc.auth.findPasskeys.useQuery(
-    {
-      page: parsedSearchParams.page,
-      perPage: parsedSearchParams.perPage,
-    },
-    {
-      keepPreviousData: true,
-    },
-  );
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    updateSearchParams({
-      page,
-      perPage,
-    });
-  };
-
-  const results = data ?? {
-    data: [],
-    perPage: 10,
-    currentPage: 1,
-    totalPages: 1,
-  };
-
-  return (
-    <DataTable
-      columns={[
-        {
-          header: 'Name',
-          accessorKey: 'name',
-        },
-        {
-          header: 'Created',
-          accessorKey: 'createdAt',
-          cell: ({ row }) => DateTime.fromJSDate(row.original.createdAt).toRelative(),
-        },
-
-        {
-          header: 'Last used',
-          accessorKey: 'updatedAt',
-          cell: ({ row }) =>
-            row.original.lastUsedAt
-              ? DateTime.fromJSDate(row.original.lastUsedAt).toRelative()
-              : 'Never',
-        },
-        {
-          id: 'actions',
-          cell: ({ row }) => (
-            <UserPasskeysDataTableActions
-              className="justify-end"
-              passkeyId={row.original.id}
-              passkeyName={row.original.name}
-            />
-          ),
-        },
-      ]}
-      data={results.data}
-      perPage={results.perPage}
-      currentPage={results.currentPage}
-      totalPages={results.totalPages}
-      onPaginationChange={onPaginationChange}
-      hasFilters={parsedSearchParams.page !== undefined || parsedSearchParams.perPage !== undefined}
-      onClearFilters={() => router.push(pathname ?? '/')}
-      error={{
-        enable: isLoadingError,
-      }}
-      skeleton={{
-        enable: isLoading && isInitialLoading,
-        rows: 3,
-        component: (
-          <>
-            <TableCell>
-              <Skeleton className="h-4 w-20 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-12 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <Skeleton className="h-4 w-12 rounded-full" />
-            </TableCell>
-            <TableCell>
-              <div className="flex flex-row space-x-2">
-                <Skeleton className="h-8 w-16 rounded" />
-                <Skeleton className="h-8 w-16 rounded" />
-              </div>
-            </TableCell>
-          </>
-        ),
-      }}
-    >
-      {(table) => <DataTablePagination table={table} />}
-    </DataTable>
-  );
-};

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

@@ -1,14 +1,10 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import {
+import type { DocumentData, Field, Recipient, Template, User } from '@documenso/prisma/client';
-  DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-  SKIP_QUERY_BATCH_META,
-} from '@documenso/lib/constants/trpc';
-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';
@@ -23,135 +19,52 @@ import { AddTemplateFieldsFormPartial } from '@documenso/ui/primitives/template-
 import type { TAddTemplateFieldsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-fields.types';
 import { AddTemplatePlaceholderRecipientsFormPartial } from '@documenso/ui/primitives/template-flow/add-template-placeholder-recipients';
 import type { TAddTemplatePlacholderRecipientsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-placeholder-recipients.types';
-import { AddTemplateSettingsFormPartial } from '@documenso/ui/primitives/template-flow/add-template-settings';
-import type { TAddTemplateSettingsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-settings.types';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
-
 export type EditTemplateFormProps = {
   className?: string;
-  initialTemplate: TemplateWithDetails;
+  user: User;
-  isEnterprise: boolean;
+  template: Template;
+  recipients: Recipient[];
+  fields: Field[];
+  documentData: DocumentData;
   templateRootPath: string;
 };
 
-type EditTemplateStep = 'settings' | 'signers' | 'fields';
+type EditTemplateStep = 'signers' | 'fields';
-const EditTemplateSteps: EditTemplateStep[] = ['settings', 'signers', 'fields'];
+const EditTemplateSteps: EditTemplateStep[] = ['signers', 'fields'];
 
 export const EditTemplateForm = ({
-  initialTemplate,
   className,
-  isEnterprise,
+  template,
+  recipients,
+  fields,
+  user: _user,
+  documentData,
   templateRootPath,
 }: EditTemplateFormProps) => {
   const { toast } = useToast();
   const router = useRouter();
 
-  const team = useOptionalCurrentTeam();
+  const [step, setStep] = useState<EditTemplateStep>('signers');
-
-  const [step, setStep] = useState<EditTemplateStep>('settings');
-
-  const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
-
-  const utils = trpc.useUtils();
-
-  const { data: template, refetch: refetchTemplate } =
-    trpc.template.getTemplateWithDetailsById.useQuery(
-      {
-        id: initialTemplate.id,
-      },
-      {
-        initialData: initialTemplate,
-        ...SKIP_QUERY_BATCH_META,
-      },
-    );
-
-  const { Recipient: recipients, Field: fields, templateDocumentData } = template;
 
   const documentFlow: Record<EditTemplateStep, DocumentFlowStep> = {
-    settings: {
-      title: 'General',
-      description: 'Configure general settings for the template.',
-      stepIndex: 1,
-    },
     signers: {
       title: 'Add Placeholders',
       description: 'Add all relevant placeholders for each recipient.',
-      stepIndex: 2,
+      stepIndex: 1,
     },
     fields: {
       title: 'Add Fields',
       description: 'Add all relevant fields for each recipient.',
-      stepIndex: 3,
+      stepIndex: 2,
     },
   };
 
   const currentDocumentFlow = documentFlow[step];
 
-  const { mutateAsync: updateTemplateSettings } = trpc.template.updateTemplateSettings.useMutation({
+  const { mutateAsync: addTemplateFields } = trpc.field.addTemplateFields.useMutation();
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
+  const { mutateAsync: addTemplateSigners } = trpc.recipient.addTemplateSigners.useMutation();
-    onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
-        {
-          id: initialTemplate.id,
-        },
-        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
-      );
-    },
-  });
-
-  const { mutateAsync: addTemplateFields } = trpc.field.addTemplateFields.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
-        {
-          id: initialTemplate.id,
-        },
-        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
-      );
-    },
-  });
-
-  const { mutateAsync: addTemplateSigners } = trpc.recipient.addTemplateSigners.useMutation({
-    ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    onSuccess: (newData) => {
-      utils.template.getTemplateWithDetailsById.setData(
-        {
-          id: initialTemplate.id,
-        },
-        (oldData) => ({ ...(oldData || initialTemplate), ...newData }),
-      );
-    },
-  });
-
-  const onAddSettingsFormSubmit = async (data: TAddTemplateSettingsFormSchema) => {
-    try {
-      await updateTemplateSettings({
-        templateId: template.id,
-        teamId: team?.id,
-        data: {
-          title: data.title,
-          globalAccessAuth: data.globalAccessAuth ?? null,
-          globalActionAuth: data.globalActionAuth ?? null,
-        },
-        meta: data.meta,
-      });
-
-      // Router refresh is here to clear the router cache for when navigating to /documents.
-      router.refresh();
-
-      setStep('signers');
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: 'Error',
-        description: 'An error occurred while updating the document settings.',
-        variant: 'destructive',
-      });
-    }
-  };
 
   const onAddTemplatePlaceholderFormSubmit = async (
     data: TAddTemplatePlacholderRecipientsFormSchema,
@@ -159,11 +72,9 @@ export const EditTemplateForm = ({
     try {
       await addTemplateSigners({
         templateId: template.id,
-        teamId: team?.id,
         signers: data.signers,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
       router.refresh();
 
       setStep('fields');
@@ -189,9 +100,6 @@ export const EditTemplateForm = ({
         duration: 5000,
       });
 
-      // Router refresh is here to clear the router cache for when navigating to /documents.
-      router.refresh();
-
       router.push(templateRootPath);
     } catch (err) {
       toast({
@@ -202,15 +110,6 @@ export const EditTemplateForm = ({
     }
   };
 
-  /**
-   * Refresh the data in the background when steps change.
-   */
-  useEffect(() => {
-    void refetchTemplate();
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [step]);
-
   return (
     <div className={cn('grid w-full grid-cols-12 gap-8', className)}>
       <Card
@@ -218,11 +117,7 @@ export const EditTemplateForm = ({
         gradient
       >
         <CardContent className="p-2">
-          <LazyPDFViewer
+          <LazyPDFViewer key={documentData.id} documentData={documentData} />
-            key={templateDocumentData.id}
-            documentData={templateDocumentData}
-            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
-          />
         </CardContent>
       </Card>
 
@@ -240,26 +135,12 @@ export const EditTemplateForm = ({
             currentStep={currentDocumentFlow.stepIndex}
             setCurrentStep={(step) => setStep(EditTemplateSteps[step - 1])}
           >
-            <AddTemplateSettingsFormPartial
-              key={recipients.length}
-              template={template}
-              documentFlow={documentFlow.settings}
-              recipients={recipients}
-              fields={fields}
-              onSubmit={onAddSettingsFormSubmit}
-              isEnterprise={isEnterprise}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
-            />
-
             <AddTemplatePlaceholderRecipientsFormPartial
               key={recipients.length}
               documentFlow={documentFlow.signers}
               recipients={recipients}
               fields={fields}
-              templateDirectLink={template.directLink}
               onSubmit={onAddTemplatePlaceholderFormSubmit}
-              isEnterprise={isEnterprise}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
             <AddTemplateFieldsFormPartial

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

@@ -1,40 +0,0 @@
-'use client';
-
-import React, { useState } from 'react';
-
-import { LinkIcon } from 'lucide-react';
-
-import type { Recipient, Template, TemplateDirectLink } from '@documenso/prisma/client';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { TemplateDirectLinkDialog } from '../template-direct-link-dialog';
-
-export type TemplatePageViewProps = {
-  template: Template & { directLink?: TemplateDirectLink | null; Recipient: Recipient[] };
-};
-
-export const TemplateDirectLinkDialogWrapper = ({ template }: TemplatePageViewProps) => {
-  const [isTemplateDirectLinkOpen, setTemplateDirectLinkOpen] = useState(false);
-
-  return (
-    <div>
-      <Button
-        variant="outline"
-        className="px-3"
-        onClick={(e) => {
-          e.preventDefault();
-          setTemplateDirectLinkOpen(true);
-        }}
-      >
-        <LinkIcon className="mr-1.5 h-3.5 w-3.5" />
-        {template.directLink ? 'Manage' : 'Create'} Direct Link
-      </Button>
-
-      <TemplateDirectLinkDialog
-        template={template}
-        open={isTemplateDirectLinkOpen}
-        onOpenChange={setTemplateDirectLinkOpen}
-      />
-    </div>
-  );
-};

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

@@ -5,17 +5,16 @@ import { redirect } from 'next/navigation';
 
 import { ChevronLeft } from 'lucide-react';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getTemplateWithDetailsById } from '@documenso/lib/server-only/template/get-template-with-details-by-id';
+import { getFieldsForTemplate } from '@documenso/lib/server-only/field/get-fields-for-template';
+import { getRecipientsForTemplate } from '@documenso/lib/server-only/recipient/get-recipients-for-template';
+import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import type { Team } from '@documenso/prisma/client';
 
 import { TemplateType } from '~/components/formatter/template-type';
 
-import { TemplateDirectLinkBadge } from '../template-direct-link-badge';
 import { EditTemplateForm } from './edit-template';
-import { TemplateDirectLinkDialogWrapper } from './template-direct-link-dialog-wrapper';
 
 export type TemplatePageViewProps = {
   params: {
@@ -36,7 +35,7 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
 
   const { user } = await getRequiredServerComponentSession();
 
-  const template = await getTemplateWithDetailsById({
+  const template = await getTemplateById({
     id: templateId,
     userId: user.id,
   }).catch(() => null);
@@ -45,47 +44,42 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
     redirect(templateRootPath);
   }
 
-  const isTemplateEnterprise = await isUserEnterprise({
+  const { templateDocumentData } = template;
-    userId: user.id,
+
-    teamId: team?.id,
+  const [templateRecipients, templateFields] = await Promise.all([
-  });
+    getRecipientsForTemplate({
+      templateId,
+      userId: user.id,
+    }),
+    getFieldsForTemplate({
+      templateId,
+      userId: user.id,
+    }),
+  ]);
 
   return (
-    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
+    <div className="mx-auto max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col justify-between sm:flex-row">
+      <Link href="/templates" className="flex items-center text-[#7AC455] hover:opacity-80">
-        <div>
+        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-          <Link href="/templates" className="flex items-center text-[#7AC455] hover:opacity-80">
+        Templates
-            <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+      </Link>
-            Templates
-          </Link>
 
-          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
+      <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
-            {template.title}
+        {template.title}
-          </h1>
+      </h1>
 
-          <div className="mt-2.5 flex items-center">
+      <div className="mt-2.5 flex items-center gap-x-6">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
+        <TemplateType inheritColor type={template.type} className="text-muted-foreground" />
-
-            {template.directLink?.token && (
-              <TemplateDirectLinkBadge
-                className="ml-4"
-                token={template.directLink.token}
-                enabled={template.directLink.enabled}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="mt-2 sm:mt-0 sm:self-end">
-          <TemplateDirectLinkDialogWrapper template={template} />
-        </div>
       </div>
 
       <EditTemplateForm
-        className="mt-6"
+        className="mt-8"
-        initialTemplate={template}
+        template={template}
+        user={user}
+        recipients={templateRecipients}
+        fields={templateFields}
+        documentData={templateDocumentData}
         templateRootPath={templateRootPath}
-        isEnterprise={isTemplateEnterprise}
       />
     </div>
   );

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

@@ -4,10 +4,10 @@ import { useState } from 'react';
 
 import Link from 'next/link';
 
-import { Copy, Edit, MoreHorizontal, Share2Icon, Trash2 } from 'lucide-react';
+import { Copy, Edit, MoreHorizontal, Trash2 } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
-import { type FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
+import type { Template } from '@documenso/prisma/client';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -18,10 +18,9 @@ import {
 
 import { DeleteTemplateDialog } from './delete-template-dialog';
 import { DuplicateTemplateDialog } from './duplicate-template-dialog';
-import { TemplateDirectLinkDialog } from './template-direct-link-dialog';
 
 export type DataTableActionDropdownProps = {
-  row: FindTemplateRow;
+  row: Template;
   templateRootPath: string;
   teamId?: number;
 };
@@ -34,7 +33,6 @@ export const DataTableActionDropdown = ({
   const { data: session } = useSession();
 
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [isTemplateDirectLinkDialogOpen, setTemplateDirectLinkDialogOpen] = useState(false);
   const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
 
   if (!session) {
@@ -68,11 +66,6 @@ export const DataTableActionDropdown = ({
           Duplicate
         </DropdownMenuItem>
 
-        <DropdownMenuItem onClick={() => setTemplateDirectLinkDialogOpen(true)}>
-          <Share2Icon className="mr-2 h-4 w-4" />
-          Direct link
-        </DropdownMenuItem>
-
         <DropdownMenuItem
           disabled={!isOwner && !isTeamTemplate}
           onClick={() => setDeleteDialogOpen(true)}
@@ -89,12 +82,6 @@ export const DataTableActionDropdown = ({
         onOpenChange={setDuplicateDialogOpen}
       />
 
-      <TemplateDirectLinkDialog
-        template={row}
-        open={isTemplateDirectLinkDialogOpen}
-        onOpenChange={setTemplateDirectLinkDialogOpen}
-      />
-
       <DeleteTemplateDialog
         id={row.id}
         open={isDeleteDialogOpen}

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

@@ -4,26 +4,32 @@ import { useTransition } from 'react';
 
 import Link from 'next/link';
 
-import { AlertTriangle, Globe2Icon, InfoIcon, Link2Icon, Loader, LockIcon } from 'lucide-react';
+import { AlertTriangle, Loader } from 'lucide-react';
 
 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/lib/server-only/template/find-templates';
+import type { Recipient, Template } from '@documenso/prisma/client';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 
 import { LocaleDate } from '~/components/formatter/locale-date';
 import { TemplateType } from '~/components/formatter/template-type';
 
 import { DataTableActionDropdown } from './data-table-action-dropdown';
 import { DataTableTitle } from './data-table-title';
-import { TemplateDirectLinkBadge } from './template-direct-link-badge';
 import { UseTemplateDialog } from './use-template-dialog';
 
+type TemplateWithRecipient = Template & {
+  Recipient: Recipient[];
+};
+
 type TemplatesDataTableProps = {
-  templates: FindTemplateRow[];
+  templates: Array<
+    TemplateWithRecipient & {
+      team: { id: number; url: string } | null;
+    }
+  >;
   perPage: number;
   page: number;
   totalPages: number;
@@ -42,7 +48,6 @@ export const TemplatesDataTable = ({
   teamId,
 }: TemplatesDataTableProps) => {
   const [isPending, startTransition] = useTransition();
-
   const updateSearchParams = useUpdateSearchParams();
 
   const { remaining } = useLimits();
@@ -83,70 +88,9 @@ export const TemplatesDataTable = ({
             cell: ({ row }) => <DataTableTitle row={row.original} />,
           },
           {
-            header: () => (
+            header: 'Type',
-              <div className="flex flex-row items-center">
-                Type
-                <Tooltip>
-                  <TooltipTrigger>
-                    <InfoIcon className="mx-2 h-4 w-4" />
-                  </TooltipTrigger>
-
-                  <TooltipContent className="text-foreground max-w-md space-y-2 !p-0">
-                    <ul className="text-muted-foreground space-y-0.5 divide-y [&>li]:p-4">
-                      <li>
-                        <h2 className="mb-2 flex flex-row items-center font-semibold">
-                          <Globe2Icon className="mr-2 h-5 w-5 text-green-500 dark:text-green-300" />
-                          Public
-                        </h2>
-
-                        <p>
-                          Public templates are connected to your public profile. Any modifications
-                          to public templates will also appear in your public profile.
-                        </p>
-                      </li>
-                      <li>
-                        <div className="mb-2 flex w-fit flex-row items-center rounded border border-neutral-300 bg-neutral-200 px-1.5 py-0.5 text-xs dark:border-neutral-500 dark:bg-neutral-600">
-                          <Link2Icon className="mr-1 h-3 w-3" />
-                          direct link
-                        </div>
-
-                        <p>
-                          Direct link templates contain one dynamic recipient placeholder. Anyone
-                          with access to this link can sign the document, and it will then appear on
-                          your documents page.
-                        </p>
-                      </li>
-                      <li>
-                        <h2 className="mb-2 flex flex-row items-center font-semibold">
-                          <LockIcon className="mr-2 h-5 w-5 text-blue-600 dark:text-blue-300" />
-                          {teamId ? 'Team Only' : 'Private'}
-                        </h2>
-
-                        <p>
-                          {teamId
-                            ? 'Team only templates are not linked anywhere and are visible only to your team.'
-                            : 'Private templates can only be modified and viewed by you.'}
-                        </p>
-                      </li>
-                    </ul>
-                  </TooltipContent>
-                </Tooltip>
-              </div>
-            ),
             accessorKey: 'type',
-            cell: ({ row }) => (
+            cell: ({ row }) => <TemplateType type={row.original.type} />,
-              <div className="flex flex-row items-center">
-                <TemplateType type="PRIVATE" />
-
-                {row.original.directLink?.token && (
-                  <TemplateDirectLinkBadge
-                    className="ml-2"
-                    token={row.original.directLink.token}
-                    enabled={row.original.directLink.enabled}
-                  />
-                )}
-              </div>
-            ),
           },
           {
             header: 'Actions',

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

@@ -1,29 +1,48 @@
 'use client';
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { FilePlus, Loader } from 'lucide-react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { FilePlus, X } from 'lucide-react';
 import { useSession } from 'next-auth/react';
+import { useForm } from 'react-hook-form';
+import * as z from 'zod';
 
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
-import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
+import { base64 } from '@documenso/lib/universal/base64';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
 import {
   Dialog,
-  DialogClose,
   DialogContent,
-  DialogDescription,
-  DialogFooter,
   DialogHeader,
   DialogTitle,
   DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { Label } from '@documenso/ui/primitives/label';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+const ZCreateTemplateFormSchema = z.object({
+  name: z.string(),
+});
+
+type TCreateTemplateFormSchema = z.infer<typeof ZCreateTemplateFormSchema>;
+
 type NewTemplateDialogProps = {
   teamId?: number;
   templateRootPath: string;
@@ -35,20 +54,51 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
   const { data: session } = useSession();
   const { toast } = useToast();
 
-  const { mutateAsync: createTemplate } = trpc.template.createTemplate.useMutation();
+  const form = useForm<TCreateTemplateFormSchema>({
+    defaultValues: {
+      name: '',
+    },
+    resolver: zodResolver(ZCreateTemplateFormSchema),
+  });
+
+  const { mutateAsync: createTemplate, isLoading: isCreatingTemplate } =
+    trpc.template.createTemplate.useMutation();
 
   const [showNewTemplateDialog, setShowNewTemplateDialog] = useState(false);
-  const [isUploadingFile, setIsUploadingFile] = useState(false);
+  const [uploadedFile, setUploadedFile] = useState<{ file: File; fileBase64: string } | null>();
 
   const onFileDrop = async (file: File) => {
-    if (isUploadingFile) {
+    try {
+      const arrayBuffer = await file.arrayBuffer();
+      const base64String = base64.encode(new Uint8Array(arrayBuffer));
+
+      setUploadedFile({
+        file,
+        fileBase64: `data:application/pdf;base64,${base64String}`,
+      });
+
+      if (!form.getValues('name')) {
+        form.setValue('name', file.name);
+      }
+    } catch {
+      toast({
+        title: 'Something went wrong',
+        description: 'Please try again later.',
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const onSubmit = async (values: TCreateTemplateFormSchema) => {
+    if (!uploadedFile) {
       return;
     }
 
-    setIsUploadingFile(true);
+    const file: File = uploadedFile.file;
 
     try {
-      const { type, data } = await putPdfFile(file);
+      const { type, data } = await putFile(file);
+
       const { id: templateDocumentDataId } = await createDocumentData({
         type,
         data,
@@ -56,7 +106,7 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
 
       const { id } = await createTemplate({
         teamId,
-        title: file.name,
+        title: values.name ? values.name : file.name,
         templateDocumentDataId,
       });
 
@@ -76,16 +126,25 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
         description: 'Please try again later.',
         variant: 'destructive',
       });
-
-      setIsUploadingFile(false);
     }
   };
 
+  const resetForm = () => {
+    if (form.getValues('name') === uploadedFile?.file.name) {
+      form.reset();
+    }
+
+    setUploadedFile(null);
+  };
+
+  useEffect(() => {
+    if (!showNewTemplateDialog) {
+      form.reset();
+    }
+  }, [form, showNewTemplateDialog]);
+
   return (
-    <Dialog
+    <Dialog open={showNewTemplateDialog} onOpenChange={setShowNewTemplateDialog}>
-      open={showNewTemplateDialog}
-      onOpenChange={(value) => !isUploadingFile && setShowNewTemplateDialog(value)}
-    >
       <DialogTrigger asChild>
         <Button className="cursor-pointer" disabled={!session?.user.emailVerified}>
           <FilePlus className="-ml-1 mr-2 h-4 w-4" />
@@ -95,29 +154,81 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
 
       <DialogContent className="w-full max-w-xl">
         <DialogHeader>
-          <DialogTitle>New Template</DialogTitle>
+          <DialogTitle className="mb-4">New Template</DialogTitle>
-          <DialogDescription>
-            Templates allow you to quickly generate documents with pre-filled recipients and fields.
-          </DialogDescription>
         </DialogHeader>
 
-        <div className="relative">
+        <div>
-          <DocumentDropzone className="h-[40vh]" onDrop={onFileDrop} type="template" />
+          <Form {...form}>
+            <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-y-4">
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Name your template</FormLabel>
+                    <FormControl>
+                      <Input id="email" type="text" className="bg-background mt-1.5" {...field} />
+                    </FormControl>
+                    <FormDescription>
+                      <span className="text-muted-foreground text-xs">
+                        Leave this empty if you would like to use your document's name for the
+                        template
+                      </span>
+                    </FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
 
-          {isUploadingFile && (
+              <div>
-            <div className="bg-background/50 absolute inset-0 flex items-center justify-center rounded-lg">
+                <Label htmlFor="template">Upload a Document</Label>
-              <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
+
-            </div>
+                <div className="my-3">
-          )}
+                  {uploadedFile ? (
+                    <Card gradient className="h-[40vh]">
+                      <CardContent className="flex h-full flex-col items-center justify-center p-2">
+                        <button
+                          onClick={() => resetForm()}
+                          title="Remove Template"
+                          className="text-muted-foreground absolute right-2.5 top-2.5 rounded-sm opacity-60 transition-opacity hover:opacity-100 focus:outline-none disabled:pointer-events-none"
+                        >
+                          <X className="h-6 w-6" />
+                          <span className="sr-only">Remove Template</span>
+                        </button>
+
+                        <div className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm">
+                          <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+                          <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-5/6 rounded-[2px]" />
+                          <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+                        </div>
+
+                        <p className="group-hover:text-foreground text-muted-foreground mt-4 font-medium">
+                          Uploaded Document
+                        </p>
+
+                        <span className="text-muted-foreground/80 mt-1 text-sm">
+                          {uploadedFile.file.name}
+                        </span>
+                      </CardContent>
+                    </Card>
+                  ) : (
+                    <DocumentDropzone
+                      className="mt-1.5 h-[40vh]"
+                      onDrop={onFileDrop}
+                      type="template"
+                    />
+                  )}
+                </div>
+              </div>
+
+              <div className="flex w-full justify-end">
+                <Button loading={isCreatingTemplate} type="submit">
+                  Create Template
+                </Button>
+              </div>
+            </form>
+          </Form>
         </div>
-
-        <DialogFooter>
-          <DialogClose asChild>
-            <Button type="button" variant="secondary" disabled={isUploadingFile}>
-              Close
-            </Button>
-          </DialogClose>
-        </DialogFooter>
       </DialogContent>
     </Dialog>
   );

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

@@ -1,45 +0,0 @@
-'use client';
-
-import { Link2Icon } from 'lucide-react';
-
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
-import { cn } from '@documenso/ui/lib/utils';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type TemplateDirectLinkBadgeProps = {
-  token: string;
-  enabled: boolean;
-  className?: string;
-};
-
-export const TemplateDirectLinkBadge = ({
-  token,
-  enabled,
-  className,
-}: TemplateDirectLinkBadgeProps) => {
-  const [, copy] = useCopyToClipboard();
-  const { toast } = useToast();
-
-  const onCopyClick = async (token: string) =>
-    copy(formatDirectTemplatePath(token)).then(() => {
-      toast({
-        title: 'Copied to clipboard',
-        description: 'The direct link has been copied to your clipboard',
-      });
-    });
-
-  return (
-    <button
-      title="Copy direct link"
-      className={cn(
-        'flex flex-row items-center rounded border border-neutral-300 bg-neutral-200 px-1.5 py-0.5 text-xs dark:border-neutral-500 dark:bg-neutral-600',
-        className,
-      )}
-      onClick={async () => onCopyClick(token)}
-    >
-      <Link2Icon className="mr-1 h-3 w-3" />
-      direct link {!enabled && 'disabled'}
-    </button>
-  );
-};

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

@@ -1,448 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-
-import { CircleDotIcon, CircleIcon, ClipboardCopyIcon, InfoIcon, LoaderIcon } from 'lucide-react';
-import { P, match } from 'ts-pattern';
-
-import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import {
-  DIRECT_TEMPLATE_DOCUMENTATION,
-  DIRECT_TEMPLATE_RECIPIENT_EMAIL,
-} from '@documenso/lib/constants/template';
-import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
-import {
-  type Recipient,
-  RecipientRole,
-  type Template,
-  type TemplateDirectLink,
-} from '@documenso/prisma/client';
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
-import { Switch } from '@documenso/ui/primitives/switch';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@documenso/ui/primitives/table';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type TemplateDirectLinkDialogProps = {
-  template: Template & {
-    directLink?: Pick<TemplateDirectLink, 'token' | 'enabled'> | null;
-    Recipient: Recipient[];
-  };
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-type TemplateDirectLinkStep = 'ONBOARD' | 'SELECT_RECIPIENT' | 'MANAGE' | 'CONFIRM_DELETE';
-
-export const TemplateDirectLinkDialog = ({
-  template,
-  open,
-  onOpenChange,
-}: TemplateDirectLinkDialogProps) => {
-  const { toast } = useToast();
-  const { quota, remaining } = useLimits();
-
-  const [, copy] = useCopyToClipboard();
-  const router = useRouter();
-
-  const [isEnabled, setIsEnabled] = useState(template.directLink?.enabled ?? false);
-  const [token, setToken] = useState(template.directLink?.token ?? null);
-  const [selectedRecipientId, setSelectedRecipientId] = useState<number | null>(null);
-  const [currentStep, setCurrentStep] = useState<TemplateDirectLinkStep>(
-    token ? 'MANAGE' : 'ONBOARD',
-  );
-
-  const validDirectTemplateRecipients = useMemo(
-    () => template.Recipient.filter((recipient) => recipient.role !== RecipientRole.CC),
-    [template.Recipient],
-  );
-
-  const {
-    mutateAsync: createTemplateDirectLink,
-    isLoading: isCreatingTemplateDirectLink,
-    reset: resetCreateTemplateDirectLink,
-  } = trpcReact.template.createTemplateDirectLink.useMutation({
-    onSuccess: (data) => {
-      setToken(data.token);
-      setIsEnabled(data.enabled);
-      setCurrentStep('MANAGE');
-
-      router.refresh();
-    },
-    onError: () => {
-      setSelectedRecipientId(null);
-
-      toast({
-        title: 'Something went wrong',
-        description: 'Unable to create direct template access. Please try again later.',
-        variant: 'destructive',
-      });
-    },
-  });
-
-  const { mutateAsync: toggleTemplateDirectLink, isLoading: isTogglingTemplateAccess } =
-    trpcReact.template.toggleTemplateDirectLink.useMutation({
-      onSuccess: (data) => {
-        toast({
-          title: 'Success',
-          description: `Direct link signing has been ${data.enabled ? 'enabled' : 'disabled'}`,
-        });
-      },
-      onError: (_ctx, data) => {
-        toast({
-          title: 'Something went wrong',
-          description: `An error occurred while ${
-            data.enabled ? 'enabling' : 'disabling'
-          } direct link signing.`,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  const { mutateAsync: deleteTemplateDirectLink, isLoading: isDeletingTemplateDirectLink } =
-    trpcReact.template.deleteTemplateDirectLink.useMutation({
-      onSuccess: () => {
-        onOpenChange(false);
-        setToken(null);
-
-        toast({
-          title: 'Success',
-          description: 'Direct template link deleted',
-          duration: 5000,
-        });
-
-        router.refresh();
-        setToken(null);
-      },
-      onError: () => {
-        toast({
-          title: 'Something went wrong',
-          description:
-            'We encountered an error while removing the direct template link. Please try again later.',
-          variant: 'destructive',
-        });
-      },
-    });
-
-  const onCopyClick = async (token: string) =>
-    copy(formatDirectTemplatePath(token)).then(() => {
-      toast({
-        title: 'Copied to clipboard',
-        description: 'The direct link has been copied to your clipboard',
-      });
-    });
-
-  const onRecipientTableRowClick = async (recipientId: number) => {
-    if (isLoading) {
-      return;
-    }
-
-    setSelectedRecipientId(recipientId);
-
-    await createTemplateDirectLink({
-      templateId: template.id,
-      directRecipientId: recipientId,
-    });
-  };
-
-  const isLoading =
-    isCreatingTemplateDirectLink || isTogglingTemplateAccess || isDeletingTemplateDirectLink;
-
-  useEffect(() => {
-    resetCreateTemplateDirectLink();
-    setCurrentStep(token ? 'MANAGE' : 'ONBOARD');
-    setSelectedRecipientId(null);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open]);
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
-      <fieldset disabled={isLoading} className="relative">
-        <AnimateGenericFadeInOut motionKey={currentStep}>
-          {match({ token, currentStep })
-            .with({ token: P.nullish, currentStep: 'ONBOARD' }, () => (
-              <DialogContent>
-                <DialogHeader>
-                  <DialogTitle>Create Direct Signing Link</DialogTitle>
-
-                  <DialogDescription>Here's how it works:</DialogDescription>
-                </DialogHeader>
-
-                <ul className="mt-4 space-y-4 pl-12">
-                  {DIRECT_TEMPLATE_DOCUMENTATION.map((step, index) => (
-                    <li className="relative" key={index}>
-                      <div className="absolute -left-12">
-                        <div className="flex h-8 w-8 items-center justify-center rounded-full border-[3px] border-neutral-200 text-sm font-bold">
-                          {index + 1}
-                        </div>
-                      </div>
-
-                      <h3 className="font-semibold">{step.title}</h3>
-                      <p className="text-muted-foreground mt-1 text-sm">{step.description}</p>
-                    </li>
-                  ))}
-                </ul>
-
-                {remaining.directTemplates === 0 && (
-                  <Alert variant="warning">
-                    <AlertTitle>
-                      Direct template link usage exceeded ({quota.directTemplates}/
-                      {quota.directTemplates})
-                    </AlertTitle>
-                    <AlertDescription>
-                      You have reached the maximum limit of {quota.directTemplates} direct
-                      templates.{' '}
-                      <Link
-                        className="mt-1 block underline underline-offset-4"
-                        href="/settings/billing"
-                      >
-                        Upgrade your account to continue!
-                      </Link>
-                    </AlertDescription>
-                  </Alert>
-                )}
-
-                {remaining.directTemplates !== 0 && (
-                  <DialogFooter className="mx-auto mt-4">
-                    <Button type="button" onClick={() => setCurrentStep('SELECT_RECIPIENT')}>
-                      Enable direct link signing
-                    </Button>
-                  </DialogFooter>
-                )}
-              </DialogContent>
-            ))
-            .with({ token: P.nullish, currentStep: 'SELECT_RECIPIENT' }, () => (
-              <DialogContent className="relative">
-                {isCreatingTemplateDirectLink && validDirectTemplateRecipients.length !== 0 && (
-                  <div className="absolute inset-0 z-50 flex items-center justify-center rounded bg-white/50 dark:bg-black/50">
-                    <LoaderIcon className="h-6 w-6 animate-spin text-gray-500" />
-                  </div>
-                )}
-
-                <DialogHeader>
-                  <DialogTitle>Choose Direct Link Recipient</DialogTitle>
-
-                  <DialogDescription>
-                    Choose an existing recipient from below to continue
-                  </DialogDescription>
-                </DialogHeader>
-
-                <div className="custom-scrollbar max-h-[60vh] overflow-y-auto rounded-md border">
-                  <Table>
-                    <TableHeader>
-                      <TableRow>
-                        <TableHead>Recipient</TableHead>
-                        <TableHead>Role</TableHead>
-                        <TableHead></TableHead>
-                      </TableRow>
-                    </TableHeader>
-                    <TableBody>
-                      {validDirectTemplateRecipients.length === 0 && (
-                        <TableRow>
-                          <TableCell colSpan={3} className="h-16 text-center">
-                            <p className="text-muted-foreground">No valid recipients found</p>
-                          </TableCell>
-                        </TableRow>
-                      )}
-
-                      {validDirectTemplateRecipients.map((row) => (
-                        <TableRow
-                          className="cursor-pointer"
-                          key={row.id}
-                          onClick={async () => onRecipientTableRowClick(row.id)}
-                        >
-                          <TableCell>
-                            <div className="text-muted-foreground text-sm">
-                              <p>{row.name}</p>
-                              <p className="text-muted-foreground/70 text-xs">{row.email}</p>
-                            </div>
-                          </TableCell>
-
-                          <TableCell className="text-muted-foreground text-sm">
-                            {RECIPIENT_ROLES_DESCRIPTION[row.role].roleName}
-                          </TableCell>
-
-                          <TableCell>
-                            {selectedRecipientId === row.id ? (
-                              <CircleDotIcon className="h-5 w-5 text-neutral-300" />
-                            ) : (
-                              <CircleIcon className="h-5 w-5 text-neutral-300" />
-                            )}
-                          </TableCell>
-                        </TableRow>
-                      ))}
-                    </TableBody>
-                  </Table>
-                </div>
-
-                {/* Prevent creating placeholder direct template recipient if the email already exists. */}
-                {!template.Recipient.some(
-                  (recipient) => recipient.email === DIRECT_TEMPLATE_RECIPIENT_EMAIL,
-                ) && (
-                  <DialogFooter className="mx-auto">
-                    <div className="flex flex-col items-center justify-center">
-                      {validDirectTemplateRecipients.length !== 0 && (
-                        <p className="text-muted-foreground text-sm">Or</p>
-                      )}
-
-                      <Button
-                        type="button"
-                        className="mt-2"
-                        loading={isCreatingTemplateDirectLink && !selectedRecipientId}
-                        onClick={async () =>
-                          createTemplateDirectLink({
-                            templateId: template.id,
-                          })
-                        }
-                      >
-                        Create one automatically
-                      </Button>
-                    </div>
-                  </DialogFooter>
-                )}
-              </DialogContent>
-            ))
-            .with({ token: P.string, currentStep: 'MANAGE' }, ({ token }) => (
-              <DialogContent className="relative">
-                <DialogHeader>
-                  <DialogTitle>Direct Link Signing</DialogTitle>
-
-                  <DialogDescription>
-                    Manage the direct link signing for this template
-                  </DialogDescription>
-                </DialogHeader>
-
-                <div>
-                  <div className="flex flex-row items-center justify-between">
-                    <Label className="flex flex-row">
-                      Enable Direct Link Signing
-                      <Tooltip>
-                        <TooltipTrigger tabIndex={-1} className="ml-2">
-                          <InfoIcon className="h-4 w-4" />
-                        </TooltipTrigger>
-                        <TooltipContent className="text-foreground z-9999 max-w-md p-4">
-                          Disabling direct link signing will prevent anyone from accessing the link.
-                        </TooltipContent>
-                      </Tooltip>
-                    </Label>
-
-                    <Switch
-                      className="mt-2"
-                      checked={isEnabled}
-                      onCheckedChange={(value) => setIsEnabled(value)}
-                    />
-                  </div>
-
-                  <div className="mt-2">
-                    <Label htmlFor="copy-direct-link">Copy Shareable Link</Label>
-
-                    <div className="relative mt-1">
-                      <Input
-                        id="copy-direct-link"
-                        disabled
-                        value={formatDirectTemplatePath(token).replace(/https?:\/\//, '')}
-                        readOnly
-                        className="pr-12"
-                      />
-
-                      <div className="absolute bottom-0 right-1 top-0 flex items-center justify-center">
-                        <Button
-                          variant="none"
-                          type="button"
-                          className="h-8 w-8"
-                          onClick={() => void onCopyClick(token)}
-                        >
-                          <ClipboardCopyIcon className="h-4 w-4 flex-shrink-0" />
-                        </Button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <DialogFooter className='mt-4'>
-                  <Button
-                    type="button"
-                    variant="destructive"
-                    className="mr-auto w-full sm:w-auto"
-                    loading={isDeletingTemplateDirectLink}
-                    onClick={() => setCurrentStep('CONFIRM_DELETE')}
-                  >
-                    Remove
-                  </Button>
-
-                  <Button
-                    type="button"
-                    loading={isTogglingTemplateAccess}
-                    onClick={async () =>
-                      toggleTemplateDirectLink({
-                        templateId: template.id,
-                        enabled: isEnabled,
-                      })
-                    }
-                  >
-                    Save
-                  </Button>
-                </DialogFooter>
-              </DialogContent>
-            ))
-            .with({ token: P.string, currentStep: 'CONFIRM_DELETE' }, () => (
-              <DialogContent className="relative">
-                <DialogHeader>
-                  <DialogTitle>Are you sure?</DialogTitle>
-
-                  <DialogDescription>
-                    Please note that proceeding will remove direct linking recipient and turn it
-                    into a placeholder.
-                  </DialogDescription>
-                </DialogHeader>
-
-                <DialogFooter>
-                  <Button
-                    type="button"
-                    variant="secondary"
-                    onClick={() => setCurrentStep('MANAGE')}
-                  >
-                    Cancel
-                  </Button>
-
-                  <Button
-                    type="button"
-                    variant="destructive"
-                    loading={isDeletingTemplateDirectLink}
-                    onClick={() => void deleteTemplateDirectLink({ templateId: template.id })}
-                  >
-                    Confirm
-                  </Button>
-                </DialogFooter>
-              </DialogContent>
-            ))
-            .otherwise(() => null)}
-        </AnimateGenericFadeInOut>
-      </fieldset>
-    </Dialog>
-  );
-};

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

@@ -1,21 +1,14 @@
-import { useEffect, useState } from 'react';
-
 import { useRouter } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { InfoIcon, Plus } from 'lucide-react';
+import { Plus } from 'lucide-react';
-import { useFieldArray, useForm } from 'react-hook-form';
+import { Controller, useFieldArray, useForm } from 'react-hook-form';
 import * as z from 'zod';
 
-import {
-  TEMPLATE_RECIPIENT_EMAIL_PLACEHOLDER_REGEX,
-  TEMPLATE_RECIPIENT_NAME_PLACEHOLDER_REGEX,
-} from '@documenso/lib/constants/template';
-import { AppError } from '@documenso/lib/errors/app-error';
 import type { Recipient } from '@documenso/prisma/client';
+import { RecipientRole } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import {
   Dialog,
   DialogClose,
@@ -26,59 +19,24 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@documenso/ui/primitives/dialog';
-import {
+import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
+import { Label } from '@documenso/ui/primitives/label';
-import type { Toast } from '@documenso/ui/primitives/use-toast';
+import { ROLE_ICONS } from '@documenso/ui/primitives/recipient-role-icons';
+import { Select, SelectContent, SelectItem, SelectTrigger } from '@documenso/ui/primitives/select';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useOptionalCurrentTeam } from '~/providers/team';
 
-const ZAddRecipientsForNewDocumentSchema = z
+const ZAddRecipientsForNewDocumentSchema = z.object({
-  .object({
+  recipients: z.array(
-    sendDocument: z.boolean(),
+    z.object({
-    recipients: z.array(
+      email: z.string().email(),
-      z.object({
+      name: z.string(),
-        id: z.number(),
+      role: z.nativeEnum(RecipientRole),
-        email: z.string().email(),
+    }),
-        name: z.string(),
+  ),
-      }),
+});
-    ),
-  })
-  // Display exactly which rows are duplicates.
-  .superRefine((items, ctx) => {
-    const uniqueEmails = new Map<string, number>();
-
-    for (const [index, recipients] of items.recipients.entries()) {
-      const email = recipients.email.toLowerCase();
-
-      const firstFoundIndex = uniqueEmails.get(email);
-
-      if (firstFoundIndex === undefined) {
-        uniqueEmails.set(email, index);
-        continue;
-      }
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['recipients', index, 'email'],
-      });
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['recipients', firstFoundIndex, 'email'],
-      });
-    }
-  });
 
 type TAddRecipientsForNewDocumentSchema = z.infer<typeof ZAddRecipientsForNewDocumentSchema>;
 
@@ -96,33 +54,35 @@ export function UseTemplateDialog({
   const router = useRouter();
   const { toast } = useToast();
 
-  const [open, setOpen] = useState(false);
-
   const team = useOptionalCurrentTeam();
 
-  const form = useForm<TAddRecipientsForNewDocumentSchema>({
+  const {
+    control,
+    handleSubmit,
+    formState: { errors, isSubmitting },
+  } = useForm<TAddRecipientsForNewDocumentSchema>({
     resolver: zodResolver(ZAddRecipientsForNewDocumentSchema),
     defaultValues: {
-      sendDocument: false,
+      recipients:
-      recipients: recipients.map((recipient) => {
+        recipients.length > 0
-        const isRecipientEmailPlaceholder = recipient.email.match(
+          ? recipients.map((recipient) => ({
-          TEMPLATE_RECIPIENT_EMAIL_PLACEHOLDER_REGEX,
+              nativeId: recipient.id,
-        );
+              formId: String(recipient.id),
-
+              name: recipient.name,
-        const isRecipientNamePlaceholder = recipient.name.match(
+              email: recipient.email,
-          TEMPLATE_RECIPIENT_NAME_PLACEHOLDER_REGEX,
+              role: recipient.role,
-        );
+            }))
-
+          : [
-        return {
+              {
-          id: recipient.id,
+                name: '',
-          name: !isRecipientNamePlaceholder ? recipient.name : '',
+                email: '',
-          email: !isRecipientEmailPlaceholder ? recipient.email : '',
+                role: RecipientRole.SIGNER,
-        };
+              },
-      }),
+            ],
     },
   });
 
-  const { mutateAsync: createDocumentFromTemplate } =
+  const { mutateAsync: createDocumentFromTemplate, isLoading: isCreatingDocumentFromTemplate } =
     trpc.template.createDocumentFromTemplate.useMutation();
 
   const onSubmit = async (data: TAddRecipientsForNewDocumentSchema) => {
@@ -131,7 +91,6 @@ export function UseTemplateDialog({
         templateId,
         teamId: team?.id,
         recipients: data.recipients,
-        sendDocument: data.sendDocument,
       });
 
       toast({
@@ -142,147 +101,146 @@ export function UseTemplateDialog({
 
       router.push(`${documentRootPath}/${id}`);
     } catch (err) {
-      const error = AppError.parseError(err);
+      toast({
-
-      const toastPayload: Toast = {
         title: 'Error',
         description: 'An error occurred while creating document from template.',
         variant: 'destructive',
-      };
+      });
-
-      if (error.code === 'DOCUMENT_SEND_FAILED') {
-        toastPayload.description = 'The document was created but could not be sent to recipients.';
-      }
-
-      toast(toastPayload);
     }
   };
 
+  const onCreateDocumentFromTemplate = handleSubmit(onSubmit);
+
   const { fields: formRecipients } = useFieldArray({
-    control: form.control,
+    control,
     name: 'recipients',
   });
 
-  useEffect(() => {
-    if (!open) {
-      form.reset();
-    }
-  }, [open, form]);
-
   return (
-    <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
+    <Dialog>
       <DialogTrigger asChild>
-        <Button variant="outline" className="bg-background">
+        <Button className="cursor-pointer">
           <Plus className="-ml-1 mr-2 h-4 w-4" />
           Use Template
         </Button>
       </DialogTrigger>
       <DialogContent className="sm:max-w-lg">
         <DialogHeader>
-          <DialogTitle>Create document from template</DialogTitle>
+          <DialogTitle>Document Recipients</DialogTitle>
-          <DialogDescription>
+          <DialogDescription>Add the recipients to create the template with.</DialogDescription>
-            {recipients.length === 0
-              ? 'A draft document will be created'
-              : 'Add the recipients to create the document with'}
-          </DialogDescription>
         </DialogHeader>
+        <div className="flex flex-col space-y-4">
+          {formRecipients.map((recipient, index) => (
+            <div
+              key={recipient.id}
+              data-native-id={recipient.id}
+              className="flex flex-wrap items-end gap-x-4"
+            >
+              <div className="flex-1">
+                <Label htmlFor={`recipient-${recipient.id}-email`}>
+                  Email
+                  <span className="text-destructive ml-1 inline-block font-medium">*</span>
+                </Label>
 
-        <Form {...form}>
+                <Controller
-          <form onSubmit={form.handleSubmit(onSubmit)}>
+                  control={control}
-            <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
+                  name={`recipients.${index}.email`}
-              <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
+                  render={({ field }) => (
-                {formRecipients.map((recipient, index) => (
+                    <Input
-                  <div className="flex w-full flex-row space-x-4" key={recipient.id}>
+                      id={`recipient-${recipient.id}-email`}
-                    <FormField
+                      type="email"
-                      control={form.control}
+                      className="bg-background mt-2"
-                      name={`recipients.${index}.email`}
+                      disabled={isSubmitting}
-                      render={({ field }) => (
+                      {...field}
-                        <FormItem className="w-full">
-                          {index === 0 && <FormLabel required>Email</FormLabel>}
-
-                          <FormControl>
-                            <Input {...field} placeholder={recipients[index].email || 'Email'} />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
                     />
-
+                  )}
-                    <FormField
+                />
-                      control={form.control}
-                      name={`recipients.${index}.name`}
-                      render={({ field }) => (
-                        <FormItem className="w-full">
-                          {index === 0 && <FormLabel>Name</FormLabel>}
-
-                          <FormControl>
-                            <Input {...field} placeholder={recipients[index].name || 'Name'} />
-                          </FormControl>
-                          <FormMessage />
-                        </FormItem>
-                      )}
-                    />
-                  </div>
-                ))}
               </div>
 
-              {recipients.length > 0 && (
+              <div className="flex-1">
-                <div className="mt-4 flex flex-row items-center">
+                <Label htmlFor={`recipient-${recipient.id}-name`}>Name</Label>
-                  <FormField
-                    control={form.control}
-                    name="sendDocument"
-                    render={({ field }) => (
-                      <FormItem>
-                        <div className="flex flex-row items-center">
-                          <Checkbox
-                            id="sendDocument"
-                            className="h-5 w-5"
-                            checkClassName="dark:text-white text-primary"
-                            checked={field.value}
-                            onCheckedChange={field.onChange}
-                          />
 
-                          <label
+                <Controller
-                            className="text-muted-foreground ml-2 flex items-center text-sm"
+                  control={control}
-                            htmlFor="sendDocument"
+                  name={`recipients.${index}.name`}
-                          >
+                  render={({ field }) => (
-                            Send document
+                    <Input
-                            <Tooltip>
+                      id={`recipient-${recipient.id}-name`}
-                              <TooltipTrigger type="button">
+                      type="text"
-                                <InfoIcon className="mx-1 h-4 w-4" />
+                      className="bg-background mt-2"
-                              </TooltipTrigger>
+                      disabled={isSubmitting}
+                      {...field}
+                    />
+                  )}
+                />
+              </div>
 
-                              <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
+              <div className="w-[60px]">
-                                <p>
+                <Controller
-                                  The document will be immediately sent to recipients if this is
+                  control={control}
-                                  checked.
+                  name={`recipients.${index}.role`}
-                                </p>
+                  render={({ field: { value, onChange } }) => (
+                    <Select value={value} onValueChange={(x) => onChange(x)}>
+                      <SelectTrigger className="bg-background">{ROLE_ICONS[value]}</SelectTrigger>
 
-                                <p>Otherwise, the document will be created as a draft.</p>
+                      <SelectContent className="" align="end">
-                              </TooltipContent>
+                        <SelectItem value={RecipientRole.SIGNER}>
-                            </Tooltip>
+                          <div className="flex items-center">
-                          </label>
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.SIGNER]}</span>
-                        </div>
+                            Signer
-                      </FormItem>
+                          </div>
-                    )}
+                        </SelectItem>
-                  />
-                </div>
-              )}
 
-              <DialogFooter>
+                        <SelectItem value={RecipientRole.CC}>
-                <DialogClose asChild>
+                          <div className="flex items-center">
-                  <Button type="button" variant="secondary">
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.CC]}</span>
-                    Close
+                            Receives copy
-                  </Button>
+                          </div>
-                </DialogClose>
+                        </SelectItem>
 
-                <Button type="submit" loading={form.formState.isSubmitting}>
+                        <SelectItem value={RecipientRole.APPROVER}>
-                  {form.getValues('sendDocument') ? 'Create and send' : 'Create as draft'}
+                          <div className="flex items-center">
-                </Button>
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.APPROVER]}</span>
-              </DialogFooter>
+                            Approver
-            </fieldset>
+                          </div>
-          </form>
+                        </SelectItem>
-        </Form>
+
+                        <SelectItem value={RecipientRole.VIEWER}>
+                          <div className="flex items-center">
+                            <span className="mr-2">{ROLE_ICONS[RecipientRole.VIEWER]}</span>
+                            Viewer
+                          </div>
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                  )}
+                />
+              </div>
+
+              <div className="w-full">
+                <FormErrorMessage className="mt-2" error={errors.recipients?.[index]?.email} />
+                <FormErrorMessage className="mt-2" error={errors.recipients?.[index]?.name} />
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <DialogFooter className="justify-end">
+          <DialogClose asChild>
+            <Button type="button" variant="secondary">
+              Close
+            </Button>
+          </DialogClose>
+
+          <Button
+            type="button"
+            loading={isCreatingDocumentFromTemplate}
+            disabled={isCreatingDocumentFromTemplate}
+            onClick={onCreateDocumentFromTemplate}
+          >
+            Create Document
+          </Button>
+        </DialogFooter>
       </DialogContent>
     </Dialog>
   );

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

@@ -1,89 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import type { DateTimeFormatOptions } from 'luxon';
-import { UAParser } from 'ua-parser-js';
-
-import type { TDocumentAuditLog } from '@documenso/lib/types/document-audit-logs';
-import { formatDocumentAuditLogAction } from '@documenso/lib/utils/document-audit-logs';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@documenso/ui/primitives/table';
-
-import { LocaleDate } from '~/components/formatter/locale-date';
-
-export type AuditLogDataTableProps = {
-  logs: TDocumentAuditLog[];
-};
-
-const dateFormat: DateTimeFormatOptions = {
-  ...DateTime.DATETIME_SHORT,
-  hourCycle: 'h12',
-};
-
-export const AuditLogDataTable = ({ logs }: AuditLogDataTableProps) => {
-  const parser = new UAParser();
-
-  const uppercaseFistLetter = (text: string) => {
-    return text.charAt(0).toUpperCase() + text.slice(1);
-  };
-
-  return (
-    <Table overflowHidden>
-      <TableHeader>
-        <TableRow>
-          <TableHead>Time</TableHead>
-          <TableHead>User</TableHead>
-          <TableHead>Action</TableHead>
-          <TableHead>IP Address</TableHead>
-          <TableHead>Browser</TableHead>
-        </TableRow>
-      </TableHeader>
-
-      <TableBody className="print:text-xs">
-        {logs.map((log, i) => (
-          <TableRow className="break-inside-avoid" key={i}>
-            <TableCell>
-              <LocaleDate format={dateFormat} date={log.createdAt} />
-            </TableCell>
-
-            <TableCell>
-              {log.name || log.email ? (
-                <div>
-                  {log.name && (
-                    <p className="break-all" title={log.name}>
-                      {log.name}
-                    </p>
-                  )}
-
-                  {log.email && (
-                    <p className="text-muted-foreground break-all" title={log.email}>
-                      {log.email}
-                    </p>
-                  )}
-                </div>
-              ) : (
-                <p>N/A</p>
-              )}
-            </TableCell>
-
-            <TableCell>
-              {uppercaseFistLetter(formatDocumentAuditLogAction(log).description)}
-            </TableCell>
-
-            <TableCell>{log.ipAddress}</TableCell>
-
-            <TableCell>
-              {log.userAgent ? parser.setUA(log.userAgent).getBrowser().name : 'N/A'}
-            </TableCell>
-          </TableRow>
-        ))}
-      </TableBody>
-    </Table>
-  );
-};

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

@@ -1,139 +0,0 @@
-import React from 'react';
-
-import { redirect } from 'next/navigation';
-
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';
-import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
-import { findDocumentAuditLogs } from '@documenso/lib/server-only/document/find-document-audit-logs';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-
-import { Logo } from '~/components/branding/logo';
-import { LocaleDate } from '~/components/formatter/locale-date';
-
-import { AuditLogDataTable } from './data-table';
-
-type AuditLogProps = {
-  searchParams: {
-    d: string;
-  };
-};
-
-export default async function AuditLog({ searchParams }: AuditLogProps) {
-  const { d } = searchParams;
-
-  if (typeof d !== 'string' || !d) {
-    return redirect('/');
-  }
-
-  const rawDocumentId = decryptSecondaryData(d);
-
-  if (!rawDocumentId || isNaN(Number(rawDocumentId))) {
-    return redirect('/');
-  }
-
-  const documentId = Number(rawDocumentId);
-
-  const document = await getEntireDocument({
-    id: documentId,
-  }).catch(() => null);
-
-  if (!document) {
-    return redirect('/');
-  }
-
-  const { data: auditLogs } = await findDocumentAuditLogs({
-    documentId: documentId,
-    userId: document.userId,
-    perPage: 100_000,
-  });
-
-  return (
-    <div className="print-provider pointer-events-none mx-auto max-w-screen-md">
-      <div className="flex items-center">
-        <h1 className="my-8 text-2xl font-bold">Version History</h1>
-      </div>
-
-      <Card>
-        <CardContent className="grid grid-cols-2 gap-4 p-6 text-sm print:text-xs">
-          <p>
-            <span className="font-medium">Document ID</span>
-
-            <span className="mt-1 block break-words">{document.id}</span>
-          </p>
-
-          <p>
-            <span className="font-medium">Enclosed Document</span>
-
-            <span className="mt-1 block break-words">{document.title}</span>
-          </p>
-
-          <p>
-            <span className="font-medium">Status</span>
-
-            <span className="mt-1 block">{document.deletedAt ? 'DELETED' : document.status}</span>
-          </p>
-
-          <p>
-            <span className="font-medium">Owner</span>
-
-            <span className="mt-1 block break-words">
-              {document.User.name} ({document.User.email})
-            </span>
-          </p>
-
-          <p>
-            <span className="font-medium">Created At</span>
-
-            <span className="mt-1 block">
-              <LocaleDate date={document.createdAt} format="yyyy-mm-dd hh:mm:ss a (ZZZZ)" />
-            </span>
-          </p>
-
-          <p>
-            <span className="font-medium">Last Updated</span>
-
-            <span className="mt-1 block">
-              <LocaleDate date={document.updatedAt} format="yyyy-mm-dd hh:mm:ss a (ZZZZ)" />
-            </span>
-          </p>
-
-          <p>
-            <span className="font-medium">Time Zone</span>
-
-            <span className="mt-1 block break-words">
-              {document.documentMeta?.timezone ?? 'N/A'}
-            </span>
-          </p>
-
-          <div>
-            <p className="font-medium">Recipients</p>
-
-            <ul className="mt-1 list-inside list-disc">
-              {document.Recipient.map((recipient) => (
-                <li key={recipient.id}>
-                  <span className="text-muted-foreground">
-                    [{RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName}]
-                  </span>{' '}
-                  {recipient.name} ({recipient.email})
-                </li>
-              ))}
-            </ul>
-          </div>
-        </CardContent>
-      </Card>
-
-      <Card className="mt-8">
-        <CardContent className="p-0">
-          <AuditLogDataTable logs={auditLogs} />
-        </CardContent>
-      </Card>
-
-      <div className="my-8 flex-row-reverse">
-        <div className="flex items-end justify-end gap-x-4">
-          <Logo className="max-h-6 print:max-h-4" />
-        </div>
-      </div>
-    </div>
-  );
-}

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

@@ -1,299 +0,0 @@
-import React from 'react';
-
-import { redirect } from 'next/navigation';
-
-import { match } from 'ts-pattern';
-import { UAParser } from 'ua-parser-js';
-
-import {
-  RECIPIENT_ROLES_DESCRIPTION,
-  RECIPIENT_ROLE_SIGNING_REASONS,
-} from '@documenso/lib/constants/recipient-roles';
-import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';
-import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
-import { getDocumentCertificateAuditLogs } from '@documenso/lib/server-only/document/get-document-certificate-audit-logs';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { FieldType } from '@documenso/prisma/client';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@documenso/ui/primitives/table';
-
-import { Logo } from '~/components/branding/logo';
-import { LocaleDate } from '~/components/formatter/locale-date';
-
-type SigningCertificateProps = {
-  searchParams: {
-    d: string;
-  };
-};
-
-const FRIENDLY_SIGNING_REASONS = {
-  ['__OWNER__']: 'I am the owner of this document',
-  ...RECIPIENT_ROLE_SIGNING_REASONS,
-};
-
-export default async function SigningCertificate({ searchParams }: SigningCertificateProps) {
-  const { d } = searchParams;
-
-  if (typeof d !== 'string' || !d) {
-    return redirect('/');
-  }
-
-  const rawDocumentId = decryptSecondaryData(d);
-
-  if (!rawDocumentId || isNaN(Number(rawDocumentId))) {
-    return redirect('/');
-  }
-
-  const documentId = Number(rawDocumentId);
-
-  const document = await getEntireDocument({
-    id: documentId,
-  }).catch(() => null);
-
-  if (!document) {
-    return redirect('/');
-  }
-
-  const auditLogs = await getDocumentCertificateAuditLogs({
-    id: documentId,
-  });
-
-  const isOwner = (email: string) => {
-    return email.toLowerCase() === document.User.email.toLowerCase();
-  };
-
-  const getDevice = (userAgent?: string | null) => {
-    if (!userAgent) {
-      return 'Unknown';
-    }
-
-    const parser = new UAParser(userAgent);
-
-    parser.setUA(userAgent);
-
-    const result = parser.getResult();
-
-    return `${result.os.name} - ${result.browser.name} ${result.browser.version}`;
-  };
-
-  const getAuthenticationLevel = (recipientId: number) => {
-    const recipient = document.Recipient.find((recipient) => recipient.id === recipientId);
-
-    if (!recipient) {
-      return 'Unknown';
-    }
-
-    const extractedAuthMethods = extractDocumentAuthMethods({
-      documentAuth: document.authOptions,
-      recipientAuth: recipient.authOptions,
-    });
-
-    let authLevel = match(extractedAuthMethods.derivedRecipientActionAuth)
-      .with('ACCOUNT', () => 'Account Re-Authentication')
-      .with('TWO_FACTOR_AUTH', () => 'Two-Factor Re-Authentication')
-      .with('PASSKEY', () => 'Passkey Re-Authentication')
-      .with('EXPLICIT_NONE', () => 'Email')
-      .with(null, () => null)
-      .exhaustive();
-
-    if (!authLevel) {
-      authLevel = match(extractedAuthMethods.derivedRecipientAccessAuth)
-        .with('ACCOUNT', () => 'Account Authentication')
-        .with(null, () => 'Email')
-        .exhaustive();
-    }
-
-    return authLevel;
-  };
-
-  const getRecipientAuditLogs = (recipientId: number) => {
-    return {
-      [DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT]: auditLogs[DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT].filter(
-        (log) =>
-          log.type === DOCUMENT_AUDIT_LOG_TYPE.EMAIL_SENT && log.data.recipientId === recipientId,
-      ),
-      [DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED]: auditLogs[
-        DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED
-      ].filter(
-        (log) =>
-          log.type === DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED &&
-          log.data.recipientId === recipientId,
-      ),
-      [DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED]: auditLogs[
-        DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED
-      ].filter(
-        (log) =>
-          log.type === DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED &&
-          log.data.recipientId === recipientId,
-      ),
-    };
-  };
-
-  const getRecipientSignatureField = (recipientId: number) => {
-    return document.Recipient.find((recipient) => recipient.id === recipientId)?.Field.find(
-      (field) => field.type === FieldType.SIGNATURE || field.type === FieldType.FREE_SIGNATURE,
-    );
-  };
-
-  return (
-    <div className="print-provider pointer-events-none mx-auto max-w-screen-md">
-      <div className="flex items-center">
-        <h1 className="my-8 text-2xl font-bold">Signing Certificate</h1>
-      </div>
-
-      <Card>
-        <CardContent className="p-0">
-          <Table overflowHidden>
-            <TableHeader>
-              <TableRow>
-                <TableHead>Signer Events</TableHead>
-                <TableHead>Signature</TableHead>
-                <TableHead>Details</TableHead>
-                {/* <TableHead>Security</TableHead> */}
-              </TableRow>
-            </TableHeader>
-
-            <TableBody className="print:text-xs">
-              {document.Recipient.map((recipient, i) => {
-                const logs = getRecipientAuditLogs(recipient.id);
-                const signature = getRecipientSignatureField(recipient.id);
-
-                return (
-                  <TableRow key={i} className="print:break-inside-avoid">
-                    <TableCell truncate={false} className="w-[min-content] max-w-[220px] align-top">
-                      <div className="hyphens-auto break-words font-medium">{recipient.name}</div>
-                      <div className="break-all">{recipient.email}</div>
-                      <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                        {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName}
-                      </p>
-
-                      <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                        <span className="font-medium">Authentication Level:</span>{' '}
-                        <span className="block">{getAuthenticationLevel(recipient.id)}</span>
-                      </p>
-                    </TableCell>
-
-                    <TableCell truncate={false} className="w-[min-content] align-top">
-                      {signature ? (
-                        <>
-                          <div
-                            className="inline-block rounded-lg p-1"
-                            style={{
-                              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)`,
-                            }}
-                          >
-                            <img
-                              src={`${signature.Signature?.signatureImageAsBase64}`}
-                              alt="Signature"
-                              className="max-h-12 max-w-full"
-                            />
-                          </div>
-
-                          <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                            <span className="font-medium">Signature ID:</span>{' '}
-                            <span className="block font-mono uppercase">
-                              {signature.secondaryId}
-                            </span>
-                          </p>
-
-                          <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                            <span className="font-medium">IP Address:</span>{' '}
-                            <span className="inline-block">
-                              {logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.ipAddress ?? 'Unknown'}
-                            </span>
-                          </p>
-
-                          <p className="text-muted-foreground mt-1 text-sm print:text-xs">
-                            <span className="font-medium">Device:</span>{' '}
-                            <span className="inline-block">
-                              {getDevice(logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.userAgent)}
-                            </span>
-                          </p>
-                        </>
-                      ) : (
-                        <p className="text-muted-foreground">N/A</p>
-                      )}
-                    </TableCell>
-
-                    <TableCell truncate={false} className="w-[min-content] align-top">
-                      <div className="space-y-1">
-                        <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">Sent:</span>{' '}
-                          <span className="inline-block">
-                            {logs.EMAIL_SENT[0] ? (
-                              <LocaleDate
-                                date={logs.EMAIL_SENT[0].createdAt}
-                                format="yyyy-MM-dd hh:mm:ss a (ZZZZ)"
-                              />
-                            ) : (
-                              'Unknown'
-                            )}
-                          </span>
-                        </p>
-
-                        <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">Viewed:</span>{' '}
-                          <span className="inline-block">
-                            {logs.DOCUMENT_OPENED[0] ? (
-                              <LocaleDate
-                                date={logs.DOCUMENT_OPENED[0].createdAt}
-                                format="yyyy-MM-dd hh:mm:ss a (ZZZZ)"
-                              />
-                            ) : (
-                              'Unknown'
-                            )}
-                          </span>
-                        </p>
-
-                        <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">Signed:</span>{' '}
-                          <span className="inline-block">
-                            {logs.DOCUMENT_RECIPIENT_COMPLETED[0] ? (
-                              <LocaleDate
-                                date={logs.DOCUMENT_RECIPIENT_COMPLETED[0].createdAt}
-                                format="yyyy-MM-dd hh:mm:ss a (ZZZZ)"
-                              />
-                            ) : (
-                              'Unknown'
-                            )}
-                          </span>
-                        </p>
-
-                        <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">Reason:</span>{' '}
-                          <span className="inline-block">
-                            {isOwner(recipient.email)
-                              ? FRIENDLY_SIGNING_REASONS['__OWNER__']
-                              : FRIENDLY_SIGNING_REASONS[recipient.role]}
-                          </span>
-                        </p>
-                      </div>
-                    </TableCell>
-                  </TableRow>
-                );
-              })}
-            </TableBody>
-          </Table>
-        </CardContent>
-      </Card>
-
-      <div className="my-8 flex-row-reverse">
-        <div className="flex items-end justify-end gap-x-4">
-          <p className="flex-shrink-0 text-sm font-medium print:text-xs">
-            Signing certificate provided by:
-          </p>
-
-          <Logo className="max-h-6 print:max-h-4" />
-        </div>
-      </div>
-    </div>
-  );
-}

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

@@ -1,158 +0,0 @@
-'use client';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useSession } from 'next-auth/react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import type { Field, Recipient } from '@documenso/prisma/client';
-import type { TemplateWithDetails } from '@documenso/prisma/types/template';
-import {
-  DocumentFlowFormContainerActions,
-  DocumentFlowFormContainerContent,
-  DocumentFlowFormContainerFooter,
-  DocumentFlowFormContainerHeader,
-  DocumentFlowFormContainerStep,
-} from '@documenso/ui/primitives/document-flow/document-flow-root';
-import { ShowFieldItem } from '@documenso/ui/primitives/document-flow/show-field-item';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useStep } from '@documenso/ui/primitives/stepper';
-
-import { useRequiredDocumentAuthContext } from '~/app/(signing)/sign/[token]/document-auth-provider';
-
-const ZConfigureDirectTemplateFormSchema = z.object({
-  email: z.string().email('Email is invalid'),
-});
-
-export type TConfigureDirectTemplateFormSchema = z.infer<typeof ZConfigureDirectTemplateFormSchema>;
-
-export type ConfigureDirectTemplateFormProps = {
-  flowStep: DocumentFlowStep;
-  isDocumentPdfLoaded: boolean;
-  template: TemplateWithDetails;
-  directTemplateRecipient: Recipient & { Field: Field[] };
-  initialEmail?: string;
-  onSubmit: (_data: TConfigureDirectTemplateFormSchema) => void;
-};
-
-export const ConfigureDirectTemplateFormPartial = ({
-  flowStep,
-  isDocumentPdfLoaded,
-  template,
-  directTemplateRecipient,
-  initialEmail,
-  onSubmit,
-}: ConfigureDirectTemplateFormProps) => {
-  const { Recipient } = template;
-  const { derivedRecipientAccessAuth } = useRequiredDocumentAuthContext();
-  const { data: session } = useSession();
-
-  const recipientsWithBlankDirectRecipientEmail = Recipient.map((recipient) => {
-    if (recipient.id === directTemplateRecipient.id) {
-      return {
-        ...recipient,
-        email: '',
-      };
-    }
-
-    return recipient;
-  });
-
-  const form = useForm<TConfigureDirectTemplateFormSchema>({
-    resolver: zodResolver(
-      ZConfigureDirectTemplateFormSchema.superRefine((items, ctx) => {
-        if (template.Recipient.map((recipient) => recipient.email).includes(items.email)) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: 'Email cannot already exist in the template',
-            path: ['email'],
-          });
-        }
-      }),
-    ),
-    defaultValues: {
-      email: initialEmail || '',
-    },
-  });
-
-  const { stepIndex, currentStep, totalSteps, previousStep } = useStep();
-
-  return (
-    <>
-      <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
-
-      <DocumentFlowFormContainerContent>
-        {isDocumentPdfLoaded &&
-          directTemplateRecipient.Field.map((field, index) => (
-            <ShowFieldItem
-              key={index}
-              field={field}
-              recipients={recipientsWithBlankDirectRecipientEmail}
-            />
-          ))}
-
-        <Form {...form}>
-          <fieldset
-            className="flex h-full flex-col space-y-6"
-            disabled={form.formState.isSubmitting}
-          >
-            <FormField
-              control={form.control}
-              name="email"
-              render={({ field, fieldState }) => (
-                <FormItem>
-                  <FormLabel required>Email</FormLabel>
-
-                  <FormControl>
-                    <Input
-                      {...field}
-                      disabled={
-                        field.disabled ||
-                        derivedRecipientAccessAuth !== null ||
-                        session?.user.email !== undefined
-                      }
-                      placeholder="recipient@documenso.com"
-                    />
-                  </FormControl>
-
-                  {!fieldState.error && (
-                    <p className="text-muted-foreground text-xs">
-                      Enter your email address to receive the completed document.
-                    </p>
-                  )}
-
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </fieldset>
-        </Form>
-      </DocumentFlowFormContainerContent>
-
-      <DocumentFlowFormContainerFooter>
-        <DocumentFlowFormContainerStep
-          title={flowStep.title}
-          step={currentStep}
-          maxStep={totalSteps}
-        />
-
-        <DocumentFlowFormContainerActions
-          loading={form.formState.isSubmitting}
-          disabled={form.formState.isSubmitting}
-          canGoBack={stepIndex !== 0}
-          onGoBackClick={previousStep}
-          onGoNextClick={form.handleSubmit(onSubmit)}
-        />
-      </DocumentFlowFormContainerFooter>
-    </>
-  );
-};

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

@@ -1,159 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { useRouter } from 'next/navigation';
-
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-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';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
-import { Stepper } from '@documenso/ui/primitives/stepper';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { useRequiredDocumentAuthContext } from '~/app/(signing)/sign/[token]/document-auth-provider';
-import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
-
-import type { TConfigureDirectTemplateFormSchema } from './configure-direct-template';
-import { ConfigureDirectTemplateFormPartial } from './configure-direct-template';
-import type { DirectTemplateLocalField } from './sign-direct-template';
-import { SignDirectTemplateForm } from './sign-direct-template';
-
-export type TemplatesDirectPageViewProps = {
-  template: TemplateWithDetails;
-  directTemplateToken: string;
-  directTemplateRecipient: Recipient & { Field: Field[] };
-};
-
-type DirectTemplateStep = 'configure' | 'sign';
-const DirectTemplateSteps: DirectTemplateStep[] = ['configure', 'sign'];
-
-export const DirectTemplatePageView = ({
-  template,
-  directTemplateRecipient,
-  directTemplateToken,
-}: TemplatesDirectPageViewProps) => {
-  const router = useRouter();
-
-  const { toast } = useToast();
-
-  const { email, setEmail } = useRequiredSigningContext();
-  const { recipient, setRecipient } = useRequiredDocumentAuthContext();
-
-  const [step, setStep] = useState<DirectTemplateStep>('configure');
-  const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
-
-  const recipientRoleDescription = RECIPIENT_ROLES_DESCRIPTION[directTemplateRecipient.role];
-
-  const directTemplateFlow: Record<DirectTemplateStep, DocumentFlowStep> = {
-    configure: {
-      title: 'General',
-      description: 'Preview and configure template.',
-      stepIndex: 1,
-    },
-    sign: {
-      title: `${recipientRoleDescription.actionVerb} document`,
-      description: `${recipientRoleDescription.actionVerb} the document to complete the process.`,
-      stepIndex: 2,
-    },
-  };
-
-  const { mutateAsync: createDocumentFromDirectTemplate } =
-    trpc.template.createDocumentFromDirectTemplate.useMutation();
-
-  /**
-   * Set the email into a temporary recipient so it can be used for reauth and signing email fields.
-   */
-  const onConfigureDirectTemplateSubmit = ({ email }: TConfigureDirectTemplateFormSchema) => {
-    setEmail(email);
-
-    setRecipient({
-      ...recipient,
-      email,
-    });
-
-    setStep('sign');
-  };
-
-  const onSignDirectTemplateSubmit = async (fields: DirectTemplateLocalField[]) => {
-    try {
-      const token = await createDocumentFromDirectTemplate({
-        directTemplateToken,
-        directRecipientEmail: recipient.email,
-        templateUpdatedAt: template.updatedAt,
-        signedFieldValues: fields.map((field) => {
-          if (!field.signedValue) {
-            throw new Error('Invalid configuration');
-          }
-
-          return field.signedValue;
-        }),
-      });
-
-      const redirectUrl = template.templateMeta?.redirectUrl;
-
-      redirectUrl ? router.push(redirectUrl) : router.push(`/sign/${token}/complete`);
-    } catch (err) {
-      toast({
-        title: 'Something went wrong',
-        description: 'We were unable to submit this document at this time. Please try again later.',
-        variant: 'destructive',
-      });
-
-      throw err;
-    }
-  };
-
-  const currentDocumentFlow = directTemplateFlow[step];
-
-  return (
-    <div className="grid w-full grid-cols-12 gap-8">
-      <Card
-        className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
-        gradient
-      >
-        <CardContent className="p-2">
-          <LazyPDFViewer
-            key={template.id}
-            documentData={template.templateDocumentData}
-            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
-          />
-        </CardContent>
-      </Card>
-
-      <div className="col-span-12 lg:col-span-6 xl:col-span-5">
-        <DocumentFlowFormContainer
-          className="lg:h-[calc(100vh-6rem)]"
-          onSubmit={(e) => e.preventDefault()}
-        >
-          <Stepper
-            currentStep={currentDocumentFlow.stepIndex}
-            setCurrentStep={(step) => setStep(DirectTemplateSteps[step - 1])}
-          >
-            <ConfigureDirectTemplateFormPartial
-              flowStep={directTemplateFlow.configure}
-              template={template}
-              directTemplateRecipient={directTemplateRecipient}
-              isDocumentPdfLoaded={isDocumentPdfLoaded}
-              onSubmit={onConfigureDirectTemplateSubmit}
-              initialEmail={email}
-            />
-
-            <SignDirectTemplateForm
-              flowStep={directTemplateFlow.sign}
-              directRecipient={recipient}
-              directRecipientFields={directTemplateRecipient.Field}
-              template={template}
-              onSubmit={onSignDirectTemplateSubmit}
-            />
-          </Stepper>
-        </DocumentFlowFormContainer>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/(recipient)/d/[token]/not-found.tsx

@@ -1,33 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-
-import { ChevronLeft } from 'lucide-react';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export default function NotFound() {
-  return (
-    <div className="mx-auto flex min-h-[80vh] w-full items-center justify-center py-32">
-      <div>
-        <p className="text-muted-foreground font-semibold">404 Template not found</p>
-
-        <h1 className="mt-3 text-2xl font-bold md:text-3xl">Oops! Something went wrong.</h1>
-
-        <p className="text-muted-foreground mt-4 text-sm">
-          The template you are looking for may have been disabled, deleted or may have never
-          existed.
-        </p>
-
-        <div className="mt-6 flex gap-x-2.5 gap-y-4 md:items-center">
-          <Button asChild className="w-32">
-            <Link href="/">
-              <ChevronLeft className="mr-2 h-4 w-4" />
-              Go Back
-            </Link>
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}

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

@@ -1,92 +0,0 @@
-import { notFound, redirect } from 'next/navigation';
-
-import { UsersIcon } from 'lucide-react';
-import { match } from 'ts-pattern';
-
-import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
-import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
-import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-
-import { DocumentAuthProvider } from '~/app/(signing)/sign/[token]/document-auth-provider';
-import { SigningProvider } from '~/app/(signing)/sign/[token]/provider';
-import { truncateTitle } from '~/helpers/truncate-title';
-
-import { DirectTemplatePageView } from './direct-template';
-import { DirectTemplateAuthPageView } from './signing-auth-page';
-
-export type TemplatesDirectPageProps = {
-  params: {
-    token: string;
-  };
-};
-
-export default async function TemplatesDirectPage({ params }: TemplatesDirectPageProps) {
-  const { token } = params;
-
-  if (!token) {
-    redirect('/');
-  }
-
-  const { user } = await getServerComponentSession();
-
-  const template = await getTemplateByDirectLinkToken({
-    token,
-  }).catch(() => null);
-
-  if (!template || !template.directLink?.enabled) {
-    notFound();
-  }
-
-  const directTemplateRecipient = template.Recipient.find(
-    (recipient) => recipient.id === template.directLink?.directTemplateRecipientId,
-  );
-
-  if (!directTemplateRecipient) {
-    notFound();
-  }
-
-  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
-    documentAuth: template.authOptions,
-  });
-
-  // Ensure typesafety when we add more options.
-  const isAccessAuthValid = match(derivedRecipientAccessAuth)
-    .with(DocumentAccessAuth.ACCOUNT, () => user !== null)
-    .with(null, () => true)
-    .exhaustive();
-
-  if (!isAccessAuthValid) {
-    return <DirectTemplateAuthPageView />;
-  }
-
-  return (
-    <SigningProvider email={user?.email} fullName={user?.name} signature={user?.signature}>
-      <DocumentAuthProvider
-        documentAuthOptions={template.authOptions}
-        recipient={directTemplateRecipient}
-        user={user}
-      >
-        <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
-            {truncateTitle(template.title)}
-          </h1>
-
-          <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">
-              {template.Recipient.length}{' '}
-              {template.Recipient.length > 1 ? 'recipients' : 'recipient'}
-            </p>
-          </div>
-
-          <DirectTemplatePageView
-            directTemplateRecipient={directTemplateRecipient}
-            directTemplateToken={template.directLink.token}
-            template={template}
-          />
-        </div>
-      </DocumentAuthProvider>
-    </SigningProvider>
-  );
-}

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

@@ -1,278 +0,0 @@
-import { useMemo, useState } from 'react';
-
-import { DateTime } from 'luxon';
-import { match } from 'ts-pattern';
-
-import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
-import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
-import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
-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,
-} from '@documenso/trpc/server/field-router/schema';
-import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import {
-  DocumentFlowFormContainerContent,
-  DocumentFlowFormContainerFooter,
-  DocumentFlowFormContainerHeader,
-  DocumentFlowFormContainerStep,
-} from '@documenso/ui/primitives/document-flow/document-flow-root';
-import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { ElementVisible } from '@documenso/ui/primitives/element-visible';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
-import { useStep } from '@documenso/ui/primitives/stepper';
-
-import { DateField } from '~/app/(signing)/sign/[token]/date-field';
-import { EmailField } from '~/app/(signing)/sign/[token]/email-field';
-import { NameField } from '~/app/(signing)/sign/[token]/name-field';
-import { useRequiredSigningContext } from '~/app/(signing)/sign/[token]/provider';
-import { SignDialog } from '~/app/(signing)/sign/[token]/sign-dialog';
-import { SignatureField } from '~/app/(signing)/sign/[token]/signature-field';
-import { TextField } from '~/app/(signing)/sign/[token]/text-field';
-
-export type SignDirectTemplateFormProps = {
-  flowStep: DocumentFlowStep;
-  directRecipient: Recipient;
-  directRecipientFields: Field[];
-  template: TemplateWithDetails;
-  onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
-};
-
-export type DirectTemplateLocalField = Field & {
-  signedValue?: TSignFieldWithTokenMutationSchema;
-  Signature?: Signature;
-};
-
-export const SignDirectTemplateForm = ({
-  flowStep,
-  directRecipient,
-  directRecipientFields,
-  template,
-  onSubmit,
-}: SignDirectTemplateFormProps) => {
-  const { fullName, signature, setFullName, setSignature } = useRequiredSigningContext();
-
-  const [localFields, setLocalFields] = useState<DirectTemplateLocalField[]>(directRecipientFields);
-  const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const { currentStep, totalSteps, previousStep } = useStep();
-
-  const onSignField = (value: TSignFieldWithTokenMutationSchema) => {
-    setLocalFields(
-      localFields.map((field) => {
-        if (field.id !== value.fieldId) {
-          return field;
-        }
-
-        const tempField: DirectTemplateLocalField = {
-          ...field,
-          customText: value.value,
-          inserted: true,
-          signedValue: value,
-        };
-
-        if (field.type === FieldType.SIGNATURE) {
-          tempField.Signature = {
-            id: 1,
-            created: new Date(),
-            recipientId: 1,
-            fieldId: 1,
-            signatureImageAsBase64: value.value,
-            typedSignature: null,
-          };
-        }
-
-        if (field.type === FieldType.DATE) {
-          tempField.customText = DateTime.now()
-            .setZone(template.templateMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE)
-            .toFormat(template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT);
-        }
-        return tempField;
-      }),
-    );
-  };
-
-  const onUnsignField = (value: TRemovedSignedFieldWithTokenMutationSchema) => {
-    setLocalFields(
-      localFields.map((field) => {
-        if (field.id !== value.fieldId) {
-          return field;
-        }
-
-        return {
-          ...field,
-          customText: '',
-          inserted: false,
-          signedValue: undefined,
-          Signature: undefined,
-        };
-      }),
-    );
-  };
-
-  const uninsertedFields = useMemo(() => {
-    return sortFieldsByPosition(localFields.filter((field) => !field.inserted));
-  }, [localFields]);
-
-  const fieldsValidated = () => {
-    setValidateUninsertedFields(true);
-    validateFieldsInserted(localFields);
-  };
-
-  const handleSubmit = async () => {
-    setValidateUninsertedFields(true);
-
-    const isFieldsValid = validateFieldsInserted(localFields);
-
-    if (!isFieldsValid) {
-      return;
-    }
-
-    setIsSubmitting(true);
-
-    try {
-      await onSubmit(localFields);
-    } catch {
-      setIsSubmitting(false);
-    }
-
-    // Do not reset to false since we do a redirect.
-  };
-
-  return (
-    <>
-      <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
-
-      <DocumentFlowFormContainerContent>
-        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
-          {validateUninsertedFields && uninsertedFields[0] && (
-            <FieldToolTip key={uninsertedFields[0].id} field={uninsertedFields[0]} color="warning">
-              Click to insert field
-            </FieldToolTip>
-          )}
-
-          {localFields.map((field) =>
-            match(field.type)
-              .with(FieldType.SIGNATURE, () => (
-                <SignatureField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.NAME, () => (
-                <NameField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.DATE, () => (
-                <DateField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  dateFormat={template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
-                  timezone={template.templateMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.EMAIL, () => (
-                <EmailField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .with(FieldType.TEXT, () => (
-                <TextField
-                  key={field.id}
-                  field={field}
-                  recipient={directRecipient}
-                  onSignField={onSignField}
-                  onUnsignField={onUnsignField}
-                />
-              ))
-              .otherwise(() => null),
-          )}
-        </ElementVisible>
-
-        <div className="-mx-2 flex flex-1 flex-col gap-4 overflow-y-auto px-2">
-          <div className="flex flex-1 flex-col gap-y-4">
-            <div>
-              <Label htmlFor="full-name">Full Name</Label>
-
-              <Input
-                id="full-name"
-                value={fullName}
-                onChange={(e) => setFullName(e.target.value.trimStart())}
-              />
-            </div>
-
-            <div>
-              <Label htmlFor="Signature">Signature</Label>
-
-              <Card className="mt-2" gradient degrees={-120}>
-                <CardContent className="p-0">
-                  <SignaturePad
-                    className="h-44 w-full"
-                    disabled={isSubmitting}
-                    defaultValue={signature ?? undefined}
-                    onChange={(value) => {
-                      setSignature(value);
-                    }}
-                  />
-                </CardContent>
-              </Card>
-            </div>
-          </div>
-        </div>
-      </DocumentFlowFormContainerContent>
-
-      <DocumentFlowFormContainerFooter>
-        <DocumentFlowFormContainerStep
-          title={flowStep.title}
-          step={currentStep}
-          maxStep={totalSteps}
-        />
-
-        <div className="mt-4 flex gap-x-4">
-          <Button
-            className="dark:bg-muted dark:hover:bg-muted/80 w-full bg-black/5 hover:bg-black/10"
-            size="lg"
-            variant="secondary"
-            disabled={isSubmitting}
-            onClick={previousStep}
-          >
-            Back
-          </Button>
-
-          <SignDialog
-            isSubmitting={isSubmitting}
-            onSignatureComplete={handleSubmit}
-            documentTitle={template.title}
-            fields={localFields}
-            fieldsValidated={fieldsValidated}
-            role={directRecipient.role}
-          />
-        </div>
-      </DocumentFlowFormContainerFooter>
-    </>
-  );
-};

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

@@ -1,54 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { signOut } from 'next-auth/react';
-
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export const DirectTemplateAuthPageView = () => {
-  const { toast } = useToast();
-
-  const [isSigningOut, setIsSigningOut] = useState(false);
-
-  const handleChangeAccount = async () => {
-    try {
-      setIsSigningOut(true);
-
-      await signOut({
-        callbackUrl: '/signin',
-      });
-    } catch {
-      toast({
-        title: 'Something went wrong',
-        description: 'We were unable to log you out at this time.',
-        duration: 10000,
-        variant: 'destructive',
-      });
-    }
-
-    setIsSigningOut(false);
-  };
-
-  return (
-    <div className="mx-auto flex h-[70vh] w-full max-w-md flex-col items-center justify-center">
-      <div>
-        <h1 className="text-3xl font-semibold">Authentication required</h1>
-
-        <p className="text-muted-foreground mt-2 text-sm">
-          You need to be logged in to view this page.
-        </p>
-
-        <Button
-          className="mt-4 w-full"
-          type="submit"
-          onClick={async () => handleChangeAccount()}
-          loading={isSigningOut}
-        >
-          Login
-        </Button>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/(recipient)/layout.tsx

@@ -1,38 +0,0 @@
-import React from 'react';
-
-import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
-import { getTeams } from '@documenso/lib/server-only/team/get-teams';
-
-import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header';
-import { NextAuthProvider } from '~/providers/next-auth';
-
-type RecipientLayoutProps = {
-  children: React.ReactNode;
-};
-
-/**
- * A layout to handle scenarios where the user is a recipient of a given resource
- * where we do not care whether they are authenticated or not.
- *
- * Such as direct template access, or signing.
- */
-export default async function RecipientLayout({ children }: RecipientLayoutProps) {
-  const { user, session } = await getServerComponentSession();
-
-  let teams: GetTeamsResponse = [];
-
-  if (user && session) {
-    teams = await getTeams({ userId: user.id });
-  }
-
-  return (
-    <NextAuthProvider session={session}>
-      <div className="min-h-screen">
-        {user && <AuthenticatedHeader user={user} teams={teams} />}
-
-        <main className="mb-8 mt-8 px-4 md:mb-12 md:mt-12 md:px-8">{children}</main>
-      </div>
-    </NextAuthProvider>
-  );
-}

apps/web/src/app/(signing)/sign/[token]/complete/claim-account.tsx

@@ -1,155 +0,0 @@
-'use client';
-
-import { useRouter } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
-import { TRPCClientError } from '@documenso/trpc/client';
-import { trpc } from '@documenso/trpc/react';
-import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { PasswordInput } from '@documenso/ui/primitives/password-input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type ClaimAccountProps = {
-  defaultName: string;
-  defaultEmail: string;
-  trigger?: React.ReactNode;
-};
-
-export const ZClaimAccountFormSchema = z
-  .object({
-    name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
-    email: z.string().email().min(1),
-    password: ZPasswordSchema,
-  })
-  .refine(
-    (data) => {
-      const { name, email, password } = data;
-      return !password.includes(name) && !password.includes(email.split('@')[0]);
-    },
-    {
-      message: 'Password should not be common or based on personal information',
-      path: ['password'],
-    },
-  );
-
-export type TClaimAccountFormSchema = z.infer<typeof ZClaimAccountFormSchema>;
-
-export const ClaimAccount = ({ defaultName, defaultEmail }: ClaimAccountProps) => {
-  const analytics = useAnalytics();
-  const { toast } = useToast();
-  const router = useRouter();
-
-  const { mutateAsync: signup } = trpc.auth.signup.useMutation();
-
-  const form = useForm<TClaimAccountFormSchema>({
-    values: {
-      name: defaultName ?? '',
-      email: defaultEmail,
-      password: '',
-    },
-    resolver: zodResolver(ZClaimAccountFormSchema),
-  });
-
-  const onFormSubmit = async ({ name, email, password }: TClaimAccountFormSchema) => {
-    try {
-      await signup({ name, email, password });
-
-      router.push(`/unverified-account`);
-
-      toast({
-        title: 'Registration Successful',
-        description:
-          'You have successfully registered. Please verify your account by clicking on the link you received in the email.',
-        duration: 5000,
-      });
-
-      analytics.capture('App: User Claim Account', {
-        email,
-        timestamp: new Date().toISOString(),
-      });
-    } catch (error) {
-      if (error instanceof TRPCClientError && error.data?.code === 'BAD_REQUEST') {
-        toast({
-          title: 'An error occurred',
-          description: error.message,
-          variant: 'destructive',
-        });
-      } else {
-        toast({
-          title: 'An unknown error occurred',
-          description:
-            'We encountered an unknown error while attempting to sign you up. Please try again later.',
-          variant: 'destructive',
-        });
-      }
-    }
-  };
-
-  return (
-    <div className="mt-2 w-full">
-      <Form {...form}>
-        <form onSubmit={form.handleSubmit(onFormSubmit)}>
-          <fieldset disabled={form.formState.isSubmitting} className="mt-4">
-            <FormField
-              name="name"
-              control={form.control}
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Name</FormLabel>
-                  <FormControl>
-                    <Input {...field} placeholder="Enter your name" />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              name="email"
-              control={form.control}
-              render={({ field }) => (
-                <FormItem className="mt-4">
-                  <FormLabel>Email address</FormLabel>
-                  <FormControl>
-                    <Input {...field} placeholder="Enter your email" />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              name="password"
-              control={form.control}
-              render={({ field }) => (
-                <FormItem className="mt-4">
-                  <FormLabel>Set a password</FormLabel>
-                  <FormControl>
-                    <PasswordInput {...field} placeholder="Pick a password" />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <Button type="submit" className="mt-6 w-full" loading={form.formState.isSubmitting}>
-              Claim account
-            </Button>
-          </fieldset>
-        </form>
-      </Form>
-    </div>
-  );
-};

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

@@ -3,13 +3,10 @@ import { notFound } from 'next/navigation';
 
 import { CheckCircle2, Clock8 } from 'lucide-react';
 import { getServerSession } from 'next-auth';
-import { env } from 'next-runtime-env';
 import { match } from 'ts-pattern';
 
 import signingCelebration from '@documenso/assets/images/signing-celebration.png';
-import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
-import { isRecipientAuthorized } from '@documenso/lib/server-only/document/is-recipient-authorized';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
@@ -17,13 +14,9 @@ import { DocumentStatus, FieldType, RecipientRole } from '@documenso/prisma/clie
 import { DocumentDownloadButton } from '@documenso/ui/components/document/document-download-button';
 import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';
-import { cn } from '@documenso/ui/lib/utils';
-import { Badge } from '@documenso/ui/primitives/badge';
 
 import { truncateTitle } from '~/helpers/truncate-title';
 
-import { SigningAuthPageView } from '../signing-auth-page';
-import { ClaimAccount } from './claim-account';
 import { DocumentPreviewButton } from './document-preview-button';
 
 export type CompletedSigningPageProps = {
@@ -35,17 +28,12 @@ export type CompletedSigningPageProps = {
 export default async function CompletedSigningPage({
   params: { token },
 }: CompletedSigningPageProps) {
-  const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP');
-
   if (!token) {
     return notFound();
   }
 
-  const { user } = await getServerComponentSession();
-
   const document = await getDocumentAndSenderByToken({
     token,
-    requireAccessAuth: false,
   }).catch(() => null);
 
   if (!document || !document.documentData) {
@@ -65,17 +53,6 @@ export default async function CompletedSigningPage({
     return notFound();
   }
 
-  const isDocumentAccessValid = await isRecipientAuthorized({
-    type: 'ACCESS',
-    documentAuthOptions: document.authOptions,
-    recipient,
-    userId: user?.id,
-  });
-
-  if (!isDocumentAccessValid) {
-    return <SigningAuthPageView email={recipient.email} />;
-  }
-
   const signatures = await getRecipientSignatures({ recipientId: recipient.id });
 
   const recipientName =
@@ -85,120 +62,96 @@ export default async function CompletedSigningPage({
 
   const sessionData = await getServerSession();
   const isLoggedIn = !!sessionData?.user;
-  const canSignUp = !isLoggedIn && NEXT_PUBLIC_DISABLE_SIGNUP !== 'true';
 
   return (
-    <div
+    <div className="-mx-4 flex max-w-[100vw] flex-col items-center overflow-x-hidden px-4 pt-24 md:-mx-8 md:px-8 lg:pt-36 xl:pt-44">
-      className={cn(
+      {/* Card with recipient */}
-        '-mx-4 flex flex-col items-center overflow-x-hidden px-4 pt-24 md:-mx-8 md:px-8 lg:pt-36 xl:pt-44',
+      <SigningCard3D
-        { 'pt-0 lg:pt-0 xl:pt-0': canSignUp },
+        name={recipientName}
-      )}
+        signature={signatures.at(0)}
-    >
+        signingCelebrationImage={signingCelebration}
-      <div
+      />
-        className={cn('relative mt-6 flex w-full flex-col items-center justify-center', {
-          'mt-0 flex-col divide-y overflow-hidden pt-6 md:pt-16 lg:flex-row lg:divide-x lg:divide-y-0 lg:pt-20 xl:pt-24':
-            canSignUp,
-        })}
-      >
-        <div
-          className={cn('flex flex-col items-center', {
-            'mb-8 p-4 md:mb-0 md:p-12': canSignUp,
-          })}
-        >
-          <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
-            {truncatedTitle}
-          </Badge>
 
-          {/* Card with recipient */}
+      <div className="relative mt-6 flex w-full flex-col items-center">
-          <SigningCard3D
+        {match({ status: document.status, deletedAt: document.deletedAt })
-            name={recipientName}
+          .with({ status: DocumentStatus.COMPLETED }, () => (
-            signature={signatures.at(0)}
+            <div className="text-documenso-700 flex items-center text-center">
-            signingCelebrationImage={signingCelebration}
+              <CheckCircle2 className="mr-2 h-5 w-5" />
-          />
+              <span className="text-sm">Everyone has signed</span>
+            </div>
+          ))
+          .with({ deletedAt: null }, () => (
+            <div className="flex items-center text-center text-blue-600">
+              <Clock8 className="mr-2 h-5 w-5" />
+              <span className="text-sm">Waiting for others to sign</span>
+            </div>
+          ))
+          .otherwise(() => (
+            <div className="flex items-center text-center text-red-600">
+              <Clock8 className="mr-2 h-5 w-5" />
+              <span className="text-sm">Document no longer available to sign</span>
+            </div>
+          ))}
 
-          <h2 className="mt-6 max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
+        <h2 className="mt-6 max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
-            Document
+          You have
-            {recipient.role === RecipientRole.SIGNER && ' Signed '}
+          {recipient.role === RecipientRole.SIGNER && ' signed '}
-            {recipient.role === RecipientRole.VIEWER && ' Viewed '}
+          {recipient.role === RecipientRole.VIEWER && ' viewed '}
-            {recipient.role === RecipientRole.APPROVER && ' Approved '}
+          {recipient.role === RecipientRole.APPROVER && ' approved '}
-          </h2>
+          <span className="mt-1.5 block">"{truncatedTitle}"</span>
+        </h2>
 
-          {match({ status: document.status, deletedAt: document.deletedAt })
+        {match({ status: document.status, deletedAt: document.deletedAt })
-            .with({ status: DocumentStatus.COMPLETED }, () => (
+          .with({ status: DocumentStatus.COMPLETED }, () => (
-              <div className="text-documenso-700 mt-4 flex items-center text-center">
+            <p className="text-muted-foreground/60 mt-2.5 max-w-[60ch] text-center text-sm font-medium md:text-base">
-                <CheckCircle2 className="mr-2 h-5 w-5" />
+              Everyone has signed! You will receive an Email copy of the signed document.
-                <span className="text-sm">Everyone has signed</span>
+            </p>
-              </div>
+          ))
-            ))
+          .with({ deletedAt: null }, () => (
-            .with({ deletedAt: null }, () => (
+            <p className="text-muted-foreground/60 mt-2.5 max-w-[60ch] text-center text-sm font-medium md:text-base">
-              <div className="mt-4 flex items-center text-center text-blue-600">
+              You will receive an Email copy of the signed document once everyone has signed.
-                <Clock8 className="mr-2 h-5 w-5" />
+            </p>
-                <span className="text-sm">Waiting for others to sign</span>
+          ))
-              </div>
+          .otherwise(() => (
-            ))
+            <p className="text-muted-foreground/60 mt-2.5 max-w-[60ch] text-center text-sm font-medium md:text-base">
-            .otherwise(() => (
+              This document has been cancelled by the owner and is no longer available for others to
-              <div className="flex items-center text-center text-red-600">
+              sign.
-                <Clock8 className="mr-2 h-5 w-5" />
+            </p>
-                <span className="text-sm">Document no longer available to sign</span>
+          ))}
-              </div>
-            ))}
 
-          {match({ status: document.status, deletedAt: document.deletedAt })
+        <div className="mt-8 flex w-full max-w-sm items-center justify-center gap-4">
-            .with({ status: DocumentStatus.COMPLETED }, () => (
+          <DocumentShareButton documentId={document.id} token={recipient.token} />
-              <p className="text-muted-foreground/60 mt-2.5 max-w-[60ch] text-center text-sm font-medium md:text-base">
-                Everyone has signed! You will receive an Email copy of the signed document.
-              </p>
-            ))
-            .with({ deletedAt: null }, () => (
-              <p className="text-muted-foreground/60 mt-2.5 max-w-[60ch] text-center text-sm font-medium md:text-base">
-                You will receive an Email copy of the signed document once everyone has signed.
-              </p>
-            ))
-            .otherwise(() => (
-              <p className="text-muted-foreground/60 mt-2.5 max-w-[60ch] text-center text-sm font-medium md:text-base">
-                This document has been cancelled by the owner and is no longer available for others
-                to sign.
-              </p>
-            ))}
 
-          <div className="mt-8 flex w-full max-w-sm items-center justify-center gap-4">
+          {document.status === DocumentStatus.COMPLETED ? (
-            <DocumentShareButton documentId={document.id} token={recipient.token} />
+            <DocumentDownloadButton
-
+              className="flex-1"
-            {document.status === DocumentStatus.COMPLETED ? (
+              fileName={document.title}
-              <DocumentDownloadButton
+              documentData={documentData}
-                className="flex-1"
+              disabled={document.status !== DocumentStatus.COMPLETED}
-                fileName={document.title}
+            />
-                documentData={documentData}
+          ) : (
-                disabled={document.status !== DocumentStatus.COMPLETED}
+            <DocumentPreviewButton
-              />
+              className="text-[11px]"
-            ) : (
+              title="Signatures will appear once the document has been completed"
-              <DocumentPreviewButton
+              documentData={documentData}
-                className="text-[11px]"
+            />
-                title="Signatures will appear once the document has been completed"
+          )}
-                documentData={documentData}
-              />
-            )}
-          </div>
         </div>
 
-        {canSignUp && (
+        {isLoggedIn ? (
-          <div className={`flex max-w-xl flex-col items-center justify-center p-4 md:p-12`}>
-            <h2 className="mt-8 text-center text-xl font-semibold md:mt-0">
-              Need to sign documents?
-            </h2>
-
-            <p className="text-muted-foreground/60 mt-4 max-w-[55ch] text-center leading-normal">
-              Create your account and start using state-of-the-art document signing.
-            </p>
-
-            <ClaimAccount defaultName={recipientName} defaultEmail={recipient.email} />
-          </div>
-        )}
-
-        {isLoggedIn && (
           <Link href="/documents" className="text-documenso-700 hover:text-documenso-600 mt-36">
             Go Back Home
           </Link>
+        ) : (
+          <p className="text-muted-foreground/60 mt-36 text-sm">
+            Want to send slick signing links like this one?{' '}
+            <Link
+              href="https://documenso.com"
+              className="text-documenso-700 hover:text-documenso-600"
+            >
+              Check out Documenso.
+            </Link>
+          </p>
         )}
       </div>
     </div>