From 4eb1c182b2c18ef45be6e7a22c675a30b4dae2ba Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Tue, 23 Jan 2018 18:16:33 -0500
Subject: [PATCH 01/14] Point PPEC extension link to woocommerce.com instead of
 wordpress.org

---
 includes/admin/class-wc-admin-setup-wizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index fc8ade88f83..c14c5ff44b9 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1108,7 +1108,7 @@ class WC_Admin_Setup_Wizard {
 		$paypal_ec_description = '<p>' . sprintf(
 			/* translators: %s: URL */
 			__( 'Safe and secure payments using credit cards or your customer\'s PayPal account. <a href="%s" target="_blank">Learn more</a>.', 'woocommerce' ),
-			'https://wordpress.org/plugins/woocommerce-gateway-paypal-express-checkout/'
+			'https://woocommerce.com/products/woocommerce-gateway-paypal-express-checkout/'
 		) . '</p>';
 		$klarna_checkout_description = '<p>' . sprintf(
 			/* translators: %s: URL */

From 591dd9ec2dd02d34369fa30755625cdefcce51ca Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Tue, 23 Jan 2018 18:19:12 -0500
Subject: [PATCH 02/14] Clarify 'payments' (in WCS feature list) to 'payment
 setup'

---
 includes/admin/class-wc-admin-setup-wizard.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index c14c5ff44b9..568e5cbc5a4 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1663,13 +1663,13 @@ class WC_Admin_Setup_Wizard {
 		$description_base = __( 'Your store is almost ready! To activate services like %s, just connect with Jetpack.', 'woocommerce' );
 
 		if ( $payment_enabled && $taxes_enabled && $rates_enabled ) {
-			$description = sprintf( $description_base, __( 'payments, automated taxes, live rates and discounted shipping labels', 'woocommerce' ) );
+			$description = sprintf( $description_base, __( 'payment setup, automated taxes, live rates and discounted shipping labels', 'woocommerce' ) );
 		} else if ( $payment_enabled && $taxes_enabled ) {
-			$description = sprintf( $description_base, __( 'payments and automated taxes', 'woocommerce' ) );
+			$description = sprintf( $description_base, __( 'payment setup and automated taxes', 'woocommerce' ) );
 		} else if ( $payment_enabled && $rates_enabled ) {
-			$description = sprintf( $description_base, __( 'payments, live rates and discounted shipping labels', 'woocommerce' ) );
+			$description = sprintf( $description_base, __( 'payment setup, live rates and discounted shipping labels', 'woocommerce' ) );
 		} else if ( $payment_enabled ) {
-			$description = sprintf( $description_base, __( 'payments', 'woocommerce' ) );
+			$description = sprintf( $description_base, __( 'payment setup', 'woocommerce' ) );
 		} else if ( $taxes_enabled && $rates_enabled ) {
 			$description = sprintf( $description_base, __( 'automated taxes, live rates and discounted shipping labels', 'woocommerce' ) );
 		} else if ( $taxes_enabled ) {

From 7f973c2c791e648739af3e156568201ceb88bd40 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Tue, 23 Jan 2018 18:20:47 -0500
Subject: [PATCH 03/14] Tweak Activate step lower heading to reflect listing of
 features of above

---
 includes/admin/class-wc-admin-setup-wizard.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 568e5cbc5a4..5c845ece766 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1691,7 +1691,7 @@ class WC_Admin_Setup_Wizard {
 		if ( isset( $_GET['activate_error'] ) ) {
 			$has_jetpack_error = true;
 
-			$title = __( "Sorry, We couldn't connect your store to Jetpack", 'woocommerce' );
+			$title = __( "Sorry, we couldn't connect your store to Jetpack", 'woocommerce' );
 
 			$error_message = $this->get_activate_error_message( sanitize_text_field( wp_unslash( $_GET['activate_error'] ) ) );
 			$description = $error_message;
@@ -1735,7 +1735,14 @@ class WC_Admin_Setup_Wizard {
 				<input type="hidden" name="save_step" value="activate" />
 				<?php wp_nonce_field( 'wc-setup' ); ?>
 			</form>
-			<h3 class="jetpack-reasons"><?php esc_html_e( "Bonus reasons you'll love Jetpack", 'woocommerce' ); ?></h3>
+			<h3 class="jetpack-reasons">
+				<?php
+					echo esc_html( $description ?
+						__( "Bonus reasons you'll love Jetpack", 'woocommerce' ) :
+						__( "Reasons you'll love Jetpack", 'woocommerce' )
+					);
+				?>
+			</h3>
 			<ul class="wc-wizard-features">
 				<li class="wc-wizard-feature-item">
 					<p class="wc-wizard-feature-name">

From 6dfcdab1bcb98fe15a81822d006604b23eca8bab Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Tue, 23 Jan 2018 18:23:46 -0500
Subject: [PATCH 04/14] Remove margin before service settings, as margin now
 follows content above

---
 assets/css/wc-setup.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 670730a5fb6..31339dc6625 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -554,10 +554,6 @@ body {
 			margin-bottom: 0;
 		}
 
-		.wc-wizard-service-settings {
-			margin-top: 1em;
-		}
-
 		.wc-wizard-service-settings-description {
 			display: block;
 			font-style: italic;

From e5d00fa98ea3479fbf8f57a6824f656b76a9320b Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Tue, 23 Jan 2018 18:25:44 -0500
Subject: [PATCH 05/14] Fix payment addons link again

---
 includes/admin/class-wc-admin-setup-wizard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 5c845ece766..2b58001242f 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1426,7 +1426,7 @@ class WC_Admin_Setup_Wizard {
 							),
 						)
 					),
-					esc_url( admin_url( 'admin.php?page=wc-addons&view=payment_gateways' ) )
+					esc_url( admin_url( 'admin.php?page=wc-addons&section=payment-gateways' ) )
 				);
 				?>
 			</p>

From 5cc6a589aba8daf036d10c990b39d236c76d6fe5 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 10:29:44 -0500
Subject: [PATCH 06/14] Make step navigation take up full width, even if there
 are fewer than 5

---
 assets/css/wc-setup.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 31339dc6625..c4c8448f961 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -326,7 +326,7 @@ body {
 	width:100%;
 	display: inline-flex;
 	li {
-		width: 20%;
+		width: 100%;
 		float: left;
 		padding: 0 0 0.8em;
 		margin: 0;

From 98fe2c7c3ea66f3b9874ce9f03af20d791fc4c33 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 10:31:16 -0500
Subject: [PATCH 07/14] Remove newline and whitespace from dropdown option
 tooltips

---
 includes/admin/class-wc-admin-setup-wizard.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 2b58001242f..642a8d37639 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -426,13 +426,7 @@ class WC_Admin_Setup_Wizard {
 			>
 				<option value=""><?php esc_html_e( 'Choose a currency&hellip;', 'woocommerce' ); ?></option>
 				<?php foreach ( get_woocommerce_currencies() as $code => $name ) : ?>
-					<option value="<?php echo esc_attr( $code ); ?>" <?php selected( $currency, $code ); ?>>
-						<?php
-						// @codingStandardsIgnoreStart
-						printf( esc_html__( '%1$s (%2$s)', 'woocommerce' ), $name, get_woocommerce_currency_symbol( $code ) );
-						// // @codingStandardsIgnoreEnd
-						?>
-					</option>
+					<option value="<?php echo esc_attr( $code ); ?>" <?php selected( $currency, $code ); ?>><?php printf( esc_html__( '%1$s (%2$s)', 'woocommerce' ), $name, get_woocommerce_currency_symbol( $code ) ); ?></option>
 				<?php endforeach; ?>
 			</select>
 			<script type="text/javascript">
@@ -722,9 +716,7 @@ class WC_Admin_Setup_Wizard {
 			<div class="wc-wizard-shipping-method-dropdown">
 				<select id="<?php echo esc_attr( "{$input_prefix}[method]" ); ?>" name="<?php echo esc_attr( "{$input_prefix}[method]" ); ?>" class="method wc-enhanced-select">
 				<?php foreach ( $shipping_methods as $method_id => $method ) : ?>
-					<option value="<?php echo esc_attr( $method_id ); ?>" <?php selected( $selected, $method_id ); ?>>
-						<?php echo esc_html( $method['name'] ); ?>
-					</option>
+					<option value="<?php echo esc_attr( $method_id ); ?>" <?php selected( $selected, $method_id ); ?>><?php echo esc_html( $method['name'] ); ?></option>
 				<?php endforeach; ?>
 				</select>
 			</div>

From b8384aa4a33c61c5c5d3e693a81c73179d560bcc Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 14:02:09 -0500
Subject: [PATCH 08/14] Scope service name styles to avoid unintended sizing
 and positioning

---
 assets/css/wc-setup.scss | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index c4c8448f961..e162a5a0c48 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -508,7 +508,10 @@ body {
 		align-self: stretch;
 		display: flex;
 		align-items: baseline;
-		justify-content: center;
+
+		.wc-wizard-payment-gateway-form & {
+			justify-content: center;
+		}
 
 		img {
 			max-width: 75px;
@@ -709,7 +712,10 @@ body {
 		display: flex;
 		flex-direction: column;
 		color: #a6a6a6;
-		font-size: 0.92em;
+
+		.wc-wizard-service-item:not(:first-child) & {
+			font-size: 0.92em;
+		}
 	}
 
 	.shipping-method-setting {

From 25373cadee5a522e22c4ae7a9dd674fa6bf01fe5 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 17:21:04 -0500
Subject: [PATCH 09/14] Tweak spacing of store setup step towards original
 static design

---
 assets/css/wc-setup.scss                       | 14 ++++++++++++--
 includes/admin/class-wc-admin-setup-wizard.php |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index e162a5a0c48..ca74ce8a911 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -840,7 +840,7 @@ h3.jetpack-reasons {
 	font-size: 13px;
 	font-weight: 500;
 	margin-bottom: 0.5em;
-	margin-top: 1em;
+	margin-top: 0.85em;
 	display: inline-block;
 }
 
@@ -869,7 +869,7 @@ h3.jetpack-reasons {
 }
 
 .store-address-container {
-	margin-bottom: 24px; // match margin-bottom on top paragraph
+	margin-top: 4px;
 
 	.city-and-postcode {
 		display: flex;
@@ -884,6 +884,16 @@ h3.jetpack-reasons {
 		}
 	}
 }
+.store-currency-container {
+	margin-top: 10px;
+}
+.product-type-container {
+	margin-top: 14px;
+	margin-bottom: 1px;
+}
+#woocommerce_sell_in_person {
+	margin-left: 0;
+}
 
 .wc-wizard-service-settings {
 	.payment-email-input {
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 642a8d37639..157fdbf2b81 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -414,6 +414,7 @@ class WC_Admin_Setup_Wizard {
 			</div>
 		</div>
 
+			<div class="store-currency-container">
 			<label class="location-prompt" for="currency_code">
 				<?php esc_html_e( 'What currency do you use?', 'woocommerce' ); ?>
 			</label>
@@ -432,7 +433,9 @@ class WC_Admin_Setup_Wizard {
 			<script type="text/javascript">
 				var wc_setup_currencies = <?php echo wp_json_encode( $currency_by_country ); ?>;
 			</script>
+			</div>
 
+			<div class="product-type-container">
 			<label class="location-prompt" for="product_type">
 				<?php esc_html_e( 'What type of product do you plan to sell?', 'woocommerce' ); ?>
 			</label>
@@ -446,6 +449,7 @@ class WC_Admin_Setup_Wizard {
 				<option value="physical" <?php selected( $product_type, 'physical' ); ?>><?php esc_html_e( 'I plan to sell physical products', 'woocommerce' ); ?></option>
 				<option value="virtual" <?php selected( $product_type, 'virtual' ); ?>><?php esc_html_e( 'I plan to sell digital products', 'woocommerce' ); ?></option>
 			</select>
+			</div>
 
 			<input
 				type="checkbox"

From eff0b623911e685ca022beaa97809f6a13965a99 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 17:23:28 -0500
Subject: [PATCH 10/14] Tweak shipping service styles towards original static
 design

---
 assets/css/wc-setup.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index ca74ce8a911..600f84ba1e8 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -672,11 +672,15 @@ body {
 	.wc-wizard-service-name {
 		font-weight: normal;
 		text-align: left;
+		align-items: center;
+		max-height: 5em;
+		padding: 0;
 	}
 
 	// List header
 	.wc-wizard-service-item {
 		padding-left: 2em;
+		padding-top: 1em;
 
 		&:first-child {
 			border-bottom: 0;

From d4a8ef4da12703f17e103a4d8f087c72e56a36f1 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 17:24:07 -0500
Subject: [PATCH 11/14] Align payment service setting checkboxes to top of
 their labels rather than bottom

---
 assets/css/wc-setup.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 600f84ba1e8..1ec16038b77 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -1048,11 +1048,12 @@ p.jetpack-terms {
 
 .wc-wizard-service-setting-stripe_create_account, .wc-wizard-service-setting-ppec_paypal_reroute_requests {
 	display: flex;
-	align-items: flex-end;
+	align-items: flex-start;
 	margin-top: 0.75em;
 
 	.payment-checkbox-input {
 		order: 1;
+		margin-top: 5px;
 		margin-left: 0;
 		margin-right: 0;
 		width: 1.5em;

From 16430dfdaadcff279dfd09073cf502884f7d1245 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Wed, 24 Jan 2018 23:52:59 -0500
Subject: [PATCH 12/14] Keep shipping service description in sync with selected
 value after refresh

---
 assets/js/admin/wc-setup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
index ba118e3cf3d..fc196aedda8 100644
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@@ -74,7 +74,7 @@ jQuery( function( $ ) {
 			.removeClass( 'hide' )
 			.find( '.shipping-method-required-field' )
 			.prop( 'required', true );
-	} );
+	} ).find( '.wc-wizard-shipping-method-select .method' ).change();
 
 	$( '.wc-wizard-services' ).on( 'change', '.wc-wizard-shipping-method-enable', function() {
 		var checked = $( this ).is( ':checked' );

From 9f5f301aa4e0830aabd559f8983f9567ee34dcc4 Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Thu, 25 Jan 2018 00:39:23 -0500
Subject: [PATCH 13/14] Restore sizing of shipping service description

---
 assets/css/wc-setup.scss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 1ec16038b77..0ebfae097b8 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -716,10 +716,9 @@ body {
 		display: flex;
 		flex-direction: column;
 		color: #a6a6a6;
-
-		.wc-wizard-service-item:not(:first-child) & {
-			font-size: 0.92em;
-		}
+	}
+	.wc-wizard-service-item:not(:first-child) .wc-wizard-service-description {
+		font-size: 0.92em;
 	}
 
 	.shipping-method-setting {

From a2863156ccd52d533e99e45155c379c700798ddf Mon Sep 17 00:00:00 2001
From: Paul Dechov <dechovsky@gmail.com>
Date: Thu, 25 Jan 2018 01:03:52 -0500
Subject: [PATCH 14/14] Tweak shipping service inner spacing

---
 assets/css/wc-setup.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 0ebfae097b8..301bab4e0a4 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -680,7 +680,7 @@ body {
 	// List header
 	.wc-wizard-service-item {
 		padding-left: 2em;
-		padding-top: 1em;
+		padding-top: 0.67em;
 
 		&:first-child {
 			border-bottom: 0;
@@ -719,6 +719,7 @@ body {
 	}
 	.wc-wizard-service-item:not(:first-child) .wc-wizard-service-description {
 		font-size: 0.92em;
+		padding-bottom: 10px;
 	}
 
 	.shipping-method-setting {