Refine validation

PotLock · Jun 23, 2024 · b2787ab · b2787ab
1 parent ef476ed
commit b2787ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/common/api/types.ts b/src/common/api/types.ts
diff --git a/src/modules/donation/hooks/forms.ts b/src/modules/donation/hooks/forms.ts
@@ -49,6 +49,7 @@ export const useDonationForm = ({
 
   const form = useForm<DonationInputs>({
     resolver: zodResolver(donationSchema),
+    mode: "onChange",
     defaultValues,
   });
 
@@ -77,8 +78,7 @@ export const useDonationForm = ({
   );
 
   console.table({ isDisabled, hasChanges });
-  console.table(currentValues);
-  console.table(defaultValues);
+  console.table(form.formState.errors);
 
   return {
     hasChanges,

diff --git a/src/modules/donation/models.ts b/src/modules/donation/models.ts
@@ -4,10 +4,12 @@ import {
   infer as FromSchema,
   array,
   boolean,
+  coerce,
   literal,
   nativeEnum,
   number,
   object,
+  preprocess,
   string,
 } from "zod";
 
@@ -72,15 +74,15 @@ export const donationTokenSchema = literal(NEAR_TOKEN_DENOM)
   .default(NEAR_TOKEN_DENOM)
   .describe('Either "NEAR" or FT contract account id.');
 
-export const donationAmountSchema = number()
-  .positive()
-  .finite()
-  .gt(0.0, "Cannot be zero.")
-  .default(0.1)
-  .refine(
-    (n) => !number().int().safeParse(n).success,
-    "Must be a floating point number.",
-  );
+export const donationAmountSchema = preprocess(
+  (x) => parseFloat(x as string),
+
+  number({ message: "Must be a positive number." })
+    .positive("Must be a positive number.")
+    .finite()
+    .safe()
+    .refine((n) => number().safeParse(n).success, "Must be a positive number."),
+);
 
 export const donationSchema = object({
   tokenId: donationTokenSchema,