From 41eeae2d14985492aa7013fe61e8ed0bd004823f Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Thu, 20 Sep 2018 15:08:01 +0200 Subject: [PATCH] Refactor property names in inAppAnnouncements to be easy to understand [MAILPOET-1525] --- .../in_app_announcements/in_app_announcement.jsx | 16 ++++++++-------- assets/js/src/newsletters/listings/heading.jsx | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/js/src/in_app_announcements/in_app_announcement.jsx b/assets/js/src/in_app_announcements/in_app_announcement.jsx index 462dbccbda..48df39263f 100644 --- a/assets/js/src/in_app_announcements/in_app_announcement.jsx +++ b/assets/js/src/in_app_announcements/in_app_announcement.jsx @@ -32,8 +32,8 @@ class InAppAnnouncement extends React.Component { } render() { - if (this.props.newUser !== null && - window.mailpoet_is_new_user !== this.props.newUser + if (this.props.showToNewUser !== null && + window.mailpoet_is_new_user !== this.props.showToNewUser ) { return null; } @@ -42,8 +42,8 @@ class InAppAnnouncement extends React.Component { return null; } - if (this.props.premiumUser !== null && - window.mailpoet_premium_active !== this.props.premiumUser + if (this.props.showToPremiumUser !== null && + window.mailpoet_premium_active !== this.props.showToPremiumUser ) { return null; } @@ -89,10 +89,10 @@ InAppAnnouncement.propTypes = { className: React.PropTypes.string, children: React.PropTypes.element.isRequired, validUntil: React.PropTypes.number, - newUser: (props, propName, componentName) => ( + showToNewUser: (props, propName, componentName) => ( validateBooleanWithWindowDependency(props, propName, componentName, 'mailpoet_is_new_user') ), - premiumUser: (props, propName, componentName) => ( + showToPremiumUser: (props, propName, componentName) => ( validateBooleanWithWindowDependency(props, propName, componentName, 'mailpoet_premium_active') ), showOnlyOnceSlug: (props, propName, componentName) => { @@ -119,8 +119,8 @@ InAppAnnouncement.defaultProps = { height: '600px', className: null, validUntil: null, - newUser: null, - premiumUser: null, + showToNewUser: null, + showToPremiumUser: null, showOnlyOnceSlug: null, }; diff --git a/assets/js/src/newsletters/listings/heading.jsx b/assets/js/src/newsletters/listings/heading.jsx index 15f3727f37..4e56b6d4bb 100644 --- a/assets/js/src/newsletters/listings/heading.jsx +++ b/assets/js/src/newsletters/listings/heading.jsx @@ -20,8 +20,8 @@ const ListingHeading = () => (