diff --git a/client/blocks/signup-form/index.jsx b/client/blocks/signup-form/index.jsx index ebfb07aed9e85..a8846125437de 100644 --- a/client/blocks/signup-form/index.jsx +++ b/client/blocks/signup-form/index.jsx @@ -32,7 +32,6 @@ import FormPasswordInput from 'calypso/components/forms/form-password-input'; import FormSettingExplanation from 'calypso/components/forms/form-setting-explanation'; import FormTextInput from 'calypso/components/forms/form-text-input'; import LoggedOutForm from 'calypso/components/logged-out-form'; -import LoggedOutFormBackLink from 'calypso/components/logged-out-form/back-link'; import LoggedOutFormFooter from 'calypso/components/logged-out-form/footer'; import LoggedOutFormLinkItem from 'calypso/components/logged-out-form/link-item'; import LoggedOutFormLinks from 'calypso/components/logged-out-form/links'; @@ -725,7 +724,7 @@ class SignupForm extends Component { { this.displayUsernameInput() && ( <> - { this.props.isReskinned || ( this.props.isWoo && ! this.props.isWooJPC ) + { this.props.isWoo && ! this.props.isWooJPC ? this.props.translate( 'Username' ) : this.props.translate( 'Choose a username' ) } @@ -1058,7 +1057,7 @@ class SignupForm extends Component { } footerLink() { - const { flowName, translate, isWoo, isBlazePro } = this.props; + const { isWoo, isBlazePro } = this.props; if ( this.props.isP2Flow ) { return ( @@ -1090,25 +1089,7 @@ class SignupForm extends Component { ); } - return ( - <> - { ! this.props.isReskinned && ( - - - { flowName === 'onboarding' || flowName === 'onboarding-pm' - ? translate( 'Log in to create a site for your existing account.' ) - : translate( 'Already have a WordPress.com account?' ) } - - { this.props.oauth2Client && ( - - ) } - - ) } - - ); + return null; } handleOnChangeAccount = () => { diff --git a/client/blocks/time-mismatch-warning/test/__snapshots__/index.jsx.snap b/client/blocks/time-mismatch-warning/test/__snapshots__/index.jsx.snap index 31492f4423507..f639b10444cc0 100644 --- a/client/blocks/time-mismatch-warning/test/__snapshots__/index.jsx.snap +++ b/client/blocks/time-mismatch-warning/test/__snapshots__/index.jsx.snap @@ -4,7 +4,7 @@ exports[`TimeMismatchWarning to render if GMT offsets do not match 1`] = `
should render notices with the expected structure 1`] >
660px" ) { margin-bottom: 24px; diff --git a/client/jetpack-connect/test/__snapshots__/jetpack-connect-notices.js.snap b/client/jetpack-connect/test/__snapshots__/jetpack-connect-notices.js.snap index 4702331e8b2aa..b7d9632aafcce 100644 --- a/client/jetpack-connect/test/__snapshots__/jetpack-connect-notices.js.snap +++ b/client/jetpack-connect/test/__snapshots__/jetpack-connect-notices.js.snap @@ -7,7 +7,7 @@ exports[`JetpackConnectNotices Should render non-terminal notice if callback sup >
{ translate( 'You have {{b}}%(amountInCurrency)s{{/b}} in {{a}}upgrade credits{{/a}} available from your current plan. This credit will be applied to the pricing below at checkout if you upgrade today!', diff --git a/client/my-sites/plans-features-main/components/plan-notice.tsx b/client/my-sites/plans-features-main/components/plan-notice.tsx index 29c44c8a50b7e..2a1e82c629771 100644 --- a/client/my-sites/plans-features-main/components/plan-notice.tsx +++ b/client/my-sites/plans-features-main/components/plan-notice.tsx @@ -111,7 +111,6 @@ export default function PlanNotice( props: PlanNoticeProps ) { onDismissClick={ handleDismissNotice } icon="info-outline" status="is-success" - isReskinned > { translate( 'This plan was purchased by a different WordPress.com account. To manage this plan, log in to that account or contact the account owner.' @@ -126,7 +125,6 @@ export default function PlanNotice( props: PlanNoticeProps ) { onDismissClick={ handleDismissNotice } icon="info-outline" status="is-warning" - isReskinned > { translate( 'Your plan currently has a legacy feature that provides 200GB of space. ' + @@ -153,7 +151,6 @@ export default function PlanNotice( props: PlanNoticeProps ) { onDismissClick={ handleDismissNotice } icon="info-outline" status="is-success" - isReskinned > { activeDiscount.plansPageNoticeTextTitle && ( @@ -178,7 +175,6 @@ export default function PlanNotice( props: PlanNoticeProps ) { { status === 'rejected' && ( 0 && ( <> { className="add-subscribers-modal__notice" icon={ } isCompact - isReskinned status="is-info" showDismiss={ false } > @@ -219,7 +218,6 @@ const AddSubscribersModal = ( { site }: AddSubscribersModalProps ) => { className="add-subscribers-modal__notice" icon={ } isCompact - isReskinned status="is-warning" showDismiss={ false } > @@ -265,7 +263,6 @@ const AddSubscribersModal = ( { site }: AddSubscribersModalProps ) => { className="add-subscribers-modal__notice" icon={ } isCompact - isReskinned status="is-info" showDismiss={ false } > @@ -281,7 +278,6 @@ const AddSubscribersModal = ( { site }: AddSubscribersModalProps ) => { className="add-subscribers-modal__notice" icon={ } isCompact - isReskinned status="is-warning" showDismiss={ false } > diff --git a/client/signup/signup-header/index.tsx b/client/signup/signup-header/index.tsx index e1679641388a4..af15667078414 100644 --- a/client/signup/signup-header/index.tsx +++ b/client/signup/signup-header/index.tsx @@ -1,6 +1,5 @@ import { ProgressBar, WooCommerceWooLogo } from '@automattic/components'; import { useFlowProgress } from '@automattic/onboarding'; -import clsx from 'clsx'; import { useTranslate } from 'i18n-calypso'; import WordPressLogo from 'calypso/components/wordpress-logo'; import './style.scss'; @@ -13,7 +12,6 @@ interface ProgressBarData { interface Props { progressBar?: ProgressBarData; shouldShowLoadingScreen?: boolean; - isReskinned?: boolean; rightComponent?: React.ReactNode; pageTitle?: string; showWooLogo?: boolean; @@ -21,7 +19,6 @@ interface Props { const SignupHeader = ( { shouldShowLoadingScreen, - isReskinned, rightComponent, progressBar = {}, pageTitle, @@ -40,9 +37,7 @@ const SignupHeader = ( { variationName ? { flowName: variationName, stepName: progressBar.stepName } : progressBar ); - const logoClasses = clsx( 'wordpress-logo', { - 'is-large': shouldShowLoadingScreen && ! isReskinned, - } ); + const logoClasses = 'wordpress-logo'; return ( <> diff --git a/client/signup/steps/design-picker/index.jsx b/client/signup/steps/design-picker/index.jsx index 65574fe183ee3..9ad29e8ab2b61 100644 --- a/client/signup/steps/design-picker/index.jsx +++ b/client/signup/steps/design-picker/index.jsx @@ -30,7 +30,6 @@ export default function DesignPickerStep( props ) { const { flowName, stepName, - isReskinned, showDesignPickerCategories, showLetUsChoose, hideFullScreenPreview, @@ -179,7 +178,7 @@ export default function DesignPickerStep( props ) { <> ); diff --git a/client/signup/steps/domains/test/index.js b/client/signup/steps/domains/test/index.js index e2b39e53a17d8..591979503a6db 100644 --- a/client/signup/steps/domains/test/index.js +++ b/client/signup/steps/domains/test/index.js @@ -29,7 +29,6 @@ describe( 'sortProductsByPriceDescending', () => { stepName: 'stepName', stepSectionName: 'sectionName', selectedSite: {}, - isReskinned: false, signupDependencies: { suggestedDomain: 'example.com', }, diff --git a/client/signup/steps/intent/index.tsx b/client/signup/steps/intent/index.tsx index 42c454452d100..20da95e05e8d1 100644 --- a/client/signup/steps/intent/index.tsx +++ b/client/signup/steps/intent/index.tsx @@ -18,7 +18,6 @@ import type { Dependencies } from 'calypso/signup/types'; interface Props { goToNextStep: () => void; - isReskinned: boolean; signupDependencies: any; stepName: string; queryObject: { diff --git a/client/signup/steps/starting-point/index.tsx b/client/signup/steps/starting-point/index.tsx index 663e41f948728..ec97ee54fa56e 100644 --- a/client/signup/steps/starting-point/index.tsx +++ b/client/signup/steps/starting-point/index.tsx @@ -12,7 +12,6 @@ import type { Dependencies } from 'calypso/signup/types'; interface Props { goToNextStep: () => void; - isReskinned: boolean; signupDependencies: any; stepName: string; initialContext: any; diff --git a/client/signup/steps/store-features/index.tsx b/client/signup/steps/store-features/index.tsx index 20ee8e95e39c2..f2a1a23604fae 100644 --- a/client/signup/steps/store-features/index.tsx +++ b/client/signup/steps/store-features/index.tsx @@ -18,7 +18,6 @@ import './index.scss'; interface Props { goToNextStep: () => void; - isReskinned: boolean; signupDependencies: any; stepName: string; initialContext: any; diff --git a/client/signup/steps/user/index.jsx b/client/signup/steps/user/index.jsx index 0c9da71b2430d..190785c2f3569 100644 --- a/client/signup/steps/user/index.jsx +++ b/client/signup/steps/user/index.jsx @@ -168,7 +168,7 @@ export class UserStep extends Component { } getLoginUrl() { - const { oauth2Client, wccomFrom, isReskinned, sectionName, from, locale, step } = this.props; + const { oauth2Client, wccomFrom, sectionName, from, locale, step } = this.props; const emailAddress = step?.form?.email?.value ?? step?.form?.email; return login( { @@ -178,7 +178,6 @@ export class UserStep extends Component { locale, oauth2ClientId: oauth2Client?.id, wccomFrom, - isWhiteLogin: isReskinned, signupUrl: window.location.pathname + window.location.search, emailAddress, } ); @@ -192,7 +191,6 @@ export class UserStep extends Component { translate, userLoggedIn, wccomFrom, - isReskinned, isOnboardingAffiliateFlow, isWCCOM, } = this.props; @@ -280,7 +278,7 @@ export class UserStep extends Component { subHeaderText = translate( 'Welcome to the WordPress.com community.' ); } - if ( isReskinned && 0 === positionInFlow ) { + if ( 0 === positionInFlow ) { if ( this.props.isSocialFirst ) { subHeaderText = ''; } else { @@ -569,7 +567,7 @@ export class UserStep extends Component { } renderSignupForm() { - const { oauth2Client, isReskinned, isWCCOM, isWoo } = this.props; + const { oauth2Client, isWCCOM, isWoo } = this.props; const isPasswordless = isMobile() || this.props.isPasswordless || @@ -615,8 +613,7 @@ export class UserStep extends Component { socialService={ socialService } socialServiceResponse={ socialServiceResponse } recaptchaClientId={ this.state.recaptchaClientId } - horizontal={ isReskinned } - isReskinned={ isReskinned } + horizontal shouldDisplayUserExistsError={ ! isWCCOM && ! isBlazeProOAuth2Client( oauth2Client ) } isSocialFirst={ this.props.isSocialFirst } labelText={ isWoo ? this.props.translate( 'Your email' ) : null } diff --git a/packages/plans-grid-next/src/types.ts b/packages/plans-grid-next/src/types.ts index b368f582b93bd..cca0719a2bbcc 100644 --- a/packages/plans-grid-next/src/types.ts +++ b/packages/plans-grid-next/src/types.ts @@ -105,7 +105,6 @@ export interface CommonGridProps { siteId?: number | null; isInSignup: boolean; isInAdmin: boolean; - isReskinned?: boolean; onStorageAddOnClick?: ( addOnSlug: AddOns.StorageAddOnSlug ) => void; currentSitePlanSlug?: string | null; hideUnavailableFeatures?: boolean; // used to hide features that are not available, instead of strike-through as explained in #76206