From d91a3e38288da3d8d22ba9150a8aa881c95da12c Mon Sep 17 00:00:00 2001
From: Catalin Pit <catalinpit@gmail.com>
Date: Fri, 11 Sep 2026 09:38:44 +0300
Subject: [PATCH] feat: add allow document rejection setting to document
 preferences

Adds an allowDocumentRejection column to organisation settings (default
true), team settings (nullable, inherits from the organisation) and
document meta (default true), with the migration.

Adds the "Allow Document Rejection" field to the organisation and team
document preferences form, wires it through the settings pages, and lists
it in the reset-to-defaults dialog and the admin settings section. Adds a
per-document Yes/No field to the envelope editor settings dialog.

Exposes the field on the document meta create/update schemas and the
document, envelope, template and editor envelope response schemas, and
hides the reject dialog on the V1 signing page when the document
disallows rejection.
---
 .../document-preferences-reset-dialog.tsx     |  3 +
 .../forms/document-preferences-form.tsx       | 58 +++++++++++++++++++
 .../general/admin-global-settings-section.tsx |  6 ++
 .../document-signing-page-view-v1.tsx         |  4 +-
 .../envelope-editor-settings-dialog.tsx       | 50 ++++++++++++++++
 .../o.$orgUrl.settings.document.tsx           |  3 +
 .../t.$teamUrl+/settings.document.tsx         |  2 +
 packages/lib/types/document-meta.ts           |  6 ++
 packages/lib/types/document.ts                |  1 +
 packages/lib/types/envelope-editor.ts         |  1 +
 packages/lib/types/envelope.ts                |  1 +
 packages/lib/types/template.ts                |  1 +
 .../migration.sql                             |  8 +++
 packages/prisma/schema.prisma                 |  4 ++
 14 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 packages/prisma/migrations/20260910120000_add_allow_document_rejection_setting/migration.sql

diff --git a/apps/remix/app/components/dialogs/document-preferences-reset-dialog.tsx b/apps/remix/app/components/dialogs/document-preferences-reset-dialog.tsx
index ed7184ef7..f493331ae 100644
--- a/apps/remix/app/components/dialogs/document-preferences-reset-dialog.tsx
+++ b/apps/remix/app/components/dialogs/document-preferences-reset-dialog.tsx
@@ -96,6 +96,9 @@ export const DocumentPreferencesResetDialog = ({
               <li>
                 <Trans>Delegate document ownership</Trans>
               </li>
+              <li>
+                <Trans>Allow document rejection</Trans>
+              </li>
               {showAiFeatures && (
                 <li>
                   <Trans>AI features</Trans>
diff --git a/apps/remix/app/components/forms/document-preferences-form.tsx b/apps/remix/app/components/forms/document-preferences-form.tsx
index 29e566c79..d9465d2cb 100644
--- a/apps/remix/app/components/forms/document-preferences-form.tsx
+++ b/apps/remix/app/components/forms/document-preferences-form.tsx
@@ -43,6 +43,7 @@ export type TDocumentPreferencesFormSchema = {
   signatureTypes: DocumentSignatureType[];
   defaultRecipients: TDefaultRecipients | null;
   delegateDocumentOwnership: boolean | null;
+  allowDocumentRejection: boolean | null;
   aiFeaturesEnabled: boolean | null;
 };
 
@@ -57,6 +58,7 @@ type SettingsSubset = Pick<
   | 'drawSignatureEnabled'
   | 'defaultRecipients'
   | 'delegateDocumentOwnership'
+  | 'allowDocumentRejection'
   | 'aiFeaturesEnabled'
 >;
 
@@ -77,6 +79,7 @@ const getDocumentPreferencesFormValues = (settings: SettingsSubset): TDocumentPr
     signatureTypes: extractTeamSignatureSettings({ ...settings }),
     defaultRecipients: settings.defaultRecipients ? ZDefaultRecipientsSchema.parse(settings.defaultRecipients) : null,
     delegateDocumentOwnership: settings.delegateDocumentOwnership,
+    allowDocumentRejection: settings.allowDocumentRejection,
     aiFeaturesEnabled: settings.aiFeaturesEnabled,
   };
 };
@@ -101,6 +104,7 @@ export const DocumentPreferencesForm = ({ settings, onFormSubmit, canInherit }:
     }),
     defaultRecipients: ZDefaultRecipientsSchema.nullable(),
     delegateDocumentOwnership: z.boolean().nullable(),
+    allowDocumentRejection: z.boolean().nullable(),
     aiFeaturesEnabled: z.boolean().nullable(),
   });
 
@@ -486,6 +490,60 @@ export const DocumentPreferencesForm = ({ settings, onFormSubmit, canInherit }:
             )}
           />
 
