From 1de911122aac282f0cfbc5654762c8ca023e60a6 Mon Sep 17 00:00:00 2001 From: Zainab Amir Date: Thu, 12 Aug 2021 18:26:05 +0500 Subject: [PATCH] fix: reset password banner image changed (#420) In addition to the check for authenticated user, added a welcome banner check to restrict the welcome banner for only progressive profiling page. VAN-688 --- src/base-component/BaseComponent.jsx | 9 +++++++-- src/welcome/WelcomePage.jsx | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/base-component/BaseComponent.jsx b/src/base-component/BaseComponent.jsx index 78f55b98..b7855e14 100644 --- a/src/base-component/BaseComponent.jsx +++ b/src/base-component/BaseComponent.jsx @@ -17,8 +17,8 @@ import AuthExtraLargeLayout from './AuthExtraLargeLayout'; import AuthMediumLayout from './AuthMediumLayout'; import AuthSmallLayout from './AuthSmallLayout'; -const BaseComponent = ({ children }) => { - const authenticatedUser = getAuthenticatedUser(); +const BaseComponent = ({ children, showWelcomeBanner }) => { + const authenticatedUser = showWelcomeBanner ? getAuthenticatedUser() : null; return ( <> @@ -62,8 +62,13 @@ const BaseComponent = ({ children }) => { ); }; +BaseComponent.defaultProps = { + showWelcomeBanner: false, +}; + BaseComponent.propTypes = { children: PropTypes.node.isRequired, + showWelcomeBanner: PropTypes.bool, }; export default BaseComponent; diff --git a/src/welcome/WelcomePage.jsx b/src/welcome/WelcomePage.jsx index 21526e79..d6df34a9 100644 --- a/src/welcome/WelcomePage.jsx +++ b/src/welcome/WelcomePage.jsx @@ -122,7 +122,7 @@ const WelcomePage = (props) => { return ( <> - + {intl.formatMessage(messages['progressive.profiling.page.title'], { siteName: getConfig().SITE_NAME })}