diff --git a/assets/js/src/common/sender_email_address_warning.jsx b/assets/js/src/common/sender_email_address_warning.jsx
index 73d55f873a..7e6b4a4a13 100644
--- a/assets/js/src/common/sender_email_address_warning.jsx
+++ b/assets/js/src/common/sender_email_address_warning.jsx
@@ -49,7 +49,7 @@ const badDomains = [
'yahoo.com.mx', 'live.com.mx', 'hotmail.es', 'hotmail.com.mx', 'prodigy.net.mx',
/* Domains used in Brazil */
- 'yahoo.com.br', 'hotmail.com.br', 'outlook.com.br', 'uol.com.br', 'bol.com.br', 'terra.com.br', 'ig.com.br', 'itelefonica.com.br', 'r7.com', 'zipmail.com.br', 'globo.com', 'globomail.com', 'oi.com.br'
+ 'yahoo.com.br', 'hotmail.com.br', 'outlook.com.br', 'uol.com.br', 'bol.com.br', 'terra.com.br', 'ig.com.br', 'itelefonica.com.br', 'r7.com', 'zipmail.com.br', 'globo.com', 'globomail.com', 'oi.com.br',
];
const SenderEmailAddressWarning = ({ emailAddress }) => {
diff --git a/assets/js/src/newsletters/send/sender_address_field.jsx b/assets/js/src/newsletters/send/sender_address_field.jsx
new file mode 100644
index 0000000000..76b6c478a5
--- /dev/null
+++ b/assets/js/src/newsletters/send/sender_address_field.jsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import FormFieldText from 'form/fields/text.jsx';
+import PropTypes from 'prop-types';
+import SenderEmailAddressWarning from 'common/sender_email_address_warning.jsx';
+
+class SenderField extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ emailAddress: props.item.sender_address,
+ };
+ this.onChange = this.onChange.bind(this);
+ }
+
+ onChange(event) {
+ this.setState({ emailAddress: event.target.value });
+ this.props.onValueChange(event);
+ }
+
+ render() {
+ return (
+
+
+
+
+ );
+ }
+}
+
+SenderField.propTypes = {
+ item: PropTypes.shape({
+ sender_address: PropTypes.string.isRequired,
+ }).isRequired,
+ onValueChange: PropTypes.func,
+};
+
+SenderField.defaultProps = {
+ onValueChange: function onValueChange() {
+ // no-op
+ },
+};
+
+export default SenderField;
diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx
index da56711917..3875ee4579 100644
--- a/assets/js/src/newsletters/send/standard.jsx
+++ b/assets/js/src/newsletters/send/standard.jsx
@@ -5,6 +5,7 @@ import Hooks from 'wp-js-hooks';
import PropTypes from 'prop-types';
import DateTime from 'newsletters/send/date_time.jsx';
+import SenderField from 'newsletters/send/sender_address_field.jsx';
const currentTime = window.mailpoet_current_time || '00:00';
const defaultDateTime = `${window.mailpoet_current_date} 00:00:00`;
@@ -156,7 +157,8 @@ let fields = [
},
{
name: 'sender_address',
- type: 'text',
+ type: 'reactComponent',
+ component: SenderField,
placeholder: MailPoet.I18n.t('senderAddressPlaceholder'),
validation: {
'data-parsley-required': true,
diff --git a/assets/js/src/welcome_wizard/steps/sender_step.jsx b/assets/js/src/welcome_wizard/steps/sender_step.jsx
index 994fe3dc6e..46a4df676a 100644
--- a/assets/js/src/welcome_wizard/steps/sender_step.jsx
+++ b/assets/js/src/welcome_wizard/steps/sender_step.jsx
@@ -3,7 +3,7 @@ import React from 'react';
import MailPoet from 'mailpoet';
import jQuery from 'jquery';
-import SenderEmailAddressWarning from 'common/sender_email_address_warning.jsx'
+import SenderEmailAddressWarning from 'common/sender_email_address_warning.jsx';
const WelcomeWizardSenderStep = props => (
diff --git a/views/layout.html b/views/layout.html
index 8d5a108aef..4097a6578c 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -67,8 +67,8 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
<%= localize({
'ajaxFailedErrorMessage': __('An error has happened while performing a request, the server has responded with response code %d'),
'senderEmailAddressWarning1': _x('You might not reach the inbox of your subscribers if you use this email address.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
- 'senderEmailAddressWarning2': _x('Use an address like info@%userDomain for the Sender and put %originalSender in the the Reply-to field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
- 'senderEmailAddressWarning3': _x('Read more.'),
+ 'senderEmailAddressWarning2': _x('Use an address like s%userDomain for the Sender and put %originalSender in the the Reply-to field below.', 'In the last step, before sending a newsletter. URL: ?page=mailpoet-newsletters#/send/2'),
+ 'senderEmailAddressWarning3': __('Read more.'),
}) %>
<% block translations %><% endblock %>