From 6a1185be74d3394a27de3ddf6dc0e6a0da1bce47 Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Tue, 29 Jan 2019 16:04:16 +0100
Subject: [PATCH] Fix styling problems

---
 assets/js/src/newsletters/listings/mixins.jsx | 19 +++++++++----------
 assets/js/src/newsletters/send.jsx            |  4 ++--
 .../send/congratulate/congratulate.jsx        |  3 ++-
 .../newsletters/send/congratulate/success.jsx |  9 ++++++---
 package-lock.json                             |  8 ++++----
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/assets/js/src/newsletters/listings/mixins.jsx b/assets/js/src/newsletters/listings/mixins.jsx
index 6f5c8f09ef..80e357f905 100644
--- a/assets/js/src/newsletters/listings/mixins.jsx
+++ b/assets/js/src/newsletters/listings/mixins.jsx
@@ -131,12 +131,11 @@ const QueueMixin = {
     }
 
     let progressBarWidth = 0;
-
-    if (percentage) {
-      percentage = MailPoet.I18n.t('noSubscribers');
-    } else {
+    if (Number.isFinite(percentage)) {
       progressBarWidth = percentage;
       percentage += '%';
+    } else {
+      percentage = MailPoet.I18n.t('noSubscribers');
     }
 
     return (
@@ -238,7 +237,7 @@ const StatisticsMixin = {
           <div>
             <span>
               { percentageOpenedDisplay }
-%
+              %
               {' '}
             </span>
             <StatsBadge
@@ -250,7 +249,7 @@ const StatisticsMixin = {
           <div>
             <span>
               { percentageClickedDisplay }
-%
+              %
               {' '}
             </span>
             <StatsBadge
@@ -262,7 +261,7 @@ const StatisticsMixin = {
           <div>
             <span className="mailpoet_stat_hidden">
               { percentageUnsubscribedDisplay }
-%
+              %
             </span>
           </div>
         </div>
@@ -273,15 +272,15 @@ const StatisticsMixin = {
         <div>
           <span className="mailpoet_stats_text">
             { percentageOpenedDisplay }
-%,
+            %,
             { ' ' }
             { percentageClickedDisplay }
-%
+            %
             <span className="mailpoet_stat_hidden">
               ,
               {' '}
               { percentageUnsubscribedDisplay }
-%
+              %
             </span>
           </span>
           { tooEarlyForStats && (
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index e9278e1667..018bbe8a9b 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -425,7 +425,7 @@ const NewsletterSend = createReactClass({ // eslint-disable-line react/prefer-es
             />
             &nbsp;
             {MailPoet.I18n.t('orSimply')}
-&nbsp;
+            &nbsp;
             <a
               href={
                 `?page=mailpoet-newsletter-editor&id=${this.props.match.params.id}`
@@ -434,7 +434,7 @@ const NewsletterSend = createReactClass({ // eslint-disable-line react/prefer-es
             >
               {MailPoet.I18n.t('goBackToDesign')}
             </a>
-.
+            .
           </p>
           { !isPaused && sendButtonOptions.disabled && sendButtonOptions.disabled === 'disabled' && (
             <HelpTooltip
diff --git a/assets/js/src/newsletters/send/congratulate/congratulate.jsx b/assets/js/src/newsletters/send/congratulate/congratulate.jsx
index 4ff5a6a123..083b62896c 100644
--- a/assets/js/src/newsletters/send/congratulate/congratulate.jsx
+++ b/assets/js/src/newsletters/send/congratulate/congratulate.jsx
@@ -121,7 +121,8 @@ class Congratulate extends React.Component {
   renderContent() {
     if (this.state.loading || !this.state.minimumLoadingTimePassed) {
       return renderLoading(!!this.state.newsletter);
-    } if (this.state.error) {
+    }
+    if (this.state.error) {
       return renderFail();
     }
     return renderSuccess(this.state.newsletter, this.state.testingPassed);
diff --git a/assets/js/src/newsletters/send/congratulate/success.jsx b/assets/js/src/newsletters/send/congratulate/success.jsx
index b5f9f50f44..e78004cb64 100644
--- a/assets/js/src/newsletters/send/congratulate/success.jsx
+++ b/assets/js/src/newsletters/send/congratulate/success.jsx
@@ -5,11 +5,14 @@ import MailPoet from 'mailpoet';
 function renderHeader(newsletter) {
   if (newsletter.type === 'welcome') {
     return MailPoet.I18n.t('congratulationsWelcomeEmailSuccessHeader');
-  } if (newsletter.type === 'notification') {
+  }
+  if (newsletter.type === 'notification') {
     return MailPoet.I18n.t('congratulationsPostNotificationSuccessHeader');
-  } if (newsletter.type === 'automatic') {
+  }
+  if (newsletter.type === 'automatic') {
     return MailPoet.I18n.t('congratulationsWooSuccessHeader');
-  } if (newsletter.status === 'scheduled') {
+  }
+  if (newsletter.status === 'scheduled') {
     return MailPoet.I18n.t('congratulationsScheduleSuccessHeader');
   }
   return MailPoet.I18n.t('congratulationsSendSuccessHeader');
diff --git a/package-lock.json b/package-lock.json
index d1cf346b85..1f889cc19d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3311,7 +3311,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -3418,8 +3418,8 @@
           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
           "dev": true,
           "requires": {
-            "esutils": "2.0.2",
-            "isarray": "1.0.0"
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
           }
         },
         "has": {
@@ -3511,7 +3511,7 @@
           "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
           "dev": true,
           "requires": {
-            "array-includes": "3.0.3"
+            "array-includes": "^3.0.3"
           }
         },
         "path-parse": {