The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: envelope cc issues (#2158)
David Nguyen805982f3e85b
diff --git a/apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx b/apps/remix/app/components/dialogs/envelope-distribute-dialog.tsxindex f9ca72f5e..92529bea2 100644--- a/apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx+++ b/apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx@@ -336,7 +336,7 @@ export const EnvelopeDistributeDialog = ({<Trans>Message</Trans>{' '}<span className="text-muted-foreground">(Optional)</span><Tooltip>- <TooltipTrigger>+ <TooltipTrigger type="button"><InfoIcon className="mx-2 h-4 w-4" /></TooltipTrigger><TooltipContent className="text-muted-foreground p-4">diff --git a/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx b/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsxindex 5b0c30102..717da476c 100644--- a/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx@@ -184,10 +184,10 @@ export const DocumentSigningPageViewV2 = () => {</div>)}- <div className="embed--DocumentWidgetFooter">+ <div className="embed--DocumentWidgetFooter mt-auto">{/* Footer of left sidebar. */}{!isEmbed && (- <div className="mt-auto px-4">+ <div className="px-4"><Button asChild variant="ghost" className="w-full justify-start"><Link to="/"><ArrowLeftIcon className="mr-2 h-4 w-4" />diff --git a/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx b/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsxindex 5c26e5a5d..2dba30c18 100644--- a/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx+++ b/apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx@@ -616,13 +616,14 @@ export default function EnvelopeEditorFieldsPageRenderer() {transform: 'translateX(-50%)',zIndex: 50,}}- className="text-muted-foreground grid w-max grid-cols-5 gap-x-1 gap-y-0.5 rounded-md border bg-white p-1 shadow-sm"+ // Don't use darkmode for this component, it should look the same for both light/dark modes.+ className="grid w-max grid-cols-5 gap-x-1 gap-y-0.5 rounded-md border border-gray-300 bg-white p-1 text-gray-500 shadow-sm">{fieldButtonList.map((field) => (<buttonkey={field.type}onClick={() => createFieldFromPendingTemplate(pendingFieldCreation, field.type)}- className="hover:text-foreground col-span-1 w-full flex-shrink-0 rounded-sm px-2 py-1 text-xs hover:bg-gray-100"+ className="col-span-1 w-full flex-shrink-0 rounded-sm px-2 py-1 text-xs hover:bg-gray-100 hover:text-gray-600">{t(field.name)}</button>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.tsxindex 375524e68..18e0d077e 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@@ -212,7 +212,7 @@ export const EnvelopeEditorRecipientForm = () => {);const hasDocumentBeenSent = recipients.some(- (recipient) => recipient.sendStatus === SendStatus.SENT,+ (recipient) => recipient.role !== RecipientRole.CC && recipient.sendStatus === SendStatus.SENT,);const canRecipientBeModified = (recipientId?: number) => {diff --git a/packages/lib/utils/envelope.ts b/packages/lib/utils/envelope.tsindex e78df82d2..f686ae2c8 100644--- a/packages/lib/utils/envelope.ts+++ b/packages/lib/utils/envelope.ts@@ -1,5 +1,11 @@import type { Envelope, Recipient } from '@prisma/client';-import { DocumentStatus, EnvelopeType, SendStatus, SigningStatus } from '@prisma/client';+import {+ DocumentStatus,+ EnvelopeType,+ RecipientRole,+ SendStatus,+ SigningStatus,+} from '@prisma/client';import { match } from 'ts-pattern';import { z } from 'zod';@@ -156,8 +162,9 @@ export const canEnvelopeItemsBeModified = (if (recipients.some((recipient) =>- recipient.signingStatus === SigningStatus.SIGNED ||- recipient.sendStatus === SendStatus.SENT,+ recipient.role !== RecipientRole.CC &&+ (recipient.signingStatus === SigningStatus.SIGNED ||+ recipient.sendStatus === SendStatus.SENT),)) {return false;diff --git a/packages/ui/primitives/tooltip.tsx b/packages/ui/primitives/tooltip.tsxindex 5daa4dbaa..f68599cd4 100644--- a/packages/ui/primitives/tooltip.tsx+++ b/packages/ui/primitives/tooltip.tsx@@ -19,7 +19,7 @@ const TooltipContent = React.forwardRef<ref={ref}sideOffset={sideOffset}className={cn(- 'bg-popover text-popover-foreground animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 z-50 overflow-hidden rounded-md border px-3 py-1.5 text-sm shadow-md',+ 'bg-popover z-9999 text-popover-foreground animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 overflow-hidden rounded-md border px-3 py-1.5 text-sm shadow-md',className,)}{...props}