From 131bb86711f489db3489319fcb56077385e83fca Mon Sep 17 00:00:00 2001
From: Jed Fox <git@jedfox.com>
Date: Thu, 20 Apr 2023 17:21:56 -0400
Subject: [PATCH] Fix currencyToInteger returning null when amount is zero
(#915)
Fixes #913. (And probably a few other similar bugs)
---
.../desktop-client/src/components/accounts/Account.js | 9 +++++++--
packages/loot-core/src/shared/util.ts | 2 +-
upcoming-release-notes/915.md | 6 ++++++
3 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 upcoming-release-notes/915.md
diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js
index 874bb5f82..390fa7764 100644
--- a/packages/desktop-client/src/components/accounts/Account.js
+++ b/packages/desktop-client/src/components/accounts/Account.js
@@ -195,10 +195,15 @@ function ReconcileTooltip({ account, onReconcile, onClose }) {
let balance = useSheetValue(queries.accountBalance(account));
function onSubmit(e) {
+ e.preventDefault();
let input = e.target.elements[0];
let amount = currencyToInteger(input.value);
- onReconcile(amount == null ? balance : amount);
- onClose();
+ if (amount != null) {
+ onReconcile(amount == null ? balance : amount);
+ onClose();
+ } else {
+ input.select();
+ }
}
return (
diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.ts
index 9506ee207..b62bf249d 100644
--- a/packages/loot-core/src/shared/util.ts
+++ b/packages/loot-core/src/shared/util.ts
@@ -354,7 +354,7 @@ export function currencyToAmount(str) {
export function currencyToInteger(str) {
let amount = currencyToAmount(str);
- return amount ? amountToInteger(amount) : null;
+ return amount == null ? null : amountToInteger(amount);
}
export function stringToInteger(str) {
diff --git a/upcoming-release-notes/915.md b/upcoming-release-notes/915.md
new file mode 100644
index 000000000..e8b2e2abc
--- /dev/null
+++ b/upcoming-release-notes/915.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [j-f1]
+---
+
+Fix reconciling a budget with a zero value
--
GitLab