diff --git a/assets/js/src/common/confirm_alert.jsx b/assets/js/src/common/confirm_alert.jsx index 9b43658191..62360f934e 100644 --- a/assets/js/src/common/confirm_alert.jsx +++ b/assets/js/src/common/confirm_alert.jsx @@ -49,5 +49,13 @@ ConfirmAlert.defaultProps = { export default function confirmAlert(props) { // the below render is only to invoke proptypes on ConfirmAlert - ReactDOMServer.renderToString(); + ReactDOMServer.renderToString( + + ); } diff --git a/assets/js/src/common/sender_email_address_warning.jsx b/assets/js/src/common/sender_email_address_warning.jsx index 2737b4c9c4..fcfc070e0b 100644 --- a/assets/js/src/common/sender_email_address_warning.jsx +++ b/assets/js/src/common/sender_email_address_warning.jsx @@ -11,7 +11,7 @@ const SenderEmailAddressWarning = ({ emailAddress, mssActive }) => { const emailAddressDomain = emailAddress.split('@').pop().toLowerCase(); if (window.mailpoet_free_domains.indexOf(emailAddressDomain) > -1) { return ( - + <>

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

-
+ ); } return null; diff --git a/assets/js/src/form/fields/field.jsx b/assets/js/src/form/fields/field.jsx index a1117d08ab..617c712454 100644 --- a/assets/js/src/form/fields/field.jsx +++ b/assets/js/src/form/fields/field.jsx @@ -27,35 +27,107 @@ class FormField extends React.Component { switch (dataField.type) { case 'text': - field = (); + field = ( + + ); break; case 'textarea': - field = (); + field = ( + + ); break; case 'select': - field = (); + field = ( + + ); break; case 'radio': - field = (); + field = ( + + ); break; case 'checkbox': - field = (); + field = ( + + ); break; case 'selection': - field = (); + field = ( + + ); break; case 'date': - field = (); + field = ( + + ); break; case 'reactComponent': - field = (); + field = ( + + ); break; default: diff --git a/assets/js/src/form/fields/select.jsx b/assets/js/src/form/fields/select.jsx index 033210642e..5d0c01a4e3 100644 --- a/assets/js/src/form/fields/select.jsx +++ b/assets/js/src/form/fields/select.jsx @@ -64,7 +64,7 @@ class FormFieldSelect extends React.Component { value={this.props.item[this.props.field.name] || ''} onChange={this.props.onValueChange} data-automation-id={this.props.automationId} - {...this.props.field.validation} + {...this.props.field.validation} // eslint-disable-line react/jsx-props-no-spreading > {placeholder} {options} diff --git a/assets/js/src/form/fields/selection.jsx b/assets/js/src/form/fields/selection.jsx index c0d23fc787..daddce700c 100644 --- a/assets/js/src/form/fields/selection.jsx +++ b/assets/js/src/form/fields/selection.jsx @@ -243,7 +243,11 @@ class Selection extends React.Component { // For single selects only, in order for the placeholder value to appear, // we must have a blank