From 28b955a9f1d1fd5f4448b3c4a7c0623737a8f0a5 Mon Sep 17 00:00:00 2001
From: Irakli Chalagashvili <i.chalagashvili@entando.com>
Date: Tue, 27 Jun 2023 12:51:02 +0400
Subject: [PATCH] ENG-4973 reset form when modal closed

---
 src/ui/users/my-profile/AccountForm.js          | 6 +++++-
 src/ui/users/my-profile/AccountFormContainer.js | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ui/users/my-profile/AccountForm.js b/src/ui/users/my-profile/AccountForm.js
index 46dcd0ffe..5ad182e3e 100644
--- a/src/ui/users/my-profile/AccountForm.js
+++ b/src/ui/users/my-profile/AccountForm.js
@@ -21,7 +21,9 @@ export class AccountFormBody extends Component {
   }
 
   render() {
-    const { username, onEdit, onModalFormSubmit } = this.props;
+    const {
+      username, onEdit, onModalFormSubmit, onModalClose,
+    } = this.props;
 
     const modalTitle = (
       <Modal.Title><FormattedMessage id="user.myProfile.passwordSection" /></Modal.Title>
@@ -96,6 +98,7 @@ export class AccountFormBody extends Component {
           modalClassName="MyProfileAccountForm__modal"
           modalTitle={modalTitle}
           buttons={modalButtons}
+          modalCloseCleanup={onModalClose}
         >
           {formFields}
         </GenericModalContainer>
@@ -109,6 +112,7 @@ AccountFormBody.propTypes = {
   onEdit: PropTypes.func.isRequired,
   onModalFormSubmit: PropTypes.func.isRequired,
   locale: PropTypes.string.isRequired,
+  onModalClose: PropTypes.func.isRequired,
 };
 
 const AccountForm = reduxForm({
diff --git a/src/ui/users/my-profile/AccountFormContainer.js b/src/ui/users/my-profile/AccountFormContainer.js
index 1c603d28b..47a36a661 100644
--- a/src/ui/users/my-profile/AccountFormContainer.js
+++ b/src/ui/users/my-profile/AccountFormContainer.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { getUsername } from '@entando/apimanager';
-import { submit } from 'redux-form';
+import { reset, submit } from 'redux-form';
 
 import { sendPostMyPassword } from 'state/users/actions';
 import AccountForm from 'ui/users/my-profile/AccountForm';
@@ -22,6 +22,9 @@ export const mapDispatchToProps = dispatch => ({
   onModalFormSubmit: () => {
     dispatch(submit(AccountForm.FORM_ID));
   },
+  onModalClose: () => {
+    dispatch(reset(AccountForm.FORM_ID));
+  },
 });
 
 export default connect(