github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-03-21 15:36:50 -05:00
Code Issues 250 Packages Projects Releases 53 Wiki Activity

Fixed bug where closing account did not properly validate transfer or category (#4769)

Browse Source 
Co-authored-by: Alec Bakholdin <abakho@icims.com>
This commit is contained in:
Alec Bakholdin
2025-04-08 09:52:54 -04:00
committed by GitHub
parent aba97e8b74
commit 4e0ab44e2f
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/desktop-client/src/components/modals/CloseAccountModal.tsx
View File

@@ -91,24 +91,27 @@ export function CloseAccountModal({
const onSubmit = (event: FormEvent<HTMLFormElement>) => {
event.preventDefault();
const transferError = balance !== 0 && transferAccountId === '';
const transferError = balance !== 0 && !transferAccountId;
setTransferError(transferError);
const categoryError =
needsCategory(account, transferAccountId, accounts) && categoryId === '';
needsCategory(account, transferAccountId, accounts) && !categoryId;
setCategoryError(categoryError);
if (!transferError && !categoryError) {
setLoading(true);
dispatch(
closeAccount({
id: account.id,
transferAccountId: transferAccountId || null,
categoryId: categoryId || null,
}),
);
if (transferError || categoryError) {
return false;
}
setLoading(true);
dispatch(
closeAccount({
id: account.id,
transferAccountId: transferAccountId || null,
categoryId: categoryId || null,
}),
);
return true;
};
return (
@@ -150,8 +153,9 @@ export function CloseAccountModal({
</Paragraph>
<Form
onSubmit={e => {
onSubmit(e);
close();
if (onSubmit(e)) {
close();
}
}}
>
{balance !== 0 && (