-
- {title
+
+
+
+
+ {title
&& (
-
-
{title}
-
+
+
{title}
+
)
- }
-
-
{message}
-
-
+ }
+
+
{message}
+
+
+
-
)
);
}
diff --git a/assets/js/src/common/sender_email_address_warning.jsx b/assets/js/src/common/sender_email_address_warning.jsx
index fa8db6958c..0c11a7d7cc 100644
--- a/assets/js/src/common/sender_email_address_warning.jsx
+++ b/assets/js/src/common/sender_email_address_warning.jsx
@@ -56,29 +56,31 @@ const SenderEmailAddressWarning = ({ emailAddress }) => {
const emailAddressDomain = emailAddress.split('@').pop().toLowerCase();
if (badDomains.indexOf(emailAddressDomain) > -1) {
const userHostDomain = window.location.hostname.replace('www.', '');
- return (
- {MailPoet.I18n.t('senderEmailAddressWarning1')}
-
- {ReactStringReplace(
- MailPoet.I18n.t('senderEmailAddressWarning2'),
- /(%suggested|%originalSender|.*<\/em>)/,
- (match) => {
- if (match === '%suggested') return `info@${userHostDomain}`;
- if (match === '%originalSender') return { emailAddress };
- return {match.replace(/<\/?em>/g, '')};
- }
- )}
-
-
-
- {MailPoet.I18n.t('senderEmailAddressWarning3')}
-
-
- );
+ return (
+
+ {MailPoet.I18n.t('senderEmailAddressWarning1')}
+
+ {ReactStringReplace(
+ MailPoet.I18n.t('senderEmailAddressWarning2'),
+ /(%suggested|%originalSender|.*<\/em>)/,
+ (match) => {
+ if (match === '%suggested') return `info@${userHostDomain}`;
+ if (match === '%originalSender') return { emailAddress };
+ return {match.replace(/<\/?em>/g, '')};
+ }
+ )}
+
+
+
+ {MailPoet.I18n.t('senderEmailAddressWarning3')}
+
+
+
+ );
}
return null;
};
diff --git a/assets/js/src/listing/listing_item.jsx b/assets/js/src/listing/listing_item.jsx
index 8437b3325b..ffc863eba8 100644
--- a/assets/js/src/listing/listing_item.jsx
+++ b/assets/js/src/listing/listing_item.jsx
@@ -44,8 +44,8 @@ class ListingItem extends React.Component {
' +
- '' +
- '';
+ var closeModalImage = '';
/** *************************************************************************
MailPoet Modal:
@@ -85,27 +84,27 @@ define('modal', ['mailpoet', 'jquery'],
options: {},
templates: {
overlay: '',
- popup: '',
- loading: '' +
- ' ' +
- ' ' +
- ' ' +
- ' ',
- panel: '',
- subpanel: ''
+ popup: '',
+ loading: ''
+ + ' '
+ + ' '
+ + ' '
+ + ' ',
+ panel: '',
+ subpanel: ''
},
getContentContainer: function () {
return jQuery('.mailpoet_' + this.options.type + '_body');
diff --git a/assets/js/src/newsletters/send/congratulate/success.jsx b/assets/js/src/newsletters/send/congratulate/success.jsx
index 8259d766f1..b5f9f50f44 100644
--- a/assets/js/src/newsletters/send/congratulate/success.jsx
+++ b/assets/js/src/newsletters/send/congratulate/success.jsx
@@ -29,13 +29,13 @@ function Success(props) {
{showSuccessDeliveryPoll
&& (
-
+
)
}
diff --git a/assets/js/src/newsletters/send/sender_address_field.jsx b/assets/js/src/newsletters/send/sender_address_field.jsx
index 76b6c478a5..6904a30632 100644
--- a/assets/js/src/newsletters/send/sender_address_field.jsx
+++ b/assets/js/src/newsletters/send/sender_address_field.jsx
@@ -18,15 +18,17 @@ class SenderField extends React.Component {
}
render() {
- return (
-
-
-
-
- );
+ return (
+
+
+
+
+
+
+ );
}
}
diff --git a/assets/js/src/newsletters/types/automatic_emails/event.jsx b/assets/js/src/newsletters/types/automatic_emails/event.jsx
index f93eb3f9ee..021a406e3d 100644
--- a/assets/js/src/newsletters/types/automatic_emails/event.jsx
+++ b/assets/js/src/newsletters/types/automatic_emails/event.jsx
@@ -35,7 +35,7 @@ class AutomaticEmailEvent extends React.PureComponent {
className="button button-primary"
disabled={disabled}
onClick={onClick}
- role="button"
+ role="presentation"
data-automation-id={`create_${event.slug}`}
onKeyDown={(keyEvent) => {
if ((['keydown', 'keypress'].includes(keyEvent.type) && ['Enter', ' '].includes(keyEvent.key))
diff --git a/assets/js/src/settings/default_sender.jsx b/assets/js/src/settings/default_sender.jsx
index 6db1505166..d3eb2f02ce 100644
--- a/assets/js/src/settings/default_sender.jsx
+++ b/assets/js/src/settings/default_sender.jsx
@@ -23,51 +23,53 @@ class DefaultSender extends React.Component {
}
render() {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
}
}
diff --git a/assets/js/src/welcome_wizard/steps/sender_step.jsx b/assets/js/src/welcome_wizard/steps/sender_step.jsx
index 1363baa7b0..89874f6f63 100644
--- a/assets/js/src/welcome_wizard/steps/sender_step.jsx
+++ b/assets/js/src/welcome_wizard/steps/sender_step.jsx
@@ -46,7 +46,8 @@ const WelcomeWizardSenderStep = props => (
/>
|