From 7defa5b7a805dafea960d3fb1f86226ad0e92116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= Date: Mon, 9 Feb 2026 19:57:41 -0300 Subject: [PATCH 1/2] fix: adjust order to save extra questions and values to avoid mixed messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomás Castillo --- .../sponsor-general-form/extra-questions.js | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/components/forms/sponsor-general-form/extra-questions.js b/src/components/forms/sponsor-general-form/extra-questions.js index 36d98f699..96dd3d643 100644 --- a/src/components/forms/sponsor-general-form/extra-questions.js +++ b/src/components/forms/sponsor-general-form/extra-questions.js @@ -67,19 +67,36 @@ const SponsorExtraQuestions = ({ const handleSubmitExtraQuestion = (extraQuestion) => { const { valuesToSave, ...extraQuestionToSave } = extraQuestion; - saveSponsorExtraQuestion(extraQuestionToSave).then((eq) => { - // after save question, check if values needs to be saved - if (valuesToSave && valuesToSave.length > 0) { - const extraQuestionId = extraQuestionToSave.id || eq.id; + + const hasValues = valuesToSave && valuesToSave.length > 0; + + if (!hasValues) { + saveSponsorExtraQuestion(extraQuestionToSave).then(() => + handleCloseExtraQuestionPopup() + ); + return; + } + + if (!extraQuestionToSave.id) { + saveSponsorExtraQuestion(extraQuestionToSave).then((eq) => { const saveValuePromises = valuesToSave.map((value) => - saveSponsorExtraQuestionValue(extraQuestionId, value) + saveSponsorExtraQuestionValue(eq.id, value) ); Promise.all(saveValuePromises).finally(() => handleCloseExtraQuestionPopup() ); - } else { - handleCloseExtraQuestionPopup(); - } + }); + return; + } + + const saveValuePromises = valuesToSave.map((value) => + saveSponsorExtraQuestionValue(extraQuestionToSave.id, value) + ); + + Promise.all(saveValuePromises).then(() => { + saveSponsorExtraQuestion(extraQuestionToSave).then(() => + handleCloseExtraQuestionPopup() + ); }); }; From 1e171ccd6f45b5dfb61f2b3127368f9b26308e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= Date: Thu, 12 Feb 2026 09:36:33 -0300 Subject: [PATCH 2/2] fix: only close popup if there's no error on saving values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomás Castillo --- src/components/forms/sponsor-general-form/extra-questions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/forms/sponsor-general-form/extra-questions.js b/src/components/forms/sponsor-general-form/extra-questions.js index 96dd3d643..ccd168329 100644 --- a/src/components/forms/sponsor-general-form/extra-questions.js +++ b/src/components/forms/sponsor-general-form/extra-questions.js @@ -82,7 +82,7 @@ const SponsorExtraQuestions = ({ const saveValuePromises = valuesToSave.map((value) => saveSponsorExtraQuestionValue(eq.id, value) ); - Promise.all(saveValuePromises).finally(() => + Promise.all(saveValuePromises).then(() => handleCloseExtraQuestionPopup() ); });