fix: state tax fixes for tax_rate fields not submitting (#397)

Author: serikjensen

src/components/Common/TaxInputs/TaxInputs.tsx

@@ -25,6 +25,8 @@ interface CompR {
 
 type NumberFieldProps = { isCurrency?: boolean; isPercent?: boolean }
 
+type TextInputProps = { type?: string; isPercent?: boolean }
+
 export function QuestionInput({
   questionType,
   ...props
@@ -85,7 +87,13 @@ export function SelectInput({ question, requirement, isDisabled = false }: EmpQ
   )
 }
 
-export function TextInput({ question, requirement, isDisabled = false }: EmpQ | CompR) {
+export function TextInput({
+  question,
+  requirement,
+  isDisabled = false,
+  type = 'text',
+  isPercent = false,
+}: (EmpQ | CompR) & TextInputProps) {
   const { key, label, description } = question ? question : requirement
   const value = question ? question.answers[0]?.value : requirement.value
   const mask = requirement?.metadata?.mask ?? null
@@ -103,6 +111,8 @@ export function TextInput({ question, requirement, isDisabled = false }: EmpQ |
       isDisabled={isDisabled}
       transform={mask ? transform : undefined}
       placeholder={mask ? mask : undefined}
+      type={type}
+      adornmentEnd={isPercent ? '%' : undefined}
     />
   )
 }
@@ -225,9 +235,9 @@ export function TaxRateInput({ requirement, question, ...props }: EmpQ | CompR)
         }
       />
     ) : (
-      <NumberInput requirement={requirement} {...props} isPercent />
+      <TextInput requirement={requirement} {...props} type="number" isPercent />
     )
   }
 
-  return <NumberInput question={question} {...props} isPercent />
+  return <TextInput question={question} {...props} type="number" isPercent />
 }

src/components/Company/StateTaxes/StateTaxesForm/StateTaxesForm.tsx

@@ -43,27 +43,34 @@ function Root({ companyId, state, className, children }: StateTaxesFormProps) {
   // Schema and default value generation
   const { dynamicSchema, defaultValues } = useMemo(() => {
     const schemaShape: Record<string, z.ZodObject<Record<string, z.ZodTypeAny>>> = {}
-    const values: Partial<Record<string, Record<string, string | boolean>>> = {}
+    const values: Partial<Record<string, Record<string, string | boolean | undefined>>> = {}
 
     //Looping through each requirement set
     stateTaxRequirements.requirementSets?.forEach(requirementSet => {
       if (!requirementSet.key) return
 
       const requirementSetKey = requirementSet.key
       const requirementShape: Record<string, z.ZodTypeAny> = {}
-      const requirementValues: Record<string, string | boolean> = {}
+      const requirementValues: Record<string, string | boolean | undefined> = {}
 
       requirementSet.requirements?.forEach(requirement => {
         if (!requirement.key) return
 
         const requirementKey = requirement.key
 
         // --- Default Value Logic ---
-        requirementValues[requirementKey] = requirement.value ?? ''
+        requirementValues[requirementKey] =
+          requirement.metadata?.type === 'radio'
+            ? (requirement.value ?? undefined)
+            : (requirement.value ?? '')
 
         // --- Schema Logic ---
         // Start with a basic string schema
-        let fieldSchema: z.ZodTypeAny = z.string().min(1)
+        let fieldSchema: z.ZodTypeAny = z
+          .string({
+            required_error: t('validations.required'),
+          })
+          .min(1, t('validations.required'))
 
         const validation = requirement.metadata?.validation
         // Not all requirements have validation
@@ -87,16 +94,20 @@ function Root({ companyId, state, className, children }: StateTaxesFormProps) {
               //Type is one_of
               const oneOfValues = validation.rates as string[]
               fieldSchema = z
-                .string()
-                .min(1)
+                .string({
+                  required_error: t('validations.required'),
+                })
+                .min(1, t('validations.required'))
                 .refine(val => oneOfValues.includes(val), {
                   message: t('validations.oneOf', { values: oneOfValues.join(', ') }),
                 })
             }
           }
         }
         if (requirement.metadata?.type === 'radio') {
-          fieldSchema = z.boolean()
+          fieldSchema = z.boolean({
+            required_error: t('validations.required'),
+          })
         }
         requirementShape[requirementKey] = fieldSchema
         // --- End Schema Logic ---

src/i18n/en/Company.StateTaxes.json

@@ -21,7 +21,8 @@
     "validations": {
       "minValue": "Minimum value is {{min}}",
       "maxValue": "Maximum value is {{max}}",
-      "oneOf": "Value must be one of: {{values}}"
+      "oneOf": "Value must be one of: {{values}}",
+      "required": "This field is required"
     }
   }
 }

src/types/i18next.d.ts

@@ -354,6 +354,7 @@ export interface CompanyStateTaxes{
 "minValue":string;
 "maxValue":string;
 "oneOf":string;
+"required":string;
 };
 };
 };