diff --git a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js index c96a303952ea247525193f4513de2af75c4901ba..57dff3b2e60883b5bb9663c092793e50b8082a33 100644 --- a/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js +++ b/packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js @@ -79,6 +79,7 @@ const HERecommendation = ({ handleSubmit, formValues, highlight, + toggle, rejectRecommendation, publishRecommendation, minorRevisionRecommendation, @@ -90,6 +91,7 @@ const HERecommendation = ({ highlight={highlight} label="Your Editorial Recommendation" mb={2} + toggle={toggle} {...rest} > <Root> @@ -222,6 +224,8 @@ export default compose( values, dispatch, { + reset, + toggle, onRecommendationSubmit, showModal, setFetching, @@ -230,13 +234,14 @@ export default compose( }, ) => { showModal({ + reset, title: `${modalTitle}?`, confirmText: confirmMessage === 'Submit Recommendation' ? 'Submit' : confirmMessage, - onConfirm: props => { + toggle() onRecommendationSubmit(parseFormValues(values), { ...props, setFetching, diff --git a/packages/component-manuscript/src/handleRecommendation/withHandleRecommendation.js b/packages/component-manuscript/src/handleRecommendation/withHandleRecommendation.js index 19fb97c4dfebe3f607e57735c735ec778b62b69e..59831291296fdf9f2a82e559540090777e37a15f 100644 --- a/packages/component-manuscript/src/handleRecommendation/withHandleRecommendation.js +++ b/packages/component-manuscript/src/handleRecommendation/withHandleRecommendation.js @@ -33,7 +33,10 @@ export default compose( fragment, collection, fetchUpdatedCollection, - }) => (recommendation, { hideModal, setFetching, setModalError }) => { + }) => ( + recommendation, + { hideModal, setFetching, setModalError, reset }, + ) => { setFetching(true) createRecommendation({ recommendation, @@ -42,6 +45,7 @@ export default compose( }) .then(r => { setFetching(false) + reset() hideModal() fetchUpdatedCollection() })