Refactor Woo state selectors (#98796)

* Refactor isWoo and isWooPasswordless check

* Rename is-woo-passwordless-jpc-flow

* Remove isPartnerSignup

* Fix tests

Author: chihsuan

client/blocks/authentication/social/social-tos.jsx

@@ -3,8 +3,8 @@ import { localize } from 'i18n-calypso';
 import { connect } from 'react-redux';
 import { getCurrentOAuth2Client } from 'calypso/state/oauth2-clients/ui/selectors';
 import getIsBlazePro from 'calypso/state/selectors/get-is-blaze-pro';
-import getIsWooPasswordless from 'calypso/state/selectors/get-is-woo-passwordless';
-import isWooPasswordlessJPCFlow from 'calypso/state/selectors/is-woo-passwordless-jpc-flow';
+import getIsWCCOM from 'calypso/state/selectors/get-is-wccom';
+import isWooJPCFlow from 'calypso/state/selectors/is-woo-jpc-flow';
 
 const toSLinks = {
 	components: {
@@ -30,7 +30,7 @@ function getToSComponent( content ) {
 }
 
 function SocialAuthToS( props ) {
-	if ( props.isWooPasswordlessJPC ) {
+	if ( props.isWooJPC ) {
 		const termsOfServiceLink = (
 			<a
 				href={ localizeUrl( 'https://wordpress.com/tos/' ) }
@@ -71,7 +71,7 @@ function SocialAuthToS( props ) {
 		);
 	}
 
-	if ( props.isWooPasswordless ) {
+	if ( props.isWCCOM ) {
 		return getToSComponent(
 			props.translate(
 				'By continuing with any of the options above, you agree to our {{tosLink}}Terms of Service{{/tosLink}} and have read our {{privacyLink}}Privacy Policy{{/privacyLink}}.',
@@ -105,7 +105,7 @@ function SocialAuthToS( props ) {
 
 export default connect( ( state ) => ( {
 	oauth2Client: getCurrentOAuth2Client( state ),
-	isWooPasswordless: getIsWooPasswordless( state ),
-	isWooPasswordlessJPC: isWooPasswordlessJPCFlow( state ),
+	isWCCOM: getIsWCCOM( state ),
+	isWooJPC: isWooJPCFlow( state ),
 	isBlazePro: getIsBlazePro( state ),
 } ) )( localize( SocialAuthToS ) );

client/blocks/login/continue-as-user.jsx

@@ -37,7 +37,6 @@ export default function ContinueAsUser( {
 	onChangeAccount,
 	redirectPath,
 	isWoo,
-	isWooPasswordless,
 	isBlazePro,
 	notYouText,
 } ) {
@@ -84,34 +83,6 @@ export default function ContinueAsUser( {
 	);
 
 	if ( isWoo ) {
-		if ( isWooPasswordless ) {
-			return (
-				<div className="continue-as-user">
-					<div className="continue-as-user__user-info">
-						{ gravatarLink }
-						<div className="continue-as-user__not-you">
-							<button
-								type="button"
-								id="loginAsAnotherUser"
-								className="continue-as-user__change-user-link"
-								onClick={ onChangeAccount }
-							>
-								{ translate( 'Sign in as a different user' ) }
-							</button>
-						</div>
-					</div>
-					<Button
-						primary
-						className="continue-as-user__continue-button"
-						busy={ validatingPath }
-						href={ validatedPath || '/' }
-					>
-						{ translate( 'Continue' ) }
-					</Button>
-				</div>
-			);
-		}
-
 		return (
 			<div className="continue-as-user">
 				<div className="continue-as-user__user-info">
@@ -123,15 +94,18 @@ export default function ContinueAsUser( {
 							className="continue-as-user__change-user-link"
 							onClick={ onChangeAccount }
 						>
-							{ translate( 'Log in with a different WordPress.com account' ) }
+							{ translate( 'Sign in as a different user' ) }
 						</button>
 					</div>
-					<Button primary busy={ validatingPath } href={ validatedPath || '/' }>
-						{ `${ translate( 'Continue as', {
-							context: 'Continue as an existing WordPress.com user',
-						} ) } ${ userName }` }
-					</Button>
 				</div>
+				<Button
+					primary
+					className="continue-as-user__continue-button"
+					busy={ validatingPath }
+					href={ validatedPath || '/' }
+				>
+					{ translate( 'Continue' ) }
+				</Button>
 			</div>
 		);
 	}