Final removals

Author: ddc22

client/landing/stepper/declarative-flow/internals/steps-repository/domains/domain-form-control.tsx

@@ -202,14 +202,6 @@ export function DomainFormControl( {
 		);
 	};
 
-	const isReskinnedSupportedFlow = () => {
-		if ( ! flow ) {
-			return false;
-		}
-
-		return isDomainUpsellFlow( flow ) || isSiteAssemblerFlow( flow );
-	};
-
 	const renderDomainForm = () => {
 		let initialState: DomainForm = {};
 		if ( domainForm ) {
@@ -289,7 +281,7 @@ export function DomainFormControl( {
 		content = renderDomainForm();
 	}
 
-	if ( isReskinnedSupportedFlow() && ! showUseYourDomain ) {
+	if ( ( isDomainUpsellFlow( flow ) || isSiteAssemblerFlow( flow ) ) && ! showUseYourDomain ) {
 		sideContent = getSideContent();
 	}
 

client/landing/stepper/declarative-flow/internals/steps-repository/unified-domains/index.tsx

@@ -62,7 +62,6 @@ const RenderDomainsStepConnect = connect(
 			flowName: flow,
 			path: window.location.pathname,
 			positionInFlow: 1,
-			isReskinned: true,
 			stepSectionName,
 			signupDependencies: step,
 		};

client/signup/steps/domains/index.jsx

@@ -44,7 +44,6 @@ import {
 } from 'calypso/lib/domains';
 import { getSuggestionsVendor } from 'calypso/lib/domains/suggestions';
 import { triggerGuidesForStep } from 'calypso/lib/guides/trigger-guides-for-step';
-import { getSitePropertyDefaults } from 'calypso/lib/signup/site-properties';
 import CalypsoShoppingCartProvider from 'calypso/my-sites/checkout/calypso-shopping-cart-provider';
 import withCartKey from 'calypso/my-sites/checkout/with-cart-key';
 import { domainManagementRoot } from 'calypso/my-sites/domains/paths';
@@ -103,7 +102,6 @@ export class RenderDomainsStep extends Component {
 		stepName: PropTypes.string.isRequired,
 		stepSectionName: PropTypes.string,
 		selectedSite: PropTypes.object,
-		isReskinned: PropTypes.bool,
 		recordTracksEvent: PropTypes.func,
 	};
 
@@ -1080,7 +1078,7 @@ export class RenderDomainsStep extends Component {
 				forceHideFreeDomainExplainerAndStrikeoutUi={
 					this.props.forceHideFreeDomainExplainerAndStrikeoutUi
 				}
-				isOnboarding={ this.props.isReskinned }
+				isOnboarding
 				reskinSideContent={ this.getSideContent() }
 				isInLaunchFlow={ 'launch-site' === this.props.flowName }
 				promptText={
@@ -1153,7 +1151,7 @@ export class RenderDomainsStep extends Component {
 	isHostingFlow = () => isHostingSignupFlow( this.props.flowName );
 
 	getSubHeaderText() {
-		const { flowName, isAllDomains, stepSectionName, isReskinned, translate } = this.props;
+		const { flowName, isAllDomains, stepSectionName, translate } = this.props;
 
 		if ( isAllDomains ) {
 			return translate( 'Find the domain that defines you' );
@@ -1183,12 +1181,8 @@ export class RenderDomainsStep extends Component {
 			return translate( 'Find and claim one or more domain names' );
 		}
 
-		if ( isReskinned ) {
-			return (
-				! stepSectionName &&
-				'domain-transfer' !== flowName &&
-				translate( 'Enter some descriptive keywords to get started' )
-			);
+		if ( ! stepSectionName && 'domain-transfer' !== flowName ) {
+			return translate( 'Enter some descriptive keywords to get started' );
 		}
 
 		return 'transfer' === this.props.stepSectionName || 'mapping' === this.props.stepSectionName
@@ -1197,8 +1191,7 @@ export class RenderDomainsStep extends Component {
 	}
 
 	getHeaderText() {
-		const { headerText, isAllDomains, isReskinned, stepSectionName, translate, flowName } =
-			this.props;
+		const { headerText, isAllDomains, stepSectionName, translate, flowName } = this.props;
 
 		if ( stepSectionName === 'use-your-domain' || 'domain-transfer' === flowName ) {
 			return '';
@@ -1212,14 +1205,10 @@ export class RenderDomainsStep extends Component {
 			return translate( 'Your next big idea starts here' );
 		}
 
-		if ( isReskinned ) {
-			if ( shouldUseMultipleDomainsInCart( flowName ) ) {
-				return ! stepSectionName && translate( 'Choose your domains' );
-			}
-			return ! stepSectionName && translate( 'Choose a domain' );
+		if ( shouldUseMultipleDomainsInCart( flowName ) ) {
+			return ! stepSectionName && translate( 'Choose your domains' );
 		}
-
-		return getSitePropertyDefaults( 'signUpFlowDomainsStepHeader' );
+		return ! stepSectionName && translate( 'Choose a domain' );
 	}
 
 	getAnalyticsSection() {
@@ -1238,7 +1227,7 @@ export class RenderDomainsStep extends Component {
 			content = this.domainForm();
 		}
 
-		if ( ! this.props.stepSectionName && this.props.isReskinned ) {
+		if ( ! this.props.stepSectionName ) {
 			sideContent = this.getSideContent();
 		}
 
@@ -1325,7 +1314,6 @@ export class RenderDomainsStep extends Component {
 			stepSectionName,
 			isAllDomains,
 			translate,
-			isReskinned,
 			userSiteCount,
 			previousStepName,
 			useStepperWrapper,
@@ -1473,7 +1461,7 @@ export class RenderDomainsStep extends Component {
 				hideSkip
 				goToNextStep={ this.handleSkip }
 				align="center"
-				isWideLayout={ isReskinned }
+				isWideLayout
 			/>
 		);
 	}

client/signup/steps/site-or-domain/index.jsx

@@ -15,10 +15,6 @@ import StepWrapper from 'calypso/signup/step-wrapper';
 import { isUserLoggedIn, getCurrentUser } from 'calypso/state/current-user/selectors';
 import { getAvailableProductsList } from 'calypso/state/products-list/selectors';
 import { submitSignupStep } from 'calypso/state/signup/progress/actions';
-import SiteOrDomainChoice from './choice';
-import DomainImage from './domain-image';
-import ExistingSiteImage from './existing-site-image';
-import NewSiteImage from './new-site-image';
 
 import './style.scss';
 
@@ -58,7 +54,7 @@ class SiteOrDomain extends Component {
 	}
 
 	getChoices() {
-		const { translate, isReskinned, isLoggedIn, siteCount } = this.props;
+		const { translate, isLoggedIn, siteCount } = this.props;
 
 		const domainName = this.getDomainName();
 		let buyADomainTitle = translate( 'Just buy a domain', 'Just buy domains', {
@@ -72,22 +68,40 @@ class SiteOrDomain extends Component {
 		const choices = [];
 
 		const buyADomainDescription = translate( 'Add a site later.' );
-		if ( isReskinned ) {
-			choices.push( {
-				key: 'domain',
-				title: buyADomainTitle,
-				description: buyADomainDescription,
-				icon: null,
-				titleIcon: globe,
-				value: 'domain',
-				actionText: <Gridicon icon="chevron-right" size={ 18 } />,
-				allItemClickable: true,
-			} );
+		choices.push( {
+			key: 'domain',
+			title: buyADomainTitle,
+			description: buyADomainDescription,
+			icon: null,
+			titleIcon: globe,
+			value: 'domain',
+			actionText: <Gridicon icon="chevron-right" size={ 18 } />,
+			allItemClickable: true,
+		} );
+		choices.push( {
+			key: 'page',
+			title: translate( 'New site' ),
+			description: translate(
+				'Customize and launch your site.{{br/}}{{strong}}Free domain for the first year on annual plans.{{/strong}}',
+				{
+					components: {
+						strong: <strong />,
+						br: <br />,
+					},
+				}
+			),
+			icon: null,
+			titleIcon: addCard,
+			value: 'page',
+			actionText: <Gridicon icon="chevron-right" size={ 18 } />,
+			allItemClickable: true,
+		} );
+		if ( isLoggedIn && siteCount > 0 ) {
 			choices.push( {
-				key: 'page',
-				title: translate( 'New site' ),
+				key: 'existing-site',
+				title: translate( 'Existing WordPress.com site' ),
 				description: translate(
-					'Customize and launch your site.{{br/}}{{strong}}Free domain for the first year on annual plans.{{/strong}}',
+					'Use the domain with a site you already started.{{br/}}{{strong}}Free domain for the first year on annual plans.{{/strong}}',
 					{
 						components: {
 							strong: <strong />,
@@ -96,86 +110,24 @@ class SiteOrDomain extends Component {
 					}
 				),
 				icon: null,
-				titleIcon: addCard,
-				value: 'page',
+				titleIcon: layout,
+				value: 'existing-site',
 				actionText: <Gridicon icon="chevron-right" size={ 18 } />,
 				allItemClickable: true,
 			} );
-			if ( isLoggedIn && siteCount > 0 ) {
-				choices.push( {
-					key: 'existing-site',
-					title: translate( 'Existing WordPress.com site' ),
-					description: translate(
-						'Use the domain with a site you already started.{{br/}}{{strong}}Free domain for the first year on annual plans.{{/strong}}',
-						{
-							components: {
-								strong: <strong />,
-								br: <br />,
-							},
-						}
-					),
-					icon: null,
-					titleIcon: layout,
-					value: 'existing-site',
-					actionText: <Gridicon icon="chevron-right" size={ 18 } />,
-					allItemClickable: true,
-				} );
-			}
-		} else {
-			choices.push( {
-				type: 'page',
-				label: translate( 'New site' ),
-				image: <NewSiteImage />,
-				description: translate(
-					'Choose a theme, customize, and launch your site. A free domain for one year is included with all annual plans.'
-				),
-			} );
-			if ( isLoggedIn && siteCount > 0 ) {
-				choices.push( {
-					type: 'existing-site',
-					label: translate( 'Existing WordPress.com site' ),
-					image: <ExistingSiteImage />,
-					description: translate(
-						'Use with a site you already started. A free domain for one year is included with all annual plans.'
-					),
-				} );
-			}
-			choices.push( {
-				type: 'domain',
-				label: buyADomainTitle,
-				image: <DomainImage />,
-				description: buyADomainDescription,
-			} );
 		}
 
 		return choices;
 	}
 
 	renderChoices() {
-		const { isReskinned } = this.props;
-
 		return (
 			<div className="site-or-domain__choices">
-				{ isReskinned ? (
-					<>
-						<SelectItems
-							items={ this.getChoices() }
-							onSelect={ this.handleClickChoice }
-							preventWidows={ preventWidows }
-						/>
-					</>
-				) : (
-					<>
-						{ this.getChoices().map( ( choice, index ) => (
-							<SiteOrDomainChoice
-								choice={ choice }
-								handleClickChoice={ this.handleClickChoice }
-								isPlaceholder={ ! this.props.productsLoaded }
-								key={ `site-or-domain-choice-${ index }` }
-							/>
-						) ) }
-					</>
-				) }
+				<SelectItems
+					items={ this.getChoices() }
+					onSelect={ this.handleClickChoice }
+					preventWidows={ preventWidows }
+				/>
 			</div>
 		);
 	}
@@ -249,7 +201,7 @@ class SiteOrDomain extends Component {
 	};
 
 	render() {
-		const { translate, productsLoaded, isReskinned } = this.props;
+		const { translate, productsLoaded } = this.props;
 		const domainName = this.getDomainName();
 
 		if ( productsLoaded && ! domainName ) {
@@ -277,10 +229,8 @@ class SiteOrDomain extends Component {
 		const additionalProps = {};
 		let headerText = this.props.getHeaderText( this.getDomainCart() );
 
-		if ( isReskinned ) {
-			additionalProps.isHorizontalLayout = false;
-			additionalProps.align = 'center';
-		}
+		additionalProps.isHorizontalLayout = false;
+		additionalProps.align = 'center';
 
 		if ( this.isLeanDomainSearch() ) {
 			additionalProps.className = 'lean-domain-search';