Replace isGravatarDomain checks by isGravatarRestrictedDomain checks where applicable

Author: leonardost

client/me/purchases/cancel-purchase/refund-information.jsx

@@ -13,7 +13,11 @@ import {
 } from 'calypso/lib/purchases';
 import { getDomainsBySiteId } from 'calypso/state/sites/domains/selectors';
 
-const CancelPurchaseRefundInformation = ( { purchase, isGravatarDomain, isJetpackPurchase } ) => {
+const CancelPurchaseRefundInformation = ( {
+	purchase,
+	isGravatarRestrictedDomain,
+	isJetpackPurchase,
+} ) => {
 	const { refundPeriodInDays } = purchase;
 	let text;
 
@@ -93,7 +97,7 @@ const CancelPurchaseRefundInformation = ( { purchase, isGravatarDomain, isJetpac
 			),
 		];
 
-		if ( isGravatarDomain ) {
+		if ( isGravatarRestrictedDomain ) {
 			text.push(
 				i18n.translate(
 					'This domain is provided at no cost for the first year for use with your Gravatar profile. This offer is limited to one free domain per user. If you cancel this domain, you will have to pay the standard price to register another domain for your Gravatar profile.'
@@ -145,6 +149,6 @@ export default connect( ( state, props ) => {
 	const selectedDomain = getSelectedDomain( { domains, selectedDomainName } );
 
 	return {
-		isGravatarDomain: selectedDomain?.isGravatarDomain,
+		isGravatarRestrictedDomain: selectedDomain?.isGravatarRestrictedDomain,
 	};
 } )( CancelPurchaseRefundInformation );

client/me/purchases/remove-purchase/remove-domain-dialog/index.jsx

@@ -30,7 +30,7 @@ class RemoveDomainDialog extends Component {
 	};
 
 	renderDomainDeletionWarning( productName ) {
-		const { translate, slug, currentRoute, isGravatarDomain } = this.props;
+		const { translate, slug, currentRoute, isGravatarRestrictedDomain } = this.props;
 
 		return (
 			<Fragment>
@@ -39,7 +39,7 @@ class RemoveDomainDialog extends Component {
 						'Deleting a domain will make all services connected to it unreachable, including your email and website. It will also make the domain available for someone else to register.'
 					) }
 				</p>
-				{ isGravatarDomain && (
+				{ isGravatarRestrictedDomain && (
 					<p>
 						{ translate(
 							'This domain is provided at no cost for the first year for use with your Gravatar profile. This offer is limited to one free domain per user. If you cancel this domain, you will have to pay the standard price to register another domain for your Gravatar profile.'
@@ -239,7 +239,7 @@ export default connect( ( state, ownProps ) => {
 	const selectedDomainName = getName( ownProps.purchase );
 	const selectedDomain = getSelectedDomain( { domains, selectedDomainName } );
 	return {
-		isGravatarDomain: selectedDomain?.isGravatarDomain,
+		isGravatarRestrictedDomain: selectedDomain?.isGravatarRestrictedDomain,
 		hasTitanWithUs: hasTitanMailWithUs( selectedDomain ),
 		currentRoute: getCurrentRoute( state ),
 		userEmail: getCurrentUserEmail( state ),

client/my-sites/domains/domain-management/settings/index.tsx

@@ -186,7 +186,7 @@ const Settings = ( {
 		if (
 			! ( domain && selectedSite?.options?.is_domain_only ) ||
 			domain?.type === domainTypes.TRANSFER ||
-			domain?.isGravatarDomain
+			domain?.isGravatarRestrictedDomain
 		) {
 			return null;
 		}
@@ -324,7 +324,7 @@ const Settings = ( {
 	};
 
 	const renderNameServersSection = () => {
-		if ( ! domain || domain.type !== domainTypes.REGISTERED || domain.isGravatarDomain ) {
+		if ( ! domain || domain.type !== domainTypes.REGISTERED || domain.isGravatarRestrictedDomain ) {
 			return null;
 		}
 
@@ -772,7 +772,7 @@ const Settings = ( {
 		}
 		return (
 			<>
-				{ ! domain.isGravatarDomain && (
+				{ ! domain.isGravatarRestrictedDomain && (
 					<DomainEmailInfoCard selectedSite={ selectedSite } domain={ domain } />
 				) }
 				{ ! domain.isHundredYearDomain && (

client/my-sites/domains/domain-management/transfer/transfer-page/index.tsx

@@ -374,7 +374,7 @@ const TransferPage = ( props: TransferPageProps ) => {
 						? __( 'Transfer to another registrar' )
 						: __( 'Advanced Options' ) }
 				</CardHeading>
-				{ domain?.isGravatarDomain && (
+				{ domain?.isGravatarRestrictedDomain && (
 					<InfoNotice
 						redesigned
 						text={ __(

client/my-sites/email/email-forwards-add/index.tsx

@@ -57,7 +57,8 @@ const EmailForwardsAdd = ( {
 	const domains = useSelector( ( state ) => getDomainsBySiteId( state, selectedSite?.ID ) );
 	const selectedDomain = getSelectedDomain( { domains, selectedDomainName } );
 	const cannotAddEmailWarningReason = getCurrentUserCannotAddEmailReason( selectedDomain );
-	const isGravatarDomain = cannotAddEmailWarningReason?.code === EMAIL_WARNING_CODE_GRAVATAR_DOMAIN;
+	const isGravatarRestrictedDomain =
+		cannotAddEmailWarningReason?.code === EMAIL_WARNING_CODE_GRAVATAR_DOMAIN;
 
 	const goToEmail = useCallback( (): void => {
 		if ( ! selectedSite ) {
@@ -80,7 +81,7 @@ const EmailForwardsAdd = ( {
 		page( getEmailManagementPath( selectedSite.slug, selectedDomainName, currentRoute ) );
 	}, [ currentRoute, selectedDomainName, selectedSite ] );
 
-	const content = isGravatarDomain ? (
+	const content = isGravatarRestrictedDomain ? (
 		<Notice showDismiss={ false } className="email-forwards-add__notice">
 			{ translate(
 				'This domain is associated with a Gravatar profile and cannot be used for email services at this time.'

client/my-sites/email/email-providers-comparison/stacked/index.tsx

@@ -99,7 +99,8 @@ const EmailProvidersStackedComparison = ( {
 	const currentUserCanAddEmail = canCurrentUserAddEmail( domain );
 	const showNonOwnerMessage = ! currentUserCanAddEmail && ! isDomainInCart;
 	const cannotAddEmailWarningReason = getCurrentUserCannotAddEmailReason( domain );
-	const isGravatarDomain = cannotAddEmailWarningReason?.code === EMAIL_WARNING_CODE_GRAVATAR_DOMAIN;
+	const isGravatarRestrictedDomain =
+		cannotAddEmailWarningReason?.code === EMAIL_WARNING_CODE_GRAVATAR_DOMAIN;
 
 	const isGSuiteSupported =
 		domain && canPurchaseGSuite && ( isDomainInCart || hasGSuiteSupportedDomain( [ domain ] ) );
@@ -295,14 +296,14 @@ const EmailProvidersStackedComparison = ( {
 			{ ! isDomainInCart && domain && <EmailExistingPaidServiceNotice domain={ domain } /> }
 
 			<>
-				{ showNonOwnerMessage && ! isGravatarDomain && (
+				{ showNonOwnerMessage && ! isGravatarRestrictedDomain && (
 					<EmailNonDomainOwnerMessage
 						domain={ domain }
 						selectedSite={ selectedSite }
 						source="email-comparison"
 					/>
 				) }
-				{ isGravatarDomain && (
+				{ isGravatarRestrictedDomain && (
 					<Notice showDismiss={ false } className="email-providers-stacked-comparison__notice">
 						{ translate(
 							'This domain is associated with a Gravatar profile and cannot be used for email services at this time.'