Skip to content

Commit

Permalink
Second phase rename
Browse files Browse the repository at this point in the history
  • Loading branch information
ddc22 committed Feb 7, 2025
1 parent c40830e commit 3fd28b7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
3 changes: 2 additions & 1 deletion client/components/domains/domain-search-results/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class DomainSearchResults extends Component {
mappingSuggestionLabel: PropTypes.string,
offerUnavailableOption: PropTypes.bool,
showAlreadyOwnADomain: PropTypes.bool,
showDomainTransferSuggestion: PropTypes.bool,
onClickResult: PropTypes.func.isRequired,
onAddMapping: PropTypes.func,
onAddTransfer: PropTypes.func,
Expand Down Expand Up @@ -367,7 +368,7 @@ class DomainSearchResults extends Component {
if (
this.props.offerUnavailableOption &&
this.props.siteDesignType !== DESIGN_TYPE_STORE &&
! this.props.isReskinned
this.props.showDomainTransferSuggestion
) {
unavailableOffer = (
<DomainTransferSuggestion
Expand Down
20 changes: 12 additions & 8 deletions client/components/domains/register-domain-step/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ class RegisterDomainStep extends Component {
deemphasiseTlds: PropTypes.array,
recordFiltersSubmit: PropTypes.func.isRequired,
recordFiltersReset: PropTypes.func.isRequired,
isReskinned: PropTypes.bool,
/**
* A flag signalling if the step is being used in the onboarding flow
*/
isOnboarding: PropTypes.bool,
showSkipButton: PropTypes.bool,
onSkip: PropTypes.func,
promoTlds: PropTypes.array,
Expand Down Expand Up @@ -537,7 +540,7 @@ class RegisterDomainStep extends Component {
! Array.isArray( this.state.searchResults ) &&
! this.state.loadingResults &&
! this.props.showExampleSuggestions;
const showFilters = ! isRenderingInitialSuggestions || this.props.isReskinned;
const showFilters = ! isRenderingInitialSuggestions || this.props.isOnboarding;

const showTldFilter =
( Array.isArray( this.state.availableTlds ) && this.state.availableTlds.length > 0 ) ||
Expand Down Expand Up @@ -622,7 +625,7 @@ class RegisterDomainStep extends Component {
onSearch: this.onSearch,
onSearchChange: this.onSearchChange,
ref: this.bindSearchCardReference,
isReskinned: this.props.isReskinned,
isOnboarding: this.props.isOnboarding,
childrenBeforeCloseButton:
this.props.isDomainAndPlanPackageFlow && this.renderSearchFilters(),
};
Expand Down Expand Up @@ -1524,10 +1527,10 @@ class RegisterDomainStep extends Component {
}

renderExampleSuggestions() {
const { isReskinned, domainsWithPlansOnly, offerUnavailableOption, products, path } =
const { isOnboarding, domainsWithPlansOnly, offerUnavailableOption, products, path } =
this.props;

if ( isReskinned ) {
if ( isOnboarding ) {
return this.renderBestNamesPrompt();
}

Expand Down Expand Up @@ -1694,15 +1697,16 @@ class RegisterDomainStep extends Component {
unavailableDomains={ this.state.unavailableDomains }
onSkip={ this.props.onSkip }
showSkipButton={ this.props.showSkipButton }
hideMatchReasons={ this.props.isReskinned }
hideMatchReasons={ this.props.isOnboarding }
showDomainTransferSuggestion={ this.props.isOnboarding }
domainAndPlanUpsellFlow={ this.props.domainAndPlanUpsellFlow }
useProvidedProductsList={ this.props.useProvidedProductsList }
isCartPendingUpdateDomain={ this.props.isCartPendingUpdateDomain }
wpcomSubdomainSelected={ this.props.wpcomSubdomainSelected }
temporaryCart={ this.props.temporaryCart }
domainRemovalQueue={ this.props.domainRemovalQueue }
>
{ ! this.props.isReskinned &&
{ ! this.props.isOnboarding &&
hasResults &&
isFreeDomainExplainerVisible &&
this.renderFreeDomainExplainer() }
Expand All @@ -1711,7 +1715,7 @@ class RegisterDomainStep extends Component {
}

renderSideContent() {
return this.props.isReskinned && ! this.state.loadingResults && this.props.reskinSideContent;
return this.props.isOnboarding && ! this.state.loadingResults && this.props.reskinSideContent;
}

getFetchAlgo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export function DomainFormControl( {
includeWordPressDotCom={ includeWordPressDotCom ?? true }
initialState={ initialState }
isPlanSelectionAvailableInFlow={ isPlanSelectionAvailableLaterInFlow }
isReskinned
isOnboarding
reskinSideContent={ getSideContent() }
isSignupStep
key="domainForm"
Expand Down
2 changes: 1 addition & 1 deletion client/signup/steps/domains/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ export class RenderDomainsStep extends Component {
forceHideFreeDomainExplainerAndStrikeoutUi={
this.props.forceHideFreeDomainExplainerAndStrikeoutUi
}
isReskinned={ this.props.isReskinned }
isOnboarding={ this.props.isReskinned }
reskinSideContent={ this.getSideContent() }
isInLaunchFlow={ 'launch-site' === this.props.flowName }
promptText={
Expand Down

0 comments on commit 3fd28b7

Please sign in to comment.