Code cleanup

Automattic · Aug 7, 2019 · 1e11edf · 1e11edf
1 parent 4af2c25
commit 1e11edf
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 25 deletions.
diff --git a/client/blocks/login/login-form.jsx b/client/blocks/login/login-form.jsx
@@ -435,7 +435,6 @@ export class LoginForm extends Component {
 
 		if (
 			config.isEnabled( 'woocommerce/onboarding-oauth' ) &&
-			oauth2Client &&
 			isWooOAuth2Client( oauth2Client ) &&
 			wccomFrom
 		) {

diff --git a/client/blocks/signup-form/index.jsx b/client/blocks/signup-form/index.jsx
@@ -871,7 +871,6 @@ class SignupForm extends Component {
 			( config.isEnabled( 'jetpack/connect/woocommerce' ) &&
 				this.props.isJetpackWooCommerceFlow ) ||
 			( config.isEnabled( 'woocommerce/onboarding-oauth' ) &&
-				this.props.oauth2Client &&
 				isWooOAuth2Client( this.props.oauth2Client ) &&
 				this.props.wccomFrom )
 		) {

diff --git a/client/extensions/woocommerce/components/woocommerce-connect-cart-header/index.js b/client/extensions/woocommerce/components/woocommerce-connect-cart-header/index.js
@@ -4,10 +4,11 @@
  * External dependencies
  */
 import React from 'react';
+import { localize } from 'i18n-calypso';
 
 import './style.scss';
 
-const WooCommercConnectCartHeader = () => {
+const WooCommercConnectCartHeader = ( { translate } ) => {
 	return (
 		<div className="woocommerce-connect-cart-header is-stepper">
 			<div className="woocommerce-connect-cart-header__stepper">
@@ -45,7 +46,9 @@ const WooCommercConnectCartHeader = () => {
 							</svg>
 						</div>
 						<div className="woocommerce-connect-cart-header__stepper-step-text">
-							<span className="woocommerce-connect-cart-header__stepper-step-label">Cart</span>
+							<span className="woocommerce-connect-cart-header__stepper-step-label">
+								{ translate( 'Cart' ) }
+							</span>
 						</div>
 					</div>
 					<div className="woocommerce-connect-cart-header__stepper-step-divider" />
@@ -54,7 +57,9 @@ const WooCommercConnectCartHeader = () => {
 							<span className="woocommerce-connect-cart-header__stepper-step-number">2</span>
 						</div>
 						<div className="woocommerce-connect-cart-header__stepper-step-text">
-							<span className="woocommerce-connect-cart-header__stepper-step-label">Payment</span>
+							<span className="woocommerce-connect-cart-header__stepper-step-label">
+								{ translate( 'Payment' ) }
+							</span>
 						</div>
 					</div>
 					<div className="woocommerce-connect-cart-header__stepper-step-divider" />
@@ -64,7 +69,7 @@ const WooCommercConnectCartHeader = () => {
 						</div>
 						<div className="woocommerce-connect-cart-header__stepper-step-text">
 							<span className="woocommerce-connect-cart-header__stepper-step-label">
-								Installation
+								{ translate( 'Installation' ) }
 							</span>
 						</div>
 					</div>
@@ -74,4 +79,4 @@ const WooCommercConnectCartHeader = () => {
 	);
 };
 
-export default WooCommercConnectCartHeader;
+export default localize( WooCommercConnectCartHeader );
diff --git a/client/extensions/woocommerce/components/woocommerce-connect-cart-header/style.scss b/client/extensions/woocommerce/components/woocommerce-connect-cart-header/style.scss
@@ -1,11 +1,10 @@
-/* @todo color variables */
 .woocommerce-connect-cart-header {
 	height: 56px;
-	border-bottom: 1px solid #e1e2e2;
+	border-bottom: 1px solid var( --color-gray-50 );
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	background: #fff;
+	background: var( --color-white );
 	position: absolute;
 	left: 0;
 	top: 0;
@@ -67,15 +66,15 @@
 	height: 24px;
 	min-width: 24px;
 	margin-right: 12px;
-	background: #e1e2e2;
-	color: #50575d;
+	background: var( --color-gray-50 );
+	color: var( --color-gray-600 );
 	border-radius: 50%;
 }
 
 .woocommerce-connect-cart-header__stepper-step.is-active .woocommerce-connect-cart-header__stepper-step-icon,
 .woocommerce-connect-cart-header__stepper-step.is-complete .woocommerce-connect-cart-header__stepper-step-icon {
-	background: #673d99;
-	color: #fff;
+	background: var( --color-hot-purple-600 );
+	color: var( --color-white );
 }
 
 .woocommerce-connect-cart-header__stepper-step.is-complete .woocommerce-connect-cart-header__stepper-step-number {
@@ -91,7 +90,7 @@
 }
 
 .woocommerce-connect-cart-header__stepper-step .woocommerce-connect-cart-header__stepper-step-label {
-	color: #1a1a1a;
+	color: var( --color-gray-900 );
 	line-height: 24px;
 	font-size: 16px;
 
@@ -102,15 +101,15 @@
 }
 
 .woocommerce-connect-cart-header__stepper-step .woocommerce-connect-cart-header__stepper-step-label {
-	color: #2b2d2f;
+	color: var( --color-gray-800 );
 }
 .woocommerce-connect-cart-header__stepper-step.is-complete .woocommerce-connect-cart-header__stepper-step-label {
-	color: #1a1a1a;
+	color: var( --color-gray-900 );
 }
 
 .woocommerce-connect-cart-header__stepper-step-divider {
 	align-self: flex-start;
 	flex-grow: 1;
-	border-bottom: 1px solid #e1e2e2;
+	border-bottom: 1px solid var( --color-gray-50 );
 	margin-top: 20px;
-}
+}
diff --git a/client/layout/index.jsx b/client/layout/index.jsx
@@ -128,7 +128,6 @@ class Layout extends Component {
 				{
 					'is-wccom-oauth-flow':
 						config.isEnabled( 'woocommerce/onboarding-oauth' ) &&
-						this.props.oauth2Client &&
 						isWooOAuth2Client( this.props.oauth2Client ) &&
 						this.props.wccomFrom,
 				}

diff --git a/client/layout/logged-out.jsx b/client/layout/logged-out.jsx
@@ -64,7 +64,6 @@ const LayoutLoggedOut = ( {
 			config.isEnabled( 'jetpack/connect/woocommerce' ) && isJetpackWooCommerceFlow,
 		'is-wccom-oauth-flow':
 			config.isEnabled( 'woocommerce/onboarding-oauth' ) &&
-			useOAuth2Layout &&
 			isWooOAuth2Client( oauth2Client ) &&
 			wccomFrom,
 	};

diff --git a/client/lib/oauth2-clients.js b/client/lib/oauth2-clients.js
@@ -11,5 +11,5 @@ export const isCrowdsignalOAuth2Client = oauth2Client => {
 };
 
 export const isWooOAuth2Client = oauth2Client => {
-	return includes( [ 50019, 50915, 50916 ], oauth2Client.id );
+	return oauth2Client && includes( [ 50019, 50915, 50916 ], oauth2Client.id );
 };
diff --git a/client/lib/paths/login/test/index.js b/client/lib/paths/login/test/index.js
@@ -81,5 +81,11 @@ describe( 'index', () => {
 
 			expect( url ).to.equal( '/log-in/jetpack?from=woocommerce-setup-wizard' );
 		} );
+
+		test( 'should return the login url with WooCommerce.com handler', () => {
+			const url = login( { isNative: true, oauth2ClientId: 12345, wccomFrom: 'testing' } );
+
+			expect( url ).to.equal( '/log-in?client_id=12345&wccom-from=testing' );
+		} );
 	} );
 } );
diff --git a/client/login/wp-login/login-links.jsx b/client/login/wp-login/login-links.jsx
@@ -173,7 +173,6 @@ export class LoginLinks extends React.Component {
 		// @todo Implement a muriel version of the email login links for the WooCommerce onboarding flows
 		if (
 			config.isEnabled( 'woocommerce/onboarding-oauth' ) &&
-			this.props.oauth2Client &&
 			isWooOAuth2Client( this.props.oauth2Client ) &&
 			this.props.wccomFrom
 		) {

diff --git a/client/signup/style.scss b/client/signup/style.scss
@@ -234,7 +234,7 @@ body.is-section-signup .layout.gravatar .formatted-header {
 		display: block;
 		height: 56px;
 		border-bottom: 1px solid var( --color-woocommerce-header-border );
-		background: #fff;
+		background: var( --color-white );
 
 		svg {
 			margin-top: 15px;

diff --git a/server/pages/index.js b/server/pages/index.js
@@ -307,7 +307,6 @@ function getDefaultContext( request ) {
 		config.isEnabled( 'woocommerce/onboarding-oauth' ) &&
 		( 'login' === request.context.sectionName || 'signup' === request.context.sectionName ) &&
 		request.query[ 'wccom-from' ] &&
-		oauthClientId &&
 		isWooOAuth2Client( { id: parseInt( oauthClientId ) } );
 
 	const context = Object.assign( {}, request.context, {