From 1e373ab7e07be92c203511211a095dceb31d458f Mon Sep 17 00:00:00 2001
From: Brezo Cordero <8002881+brezocordero@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:30:16 -0600
Subject: [PATCH] Update Sender Domain inline notice

Remove unused notices displayed before enforcement date.

[MAILPOET-5844]
---
 .../src/common/sender-domain-notice/index.tsx | 15 +++-----------
 .../sender-domain-notice-body.tsx             | 20 +------------------
 mailpoet/assets/js/src/global.d.ts            |  3 ---
 mailpoet/lib/AdminPages/Pages/Newsletters.php |  3 ---
 mailpoet/lib/AdminPages/Pages/Settings.php    |  3 ---
 .../AuthorizedSenderDomainController.php      | 11 ----------
 .../AuthorizedSenderDomainControllerTest.php  |  7 -------
 7 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/mailpoet/assets/js/src/common/sender-domain-notice/index.tsx b/mailpoet/assets/js/src/common/sender-domain-notice/index.tsx
index cdeb29c7ea..48193d7a58 100644
--- a/mailpoet/assets/js/src/common/sender-domain-notice/index.tsx
+++ b/mailpoet/assets/js/src/common/sender-domain-notice/index.tsx
@@ -8,8 +8,8 @@ import { SenderActions } from './sender-domain-notice-actions';
 
 export type SenderRestrictionsType = {
   lowerLimit: number;
-  isNewUser: boolean;
-  isEnforcementOfNewRestrictionsInEffect: boolean;
+  isAuthorizedDomainRequiredForNewCampaigns?: boolean;
+  campaignTypes?: string[];
   alwaysRewrite?: boolean;
 };
 
