diff --git a/client/components/domains/connect-domain-step/connect-domain-step-suggested-start.jsx b/client/components/domains/connect-domain-step/connect-domain-step-suggested-start.jsx index eb41a8749afb3..0fa1ff7fcc727 100644 --- a/client/components/domains/connect-domain-step/connect-domain-step-suggested-start.jsx +++ b/client/components/domains/connect-domain-step/connect-domain-step-suggested-start.jsx @@ -11,7 +11,6 @@ import { stepsHeading, stepSlug, } from 'calypso/components/domains/connect-domain-step/constants'; -import { isSubdomain } from 'calypso/lib/domains'; import { domainManagementDns } from 'calypso/my-sites/domains/paths'; import { getSelectedSite } from 'calypso/state/ui/selectors'; import ConnectDomainStepWrapper from './connect-domain-step-wrapper'; @@ -26,16 +25,18 @@ export default function ConnectDomainStepSuggestedStart( { onNextStep, progressStepList, setPage, + domainSetupInfo, } ) { const { __ } = useI18n(); + const { data } = domainSetupInfo; const selectedSite = useSelector( getSelectedSite ); const goToDnsRecordsPage = () => page( domainManagementDns( selectedSite?.slug, domain ) ); - const firstStep = isSubdomain( domain ) + const firstStep = data?.is_subdomain ? stepSlug.SUBDOMAIN_ADVANCED_START : stepSlug.ADVANCED_START; const switchToAdvancedSetup = () => setPage( firstStep ); - const message = isSubdomain( domain ) + const message = data?.is_subdomain ? __( 'The easiest way to connect your subdomain is by changing NS records. But if you are unable to do this, then switch to our advanced setup, using A & CNAME records.' ) @@ -130,4 +131,5 @@ ConnectDomainStepSuggestedStart.propTypes = { onNextStep: PropTypes.func.isRequired, progressStepList: PropTypes.object.isRequired, setPage: PropTypes.func.isRequired, + domainSetupInfo: PropTypes.object.isRequired, }; diff --git a/client/components/domains/connect-domain-step/constants.ts b/client/components/domains/connect-domain-step/constants.ts index b0e1af78b64eb..132dee3fc4599 100644 --- a/client/components/domains/connect-domain-step/constants.ts +++ b/client/components/domains/connect-domain-step/constants.ts @@ -58,6 +58,7 @@ export const defaultDomainSetupInfo = { data: { default_ip_addresses: [ '192.0.78.24', '192.0.78.25' ], wpcom_name_servers: [ 'ns1.wordpress.com', 'ns2.wordpress.com', 'ns3.wordpress.com' ], + is_subdomain: false, }, } as const;