diff --git a/assets/js/src/common/sender_email_address_warning.jsx b/assets/js/src/common/sender_email_address_warning.jsx index ecbcd847d5..2cf69e1ed2 100644 --- a/assets/js/src/common/sender_email_address_warning.jsx +++ b/assets/js/src/common/sender_email_address_warning.jsx @@ -7,55 +7,6 @@ import ReactStringReplace from 'react-string-replace'; const userHostDomain = window.location.hostname.replace('www.', ''); const suggestedEmailAddress = `contact@${userHostDomain}`; -const NewInstallationWithMSSWarning = ({ emailAddress }) => ( - -

- {ReactStringReplace( - MailPoet.I18n.t('senderEmailAddressNewInstallWarning1'), - '%originalSender', - () => { emailAddress } - )} -

-

- {ReactStringReplace( - MailPoet.I18n.t('senderEmailAddressNewInstallWarning2'), - /(%suggested|%originalSender)/, - (match) => { - if (match === '%suggested') return { suggestedEmailAddress }; - return { emailAddress }; - } - )} -

-

- {MailPoet.I18n.t('senderEmailAddressNewInstallWarning3')} - {' '} - - {MailPoet.I18n.t('senderEmailAddressNewInstallWarning4')} - -

-

- - {MailPoet.I18n.t('senderEmailAddressWarning3')} - -

-
-); - -NewInstallationWithMSSWarning.propTypes = { - emailAddress: PropTypes.string.isRequired, -}; - const OldInstallationWarning = ({ emailAddress }) => (

{ + if (mssActive) return null const emailAddressDomain = emailAddress.split('@').pop().toLowerCase(); if (window.mailpoet_free_domains.indexOf(emailAddressDomain) > -1) { - if (mssActive && moment(pluginInstalledAt).isAfter('2019-03-05')) { - return ; - } return ; } return null;