@@ -56,20 +56,12 @@ function SenderDomainInlineNotice({
 
   const LOWER_LIMIT = senderRestrictions?.lowerLimit || 500;
 
-  const isNewUser = senderRestrictions?.isNewUser ?? true;
-  const isEnforcementOfNewRestrictionsInEffect =
-    senderRestrictions?.isEnforcementOfNewRestrictionsInEffect ?? true;
-  // TODO: Remove after the enforcement date has passed
-  const onlyShowWarnings =
-    !isNewUser && !isEnforcementOfNewRestrictionsInEffect;
-
   const isSmallSender = subscribersCount <= LOWER_LIMIT;
 
   if (
     isSmallSender ||
     isPartiallyVerifiedDomain ||
-    senderRestrictions.alwaysRewrite ||
-    onlyShowWarnings
+    senderRestrictions.alwaysRewrite
   ) {
     isAlert = false;
   }
@@ -103,7 +95,6 @@ function SenderDomainInlineNotice({
         isFreeDomain={isFreeDomain}
         isPartiallyVerifiedDomain={isPartiallyVerifiedDomain}
         isSmallSender={isSmallSender}
-        onlyShowWarnings={onlyShowWarnings}
       />
     </InlineNotice>
   );
diff --git a/mailpoet/assets/js/src/common/sender-domain-notice/sender-domain-notice-body.tsx b/mailpoet/assets/js/src/common/sender-domain-notice/sender-domain-notice-body.tsx
index f756d72ff9..2354eb3fe0 100644
--- a/mailpoet/assets/js/src/common/sender-domain-notice/sender-domain-notice-body.tsx
+++ b/mailpoet/assets/js/src/common/sender-domain-notice/sender-domain-notice-body.tsx
@@ -7,14 +7,12 @@ function SenderDomainNoticeBody({
   isFreeDomain,
   isPartiallyVerifiedDomain,
   isSmallSender,
-  onlyShowWarnings = false,
   alwaysRewrite = false,
 }: {
   emailAddressDomain: string;
   isFreeDomain: boolean;
   isPartiallyVerifiedDomain: boolean;
   isSmallSender: boolean;
-  onlyShowWarnings?: boolean;
   alwaysRewrite?: boolean;
 }) {
   const renderMessage = (messageKey: string) => {
@@ -27,11 +25,6 @@ function SenderDomainNoticeBody({
         "MailPoet cannot send email campaigns from shared 3rd-party domains like <emailDomain/>. Please send from your site's branded domain instead.",
         'mailpoet',
       ),
-      // TODO: Remove freeWarning after the enforcement date has passed
-      freeWarning: __(
-        "Starting on February 1st, 2024, MailPoet will no longer be able to send from email addresses on shared 3rd party domains like <emailDomain/>. Please send from your site's branded domain instead.",
-        'mailpoet',
-      ),
       partiallyVerified: __(
         'Update your domain settings to improve email deliverability and meet new sending requirements.',
         'mailpoet',
@@ -48,22 +41,11 @@ function SenderDomainNoticeBody({
 
     const defaultMessage = messages[messageKey] || messages.default;
 
-    return createInterpolateElement(__(defaultMessage, 'mailpoet'), {
+    return createInterpolateElement(defaultMessage, {
       emailDomain: <strong>{escapeHTML(emailAddressDomain)}</strong>,
     });
   };
 
-  // TODO: Remove after the enforcement date has passed
-  if (onlyShowWarnings) {
-    if (isFreeDomain) {
-      return renderMessage(isSmallSender ? 'freeSmall' : 'freeWarning');
-    }
-    if (isPartiallyVerifiedDomain) {
-      return renderMessage('partiallyVerified');
-    }
-    return renderMessage('smallSender');
-  }
-
   if (isFreeDomain) {
     return renderMessage(isSmallSender || alwaysRewrite ? 'freeSmall' : 'free');
   }
diff --git a/mailpoet/assets/js/src/global.d.ts b/mailpoet/assets/js/src/global.d.ts
index 1b1fa0ffc6..9c849c3f39 100644
--- a/mailpoet/assets/js/src/global.d.ts
+++ b/mailpoet/assets/js/src/global.d.ts
@@ -155,9 +155,6 @@ interface Window {
   mailpoet_partially_verified_sender_domains?: string[];
   mailpoet_sender_restrictions?: {
     lowerLimit: number;
-    upperLimit: number;
-    isNewUser: boolean;
-    isEnforcementOfNewRestrictionsInEffect: boolean;
     isAuthorizedDomainRequiredForNewCampaigns?: boolean;
     campaignTypes?: string[];
   };
diff --git a/mailpoet/lib/AdminPages/Pages/Newsletters.php b/mailpoet/lib/AdminPages/Pages/Newsletters.php
index cfeabad0d3..49ee9a4038 100644
--- a/mailpoet/lib/AdminPages/Pages/Newsletters.php
+++ b/mailpoet/lib/AdminPages/Pages/Newsletters.php
@@ -152,9 +152,6 @@ class Newsletters {
       $data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains();
       $data['sender_restrictions'] = [
         'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT,
-        'upperLimit' => AuthorizedSenderDomainController::UPPER_LIMIT,
-        'isNewUser' => $this->senderDomainController->isNewUser(),
-        'isEnforcementOfNewRestrictionsInEffect' => $this->senderDomainController->isEnforcementOfNewRestrictionsInEffect(),
         'isAuthorizedDomainRequiredForNewCampaigns' => $this->senderDomainController->isAuthorizedDomainRequiredForNewCampaigns(),
         'campaignTypes' => NewsletterEntity::CAMPAIGN_TYPES,
       ];
diff --git a/mailpoet/lib/AdminPages/Pages/Settings.php b/mailpoet/lib/AdminPages/Pages/Settings.php
index 54048fab23..3c0a4f6a41 100644
--- a/mailpoet/lib/AdminPages/Pages/Settings.php
+++ b/mailpoet/lib/AdminPages/Pages/Settings.php
@@ -106,9 +106,6 @@ class Settings {
       $data['all_sender_domains'] = $this->senderDomainController->getAllSenderDomains();
       $data['sender_restrictions'] = [
         'lowerLimit' => AuthorizedSenderDomainController::LOWER_LIMIT,
-        'upperLimit' => AuthorizedSenderDomainController::UPPER_LIMIT,
-        'isNewUser' => $this->senderDomainController->isNewUser(),
-        'isEnforcementOfNewRestrictionsInEffect' => $this->senderDomainController->isEnforcementOfNewRestrictionsInEffect(),
       ];
     }
 
diff --git a/mailpoet/lib/Services/AuthorizedSenderDomainController.php b/mailpoet/lib/Services/AuthorizedSenderDomainController.php
index 997caa52c6..ee56ee35f8 100644
--- a/mailpoet/lib/Services/AuthorizedSenderDomainController.php
+++ b/mailpoet/lib/Services/AuthorizedSenderDomainController.php
@@ -8,7 +8,6 @@ use MailPoet\Services\Bridge\API;
 use MailPoet\Settings\SettingsController;
 use MailPoet\Util\License\Features\Subscribers;
 use MailPoet\WP\Functions as WPFunctions;
-use MailPoetVendor\Carbon\Carbon;
 
 class AuthorizedSenderDomainController {
   const OVERALL_STATUS_VERIFIED = 'verified';
@@ -22,8 +21,6 @@ class AuthorizedSenderDomainController {
   const LOWER_LIMIT = 100;
   const UPPER_LIMIT = 200;
 
-  const ENFORCEMENT_START_TIME = '2024-02-01 00:00:00 UTC';
-
   const INSTALLED_AFTER_NEW_RESTRICTIONS_OPTION = 'installed_after_new_domain_restrictions';
 
   const SENDER_DOMAINS_KEY = 'mailpoet_sender_domains';
@@ -261,11 +258,6 @@ class AuthorizedSenderDomainController {
     return $this->currentRecords;
   }
 
-  // TODO: Remove after the enforcement date has passed
-  public function isEnforcementOfNewRestrictionsInEffect(): bool {
-    return Carbon::now() >= Carbon::parse(self::ENFORCEMENT_START_TIME);
-  }
-
   public function isNewUser(): bool {
     $installedVersion = $this->settingsController->get('version');
 
@@ -306,9 +298,6 @@ class AuthorizedSenderDomainController {
       'allSenderDomains' => $this->getAllSenderDomains(),
       'senderRestrictions' => [
         'lowerLimit' => self::LOWER_LIMIT,
-        'upperLimit' => self::UPPER_LIMIT,
-        'isNewUser' => $this->isNewUser(),
-        'isEnforcementOfNewRestrictionsInEffect' => $this->isEnforcementOfNewRestrictionsInEffect(),
         'alwaysRewrite' => false,
       ],
     ];
diff --git a/mailpoet/tests/integration/Services/AuthorizedSenderDomainControllerTest.php b/mailpoet/tests/integration/Services/AuthorizedSenderDomainControllerTest.php
index 221995f465..03fe75eea1 100644
--- a/mailpoet/tests/integration/Services/AuthorizedSenderDomainControllerTest.php
+++ b/mailpoet/tests/integration/Services/AuthorizedSenderDomainControllerTest.php
@@ -426,13 +426,6 @@ class AuthorizedSenderDomainControllerTest extends \MailPoetTest {
     $this->assertFalse($this->getController()->isNewUser());
   }
 
-  public function testItKnowsWhenNewRestrictionsStartGettingEnforced(): void {
-    Carbon::setTestNow(Carbon::parse('2024-01-31 00:00:00 UTC'));
-    $this->assertFalse($this->getController()->isEnforcementOfNewRestrictionsInEffect());
-    Carbon::setTestNow(Carbon::parse('2024-02-01 00:00:01 UTC'));
-    $this->assertTrue($this->getController()->isEnforcementOfNewRestrictionsInEffect());
-  }
-
   public function testIsSmallSenderIfSubscribersUnderLowerLimit(): void {
     $subscribersMock = $this->make(Subscribers::class, [
       'getSubscribersCount' => Expected::once($this->lowerLimit),