+          <FormField
+            control={form.control}
+            name="allowDocumentRejection"
+            render={({ field }) => (
+              <InheritableField
+                className="flex-1"
+                canInherit={canInherit}
+                isInherited={field.value === null}
+                label={<Trans>Allow Document Rejection</Trans>}
+                testId="allow-document-rejection"
+              >
+                <FormControl>
+                  <Select
+                    {...field}
+                    value={field.value === null ? '-1' : field.value.toString()}
+                    onValueChange={(value) =>
+                      field.onChange(value === 'true' ? true : value === 'false' ? false : null)
+                    }
+                  >
+                    <SelectTrigger
+                      className="bg-background text-muted-foreground"
+                      data-testid="allow-document-rejection-trigger"
+                    >
+                      <SelectValue />
+                    </SelectTrigger>
+
+                    <SelectContent>
+                      <SelectItem value="true">
+                        <Trans>Yes</Trans>
+                      </SelectItem>
+
+                      <SelectItem value="false">
+                        <Trans>No</Trans>
+                      </SelectItem>
+
+                      {canInherit && (
+                        <SelectItem value={'-1'}>
+                          <Trans>Inherit from organisation</Trans>
+                        </SelectItem>
+                      )}
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+
+                <FormDescription>
+                  <Trans>
+                    Controls whether recipients can reject newly created documents from the signing page. Existing
+                    documents keep their current setting. You can change it per document in the document settings.
+                  </Trans>
+                </FormDescription>
+              </InheritableField>
+            )}
+          />
+
           {isAiFeaturesConfigured && (
             <FormField
               control={form.control}
diff --git a/apps/remix/app/components/general/admin-global-settings-section.tsx b/apps/remix/app/components/general/admin-global-settings-section.tsx
index 760684077..1c5311559 100644
--- a/apps/remix/app/components/general/admin-global-settings-section.tsx
+++ b/apps/remix/app/components/general/admin-global-settings-section.tsx
@@ -138,6 +138,12 @@ export const AdminGlobalSettingsSection = ({
         </DetailsValue>
       </DetailsCard>
 
+      <DetailsCard label={<Trans>Allow document rejection</Trans>}>
+        <DetailsValue>
+          {booleanValue(settings.allowDocumentRejection, inheritedSettings?.allowDocumentRejection)}
+        </DetailsValue>
+      </DetailsCard>
+
       <DetailsCard label={<Trans>Typed signature</Trans>}>
         <DetailsValue>
           {booleanValue(settings.typedSignatureEnabled, inheritedSettings?.typedSignatureEnabled)}
diff --git a/apps/remix/app/components/general/document-signing/document-signing-page-view-v1.tsx b/apps/remix/app/components/general/document-signing/document-signing-page-view-v1.tsx
index 4fa8077a0..4b8758485 100644
--- a/apps/remix/app/components/general/document-signing/document-signing-page-view-v1.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view-v1.tsx
@@ -261,7 +261,9 @@ export const DocumentSigningPageViewV1 = ({
 
           <div className="flex items-center gap-x-4">
             <DocumentSigningAttachmentsPopover envelopeId={document.envelopeId} token={recipient.token} />
-            <DocumentSigningRejectDialog documentId={document.id} token={recipient.token} />
+            {documentMeta.allowDocumentRejection && (
+              <DocumentSigningRejectDialog documentId={document.id} token={recipient.token} />
+            )}
           </div>
         </div>
 
diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
index ea60d1819..410afbbc4 100644
--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-settings-dialog.tsx
@@ -110,6 +110,7 @@ export const ZAddSettingsFormSchema = z.object({
     signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(1, {
       message: msg`At least one signature type must be enabled`.id,
     }),
+    allowDocumentRejection: z.boolean(),
     envelopeExpirationPeriod: ZEnvelopeExpirationPeriod.nullish(),
     reminderSettings: ZEnvelopeReminderSettings.nullish(),
   }),
@@ -200,6 +201,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
         emailReplyTo: envelope.documentMeta.emailReplyTo ?? undefined,
         emailSettings: ZDocumentEmailSettingsSchema.parse(envelope.documentMeta.emailSettings),
         signatureTypes: extractTeamSignatureSettings(envelope.documentMeta),
+        allowDocumentRejection: envelope.documentMeta.allowDocumentRejection,
         envelopeExpirationPeriod: envelope.documentMeta?.envelopeExpirationPeriod ?? null,
         reminderSettings: envelope.documentMeta?.reminderSettings ?? null,
       },
@@ -249,6 +251,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
       message,
       subject,
       emailReplyTo,
+      allowDocumentRejection,
       envelopeExpirationPeriod,
       reminderSettings,
     } = data.meta;
@@ -278,6 +281,7 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
           drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
           typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
           uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          allowDocumentRejection,
           envelopeExpirationPeriod,
           reminderSettings,
         },
@@ -465,6 +469,52 @@ export const EnvelopeEditorSettingsDialog = ({ trigger, ...props }: EnvelopeEdit
                         />
                       )}
 
+                      <FormField
+                        control={form.control}
+                        name="meta.allowDocumentRejection"
+                        render={({ field }) => (
+                          <FormItem>
+                            <FormLabel className="flex flex-row items-center">
+                              <Trans>Allow Document Rejection</Trans>
+                              <Tooltip>
+                                <TooltipTrigger>
+                                  <InfoIcon className="mx-2 h-4 w-4" />
+                                </TooltipTrigger>
+
+                                <TooltipContent className="max-w-xs text-muted-foreground">
+                                  <Trans>
+                                    Controls whether recipients can reject the document from the signing page.
+                                  </Trans>
+                                </TooltipContent>
+                              </Tooltip>
+                            </FormLabel>
+
+                            <FormControl>
+                              <Select
+                                value={field.value ? 'true' : 'false'}
+                                onValueChange={(value) => field.onChange(value === 'true')}
+                              >
+                                <SelectTrigger className="bg-background" data-testid="allow-document-rejection-trigger">
+                                  <SelectValue />
+                                </SelectTrigger>
+
+                                <SelectContent>
+                                  <SelectItem value="true">
+                                    <Trans>Yes</Trans>
+                                  </SelectItem>
+
+                                  <SelectItem value="false">
+                                    <Trans>No</Trans>
+                                  </SelectItem>
+                                </SelectContent>
+                              </Select>
+                            </FormControl>
+
+                            <FormMessage />
+                          </FormItem>
+                        )}
+                      />
+
                       {settings.allowConfigureDateFormat && (
                         <FormField
                           control={form.control}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.document.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.document.tsx
index 6331e5ece..72dcb83e4 100644
--- a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.document.tsx
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.document.tsx
@@ -39,6 +39,7 @@ export default function OrganisationSettingsDocumentPage() {
         signatureTypes,
         defaultRecipients,
         delegateDocumentOwnership,
+        allowDocumentRejection,
         aiFeaturesEnabled,
       } = data;
 
@@ -46,6 +47,7 @@ export default function OrganisationSettingsDocumentPage() {
         documentVisibility === null ||
         documentLanguage === null ||
         documentDateFormat === null ||
+        allowDocumentRejection === null ||
         aiFeaturesEnabled === null
       ) {
         throw new Error('Should not be possible.');
@@ -63,6 +65,7 @@ export default function OrganisationSettingsDocumentPage() {
           uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
           drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
           delegateDocumentOwnership,
+          allowDocumentRejection,
           aiFeaturesEnabled,
         },
       });
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.document.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.document.tsx
index e510ad48b..9aab3a11c 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.document.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.document.tsx
@@ -33,6 +33,7 @@ export default function TeamsSettingsPage() {
         signatureTypes,
         defaultRecipients,
         delegateDocumentOwnership,
+        allowDocumentRejection,
         aiFeaturesEnabled,
       } = data;
 
@@ -57,6 +58,7 @@ export default function TeamsSettingsPage() {
                 drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
               }),
           delegateDocumentOwnership,
+          allowDocumentRejection,
         },
       });
 
