From d121392f744d4a124bc74df6236477d5b65d286b Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Tue, 18 Nov 2025 13:08:44 +1100
Subject: [PATCH] fix: envelope template recipient placeholders

---
 .../envelope-editor-header.tsx                |  2 +-
 .../envelope-editor-recipient-form.tsx        | 32 ++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx
index 420f8b5b1..216ca0119 100644
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx
@@ -44,7 +44,7 @@ export default function EnvelopeEditorHeader() {
     <nav className="bg-background border-border w-full border-b px-4 py-3 md:px-6">
       <div className="flex items-center justify-between">
         <div className="flex items-center space-x-4">
-          <Link to="/">
+          <Link to={relativePath.basePath}>
             <BrandingLogo className="h-6 w-auto" />
           </Link>
           <Separator orientation="vertical" className="h-6" />
diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx
index 18e0d077e..67bad9d6c 100644
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx
@@ -22,12 +22,14 @@ import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounce
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isTemplateRecipientEmailPlaceholder } from '@documenso/lib/constants/template';
 import {
   ZRecipientActionAuthTypesSchema,
   ZRecipientAuthOptionsSchema,
 } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
 import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
+import { generateRecipientPlaceholder } from '@documenso/lib/utils/templates';
 import { trpc } from '@documenso/trpc/react';
 import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 import { RecipientActionAuthSelect } from '@documenso/ui/components/recipient/recipient-action-auth-select';
@@ -82,7 +84,8 @@ const ZEnvelopeRecipientsForm = z.object({
 type TEnvelopeRecipientsForm = z.infer<typeof ZEnvelopeRecipientsForm>;
 
 export const EnvelopeEditorRecipientForm = () => {
-  const { envelope, setRecipientsDebounced, updateEnvelope } = useCurrentEnvelopeEditor();
+  const { envelope, setRecipientsDebounced, updateEnvelope, isTemplate } =
+    useCurrentEnvelopeEditor();
 
   const organisation = useCurrentOrganisation();
 
@@ -119,6 +122,7 @@ export const EnvelopeEditorRecipientForm = () => {
       role: RecipientRole.SIGNER,
       signingOrder: 1,
       actionAuth: [],
+      ...(isTemplate ? generateRecipientPlaceholder(1) : {}),
     },
   ];
 
@@ -234,14 +238,27 @@ export const EnvelopeEditorRecipientForm = () => {
   };
 
   const onAddSigner = () => {
-    appendSigner({
+    let newRecipient = {
       formId: nanoid(12),
       name: '',
       email: '',
       role: RecipientRole.SIGNER,
       actionAuth: [],
       signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
-    });
+    };
+
+    if (isTemplate) {
+      const placeholderRecipientCount = signers.length > 1 ? signers.length + 1 : 2;
+
+      newRecipient = {
+        ...newRecipient,
+        ...generateRecipientPlaceholder(placeholderRecipientCount),
+      };
+    }
+
+    appendSigner(newRecipient);
+
+    void form.trigger('signers');
   };
 
   const onRemoveSigner = (index: number) => {
@@ -806,7 +823,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                       })}
                                     >
                                       {!showAdvancedSettings && index === 0 && (
-                                        <FormLabel required>
+                                        <FormLabel required={!isTemplate}>
                                           <Trans>Email</Trans>
                                         </FormLabel>
                                       )}
@@ -815,7 +832,12 @@ export const EnvelopeEditorRecipientForm = () => {
                                         <RecipientAutoCompleteInput
                                           type="email"
                                           placeholder={t`Email`}
-                                          value={field.value}
+                                          value={
+                                            isTemplate &&
+                                            isTemplateRecipientEmailPlaceholder(field.value)
+                                              ? ''
+                                              : field.value
+                                          }
                                           disabled={
                                             snapshot.isDragging ||
                                             isSubmitting ||