From 6f426d415477dd8f58a2acadae9f5d6f796894ef Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Wed, 6 Jan 2021 16:54:20 +0100
Subject: [PATCH] Simplify subscribers count info on subscribers page

[MAILPOET-3143]
---
 assets/js/src/common/subscribers_in_plan.tsx | 51 +++++---------------
 assets/js/src/segments/heading.jsx           |  5 --
 assets/js/src/subscribers/list.jsx           |  5 --
 views/subscribers/subscribers.html           |  4 --
 4 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/assets/js/src/common/subscribers_in_plan.tsx b/assets/js/src/common/subscribers_in_plan.tsx
index d23cd2af82..caf5c291b0 100644
--- a/assets/js/src/common/subscribers_in_plan.tsx
+++ b/assets/js/src/common/subscribers_in_plan.tsx
@@ -6,62 +6,35 @@ import ReactStringReplace from 'react-string-replace';
 type Props = {
   subscribersInPlan: number | false;
   subscribersInPlanLimit: number | false;
-  mailpoetSubscribers: number | false;
-  mailpoetSubscribersLimit: number | false;
-  hasPremiumSupport: boolean;
-  wpUsersCount: number | false;
-  mssActive: boolean;
 };
 
 const SubscribersInPlan = ({
   subscribersInPlan,
   subscribersInPlanLimit,
-  mailpoetSubscribers,
-  mailpoetSubscribersLimit,
-  hasPremiumSupport,
-  wpUsersCount,
-  mssActive,
 }: Props) => {
-  const subscribersInPlanCount = (
-    <b key="1">
+  if (subscribersInPlan === false) {
+    return null;
+  }
+
+  const subscribersInPlanCount = subscribersInPlanLimit ? (
+    <b key="subscribers_count">
       {MailPoet.I18n.t('subscribersInPlanCount')
         .replace('%$1d', subscribersInPlan.toLocaleString())
         .replace('%$2d', subscribersInPlanLimit.toLocaleString())}
     </b>
+  ) : (
+    <b key="subscribers_count">{subscribersInPlan}</b>
   );
-  const mailpoetSubscribersCount = (
-    <b key="2">
-      {MailPoet.I18n.t('subscribersInPlanCount')
-        .replace('%$1d', mailpoetSubscribers.toLocaleString())
-        .replace('%$2d', mailpoetSubscribersLimit ? mailpoetSubscribersLimit.toLocaleString() : '∞')}
-    </b>
-  );
-  let mailpoetSubscribersTooltip;
-  if (hasPremiumSupport) {
-    mailpoetSubscribersTooltip = MailPoet.I18n.t('mailpoetSubscribersTooltipPremium');
-  } else {
-    mailpoetSubscribersTooltip = MailPoet.I18n.t('mailpoetSubscribersTooltipFree')
-      .replace('%$1d', wpUsersCount.toLocaleString());
-  }
+
   return (
     <div className="mailpoet-subscribers-in-plan">
-      {mssActive && subscribersInPlanLimit && (
-        <>
-          {ReactStringReplace(MailPoet.I18n.t('subscribersInPlan'), '%s', () => subscribersInPlanCount)}
-          {' '}
-          <HelpTooltip
-            tooltip={MailPoet.I18n.t('subscribersInPlanTooltip')}
-            place="right"
-          />
-          <span className="mailpoet-subscribers-in-plan-spacer">{' '}</span>
-        </>
-      )}
-      {ReactStringReplace(MailPoet.I18n.t('mailpoetSubscribers'), '%s', () => mailpoetSubscribersCount)}
+      {ReactStringReplace(MailPoet.I18n.t('subscribersInPlan'), '%s', () => subscribersInPlanCount)}
       {' '}
       <HelpTooltip
-        tooltip={mailpoetSubscribersTooltip}
+        tooltip={MailPoet.I18n.t('subscribersInPlanTooltip')}
         place="right"
       />
+      <span className="mailpoet-subscribers-in-plan-spacer">{' '}</span>
     </div>
   );
 };
diff --git a/assets/js/src/segments/heading.jsx b/assets/js/src/segments/heading.jsx
index d7ac99a3f3..e52c91a956 100644
--- a/assets/js/src/segments/heading.jsx
+++ b/assets/js/src/segments/heading.jsx
@@ -21,11 +21,6 @@ const ListHeading = () => (
     <SubscribersInPlan
       subscribersInPlan={window.mailpoet_subscribers_in_plan_count}
       subscribersInPlanLimit={window.mailpoet_subscribers_limit}
-      mailpoetSubscribers={window.mailpoet_premium_subscribers_count}
-      mailpoetSubscribersLimit={window.mailpoet_subscribers_limit}
-      hasPremiumSupport={window.mailpoet_has_premium_support}
-      wpUsersCount={window.mailpoet_wp_users_count}
-      mssActive={window.mailpoet_mss_active}
     />
   </>
 );
diff --git a/assets/js/src/subscribers/list.jsx b/assets/js/src/subscribers/list.jsx
index 3da6a512ac..27e38266e5 100644
--- a/assets/js/src/subscribers/list.jsx
+++ b/assets/js/src/subscribers/list.jsx
@@ -428,11 +428,6 @@ const SubscriberList = ({ match }) => {
       <SubscribersInPlan
         subscribersInPlan={window.mailpoet_subscribers_in_plan_count}
         subscribersInPlanLimit={window.mailpoet_subscribers_limit}
-        mailpoetSubscribers={window.mailpoet_premium_subscribers_count}
-        mailpoetSubscribersLimit={window.mailpoet_subscribers_limit}
-        hasPremiumSupport={window.mailpoet_has_premium_support}
-        wpUsersCount={window.mailpoet_wp_users_count}
-        mssActive={window.mailpoet_mss_active}
       />
 
       <SubscribersLimitNotice />
diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html
index 57ea919f4c..4bfbebaa83 100644
--- a/views/subscribers/subscribers.html
+++ b/views/subscribers/subscribers.html
@@ -71,10 +71,6 @@
     'subscribersInPlan': _x('%s subscribers in your plan', 'number of subscribers in a sending plan'),
     'subscribersInPlanTooltip': __('This is the total of subscribed, unconfirmed and inactive subscribers we count when you are sending with MailPoet Sending Service. The count excludes unsubscribed and bounced (invalid) email addresses.'),
 
-    'mailpoetSubscribers': _x('%s MailPoet subscribers', 'number of subscribers in the plugin'),
-    'mailpoetSubscribersTooltipFree': __('This is the total of all subscribers including %$1d WordPress users. To exclude WordPress users, please purchase one of our premium plans.'),
-    'mailpoetSubscribersTooltipPremium': __('This is the total of all subscribers excluding all WordPress users.'),
-
     'email': __('E-mail'),
     'firstname': __('First name'),
     'lastname': __('Last name'),