From baf38d3fe95b0bb09caef2f7ab49e7427a0e9513 Mon Sep 17 00:00:00 2001
From: Darshan Sawardekar <darshan@sawardekar.org>
Date: Thu, 5 Sep 2024 14:48:57 +0530
Subject: [PATCH 1/2] Removes initial cards as part of refactoring

---
 .../setup-stepper/setup-accounts/index.js        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/js/src/setup-mc/setup-stepper/setup-accounts/index.js b/js/src/setup-mc/setup-stepper/setup-accounts/index.js
index a1be26f4ba..b8dbe6ecbb 100644
--- a/js/src/setup-mc/setup-stepper/setup-accounts/index.js
+++ b/js/src/setup-mc/setup-stepper/setup-accounts/index.js
@@ -160,16 +160,8 @@ const SetupAccounts = ( props ) => {
 						<WPComAccountCard jetpack={ jetpack } />
 					) }
 					<GoogleAccountCard disabled={ ! isJetpackActive } />
-					<GoogleAdsAccountCard />
 				</VerticalGapLayout>
 			</Section>
-			<Section
-				className="gla-google-mc-account-section"
-				description={ <GoogleMCDisclaimer /> }
-				disabledLeft={ ! isGMCPreconditionReady }
-			>
-				<GoogleMCAccountCard />
-			</Section>
 
 			<StepContentFooter>
 				<StepContentActions>
@@ -181,8 +173,14 @@ const SetupAccounts = ( props ) => {
 						{ __( 'Continue', 'google-listings-and-ads' ) }
 					</AppButton>
 				</StepContentActions>
-				<Faqs />
 			</StepContentFooter>
+			<Section
+				className="gla-google-mc-account-section"
+				description={ <GoogleMCDisclaimer /> }
+				disabledLeft={ ! isGMCPreconditionReady }
+			>
+				<Faqs />
+			</Section>
 		</StepContent>
 	);
 };

From dd17d97e2e2a7d2468d417bbb611d5f2b85974a0 Mon Sep 17 00:00:00 2001
From: Darshan Sawardekar <darshan@sawardekar.org>
Date: Thu, 5 Sep 2024 15:01:07 +0530
Subject: [PATCH 2/2] Fixes linter warnings

---
 js/src/setup-mc/setup-stepper/setup-accounts/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/src/setup-mc/setup-stepper/setup-accounts/index.js b/js/src/setup-mc/setup-stepper/setup-accounts/index.js
index b8dbe6ecbb..a1de3d777b 100644
--- a/js/src/setup-mc/setup-stepper/setup-accounts/index.js
+++ b/js/src/setup-mc/setup-stepper/setup-accounts/index.js
@@ -21,8 +21,6 @@ import AppDocumentationLink from '.~/components/app-documentation-link';
 import VerticalGapLayout from '.~/components/vertical-gap-layout';
 import WPComAccountCard from '.~/components/wpcom-account-card';
 import GoogleAccountCard from '.~/components/google-account-card';
-import GoogleMCAccountCard from '.~/components/google-mc-account-card';
-import GoogleAdsAccountCard from '.~/components/google-ads-account-card';
 import Faqs from './faqs';
 import './index.scss';
 import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';