From ed2ae6d22e3cd9722b864274f054d35855073a4a Mon Sep 17 00:00:00 2001
From: Pauliina Ilmanen <pauliina.jalava@anders.fi>
Date: Tue, 14 Jan 2025 13:11:57 +0200
Subject: [PATCH] Re-fetch user once email is updated

Email was missing e.g. in reservation confirmation page as the updated
email was not yet updated to the user object.

Refs TTVA-223
---
 app/pages/AppContainer.js                               | 1 +
 app/shared/modals/user-email-form/UserEmailFormModal.js | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/pages/AppContainer.js b/app/pages/AppContainer.js
index a7cc92a6e..1a7bd1a72 100644
--- a/app/pages/AppContainer.js
+++ b/app/pages/AppContainer.js
@@ -106,6 +106,7 @@ export class UnconnectedAppContainer extends Component {
           <Footer />
           {(userId) && (
             <UserEmailFormModal
+              fetchUser={this.props.fetchUser}
               show={userId && !userHasEmail}
               userId={userId}
             />
diff --git a/app/shared/modals/user-email-form/UserEmailFormModal.js b/app/shared/modals/user-email-form/UserEmailFormModal.js
index a75be7058..aae314b51 100644
--- a/app/shared/modals/user-email-form/UserEmailFormModal.js
+++ b/app/shared/modals/user-email-form/UserEmailFormModal.js
@@ -12,7 +12,9 @@ import { NOTIFICATION_TYPE } from '../../../../src/common/notification/constants
 import client from '../../../../src/common/api/client';
 import injectT from '../../../i18n/injectT';
 
-function UserEmailFormModal({ userId, show, t }) {
+function UserEmailFormModal({
+  fetchUser, userId, show, t,
+}) {
   const [open, setOpen] = useState(false);
   const [error, setError] = useState(false);
   const [emailMismatch, setEmailMismatch] = useState(false);
@@ -35,6 +37,7 @@ function UserEmailFormModal({ userId, show, t }) {
         .then(() => {
           createNotification(NOTIFICATION_TYPE.SUCCESS, t('UserEmailForm.emailSet'));
           setOpen(false);
+          fetchUser(userId);
         })
         .catch((e) => {
           setError(true);
@@ -129,6 +132,7 @@ function UserEmailFormModal({ userId, show, t }) {
 }
 
 UserEmailFormModal.propTypes = {
+  fetchUser: PropTypes.func.isRequired,
   userId: PropTypes.string.isRequired,
   show: PropTypes.bool.isRequired,
   t: PropTypes.func.isRequired,