From 53031f3faece4284902e608d4a0a9fd1d739fe26 Mon Sep 17 00:00:00 2001
From: Jeff Stieler <jeff.m.stieler@gmail.com>
Date: Thu, 30 Jul 2020 12:14:18 -0400
Subject: [PATCH] OBW: fix product types step bugs
 (https://github.com/woocommerce/woocommerce-admin/pull/4900)

* OBW: fix tooltip display on product types step.

* Restore physical products as default.

* Slight improvement to screen reader text.
---
 .../profile-wizard/steps/product-types.js     | 22 +++++++++++++------
 .../src/Features/Onboarding.php               |  3 ++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/product-types.js b/plugins/woocommerce-admin/client/profile-wizard/steps/product-types.js
index 52a936f959c..dd476d91f26 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/product-types.js
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/product-types.js
@@ -32,19 +32,27 @@ function getLabel( description, yearlyPrice ) {
 		__( '$%f per month, billed annually', 'woocommerce-admin' ),
 		monthlyPrice
 	);
+	/* eslint-disable @wordpress/i18n-no-collapsible-whitespace */
+	const toolTipText = __(
+		"This product type requires a paid extension.\nWe'll add this to a cart so that\nyou can purchase and install it later.",
+		'woocommerce-admin'
+	);
+	/* eslint-enable @wordpress/i18n-no-collapsible-whitespace */
 
 	return (
 		<Fragment>
 			<span className="woocommerce-product-wizard__product-types__label">
 				{ description }
 			</span>
-			<Tooltip
-				text={ __(
-					"This product type requires a paid extension. We'll add this to a cart so that you can purchase and install it later.",
-					'woocommerce-admin'
-				) }
-			>
-				<Pill>{ priceDescription }</Pill>
+			<Tooltip text={ toolTipText } position="bottom center">
+				<span>
+					<Pill>
+						<span className="screen-reader-text">
+							{ toolTipText }
+						</span>
+						{ priceDescription }
+					</Pill>
+				</span>
 			</Tooltip>
 		</Fragment>
 	);
diff --git a/plugins/woocommerce-admin/src/Features/Onboarding.php b/plugins/woocommerce-admin/src/Features/Onboarding.php
index 10cb70fb720..2c266787837 100644
--- a/plugins/woocommerce-admin/src/Features/Onboarding.php
+++ b/plugins/woocommerce-admin/src/Features/Onboarding.php
@@ -339,7 +339,8 @@ class Onboarding {
 		$product_types = self::append_product_data(
 			array(
 				'physical'        => array(
-					'label' => __( 'Physical products', 'woocommerce-admin' ),
+					'label'   => __( 'Physical products', 'woocommerce-admin' ),
+					'default' => true,
 				),
 				'downloads'       => array(
 					'label' => __( 'Downloads', 'woocommerce-admin' ),