From b8a93a76d07558893852ed2b49ee781db58b3f87 Mon Sep 17 00:00:00 2001
From: Taras Lytvynenko <69678257+Inferato@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:30:08 +0300
Subject: [PATCH 1/2] fix: Added maxLength and default tip for email subject
---
.../bulk-email-tool/bulk-email-form/BulkEmailForm.jsx | 5 ++++-
src/components/bulk-email-tool/bulk-email-form/messages.js | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx b/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
index f0bdc316..ce0b157a 100644
--- a/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
+++ b/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
@@ -275,7 +275,10 @@ function BulkEmailForm(props) {
/>
{intl.formatMessage(messages.bulkEmailSubjectLabel)}
-
+
+
+ {intl.formatMessage(messages.bulkEmailFormSubjectTip)}
+
{!emailFormValidation.subject && (
{intl.formatMessage(messages.bulkEmailFormSubjectError)}
diff --git a/src/components/bulk-email-tool/bulk-email-form/messages.js b/src/components/bulk-email-tool/bulk-email-form/messages.js
index c304c072..2e4df835 100644
--- a/src/components/bulk-email-tool/bulk-email-form/messages.js
+++ b/src/components/bulk-email-tool/bulk-email-form/messages.js
@@ -41,6 +41,11 @@ const messages = defineMessages({
defaultMessage: 'Subject',
description: 'Email subject line input label. Meant to have colon or equivilant punctuation.',
},
+ bulkEmailFormSubjectTip: {
+ id: 'bulk.email.form.subject.tip',
+ defaultMessage: '(Maximum 128 characters)',
+ description: 'Default Subject tip'
+ },
bulkEmailFormSubjectError: {
id: 'bulk.email.form.subject.error',
defaultMessage: 'A subject is required',
From 276da02b8b8b968ee9ae811447000f7ac7dc9723 Mon Sep 17 00:00:00 2001
From: Taras Lytvynenko <69678257+Inferato@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:01:58 +0300
Subject: [PATCH 2/2] fix: lint
---
.../bulk-email-tool/bulk-email-form/BulkEmailForm.jsx | 4 ++--
src/components/bulk-email-tool/bulk-email-form/messages.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx b/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
index ce0b157a..3b1816da 100644
--- a/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
+++ b/src/components/bulk-email-tool/bulk-email-form/BulkEmailForm.jsx
@@ -275,9 +275,9 @@ function BulkEmailForm(props) {
/>
{intl.formatMessage(messages.bulkEmailSubjectLabel)}
-
+
- {intl.formatMessage(messages.bulkEmailFormSubjectTip)}
+ {intl.formatMessage(messages.bulkEmailFormSubjectTip)}
{!emailFormValidation.subject && (
diff --git a/src/components/bulk-email-tool/bulk-email-form/messages.js b/src/components/bulk-email-tool/bulk-email-form/messages.js
index 2e4df835..0d0194a1 100644
--- a/src/components/bulk-email-tool/bulk-email-form/messages.js
+++ b/src/components/bulk-email-tool/bulk-email-form/messages.js
@@ -44,7 +44,7 @@ const messages = defineMessages({
bulkEmailFormSubjectTip: {
id: 'bulk.email.form.subject.tip',
defaultMessage: '(Maximum 128 characters)',
- description: 'Default Subject tip'
+ description: 'Default Subject tip',
},
bulkEmailFormSubjectError: {
id: 'bulk.email.form.subject.error',