Skip to content

Commit cf292a9

Browse files
authored
fix: Prevent 0 on renumeration results step if declaration modified (#2163)
1 parent 7041919 commit cf292a9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

packages/app/src/app/(default)/index-egapro/declaration/remunerations/RemunerationForm.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ export const RemunerationForm = () => {
158158
draft["remunerations-resultat"] = undefined;
159159
savePageData("remunerations-resultat", undefined);
160160
}
161+
if (data.estCalculable === "oui" && formData[stepName]?.estCalculable === "non") {
162+
draft["remunerations-resultat"] = undefined;
163+
savePageData("remunerations-resultat", undefined);
164+
}
161165
if (data.estCalculable !== formData[stepName]?.estCalculable) {
162166
draft[stepName] = getModifiedFormValues(dirtyFields, data) as DeclarationDTO[typeof stepName];
163167
} else {

packages/app/src/app/(default)/index-egapro/declaration/resultat-global/ResultatGlobalForm.tsx

+6-10
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,12 @@ export const ResultatGlobalForm = () => {
6060

6161
const computed = computeDeclarationIndex(DeclarationComputerInputBuilder.fromDeclarationDTO(formData));
6262

63-
// We don't compute the index if we only read an existing declaration.
64-
const defaultValues =
65-
formData["declaration-existante"].status === "consultation"
66-
? formData[stepName]
67-
: {
68-
...formData[stepName],
69-
index: computed.index,
70-
points: computed.points,
71-
pointsCalculables: computed.computablePoints,
72-
};
63+
const defaultValues = {
64+
...formData[stepName],
65+
index: computed.index,
66+
points: computed.points,
67+
pointsCalculables: computed.computablePoints,
68+
};
7369

7470
const methods = useForm<FormType>({
7571
mode: "onChange",

0 commit comments

Comments
 (0)