chore: check it build will pass

.env.example

@@ -93,8 +93,6 @@ NEXT_PRIVATE_SMTP_UNSAFE_IGNORE_TLS=
 NEXT_PRIVATE_SMTP_FROM_NAME="Documenso"
 # REQUIRED: Defines the email address to use as the from address.
 NEXT_PRIVATE_SMTP_FROM_ADDRESS="noreply@documenso.com"
-# OPTIONAL: Defines the service for nodemailer
-NEXT_PRIVATE_SMTP_SERVICE=
 # OPTIONAL: The API key to use for Resend.com
 NEXT_PRIVATE_RESEND_API_KEY=
 # OPTIONAL: The API key to use for MailChannels.

.github/workflows/publish.yml

@@ -89,35 +89,22 @@ jobs:
           APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
           GIT_SHA="$(git rev-parse HEAD)"
 
-          # Check if the version is stable (no rc or beta in the version)
-          if [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            docker manifest create \
-              documenso/documenso:latest \
-              --amend documenso/documenso-amd64:latest \
-              --amend documenso/documenso-arm64:latest
-
-            docker manifest push documenso/documenso:latest
-          fi
-
-          if [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
-            docker manifest create \
-              documenso/documenso:rc \
-              --amend documenso/documenso-amd64:rc \
-              --amend documenso/documenso-arm64:rc
-
-            docker manifest push documenso/documenso:rc
-          fi
+          docker manifest create \
+            documenso/documenso:latest \
+            --amend documenso/documenso-amd64:latest \
+            --amend documenso/documenso-arm64:latest \
 
           docker manifest create \
             documenso/documenso:$GIT_SHA \
             --amend documenso/documenso-amd64:$GIT_SHA \
-            --amend documenso/documenso-arm64:$GIT_SHA
+            --amend documenso/documenso-arm64:$GIT_SHA \
 
           docker manifest create \
             documenso/documenso:$APP_VERSION \
             --amend documenso/documenso-amd64:$APP_VERSION \
-            --amend documenso/documenso-arm64:$APP_VERSION
+            --amend documenso/documenso-arm64:$APP_VERSION \
 
+          docker manifest push documenso/documenso:latest
           docker manifest push documenso/documenso:$GIT_SHA
           docker manifest push documenso/documenso:$APP_VERSION
 
@@ -126,34 +113,21 @@ jobs:
           APP_VERSION="$(git name-rev --tags --name-only $(git rev-parse HEAD) | head -n 1 | sed 's/\^0//')"
           GIT_SHA="$(git rev-parse HEAD)"
 
-          # Check if the version is stable (no rc or beta in the version)
-          if [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            docker manifest create \
-              ghcr.io/documenso/documenso:latest \
-              --amend ghcr.io/documenso/documenso-amd64:latest \
-              --amend ghcr.io/documenso/documenso-arm64:latest
-
-            docker manifest push ghcr.io/documenso/documenso:latest
-          fi
-
-          if [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
-            docker manifest create \
-              ghcr.io/documenso/documenso:rc \
-              --amend ghcr.io/documenso/documenso-amd64:rc \
-              --amend ghcr.io/documenso/documenso-arm64:rc
-
-            docker manifest push ghcr.io/documenso/documenso:rc
-          fi
+          docker manifest create \
+            ghcr.io/documenso/documenso:latest \
+            --amend ghcr.io/documenso/documenso-amd64:latest \
+            --amend ghcr.io/documenso/documenso-arm64:latest \
 
           docker manifest create \
             ghcr.io/documenso/documenso:$GIT_SHA \
             --amend ghcr.io/documenso/documenso-amd64:$GIT_SHA \
-            --amend ghcr.io/documenso/documenso-arm64:$GIT_SHA
+            --amend ghcr.io/documenso/documenso-arm64:$GIT_SHA \
 
           docker manifest create \
             ghcr.io/documenso/documenso:$APP_VERSION \
             --amend ghcr.io/documenso/documenso-amd64:$APP_VERSION \
-            --amend ghcr.io/documenso/documenso-arm64:$APP_VERSION
+            --amend ghcr.io/documenso/documenso-arm64:$APP_VERSION \
 
+          docker manifest push ghcr.io/documenso/documenso:latest
           docker manifest push ghcr.io/documenso/documenso:$GIT_SHA
           docker manifest push ghcr.io/documenso/documenso:$APP_VERSION

apps/documentation/pages/developers/local-development/signing-certificate.mdx

@@ -11,10 +11,6 @@ Digitally signing documents requires a signing certificate in `.p12` format. You
 
 Follow the steps below to create a free, self-signed certificate for local development.
 
-<Callout type="warning">
-  These steps should be run on a UNIX based system, otherwise you may run into an error.
-</Callout>
-
 <Steps>
 
 ### Generate Private Key
@@ -42,17 +38,11 @@ You will be prompted to enter some information, such as the certificate's Common
 Combine the private key and the self-signed certificate to create a `.p12` certificate. Use the following command:
 
 ```bash
-openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt -legacy
+openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt
 ```
 
 <Callout type="warning">
-When running the application in Docker, you may encounter permission issues when attempting to sign documents using your certificate (.p12) file. This happens because the application runs as a non-root user inside the container and needs read access to the certificate.
-
-To resolve this, you'll need to update the certificate file permissions to allow the container user 1001, which runs NextJS, to read it:
-
-```bash
-sudo chown 1001 certificate.p12
-```
+  If you get the error "Error: Failed to get private key bags", add the `-legacy` flag to the command `openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt -legacy`.
 
 </Callout>
 
@@ -64,8 +54,8 @@ Note that for local development, the password can be left empty.
 
 ### Add Certificate to the Project
 
-Use the `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH` environment variable to point at the certificate you created.
+Finally, add the certificate to the project. Place the `certificate.p12` file in the `/apps/web/resources` directory. If the directory doesn't exist, create it.
 
-Details about environment variables associated with certificates can be found [here](/developers/self-hosting/signing-certificate#configure-documenso-to-use-the-certificate).
+The final file path should be `/apps/web/resources/certificate.p12`.
 
 </Steps>

apps/documentation/pages/developers/self-hosting/how-to.mdx

@@ -133,7 +133,7 @@ volumes:
 After updating the volume binding, save the `compose.yml` file and run the following command to start the containers:
 
 ```bash
-docker-compose --env-file ./.env up -d
+docker-compose --env-file ./.env -d up
 ```
 
 The command will start the PostgreSQL database and the Documenso application containers.

apps/documentation/pages/users/_meta.json

@@ -11,7 +11,6 @@
   "templates": "Templates",
   "direct-links": "Direct Signing Links",
   "document-visibility": "Document Visibility",
-  "teams": "Teams",
   "-- Legal Overview": {
     "type": "separator",
     "title": "Legal Overview"

apps/documentation/pages/users/document-visibility.mdx

@@ -0,0 +1,18 @@
+---
+title: Document Visibility
+description: Learn how to control the visibility of your team documents.
+---
+
+# Team's Document Visibility
+
+By default, all documents created in a team are visible to all team members. However, you can control the visibility of your documents by changing the document's visibility settings.
+
+To set the visibility of a document, click on the **Document visibility** dropdown in the document's settings panel.
+
+![A screenshot of the Documenso's document editor page where you can update the document visibility](/document-visibility-settings.webp)
+
+The document visibility can be set to one of the following options:
+
+- **Everyone** - The document is visible to all team members.
+- **Managers and above** - The document is visible to people with the role of Manager or above.
+- **Admin only** - The document is only visible to the team's admins.

apps/documentation/pages/users/teams/_meta.json

@@ -1,5 +0,0 @@
-{
-  "general-settings": "General Settings",
-  "document-visibility": "Document Visibility",
-  "sender-details": "Email Sender Details"
-}

apps/documentation/pages/users/teams/document-visibility.mdx

@@ -1,45 +0,0 @@
----
-title: Document Visibility
-description: Learn how to control the visibility of your team documents.
----
-
-import { Callout } from 'nextra/components';
-
-# Team's Document Visibility
-
-The default document visibility option allows you to control who can view and access the documents uploaded to your team account. The document visibility can be set to one of the following options:
-
-- **Everyone** - The document is visible to all team members.
-- **Managers and above** - The document is visible to team members with the role of _Manager or above_ and _Admin_.
-- **Admin only** - The document is only visible to the team's admins.
-
-![A screenshot of the document visibility selector from the team's general settings page](/teams/team-general-settings-document-visibility-select.webp)
-
-The default document visibility is set to "_EVERYONE_" by default. You can change this setting by going to the [team's general settings page](/users/teams/general-settings) and selecting a different visibility option.
-
-<Callout type="warning">
-  If the team member uploading the document has a role lower than the default document visibility,
-  the document visibility will be set to a lower visibility level matching the team member's role.
-</Callout>
-
-Here's how it works:
-
-- If a user with the "_Member_" role creates a document and the default document visibility is set to "_Admin_" or "_Managers and above_", the document's visibility is set to "_Everyone_".
-- If a user with the "_Manager_" role creates a document and the default document visibility is set to "_Admin_", the document's visibility is set to "_Managers and above_".
-- Otherwise, the document's visibility is set to the default document visibility.
-
-You can change the visibility of a document at any time by editing the document and selecting a different visibility option.
-
-![A screenshot of the Documenso's document editor page where you can update the document visibility](/teams/document-visibility-settings.webp)
-
-<Callout type="warning">
-  Updating the default document visibility in the team's general settings will not affect the
-  visibility of existing documents. You will need to update the visibility of each document
-  individually.
-</Callout>
-
-## A Note on Document Access
-
-The `document owner` (the user who created the document) always has access to the document, regardless of the document's visibility settings. This means that even if a document is set to "Admins only", the document owner can still view and edit the document.
-
-The `recipient` (the user who receives the document for signature, approval, etc.) also has access to the document, regardless of the document's visibility settings. This means that even if a document is set to "Admins only", the recipient can still view and sign the document.

apps/documentation/pages/users/teams/general-settings.mdx

@@ -1,15 +0,0 @@
----
-title: General Settings
-description: Learn how to manage your team's General settings.
----
-
-# General Settings
-
-You can manage your team's general settings by clicking on the **General Settings** tab in the team's settings dashboard.
-
-![A screenshot of team's General settings page](/teams/team-general-settings.webp)
-
-The general settings page allows you to update the following settings:
-
-- **Document Visibility** - Set the default visibility of the documents created by team members. Learn more about [document visibility](/users/teams/document-visibility).
-- **Sender Details** - Set whether the sender's name should be included in the emails sent by the team. Learn more about [sender details](/users/teams/sender-details).

apps/documentation/pages/users/teams/sender-details.mdx

@@ -1,14 +0,0 @@
----
-title: Email Sender Details
-description: Learn how to update the sender details for your team's email notifications.
----
-
-## Sender Details
-
-If the **Sender Details** setting is enabled, the emails sent by the team will include the sender's name. The email will say:
-
-> "Example User" on behalf of "Example Team" has invited you to sign "document.pdf"
-
-If the **Sender Details** setting is disabled, the emails sent by the team will not include the sender's name. The email will say:
-
-> "Example Team" has invited you to sign "document.pdf"

apps/marketing/content/blog/project-babel.mdx

@@ -1,64 +0,0 @@
----
-title: Project Babel
-description: We are announcing Project Babel - an initiative to support all languages of the world on Documenso.
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2024-11-08
-tags:
-  - Languages
-  - Community
-  - Open Source
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/babel.png"
-    width="800"
-    height="800"
-    alt=""
-  />
-
-  <figcaption className="text-center">The tower of Babel to add some Gravitas to this project.</figcaption>
-</figure>
-
-> TLDR; We are opening up translations to the community. Read this to add a language: https://documen.so/babel-fish
-
-## Announcing Project Babel: Powering Documenso with Global Language Support
-
-At Documenso, we believe that open source is more than just a software philosophy—it’s a way to build solutions that are open to all. Now, we’re happy to take that mission further with Project Babel, a community-driven initiative designed to bring worldwide language support to the Documenso platform. This project aims to enable Documenso to support as many languages as possible.
-
-## Why Language Support Matters
-
-We already have customers from 36 different countries and are seeing traffic from even more. When it comes to critical tools like signature platforms, having a user interface in your native language can make all the difference. No matter who and where you are, your team deserves tools that are fully accessible and intuitive. That’s why we’re making it our goal to support every language, and we need your help to make it happen! We’re building Documenso as a truly global public commodity.
-
-## The Vision Behind Project Babel
-
-The goal of Project Babel is simple but bold: We want to out-ship and out-customize every other document signing tool worldwide. How? By leveraging the collective power of our global community.
-
-Unlike closed-source software, where localization means waiting for updates from the core team, Project Babel lets anyone contribute a new language, improve an existing translation, or customize the experience to meet local cultural nuances. This flexibility isn’t just a bonus—it’s the baseline for truly global products.
-
-Through Project Babel, you can help make Documenso the most inclusive e-signature tool. Whether by adding a language you speak or fine-tuning existing translations, you’re shaping a platform that works for everyone, everywhere.
-
-## How You Can Contribute
-
-We’ve created a simple GitHub-based contribution flow to get started. We’ll improve the flow and user experience as the project progresses. As always, your contributions are highly valued.
-
-    Check out the contribution guide here: [https://documen.so/babel-fish](https://documen.so/babel-fish)
-
-## Open Source Makes It Possible
-
-Closed-source solutions can’t keep up with the speed or depth of customization that open source offers. While other companies might take months or years to localize their products, Documenso can adapt and grow in real-time, thanks to contributions from our community. Whether it’s a small regional dialect or a widely spoken language, Project Babel ensures that Documenso evolves to meet the needs of people everywhere.
-
-> More importantly, this initiative empowers users. It allows you to control your software experience, ensuring it reflects your culture, language, and unique needs.
-
-Project Babel is more than a localization effort—it’s the first step toward democratizing access to highly customized software for everyone, no matter where they are or what language they speak. We’re incredibly excited about this initiative, but it can only succeed with your participation. We invite you to join us in making Documenso the most linguistically inclusive platform out there.
-
-Ready to get started? Check out the full tutorial and become part of the Babel community today! Let’s build open signing for the world: https://documen.so/babel-fish
-
-If you have any questions or comments, reach out on [Twitter / X](https://twitter.com/eltimuro) (DMs open) or [Discord](https://documen.so/discord).
-
-Thinking about switching to a modern signing platform? Reach out anytime: [https://documen.so/sales](https://documen.so/sales)
-
-Best from Hamburg\
-Timur

apps/marketing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/marketing",
-  "version": "1.8.0-rc.3",
+  "version": "1.7.2-rc.3",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {

apps/marketing/process-env.d.ts

@@ -2,8 +2,8 @@ declare namespace NodeJS {
   export interface ProcessEnv {
     NEXT_PUBLIC_WEBAPP_URL?: string;
     NEXT_PUBLIC_MARKETING_URL?: string;
-    NEXT_PRIVATE_INTERNAL_WEBAPP_URL?: string;
-
+    NEXT_PRIVATE_INTERNAL_WEBAPP_URL?:string;
+    
     NEXT_PRIVATE_DATABASE_URL: string;
 
     NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;

apps/marketing/src/app/(marketing)/[content]/content.tsx

@@ -1,23 +0,0 @@
-'use client';
-
-import Image from 'next/image';
-
-import type { DocumentTypes } from 'contentlayer/generated';
-import type { MDXComponents } from 'mdx/types';
-import { useMDXComponent } from 'next-contentlayer/hooks';
-
-const mdxComponents: MDXComponents = {
-  MdxNextImage: (props: { width: number; height: number; alt?: string; src: string }) => (
-    <Image {...props} alt={props.alt ?? ''} />
-  ),
-};
-
-export type ContentPageContentProps = {
-  document: DocumentTypes;
-};
-
-export const ContentPageContent = ({ document }: ContentPageContentProps) => {
-  const MDXContent = useMDXComponent(document.body.code);
-
-  return <MDXContent components={mdxComponents} />;
-};

apps/marketing/src/app/(marketing)/[content]/page.tsx

@@ -1,11 +1,12 @@
+import Image from 'next/image';
 import { notFound } from 'next/navigation';
 
 import { allDocuments } from 'contentlayer/generated';
+import type { MDXComponents } from 'mdx/types';
+import { useMDXComponent } from 'next-contentlayer/hooks';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 
-import { ContentPageContent } from './content';
-
 export const dynamic = 'force-dynamic';
 
 export const generateMetadata = ({ params }: { params: { content: string } }) => {
@@ -18,13 +19,19 @@ export const generateMetadata = ({ params }: { params: { content: string } }) =>
   return { title: document.title };
 };
 
+const mdxComponents: MDXComponents = {
+  MdxNextImage: (props: { width: number; height: number; alt?: string; src: string }) => (
+    <Image {...props} alt={props.alt ?? ''} />
+  ),
+};
+
 /**
  * A generic catch all page for the root level that checks for content layer documents.
  *
  * Will render the document if it exists, otherwise will return a 404.
  */
-export default async function ContentPage({ params }: { params: { content: string } }) {
-  await setupI18nSSR();
+export default function ContentPage({ params }: { params: { content: string } }) {
+  setupI18nSSR();
 
   const post = allDocuments.find((post) => post._raw.flattenedPath === params.content);
 
@@ -32,9 +39,11 @@ export default async function ContentPage({ params }: { params: { content: strin
     notFound();
   }
 
+  const MDXContent = useMDXComponent(post.body.code);
+
   return (
     <article className="prose dark:prose-invert mx-auto">
-      <ContentPageContent document={post} />
+      <MDXContent components={mdxComponents} />
     </article>
   );
 }

apps/marketing/src/app/(marketing)/blog/[post]/content.tsx

@@ -1,23 +0,0 @@
-'use client';
-
-import Image from 'next/image';
-
-import type { BlogPost } from 'contentlayer/generated';
-import type { MDXComponents } from 'mdx/types';
-import { useMDXComponent } from 'next-contentlayer/hooks';
-
-const mdxComponents: MDXComponents = {
-  MdxNextImage: (props: { width: number; height: number; alt?: string; src: string }) => (
-    <Image {...props} alt={props.alt ?? ''} />
-  ),
-};
-
-export type BlogPostContentProps = {
-  post: BlogPost;
-};
-
-export const BlogPostContent = ({ post }: BlogPostContentProps) => {
-  const MdxContent = useMDXComponent(post.body.code);
-
-  return <MdxContent components={mdxComponents} />;
-};

apps/marketing/src/app/(marketing)/blog/[post]/page.tsx

@@ -1,15 +1,16 @@
+import Image from 'next/image';
 import Link from 'next/link';
 import { notFound } from 'next/navigation';
 
 import { allBlogPosts } from 'contentlayer/generated';
 import { ChevronLeft } from 'lucide-react';
+import type { MDXComponents } from 'mdx/types';
+import { useMDXComponent } from 'next-contentlayer/hooks';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 
 import { CallToAction } from '~/components/(marketing)/call-to-action';
 
-import { BlogPostContent } from './content';
-
 export const dynamic = 'force-dynamic';
 
 export const generateMetadata = ({ params }: { params: { post: string } }) => {
@@ -41,8 +42,14 @@ export const generateMetadata = ({ params }: { params: { post: string } }) => {
   };
 };
 
-export default async function BlogPostPage({ params }: { params: { post: string } }) {
-  await setupI18nSSR();
+const mdxComponents: MDXComponents = {
+  MdxNextImage: (props: { width: number; height: number; alt?: string; src: string }) => (
+    <Image {...props} alt={props.alt ?? ''} />
+  ),
+};
+
+export default function BlogPostPage({ params }: { params: { post: string } }) {
+  setupI18nSSR();
 
   const post = allBlogPosts.find((post) => post._raw.flattenedPath === `blog/${params.post}`);
 
@@ -50,6 +57,8 @@ export default async function BlogPostPage({ params }: { params: { post: string
     notFound();
   }
 
+  const MDXContent = useMDXComponent(post.body.code);
+
   return (
     <div>
       <article className="prose dark:prose-invert mx-auto py-8">
@@ -78,7 +87,7 @@ export default async function BlogPostPage({ params }: { params: { post: string
           </div>
         </div>
 
-        <BlogPostContent post={post} />
+        <MDXContent components={mdxComponents} />
 
         {post.tags.length > 0 && (
           <ul className="not-prose flex list-none flex-row space-x-2 px-0">

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

@@ -9,8 +9,8 @@ export const metadata: Metadata = {
   title: 'Blog',
 };
 
-export default async function BlogPage() {
-  const { i18n } = await setupI18nSSR();
+export default function BlogPage() {
+  const { i18n } = setupI18nSSR();
 
   const blogPosts = allBlogPosts.sort((a, b) => {
     const dateA = new Date(a.date);

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

@@ -76,9 +76,9 @@ export type EarlyAdoptersType = z.infer<typeof ZEarlyAdoptersResponse>;
 
 const fetchGithubStats = async () => {
   return await fetch('https://api.github.com/repos/documenso/documenso', {
-    headers: {
-      ...GITHUB_HEADERS,
-    },
+    // headers: {
+    //   ...GITHUB_HEADERS,
+    // },
   })
     .then(async (res) => res.json())
     .then((res) => ZGithubStatsResponse.parse(res));
@@ -131,7 +131,7 @@ const fetchEarlyAdopters = async () => {
 };
 
 export default async function OpenPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
 

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

@@ -26,7 +26,7 @@ const fontCaveat = Caveat({
 });
 
 export default async function IndexPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const starCount = await fetch('https://api.github.com/repos/documenso/documenso', {
     headers: {

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

@@ -30,8 +30,8 @@ export type PricingPageProps = {
   };
 };
 
-export default async function PricingPage() {
-  await setupI18nSSR();
+export default function PricingPage() {
+  setupI18nSSR();
 
   return (
     <div className="mt-6 sm:mt-12">

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

@@ -163,7 +163,6 @@ export const SinglePlayerClient = () => {
     expired: null,
     signedAt: null,
     readStatus: 'OPENED',
-    rejectionReason: null,
     documentDeletedAt: null,
     signingStatus: 'NOT_SIGNED',
     sendStatus: 'NOT_SENT',

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

@@ -14,8 +14,8 @@ export const dynamic = 'force-dynamic';
 // !: This entire file is a hack to get around failed prerendering of
 // !: the Single Player Mode page. This regression was introduced during
 // !: the upgrade of Next.js to v13.5.x.
-export default async function SingleplayerPage() {
-  await setupI18nSSR();
+export default function SingleplayerPage() {
+  setupI18nSSR();
 
   return <SinglePlayerClient />;
 }

apps/marketing/src/app/layout.tsx

@@ -56,7 +56,7 @@ export function generateMetadata() {
 export default async function RootLayout({ children }: { children: React.ReactNode }) {
   const flags = await getAllAnonymousFlags();
 
-  const { lang, locales, i18n } = await setupI18nSSR();
+  const { lang, locales, i18n } = setupI18nSSR();
 
   return (
     <html

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.8.0-rc.3",
+  "version": "1.7.2-rc.3",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {

apps/web/process-env.d.ts

@@ -2,7 +2,7 @@ declare namespace NodeJS {
   export interface ProcessEnv {
     NEXT_PUBLIC_WEBAPP_URL?: string;
     NEXT_PUBLIC_MARKETING_URL?: string;
-    NEXT_PRIVATE_INTERNAL_WEBAPP_URL?: string;
+    NEXT_PRIVATE_INTERNAL_WEBAPP_URL?:string;
 
     NEXT_PRIVATE_DATABASE_URL: string;
 

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

@@ -24,7 +24,7 @@ type AdminDocumentDetailsPageProps = {
 };
 
 export default async function AdminDocumentDetailsPage({ params }: AdminDocumentDetailsPageProps) {
-  const { i18n } = await setupI18nSSR();
+  const { i18n } = setupI18nSSR();
 
   const document = await getEntireDocument({ id: Number(params.id) });
 

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

@@ -4,8 +4,8 @@ import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 
 import { AdminDocumentResults } from './document-results';
 
-export default async function AdminDocumentsPage() {
-  await setupI18nSSR();
+export default function AdminDocumentsPage() {
+  setupI18nSSR();
 
   return (
     <div>

apps/web/src/app/(dashboard)/admin/layout.tsx

@@ -13,7 +13,7 @@ export type AdminSectionLayoutProps = {
 };
 
 export default async function AdminSectionLayout({ children }: AdminSectionLayoutProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { user } = await getRequiredServerComponentSession();
 

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

@@ -12,7 +12,7 @@ import { BannerForm } from './banner-form';
 // import { BannerForm } from './banner-form';
 
 export default async function AdminBannerPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
 

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

@@ -30,7 +30,7 @@ import { SignerConversionChart } from './signer-conversion-chart';
 import { UserWithDocumentChart } from './user-with-document';
 
 export default async function AdminStatsPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
 

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

@@ -14,7 +14,7 @@ import {
 } from '@documenso/ui/primitives/table';
 
 export default async function Subscriptions() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const subscriptions = await findSubscriptions();
 

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

@@ -16,7 +16,7 @@ type AdminManageUsersProps = {
 };
 
 export default async function AdminManageUsers({ searchParams = {} }: AdminManageUsersProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const page = Number(searchParams.page) || 1;
   const perPage = Number(searchParams.perPage) || 10;

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

@@ -33,8 +33,6 @@ import {
 } from '@documenso/ui/primitives/dropdown-menu';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { DocumentRecipientLinkCopyDialog } from '~/components/document/document-recipient-link-copy-dialog';
-
 import { ResendDocumentActionItem } from '../_action-items/resend-document';
 import { DeleteDocumentDialog } from '../delete-document-dialog';
 import { DuplicateDocumentDialog } from '../duplicate-document-dialog';
@@ -64,7 +62,6 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
 
   const isOwner = document.User.id === session.user.id;
   const isDraft = document.status === DocumentStatus.DRAFT;
-  const isPending = document.status === DocumentStatus.PENDING;
   const isDeleted = document.deletedAt !== null;
   const isComplete = document.status === DocumentStatus.COMPLETED;
   const isCurrentTeamDocument = team && document.team?.url === team.url;
@@ -148,21 +145,6 @@ export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDro
           <Trans>Share</Trans>
         </DropdownMenuLabel>
 
-        {canManageDocument && (
-          <DocumentRecipientLinkCopyDialog
-            recipients={document.Recipient}
-            trigger={
-              <DropdownMenuItem
-                disabled={!isPending || isDeleted}
-                onSelect={(e) => e.preventDefault()}
-              >
-                <Copy className="mr-2 h-4 w-4" />
-                <Trans>Signing Links</Trans>
-              </DropdownMenuItem>
-            }
-          />
-        )}
-
         <ResendDocumentActionItem
           document={document}
           recipients={nonSignedRecipients}

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

@@ -4,7 +4,7 @@ import { useMemo } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import { AlertTriangle, CheckCheckIcon, CheckIcon, Loader, MailOpen } from 'lucide-react';
+import { CheckCheckIcon, CheckIcon, Loader, MailOpen } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';
 
@@ -133,11 +133,6 @@ export const DocumentPageViewRecentActivity = ({
                         <CheckIcon className="h-3 w-3" aria-hidden="true" />
                       </div>
                     ))
-                    .with(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_REJECTED, () => (
-                      <div className="bg-widget rounded-full border border-gray-300 p-1 dark:border-neutral-600">
-                        <AlertTriangle className="h-3 w-3" aria-hidden="true" />
-                      </div>
-                    ))
                     .with(DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_OPENED, () => (
                       <div className="bg-widget rounded-full border border-gray-300 p-1 dark:border-neutral-600">
                         <MailOpen className="h-3 w-3" aria-hidden="true" />
@@ -148,11 +143,17 @@ export const DocumentPageViewRecentActivity = ({
                     ))}
                 </div>
 
+                {/* Todo: Translations. */}
                 <p
                   className="text-muted-foreground dark:text-muted-foreground/70 flex-auto truncate py-0.5 text-xs leading-5"
-                  title={formatDocumentAuditLogAction(_, auditLog, userId).description}
+                  title={`${formatDocumentAuditLogAction(auditLog, userId).prefix} ${
+                    formatDocumentAuditLogAction(auditLog, userId).description
+                  }`}
                 >
-                  {formatDocumentAuditLogAction(_, auditLog, userId).description}
+                  <span className="text-foreground font-medium">
+                    {formatDocumentAuditLogAction(auditLog, userId).prefix}
+                  </span>{' '}
+                  {formatDocumentAuditLogAction(auditLog, userId).description}
                 </p>
 
                 <time className="text-muted-foreground dark:text-muted-foreground/70 flex-none py-0.5 text-xs leading-5">

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

@@ -1,30 +1,16 @@
-'use client';
-
 import Link from 'next/link';
 
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import {
-  AlertTriangle,
-  CheckIcon,
-  Clock,
-  MailIcon,
-  MailOpenIcon,
-  PenIcon,
-  PlusIcon,
-} from 'lucide-react';
+import { CheckIcon, Clock, MailIcon, MailOpenIcon, PenIcon, PlusIcon } from 'lucide-react';
 import { match } from 'ts-pattern';
 
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import { formatSigningLink } from '@documenso/lib/utils/recipients';
 import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
 import type { Document, Recipient } from '@documenso/prisma/client';
-import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
 import { SignatureIcon } from '@documenso/ui/icons/signature';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import { Badge } from '@documenso/ui/primitives/badge';
-import { PopoverHover } from '@documenso/ui/primitives/popover';
-import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DocumentPageViewRecipientsProps = {
   document: Document & {
@@ -38,7 +24,6 @@ export const DocumentPageViewRecipients = ({
   documentRootPath,
 }: DocumentPageViewRecipientsProps) => {
   const { _ } = useLingui();
-  const { toast } = useToast();
 
   const recipients = document.Recipient;
 
@@ -83,89 +68,53 @@ export const DocumentPageViewRecipients = ({
               }
             />
 
-            <div className="flex flex-row items-center">
-              {document.status !== DocumentStatus.DRAFT &&
-                recipient.signingStatus === SigningStatus.SIGNED && (
-                  <Badge variant="default">
-                    {match(recipient.role)
-                      .with(RecipientRole.APPROVER, () => (
+            {document.status !== DocumentStatus.DRAFT &&
+              recipient.signingStatus === SigningStatus.SIGNED && (
+                <Badge variant="default">
+                  {match(recipient.role)
+                    .with(RecipientRole.APPROVER, () => (
+                      <>
+                        <CheckIcon className="mr-1 h-3 w-3" />
+                        <Trans>Approved</Trans>
+                      </>
+                    ))
+                    .with(RecipientRole.CC, () =>
+                      document.status === DocumentStatus.COMPLETED ? (
+                        <>
+                          <MailIcon className="mr-1 h-3 w-3" />
+                          <Trans>Sent</Trans>
+                        </>
+                      ) : (
                         <>
                           <CheckIcon className="mr-1 h-3 w-3" />
-                          <Trans>Approved</Trans>
+                          <Trans>Ready</Trans>
                         </>
-                      ))
-                      .with(RecipientRole.CC, () =>
-                        document.status === DocumentStatus.COMPLETED ? (
-                          <>
-                            <MailIcon className="mr-1 h-3 w-3" />
-                            <Trans>Sent</Trans>
-                          </>
-                        ) : (
-                          <>
-                            <CheckIcon className="mr-1 h-3 w-3" />
-                            <Trans>Ready</Trans>
-                          </>
-                        ),
-                      )
+                      ),
+                    )
 
-                      .with(RecipientRole.SIGNER, () => (
-                        <>
-                          <SignatureIcon className="mr-1 h-3 w-3" />
-                          <Trans>Signed</Trans>
-                        </>
-                      ))
-                      .with(RecipientRole.VIEWER, () => (
-                        <>
-                          <MailOpenIcon className="mr-1 h-3 w-3" />
-                          <Trans>Viewed</Trans>
-                        </>
-                      ))
-                      .exhaustive()}
-                  </Badge>
-                )}
+                    .with(RecipientRole.SIGNER, () => (
+                      <>
+                        <SignatureIcon className="mr-1 h-3 w-3" />
+                        <Trans>Signed</Trans>
+                      </>
+                    ))
+                    .with(RecipientRole.VIEWER, () => (
+                      <>
+                        <MailOpenIcon className="mr-1 h-3 w-3" />
+                        <Trans>Viewed</Trans>
+                      </>
+                    ))
+                    .exhaustive()}
+                </Badge>
+              )}
 
-              {document.status !== DocumentStatus.DRAFT &&
-                recipient.signingStatus === SigningStatus.NOT_SIGNED && (
-                  <Badge variant="secondary">
-                    <Clock className="mr-1 h-3 w-3" />
-                    <Trans>Pending</Trans>
-                  </Badge>
-                )}
-
-              {document.status !== DocumentStatus.DRAFT &&
-                recipient.signingStatus === SigningStatus.REJECTED && (
-                  <PopoverHover
-                    trigger={
-                      <Badge variant="destructive">
-                        <AlertTriangle className="mr-1 h-3 w-3" />
-                        <Trans>Rejected</Trans>
-                      </Badge>
-                    }
-                  >
-                    <p className="text-sm">
-                      <Trans>Reason for rejection: </Trans>
-                    </p>
-
-                    <p className="text-muted-foreground mt-1 text-sm">
-                      {recipient.rejectionReason}
-                    </p>
-                  </PopoverHover>
-                )}
-
-              {document.status === DocumentStatus.PENDING &&
-                recipient.signingStatus === SigningStatus.NOT_SIGNED &&
-                recipient.role !== RecipientRole.CC && (
-                  <CopyTextButton
-                    value={formatSigningLink(recipient.token)}
-                    onCopySuccess={() => {
-                      toast({
-                        title: _(msg`Copied to clipboard`),
-                        description: _(msg`The signing link has been copied to your clipboard.`),
-                      });
-                    }}
-                  />
-                )}
-            </div>
+            {document.status !== DocumentStatus.DRAFT &&
+              recipient.signingStatus === SigningStatus.NOT_SIGNED && (
+                <Badge variant="secondary">
+                  <Clock className="mr-1 h-3 w-3" />
+                  <Trans>Pending</Trans>
+                </Badge>
+              )}
           </li>
         ))}
       </ul>

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

@@ -26,7 +26,6 @@ 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 { DocumentRecipientLinkCopyDialog } from '~/components/document/document-recipient-link-copy-dialog';
 import {
   DocumentStatus as DocumentStatusComponent,
   FRIENDLY_STATUS_MAP,
@@ -74,7 +73,7 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
   const isRecipient = document?.Recipient.find((recipient) => recipient.email === user.email);
   let canAccessDocument = true;
 
-  if (team && !isRecipient && document?.userId !== user.id) {
+  if (team && !isRecipient) {
     canAccessDocument = match([documentVisibility, currentTeamMemberRole])
       .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
       .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
@@ -135,10 +134,6 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
 
   return (
     <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      {document.status === DocumentStatus.PENDING && (
-        <DocumentRecipientLinkCopyDialog recipients={recipients} />
-      )}
-
       <Link href={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
         <ChevronLeft className="mr-2 inline-block h-5 w-5" />
         <Trans>Documents</Trans>

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

@@ -7,12 +7,10 @@ import { useRouter, useSearchParams } from 'next/navigation';
 import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 
-import { isValidLanguageCode } from '@documenso/lib/constants/i18n';
 import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
-import { DocumentDistributionMethod, DocumentStatus } from '@documenso/prisma/client';
 import type { DocumentWithDetails } from '@documenso/prisma/types/document';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -178,8 +176,8 @@ export const EditDocumentForm = ({
       stepIndex: 3,
     },
     subject: {
-      title: msg`Distribute Document`,
-      description: msg`Choose how the document will reach recipients`,
+      title: msg`Add Subject`,
+      description: msg`Add the subject and message you wish to send to signers.`,
       stepIndex: 4,
     },
   };
@@ -203,7 +201,7 @@ export const EditDocumentForm = ({
 
   const onAddSettingsFormSubmit = async (data: TAddSettingsFormSchema) => {
     try {
-      const { timezone, dateFormat, redirectUrl, language } = data.meta;
+      const { timezone, dateFormat, redirectUrl } = data.meta;
 
       await setSettingsForDocument({
         documentId: document.id,
@@ -219,7 +217,6 @@ export const EditDocumentForm = ({
           timezone,
           dateFormat,
           redirectUrl,
-          language: isValidLanguageCode(language) ? language : undefined,
         },
       });
 
@@ -308,7 +305,7 @@ export const EditDocumentForm = ({
   };
 
   const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {
-    const { subject, message, distributionMethod, emailSettings } = data.meta;
+    const { subject, message } = data.meta;
 
     try {
       await sendDocument({
@@ -317,31 +314,16 @@ export const EditDocumentForm = ({
         meta: {
           subject,
           message,
-          distributionMethod,
-          emailSettings,
         },
       });
 
-      if (distributionMethod === DocumentDistributionMethod.EMAIL) {
-        toast({
-          title: _(msg`Document sent`),
-          description: _(msg`Your document has been sent successfully.`),
-          duration: 5000,
-        });
+      toast({
+        title: _(msg`Document sent`),
+        description: _(msg`Your document has been sent successfully.`),
+        duration: 5000,
+      });
 
-        router.push(documentRootPath);
-        return;
-      }
-
-      if (document.status === DocumentStatus.DRAFT) {
-        toast({
-          title: _(msg`Links Generated`),
-          description: _(msg`Signing links have been generated for this document.`),
-          duration: 5000,
-        });
-      } else {
-        router.push(`${documentRootPath}/${document.id}`);
-      }
+      router.push(documentRootPath);
     } catch (err) {
       console.error(err);
 

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

@@ -55,7 +55,7 @@ export const DocumentEditPageView = async ({ params, team }: DocumentEditPageVie
   const isRecipient = document?.Recipient.find((recipient) => recipient.email === user.email);
   let canAccessDocument = true;
 
-  if (!isRecipient && document?.userId !== user.id) {
+  if (!isRecipient) {
     canAccessDocument = match([documentVisibility, currentTeamMemberRole])
       .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
       .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)

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

@@ -8,8 +8,8 @@ export type DocumentPageProps = {
   };
 };
 
-export default async function DocumentEditPage({ params }: DocumentPageProps) {
-  await setupI18nSSR();
+export default function DocumentEditPage({ params }: DocumentPageProps) {
+  setupI18nSSR();
 
   return <DocumentEditPageView params={params} />;
 }

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

@@ -6,8 +6,8 @@ import { ChevronLeft, Loader } from 'lucide-react';
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 
-export default async function Loading() {
-  await setupI18nSSR();
+export default function Loading() {
+  setupI18nSSR();
 
   return (
     <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">

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

@@ -58,6 +58,10 @@ export const DocumentLogsDataTable = ({ documentId }: DocumentLogsDataTableProps
     });
   };
 
+  const uppercaseFistLetter = (text: string) => {
+    return text.charAt(0).toUpperCase() + text.slice(1);
+  };
+
   const results = data ?? {
     data: [],
     perPage: 10,

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

@@ -139,7 +139,6 @@ export const DocumentLogsPageView = async ({ params, team }: DocumentLogsPageVie
             className="mr-2"
             documentId={document.id}
             documentStatus={document.status}
-            teamId={team?.id}
           />
 
           <DownloadAuditLogButton teamId={team?.id} documentId={document.id} />

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

@@ -14,14 +14,12 @@ export type DownloadCertificateButtonProps = {
   className?: string;
   documentId: number;
   documentStatus: DocumentStatus;
-  teamId?: number;
 };
 
 export const DownloadCertificateButton = ({
   className,
   documentId,
   documentStatus,
-  teamId,
 }: DownloadCertificateButtonProps) => {
   const { toast } = useToast();
   const { _ } = useLingui();
@@ -31,7 +29,7 @@ export const DownloadCertificateButton = ({
 
   const onDownloadCertificatesClick = async () => {
     try {
-      const { url } = await downloadCertificate({ documentId, teamId });
+      const { url } = await downloadCertificate({ documentId });
 
       const iframe = Object.assign(document.createElement('iframe'), {
         src: url,

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

@@ -8,8 +8,8 @@ export type DocumentsLogsPageProps = {
   };
 };
 
-export default async function DocumentsLogsPage({ params }: DocumentsLogsPageProps) {
-  await setupI18nSSR();
+export default function DocumentsLogsPage({ params }: DocumentsLogsPageProps) {
+  setupI18nSSR();
 
   return <DocumentLogsPageView params={params} />;
 }

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

@@ -8,8 +8,8 @@ export type DocumentPageProps = {
   };
 };
 
-export default async function DocumentPage({ params }: DocumentPageProps) {
-  await setupI18nSSR();
+export default function DocumentPage({ params }: DocumentPageProps) {
+  setupI18nSSR();
 
   return <DocumentPageView params={params} />;
 }

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

@@ -5,8 +5,8 @@ import { ChevronLeft } from 'lucide-react';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 
-export default async function DocumentSentPage() {
-  await setupI18nSSR();
+export default function DocumentSentPage() {
+  setupI18nSSR();
 
   return (
     <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">

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

@@ -37,8 +37,6 @@ import {
 } from '@documenso/ui/primitives/dropdown-menu';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { DocumentRecipientLinkCopyDialog } from '~/components/document/document-recipient-link-copy-dialog';
-
 import { ResendDocumentActionItem } from './_action-items/resend-document';
 import { DeleteDocumentDialog } from './delete-document-dialog';
 import { DuplicateDocumentDialog } from './duplicate-document-dialog';
@@ -71,7 +69,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
   const isOwner = row.User.id === session.user.id;
   // const isRecipient = !!recipient;
   const isDraft = row.status === DocumentStatus.DRAFT;
-  const isPending = row.status === DocumentStatus.PENDING;
+  // const isPending = row.status === DocumentStatus.PENDING;
   const isComplete = row.status === DocumentStatus.COMPLETED;
   // const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
   const isCurrentTeamDocument = team && row.team?.url === team.url;
@@ -193,20 +191,6 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
           <Trans>Share</Trans>
         </DropdownMenuLabel>
 
-        {canManageDocument && (
-          <DocumentRecipientLinkCopyDialog
-            recipients={row.Recipient}
-            trigger={
-              <DropdownMenuItem disabled={!isPending} asChild onSelect={(e) => e.preventDefault()}>
-                <div>
-                  <Copy className="mr-2 h-4 w-4" />
-                  <Trans>Signing Links</Trans>
-                </div>
-              </DropdownMenuItem>
-            }
-          />
-        )}
-
         <ResendDocumentActionItem document={row} recipients={nonSignedRecipients} team={team} />
 
         <DocumentShareButton

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

@@ -78,7 +78,7 @@ export const DocumentsDataTable = ({
       {
         header: _(msg`Status`),
         accessorKey: 'status',
-        cell: ({ row }) => <DocumentStatus status={row.original.status} />,
+        cell: ({ row }) => <DocumentStatus status={row.getValue('status')} />,
         size: 140,
       },
       {

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

@@ -16,7 +16,7 @@ export const metadata: Metadata = {
 };
 
 export default async function DocumentsPage({ searchParams = {} }: DocumentsPageProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { user } = await getRequiredServerComponentSession();
 

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

@@ -23,7 +23,7 @@ export type AuthenticatedDashboardLayoutProps = {
 export default async function AuthenticatedDashboardLayout({
   children,
 }: AuthenticatedDashboardLayoutProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const session = await getServerSession(NEXT_AUTH_OPTIONS);
 

apps/web/src/app/(dashboard)/settings/billing/billing-plans.tsx

@@ -44,11 +44,11 @@ export const BillingPlans = ({ prices }: BillingPlansProps) => {
   const isMounted = useIsMounted();
 
   const [interval, setInterval] = useState<Interval>('month');
-  const [checkoutSessionPriceId, setCheckoutSessionPriceId] = useState<string | null>(null);
+  const [isFetchingCheckoutSession, setIsFetchingCheckoutSession] = useState(false);
 
   const onSubscribeClick = async (priceId: string) => {
     try {
-      setCheckoutSessionPriceId(priceId);
+      setIsFetchingCheckoutSession(true);
 
       const url = await createCheckout({ priceId });
 
@@ -64,7 +64,7 @@ export const BillingPlans = ({ prices }: BillingPlansProps) => {
         variant: 'destructive',
       });
     } finally {
-      setCheckoutSessionPriceId(null);
+      setIsFetchingCheckoutSession(false);
     }
   };
 
@@ -122,8 +122,7 @@ export const BillingPlans = ({ prices }: BillingPlansProps) => {
 
                 <Button
                   className="mt-4"
-                  disabled={checkoutSessionPriceId !== null}
-                  loading={checkoutSessionPriceId === price.id}
+                  loading={isFetchingCheckoutSession}
                   onClick={() => void onSubscribeClick(price.id)}
                 >
                   <Trans>Subscribe</Trans>

apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx

@@ -12,10 +12,9 @@ import { createBillingPortal } from './create-billing-portal.action';
 
 export type BillingPortalButtonProps = {
   buttonProps?: React.ComponentProps<typeof Button>;
-  children?: React.ReactNode;
 };
 
-export const BillingPortalButton = ({ buttonProps, children }: BillingPortalButtonProps) => {
+export const BillingPortalButton = ({ buttonProps }: BillingPortalButtonProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
@@ -64,7 +63,7 @@ export const BillingPortalButton = ({ buttonProps, children }: BillingPortalButt
       onClick={async () => handleFetchPortalUrl()}
       loading={isFetchingPortalUrl}
     >
-      {children || <Trans>Manage Subscription</Trans>}
+      <Trans>Manage Subscription</Trans>
     </Button>
   );
 };

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

@@ -24,7 +24,7 @@ export const metadata: Metadata = {
 };
 
 export default async function BillingSettingsPage() {
-  const { i18n } = await setupI18nSSR();
+  const { i18n } = setupI18nSSR();
 
   let { user } = await getRequiredServerComponentSession();
 
@@ -68,74 +68,60 @@ export default async function BillingSettingsPage() {
 
   return (
     <div>
-      <div className="flex flex-row items-end justify-between">
-        <div>
-          <h3 className="text-2xl font-semibold">
-            <Trans>Billing</Trans>
-          </h3>
+      <h3 className="text-2xl font-semibold">
+        <Trans>Billing</Trans>
+      </h3>
 
-          <div className="text-muted-foreground mt-2 text-sm">
-            {isMissingOrInactiveOrFreePlan && (
+      <div className="text-muted-foreground mt-2 text-sm">
+        {isMissingOrInactiveOrFreePlan && (
+          <p>
+            <Trans>
+              You are currently on the <span className="font-semibold">Free Plan</span>.
+            </Trans>
+          </p>
+        )}
+
+        {/* Todo: Translation */}
+        {!isMissingOrInactiveOrFreePlan &&
+          match(subscription.status)
+            .with('ACTIVE', () => (
               <p>
-                <Trans>
-                  You are currently on the <span className="font-semibold">Free Plan</span>.
-                </Trans>
-              </p>
-            )}
+                {subscriptionProduct ? (
+                  <span>
+                    You are currently subscribed to{' '}
+                    <span className="font-semibold">{subscriptionProduct.name}</span>
+                  </span>
+                ) : (
+                  <span>You currently have an active plan</span>
+                )}
 
-            {/* Todo: Translation */}
-            {!isMissingOrInactiveOrFreePlan &&
-              match(subscription.status)
-                .with('ACTIVE', () => (
-                  <p>
-                    {subscriptionProduct ? (
+                {subscription.periodEnd && (
+                  <span>
+                    {' '}
+                    which is set to{' '}
+                    {subscription.cancelAtPeriodEnd ? (
                       <span>
-                        You are currently subscribed to{' '}
-                        <span className="font-semibold">{subscriptionProduct.name}</span>
+                        end on{' '}
+                        <span className="font-semibold">{i18n.date(subscription.periodEnd)}.</span>
                       </span>
                     ) : (
-                      <span>You currently have an active plan</span>
-                    )}
-
-                    {subscription.periodEnd && (
                       <span>
-                        {' '}
-                        which is set to{' '}
-                        {subscription.cancelAtPeriodEnd ? (
-                          <span>
-                            end on{' '}
-                            <span className="font-semibold">
-                              {i18n.date(subscription.periodEnd)}.
-                            </span>
-                          </span>
-                        ) : (
-                          <span>
-                            automatically renew on{' '}
-                            <span className="font-semibold">
-                              {i18n.date(subscription.periodEnd)}.
-                            </span>
-                          </span>
-                        )}
+                        automatically renew on{' '}
+                        <span className="font-semibold">{i18n.date(subscription.periodEnd)}.</span>
                       </span>
                     )}
-                  </p>
-                ))
-                .with('PAST_DUE', () => (
-                  <p>
-                    <Trans>
-                      Your current plan is past due. Please update your payment information.
-                    </Trans>
-                  </p>
-                ))
-                .otherwise(() => null)}
-          </div>
-        </div>
-
-        {isMissingOrInactiveOrFreePlan && (
-          <BillingPortalButton>
-            <Trans>Manage billing</Trans>
-          </BillingPortalButton>
-        )}
+                  </span>
+                )}
+              </p>
+            ))
+            .with('PAST_DUE', () => (
+              <p>
+                <Trans>
+                  Your current plan is past due. Please update your payment information.
+                </Trans>
+              </p>
+            ))
+            .otherwise(() => null)}
       </div>
 
       <hr className="my-4" />

apps/web/src/app/(dashboard)/settings/layout.tsx

@@ -11,8 +11,8 @@ export type DashboardSettingsLayoutProps = {
   children: React.ReactNode;
 };
 
-export default async function DashboardSettingsLayout({ children }: DashboardSettingsLayoutProps) {
-  await setupI18nSSR();
+export default function DashboardSettingsLayout({ children }: DashboardSettingsLayoutProps) {
+  setupI18nSSR();
 
   return (
     <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">

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

@@ -17,7 +17,7 @@ export const metadata: Metadata = {
 };
 
 export default async function ProfileSettingsPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
   const { user } = await getRequiredServerComponentSession();

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

@@ -5,7 +5,7 @@ import { getUserPublicProfile } from '@documenso/lib/server-only/user/get-user-p
 import { PublicProfilePageView } from './public-profile-page-view';
 
 export default async function Page() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { user } = await getRequiredServerComponentSession();
 

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

@@ -14,8 +14,8 @@ export const metadata: Metadata = {
   title: 'Security activity',
 };
 
-export default async function SettingsSecurityActivityPage() {
-  await setupI18nSSR();
+export default function SettingsSecurityActivityPage() {
+  setupI18nSSR();
 
   const { _ } = useLingui();
 

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

@@ -21,7 +21,7 @@ export const metadata: Metadata = {
 };
 
 export default async function SecuritySettingsPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
   const { user } = await getRequiredServerComponentSession();

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

@@ -17,7 +17,7 @@ export const metadata: Metadata = {
 };
 
 export default async function SettingsManagePasskeysPage() {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
   const isPasskeyEnabled = await getServerComponentFlag('app_passkey');

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

@@ -10,7 +10,7 @@ import DeleteTokenDialog from '~/components/(dashboard)/settings/token/delete-to
 import { ApiTokenForm } from '~/components/forms/token';
 
 export default async function ApiTokensPage() {
-  const { i18n } = await setupI18nSSR();
+  const { i18n } = setupI18nSSR();
 
   const { user } = await getRequiredServerComponentSession();
 

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

@@ -7,7 +7,6 @@ import { useRouter } from 'next/navigation';
 import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 
-import { isValidLanguageCode } from '@documenso/lib/constants/i18n';
 import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
   SKIP_QUERY_BATCH_META,
@@ -152,10 +151,7 @@ export const EditTemplateForm = ({
           globalAccessAuth: data.globalAccessAuth ?? null,
           globalActionAuth: data.globalActionAuth ?? null,
         },
-        meta: {
-          ...data.meta,
-          language: isValidLanguageCode(data.meta.language) ? data.meta.language : undefined,
-        },
+        meta: data.meta,
       });
 
       // Router refresh is here to clear the router cache for when navigating to /documents.

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

@@ -1,14 +0,0 @@
-import React from 'react';
-
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-
-import type { TemplateEditPageViewProps } from './template-edit-page-view';
-import { TemplateEditPageView } from './template-edit-page-view';
-
-type TemplateEditPageProps = Pick<TemplateEditPageViewProps, 'params'>;
-
-export default async function TemplateEditPage({ params }: TemplateEditPageProps) {
-  await setupI18nSSR();
-
-  return <TemplateEditPageView params={params} />;
-}

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

@@ -1,96 +0,0 @@
-import React from 'react';
-
-import Link from 'next/link';
-import { redirect } from 'next/navigation';
-
-import { Trans } from '@lingui/macro';
-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 { 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 { TemplateDirectLinkDialogWrapper } from '../template-direct-link-dialog-wrapper';
-import { EditTemplateForm } from './edit-template';
-
-export type TemplateEditPageViewProps = {
-  params: {
-    id: string;
-  };
-  team?: Team;
-};
-
-export const TemplateEditPageView = async ({ params, team }: TemplateEditPageViewProps) => {
-  const { id } = params;
-
-  const templateId = Number(id);
-  const templateRootPath = formatTemplatesPath(team?.url);
-
-  if (!templateId || Number.isNaN(templateId)) {
-    redirect(templateRootPath);
-  }
-
-  const { user } = await getRequiredServerComponentSession();
-
-  const template = await getTemplateWithDetailsById({
-    id: templateId,
-    userId: user.id,
-  }).catch(() => null);
-
-  if (!template || !template.templateDocumentData) {
-    redirect(templateRootPath);
-  }
-
-  const isTemplateEnterprise = await isUserEnterprise({
-    userId: user.id,
-    teamId: team?.id,
-  });
-
-  return (
-    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col justify-between sm:flex-row">
-        <div>
-          <Link
-            href={`${templateRootPath}/${templateId}`}
-            className="flex items-center text-[#7AC455] hover:opacity-80"
-          >
-            <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-            <Trans>Template</Trans>
-          </Link>
-
-          <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
-            {template.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
-
-            {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"
-        initialTemplate={template}
-        templateRootPath={templateRootPath}
-        isEnterprise={isTemplateEnterprise}
-      />
-    </div>
-  );
-};

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

@@ -1,15 +1,14 @@
+import React from 'react';
+
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 
+import type { TemplatePageViewProps } from './template-page-view';
 import { TemplatePageView } from './template-page-view';
 
-export type TemplatePageProps = {
-  params: {
-    id: string;
-  };
-};
+type TemplatePageProps = Pick<TemplatePageViewProps, 'params'>;
 
-export default async function TemplatePage({ params }: TemplatePageProps) {
-  await setupI18nSSR();
+export default function TemplatePage({ params }: TemplatePageProps) {
+  setupI18nSSR();
 
   return <TemplatePageView params={params} />;
 }

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

@@ -10,13 +10,11 @@ import { Button } from '@documenso/ui/primitives/button';
 
 import { TemplateDirectLinkDialog } from '../template-direct-link-dialog';
 
-export type TemplateDirectLinkDialogWrapperProps = {
+export type TemplatePageViewProps = {
   template: Template & { directLink?: TemplateDirectLink | null; Recipient: Recipient[] };
 };
 
-export const TemplateDirectLinkDialogWrapper = ({
-  template,
-}: TemplateDirectLinkDialogWrapperProps) => {
+export const TemplateDirectLinkDialogWrapper = ({ template }: TemplatePageViewProps) => {
   const [isTemplateDirectLinkOpen, setTemplateDirectLinkOpen] = useState(false);
 
   return (

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

@@ -1,281 +0,0 @@
-'use client';
-
-import { useMemo } from 'react';
-
-import { useSearchParams } from 'next/navigation';
-
-import type { MessageDescriptor } from '@lingui/core';
-import { Trans, msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
-import { InfoIcon } from 'lucide-react';
-import { DateTime } from 'luxon';
-import { z } from 'zod';
-
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';
-import type { Team } from '@documenso/prisma/client';
-import { DocumentSource, DocumentStatus as DocumentStatusEnum } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
-import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { SelectItem } from '@documenso/ui/primitives/select';
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-import { TableCell } from '@documenso/ui/primitives/table';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
-
-import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip';
-import { DocumentSearch } from '~/components/(dashboard)/document-search/document-search';
-import { PeriodSelector } from '~/components/(dashboard)/period-selector/period-selector';
-import { DocumentStatus } from '~/components/formatter/document-status';
-import { SearchParamSelector } from '~/components/forms/search-param-selector';
-
-import { DataTableActionButton } from '../../documents/data-table-action-button';
-import { DataTableActionDropdown } from '../../documents/data-table-action-dropdown';
-import { DataTableTitle } from '../../documents/data-table-title';
-
-const DOCUMENT_SOURCE_LABELS: { [key in DocumentSource]: MessageDescriptor } = {
-  DOCUMENT: msg`Document`,
-  TEMPLATE: msg`Template`,
-  TEMPLATE_DIRECT_LINK: msg`Direct link`,
-};
-
-const ZTemplateSearchParamsSchema = ZBaseTableSearchParamsSchema.extend({
-  source: z
-    .nativeEnum(DocumentSource)
-    .optional()
-    .catch(() => undefined),
-  status: z
-    .nativeEnum(DocumentStatusEnum)
-    .optional()
-    .catch(() => undefined),
-  search: z.coerce
-    .string()
-    .optional()
-    .catch(() => undefined),
-});
-
-type TemplatePageViewDocumentsTableProps = {
-  templateId: number;
-  team?: Team;
-};
-
-export const TemplatePageViewDocumentsTable = ({
-  templateId,
-  team,
-}: TemplatePageViewDocumentsTableProps) => {
-  const { _, i18n } = useLingui();
-
-  const searchParams = useSearchParams();
-  const updateSearchParams = useUpdateSearchParams();
-
-  const parsedSearchParams = ZTemplateSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
-
-  const { data, isLoading, isInitialLoading, isLoadingError } =
-    trpc.document.findDocuments.useQuery(
-      {
-        templateId,
-        teamId: team?.id,
-        page: parsedSearchParams.page,
-        perPage: parsedSearchParams.perPage,
-        search: parsedSearchParams.search,
-        source: parsedSearchParams.source,
-        status: parsedSearchParams.status,
-      },
-      {
-        keepPreviousData: true,
-      },
-    );
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    updateSearchParams({
-      page,
-      perPage,
-    });
-  };
-
-  const results = data ?? {
-    data: [],
-    perPage: 10,
-    currentPage: 1,
-    totalPages: 1,
-  };
-
-  const columns = useMemo(() => {
-    return [
-      {
-        header: _(msg`Created`),
-        accessorKey: 'createdAt',
-        cell: ({ row }) =>
-          i18n.date(row.original.createdAt, { ...DateTime.DATETIME_SHORT, hourCycle: 'h12' }),
-      },
-      {
-        header: _(msg`Title`),
-        cell: ({ row }) => <DataTableTitle row={row.original} teamUrl={team?.url} />,
-      },
-
-      {
-        header: _(msg`Recipient`),
-        accessorKey: 'recipient',
-        cell: ({ row }) => (
-          <StackAvatarsWithTooltip
-            recipients={row.original.Recipient}
-            documentStatus={row.original.status}
-          />
-        ),
-      },
-      {
-        header: _(msg`Status`),
-        accessorKey: 'status',
-        cell: ({ row }) => <DocumentStatus status={row.getValue('status')} />,
-        size: 140,
-      },
-      {
-        header: () => (
-          <div className="flex flex-row items-center">
-            <Trans>Source</Trans>
-            <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">
-                      <Trans>Template</Trans>
-                    </h2>
-
-                    <p>
-                      <Trans>
-                        This document was created by you or a team member using the template above.
-                      </Trans>
-                    </p>
-                  </li>
-
-                  <li>
-                    <h2 className="mb-2 flex flex-row items-center font-semibold">
-                      <Trans>Direct Link</Trans>
-                    </h2>
-
-                    <p>
-                      <Trans>This document was created using a direct link.</Trans>
-                    </p>
-                  </li>
-                </ul>
-              </TooltipContent>
-            </Tooltip>
-          </div>
-        ),
-        accessorKey: 'type',
-        cell: ({ row }) => (
-          <div className="flex flex-row items-center">
-            {_(DOCUMENT_SOURCE_LABELS[row.original.source])}
-          </div>
-        ),
-      },
-      {
-        id: 'actions',
-        header: _(msg`Actions`),
-        cell: ({ row }) => (
-          <div className="flex items-center space-x-2">
-            <DataTableActionButton team={team} row={row.original} />
-
-            <DataTableActionDropdown team={team} row={row.original} />
-          </div>
-        ),
-      },
-    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
-  }, []);
-
-  return (
-    <div>
-      <div className="mb-4 flex flex-row space-x-4">
-        <DocumentSearch />
-
-        <SearchParamSelector
-          paramKey="status"
-          isValueValid={(value) =>
-            [...DocumentStatusEnum.COMPLETED].includes(value as unknown as string)
-          }
-        >
-          <SelectItem value="all">
-            <Trans>Any Status</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.COMPLETED}>
-            <Trans>Completed</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.PENDING}>
-            <Trans>Pending</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.DRAFT}>
-            <Trans>Draft</Trans>
-          </SelectItem>
-        </SearchParamSelector>
-
-        <SearchParamSelector
-          paramKey="source"
-          isValueValid={(value) =>
-            [...DocumentSource.TEMPLATE].includes(value as unknown as string)
-          }
-        >
-          <SelectItem value="all">
-            <Trans>Any Source</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentSource.TEMPLATE}>
-            <Trans>Template</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentSource.TEMPLATE_DIRECT_LINK}>
-            <Trans>Direct Link</Trans>
-          </SelectItem>
-        </SearchParamSelector>
-
-        <PeriodSelector />
-      </div>
-
-      <DataTable
-        columns={columns}
-        data={results.data}
-        perPage={results.perPage}
-        currentPage={results.currentPage}
-        totalPages={results.totalPages}
-        onPaginationChange={onPaginationChange}
-        error={{
-          enable: isLoadingError,
-        }}
-        skeleton={{
-          enable: isLoading && isInitialLoading,
-          rows: 3,
-          component: (
-            <>
-              <TableCell>
-                <Skeleton className="h-4 w-12 rounded-full" />
-              </TableCell>
-              <TableCell>
-                <Skeleton className="h-4 w-24 rounded-full" />
-              </TableCell>
-              <TableCell className="py-4 pr-4">
-                <Skeleton className="h-12 w-12 flex-shrink-0 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 justify-end space-x-2">
-                  <Skeleton className="h-10 w-20 rounded" />
-                </div>
-              </TableCell>
-            </>
-          ),
-        }}
-      >
-        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
-      </DataTable>
-    </div>
-  );
-};

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

@@ -1,66 +0,0 @@
-'use client';
-
-import { useMemo } from 'react';
-
-import { Trans, msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
-import { DateTime } from 'luxon';
-
-import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
-import type { Template, User } from '@documenso/prisma/client';
-
-export type TemplatePageViewInformationProps = {
-  userId: number;
-  template: Template & {
-    User: Pick<User, 'id' | 'name' | 'email'>;
-  };
-};
-
-export const TemplatePageViewInformation = ({
-  template,
-  userId,
-}: TemplatePageViewInformationProps) => {
-  const isMounted = useIsMounted();
-
-  const { _, i18n } = useLingui();
-
-  const templateInformation = useMemo(() => {
-    return [
-      {
-        description: msg`Uploaded by`,
-        value: userId === template.userId ? _(msg`You`) : template.User.name ?? template.User.email,
-      },
-      {
-        description: msg`Created`,
-        value: i18n.date(template.createdAt, { dateStyle: 'medium' }),
-      },
-      {
-        description: msg`Last modified`,
-        value: DateTime.fromJSDate(template.updatedAt)
-          .setLocale(i18n.locales?.[0] || i18n.locale)
-          .toRelative(),
-      },
-    ];
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isMounted, template, userId]);
-
-  return (
-    <section className="dark:bg-background text-foreground border-border bg-widget flex flex-col rounded-xl border">
-      <h1 className="px-4 py-3 font-medium">
-        <Trans>Information</Trans>
-      </h1>
-
-      <ul className="divide-y border-t">
-        {templateInformation.map((item, i) => (
-          <li
-            key={i}
-            className="flex items-center justify-between px-4 py-2.5 text-sm last:border-b"
-          >
-            <span className="text-muted-foreground">{_(item.description)}</span>
-            <span>{item.value}</span>
-          </li>
-        ))}
-      </ul>
-    </section>
-  );
-};

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

@@ -1,163 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-
-import { Trans } from '@lingui/macro';
-import { Loader } from 'lucide-react';
-import { DateTime } from 'luxon';
-import { match } from 'ts-pattern';
-
-import { DocumentSource } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-
-export type TemplatePageViewRecentActivityProps = {
-  templateId: number;
-  teamId?: number;
-  documentRootPath: string;
-};
-
-export const TemplatePageViewRecentActivity = ({
-  templateId,
-  teamId,
-  documentRootPath,
-}: TemplatePageViewRecentActivityProps) => {
-  const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocuments.useQuery({
-    templateId,
-    teamId,
-    orderBy: {
-      column: 'createdAt',
-      direction: 'asc',
-    },
-    perPage: 5,
-  });
-
-  const results = data ?? {
-    data: [],
-    perPage: 10,
-    currentPage: 1,
-    totalPages: 1,
-  };
-
-  return (
-    <section className="dark:bg-background border-border bg-widget flex flex-col rounded-xl border">
-      <div className="flex flex-row items-center justify-between border-b px-4 py-3">
-        <h1 className="text-foreground font-medium">
-          <Trans>Recent documents</Trans>
-        </h1>
-
-        {/* Can add dropdown menu here for additional options. */}
-      </div>
-
-      {isLoading && (
-        <div className="flex h-full items-center justify-center py-16">
-          <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
-        </div>
-      )}
-
-      {isLoadingError && (
-        <div className="flex h-full flex-col items-center justify-center py-16">
-          <p className="text-foreground/80 text-sm">
-            <Trans>Unable to load documents</Trans>
-          </p>
-          <button
-            onClick={async () => refetch()}
-            className="text-foreground/70 hover:text-muted-foreground mt-2 text-sm"
-          >
-            <Trans>Click here to retry</Trans>
-          </button>
-        </div>
-      )}
-
-      {data && (
-        <>
-          <ul role="list" className="space-y-6 p-4">
-            {data.data.length > 0 && results.totalPages > 1 && (
-              <li className="relative flex gap-x-4">
-                <div className="absolute -bottom-6 left-0 top-0 flex w-6 justify-center">
-                  <div className="bg-border w-px" />
-                </div>
-
-                <div className="bg-widget relative flex h-6 w-6 flex-none items-center justify-center">
-                  <div className="bg-widget h-1.5 w-1.5 rounded-full ring-1 ring-gray-300 dark:ring-neutral-600" />
-                </div>
-
-                <button
-                  onClick={() => {
-                    window.scrollTo({
-                      top: document.getElementById('documents')?.offsetTop,
-                      behavior: 'smooth',
-                    });
-                  }}
-                  className="text-foreground/70 hover:text-muted-foreground flex items-center text-xs"
-                >
-                  <Trans>View more</Trans>
-                </button>
-              </li>
-            )}
-
-            {results.data.length === 0 && (
-              <div className="flex items-center justify-center py-4">
-                <p className="text-muted-foreground/70 text-sm">
-                  <Trans>No recent documents</Trans>
-                </p>
-              </div>
-            )}
-
-            {results.data.map((document, documentIndex) => (
-              <li key={document.id} className="relative flex gap-x-4">
-                <div
-                  className={cn(
-                    documentIndex === results.data.length - 1 ? 'h-6' : '-bottom-6',
-                    'absolute left-0 top-0 flex w-6 justify-center',
-                  )}
-                >
-                  <div className="bg-border w-px" />
-                </div>
-
-                <div className="bg-widget text-foreground/40 relative flex h-6 w-6 flex-none items-center justify-center">
-                  <div className="bg-widget h-1.5 w-1.5 rounded-full ring-1 ring-gray-300 dark:ring-neutral-600" />
-                </div>
-
-                <Link
-                  href={`${documentRootPath}/${document.id}`}
-                  className="text-muted-foreground dark:text-muted-foreground/70 flex-auto truncate py-0.5 text-xs leading-5"
-                >
-                  {match(document.source)
-                    .with(DocumentSource.DOCUMENT, DocumentSource.TEMPLATE, () => (
-                      <Trans>
-                        Document created by <span className="font-bold">{document.User.name}</span>
-                      </Trans>
-                    ))
-                    .with(DocumentSource.TEMPLATE_DIRECT_LINK, () => (
-                      <Trans>
-                        Document created using a <span className="font-bold">direct link</span>
-                      </Trans>
-                    ))
-                    .exhaustive()}
-                </Link>
-
-                <time className="text-muted-foreground dark:text-muted-foreground/70 flex-none py-0.5 text-xs leading-5">
-                  {DateTime.fromJSDate(document.createdAt).toRelative({ style: 'short' })}
-                </time>
-              </li>
-            ))}
-          </ul>
-
-          <Button
-            className="mx-4 mb-4"
-            onClick={() => {
-              window.scrollTo({
-                top: document.getElementById('documents')?.offsetTop,
-                behavior: 'smooth',
-              });
-            }}
-          >
-            <Trans>View all related documents</Trans>
-          </Button>
-        </>
-      )}
-    </section>
-  );
-};

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

@@ -1,69 +0,0 @@
-import Link from 'next/link';
-
-import { Trans, msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
-import { PenIcon, PlusIcon } from 'lucide-react';
-
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import type { Recipient, Template } from '@documenso/prisma/client';
-import { AvatarWithText } from '@documenso/ui/primitives/avatar';
-
-export type TemplatePageViewRecipientsProps = {
-  template: Template & {
-    Recipient: Recipient[];
-  };
-  templateRootPath: string;
-};
-
-export const TemplatePageViewRecipients = ({
-  template,
-  templateRootPath,
-}: TemplatePageViewRecipientsProps) => {
-  const { _ } = useLingui();
-
-  const recipients = template.Recipient;
-
-  return (
-    <section className="dark:bg-background border-border bg-widget flex flex-col rounded-xl border">
-      <div className="flex flex-row items-center justify-between px-4 py-3">
-        <h1 className="text-foreground font-medium">
-          <Trans>Recipients</Trans>
-        </h1>
-
-        <Link
-          href={`${templateRootPath}/${template.id}/edit?step=signers`}
-          title={_(msg`Modify recipients`)}
-          className="flex flex-row items-center justify-between"
-        >
-          {recipients.length === 0 ? (
-            <PlusIcon className="ml-2 h-4 w-4" />
-          ) : (
-            <PenIcon className="ml-2 h-3 w-3" />
-          )}
-        </Link>
-      </div>
-
-      <ul className="text-muted-foreground divide-y border-t">
-        {recipients.length === 0 && (
-          <li className="flex flex-col items-center justify-center py-6 text-sm">
-            <Trans>No recipients</Trans>
-          </li>
-        )}
-
-        {recipients.map((recipient) => (
-          <li key={recipient.id} className="flex items-center justify-between px-4 py-2.5 text-sm">
-            <AvatarWithText
-              avatarFallback={recipient.email.slice(0, 1).toUpperCase()}
-              primaryText={<p className="text-muted-foreground text-sm">{recipient.email}</p>}
-              secondaryText={
-                <p className="text-muted-foreground/70 text-xs">
-                  {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
-                </p>
-              }
-            />
-          </li>
-        ))}
-      </ul>
-    </section>
-  );
-};

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

@@ -1,28 +1,22 @@
+import React from 'react';
+
 import Link from 'next/link';
 import { redirect } from 'next/navigation';
 
 import { Trans } from '@lingui/macro';
-import { ChevronLeft, LucideEdit } from 'lucide-react';
+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 { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { DocumentSigningOrder, SigningStatus, type Team } from '@documenso/prisma/client';
-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 { getTemplateWithDetailsById } from '@documenso/lib/server-only/template/get-template-with-details-by-id';
+import { formatTemplatesPath } from '@documenso/lib/utils/teams';
+import type { Team } from '@documenso/prisma/client';
 
-import { DocumentReadOnlyFields } from '~/components/document/document-read-only-fields';
 import { TemplateType } from '~/components/formatter/template-type';
 
-import { DataTableActionDropdown } from '../data-table-action-dropdown';
 import { TemplateDirectLinkBadge } from '../template-direct-link-badge';
-import { UseTemplateDialog } from '../use-template-dialog';
+import { EditTemplateForm } from './edit-template';
 import { TemplateDirectLinkDialogWrapper } from './template-direct-link-dialog-wrapper';
-import { TemplatePageViewDocumentsTable } from './template-page-view-documents-table';
-import { TemplatePageViewInformation } from './template-page-view-information';
-import { TemplatePageViewRecentActivity } from './template-page-view-recent-activity';
-import { TemplatePageViewRecipients } from './template-page-view-recipients';
 
 export type TemplatePageViewProps = {
   params: {
@@ -36,7 +30,6 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
 
   const templateId = Number(id);
   const templateRootPath = formatTemplatesPath(team?.url);
-  const documentRootPath = formatDocumentsPath(team?.url);
 
   if (!templateId || Number.isNaN(templateId)) {
     redirect(templateRootPath);
@@ -44,51 +37,29 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
 
   const { user } = await getRequiredServerComponentSession();
 
-  const template = await getTemplateById({
+  const template = await getTemplateWithDetailsById({
     id: templateId,
     userId: user.id,
-    teamId: team?.id,
   }).catch(() => null);
 
-  if (!template || !template.templateDocumentData || (template?.teamId && !team?.url)) {
+  if (!template || !template.templateDocumentData) {
     redirect(templateRootPath);
   }
 
-  const { templateDocumentData, Field, Recipient: recipients, templateMeta } = template;
-
-  // Remap to fit the DocumentReadOnlyFields component.
-  const readOnlyFields = Field.map((field) => {
-    const recipient = recipients.find((recipient) => recipient.id === field.recipientId) || {
-      name: '',
-      email: '',
-      signingStatus: SigningStatus.NOT_SIGNED,
-    };
-
-    return {
-      ...field,
-      Recipient: recipient,
-      Signature: null,
-    };
+  const isTemplateEnterprise = await isUserEnterprise({
+    userId: user.id,
+    teamId: team?.id,
   });
 
-  const mockedDocumentMeta = templateMeta
-    ? {
-        typedSignatureEnabled: false,
-        ...templateMeta,
-        signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,
-        documentId: 0,
-      }
-    : undefined;
-
   return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link href={templateRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Templates</Trans>
-      </Link>
-
-      <div className="flex flex-row justify-between truncate">
+    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
+      <div className="flex flex-col justify-between sm:flex-row">
         <div>
+          <Link href="/templates" className="flex items-center text-[#7AC455] hover:opacity-80">
+            <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+            <Trans>Templates</Trans>
+          </Link>
+
           <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={template.title}>
             {template.title}
           </h1>
@@ -106,97 +77,17 @@ export const TemplatePageView = async ({ params, team }: TemplatePageViewProps)
           </div>
         </div>
 
-        <div className="mt-2 flex flex-row space-x-4 sm:mt-0 sm:self-end">
+        <div className="mt-2 sm:mt-0 sm:self-end">
           <TemplateDirectLinkDialogWrapper template={template} />
-
-          <Button className="w-full" asChild>
-            <Link href={`${templateRootPath}/${template.id}/edit`}>
-              <LucideEdit className="mr-1.5 h-3.5 w-3.5" />
-              <Trans>Edit Template</Trans>
-            </Link>
-          </Button>
         </div>
       </div>
 
-      <div className="mt-6 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
-              document={template}
-              key={template.id}
-              documentData={templateDocumentData}
-            />
-          </CardContent>
-        </Card>
-
-        <DocumentReadOnlyFields
-          fields={readOnlyFields}
-          showFieldStatus={false}
-          documentMeta={mockedDocumentMeta}
-        />
-
-        <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">
-              <div className="flex flex-row items-center justify-between px-4">
-                <h3 className="text-foreground text-2xl font-semibold">
-                  <Trans>Template</Trans>
-                </h3>
-
-                <div>
-                  <DataTableActionDropdown
-                    row={template}
-                    teamId={team?.id}
-                    templateRootPath={templateRootPath}
-                  />
-                </div>
-              </div>
-
-              <p className="text-muted-foreground mt-2 px-4 text-sm ">
-                <Trans>Manage and view template</Trans>
-              </p>
-
-              <div className="mt-4 border-t px-4 pt-4">
-                <UseTemplateDialog
-                  templateId={template.id}
-                  templateSigningOrder={template.templateMeta?.signingOrder}
-                  recipients={template.Recipient}
-                  documentRootPath={documentRootPath}
-                  trigger={
-                    <Button className="w-full">
-                      <Trans>Use</Trans>
-                    </Button>
-                  }
-                />
-              </div>
-            </section>
-
-            {/* Template information section. */}
-            <TemplatePageViewInformation template={template} userId={user.id} />
-
-            {/* Recipients section. */}
-            <TemplatePageViewRecipients template={template} templateRootPath={templateRootPath} />
-
-            {/* Recent activity section. */}
-            <TemplatePageViewRecentActivity
-              documentRootPath={documentRootPath}
-              templateId={template.id}
-              teamId={team?.id}
-            />
-          </div>
-        </div>
-      </div>
-
-      <div className="mt-16" id="documents">
-        <h1 className="mb-4 text-2xl font-bold">
-          <Trans>Documents created from template</Trans>
-        </h1>
-
-        <TemplatePageViewDocumentsTable team={team} templateId={template.id} />
-      </div>
+      <EditTemplateForm
+        className="mt-6"
+        initialTemplate={template}
+        templateRootPath={templateRootPath}
+        isEnterprise={isTemplateEnterprise}
+      />
     </div>
   );
 };

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

@@ -8,7 +8,7 @@ import { Trans } from '@lingui/macro';
 import { Copy, Edit, MoreHorizontal, MoveRight, Share2Icon, Trash2 } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 
-import type { Recipient, Template, TemplateDirectLink } from '@documenso/prisma/client';
+import { type FindTemplateRow } from '@documenso/lib/server-only/template/find-templates';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -23,10 +23,7 @@ import { MoveTemplateDialog } from './move-template-dialog';
 import { TemplateDirectLinkDialog } from './template-direct-link-dialog';
 
 export type DataTableActionDropdownProps = {
-  row: Template & {
-    directLink?: Pick<TemplateDirectLink, 'token' | 'enabled'> | null;
-    Recipient: Recipient[];
-  };
+  row: FindTemplateRow;
   templateRootPath: string;
   teamId?: number;
 };
@@ -60,7 +57,7 @@ export const DataTableActionDropdown = ({
         <DropdownMenuLabel>Action</DropdownMenuLabel>
 
         <DropdownMenuItem disabled={!isOwner && !isTeamTemplate} asChild>
-          <Link href={`${templateRootPath}/${row.id}/edit`}>
+          <Link href={`${templateRootPath}/${row.id}`}>
             <Edit className="mr-2 h-4 w-4" />
             <Trans>Edit</Trans>
           </Link>

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

@@ -124,7 +124,7 @@ export const TemplatesDataTable = ({
         accessorKey: 'type',
         cell: ({ row }) => (
           <div className="flex flex-row items-center">
-            <TemplateType type={row.original.type} />
+            <TemplateType type="PRIVATE" />
 
             {row.original.directLink?.token && (
               <TemplateDirectLinkBadge
@@ -145,7 +145,6 @@ export const TemplatesDataTable = ({
               <UseTemplateDialog
                 templateId={row.original.id}
                 templateSigningOrder={row.original.templateMeta?.signingOrder}
-                documentDistributionMethod={row.original.templateMeta?.distributionMethod}
                 recipients={row.original.Recipient}
                 documentRootPath={documentRootPath}
               />

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

@@ -73,7 +73,7 @@ export const NewTemplateDialog = ({ teamId, templateRootPath }: NewTemplateDialo
 
       setShowNewTemplateDialog(false);
 
-      router.push(`${templateRootPath}/${id}/edit`);
+      router.push(`${templateRootPath}/${id}`);
     } catch {
       toast({
         title: _(msg`Something went wrong`),

apps/web/src/app/(dashboard)/templates/page.tsx

@@ -15,8 +15,8 @@ export const metadata: Metadata = {
   title: 'Templates',
 };
 
-export default async function TemplatesPage({ searchParams = {} }: TemplatesPageProps) {
-  await setupI18nSSR();
+export default function TemplatesPage({ searchParams = {} }: TemplatesPageProps) {
+  setupI18nSSR();
 
   return <TemplatesPageView searchParams={searchParams} />;
 }

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

@@ -1,5 +1,3 @@
-'use client';
-
 import { useEffect, useState } from 'react';
 
 import { useRouter } from 'next/navigation';
@@ -17,7 +15,7 @@ import {
 } from '@documenso/lib/constants/template';
 import { AppError } from '@documenso/lib/errors/app-error';
 import type { Recipient } from '@documenso/prisma/client';
-import { DocumentDistributionMethod, DocumentSigningOrder } from '@documenso/prisma/client';
+import { DocumentSigningOrder } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -49,7 +47,7 @@ import { useOptionalCurrentTeam } from '~/providers/team';
 
 const ZAddRecipientsForNewDocumentSchema = z
   .object({
-    distributeDocument: z.boolean(),
+    sendDocument: z.boolean(),
     recipients: z.array(
       z.object({
         id: z.number(),
@@ -93,18 +91,14 @@ export type UseTemplateDialogProps = {
   templateId: number;
   templateSigningOrder?: DocumentSigningOrder | null;
   recipients: Recipient[];
-  documentDistributionMethod?: DocumentDistributionMethod;
   documentRootPath: string;
-  trigger?: React.ReactNode;
 };
 
 export function UseTemplateDialog({
   recipients,
-  documentDistributionMethod = DocumentDistributionMethod.EMAIL,
   documentRootPath,
   templateId,
   templateSigningOrder,
-  trigger,
 }: UseTemplateDialogProps) {
   const router = useRouter();
 
@@ -118,7 +112,7 @@ export function UseTemplateDialog({
   const form = useForm<TAddRecipientsForNewDocumentSchema>({
     resolver: zodResolver(ZAddRecipientsForNewDocumentSchema),
     defaultValues: {
-      distributeDocument: false,
+      sendDocument: false,
       recipients: recipients
         .sort((a, b) => (a.signingOrder || 0) - (b.signingOrder || 0))
         .map((recipient) => {
@@ -149,7 +143,7 @@ export function UseTemplateDialog({
         templateId,
         teamId: team?.id,
         recipients: data.recipients,
-        distributeDocument: data.distributeDocument,
+        sendDocument: data.sendDocument,
       });
 
       toast({
@@ -158,16 +152,7 @@ export function UseTemplateDialog({
         duration: 5000,
       });
 
-      let documentPath = `${documentRootPath}/${id}`;
-
-      if (
-        data.distributeDocument &&
-        documentDistributionMethod === DocumentDistributionMethod.NONE
-      ) {
-        documentPath += '?action=view-signing-links';
-      }
-
-      router.push(documentPath);
+      router.push(`${documentRootPath}/${id}`);
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -201,12 +186,10 @@ export function UseTemplateDialog({
   return (
     <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
       <DialogTrigger asChild>
-        {trigger || (
-          <Button variant="outline" className="bg-background">
-            <Plus className="-ml-1 mr-2 h-4 w-4" />
-            <Trans>Use Template</Trans>
-          </Button>
-        )}
+        <Button variant="outline" className="bg-background">
+          <Plus className="-ml-1 mr-2 h-4 w-4" />
+          <Trans>Use Template</Trans>
+        </Button>
       </DialogTrigger>
       <DialogContent className="sm:max-w-lg">
         <DialogHeader>
@@ -306,76 +289,43 @@ export function UseTemplateDialog({
                 <div className="mt-4 flex flex-row items-center">
                   <FormField
                     control={form.control}
-                    name="distributeDocument"
+                    name="sendDocument"
                     render={({ field }) => (
                       <FormItem>
                         <div className="flex flex-row items-center">
                           <Checkbox
-                            id="distributeDocument"
+                            id="sendDocument"
                             className="h-5 w-5"
                             checkClassName="dark:text-white text-primary"
                             checked={field.value}
                             onCheckedChange={field.onChange}
                           />
 
-                          {documentDistributionMethod === DocumentDistributionMethod.EMAIL && (
-                            <label
-                              className="text-muted-foreground ml-2 flex items-center text-sm"
-                              htmlFor="distributeDocument"
-                            >
-                              <Trans>Send document</Trans>
-                              <Tooltip>
-                                <TooltipTrigger type="button">
-                                  <InfoIcon className="mx-1 h-4 w-4" />
-                                </TooltipTrigger>
+                          <label
+                            className="text-muted-foreground ml-2 flex items-center text-sm"
+                            htmlFor="sendDocument"
+                          >
+                            <Trans>Send document</Trans>
+                            <Tooltip>
+                              <TooltipTrigger type="button">
+                                <InfoIcon className="mx-1 h-4 w-4" />
+                              </TooltipTrigger>
 
-                                <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
-                                  <p>
-                                    <Trans>
-                                      The document will be immediately sent to recipients if this is
-                                      checked.
-                                    </Trans>
-                                  </p>
+                              <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
+                                <p>
+                                  <Trans>
+                                    {' '}
+                                    The document will be immediately sent to recipients if this is
+                                    checked.
+                                  </Trans>
+                                </p>
 
-                                  <p>
-                                    <Trans>
-                                      Otherwise, the document will be created as a draft.
-                                    </Trans>
-                                  </p>
-                                </TooltipContent>
-                              </Tooltip>
-                            </label>
-                          )}
-
-                          {documentDistributionMethod === DocumentDistributionMethod.NONE && (
-                            <label
-                              className="text-muted-foreground ml-2 flex items-center text-sm"
-                              htmlFor="distributeDocument"
-                            >
-                              <Trans>Create as pending</Trans>
-                              <Tooltip>
-                                <TooltipTrigger type="button">
-                                  <InfoIcon className="mx-1 h-4 w-4" />
-                                </TooltipTrigger>
-                                <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
-                                  <p>
-                                    <Trans>Create the document as pending and ready to sign.</Trans>
-                                  </p>
-
-                                  <p>
-                                    <Trans>We won't send anything to notify recipients.</Trans>
-                                  </p>
-
-                                  <p className="mt-2">
-                                    <Trans>
-                                      We will generate signing links for you, which you can send to
-                                      the recipients through your method of choice.
-                                    </Trans>
-                                  </p>
-                                </TooltipContent>
-                              </Tooltip>
-                            </label>
-                          )}
+                                <p>
+                                  <Trans>Otherwise, the document will be created as a draft.</Trans>
+                                </p>
+                              </TooltipContent>
+                            </Tooltip>
+                          </label>
                         </div>
                       </FormItem>
                     )}
@@ -391,12 +341,10 @@ export function UseTemplateDialog({
                 </DialogClose>
 
                 <Button type="submit" loading={form.formState.isSubmitting}>
-                  {!form.getValues('distributeDocument') ? (
-                    <Trans>Create as draft</Trans>
-                  ) : documentDistributionMethod === DocumentDistributionMethod.EMAIL ? (
+                  {form.getValues('sendDocument') ? (
                     <Trans>Create and send</Trans>
                   ) : (
-                    <Trans>Create signing links</Trans>
+                    <Trans>Create as draft</Trans>
                   )}
                 </Button>
               </DialogFooter>

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

@@ -1,5 +1,5 @@
-import { msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
+'use client';
+
 import { DateTime } from 'luxon';
 import type { DateTimeFormatOptions } from 'luxon';
 import { UAParser } from 'ua-parser-js';
@@ -25,12 +25,7 @@ const dateFormat: DateTimeFormatOptions = {
   hourCycle: 'h12',
 };
 
-/**
- * DO NOT USE TRANS. YOU MUST USE _ FOR THIS FILE AND ALL CHILDREN COMPONENTS.
- */
 export const AuditLogDataTable = ({ logs }: AuditLogDataTableProps) => {
-  const { _ } = useLingui();
-
   const parser = new UAParser();
 
   const uppercaseFistLetter = (text: string) => {
@@ -41,11 +36,11 @@ export const AuditLogDataTable = ({ logs }: AuditLogDataTableProps) => {
     <Table overflowHidden>
       <TableHeader>
         <TableRow>
-          <TableHead>{_(msg`Time`)}</TableHead>
-          <TableHead>{_(msg`User`)}</TableHead>
-          <TableHead>{_(msg`Action`)}</TableHead>
-          <TableHead>{_(msg`IP Address`)}</TableHead>
-          <TableHead>{_(msg`Browser`)}</TableHead>
+          <TableHead>Time</TableHead>
+          <TableHead>User</TableHead>
+          <TableHead>Action</TableHead>
+          <TableHead>IP Address</TableHead>
+          <TableHead>Browser</TableHead>
         </TableRow>
       </TableHeader>
 
@@ -79,7 +74,7 @@ export const AuditLogDataTable = ({ logs }: AuditLogDataTableProps) => {
             </TableCell>
 
             <TableCell>
-              {uppercaseFistLetter(formatDocumentAuditLogAction(_, log).description)}
+              {uppercaseFistLetter(formatDocumentAuditLogAction(log).description)}
             </TableCell>
 
             <TableCell>{log.ipAddress}</TableCell>

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

@@ -2,18 +2,13 @@ import React from 'react';
 
 import { redirect } from 'next/navigation';
 
-import { msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
 
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-import { DOCUMENT_STATUS } from '@documenso/lib/constants/document';
-import { APP_I18N_OPTIONS, ZSupportedLanguageCodeSchema } from '@documenso/lib/constants/i18n';
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
+import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';
+import { RECIPIENT_ROLES_DESCRIPTION_ENG } 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 { dynamicActivate } from '@documenso/lib/utils/i18n';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 
 import { Logo } from '~/components/branding/logo';
@@ -26,17 +21,7 @@ type AuditLogProps = {
   };
 };
 
-/**
- * DO NOT USE TRANS. YOU MUST USE _ FOR THIS FILE AND ALL CHILDREN COMPONENTS.
- *
- * Cannot use dynamicActivate by itself to translate this specific page and all
- * children components because `not-found.tsx` page runs and overrides the i18n.
- */
 export default async function AuditLog({ searchParams }: AuditLogProps) {
-  const { i18n } = await setupI18nSSR();
-
-  const { _ } = useLingui();
-
   const { d } = searchParams;
 
   if (typeof d !== 'string' || !d) {
@@ -59,10 +44,6 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
     return redirect('/');
   }
 
-  const documentLanguage = ZSupportedLanguageCodeSchema.parse(document.documentMeta?.language);
-
-  await dynamicActivate(i18n, documentLanguage);
-
   const { data: auditLogs } = await findDocumentAuditLogs({
     documentId: documentId,
     userId: document.userId,
@@ -72,35 +53,31 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
   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">{_(msg`Version History`)}</h1>
+        <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">{_(msg`Document ID`)}</span>
+            <span className="font-medium">Document ID</span>
 
             <span className="mt-1 block break-words">{document.id}</span>
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Enclosed Document`)}</span>
+            <span className="font-medium">Enclosed Document</span>
 
             <span className="mt-1 block break-words">{document.title}</span>
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Status`)}</span>
+            <span className="font-medium">Status</span>
 
-            <span className="mt-1 block">
-              {_(
-                document.deletedAt ? msg`Deleted` : DOCUMENT_STATUS[document.status].description,
-              ).toUpperCase()}
-            </span>
+            <span className="mt-1 block">{document.deletedAt ? 'DELETED' : document.status}</span>
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Owner`)}</span>
+            <span className="font-medium">Owner</span>
 
             <span className="mt-1 block break-words">
               {document.User.name} ({document.User.email})
@@ -108,7 +85,7 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Created At`)}</span>
+            <span className="font-medium">Created At</span>
 
             <span className="mt-1 block">
               {DateTime.fromJSDate(document.createdAt)
@@ -118,7 +95,7 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Last Updated`)}</span>
+            <span className="font-medium">Last Updated</span>
 
             <span className="mt-1 block">
               {DateTime.fromJSDate(document.updatedAt)
@@ -128,7 +105,7 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Time Zone`)}</span>
+            <span className="font-medium">Time Zone</span>
 
             <span className="mt-1 block break-words">
               {document.documentMeta?.timezone ?? 'N/A'}
@@ -136,13 +113,13 @@ export default async function AuditLog({ searchParams }: AuditLogProps) {
           </p>
 
           <div>
-            <p className="font-medium">{_(msg`Recipients`)}</p>
+            <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)}]
+                    [{RECIPIENT_ROLES_DESCRIPTION_ENG[recipient.role].roleName}]
                   </span>{' '}
                   {recipient.name} ({recipient.email})
                 </li>

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

@@ -2,24 +2,20 @@ import React from 'react';
 
 import { redirect } from 'next/navigation';
 
-import { msg } from '@lingui/macro';
-import { useLingui } from '@lingui/react';
 import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';
 import { UAParser } from 'ua-parser-js';
 
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-import { APP_I18N_OPTIONS, ZSupportedLanguageCodeSchema } from '@documenso/lib/constants/i18n';
+import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';
 import {
-  RECIPIENT_ROLES_DESCRIPTION,
-  RECIPIENT_ROLE_SIGNING_REASONS,
+  RECIPIENT_ROLES_DESCRIPTION_ENG,
+  RECIPIENT_ROLE_SIGNING_REASONS_ENG,
 } 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 { dynamicActivate } from '@documenso/lib/utils/i18n';
 import { FieldType } from '@documenso/prisma/client';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import {
@@ -40,21 +36,11 @@ type SigningCertificateProps = {
 };
 
 const FRIENDLY_SIGNING_REASONS = {
-  ['__OWNER__']: msg`I am the owner of this document`,
-  ...RECIPIENT_ROLE_SIGNING_REASONS,
+  ['__OWNER__']: `I am the owner of this document`,
+  ...RECIPIENT_ROLE_SIGNING_REASONS_ENG,
 };
 
-/**
- * DO NOT USE TRANS. YOU MUST USE _ FOR THIS FILE AND ALL CHILDREN COMPONENTS.
- *
- * Cannot use dynamicActivate by itself to translate this specific page and all
- * children components because `not-found.tsx` page runs and overrides the i18n.
- */
 export default async function SigningCertificate({ searchParams }: SigningCertificateProps) {
-  const { i18n } = await setupI18nSSR();
-
-  const { _ } = useLingui();
-
   const { d } = searchParams;
 
   if (typeof d !== 'string' || !d) {
@@ -77,10 +63,6 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
     return redirect('/');
   }
 
-  const documentLanguage = ZSupportedLanguageCodeSchema.parse(document.documentMeta?.language);
-
-  await dynamicActivate(i18n, documentLanguage);
-
   const auditLogs = await getDocumentCertificateAuditLogs({
     id: documentId,
   });
@@ -116,17 +98,17 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
     });
 
     let authLevel = match(extractedAuthMethods.derivedRecipientActionAuth)
-      .with('ACCOUNT', () => _(msg`Account Re-Authentication`))
-      .with('TWO_FACTOR_AUTH', () => _(msg`Two-Factor Re-Authentication`))
-      .with('PASSKEY', () => _(msg`Passkey Re-Authentication`))
-      .with('EXPLICIT_NONE', () => _(msg`Email`))
+      .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', () => _(msg`Account Authentication`))
-        .with(null, () => _(msg`Email`))
+        .with('ACCOUNT', () => 'Account Authentication')
+        .with(null, () => 'Email')
         .exhaustive();
     }
 
@@ -165,7 +147,7 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
   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">{_(msg`Signing Certificate`)}</h1>
+        <h1 className="my-8 text-2xl font-bold">Signing Certificate</h1>
       </div>
 
       <Card>
@@ -173,9 +155,9 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
           <Table overflowHidden>
             <TableHeader>
               <TableRow>
-                <TableHead>{_(msg`Signer Events`)}</TableHead>
-                <TableHead>{_(msg`Signature`)}</TableHead>
-                <TableHead>{_(msg`Details`)}</TableHead>
+                <TableHead>Signer Events</TableHead>
+                <TableHead>Signature</TableHead>
+                <TableHead>Details</TableHead>
                 {/* <TableHead>Security</TableHead> */}
               </TableRow>
             </TableHeader>
@@ -191,11 +173,11 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
                       <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)}
+                        {RECIPIENT_ROLES_DESCRIPTION_ENG[recipient.role].roleName}
                       </p>
 
                       <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                        <span className="font-medium">{_(msg`Authentication Level`)}:</span>{' '}
+                        <span className="font-medium">Authentication Level:</span>{' '}
                         <span className="block">{getAuthenticationLevel(recipient.id)}</span>
                       </p>
                     </TableCell>
@@ -217,21 +199,21 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
                           </div>
 
                           <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                            <span className="font-medium">{_(msg`Signature ID`)}:</span>{' '}
+                            <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">{_(msg`IP Address`)}:</span>{' '}
+                            <span className="font-medium">IP Address:</span>{' '}
                             <span className="inline-block">
-                              {logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.ipAddress ?? _(msg`Unknown`)}
+                              {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">{_(msg`Device`)}:</span>{' '}
+                            <span className="font-medium">Device:</span>{' '}
                             <span className="inline-block">
                               {getDevice(logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.userAgent)}
                             </span>
@@ -245,46 +227,44 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
                     <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">{_(msg`Sent`)}:</span>{' '}
+                          <span className="font-medium">Sent:</span>{' '}
                           <span className="inline-block">
                             {logs.EMAIL_SENT[0]
                               ? DateTime.fromJSDate(logs.EMAIL_SENT[0].createdAt)
                                   .setLocale(APP_I18N_OPTIONS.defaultLocale)
                                   .toFormat('yyyy-MM-dd hh:mm:ss a (ZZZZ)')
-                              : _(msg`Unknown`)}
+                              : 'Unknown'}
                           </span>
                         </p>
 
                         <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">{_(msg`Viewed`)}:</span>{' '}
+                          <span className="font-medium">Viewed:</span>{' '}
                           <span className="inline-block">
                             {logs.DOCUMENT_OPENED[0]
                               ? DateTime.fromJSDate(logs.DOCUMENT_OPENED[0].createdAt)
                                   .setLocale(APP_I18N_OPTIONS.defaultLocale)
                                   .toFormat('yyyy-MM-dd hh:mm:ss a (ZZZZ)')
-                              : _(msg`Unknown`)}
+                              : 'Unknown'}
                           </span>
                         </p>
 
                         <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">{_(msg`Signed`)}:</span>{' '}
+                          <span className="font-medium">Signed:</span>{' '}
                           <span className="inline-block">
                             {logs.DOCUMENT_RECIPIENT_COMPLETED[0]
                               ? DateTime.fromJSDate(logs.DOCUMENT_RECIPIENT_COMPLETED[0].createdAt)
                                   .setLocale(APP_I18N_OPTIONS.defaultLocale)
                                   .toFormat('yyyy-MM-dd hh:mm:ss a (ZZZZ)')
-                              : _(msg`Unknown`)}
+                              : 'Unknown'}
                           </span>
                         </p>
 
                         <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">{_(msg`Reason`)}:</span>{' '}
+                          <span className="font-medium">Reason:</span>{' '}
                           <span className="inline-block">
-                            {_(
-                              isOwner(recipient.email)
-                                ? FRIENDLY_SIGNING_REASONS['__OWNER__']
-                                : FRIENDLY_SIGNING_REASONS[recipient.role],
-                            )}
+                            {isOwner(recipient.email)
+                              ? FRIENDLY_SIGNING_REASONS['__OWNER__']
+                              : FRIENDLY_SIGNING_REASONS[recipient.role]}
                           </span>
                         </p>
                       </div>
@@ -300,7 +280,7 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
       <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">
-            {_(msg`Signing certificate provided by`)}:
+            Signing certificate provided by:
           </p>
 
           <Logo className="max-h-6 print:max-h-4" />

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

@@ -14,7 +14,7 @@ type PublicProfileLayoutProps = {
 };
 
 export default async function PublicProfileLayout({ children }: PublicProfileLayoutProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { user, session } = await getServerComponentSession();
 

apps/web/src/app/(profile)/p/[url]/page.tsx

@@ -42,7 +42,7 @@ const BADGE_DATA = {
 };
 
 export default async function PublicProfilePage({ params }: PublicProfilePageProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { url: profileUrl } = params;
 

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

@@ -7,7 +7,7 @@ import { useRouter, useSearchParams } from 'next/navigation';
 import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
+import { RECIPIENT_ROLES_DESCRIPTION_ENG } 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';
@@ -53,9 +53,7 @@ export const DirectTemplatePageView = ({
   const [step, setStep] = useState<DirectTemplateStep>('configure');
   const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
 
-  const recipientActionVerb = _(
-    RECIPIENT_ROLES_DESCRIPTION[directTemplateRecipient.role].actionVerb,
-  );
+  const recipientRoleDescription = RECIPIENT_ROLES_DESCRIPTION_ENG[directTemplateRecipient.role];
 
   const directTemplateFlow: Record<DirectTemplateStep, DocumentFlowStep> = {
     configure: {
@@ -64,8 +62,9 @@ export const DirectTemplatePageView = ({
       stepIndex: 1,
     },
     sign: {
-      title: msg`${recipientActionVerb} document`,
-      description: msg`${recipientActionVerb} the document to complete the process.`,
+      // Todo: Translations
+      title: msg`${recipientRoleDescription.actionVerb} document`,
+      description: msg`${recipientRoleDescription.actionVerb} the document to complete the process.`,
       stepIndex: 2,
     },
   };

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

@@ -24,7 +24,7 @@ export type TemplatesDirectPageProps = {
 };
 
 export default async function TemplatesDirectPage({ params }: TemplatesDirectPageProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { token } = params;
 

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

@@ -193,6 +193,7 @@ export const SignDirectTemplateForm = ({
                   field={field}
                   recipient={directRecipient}
                   onSignField={onSignField}
+                  onUnsignField={onUnsignField}
                 />
               ))
               .with(FieldType.NAME, () => (
@@ -201,6 +202,7 @@ export const SignDirectTemplateForm = ({
                   field={field}
                   recipient={directRecipient}
                   onSignField={onSignField}
+                  onUnsignField={onUnsignField}
                 />
               ))
               .with(FieldType.DATE, () => (
@@ -211,6 +213,7 @@ export const SignDirectTemplateForm = ({
                   dateFormat={template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT}
                   timezone={template.templateMeta?.timezone ?? DEFAULT_DOCUMENT_TIME_ZONE}
                   onSignField={onSignField}
+                  onUnsignField={onUnsignField}
                 />
               ))
               .with(FieldType.EMAIL, () => (
@@ -219,6 +222,7 @@ export const SignDirectTemplateForm = ({
                   field={field}
                   recipient={directRecipient}
                   onSignField={onSignField}
+                  onUnsignField={onUnsignField}
                 />
               ))
               .with(FieldType.TEXT, () => {

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

@@ -19,7 +19,7 @@ type RecipientLayoutProps = {
  * Such as direct template access, or signing.
  */
 export default async function RecipientLayout({ children }: RecipientLayoutProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { user, session } = await getServerComponentSession();
 

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

@@ -8,8 +8,8 @@ export type SigningLayoutProps = {
   children: React.ReactNode;
 };
 
-export default async function SigningLayout({ children }: SigningLayoutProps) {
-  await setupI18nSSR();
+export default function SigningLayout({ children }: SigningLayoutProps) {
+  setupI18nSSR();
 
   return (
     <div>

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

@@ -40,7 +40,7 @@ export type CompletedSigningPageProps = {
 export default async function CompletedSigningPage({
   params: { token },
 }: CompletedSigningPageProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { _ } = useLingui();
 

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useTransition } from 'react';
+import { useTransition } from 'react';
 
 import { useRouter } from 'next/navigation';
 
@@ -25,7 +25,6 @@ import type {
 } from '@documenso/trpc/server/field-router/schema';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useRequiredDocumentAuthContext } from './document-auth-provider';
 import { SigningFieldContainer } from './signing-field-container';
 
 export type DateFieldProps = {
@@ -43,6 +42,7 @@ export const DateField = ({
   dateFormat = DEFAULT_DOCUMENT_DATE_FORMAT,
   timezone = DEFAULT_DOCUMENT_TIME_ZONE,
   onSignField,
+  onUnsignField,
 }: DateFieldProps) => {
   const router = useRouter();
 
@@ -54,13 +54,13 @@ export const DateField = ({
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const { isLoading: isRemoveSignedFieldWithTokenLoading } =
-    trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  const {
+    mutateAsync: removeSignedFieldWithToken,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
+  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 
-  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
-
   const localDateString = convertToLocalSystemFormat(field.customText, dateFormat, timezone);
 
   const isDifferentTime = field.inserted && localDateString !== field.customText;
@@ -103,18 +103,37 @@ export const DateField = ({
     }
   };
 
-  useEffect(() => {
-    if (!field.inserted) {
-      void executeActionAuthProcedure({
-        onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
-        actionTarget: field.type,
+  const onRemove = async () => {
+    try {
+      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+        token: recipient.token,
+        fieldId: field.id,
+      };
+
+      if (onUnsignField) {
+        await onUnsignField(payload);
+        return;
+      }
+
+      await removeSignedFieldWithToken(payload);
+
+      startTransition(() => router.refresh());
+    } catch (err) {
+      console.error(err);
+
+      toast({
+        title: _(msg`Error`),
+        description: _(msg`An error occurred while removing the signature.`),
+        variant: 'destructive',
       });
     }
-  }, [field]);
+  };
 
   return (
     <SigningFieldContainer
       field={field}
+      onSign={onSign}
+      onRemove={onRemove}
       type="Date"
       tooltipText={isDifferentTime ? tooltipText : undefined}
     >

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useTransition } from 'react';
+import { useTransition } from 'react';
 
 import { useRouter } from 'next/navigation';
 
@@ -14,10 +14,12 @@ import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import type { Recipient } from '@documenso/prisma/client';
 import type { FieldWithSignature } from '@documenso/prisma/types/field-with-signature';
 import { trpc } from '@documenso/trpc/react';
-import type { TSignFieldWithTokenMutationSchema } from '@documenso/trpc/server/field-router/schema';
+import type {
+  TRemovedSignedFieldWithTokenMutationSchema,
+  TSignFieldWithTokenMutationSchema,
+} from '@documenso/trpc/server/field-router/schema';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useRequiredDocumentAuthContext } from './document-auth-provider';
 import { useRequiredSigningContext } from './provider';
 import { SigningFieldContainer } from './signing-field-container';
 
@@ -25,9 +27,10 @@ export type EmailFieldProps = {
   field: FieldWithSignature;
   recipient: Recipient;
   onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
+  onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
 };
 
-export const EmailField = ({ field, recipient, onSignField }: EmailFieldProps) => {
+export const EmailField = ({ field, recipient, onSignField, onUnsignField }: EmailFieldProps) => {
   const router = useRouter();
 
   const { _ } = useLingui();
@@ -40,13 +43,13 @@ export const EmailField = ({ field, recipient, onSignField }: EmailFieldProps) =
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
-  const { isLoading: isRemoveSignedFieldWithTokenLoading } =
-    trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
+  const {
+    mutateAsync: removeSignedFieldWithToken,
+    isLoading: isRemoveSignedFieldWithTokenLoading,
+  } = trpc.field.removeSignedFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
   const isLoading = isSignFieldWithTokenLoading || isRemoveSignedFieldWithTokenLoading || isPending;
 
-  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
-
   const onSign = async (authOptions?: TRecipientActionAuth) => {
     try {
       const value = providedEmail ?? '';
@@ -84,17 +87,34 @@ export const EmailField = ({ field, recipient, onSignField }: EmailFieldProps) =
     }
   };
 
-  useEffect(() => {
-    if (!field.inserted) {
-      void executeActionAuthProcedure({
-        onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
-        actionTarget: field.type,
+  const onRemove = async () => {
+    try {
+      const payload: TRemovedSignedFieldWithTokenMutationSchema = {
+        token: recipient.token,
+        fieldId: field.id,
+      };
+
+      if (onUnsignField) {
+        await onUnsignField(payload);
+        return;
+      }
+
+      await removeSignedFieldWithToken(payload);
+
+      startTransition(() => router.refresh());
+    } catch (err) {
+      console.error(err);
+
+      toast({
+        title: _(msg`Error`),
+        description: _(msg`An error occurred while removing the signature.`),
+        variant: 'destructive',
       });
     }
-  }, [field]);
+  };
 
   return (
-    <SigningFieldContainer field={field} type="Email">
+    <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove} type="Email">
       {isLoading && (
         <div className="bg-background absolute inset-0 flex items-center justify-center rounded-md">
           <Loader className="text-primary h-5 w-5 animate-spin md:h-8 md:w-8" />

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useTransition } from 'react';
+import { useTransition } from 'react';
 
 import { useRouter } from 'next/navigation';
 
@@ -8,7 +8,6 @@ import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { Loader } from 'lucide-react';
 
-import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -22,7 +21,6 @@ import type {
 } from '@documenso/trpc/server/field-router/schema';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useRequiredDocumentAuthContext } from './document-auth-provider';
 import { useRequiredSigningContext } from './provider';
 import { SigningFieldContainer } from './signing-field-container';
 
@@ -46,12 +44,8 @@ export const InitialsField = ({
   const { fullName } = useRequiredSigningContext();
   const initials = extractInitials(fullName);
 
-  const debouncedInitials = useDebouncedValue(initials, 2000);
-
   const [isPending, startTransition] = useTransition();
 
-  const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
-
   const { mutateAsync: signFieldWithToken, isLoading: isSignFieldWithTokenLoading } =
     trpc.field.signFieldWithToken.useMutation(DO_NOT_INVALIDATE_QUERY_ON_MUTATION);
 
@@ -64,7 +58,7 @@ export const InitialsField = ({
 
   const onSign = async (authOptions?: TRecipientActionAuth) => {
     try {
-      const value = debouncedInitials ?? '';
+      const value = initials ?? '';
 
       const payload: TSignFieldWithTokenMutationSchema = {
         token: recipient.token,
@@ -125,15 +119,6 @@ export const InitialsField = ({
     }
   };
 
-  useEffect(() => {
-    if (!field.inserted && debouncedInitials) {
-      void executeActionAuthProcedure({
-        onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
-        actionTarget: field.type,
-      });
-    }
-  }, [field, debouncedInitials, field.inserted]);
-
   return (
     <SigningFieldContainer field={field} onSign={onSign} onRemove={onRemove} type="Initials">
       {isLoading && (

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

@@ -13,7 +13,7 @@ export type SigningLayoutProps = {
 };
 
 export default async function SigningLayout({ children }: SigningLayoutProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   const { user, session } = await getServerComponentSession();
 

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

@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState, useTransition } from 'react';
+import { useState, useTransition } from 'react';
 
 import { useRouter } from 'next/navigation';
 
@@ -8,7 +8,6 @@ import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { Loader } from 'lucide-react';
 
-import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
 import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION } from '@documenso/lib/constants/trpc';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
@@ -45,8 +44,6 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
   const { fullName: providedFullName, setFullName: setProvidedFullName } =
     useRequiredSigningContext();
 
-  const debouncedProvidedFullName = useDebouncedValue(providedFullName, 2000);
-
   const { executeActionAuthProcedure } = useRequiredDocumentAuthContext();
 
   const [isPending, startTransition] = useTransition();
@@ -154,15 +151,6 @@ export const NameField = ({ field, recipient, onSignField, onUnsignField }: Name
     }
   };
 
-  useEffect(() => {
-    if (!field.inserted && providedFullName) {
-      void executeActionAuthProcedure({
-        onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
-        actionTarget: field.type,
-      });
-    }
-  }, [field, debouncedProvidedFullName]);
-
   return (
     <SigningFieldContainer
       field={field}

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

@@ -31,7 +31,7 @@ export type SigningPageProps = {
 };
 
 export default async function SigningPage({ params: { token } }: SigningPageProps) {
-  await setupI18nSSR();
+  setupI18nSSR();
 
   if (!token) {
     return notFound();
@@ -99,10 +99,6 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
 
   const { documentMeta } = document;
 
-  if (recipient.signingStatus === SigningStatus.REJECTED) {
-    return redirect(`/sign/${token}/rejected`);
-  }
-
   if (
     document.status === DocumentStatus.COMPLETED ||
     recipient.signingStatus === SigningStatus.SIGNED

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

@@ -1,170 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-
-import { useRouter, useSearchParams } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Trans, msg } from '@lingui/macro';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import type { Document } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
-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,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Textarea } from '@documenso/ui/primitives/textarea';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-const ZRejectDocumentFormSchema = z.object({
-  reason: z
-    .string()
-    .min(5, msg`Please provide a reason`)
-    .max(500, msg`Reason must be less than 500 characters`),
-});
-
-type TRejectDocumentFormSchema = z.infer<typeof ZRejectDocumentFormSchema>;
-
-export interface RejectDocumentDialogProps {
-  document: Pick<Document, 'id'>;
-  token: string;
-}
-
-export function RejectDocumentDialog({ document, token }: RejectDocumentDialogProps) {
-  const { toast } = useToast();
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const [isOpen, setIsOpen] = useState(false);
-
-  const { mutateAsync: rejectDocumentWithToken } =
-    trpc.recipient.rejectDocumentWithToken.useMutation();
-
-  const form = useForm<TRejectDocumentFormSchema>({
-    resolver: zodResolver(ZRejectDocumentFormSchema),
-    defaultValues: {
-      reason: '',
-    },
-  });
-
-  const onRejectDocument = async ({ reason }: TRejectDocumentFormSchema) => {
-    try {
-      // TODO: Add trpc mutation here
-      await rejectDocumentWithToken({
-        documentId: document.id,
-        token,
-        reason,
-      });
-
-      toast({
-        title: 'Document rejected',
-        description: 'The document has been successfully rejected.',
-        duration: 5000,
-      });
-
-      setIsOpen(false);
-
-      router.push(`/sign/${token}/rejected`);
-    } catch (err) {
-      toast({
-        title: 'Error',
-        description: 'An error occurred while rejecting the document. Please try again.',
-        variant: 'destructive',
-        duration: 5000,
-      });
-    }
-  };
-
-  useEffect(() => {
-    if (searchParams?.get('reject') === 'true') {
-      setIsOpen(true);
-    }
-  }, []);
-
-  useEffect(() => {
-    if (!isOpen) {
-      form.reset();
-    }
-  }, [isOpen]);
-
-  return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
-      <DialogTrigger asChild>
-        <Button variant="outline">
-          <Trans>Reject Document</Trans>
-        </Button>
-      </DialogTrigger>
-
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Reject Document</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            <Trans>
-              Are you sure you want to reject this document? This action cannot be undone.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onRejectDocument)} className="space-y-4">
-            <FormField
-              control={form.control}
-              name="reason"
-              render={({ field }) => (
-                <FormItem>
-                  <FormControl>
-                    <Textarea
-                      {...field}
-                      rows={4}
-                      placeholder="Please provide a reason for rejecting this document"
-                      disabled={form.formState.isSubmitting}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <DialogFooter>
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={() => setIsOpen(false)}
-                disabled={form.formState.isSubmitting}
-              >
-                <Trans>Cancel</Trans>
-              </Button>
-
-              <Button
-                type="submit"
-                variant="destructive"
-                loading={form.formState.isSubmitting}
-                disabled={!form.formState.isValid}
-              >
-                <Trans>Reject Document</Trans>
-              </Button>
-            </DialogFooter>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-}

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

@@ -1,110 +0,0 @@
-import Link from 'next/link';
-import { notFound } from 'next/navigation';
-
-import { Trans } from '@lingui/macro';
-import { XCircle } from 'lucide-react';
-
-import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
-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 { FieldType } from '@documenso/prisma/client';
-import { Badge } from '@documenso/ui/primitives/badge';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { truncateTitle } from '~/helpers/truncate-title';
-
-import { SigningAuthPageView } from '../signing-auth-page';
-
-export type RejectedSigningPageProps = {
-  params: {
-    token?: string;
-  };
-};
-
-export default async function RejectedSigningPage({ params: { token } }: RejectedSigningPageProps) {
-  await setupI18nSSR();
-
-  if (!token) {
-    return notFound();
-  }
-
-  const { user } = await getServerComponentSession();
-
-  const document = await getDocumentAndSenderByToken({
-    token,
-    requireAccessAuth: false,
-  }).catch(() => null);
-
-  if (!document) {
-    return notFound();
-  }
-
-  const truncatedTitle = truncateTitle(document.title);
-
-  const [fields, recipient] = await Promise.all([
-    getFieldsForToken({ token }),
-    getRecipientByToken({ token }).catch(() => null),
-  ]);
-
-  if (!recipient) {
-    return notFound();
-  }
-
-  const isDocumentAccessValid = await isRecipientAuthorized({
-    type: 'ACCESS',
-    documentAuthOptions: document.authOptions,
-    recipient,
-    userId: user?.id,
-  });
-
-  if (!isDocumentAccessValid) {
-    return <SigningAuthPageView email={recipient.email} />;
-  }
-
-  const recipientName =
-    recipient.name ||
-    fields.find((field) => field.type === FieldType.NAME)?.customText ||
-    recipient.email;
-
-  return (
-    <div className="flex flex-col items-center pt-24 lg:pt-36 xl:pt-44">
-      <Badge variant="neutral" size="default" className="mb-6 rounded-xl border bg-transparent">
-        {truncatedTitle}
-      </Badge>
-
-      <div className="flex flex-col items-center">
-        <div className="flex items-center gap-x-4">
-          <XCircle className="text-destructive h-10 w-10" />
-
-          <h2 className="max-w-[35ch] text-center text-2xl font-semibold leading-normal md:text-3xl lg:text-4xl">
-            <Trans>Document Rejected</Trans>
-          </h2>
-        </div>
-
-        <div className="text-destructive mt-4 flex items-center text-center text-sm">
-          <Trans>You have rejected this document</Trans>
-        </div>
-
-        <p className="text-muted-foreground mt-6 max-w-[60ch] text-center text-sm">
-          <Trans>
-            The document owner has been notified of your decision. They may contact you with further
-            instructions if necessary.
-          </Trans>
-        </p>
-
-        <p className="text-muted-foreground mt-2 max-w-[60ch] text-center text-sm">
-          <Trans>No further action is required from you at this time.</Trans>
-        </p>
-
-        {user && (
-          <Button className="mt-6" asChild>
-            <Link href={`/`}>Return Home</Link>
-          </Button>
-        )}
-      </div>
-    </div>
-  );
-}

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

@@ -68,8 +68,6 @@ export const SigningFieldContainer = ({
   const parsedFieldMeta = field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined;
   const readOnlyField = parsedFieldMeta?.readOnly || false;
 
-  const automatedFields = ['Email', 'Date'].includes(type ?? '');
-
   const handleInsertField = async () => {
     if (field.inserted || !onSign) {
       return;
@@ -148,7 +146,7 @@ export const SigningFieldContainer = ({
           </button>
         )}
 
-        {field.inserted && !automatedFields && !loading && !readOnlyField && (
+        {type === 'Date' && field.inserted && !loading && !readOnlyField && (
           <Tooltip delayDuration={0}>
             <TooltipTrigger asChild>
               <button
@@ -174,18 +172,14 @@ export const SigningFieldContainer = ({
           </button>
         )}
 
-        {type !== 'Checkbox' &&
-          !automatedFields &&
-          field.inserted &&
-          !loading &&
-          !readOnlyField && (
-            <button
-              className="text-destructive bg-background/50 absolute inset-0 z-10 flex h-full w-full items-center justify-center rounded-md text-sm opacity-0 duration-200 group-hover:opacity-100"
-              onClick={onRemoveSignedFieldClick}
-            >
-              Remove
-            </button>
-          )}
+        {type !== 'Date' && type !== 'Checkbox' && field.inserted && !loading && !readOnlyField && (
+          <button
+            className="text-destructive bg-background/50 absolute inset-0 z-10 flex h-full w-full items-center justify-center rounded-md text-sm opacity-0 duration-200 group-hover:opacity-100"
+            onClick={onRemoveSignedFieldClick}
+          >
+            <Trans>Remove</Trans>
+          </button>
+        )}
 
         {children}
       </FieldRootContainer>