diff --git a/packages/lib/types/document-meta.ts b/packages/lib/types/document-meta.ts
index 12c1cf87c..e3b721580 100644
--- a/packages/lib/types/document-meta.ts
+++ b/packages/lib/types/document-meta.ts
@@ -28,6 +28,7 @@ export const ZDocumentMetaSchema = DocumentMetaSchema.pick({
   typedSignatureEnabled: true,
   uploadSignatureEnabled: true,
   drawSignatureEnabled: true,
+  allowDocumentRejection: true,
   language: true,
   emailSettings: true,
 });
@@ -105,6 +106,10 @@ export const ZDocumentMetaUploadSignatureEnabledSchema = z
   .boolean()
   .describe('Whether to allow recipients to sign using an uploaded signature.');
 
+export const ZDocumentMetaAllowDocumentRejectionSchema = z
+  .boolean()
+  .describe('Whether to allow recipients to reject the document from the signing page.');
+
 /**
  * Note: Any updates to this will cause public API changes. You will need to update
  * all corresponding areas where this is used (some places that use this needs to pass
@@ -123,6 +128,7 @@ export const ZDocumentMetaCreateSchema = z.object({
   typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
   uploadSignatureEnabled: ZDocumentMetaUploadSignatureEnabledSchema.optional(),
   drawSignatureEnabled: ZDocumentMetaDrawSignatureEnabledSchema.optional(),
+  allowDocumentRejection: ZDocumentMetaAllowDocumentRejectionSchema.optional(),
   emailId: z.string().nullish(),
   emailReplyTo: zEmail().nullish(),
   emailSettings: ZDocumentEmailSettingsSchema.nullish(),
diff --git a/packages/lib/types/document.ts b/packages/lib/types/document.ts
index 2205d9191..68b0c1033 100644
--- a/packages/lib/types/document.ts
+++ b/packages/lib/types/document.ts
@@ -63,6 +63,7 @@ export const ZDocumentSchema = LegacyDocumentSchema.pick({
     uploadSignatureEnabled: true,
     drawSignatureEnabled: true,
     allowDictateNextSigner: true,
+    allowDocumentRejection: true,
     language: true,
     emailSettings: true,
     emailId: true,
diff --git a/packages/lib/types/envelope-editor.ts b/packages/lib/types/envelope-editor.ts
index cfa07fae7..9847dad2a 100644
--- a/packages/lib/types/envelope-editor.ts
+++ b/packages/lib/types/envelope-editor.ts
@@ -280,6 +280,7 @@ export const ZEditorEnvelopeSchema = EnvelopeSchema.pick({
     uploadSignatureEnabled: true,
     drawSignatureEnabled: true,
     allowDictateNextSigner: true,
+    allowDocumentRejection: true,
     language: true,
     emailSettings: true,
     emailId: true,
diff --git a/packages/lib/types/envelope.ts b/packages/lib/types/envelope.ts
index 2692252a0..bfbb41676 100644
--- a/packages/lib/types/envelope.ts
+++ b/packages/lib/types/envelope.ts
@@ -50,6 +50,7 @@ export const ZEnvelopeSchema = EnvelopeSchema.pick({
     uploadSignatureEnabled: true,
     drawSignatureEnabled: true,
     allowDictateNextSigner: true,
+    allowDocumentRejection: true,
     language: true,
     emailSettings: true,
     emailId: true,
diff --git a/packages/lib/types/template.ts b/packages/lib/types/template.ts
index bf43851c9..a07714557 100644
--- a/packages/lib/types/template.ts
+++ b/packages/lib/types/template.ts
@@ -55,6 +55,7 @@ export const ZTemplateSchema = TemplateSchema.pick({
     uploadSignatureEnabled: true,
     drawSignatureEnabled: true,
     allowDictateNextSigner: true,
+    allowDocumentRejection: true,
     distributionMethod: true,
     redirectUrl: true,
     language: true,
diff --git a/packages/prisma/migrations/20260910120000_add_allow_document_rejection_setting/migration.sql b/packages/prisma/migrations/20260910120000_add_allow_document_rejection_setting/migration.sql
new file mode 100644
index 000000000..400cda79d
--- /dev/null
+++ b/packages/prisma/migrations/20260910120000_add_allow_document_rejection_setting/migration.sql
@@ -0,0 +1,8 @@
+-- AlterTable
+ALTER TABLE "DocumentMeta" ADD COLUMN     "allowDocumentRejection" BOOLEAN NOT NULL DEFAULT true;
+
+-- AlterTable
+ALTER TABLE "OrganisationGlobalSettings" ADD COLUMN     "allowDocumentRejection" BOOLEAN NOT NULL DEFAULT true;
+
+-- AlterTable
+ALTER TABLE "TeamGlobalSettings" ADD COLUMN     "allowDocumentRejection" BOOLEAN;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 13768e34f..95ced4e10 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -583,6 +583,8 @@ model DocumentMeta {
 
   reminderSettings Json? /// [EnvelopeReminderSettings] @zod.custom.use(ZEnvelopeReminderSettingsSchema)
 
+  allowDocumentRejection Boolean @default(true)
+
   envelope Envelope?
 }
 
@@ -966,6 +968,7 @@ model OrganisationGlobalSettings {
   documentTimezone          String? // Nullable to allow using local timezones if not set.
   documentDateFormat        String             @default("yyyy-MM-dd hh:mm a")
   delegateDocumentOwnership Boolean            @default(false)
+  allowDocumentRejection    Boolean            @default(true)
 
   typedSignatureEnabled  Boolean @default(true)
   uploadSignatureEnabled Boolean @default(true)
@@ -1005,6 +1008,7 @@ model TeamGlobalSettings {
   documentTimezone          String?
   documentDateFormat        String?
   delegateDocumentOwnership Boolean?
+  allowDocumentRejection    Boolean?
 
   includeSenderDetails      Boolean?
   includeSigningCertificate Boolean?