Replace hasActiveSiteFeature with siteHasFeature (#63769)

* Replace in my-sites * Replace remaining references * Remove unused selector * Fix merge conflict
Automattic · May 23, 2022 · 9c9ecd1 · 9c9ecd1
1 parent 453e67d
commit 9c9ecd1
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 175 deletions.
diff --git a/client/components/title-format-editor/index.jsx b/client/components/title-format-editor/index.jsx
@@ -5,7 +5,7 @@ import { localize } from 'i18n-calypso';
 import PropTypes from 'prop-types';
 import { Component } from 'react';
 import { connect } from 'react-redux';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import {
 	buildSeoTitle,
 	isJetpackMinimumVersion,
@@ -304,7 +304,7 @@ const mapStateToProps = ( state, ownProps ) => {
 		shouldShowSeoArchiveTitleButton = true;
 	} else if (
 		! isJetpackSite( state, siteId ) &&
-		hasActiveSiteFeature( state, siteId, FEATURE_ADVANCED_SEO )
+		siteHasFeature( state, siteId, FEATURE_ADVANCED_SEO )
 	) {
 		// For non-AT Business plan sites which get SEO features.
 		shouldShowSeoArchiveTitleButton = true;

diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/intent-step/index.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/intent-step/index.tsx
@@ -28,7 +28,7 @@ const IntentStep: Step = function IntentStep( { navigation } ) {
 	// example usage
 	// const site = useSite();
 	// const hasSimplePayments = useSelect(
-	//	( select ) => site && select( SITE_STORE ).hasActiveSiteFeature( site?.ID, 'simple-payments' )
+	//	( select ) => site && select( SITE_STORE ).siteHasFeature( site?.ID, 'simple-payments' )
 	//);
 
 	const intents = useIntents();

diff --git a/client/my-sites/domains/domain-management/list/site-domains.jsx b/client/my-sites/domains/domain-management/list/site-domains.jsx
@@ -39,9 +39,9 @@ import { getProductsList } from 'calypso/state/products-list/selectors';
 import { getPurchases, isFetchingSitePurchases } from 'calypso/state/purchases/selectors';
 import { canCurrentUser } from 'calypso/state/selectors/can-current-user';
 import { getCurrentRoute } from 'calypso/state/selectors/get-current-route';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isDomainOnlySite from 'calypso/state/selectors/is-domain-only-site';
 import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { setPrimaryDomain } from 'calypso/state/sites/domains/actions';
 import { hasDomainCredit } from 'calypso/state/sites/plans/selectors';
 import DomainOnly from './domain-only';
@@ -506,7 +506,7 @@ export default connect(
 				: false,
 			isOnFreePlan,
 			userCanManageOptions,
-			canSetPrimaryDomain: hasActiveSiteFeature( state, siteId, FEATURE_SET_PRIMARY_CUSTOM_DOMAIN ),
+			canSetPrimaryDomain: siteHasFeature( state, siteId, FEATURE_SET_PRIMARY_CUSTOM_DOMAIN ),
 			purchases,
 			isFetchingPurchases: isFetchingSitePurchases( state ),
 		};

diff --git a/client/my-sites/domains/domain-management/settings/set-as-primary/index.tsx b/client/my-sites/domains/domain-management/settings/set-as-primary/index.tsx
@@ -18,8 +18,8 @@ import {
 	showUpdatePrimaryDomainErrorNotice,
 } from 'calypso/state/domains/management/actions';
 import { getCurrentRoute } from 'calypso/state/selectors/get-current-route';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isDomainOnlySite from 'calypso/state/selectors/is-domain-only-site';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { setPrimaryDomain } from 'calypso/state/sites/domains/actions';
 import type {
 	SetAsPrimaryProps,
@@ -141,7 +141,7 @@ export default connect(
 				: false,
 			isOnFreePlan,
 			isManagingAllSites: isUnderDomainManagementAll( getCurrentRoute( state ) ),
-			canSetPrimaryDomain: hasActiveSiteFeature(
+			canSetPrimaryDomain: siteHasFeature(
 				state,
 				selectedSite.ID,
 				FEATURE_SET_PRIMARY_CUSTOM_DOMAIN

diff --git a/client/my-sites/earn/memberships/index.jsx b/client/my-sites/earn/memberships/index.jsx
@@ -45,7 +45,7 @@ import {
 	getTotalSubscribersForSiteId,
 	getOwnershipsForSiteId,
 } from 'calypso/state/memberships/subscribers/selectors';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import {
 	getSelectedSite,
@@ -658,9 +658,9 @@ const mapStateToProps = ( state ) => {
 		connectedAccountId: getConnectedAccountIdForSiteId( state, siteId ),
 		connectUrl: getConnectUrlForSiteId( state, siteId ),
 		hasStripeFeature:
-			hasActiveSiteFeature( state, siteId, FEATURE_PREMIUM_CONTENT_CONTAINER ) ||
-			hasActiveSiteFeature( state, siteId, FEATURE_DONATIONS ) ||
-			hasActiveSiteFeature( state, siteId, FEATURE_RECURRING_PAYMENTS ),
+			siteHasFeature( state, siteId, FEATURE_PREMIUM_CONTENT_CONTAINER ) ||
+			siteHasFeature( state, siteId, FEATURE_DONATIONS ) ||
+			siteHasFeature( state, siteId, FEATURE_RECURRING_PAYMENTS ),
 		isJetpack: isJetpackSite( state, siteId ),
 	};
 };

diff --git a/client/my-sites/earn/memberships/products.jsx b/client/my-sites/earn/memberships/products.jsx
@@ -16,7 +16,7 @@ import PopoverMenuItem from 'calypso/components/popover-menu/item';
 import SectionHeader from 'calypso/components/section-header';
 import { bumpStat } from 'calypso/state/analytics/actions';
 import { getProductsForSiteId } from 'calypso/state/memberships/product-list/selectors';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import {
 	getSelectedSite,
 	getSelectedSiteId,
@@ -139,9 +139,9 @@ export default connect(
 			siteSlug: getSelectedSiteSlug( state ),
 			products: getProductsForSiteId( state, siteId ),
 			hasStripeFeature:
-				hasActiveSiteFeature( state, siteId, FEATURE_PREMIUM_CONTENT_CONTAINER ) ||
-				hasActiveSiteFeature( state, siteId, FEATURE_DONATIONS ) ||
-				hasActiveSiteFeature( state, siteId, FEATURE_RECURRING_PAYMENTS ),
+				siteHasFeature( state, siteId, FEATURE_PREMIUM_CONTENT_CONTAINER ) ||
+				siteHasFeature( state, siteId, FEATURE_DONATIONS ) ||
+				siteHasFeature( state, siteId, FEATURE_RECURRING_PAYMENTS ),
 		};
 	},
 	( dispatch ) => ( {

diff --git a/client/my-sites/media-library/index.jsx b/client/my-sites/media-library/index.jsx
@@ -9,7 +9,7 @@ import searchUrl from 'calypso/lib/search-url';
 import { selectMediaItems } from 'calypso/state/media/actions';
 import getMediaErrors from 'calypso/state/selectors/get-media-errors';
 import getMediaLibrarySelectedItems from 'calypso/state/selectors/get-media-library-selected-items';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { requestKeyringConnections } from 'calypso/state/sharing/keyring/actions';
 import {
 	isKeyringConnectionsFetching,
@@ -206,7 +206,7 @@ export default connect(
 		needsKeyring: needsKeyring( state, source ),
 		selectedItems: getMediaLibrarySelectedItems( state, site?.ID ),
 		isJetpack: isJetpackSite( state, site?.ID ),
-		hasVideoUploadFeature: hasActiveSiteFeature( state, site?.ID, 'upload-video-files' ),
+		hasVideoUploadFeature: siteHasFeature( state, site?.ID, 'upload-video-files' ),
 	} ),
 	{
 		requestKeyringConnections,

diff --git a/client/my-sites/plugins/plugin-details-CTA/index.jsx b/client/my-sites/plugins/plugin-details-CTA/index.jsx
@@ -22,8 +22,8 @@ import { removePluginStatuses } from 'calypso/state/plugins/installed/status/act
 import { savePreference } from 'calypso/state/preferences/actions';
 import { getPreference, hasReceivedRemotePreferences } from 'calypso/state/preferences/selectors';
 import getPrimaryDomainBySiteId from 'calypso/state/selectors/get-primary-domain-by-site-id';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { getDomainsBySiteId } from 'calypso/state/sites/domains/selectors';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { PREINSTALLED_PLUGINS } from '../constants';
@@ -57,7 +57,7 @@ const PluginDetailsCTA = ( {
 
 	const shouldUpgrade =
 		useSelector(
-			( state ) => ! hasActiveSiteFeature( state, selectedSite?.ID, FEATURE_INSTALL_PLUGINS )
+			( state ) => ! siteHasFeature( state, selectedSite?.ID, FEATURE_INSTALL_PLUGINS )
 		) && ! isJetpackSelfHosted;
 
 	// Eligibilities for Simple Sites.

diff --git a/client/my-sites/plugins/plugin-details.jsx b/client/my-sites/plugins/plugin-details.jsx
@@ -56,8 +56,8 @@ import canCurrentUserManagePlugins from 'calypso/state/selectors/can-current-use
 import getSelectedOrAllSites from 'calypso/state/selectors/get-selected-or-all-sites';
 import getSelectedOrAllSitesWithPlugins from 'calypso/state/selectors/get-selected-or-all-sites-with-plugins';
 import getSiteConnectionStatus from 'calypso/state/selectors/get-site-connection-status';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import {
 	isJetpackSite,
 	isRequestingSites as checkRequestingSites,
@@ -373,12 +373,12 @@ function SitesListArea( { fullPlugin: plugin, isPluginInstalledOnsite, billingPe
 
 	const availableOnSites = useSelector( ( state ) =>
 		sitesWithoutPlugin.filter( ( site ) =>
-			hasActiveSiteFeature( state, site.ID, FEATURE_INSTALL_PLUGINS )
+			siteHasFeature( state, site.ID, FEATURE_INSTALL_PLUGINS )
 		)
 	);
 	const upgradeNeededSites = useSelector( ( state ) =>
 		sitesWithoutPlugin.filter(
-			( site ) => ! hasActiveSiteFeature( state, site.ID, FEATURE_INSTALL_PLUGINS )
+			( site ) => ! siteHasFeature( state, site.ID, FEATURE_INSTALL_PLUGINS )
 		)
 	);
 

diff --git a/client/my-sites/plugins/plugin-install-button/index.jsx b/client/my-sites/plugins/plugin-install-button/index.jsx
@@ -19,8 +19,8 @@ import { recordGoogleEvent, recordTracksEvent } from 'calypso/state/analytics/ac
 import { installPlugin } from 'calypso/state/plugins/installed/actions';
 import { removePluginStatuses } from 'calypso/state/plugins/installed/status/actions';
 import getSiteConnectionStatus from 'calypso/state/selectors/get-site-connection-status';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isSiteWpcomAtomic from 'calypso/state/selectors/is-site-wpcom-atomic';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isCompatiblePlugin } from '../plugin-compatibility';
 import { getPeriodVariationValue } from '../plugin-price';
 
@@ -332,7 +332,7 @@ export default connect(
 			siteId,
 			siteIsConnected: getSiteConnectionStatus( state, siteId ),
 			siteIsWpcomAtomic: isSiteWpcomAtomic( state, siteId ),
-			canInstallPlugins: hasActiveSiteFeature( state, siteId, FEATURE_INSTALL_PLUGINS ),
+			canInstallPlugins: siteHasFeature( state, siteId, FEATURE_INSTALL_PLUGINS ),
 			eligibleForProPlan: isEligibleForProPlan( state, siteId ),
 		};
 	},

diff --git a/client/my-sites/site-settings/analytics/form-cloudflare-analytics.js b/client/my-sites/site-settings/analytics/form-cloudflare-analytics.js
@@ -19,7 +19,7 @@ import SettingsSectionHeader from 'calypso/my-sites/site-settings/settings-secti
 import { recordTracksEvent } from 'calypso/state/analytics/actions';
 import { getPlugins } from 'calypso/state/plugins/installed/selectors';
 import getCurrentRouteParameterized from 'calypso/state/selectors/get-current-route-parameterized';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { getSelectedSite, getSelectedSiteId } from 'calypso/state/ui/selectors';
 import wrapSettingsForm from '../wrap-settings-form';
@@ -234,7 +234,7 @@ export function CloudflareAnalyticsSettings( {
 const mapStateToProps = ( state ) => {
 	const site = getSelectedSite( state );
 	const siteId = getSelectedSiteId( state );
-	const isAnalyticsEligible = hasActiveSiteFeature( state, siteId, FEATURE_GOOGLE_ANALYTICS );
+	const isAnalyticsEligible = siteHasFeature( state, siteId, FEATURE_GOOGLE_ANALYTICS );
 	const siteIsJetpack = isJetpackSite( state, siteId );
 	const sitePlugins = site ? getPlugins( state, [ site.ID ] ) : [];
 	const path = getCurrentRouteParameterized( state, siteId );

diff --git a/client/my-sites/site-settings/analytics/form-google-analytics.jsx b/client/my-sites/site-settings/analytics/form-google-analytics.jsx
@@ -5,9 +5,9 @@ import { connect } from 'react-redux';
 import { recordTracksEvent } from 'calypso/state/analytics/actions';
 import { getPlugins } from 'calypso/state/plugins/installed/selectors';
 import getCurrentRouteParameterized from 'calypso/state/selectors/get-current-route-parameterized';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isJetpackModuleActive from 'calypso/state/selectors/is-jetpack-module-active';
 import isAtomicSite from 'calypso/state/selectors/is-site-automated-transfer';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { getSelectedSite, getSelectedSiteId } from 'calypso/state/ui/selectors';
 import wrapSettingsForm from '../wrap-settings-form';
@@ -93,7 +93,7 @@ export const GoogleAnalyticsForm = ( props ) => {
 const mapStateToProps = ( state ) => {
 	const site = getSelectedSite( state );
 	const siteId = getSelectedSiteId( state );
-	const isGoogleAnalyticsEligible = hasActiveSiteFeature( state, siteId, FEATURE_GOOGLE_ANALYTICS );
+	const isGoogleAnalyticsEligible = siteHasFeature( state, siteId, FEATURE_GOOGLE_ANALYTICS );
 	const jetpackModuleActive = isJetpackModuleActive( state, siteId, 'google-analytics' );
 	const siteIsJetpack = isJetpackSite( state, siteId );
 	const googleAnalyticsEnabled = site && ( ! siteIsJetpack || jetpackModuleActive );

diff --git a/client/my-sites/site-settings/seo-settings/help.jsx b/client/my-sites/site-settings/seo-settings/help.jsx
@@ -7,7 +7,7 @@ import SupportInfo from 'calypso/components/support-info';
 import JetpackModuleToggle from 'calypso/my-sites/site-settings/jetpack-module-toggle';
 import SettingsSectionHeader from 'calypso/my-sites/site-settings/settings-section-header';
 import getJetpackModules from 'calypso/state/selectors/get-jetpack-modules';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { getSelectedSiteId } from 'calypso/state/ui/selectors';
 
@@ -70,7 +70,7 @@ export default connect( ( state ) => {
 	const siteId = getSelectedSiteId( state );
 	const siteIsJetpack = isJetpackSite( state, siteId );
 	const hasAdvancedSEOFeature =
-		hasActiveSiteFeature( state, siteId, FEATURE_ADVANCED_SEO ) &&
+		siteHasFeature( state, siteId, FEATURE_ADVANCED_SEO ) &&
 		( ! siteIsJetpack || get( getJetpackModules( state, siteId ), 'seo-tools.available', false ) );
 
 	return {

diff --git a/client/my-sites/site-settings/settings-security/main.jsx b/client/my-sites/site-settings/settings-security/main.jsx
@@ -15,9 +15,9 @@ import JetpackCredentialsBanner from 'calypso/my-sites/site-settings/jetpack-cre
 import JetpackDevModeNotice from 'calypso/my-sites/site-settings/jetpack-dev-mode-notice';
 import SiteSettingsNavigation from 'calypso/my-sites/site-settings/navigation';
 import { siteHasScanProductPurchase } from 'calypso/state/purchases/selectors';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isJetpackSectionEnabledForSite from 'calypso/state/selectors/is-jetpack-section-enabled-for-site';
 import isRewindActive from 'calypso/state/selectors/is-rewind-active';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { shouldDisplayJetpackCredentialsBanner } from 'calypso/state/site-settings/jetpack-credentials-banner/selectors';
 import { getSelectedSite, getSelectedSiteId } from 'calypso/state/ui/selectors';
 
@@ -94,10 +94,6 @@ export default connect( ( state ) => {
 		hasActiveRewind: isRewindActive( state, siteId ),
 		isJetpackSectionEnabled: isJetpackSectionEnabledForSite( state, siteId ),
 		shouldDisplayBanner: shouldDisplayJetpackCredentialsBanner( state ),
-		hasActiveSecuritySettingsFeature: hasActiveSiteFeature(
-			state,
-			siteId,
-			FEATURE_SECURITY_SETTINGS
-		),
+		hasActiveSecuritySettingsFeature: siteHasFeature( state, siteId, FEATURE_SECURITY_SETTINGS ),
 	};
 } )( localize( SiteSettingsSecurity ) );
diff --git a/client/my-sites/themes/theme-showcase.jsx b/client/my-sites/themes/theme-showcase.jsx
@@ -21,8 +21,8 @@ import { buildRelativeSearchUrl } from 'calypso/lib/build-url';
 import AutoLoadingHomepageModal from 'calypso/my-sites/themes/auto-loading-homepage-modal';
 import ThanksModal from 'calypso/my-sites/themes/thanks-modal';
 import { isUserLoggedIn } from 'calypso/state/current-user/selectors';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isAtomicSite from 'calypso/state/selectors/is-site-automated-transfer';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { getSiteSlug } from 'calypso/state/sites/selectors';
 import {
 	getActiveTheme,
@@ -402,7 +402,7 @@ const mapStateToProps = ( state, { siteId, filter, tier, vertical } ) => {
 		currentTheme,
 		isLoggedIn: isUserLoggedIn( state ),
 		isAtomicSite: isAtomicSite( state, siteId ),
-		siteCanInstallThemes: hasActiveSiteFeature( state, siteId, FEATURE_INSTALL_THEMES ),
+		siteCanInstallThemes: siteHasFeature( state, siteId, FEATURE_INSTALL_THEMES ),
 		siteSlug: getSiteSlug( state, siteId ),
 		description: getThemeShowcaseDescription( state, { filter, tier, vertical } ),
 		title: getThemeShowcaseTitle( state, { filter, tier, vertical } ),

diff --git a/client/my-sites/themes/theme-upload/index.jsx b/client/my-sites/themes/theme-upload/index.jsx
@@ -42,9 +42,9 @@ import {
 	isFetchingSitePurchases,
 	hasLoadedSitePurchasesFromServer,
 } from 'calypso/state/purchases/selectors';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
 import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
 import isSiteWpcomAtomic from 'calypso/state/selectors/is-site-wpcom-atomic';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import {
 	getSiteAdminUrl,
 	isJetpackSite,
@@ -386,8 +386,8 @@ const mapStateToProps = ( state ) => {
 	const eligibleForProPlan = isEligibleForProPlan( state, siteId );
 
 	const canUploadThemesOrPlugins =
-		hasActiveSiteFeature( state, siteId, FEATURE_UPLOAD_THEMES ) ||
-		hasActiveSiteFeature( state, siteId, FEATURE_UPLOAD_PLUGINS );
+		siteHasFeature( state, siteId, FEATURE_UPLOAD_THEMES ) ||
+		siteHasFeature( state, siteId, FEATURE_UPLOAD_PLUGINS );
 
 	const isAtomic = isSiteWpcomAtomic( state, siteId );
 

diff --git a/client/post-editor/media-modal/detail/detail-fields.jsx b/client/post-editor/media-modal/detail/detail-fields.jsx
@@ -17,7 +17,7 @@ import { FormCheckbox } from 'calypso/devdocs/design/playground-scope';
 import { gaRecordEvent } from 'calypso/lib/analytics/ga';
 import { bumpStat } from 'calypso/lib/analytics/mc';
 import { getMimePrefix, url } from 'calypso/lib/media/utils';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isJetpackSite } from 'calypso/state/sites/selectors';
 import { getSelectedSiteId } from 'calypso/state/ui/selectors';
 import EditorMediaModalFieldset from '../fieldset';
@@ -354,7 +354,7 @@ export default connect( ( state ) => {
 	const siteId = getSelectedSiteId( state );
 	const isWpcom = ! isJetpackSite( state, siteId );
 	const hasVideoPrivacyFeature =
-		isWpcom && hasActiveSiteFeature( state, siteId, 'videopress-privacy-setting' );
+		isWpcom && siteHasFeature( state, siteId, 'videopress-privacy-setting' );
 
 	return {
 		siteId,

diff --git a/client/signup/steps/store-features/index.tsx b/client/signup/steps/store-features/index.tsx
@@ -8,7 +8,7 @@ import { recordTracksEvent } from 'calypso/lib/analytics/tracks';
 import { preventWidows } from 'calypso/lib/formatting';
 import useBranchSteps from 'calypso/signup/hooks/use-branch-steps';
 import StepWrapper from 'calypso/signup/step-wrapper';
-import hasActiveSiteFeature from 'calypso/state/selectors/has-active-site-feature';
+import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { saveSignupStep, submitSignupStep } from 'calypso/state/signup/progress/actions';
 import { EXCLUDED_STEPS } from '../intent/index';
 import { useIntents } from './intents';
@@ -74,10 +74,10 @@ export default function StoreFeaturesStep( props: Props ): React.ReactNode {
 	}, [] );
 
 	const hasPaymentsFeature = useSelector( ( state ) =>
-		hasActiveSiteFeature( state, props.siteId, FEATURE_SIMPLE_PAYMENTS )
+		siteHasFeature( state, props.siteId, FEATURE_SIMPLE_PAYMENTS )
 	);
 	const hasWooFeature = useSelector( ( state ) =>
-		hasActiveSiteFeature( state, props.siteId, FEATURE_WOOP )
+		siteHasFeature( state, props.siteId, FEATURE_WOOP )
 	);
 	const intents = useIntents( siteSlug, hasPaymentsFeature, hasWooFeature, trackSupportLinkClick );