From f66656b38b002c64a38724e6da20c763667fcdaa Mon Sep 17 00:00:00 2001
From: Brezo Cordero <8002881+brezocordero@users.noreply.github.com>
Date: Thu, 12 Aug 2021 17:39:57 -0500
Subject: [PATCH] Unify duplicated API error notices

[MAILPOET-2844]
---
 assets/js/src/listing/notices.jsx                |  4 ++++
 assets/js/src/newsletters/send.jsx               |  5 -----
 assets/js/src/notices/invalid_mss_key_notice.tsx | 11 ++++++++++-
 views/newsletters.html                           |  2 +-
 views/segments.html                              |  2 +-
 views/subscribers/subscribers.html               |  2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/assets/js/src/listing/notices.jsx b/assets/js/src/listing/notices.jsx
index 9564c675c4..97a2b03fc4 100644
--- a/assets/js/src/listing/notices.jsx
+++ b/assets/js/src/listing/notices.jsx
@@ -25,6 +25,10 @@ const MailerError = (props) => {
   if (!props.mta_log.error || props.mta_log.status !== 'paused' || props.mta_log.error.operation === 'authorization') {
     return null;
   }
+  // do not display MailPoet API Key error twice
+  if (props.mta_log.error.operation === 'send' && props.mta_method === 'MailPoet' && MailPoet.hasInvalidMssApiKey) {
+    return null;
+  }
   if (props.mta_log.error.operation === 'migration') {
     return (
       <div className="mailpoet_notice notice notice-warning">
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index 68746ac32a..33d83c04cf 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -15,7 +15,6 @@ import { fromUrl } from 'common/thumbnail.ts';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 import ReactStringReplace from 'react-string-replace';
-import InvalidMssKeyNotice from 'notices/invalid_mss_key_notice';
 import slugify from 'slugify';
 import { GlobalContext } from 'context/index.jsx';
 
@@ -478,10 +477,6 @@ class NewsletterSend extends React.Component {
           onChange={this.handleFormChange}
           onSubmit={this.handleSave}
         >
-          <InvalidMssKeyNotice
-            mssKeyInvalid={window.mailpoet_mss_key_invalid}
-            subscribersCount={window.mailpoet_subscribers_count}
-          />
           <p>
             <Button variant="secondary" type="submit" automationId="email-save-draft">
               {MailPoet.I18n.t('saveDraftAndClose')}
diff --git a/assets/js/src/notices/invalid_mss_key_notice.tsx b/assets/js/src/notices/invalid_mss_key_notice.tsx
index e675bc3aa2..d91b49f7a0 100644
--- a/assets/js/src/notices/invalid_mss_key_notice.tsx
+++ b/assets/js/src/notices/invalid_mss_key_notice.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import Notice from 'notices/notice';
 import MailPoet from 'mailpoet';
+import ReactStringReplace from 'react-string-replace';
 
 type Props = {
   mssKeyInvalid: boolean;
@@ -12,7 +13,15 @@ const InvalidMssKeyNotice = ({ mssKeyInvalid, subscribersCount }: Props) => {
   return (
     <Notice type="error" timeout={false} closable={false} renderInPlace>
       <h3>{MailPoet.I18n.t('allSendingPausedHeader')}</h3>
-      <p>{MailPoet.I18n.t('allSendingPausedBody')}</p>
+      <p>
+        {
+          ReactStringReplace(
+            MailPoet.I18n.t('allSendingPausedBody'),
+            /\[link\](.*?)\[\/link\]/g,
+            (match) => <a href="?page=mailpoet-settings#premium" key="check-sending">{ match }</a>
+          )
+        }
+      </p>
       <p>
         <a
           href={`https://account.mailpoet.com?s=${subscribersCount}`}
diff --git a/views/newsletters.html b/views/newsletters.html
index 4bf66046e0..a4142c75a3 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -294,7 +294,7 @@
     'schedule': __('Schedule'),
 
     'allSendingPausedHeader': __('All sending is currently paused!'),
-    'allSendingPausedBody': __('Your key to send with MailPoet is invalid.'),
+    'allSendingPausedBody': __('Your [link]API key[/link] to send with MailPoet is invalid.'),
     'allSendingPausedLink': __('Purchase a key'),
 
     'next': __('Next'),
diff --git a/views/segments.html b/views/segments.html
index c517239d44..73b7828612 100644
--- a/views/segments.html
+++ b/views/segments.html
@@ -99,7 +99,7 @@
     'numberOfItemsSingular': __('1 item'),
     'numberOfItemsMultiple': __('%$1d items'),
     'allSendingPausedHeader': __('All sending is currently paused!'),
-    'allSendingPausedBody': __('Your key to send with MailPoet is invalid.'),
+    'allSendingPausedBody': __('Your [link]API key[/link] to send with MailPoet is invalid.'),
     'allSendingPausedLink': __('Purchase a key'),
 
     'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers.'),
diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html
index a663e3fb64..7fddf3ca98 100644
--- a/views/subscribers/subscribers.html
+++ b/views/subscribers/subscribers.html
@@ -118,7 +118,7 @@
     'WPUsersSegment': __('WordPress Users'),
     'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his/her profile[/link] to change his/her email.'),
     'allSendingPausedHeader': __('All sending is currently paused!'),
-    'allSendingPausedBody': __('Your key to send with MailPoet is invalid.'),
+    'allSendingPausedBody': __('Your [link]API key[/link] to send with MailPoet is invalid.'),
     'allSendingPausedLink': __('Purchase a key'),
     'statsListingActionTitle': __('Statistics'),
     'statsHeading': _x('Stats: %s', 'This is a heading for the subscribers statistics page example: "Stats: mailpoet@example.com"'),