From 6d7f6dcbd6f7634ac72c855ffdf1029713a33186 Mon Sep 17 00:00:00 2001
From: Fernando <ultimoround@gmail.com>
Date: Fri, 19 Feb 2021 11:20:16 -0300
Subject: [PATCH] Removed @woocommerce/components/card from OBW
 (https://github.com/woocommerce/woocommerce-admin/pull/6374)

* Removed @woocommerce/components/card from OBW

This commit removes the "@woocommerce/components/card" from the step "Business Details" in the OBW.

* Added readme.txt line

Co-authored-by: Fernando Marichal <contacto@fernandomarichal.com>
---
 .../flows/selective-bundle/index.js           | 69 +++++++++----------
 .../flows/selective-bundle/style.scss         |  8 +++
 .../steps/business-details/style.scss         |  5 --
 .../steps/product-types/style.scss            |  5 --
 plugins/woocommerce-admin/readme.txt          |  1 +
 5 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js
index 1cb1c9793fe..2d8d952e708 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/index.js
@@ -6,16 +6,14 @@ import { Component } from '@wordpress/element';
 import { compose } from '@wordpress/compose';
 import {
 	Button,
+	Card,
+	CardBody,
+	CardFooter,
 	TabPanel,
 	__experimentalText as Text,
 } from '@wordpress/components';
 import { withDispatch, withSelect } from '@wordpress/data';
-import {
-	Card,
-	SelectControl,
-	Form,
-	TextControl,
-} from '@woocommerce/components';
+import { SelectControl, Form, TextControl } from '@woocommerce/components';
 import {
 	ONBOARDING_STORE_NAME,
 	PLUGINS_STORE_NAME,
@@ -262,7 +260,7 @@ class BusinessDetails extends Component {
 								</Text>
 							</div>
 							<Card>
-								<>
+								<CardBody>
 									<SelectControl
 										label={ __(
 											'How many products do you plan to display?',
@@ -337,36 +335,35 @@ class BusinessDetails extends Component {
 											</div>
 										</>
 									) }
-
-									<div className="woocommerce-profile-wizard__card-actions">
-										<Button
-											isPrimary
-											onClick={ handleSubmit }
-											disabled={ ! isValidForm }
-											isBusy={ isInstallingActivating }
-										>
-											{ ! hasInstallActivateError
-												? __(
-														'Continue',
-														'woocommerce-admin'
-												  )
-												: __(
-														'Retry',
-														'woocommerce-admin'
-												  ) }
-										</Button>
-										{ hasInstallActivateError && (
-											<Button
-												onClick={ () => goToNextStep() }
-											>
-												{ __(
-													'Continue without installing',
+								</CardBody>
+								<CardFooter isBorderless justify="center">
+									<Button
+										isPrimary
+										onClick={ handleSubmit }
+										disabled={ ! isValidForm }
+										isBusy={ isInstallingActivating }
+									>
+										{ ! hasInstallActivateError
+											? __(
+													'Continue',
 													'woocommerce-admin'
-												) }
-											</Button>
-										) }
-									</div>
-								</>
+											  )
+											: __(
+													'Retry',
+													'woocommerce-admin'
+											  ) }
+									</Button>
+									{ hasInstallActivateError && (
+										<Button
+											onClick={ () => goToNextStep() }
+										>
+											{ __(
+												'Continue without installing',
+												'woocommerce-admin'
+											) }
+										</Button>
+									) }
+								</CardFooter>
 							</Card>
 						</>
 					);
diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss
index 90a8c628357..e2c10c1d37b 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/flows/selective-bundle/style.scss
@@ -14,4 +14,12 @@
 
 		justify-content: center;
 	}
+	.components-card {
+		&__body {
+			padding: $gap $gap 0;
+		}
+		&__footer {
+			padding-top: 0;
+		}
+	}
 }
diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/style.scss b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/style.scss
index 70c315d043e..229b4928e46 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/style.scss
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/business-details/style.scss
@@ -8,9 +8,4 @@
 	.woocommerce-profile-wizard__step-header {
 		margin-top: 28px;
 	}
-
-	.woocommerce-profile-wizard__card-actions {
-		display: flex;
-		justify-content: center;
-	}
 }
diff --git a/plugins/woocommerce-admin/client/profile-wizard/steps/product-types/style.scss b/plugins/woocommerce-admin/client/profile-wizard/steps/product-types/style.scss
index df362a82789..0ed73b729ab 100644
--- a/plugins/woocommerce-admin/client/profile-wizard/steps/product-types/style.scss
+++ b/plugins/woocommerce-admin/client/profile-wizard/steps/product-types/style.scss
@@ -60,11 +60,6 @@
 				margin-left: $gap;
 			}
 		}
-
-		.woocommerce-profile-wizard__card-actions
-		.components-button.is-primary {
-			margin-top: $gap;
-		}
 	}
 }
 
diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index f3a66fd8aca..87c1586880d 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -81,6 +81,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
 - Dev: Add filter to allow enabling the WP toolbar within the new navigation. #6371
 - Dev: Add unit tests to Navigation's Container component. #6344
 - Fix: Enqueue scripts called incorrectly in php unit tests #6358
+- Fix: Removed @woocommerce/components/card from OBW #6374
 
 == 2.0.0 02/05/2021 ==