Merge pull request #66 from afadil/dev

fix activity form

package.json

@@ -1,7 +1,7 @@
 {
   "name": "wealthfolio-app",
   "private": true,
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wealthfolio-app"
-version = "1.0.7"
+version = "1.0.8"
 description = "Portfolio tracker"
 authors = ["Aziz Fadil"]
 license = "LGPL-3.0"

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Wealthfolio",
-    "version": "1.0.7"
+    "version": "1.0.8"
   },
   "tauri": {
     "allowlist": {

src/lib/schemas.ts

@@ -42,15 +42,15 @@ export const newActivitySchema = z.object({
       required_error: 'Please enter a valid fee.',
       invalid_type_error: 'Fee must be a positive number.',
     })
-    .min(0, { message: 'Fee must be a positive number.' }),
+    .min(0, { message: 'Fee must be a non-negative number.' }),
 
   isDraft: z.boolean(),
   quantity: z.coerce
     .number({
       required_error: 'Please enter a valid quantity.',
       invalid_type_error: 'Quantity must be a positive number.',
     })
-    .min(0, { message: 'Quantity must be a positive number.' }),
+    .positive({ message: 'Quantity must be a positive number.' }),
   assetId: z.string().min(1, { message: 'Asset ID is required' }),
   activityType: z.enum([
     'BUY',
@@ -72,6 +72,6 @@ export const newActivitySchema = z.object({
       required_error: 'Please enter a valid price.',
       invalid_type_error: 'Price must be a positive number.',
     })
-    .min(0, { message: 'Price must be a positive number.' }),
+    .positive({ message: 'Price must be a positive number.' }),
   comment: z.string().optional(),
 });

src/pages/activity/components/activity-form.tsx

@@ -142,7 +142,7 @@ export function ActivityForm({ accounts, defaultValues, onSuccess = () => {} }:
           </DialogDescription>
         </DialogHeader>
 
-        <div className="grid gap-6 p-4 ">
+        <div className="grid gap-6 p-4">
           {addActivityMutation.error && (
             <AlertFeedback
               variant="error"
@@ -369,7 +369,7 @@ const AssetActivityFields = ({ defaultAssetId }: AssetActivityFieldsProps) => {
               <FormItem>
                 <FormLabel>Shares</FormLabel>
                 <FormControl>
-                  <Input type="number" inputMode="decimal" min="0" placeholder="Shares" {...field} />
+                  <Input type="number" inputMode="decimal" placeholder="Shares" {...field} />
                 </FormControl>
                 <FormMessage />
               </FormItem>
@@ -382,7 +382,7 @@ const AssetActivityFields = ({ defaultAssetId }: AssetActivityFieldsProps) => {
               <FormItem>
                 <FormLabel>Price</FormLabel>
                 <FormControl>
-                  <Input type="number" inputMode="decimal" min="0" placeholder="Price" {...field} />
+                  <Input type="number" inputMode="decimal" placeholder="Price" {...field} />
                 </FormControl>
                 <FormMessage />
               </FormItem>
@@ -395,7 +395,7 @@ const AssetActivityFields = ({ defaultAssetId }: AssetActivityFieldsProps) => {
               <FormItem>
                 <FormLabel>Fee</FormLabel>
                 <FormControl>
-                  <Input type="number" inputMode="decimal" min="0" placeholder="Fee" {...field} />
+                  <Input type="number" inputMode="decimal" placeholder="Fee" {...field} />
                 </FormControl>
                 <FormMessage />
               </FormItem>