diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/test/contact-list.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/test/contact-list.tsx
index 500b7f73408e2..b8226d783a3b8 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/test/contact-list.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/contact-list/test/contact-list.tsx
@@ -110,9 +110,6 @@ describe( 'ContactList', () => {
const upgradeBadge = screen.getByRole( 'button', { name: 'Upgrade' } );
expect( upgradeBadge ).toBeInTheDocument();
- const upgradeLink = screen.getByRole( 'button', { name: 'Upgrade ($1.00/m)' } );
- expect( upgradeLink ).toBeInTheDocument();
-
expect(
screen.getByText( /multiple email recipients is part of the basic plan./i )
).toBeInTheDocument();
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx
index ecfd94c0ba31d..503be1513bdaa 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/email-notification.tsx
@@ -1,4 +1,3 @@
-import { isEnabled } from '@automattic/calypso-config';
import { ToggleControl } from '@wordpress/components';
import { useTranslate } from 'i18n-calypso';
import ContactList from '../../contact-list';
@@ -21,15 +20,12 @@ export default function EmailNotification( {
verifiedItem,
enableEmailNotification,
setEnableEmailNotification,
- defaultUserEmailAddresses,
toggleAddEmailModal,
allEmailItems,
restriction,
}: Props ) {
const translate = useTranslate();
- const isPaidTierEnabled = isEnabled( 'jetpack/pro-dashboard-monitor-paid-tier' );
-
return (
<>
@@ -52,23 +48,15 @@ export default function EmailNotification( {
- { isPaidTierEnabled ? (
- <>
-
- { translate( 'Receive email notifications with one or more recipients.' ) }
-
- >
- ) : (
+ <>
- { translate( 'Receive email notifications with your account email address %s.', {
- args: defaultUserEmailAddresses,
- } ) }
+ { translate( 'Receive email notifications with one or more recipients.' ) }
- ) }
+ >
- { enableEmailNotification && isPaidTierEnabled && (
+ { enableEmailNotification && (
( showPaidDuration ? durations : durations.filter( ( duration ) => ! duration.isPaid ) ),
- [ durations, showPaidDuration ]
- );
return (
@@ -52,7 +44,7 @@ export default function NotificationDuration( {
}
selectedText={ selectedDuration?.label }
>
- { selectableDuration.map( ( duration ) => (
+ { durations.map( ( duration ) => (
{ translate( 'Set up text messages to send to one or more people.' ) }
- { restriction === 'upgrade_required' && (
-
-
-
- ) }
{ enableSMSNotification && (
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/email-notification.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/email-notification.tsx
index 468ac80b8ac8c..42a68a029be04 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/email-notification.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/email-notification.tsx
@@ -10,12 +10,6 @@ import configureStore from 'redux-mock-store';
import EmailNotification from '../email-notification';
import type { RestrictionType } from '../../../types';
-jest.mock( '@automattic/calypso-config', () => {
- const config = () => 'development';
- config.isEnabled = ( property: string ) => property === 'jetpack/pro-dashboard-monitor-paid-tier';
- return config;
-} );
-
describe( 'EmailNotification', () => {
const defaultProps = {
recordEvent: jest.fn(),
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/notification-duration.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/notification-duration.tsx
index c7165eeffeb68..fcbf4595d6149 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/notification-duration.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/notification-duration.tsx
@@ -10,12 +10,6 @@ import configureStore from 'redux-mock-store';
import DashboardDataContext from '../../../../sites-overview/dashboard-data-context';
import NotificationDuration from '../notification-duration';
-jest.mock( '@automattic/calypso-config', () => {
- const config = () => 'development';
- config.isEnabled = ( property: string ) => property === 'jetpack/pro-dashboard-monitor-paid-tier';
- return config;
-} );
-
describe( 'NotificationDuration', () => {
const defaultProps = {
selectDuration: jest.fn(),
@@ -93,6 +87,5 @@ describe( 'NotificationDuration', () => {
expect( dropdownToggle ).toHaveClass( 'is-disabled' );
expect( dropdownToggle ).toHaveTextContent( '1 minute' );
expect( dropdownToggle ).toHaveTextContent( 'Upgrade' );
- expect( dropdownToggle ).toHaveTextContent( 'Upgrade ($1.00/m)' );
} );
} );
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/sms-notification.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/sms-notification.tsx
index e3359f3e02128..40b40dbcd11c0 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/sms-notification.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/form-content/test/sms-notification.tsx
@@ -81,7 +81,6 @@ describe( 'SMSNotification', () => {
expect( screen.getByLabelText( 'Disable SMS notifications' ) ).toBeDisabled();
expect( screen.getByRole( 'button', { name: 'Upgrade' } ) ).toBeInTheDocument();
- expect( screen.getByRole( 'button', { name: 'Upgrade ($1.00/m)' } ) ).toBeInTheDocument();
} );
it( 'handles toggle change with SMS notifications enabled', () => {
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/index.tsx
index bfac8d40c1fc2..37e6372bf3516 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/index.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/notification-settings/index.tsx
@@ -102,8 +102,6 @@ export default function NotificationSettings( {
'jetpack/pro-dashboard-monitor-sms-notification'
);
- const isPaidTierEnabled = isEnabled( 'jetpack/pro-dashboard-monitor-paid-tier' );
-
// Check if current site or all sites selected has a paid license.
const hasPaidLicenses = ! sites.find( ( site ) => ! site.has_paid_agency_monitor );
@@ -484,18 +482,16 @@ export default function NotificationSettings( {
restriction={ restriction }
/>
- { isPaidTierEnabled && (
-
- ) }
+
( false );
const [ showTooltip, setShowTooltip ] = useState( false );
- const isPaidTierEnabled = isEnabled( 'jetpack/pro-dashboard-monitor-paid-tier' );
-
const shouldDisplayUpgradePopover =
- status === 'success' && isPaidTierEnabled && ! site.has_paid_agency_monitor && ! site.is_atomic;
+ status === 'success' && ! site.has_paid_agency_monitor && ! site.is_atomic;
const handleShowTooltip = () => {
setShowTooltip( true );
@@ -131,7 +128,7 @@ export default function ToggleActivateMonitoring( {
) as string
}
>
- { isPaidTierEnabled && smsLimitReached ? (
+ { smsLimitReached ? (
) : (
@@ -174,7 +171,7 @@ export default function ToggleActivateMonitoring( {
}
let tooltipText = tooltip;
- if ( isPaidTierEnabled && smsLimitReached && status === 'success' ) {
+ if ( smsLimitReached && status === 'success' ) {
tooltipText = translate( 'You have reached the SMS limit' );
}
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/test/toggle-activate-monitoring.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/test/toggle-activate-monitoring.tsx
index a9115948e6cfa..2b792e3d8e08a 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/test/toggle-activate-monitoring.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/toggle-activate-monitoring/test/toggle-activate-monitoring.tsx
@@ -11,12 +11,6 @@ import configureStore from 'redux-mock-store';
import { site } from '../../../sites-overview/test/test-utils/constants';
import ToggleActivateMonitoring from '../index';
-jest.mock( '@automattic/calypso-config', () => {
- const config = () => 'development';
- config.isEnabled = ( property: string ) => property === 'jetpack/pro-dashboard-monitor-paid-tier';
- return config;
-} );
-
describe( 'ToggleActivateMonitoring', () => {
const defaultProps = {
site,
diff --git a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/upgrade-link/test/upgrade-link.tsx b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/upgrade-link/test/upgrade-link.tsx
index b91f2807f8443..44f806cb269b1 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/upgrade-link/test/upgrade-link.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/downtime-monitoring/upgrade-link/test/upgrade-link.tsx
@@ -3,11 +3,10 @@
*/
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render } from '@testing-library/react';
import React from 'react';
import { Provider } from 'react-redux';
import configureStore from 'redux-mock-store';
-import SitesOverviewContext from '../../../sites-overview/context';
import DashboardDataContext from '../../../sites-overview/dashboard-data-context';
import UpgradeLink from '../index';
@@ -43,37 +42,6 @@ describe( 'UpgradeLink', () => {
);
- it( 'renders the upgrade link text', () => {
- render(
-
-
- ,
- { wrapper: Wrapper }
- );
- const upgradeLink = screen.getByText( 'Upgrade ($1.00/m)' );
- expect( upgradeLink ).toBeInTheDocument();
- } );
-
- it( 'renders the upgrade link text and onclick works', () => {
- const mockShowLicenseInfo = jest.fn();
-
- render(
- // We need only the showLicenseInfo function from the context
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
-
-
-
-
- ,
- { wrapper: Wrapper }
- );
- const upgradeLink = screen.getByText( 'Upgrade ($1.00/m)' );
- expect( upgradeLink ).toBeInTheDocument();
- fireEvent.click( upgradeLink );
- expect( mockShowLicenseInfo ).toHaveBeenCalledWith( 'monitor' );
- } );
-
it( 'renders the upgrade link text inline', () => {
render(
@@ -82,18 +50,6 @@ describe( 'UpgradeLink', () => {
{ wrapper: Wrapper }
);
- const upgradeLink = screen.getByText( 'Upgrade ($1.00/m)' );
expect( upgradeLink.parentElement ).toHaveClass( 'is-inline' );
} );
-
- it( 'renders the upgrade link text when the price is undefined', () => {
- render(
-
-
- ,
- { wrapper: Wrapper }
- );
- const upgradeLink = screen.getByText( 'Upgrade' );
- expect( upgradeLink ).toBeInTheDocument();
- } );
} );
diff --git a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/dashboard-banners/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/dashboard-banners/index.tsx
index 651eae56feb6f..3a1430fe1ba10 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/dashboard-banners/index.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/dashboard-banners/index.tsx
@@ -1,4 +1,3 @@
-import { isEnabled } from '@automattic/calypso-config';
import showBanner from 'calypso/jetpack-cloud/sections/utils/show-banner';
import { useSelector } from 'calypso/state';
import {
@@ -27,7 +26,6 @@ export default function DashboardBanners() {
getPreference( state, downtimeMonitoringUpgradeBannerPreferenceName )
),
showDays: 7,
- hideBanner: ! isEnabled( 'jetpack/pro-dashboard-monitor-paid-tier' ),
},
{
component: () => ,
diff --git a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/hooks/use-default-site-columns.tsx b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/hooks/use-default-site-columns.tsx
index 8fcfc810fa32a..852cae957b2ba 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/hooks/use-default-site-columns.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/hooks/use-default-site-columns.tsx
@@ -15,7 +15,6 @@ type SiteColumn = {
const useDefaultSiteColumns = ( isLargeScreen = false ): SiteColumns => {
const translate = useTranslate();
const isBoostEnabled = isEnabled( 'jetpack/pro-dashboard-jetpack-boost' );
- const isPaidMonitorEnabled = isEnabled( 'jetpack/pro-dashboard-monitor-paid-tier' );
const isWPCOMAtomicSiteCreationEnabled = isEnabled(
'jetpack/pro-dashboard-wpcom-atomic-hosting'
);
@@ -71,7 +70,7 @@ const useDefaultSiteColumns = ( isLargeScreen = false ): SiteColumns => {
title: translate( 'Monitor' ),
className: 'min-width-100px jetpack-cloud-site-column__monitor',
isExpandable: true,
- showInfo: isPaidMonitorEnabled,
+ showInfo: true,
},
{
key: 'plugin',
@@ -79,13 +78,7 @@ const useDefaultSiteColumns = ( isLargeScreen = false ): SiteColumns => {
className: 'width-fit-content jetpack-cloud-site-column__plugin',
},
];
- }, [
- isBoostEnabled,
- isPaidMonitorEnabled,
- isWPCOMAtomicSiteCreationEnabled,
- translate,
- isLargeScreen,
- ] );
+ }, [ isBoostEnabled, isWPCOMAtomicSiteCreationEnabled, translate, isLargeScreen ] );
};
export default useDefaultSiteColumns;
diff --git a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-downtime-monitoring-upgrade-banner/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-downtime-monitoring-upgrade-banner/index.tsx
index 377a5870f70c0..804f3b45cff33 100644
--- a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-downtime-monitoring-upgrade-banner/index.tsx
+++ b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-downtime-monitoring-upgrade-banner/index.tsx
@@ -1,4 +1,3 @@
-import { isEnabled } from '@automattic/calypso-config';
import { useTranslate } from 'i18n-calypso';
import { useCallback, useContext, useEffect } from 'react';
import CelebrationIcon from 'calypso/assets/images/jetpack/celebration-icon.svg';
@@ -35,12 +34,8 @@ export default function SiteDowntimeMonitoringUpgradeBanner() {
[ dispatch, preference, preferenceName ]
);
- const isDowntimeMonitoringPaidTierEnabled = isEnabled(
- 'jetpack/pro-dashboard-monitor-paid-tier'
- );
-
useEffect( () => {
- if ( isDowntimeMonitoringPaidTierEnabled && ! isDismissed && ! viewDate ) {
+ if ( ! isDismissed && ! viewDate ) {
savePreferenceType( 'view_date', Date.now() );
dispatch(
recordTracksEvent( 'calypso_jetpack_agency_dashboard_monitor_upgrade_banner_view' )
@@ -50,7 +45,7 @@ export default function SiteDowntimeMonitoringUpgradeBanner() {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [] );
- if ( ! isDowntimeMonitoringPaidTierEnabled || isDismissed ) {
+ if ( isDismissed ) {
return null;
}
diff --git a/config/jetpack-cloud-development.json b/config/jetpack-cloud-development.json
index 056f9a9c48a1d..e7b93a94748b8 100644
--- a/config/jetpack-cloud-development.json
+++ b/config/jetpack-cloud-development.json
@@ -57,7 +57,6 @@
"jetpack/pricing-page-annual-only": true,
"jetpack/pro-dashboard-jetpack-boost": true,
"jetpack/pro-dashboard-monitor-multiple-email-recipients": true,
- "jetpack/pro-dashboard-monitor-paid-tier": true,
"jetpack/pro-dashboard-monitor-sms-notification": true,
"jetpack/pro-dashboard-wpcom-atomic-hosting": true,
"jetpack/manage-simple-sites": true,
diff --git a/config/jetpack-cloud-horizon.json b/config/jetpack-cloud-horizon.json
index 29796f5f55abc..882b48a16e6a2 100644
--- a/config/jetpack-cloud-horizon.json
+++ b/config/jetpack-cloud-horizon.json
@@ -51,7 +51,6 @@
"jetpack/pricing-page-annual-only": true,
"jetpack/pro-dashboard-jetpack-boost": true,
"jetpack/pro-dashboard-monitor-multiple-email-recipients": true,
- "jetpack/pro-dashboard-monitor-paid-tier": true,
"jetpack/pro-dashboard-monitor-sms-notification": true,
"jetpack/pro-dashboard-wpcom-atomic-hosting": true,
"jetpack/manage-simple-sites": true,
diff --git a/config/jetpack-cloud-production.json b/config/jetpack-cloud-production.json
index 9434c07c22953..b4792990dfab0 100644
--- a/config/jetpack-cloud-production.json
+++ b/config/jetpack-cloud-production.json
@@ -55,7 +55,6 @@
"jetpack/pricing-page-annual-only": true,
"jetpack/pro-dashboard-jetpack-boost": true,
"jetpack/pro-dashboard-monitor-multiple-email-recipients": true,
- "jetpack/pro-dashboard-monitor-paid-tier": true,
"jetpack/pro-dashboard-monitor-sms-notification": true,
"jetpack/pro-dashboard-wpcom-atomic-hosting": true,
"jetpack/manage-simple-sites": true,
diff --git a/config/jetpack-cloud-stage.json b/config/jetpack-cloud-stage.json
index 279e2a8e97a6e..c734ab77d069b 100644
--- a/config/jetpack-cloud-stage.json
+++ b/config/jetpack-cloud-stage.json
@@ -54,7 +54,6 @@
"jetpack/pricing-page-annual-only": true,
"jetpack/pro-dashboard-jetpack-boost": true,
"jetpack/pro-dashboard-monitor-multiple-email-recipients": true,
- "jetpack/pro-dashboard-monitor-paid-tier": true,
"jetpack/pro-dashboard-monitor-sms-notification": true,
"jetpack/manage-sites-v2-menu": false,
"jetpack/search-product": true,