Stage merge conflicts (#2880)

Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>

Author: 3 people

src/apps/schema/src/app/components/AddFieldModal/FieldFormInput.tsx

@@ -55,6 +55,7 @@ export type FieldNames =
   | "regexRestrictErrorMessage"
   | "minValue"
   | "maxValue"
+  | "currency"
   | "fileExtensions"
   | "fileExtensionsErrorMessage";
 type FieldType =

src/apps/schema/src/app/components/AddFieldModal/views/FieldForm.tsx

@@ -233,6 +233,8 @@ export const FieldForm = ({
           formFields[field.name] = fieldData.settings[field.name] ?? null;
         } else if (field.name === "maxValue") {
           formFields[field.name] = fieldData.settings[field.name] ?? null;
+        } else if (field.name === "currency") {
+          formFields[field.name] = fieldData.settings?.currency ?? "USD";
         } else if (field.name === "fileExtensions") {
           formFields[field.name] = fieldData.settings[field.name] ?? null;
         } else if (field.name === "fileExtensionsErrorMessage") {
@@ -429,6 +431,22 @@ export const FieldForm = ({
         newErrorsObj[inputName] = "This field is required";
       }
 
+      if (
+        inputName === "fileExtensions" &&
+        formData.fileExtensions !== null &&
+        !(formData.fileExtensions as string[])?.length
+      ) {
+        newErrorsObj[inputName] = "This field is required";
+      }
+
+      if (
+        inputName === "fileExtensionsErrorMessage" &&
+        formData.fileExtensions !== null &&
+        formData.fileExtensionsErrorMessage === ""
+      ) {
+        newErrorsObj[inputName] = "This field is required";
+      }
+
       if (
         inputName in errors &&
         ![
@@ -441,6 +459,7 @@ export const FieldForm = ({
           "regexRestrictErrorMessage",
           "minValue",
           "maxValue",
+          "currency",
           "fileExtensions",
           "fileExtensionsErrorMessage",
         ].includes(inputName)
@@ -602,6 +621,9 @@ export const FieldForm = ({
         ...(formData.maxValue !== null && {
           maxValue: formData.maxValue as number,
         }),
+        ...(formData.currency !== null && {
+          currency: formData.currency as string,
+        }),
         ...(formData.fileExtensions && {
           fileExtensions: formData.fileExtensions as string[],
         }),

src/shell/services/types.ts

@@ -203,6 +203,7 @@ export interface FieldSettings {
   regexRestrictErrorMessage?: string;
   minValue?: number;
   maxValue?: number;
+  currency?: string;
   fileExtensions?: string[];
   fileExtensionsErrorMessage?: string;
 }