diff --git a/client/blocks/stats-navigation/index.js b/client/blocks/stats-navigation/index.js index 4e75fd1f882401..cc09c9a71e6813 100644 --- a/client/blocks/stats-navigation/index.js +++ b/client/blocks/stats-navigation/index.js @@ -15,15 +15,9 @@ import { useNoticeVisibilityQuery } from 'calypso/my-sites/stats/hooks/use-notic import { shouldGateStats } from 'calypso/my-sites/stats/hooks/use-should-gate-stats'; import { canCurrentUser } from 'calypso/state/selectors/can-current-user'; import isGoogleMyBusinessLocationConnectedSelector from 'calypso/state/selectors/is-google-my-business-location-connected'; -import isJetpackModuleActive from 'calypso/state/selectors/is-jetpack-module-active'; import isSiteStore from 'calypso/state/selectors/is-site-store'; import siteHasFeature from 'calypso/state/selectors/site-has-feature'; -import { - getJetpackStatsAdminVersion, - getSiteOption, - isJetpackSite, - isSimpleSite, -} from 'calypso/state/sites/selectors'; +import { getJetpackStatsAdminVersion, getSiteOption } from 'calypso/state/sites/selectors'; import getSiteAdminUrl from 'calypso/state/sites/selectors/get-site-admin-url'; import { updateModuleToggles, @@ -142,15 +136,7 @@ class StatsNavigation extends Component { }; isValidItem = ( item ) => { - const { - isGoogleMyBusinessLocationConnected, - isStore, - isWordAds, - isSubscriptionsModuleActive, - isSimple, - isSiteJetpackNotAtomic, - siteId, - } = this.props; + const { isGoogleMyBusinessLocationConnected, isStore, isWordAds, siteId } = this.props; switch ( item ) { case 'wordads': @@ -171,11 +157,6 @@ class StatsNavigation extends Component { return false; } - // The value of isSubscriptionsModuleActive is null in Odyssey Stats so we default to showing the tab. - // Maintains existing behaviour inside wp-admin for self-hosted sites. - // For DotCom sites, it will only be shown on Simple sites or if subs are enabled. - return isSiteJetpackNotAtomic || isSimple || isSubscriptionsModuleActive; - default: return true; } @@ -317,9 +298,6 @@ export default connect( isWordAds: getSiteOption( state, siteId, 'wordads' ) && canCurrentUser( state, siteId, 'manage_options' ), - isSubscriptionsModuleActive: isJetpackModuleActive( state, siteId, 'subscriptions' ), - isSimple: isSimpleSite( state, siteId ), - isSiteJetpackNotAtomic: isJetpackSite( state, siteId, { treatAtomicAsJetpackSite: false } ), hasVideoPress: siteHasFeature( state, siteId, 'videopress' ), siteId, pageModuleToggles: getModuleToggles( state, siteId, [ selectedItem ] ),