From 4b2699c0d6335a4b9727f5c371dde7585b3aa100 Mon Sep 17 00:00:00 2001 From: Aziz FADIL Date: Sat, 7 Sep 2024 19:45:03 -0400 Subject: [PATCH 1/2] fix activity form --- src/lib/schemas.ts | 6 +++--- src/pages/activity/components/activity-form.tsx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts index 660dafa..bf3ed53 100644 --- a/src/lib/schemas.ts +++ b/src/lib/schemas.ts @@ -42,7 +42,7 @@ 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 @@ -50,7 +50,7 @@ export const newActivitySchema = z.object({ 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(), }); diff --git a/src/pages/activity/components/activity-form.tsx b/src/pages/activity/components/activity-form.tsx index e4db610..98db52f 100644 --- a/src/pages/activity/components/activity-form.tsx +++ b/src/pages/activity/components/activity-form.tsx @@ -142,7 +142,7 @@ export function ActivityForm({ accounts, defaultValues, onSuccess = () => {} }: -
+
{addActivityMutation.error && ( { Shares - + @@ -382,7 +382,7 @@ const AssetActivityFields = ({ defaultAssetId }: AssetActivityFieldsProps) => { Price - + @@ -395,7 +395,7 @@ const AssetActivityFields = ({ defaultAssetId }: AssetActivityFieldsProps) => { Fee - + From d08ff867429bffe00fec6e173430425bd8d1cd0b Mon Sep 17 00:00:00 2001 From: Aziz FADIL Date: Sat, 7 Sep 2024 19:48:44 -0400 Subject: [PATCH 2/2] bump version --- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c1e4126..b5d1e87 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "wealthfolio-app", "private": true, - "version": "1.0.7", + "version": "1.0.8", "type": "module", "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 741a7a3..d16c2cc 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4352,7 +4352,7 @@ dependencies = [ [[package]] name = "wealthfolio-app" -version = "1.0.7" +version = "1.0.8" dependencies = [ "chrono", "csv", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index bc72b7d..6af884d 100644 --- a/src-tauri/Cargo.toml +++ b/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" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 6611476..05f028a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Wealthfolio", - "version": "1.0.7" + "version": "1.0.8" }, "tauri": { "allowlist": {