fix: merge conflicts

packages/ui/primitives/document-flow/add-fields.tsx

@@ -19,7 +19,6 @@ import {
 } from 'lucide-react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { useHotkeys } from 'react-hotkeys-hook';
-import { prop, sortBy } from 'remeda';
 
 import { getBoundingClientRect } from '@documenso/lib/client-only/get-bounding-client-rect';
 import { useAutoSave } from '@documenso/lib/client-only/hooks/use-autosave';
@@ -120,7 +119,7 @@ export const AddFieldsFormPartial = ({
     defaultValues: {
       fields: fields.map((field) => ({
         nativeId: field.id,
-        formId: `${field.id}-${field.documentId}`,
+        formId: `${field.id}-${field.envelopeItemId}`,
         pageNumber: field.page,
         type: field.type,
         pageX: Number(field.positionX),
@@ -551,29 +550,6 @@ export const AddFieldsFormPartial = ({
     return recipientsByRole;
   }, [recipients]);
 
-  const recipientsByRoleToDisplay = useMemo(() => {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return (Object.entries(recipientsByRole) as [RecipientRole, Recipient[]][])
-      .filter(
-        ([role]) =>
-          role !== RecipientRole.CC &&
-          role !== RecipientRole.VIEWER &&
-          role !== RecipientRole.ASSISTANT,
-      )
-      .map(
-        ([role, roleRecipients]) =>
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          [
-            role,
-            sortBy(
-              roleRecipients,
-              [(r) => r.signingOrder || Number.MAX_SAFE_INTEGER, 'asc'],
-              [prop('id'), 'asc'],
-            ),
-          ] as [RecipientRole, Recipient[]],
-      );
-  }, [recipientsByRole]);
-
   const handleAdvancedSettings = () => {
     setShowAdvancedSettings((prev) => !prev);
   };

packages/ui/primitives/document-flow/add-settings.types.ts

@@ -10,11 +10,11 @@ import {
   ZDocumentAccessAuthTypesSchema,
   ZDocumentActionAuthTypesSchema,
 } from '@documenso/lib/types/document-auth';
-import { isValidRedirectUrl } from '@documenso/lib/utils/is-valid-redirect-url';
 import {
   ZDocumentMetaDateFormatSchema,
   ZDocumentMetaTimezoneSchema,
-} from '@documenso/trpc/server/document-router/schema';
+} from '@documenso/lib/types/document-meta';
+import { isValidRedirectUrl } from '@documenso/lib/utils/is-valid-redirect-url';
 
 export const ZAddSettingsFormSchema = z.object({
   title: z

packages/ui/primitives/document-flow/add-signers.tsx

@@ -216,6 +216,7 @@ export const AddSignersFormPartial = ({
       // Sync the response recipients back to form state to prevent duplicates
       if (response?.recipients) {
         const currentSigners = form.getValues('signers');
+
         const updatedSigners = currentSigners.map((signer) => {
           // Find the matching recipient from the response using nativeId
           const matchingRecipient = response.recipients.find(
@@ -228,10 +229,9 @@ export const AddSignersFormPartial = ({
               ...signer,
               nativeId: matchingRecipient.id,
             };
-          }
-
-          // For new signers without nativeId, match by email and update with server ID
-          if (!signer.nativeId) {
+          } else if (!signer.nativeId) {
+            // For new signers without nativeId, match by email and update with server ID
+            // Bug: Multiple recipients with the same email will be matched incorrectly here.
             const newRecipient = response.recipients.find(
               (recipient) => recipient.email === signer.email,
             );

packages/ui/primitives/document-flow/field-content.tsx

@@ -1,5 +1,5 @@
 import { useLingui } from '@lingui/react';
-import type { DocumentMeta, Signature, TemplateMeta } from '@prisma/client';
+import type { DocumentMeta, Signature } from '@prisma/client';
 import { FieldType } from '@prisma/client';
 import { ChevronDown } from 'lucide-react';
 
@@ -27,7 +27,7 @@ type FieldIconProps = {
     fieldMeta?: TFieldMetaSchema | null;
     signature?: Signature | null;
   };
-  documentMeta?: Pick<DocumentMeta | TemplateMeta, 'dateFormat'>;
+  documentMeta?: Pick<DocumentMeta, 'dateFormat'>;
 };
 
 /**

packages/ui/primitives/document-flow/field-items-advanced-settings/constants.ts

@@ -2,14 +2,17 @@ export const numberFormatValues = [
   {
     label: '123,456,789.00',
     value: '123,456,789.00',
+    regex: /^(?:\d{1,3}(?:,\d{3})*|\d+)(?:\.\d{1,2})?$/,
   },
   {
     label: '123.456.789,00',
     value: '123.456.789,00',
+    regex: /^(?:\d{1,3}(?:\.\d{3})*|\d+)(?:,\d{1,2})?$/,
   },
   {
     label: '123456,789.00',
     value: '123456,789.00',
+    regex: /^(?:\d+)(?:,\d{1,3}(?:\.\d{1,2})?)?$/,
   },
 ];
 

packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx

@@ -102,7 +102,7 @@ export const NumberFieldAdvancedSettings = ({
           <Trans>Number format</Trans>
         </Label>
         <Select
-          value={fieldState.numberFormat}
+          value={fieldState.numberFormat ?? ''}
           onValueChange={(val) => handleInput('numberFormat', val)}
         >
           <SelectTrigger className="text-muted-foreground bg-background mt-2 w-full">
@@ -199,7 +199,7 @@ export const NumberFieldAdvancedSettings = ({
               id="minValue"
               className="bg-background mt-2"
               placeholder="E.g. 0"
-              value={fieldState.minValue}
+              value={fieldState.minValue ?? ''}
               onChange={(e) => handleInput('minValue', e.target.value)}
             />
           </div>
@@ -211,7 +211,7 @@ export const NumberFieldAdvancedSettings = ({
               id="maxValue"
               className="bg-background mt-2"
               placeholder="E.g. 100"
-              value={fieldState.maxValue}
+              value={fieldState.maxValue ?? ''}
               onChange={(e) => handleInput('maxValue', e.target.value)}
             />
           </div>